Changeset 58352 in webkit


Ignore:
Timestamp:
Apr 27, 2010 4:24:21 PM (14 years ago)
Author:
kinuko@chromium.org
Message:

2010-04-27 Kinuko Yasuda <kinuko@chromium.org>

Reviewed by Jian Li.

[V8] Handle OR ('|') conditional in action_derivedsourcesallinone.py
https://bugs.webkit.org/show_bug.cgi?id=38207

No new tests.

  • WebCore.gyp/scripts/action_derivedsourcesallinone.py:
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r58349 r58352  
     12010-04-27  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        [V8] Handle OR ('|') conditional in action_derivedsourcesallinone.py
     6        https://bugs.webkit.org/show_bug.cgi?id=38207
     7
     8        No new tests.
     9
     10        * WebCore.gyp/scripts/action_derivedsourcesallinone.py:
     11
    1122010-04-27  François Sausset  <sausset@gmail.com>
    213
  • trunk/WebCore/WebCore.gyp/scripts/action_derivedsourcesallinone.py

    r55318 r58352  
    5050
    5151# A regexp for finding Conditional attributes in interface definitions.
    52 conditionalPattern = re.compile('interface[\s]*\[[^\]]*Conditional=([\_0-9a-zA-Z&]*)')
     52conditionalPattern = re.compile('interface[\s]*\[[^\]]*Conditional=([\_0-9a-zA-Z&|]*)')
    5353
    5454copyrightTemplate = """/*
     
    8383
    8484
    85 # Wraps conditional with ENABLE() and && if more than one conditional is specified.
     85# Wraps conditional with ENABLE() and replace '&','|' with '&&','||' if more than one conditional is specified.
    8686def formatConditional(conditional):
    8787    def wrapWithEnable(s):
     88        if re.match('[|&]$', s):
     89            return s * 2
    8890        return 'ENABLE(' + s + ')'
    89     return ' && '.join(map(wrapWithEnable, conditional))
     91    return ' '.join(map(wrapWithEnable, conditional))
    9092
    9193
     
    102104    if match:
    103105        conditional = match.group(1)
    104         conditional = conditional.split('&')
     106        conditional = re.split('([|&])', conditional)
    105107
    106108    return conditional
Note: See TracChangeset for help on using the changeset viewer.