Changeset 58352 in webkit
- Timestamp:
- Apr 27, 2010 4:24:21 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r58349 r58352 1 2010-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 1 12 2010-04-27 François Sausset <sausset@gmail.com> 2 13 -
trunk/WebCore/WebCore.gyp/scripts/action_derivedsourcesallinone.py
r55318 r58352 50 50 51 51 # A regexp for finding Conditional attributes in interface definitions. 52 conditionalPattern = re.compile('interface[\s]*\[[^\]]*Conditional=([\_0-9a-zA-Z& ]*)')52 conditionalPattern = re.compile('interface[\s]*\[[^\]]*Conditional=([\_0-9a-zA-Z&|]*)') 53 53 54 54 copyrightTemplate = """/* … … 83 83 84 84 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. 86 86 def formatConditional(conditional): 87 87 def wrapWithEnable(s): 88 if re.match('[|&]$', s): 89 return s * 2 88 90 return 'ENABLE(' + s + ')' 89 return ' &&'.join(map(wrapWithEnable, conditional))91 return ' '.join(map(wrapWithEnable, conditional)) 90 92 91 93 … … 102 104 if match: 103 105 conditional = match.group(1) 104 conditional = conditional.split('&')106 conditional = re.split('([|&])', conditional) 105 107 106 108 return conditional
Note: See TracChangeset
for help on using the changeset viewer.