Changeset 34539 in webkit


Ignore:
Timestamp:
Jun 14, 2008 2:56:04 AM (16 years ago)
Author:
cwzwarich@webkit.org
Message:

2008-06-14 Cameron Zwarich <cwzwarich@uwaterloo.ca>

Reviewed by Oliver.

Remove helper functions in the parser that are no longer needed.

  • kjs/grammar.y:
Location:
trunk/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r34535 r34539  
     12008-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
    192008-06-14  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
    210
  • trunk/JavaScriptCore/kjs/grammar.y

    r34535 r34539  
    6464using namespace std;
    6565
    66 static AddNode* makeAddNode(ExpressionNode*, ExpressionNode*, bool rightHasAssignments);
    67 static LessNode* makeLessNode(ExpressionNode*, ExpressionNode*);
    6866static ExpressionNode* makeAssignNode(ExpressionNode* loc, Operator, ExpressionNode* expr, bool locHasAssignments, bool exprHasAssignments);
    6967static ExpressionNode* makePrefixNode(ExpressionNode* expr, Operator);
     
    478476AdditiveExpr:
    479477    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); }
    481479  | AdditiveExpr '-' MultiplicativeExpr { $$ = createNodeFeatureInfo<ExpressionNode*>(new SubNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); }
    482480;
     
    485483    MultiplicativeExprNoBF
    486484  | 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); }
    488486  | AdditiveExprNoBF '-' MultiplicativeExpr
    489487                                        { $$ = createNodeFeatureInfo<ExpressionNode*>(new SubNode($1.m_node, $3.m_node, $3.m_featureInfo & AssignFeature), $1.m_featureInfo | $3.m_featureInfo); }
     
    506504RelationalExpr:
    507505    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); }
    509507  | RelationalExpr '>' ShiftExpr        { $$ = createNodeFeatureInfo<ExpressionNode*>(new GreaterNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }
    510508  | RelationalExpr LE ShiftExpr         { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessEqNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }
     
    516514RelationalExprNoIn:
    517515    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); }
    519517  | RelationalExprNoIn '>' ShiftExpr    { $$ = createNodeFeatureInfo<ExpressionNode*>(new GreaterNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }
    520518  | RelationalExprNoIn LE ShiftExpr     { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessEqNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }
     
    526524RelationalExprNoBF:
    527525    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); }
    529527  | RelationalExprNoBF '>' ShiftExpr    { $$ = createNodeFeatureInfo<ExpressionNode*>(new GreaterNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }
    530528  | RelationalExprNoBF LE ShiftExpr     { $$ = createNodeFeatureInfo<ExpressionNode*>(new LessEqNode($1.m_node, $3.m_node), $1.m_featureInfo | $3.m_featureInfo); }
     
    10941092 
    10951093%%
    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 }
    11061094
    11071095static ExpressionNode* makeAssignNode(ExpressionNode* loc, Operator op, ExpressionNode* expr, bool locHasAssignments, bool exprHasAssignments)
Note: See TracChangeset for help on using the changeset viewer.