Changeset 38649 in webkit for trunk/JavaScriptCore
- Timestamp:
- Nov 20, 2008, 5:53:44 PM (17 years ago)
- Location:
- trunk/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r38647 r38649 1 2008-11-20 Sam Weinig <[email protected]> 2 3 Try and fix the tiger build. 4 5 * parser/Grammar.y: 6 1 7 2008-11-20 Eric Seidel <[email protected]> 2 8 -
trunk/JavaScriptCore/parser/Grammar.y
r38635 r38649 1245 1245 | TRUETOKEN 1246 1246 | FALSETOKEN 1247 | NUMBER 1248 | STRING 1247 | NUMBER { } 1248 | STRING { } 1249 1249 | '/' /* regexp */ { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; } 1250 1250 | DIVEQUAL /* regexp with /= */ { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; } … … 1252 1252 1253 1253 Property_NoNode: 1254 IDENT ':' AssignmentExpr_NoNode 1255 | STRING ':' AssignmentExpr_NoNode 1256 | NUMBER ':' AssignmentExpr_NoNode 1254 IDENT ':' AssignmentExpr_NoNode { } 1255 | STRING ':' AssignmentExpr_NoNode { } 1256 | NUMBER ':' AssignmentExpr_NoNode { } 1257 1257 | IDENT IDENT '(' ')' OPENBRACE FunctionBody_NoNode CLOSEBRACE { if (*$1 != "get" && *$1 != "set") YYABORT; } 1258 1258 | IDENT IDENT '(' FormalParameterList_NoNode ')' OPENBRACE FunctionBody_NoNode CLOSEBRACE { if (*$1 != "get" && *$1 != "set") YYABORT; } … … 1266 1266 PrimaryExpr_NoNode: 1267 1267 PrimaryExprNoBrace_NoNode 1268 | OPENBRACE CLOSEBRACE 1269 | OPENBRACE PropertyList_NoNode CLOSEBRACE 1268 | OPENBRACE CLOSEBRACE { } 1269 | OPENBRACE PropertyList_NoNode CLOSEBRACE { } 1270 1270 /* allow extra comma, see http://bugs.webkit.org/show_bug.cgi?id=5939 */ 1271 | OPENBRACE PropertyList_NoNode ',' CLOSEBRACE 1271 | OPENBRACE PropertyList_NoNode ',' CLOSEBRACE { } 1272 1272 ; 1273 1273 … … 1276 1276 | Literal_NoNode 1277 1277 | ArrayLiteral_NoNode 1278 | IDENT 1278 | IDENT { } 1279 1279 | '(' Expr_NoNode ')' 1280 1280 ; … … 1643 1643 1644 1644 Block_NoNode: 1645 OPENBRACE CLOSEBRACE 1646 | OPENBRACE SourceElements_NoNode CLOSEBRACE 1645 OPENBRACE CLOSEBRACE { } 1646 | OPENBRACE SourceElements_NoNode CLOSEBRACE { } 1647 1647 ; 1648 1648 … … 1653 1653 1654 1654 VariableDeclarationList_NoNode: 1655 IDENT 1656 | IDENT Initializer_NoNode 1655 IDENT { } 1656 | IDENT Initializer_NoNode { } 1657 1657 | VariableDeclarationList_NoNode ',' IDENT 1658 1658 | VariableDeclarationList_NoNode ',' IDENT Initializer_NoNode … … 1660 1660 1661 1661 VariableDeclarationListNoIn_NoNode: 1662 IDENT 1663 | IDENT InitializerNoIn_NoNode 1662 IDENT { } 1663 | IDENT InitializerNoIn_NoNode { } 1664 1664 | VariableDeclarationListNoIn_NoNode ',' IDENT 1665 1665 | VariableDeclarationListNoIn_NoNode ',' IDENT InitializerNoIn_NoNode … … 1677 1677 1678 1678 ConstDeclaration_NoNode: 1679 IDENT 1680 | IDENT Initializer_NoNode 1679 IDENT { } 1680 | IDENT Initializer_NoNode { } 1681 1681 ; 1682 1682 … … 1754 1754 1755 1755 CaseBlock_NoNode: 1756 OPENBRACE CaseClausesOpt_NoNode CLOSEBRACE 1757 | OPENBRACE CaseClausesOpt_NoNode DefaultClause_NoNode CaseClausesOpt_NoNode CLOSEBRACE 1756 OPENBRACE CaseClausesOpt_NoNode CLOSEBRACE { } 1757 | OPENBRACE CaseClausesOpt_NoNode DefaultClause_NoNode CaseClausesOpt_NoNode CLOSEBRACE { } 1758 1758 ; 1759 1759 … … 1779 1779 1780 1780 LabelledStatement_NoNode: 1781 IDENT ':' Statement_NoNode; 1781 IDENT ':' Statement_NoNode { } 1782 ; 1782 1783 1783 1784 ThrowStatement_NoNode: … … 1810 1811 1811 1812 FormalParameterList_NoNode: 1812 IDENT 1813 IDENT { } 1813 1814 | FormalParameterList_NoNode ',' IDENT 1814 1815 ;
Note:
See TracChangeset
for help on using the changeset viewer.