Changes in src/Parser/parser.yy [51b1202:1db21619]

File:

• src/Parser/parser.yy (modified) (15 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 : Tue Aug 11 16:01:49 2015
-// Update Count     : 1350
+// Last Modified On : Thu Jul 16 16:25:12 2015
+// Update Count     : 1267
 // 
 
@@ -115 +115 @@
         StatementNode *sn;
         ConstantNode *constant;
-        LabelNode *label;
         InitializerNode *in;
-        bool flag;
 }
 
@@ -136 +134 @@
 %type<en> argument_expression_list              argument_expression                     for_control_expression          assignment_opt
 %type<en> subrange
-%type<en> asm_operands_opt asm_operands_list asm_operand
-%type<label> label_list
-%type<constant> asm_clobbers_list_opt
-%type<flag> asm_volatile_opt
 
 // statements
@@ -338 +332 @@
         | zero_one
                 { $$ = new VarRefNode( $1 ); }
+        | constant
+                { $$ = $1; }
+        | string_literal_list
+                { $$ = $1; }
         | '(' comma_expression ')'
                 { $$ = $2; }
@@ -380 +378 @@
         | assignment_expression
         | no_attr_identifier ':' assignment_expression
-                { $$ = $3->set_argName( $1 ); }
+                { $$ = $3->set_asArgName( $1 ); }
                 // Only a list of no_attr_identifier_or_type_name is allowed in this context. However, there is insufficient
                 // look ahead to distinguish between this list of parameter names and a tuple, so the tuple form must be used
                 // with an appropriate semantic check.
         | '[' push assignment_expression pop ']' ':' assignment_expression
-                { $$ = $7->set_argName( $3 ); }
+                { $$ = $7->set_asArgName( $3 ); }
         | '[' push assignment_expression ',' tuple_expression_list pop ']' ':' assignment_expression
-                { $$ = $9->set_argName( new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)$3->set_link( flattenCommas( $5 )))); }
+                { $$ = $9->set_asArgName( new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)$3->set_link( flattenCommas( $5 )))); }
         ;
 
@@ -410 +408 @@
 unary_expression:
         postfix_expression
-        // first location where constant/string can have operator applied: sizeof 3/sizeof "abc"
-        // still requires semantics checks, e.g., ++3, 3--, *3, &&3
-        | constant
-                { $$ = $1; }
-        | string_literal_list
-                { $$ = $1; }
         | ICR unary_expression
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Incr ), $2 ); }
@@ -643 +635 @@
                 // requires its own scope
           push push
-          local_label_declaration_opt                                           // GCC, local labels
+          label_declaration_opt                                                         // GCC, local labels
           block_item_list pop '}'                                                       // C99, intermix declarations and statements
                 { $$ = new CompoundStmtNode( $5 ); }
@@ -762 +754 @@
 
 fall_through:                                                                                   // CFA
-        FALLTHRU                                                                        { $$ = new StatementNode( StatementNode::Fallthru ); }
-        | FALLTHRU ';'                                                          { $$ = new StatementNode( StatementNode::Fallthru ); }
+        FALLTHRU                                                                        { $$ = new StatementNode( StatementNode::Fallthru, 0, 0 ); }
+        | FALLTHRU ';'                                                          { $$ = new StatementNode( StatementNode::Fallthru, 0, 0 ); }
         ;
 
@@ -791 +783 @@
         | CONTINUE ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Continue ); }
+                { $$ = new StatementNode( StatementNode::Continue, 0, 0 ); }
         | CONTINUE no_attr_identifier ';'                                       // CFA, multi-level continue
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
@@ -798 +790 @@
         | BREAK ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Break ); }
+                { $$ = new StatementNode( StatementNode::Break, 0, 0 ); }
         | BREAK no_attr_identifier ';'                                          // CFA, multi-level exit
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
@@ -808 +800 @@
                 { $$ = new StatementNode( StatementNode::Throw, $2, 0 ); }
         | THROW ';'
-                { $$ = new StatementNode( StatementNode::Throw ); }
+                { $$ = new StatementNode( StatementNode::Throw, 0, 0 ); }
         ;
 
@@ -871 +863 @@
 
 asm_statement:
-        ASM asm_volatile_opt '(' string_literal_list ')' ';'
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, 0 ); }
-        | ASM asm_volatile_opt '(' string_literal_list ':' asm_operands_opt ')' ';' // remaining GCC
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, $6 ); }
-        | ASM asm_volatile_opt '(' string_literal_list ':' asm_operands_opt ':' asm_operands_opt ')' ';'
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, $6, $8 ); }
-        | ASM asm_volatile_opt '(' string_literal_list ':' asm_operands_opt ':' asm_operands_opt ':' asm_clobbers_list_opt ')' ';'
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, $6, $8, $10 ); }
-        | ASM asm_volatile_opt GOTO '(' string_literal_list ':' ':' asm_operands_opt ':' asm_clobbers_list_opt ':' label_list ')' ';'
-        { $$ = new AsmStmtNode( StatementNode::Asm, $2, $5, 0, $8, $10, $12 ); }
-        ;
-
-asm_volatile_opt:                                                                               // GCC
-        // empty
-                { $$ = false; }
-        | VOLATILE
-                { $$ = true; }
+        ASM type_qualifier_list_opt '(' constant_expression ')' ';'
+                { $$ = new StatementNode( StatementNode::Asm, 0, 0 ); }
+        | ASM type_qualifier_list_opt '(' constant_expression ':' asm_operands_opt ')' ';' // remaining GCC
+                { $$ = new StatementNode( StatementNode::Asm, 0, 0 ); }
+        | ASM type_qualifier_list_opt '(' constant_expression ':' asm_operands_opt ':' asm_operands_opt ')' ';'
+                { $$ = new StatementNode( StatementNode::Asm, 0, 0 ); }
+        | ASM type_qualifier_list_opt '(' constant_expression ':' asm_operands_opt ':' asm_operands_opt ':' asm_clobbers_list ')' ';'
+                { $$ = new StatementNode( StatementNode::Asm, 0, 0 ); }
         ;
 
 asm_operands_opt:                                                                               // GCC
         // empty
-                { $$ = 0; }                                                                             // use default argument
         | asm_operands_list
         ;
@@ -899 +881 @@
         asm_operand
         | asm_operands_list ',' asm_operand
-                { $$ = (ExpressionNode *)$1->set_link( $3 ); }
         ;
 
 asm_operand:                                                                                    // GCC
-        string_literal_list '(' constant_expression ')'
-                { $$ = new AsmExprNode( 0, $1, $3 ); }
-        | '[' constant_expression ']' string_literal_list '(' constant_expression ')'
-                { $$ = new AsmExprNode( $2, $4, $6 ); }
-        ;
-
-asm_clobbers_list_opt:                                                                          // GCC
-        // empty
-                { $$ = 0; }                                                                             // use default argument
-        | string_literal_list
-                { $$ = $1; }
-        | asm_clobbers_list_opt ',' string_literal_list
-                { $$ = (ConstantNode *)$1->set_link( $3 ); }
-        ;
-
-label_list:
-        no_attr_identifier
-                { $$ = new LabelNode(); $$->append_label( $1 ); }
-        | label_list ',' no_attr_identifier
-                { $$ = $1; $1->append_label( $3 ); }
+        STRINGliteral '(' constant_expression ')'       {}
+        ;
+
+asm_clobbers_list:                                                                              // GCC
+        STRINGliteral                                                           {}
+        | asm_clobbers_list ',' STRINGliteral
         ;
 
@@ -951 +918 @@
         ;
 
-local_label_declaration_opt:                                                    // GCC, local label
+label_declaration_opt:                                                                  // GCC, local label
         // empty
-        | local_label_declaration_list
-        ;
-
-local_label_declaration_list:                                                   // GCC, local label
-        LABEL local_label_list ';'
-        | local_label_declaration_list LABEL local_label_list ';'
-        ;
-
-local_label_list:                                                                               // GCC, local label
-        no_attr_identifier_or_type_name                         {}
-        | local_label_list ',' no_attr_identifier_or_type_name {}
+        | label_declaration_list
+        ;
+
+label_declaration_list:                                                                 // GCC, local label
+        LABEL label_list ';'
+        | label_declaration_list LABEL label_list ';'
+        ;
+
+label_list:                                                                                             // GCC, local label
+        no_attr_identifier_or_type_name                 {}
+        | label_list ',' no_attr_identifier_or_type_name {}
         ;
 
@@ -1693 +1660 @@
 
 designator:
-        // only ".0" and ".1" allowed => semantic check
-        FLOATINGconstant
-                { $$ = new DesignatorNode( new VarRefNode( $1 ) ); }
-        | '.' no_attr_identifier_or_type_name                           // C99, field name
-                { $$ = new DesignatorNode( new VarRefNode( $2 ) ); }
+        '.' no_attr_identifier_or_type_name                                     // C99, field name
+                { $$ = new VarRefNode( $2 ); }
         | '[' push assignment_expression pop ']'                        // C99, single array element
                 // assignment_expression used instead of constant_expression because of shift/reduce conflicts with tuple.
-                { $$ = new DesignatorNode( $3, true ); }
+                { $$ = $3; }
         | '[' push subrange pop ']'                                                     // CFA, multiple array elements
-                { $$ = new DesignatorNode( $3, true ); }
+                { $$ = $3; }
         | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements
-                { $$ = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), $3, $5 ), true ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), $3, $5 ); }
         | '.' '[' push field_list pop ']'                                       // CFA, tuple field selector
-                { $$ = new DesignatorNode( $4 ); }
+                { $$ = $4; }
         ;