Changes in src/Parser/parser.yy [064e3ff:8688ce1]

File:

• src/Parser/parser.yy (modified) (11 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 16:56:28 2016
-// Update Count     : 1694
+// Last Modified On : Thu Aug  4 11:28:18 2016
+// Update Count     : 1672
 //
 
@@ -119 +119 @@
         LabelNode *label;
         InitializerNode *in;
-        OperatorNode::Type op;
         bool flag;
 }
@@ -130 +129 @@
 %type<constant> constant
 %type<en> tuple                                                 tuple_expression_list
-%type<op> ptrref_operator
-%type<en> unary_operator                                assignment_operator
+%type<en> ptrref_operator                               unary_operator                          assignment_operator
 %type<en> primary_expression                    postfix_expression                      unary_expression
 %type<en> cast_expression                               multiplicative_expression       additive_expression                     shift_expression
@@ -362 +360 @@
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
         | postfix_expression '.' no_attr_identifier
-                { $$ = new CompositeExprNode2( build_fieldSel( $1, new VarRefNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), $1, new VarRefNode( $3 )); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
         | postfix_expression ARROW no_attr_identifier
-                { $$ = new CompositeExprNode2( build_pfieldSel( $1, new VarRefNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), $1, new VarRefNode( $3 )); }
         | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
         | postfix_expression ICR
@@ -412 +410 @@
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
         | no_attr_identifier '.' field
-                { $$ = new CompositeExprNode2( build_fieldSel( $3, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( $1 ), $3 ); }
         | no_attr_identifier '.' '[' push field_list pop ']'
-                { $$ = new CompositeExprNode2( build_fieldSel( $5, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( $1 ), $5 ); }
         | no_attr_identifier ARROW field
-                { $$ = new CompositeExprNode2( build_pfieldSel( $3, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( $1 ), $3 ); }
         | no_attr_identifier ARROW '[' push field_list pop ']'
-                { $$ = new CompositeExprNode2( build_pfieldSel( $5, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( $1 ), $5 ); }
         ;
 
@@ -432 +430 @@
                 { $$ = $2->set_extension( true ); }
         | ptrref_operator cast_expression                                       // CFA
-        { $$ = $1 == OperatorNode::AddressOf ? (ExpressionNode*) new CompositeExprNode2( build_addressOf( $2 ) ) : (ExpressionNode*)new CompositeExprNode( new OperatorNode ( $1 ), $2 ); }
+                { $$ = new CompositeExprNode( $1, $2 ); }
                 // '*' ('&') is separated from unary_operator because of shift/reduce conflict in:
                 //              { * X; }         // dereference X
@@ -443 +441 @@
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Decr ), $2 ); }
         | SIZEOF unary_expression
-                { $$ = new CompositeExprNode2( build_sizeOf( $2 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), $2 ); }
         | SIZEOF '(' type_name_no_function ')'
-                { $$ = new CompositeExprNode2( build_sizeOf( new TypeValueNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( $3 )); }
         | OFFSETOF '(' type_name_no_function ',' no_attr_identifier ')'
-                { $$ = new CompositeExprNode2( build_offsetOf( new TypeValueNode( $3 ), new VarRefNode( $5 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( $3 ), new VarRefNode( $5 )); }
         | ATTR_IDENTIFIER
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 )); }
@@ -455 +453 @@
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 ), $3 ); }
         | ALIGNOF unary_expression                                                      // GCC, variable alignment
-                { $$ = new CompositeExprNode2( build_alignOf( $2 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), $2 ); }
         | ALIGNOF '(' type_name_no_function ')'                         // GCC, type alignment
-                { $$ = new CompositeExprNode2( build_alignOf( new TypeValueNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( $3 ) ); }
 //      | ANDAND IDENTIFIER                                                                     // GCC, address of label
 //              { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::LabelAddress ), new VarRefNode( $2, true ) ); }
@@ -463 +461 @@
 
 ptrref_operator:
-        '*'                                                                                     { $$ = OperatorNode::PointTo; }
-        | '&'                                                                           { $$ = OperatorNode::AddressOf; }
+        '*'                                                                                     { $$ = new OperatorNode( OperatorNode::PointTo ); }
+        | '&'                                                                           { $$ = new OperatorNode( OperatorNode::AddressOf ); }
                 // GCC, address of label must be handled by semantic check for ref,ref,label
-        | ANDAND                                                                        { $$ = OperatorNode::And; }
+        | ANDAND                                                                        { $$ = new OperatorNode( OperatorNode::And ); }
         ;
 
@@ -479 +477 @@
         unary_expression
         | '(' type_name_no_function ')' cast_expression
-                { $$ = new CompositeExprNode2( build_cast( new TypeValueNode( $2 ), $4 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( $2 ), $4 ); }
         | '(' type_name_no_function ')' tuple
-                { $$ = new CompositeExprNode2( build_cast( new TypeValueNode( $2 ), $4 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( $2 ), $4 ); }
         ;
 
@@ -744 +742 @@
 case_value_list:                                                                                // CFA
         case_value                                                                      { $$ = new StatementNode( StatementNode::Case, $1, 0 ); }
-                // convert case list, e.g., "case 1, 3, 5:" into "case 1: case 3: case 5"
         | case_value_list ',' case_value                        { $$ = (StatementNode *)($1->set_link( new StatementNode( StatementNode::Case, $3, 0 ) ) ); }
         ;