Changeset 34539 in webkit
- Timestamp:
- Jun 14, 2008 2:56:04 AM (16 years ago)
- Location:
- trunk/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r34535 r34539 1 2008-06-14 Cameron Zwarich <cwzwarich@uwaterloo.ca> 2 3 Reviewed by Oliver. 4 5 Remove helper functions in the parser that are no longer needed. 6 7 * kjs/grammar.y: 8 1 9 2008-06-14 Cameron Zwarich <cwzwarich@uwaterloo.ca> 2 10 -
trunk/JavaScriptCore/kjs/grammar.y
r34535 r34539 64 64 using namespace std; 65 65 66 static AddNode* makeAddNode(ExpressionNode*, ExpressionNode*, bool rightHasAssignments);67 static LessNode* makeLessNode(ExpressionNode*, ExpressionNode*);68 66 static ExpressionNode* makeAssignNode(ExpressionNode* loc, Operator, ExpressionNode* expr, bool locHasAssignments, bool exprHasAssignments); 69 67 static ExpressionNode* makePrefixNode(ExpressionNode* expr, Operator); … … 478 476 AdditiveExpr: 479 477 MultiplicativeExpr 480 | AdditiveExpr '+' MultiplicativeExpr { $$ = createNodeFeatureInfo<ExpressionNode*>( makeAddNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); }478 | AdditiveExpr '+' MultiplicativeExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new AddNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); } 481 479 | AdditiveExpr '-' MultiplicativeExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new SubNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); } 482 480 ; … … 485 483 MultiplicativeExprNoBF 486 484 | AdditiveExprNoBF '+' MultiplicativeExpr 487 { $$ = createNodeFeatureInfo<ExpressionNode*>( makeAddNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); }485 { $$ = createNodeFeatureInfo<ExpressionNode*>(new AddNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); } 488 486 | AdditiveExprNoBF '-' MultiplicativeExpr 489 487 { $$ = createNodeFeatureInfo<ExpressionNode*>(new SubNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); } … … 506 504 RelationalExpr: 507 505 ShiftExpr 508 | RelationalExpr '<' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>( makeLessNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }506 | RelationalExpr '<' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } 509 507 | RelationalExpr '>' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new GreaterNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } 510 508 | RelationalExpr LE ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessEqNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } … … 516 514 RelationalExprNoIn: 517 515 ShiftExpr 518 | RelationalExprNoIn '<' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>( makeLessNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }516 | RelationalExprNoIn '<' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } 519 517 | RelationalExprNoIn '>' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new GreaterNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } 520 518 | RelationalExprNoIn LE ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessEqNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } … … 526 524 RelationalExprNoBF: 527 525 ShiftExprNoBF 528 | RelationalExprNoBF '<' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>( makeLessNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }526 | RelationalExprNoBF '<' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } 529 527 | RelationalExprNoBF '>' ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new GreaterNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } 530 528 | RelationalExprNoBF LE ShiftExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessEqNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); } … … 1094 1092 1095 1093 %% 1096 1097 static AddNode* makeAddNode(ExpressionNode* left, ExpressionNode* right, bool rightHasAssignments)1098 {1099 return new AddNode(left, right, rightHasAssignments);1100 }1101 1102 static LessNode* makeLessNode(ExpressionNode* left, ExpressionNode* right)1103 {1104 return new LessNode(left, right);1105 }1106 1094 1107 1095 static ExpressionNode* makeAssignNode(ExpressionNode* loc, Operator op, ExpressionNode* expr, bool locHasAssignments, bool exprHasAssignments)
Note: See TracChangeset
for help on using the changeset viewer.