Changeset 51b1202 for src/Parser/parser.yy

Timestamp:

Aug 11, 2015, 4:16:03 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

a3a17ba

Parents:

99f4165

Message:

move constant/string to unary_expression, temporarily separate asm and local label, introduce DesignatorNode?

File:

• src/Parser/parser.yy (modified) (6 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 Jul 30 15:29:19 2015
-// Update Count     : 1327
+// Last Modified On : Tue Aug 11 16:01:49 2015
+// Update Count     : 1350
 // 
 
@@ -338 +338 @@
         | zero_one
                 { $$ = new VarRefNode( $1 ); }
-        | constant
-                { $$ = $1; }
-        | string_literal_list
-                { $$ = $1; }
         | '(' comma_expression ')'
                 { $$ = $2; }
@@ -414 +410 @@
 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 ); }
@@ -641 +643 @@
                 // requires its own scope
           push push
-          label_declaration_opt                                                         // GCC, local labels
+          local_label_declaration_opt                                           // GCC, local labels
           block_item_list pop '}'                                                       // C99, intermix declarations and statements
                 { $$ = new CompoundStmtNode( $5 ); }
@@ -949 +951 @@
         ;
 
-label_declaration_opt:                                                                  // GCC, local label
+local_label_declaration_opt:                                                    // GCC, local label
         // empty
-        | label_declaration_list
-        ;
-
-label_declaration_list:                                                                 // GCC, local label
-        LABEL label_list ';'
-        | label_declaration_list LABEL label_list ';'
-        ;
-
-label_list:                                                                                             // GCC, local label
+        | 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                         {}
-        | label_list ',' no_attr_identifier_or_type_name {}
+        | local_label_list ',' no_attr_identifier_or_type_name {}
         ;
 
@@ -1691 +1693 @@
 
 designator:
-        '.' no_attr_identifier_or_type_name                                     // C99, field name
-                { $$ = new VarRefNode( $2 ); }
+        // 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 ) ); }
         | '[' push assignment_expression pop ']'                        // C99, single array element
                 // assignment_expression used instead of constant_expression because of shift/reduce conflicts with tuple.
-                { $$ = $3; }
+                { $$ = new DesignatorNode( $3, true ); }
         | '[' push subrange pop ']'                                                     // CFA, multiple array elements
-                { $$ = $3; }
+                { $$ = new DesignatorNode( $3, true ); }
         | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), $3, $5 ); }
+                { $$ = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), $3, $5 ), true ); }
         | '.' '[' push field_list pop ']'                                       // CFA, tuple field selector
-                { $$ = $4; }
+                { $$ = new DesignatorNode( $4 ); }
         ;