Changeset 112036 in webkit


Ignore:
Timestamp:
Mar 25, 2012 1:00:03 PM (12 years ago)
Author:
haraken@chromium.org
Message:

Remove duplicated GenerateConditionalString() from code generators
​https://bugs.webkit.org/show_bug.cgi?id=82148

Reviewed by Adam Barth.

Previously GenerateConditionalString()s were defined in each code generator,
and they were doing the same thing. This patch puts GenerateConditionalString()
in CodeGenerator.pm and removes duplicated GenerateConditionalString()s.

No tests. No change in the generated code.

  • bindings/scripts/CodeGenerator.pm:

(GenerateConditionalString):

  • bindings/scripts/CodeGeneratorCPP.pm:

(GenerateHeader):
(GenerateImplementation):

  • bindings/scripts/CodeGeneratorGObject.pm:

(GenerateProperty):
(GenerateProperties):
(GenerateFunction):
(WriteData):

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeaderContentHeader):
(GenerateImplementationContentHeader):
(GenerateHeader):
(GenerateImplementation):
(GenerateCallbackHeader):
(GenerateCallbackImplementation):

  • bindings/scripts/CodeGeneratorObjC.pm:

(GenerateHeader):
(GenerateImplementation):

  • bindings/scripts/CodeGeneratorV8.pm:

(GenerateHeader):
(GenerateNormalAttrGetter):
(GenerateNormalAttrSetter):
(GenerateOverloadedFunctionCallback):
(GenerateFunctionCallback):
(GenerateBatchedAttributeData):
(GenerateImplementation):
(GenerateHeaderContentHeader):
(GenerateImplementationContentHeader):
(GenerateCallbackHeader):
(GenerateCallbackImplementation):

Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r112035 r112036  
     12012-03-25  Kentaro Hara  <haraken@chromium.org>
     2
     3        Remove duplicated GenerateConditionalString() from code generators
     4        https://bugs.webkit.org/show_bug.cgi?id=82148
     5
     6        Reviewed by Adam Barth.
     7
     8        Previously GenerateConditionalString()s were defined in each code generator,
     9        and they were doing the same thing. This patch puts GenerateConditionalString()
     10        in CodeGenerator.pm and removes duplicated GenerateConditionalString()s.
     11
     12        No tests. No change in the generated code.
     13
     14        * bindings/scripts/CodeGenerator.pm:
     15        (GenerateConditionalString):
     16        * bindings/scripts/CodeGeneratorCPP.pm:
     17        (GenerateHeader):
     18        (GenerateImplementation):
     19        * bindings/scripts/CodeGeneratorGObject.pm:
     20        (GenerateProperty):
     21        (GenerateProperties):
     22        (GenerateFunction):
     23        (WriteData):
     24        * bindings/scripts/CodeGeneratorJS.pm:
     25        (GenerateHeaderContentHeader):
     26        (GenerateImplementationContentHeader):
     27        (GenerateHeader):
     28        (GenerateImplementation):
     29        (GenerateCallbackHeader):
     30        (GenerateCallbackImplementation):
     31        * bindings/scripts/CodeGeneratorObjC.pm:
     32        (GenerateHeader):
     33        (GenerateImplementation):
     34        * bindings/scripts/CodeGeneratorV8.pm:
     35        (GenerateHeader):
     36        (GenerateNormalAttrGetter):
     37        (GenerateNormalAttrSetter):
     38        (GenerateOverloadedFunctionCallback):
     39        (GenerateFunctionCallback):
     40        (GenerateBatchedAttributeData):
     41        (GenerateImplementation):
     42        (GenerateHeaderContentHeader):
     43        (GenerateImplementationContentHeader):
     44        (GenerateCallbackHeader):
     45        (GenerateCallbackImplementation):
     46
    1472012-03-25  Kentaro Hara  <haraken@chromium.org>
    248

  • trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm

    r111865 r112036  
    605605}
    606606
     607sub GenerateConditionalString
     608{
     609    my $generator = shift;
     610    my $node = shift;
     611
     612    my $conditional = $node->extendedAttributes->{"Conditional"};
     613    if ($conditional) {
     614        return $generator->GenerateConditionalStringFromAttributeValue($conditional);
     615    } else {
     616        return "";
     617    }
     618}
     619
    607620sub GenerateConditionalStringFromAttributeValue
    608621{

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm

    r111745 r112036  
    308308}
    309309
    310 sub GenerateConditionalString
    311 {
    312     my $node = shift;
    313     my $conditional = $node->extendedAttributes->{"Conditional"};
    314     if ($conditional) {
    315         return $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
    316     } else {
    317         return "";
    318     }
    319 }
    320 
    321310sub GetNamespaceForClass
    322311{
    … …  
    352341    push(@headerContentHeader, "\n#define $className" . "_h\n\n");
    353342
    354     my $conditionalString = GenerateConditionalString($dataNode);
     343    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    355344    push(@headerContentHeader, "#if ${conditionalString}\n\n") if $conditionalString;
    356345
    … …  
    429418            next if ShouldSkipType($attribute);
    430419
    431             my $attributeConditionalString = GenerateConditionalString($attribute->signature);
     420            my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    432421            my $attributeName = $attribute->signature->name;
    433422            my $attributeType = GetCPPType($attribute->signature->type, 0);
    … …  
    497486            }
    498487
    499             my $conditionalString = GenerateConditionalString($function->signature);
     488            my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    500489            push(@headerFunctions, "#if ${conditionalString}\n") if $conditionalString;
    501490            push(@headerFunctions, "    ");
    … …  
    604593    # - INCLUDES -
    605594    push(@implContentHeader, "\n#include \"config.h\"\n");
    606     my $conditionalString = GenerateConditionalString($dataNode);
     595    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    607596    push(@implContentHeader, "\n#if ${conditionalString}\n\n") if $conditionalString;
    608597    push(@implContentHeader, "#include \"$className.h\"\n\n");
    … …  
    721710
    722711            my $getterContent = "${getterContentHead}${functionName}(" . join(", ", @arguments) . ")${getterContentTail}";
    723             my $attributeConditionalString = GenerateConditionalString($attribute->signature);
     712            my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    724713            push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
    725714
    … …  
    890879            }
    891880
    892             my $conditionalString = GenerateConditionalString($function->signature);
     881            my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    893882            push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
    894883

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm

    r111914 r112036  
    343343}
    344344
    345 sub GenerateConditionalString
    346 {
    347     my $node = shift;
    348     my $conditional = $node->extendedAttributes->{"Conditional"};
    349     if ($conditional) {
    350         if ($conditional =~ /&/) {
    351             return "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
    352         } elsif ($conditional =~ /\|/) {
    353             return "ENABLE(" . join(") || ENABLE(", split(/\|/, $conditional)) . ")";
    354         } else {
    355             return "ENABLE(" . $conditional . ")";
    356         }
    357     } else {
    358         return "";
    359     }
    360 }
    361 
    362345sub GenerateConditionalWarning
    363346{
    … …  
    391374    my @writeableProperties = @{shift @_};
    392375
    393     my $conditionalString = GenerateConditionalString($attribute->signature);
     376    my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    394377    my $camelPropName = $attribute->signature->name;
    395378    my $setPropNameFunction = $codeGenerator->WK_ucfirst($camelPropName);
    … …  
    530513    my $conditionGuardStart = "";
    531514    my $conditionGuardEnd = "";
    532     my $conditionalString = GenerateConditionalString($dataNode);
     515    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    533516    if ($conditionalString) {
    534517        $conditionGuardStart = "#if ${conditionalString}";
    … …  
    794777    my $returnValueIsGDOMType = IsGDOMClassType($functionSigType);
    795778
    796     my $conditionalString = GenerateConditionalString($function->signature);
    797     my $parentConditionalString = GenerateConditionalString($parentNode);
     779    my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
     780    my $parentConditionalString = $codeGenerator->GenerateConditionalString($parentNode);
    798781    my @conditionalWarn = GenerateConditionalWarning($function->signature);
    799782    my @parentConditionalWarn = GenerateConditionalWarning($parentNode);
    … …  
    13631346
    13641347    # Add the guard if the 'Conditional' extended attribute exists
    1365     my $conditionalString = GenerateConditionalString($dataNode);
     1348    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    13661349
    13671350    open(PRIVHEADER, ">$filename") or die "Couldn't open file $filename for writing";

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r111856 r112036  
    383383}
    384384
    385 sub GenerateConditionalString
    386 {
    387     my $node = shift;
    388     my $conditional = $node->extendedAttributes->{"Conditional"};
    389     if ($conditional) {
    390         return $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
    391     } else {
    392         return "";
    393     }
    394 }
    395 
    396385sub GenerateGetOwnPropertySlotBody
    397386{
    … …  
    590579    push(@headerContentHeader, "\n#define $className" . "_h\n\n");
    591580
    592     my $conditionalString = GenerateConditionalString($dataNode);
     581    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    593582    push(@headerContentHeader, "#if ${conditionalString}\n\n") if $conditionalString;
    594583    return @headerContentHeader;
    … …  
    603592
    604593    push(@implContentHeader, "\n#include \"config.h\"\n");
    605     my $conditionalString = GenerateConditionalString($dataNode);
     594    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    606595    push(@implContentHeader, "\n#if ${conditionalString}\n\n") if $conditionalString;
    607596    push(@implContentHeader, "#include \"$className.h\"\n\n");
    … …  
    846835            $numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomSetter"} || $attribute->signature->extendedAttributes->{"JSCustomSetter"});
    847836            if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {
    848                 my $conditionalString = GenerateConditionalString($attribute->signature);
     837                my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    849838                push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    850839                push(@headerContent, "    JSC::WriteBarrier<JSC::Unknown> m_" . $attribute->signature->name . ";\n");
    … …  
    866855
    867856        foreach my $attribute (@{$dataNode->attributes}) {
    868             my $conditionalString = GenerateConditionalString($attribute->signature);
     857            my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    869858            if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"JSCustom"} || $attribute->signature->extendedAttributes->{"CustomGetter"} || $attribute->signature->extendedAttributes->{"JSCustomGetter"}) {
    870859                push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    … …  
    890879            next unless $function->signature->extendedAttributes->{"Custom"} or $function->signature->extendedAttributes->{"JSCustom"};
    891880            next if $function->{overloads} && $function->{overloadIndex} != 1;
    892             my $conditionalString = GenerateConditionalString($function->signature);
     881            my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    893882            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    894883            my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} || $codeGenerator->WK_lcfirst($function->signature->name);
    … …  
    10801069        foreach my $function (@{$dataNode->functions}) {
    10811070            next if $function->{overloadIndex} && $function->{overloadIndex} > 1;
    1082             my $conditionalString = GenerateConditionalString($function->signature);
     1071            my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    10831072            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    10841073            my $functionName = GetFunctionName($className, $function);
    … …  
    10911080        push(@headerContent,"// Attributes\n\n");
    10921081        foreach my $attribute (@{$dataNode->attributes}) {
    1093             my $conditionalString = GenerateConditionalString($attribute->signature);
     1082            my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    10941083            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    10951084            my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
    … …  
    11161105        push(@headerContent,"// Constants\n\n");
    11171106        foreach my $constant (@{$dataNode->constants}) {
    1118             my $conditionalString = GenerateConditionalString($constant);
     1107            my $conditionalString = $codeGenerator->GenerateConditionalString($constant);
    11191108            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    11201109            my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($constant->name);
    … …  
    11241113    }
    11251114
    1126     my $conditionalString = GenerateConditionalString($dataNode);
     1115    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    11271116    push(@headerContent, "\n} // namespace WebCore\n\n");
    11281117    push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString;
    … …  
    16831672                my $implGetterFunctionName = $codeGenerator->WK_lcfirst($name);
    16841673
    1685                 my $attributeConditionalString = GenerateConditionalString($attribute->signature);
     1674                my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    16861675                push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
    16871676
    … …  
    18741863                        my $implSetterFunctionName = $codeGenerator->WK_ucfirst($name);
    18751864
    1876                         my $attributeConditionalString = GenerateConditionalString($attribute->signature);
     1865                        my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    18771866                        push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
    18781867
    … …  
    23682357    push(@implContent, "\n}\n");
    23692358
    2370     my $conditionalString = GenerateConditionalString($dataNode);
     2359    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    23712360    push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
    23722361}
    … …  
    26372626
    26382627    push(@headerContent, "} // namespace WebCore\n\n");
    2639     my $conditionalString = GenerateConditionalString($dataNode);
     2628    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    26402629    push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString;
    26412630    push(@headerContent, "#endif\n");
    … …  
    27312720
    27322721    push(@implContent, "\n}\n");
    2733     my $conditionalString = GenerateConditionalString($dataNode);
     2722    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    27342723    push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
    27352724}

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

    r109515 r112036  
    270270}
    271271
    272 sub GenerateConditionalString
    273 {
    274     my $node = shift;
    275     my $conditional = $node->extendedAttributes->{"Conditional"};
    276     if ($conditional) {
    277         if ($conditional =~ /&/) {
    278             return "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
    279         } elsif ($conditional =~ /\|/) {
    280             return "ENABLE(" . join(") || ENABLE(", split(/\|/, $conditional)) . ")";
    281         } else {
    282             return "ENABLE(" . $conditional . ")";
    283         }
    284     } else {
    285         return "";
    286     }
    287 }
    288 
    289272# Params: 'domClass' struct
    290273sub GenerateInterface
    … …  
    826809                push(@privateHeaderAttributes, $property) unless $public;
    827810            } else {
    828                 my $attributeConditionalString = GenerateConditionalString($attribute->signature);
     811                my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    829812                if ($attributeConditionalString) {
    830813                    push(@headerAttributes, "#if ${attributeConditionalString}\n") if $public;
    … …  
    921904            }
    922905
    923             my $functionConditionalString = GenerateConditionalString($function->signature);
     906            my $functionConditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    924907            if ($functionConditionalString) {
    925908                push(@headerFunctions, "#if ${functionConditionalString}\n") if $public;
    … …  
    10941077    push(@implContentHeader, "\n#import \"config.h\"\n");
    10951078
    1096     my $conditionalString = GenerateConditionalString($dataNode);
     1079    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    10971080    push(@implContentHeader, "\n#if ${conditionalString}\n\n") if $conditionalString;
    10981081
    … …  
    13641347            }
    13651348
    1366             my $attributeConditionalString = GenerateConditionalString($attribute->signature);
     1349            my $attributeConditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    13671350            push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
    13681351            push(@implContent, $getterSig);
    … …  
    16931676            }
    16941677
    1695             my $conditionalString = GenerateConditionalString($function->signature);
     1678            my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    16961679            push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
    16971680

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

    r111825 r112036  
    182182}
    183183
    184 sub GenerateConditionalString
    185 {
    186     my $node = shift;
    187     my $conditional = $node->extendedAttributes->{"Conditional"};
    188     if ($conditional) {
    189         return $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
    190     } else {
    191         return "";
    192     }
    193 }
    194 
    195184sub GetSVGPropertyTypes
    196185{
    … …  
    366355
    367356        if (($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) && !$attrExt->{"ImplementedBy"} && $function->{overloadIndex} == 1) {
    368             my $conditionalString = GenerateConditionalString($function->signature);
     357            my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    369358            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    370359            push(@headerContent, <<END);
    … …  
    388377        my $name = $attribute->signature->name;
    389378        my $attrExt = $attribute->signature->extendedAttributes;
    390         my $conditionalString = GenerateConditionalString($attribute->signature);
     379        my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    391380        if (($attrExt->{"V8CustomGetter"} || $attrExt->{"CustomGetter"} ||
    392381             $attrExt->{"V8Custom"} || $attrExt->{"Custom"}) &&
    … …  
    500489    push(@headerContent, "#endif // $className" . "_h\n");
    501490
    502     my $conditionalString = GenerateConditionalString($dataNode);
     491    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    503492    push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString;
    504493}
    … …  
    787776
    788777    # Getter
    789     my $conditionalString = GenerateConditionalString($attribute->signature);
     778    my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    790779    push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
    791780
    … …  
    10281017    my $attrExt = $attribute->signature->extendedAttributes;
    10291018
    1030     my $conditionalString = GenerateConditionalString($attribute->signature);
     1019    my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    10311020    push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
    10321021
    … …  
    13291318
    13301319    my $name = $function->signature->name;
    1331     my $conditionalString = GenerateConditionalString($function->signature);
     1320    my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    13321321    push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
    13331322    push(@implContentDecls, <<END);
    … …  
    13751364    }
    13761365
    1377     my $conditionalString = GenerateConditionalString($function->signature);
     1366    my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    13781367    push(@implContentDecls, "#if ${conditionalString}\n\n") if $conditionalString;
    13791368    push(@implContentDecls, <<END);
    … …  
    19981987
    19991988    foreach my $attribute (@$attributes) {
    2000         my $conditionalString = GenerateConditionalString($attribute->signature);
     1989        my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
    20011990        push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
    20021991        GenerateSingleBatchedAttribute($interfaceName, $attribute, ",", "");
    … …  
    24922481        my $name = $function->signature->name;
    24932482        my $callback = GetFunctionTemplateCallbackName($function, $interfaceName);
    2494         my $conditionalString = GenerateConditionalString($function->signature);
     2483        my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    24952484        push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
    24962485        push(@implContent, <<END);
    … …  
    26392628    foreach my $runtime_attr (@enabledAtRuntime) {
    26402629        my $enable_function = GetRuntimeEnableFunctionName($runtime_attr->signature);
    2641         my $conditionalString = GenerateConditionalString($runtime_attr->signature);
     2630        my $conditionalString = $codeGenerator->GenerateConditionalString($runtime_attr->signature);
    26422631        push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
    26432632        push(@implContent, "    if (${enable_function}()) {\n");
    … …  
    26542643    foreach my $runtime_const (@constantsEnabledAtRuntime) {
    26552644        my $enable_function = GetRuntimeEnableFunctionName($runtime_const);
    2656         my $conditionalString = GenerateConditionalString($runtime_const);
     2645        my $conditionalString = $codeGenerator->GenerateConditionalString($runtime_const);
    26572646        my $name = $runtime_const->name;
    26582647        my $value = $runtime_const->value;
    … …  
    27572746        }
    27582747
    2759         my $conditionalString = GenerateConditionalString($function->signature);
     2748        my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
    27602749        push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
    27612750
    … …  
    28932882END
    28942883
    2895     my $conditionalString = GenerateConditionalString($dataNode);
     2884    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    28962885    push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
    28972886   
    … …  
    29052894    my $dataNode = shift;
    29062895    my $className = "V8" . $dataNode->name;
    2907     my $conditionalString = GenerateConditionalString($dataNode);
     2896    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    29082897
    29092898    my @headerContentHeader = split("\r", $headerTemplate);
    … …  
    29192908    my $dataNode = shift;
    29202909    my $className = "V8" . $dataNode->name;
    2921     my $conditionalString = GenerateConditionalString($dataNode);
     2910    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    29222911
    29232912    my @implContentHeader = split("\r", $headerTemplate);
    … …  
    30022991    push(@headerContent, "#endif // $className" . "_h\n\n");
    30032992
    3004     my $conditionalString = GenerateConditionalString($dataNode);
     2993    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    30052994    push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
    30062995}
    … …  
    30963085    push(@implContent, "\n} // namespace WebCore\n\n");
    30973086
    3098     my $conditionalString = GenerateConditionalString($dataNode);
     3087    my $conditionalString = $codeGenerator->GenerateConditionalString($dataNode);
    30993088    push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
    31003089}
Note: See TracChangeset for help on using the changeset viewer.