Changeset 84b08d4 for src/Parser/parser.yy

Timestamp:

Nov 18, 2015, 12:50:56 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

9ed3237

Parents:

0800284 (diff), 50eac1b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'override-autogen' into ctor

File:

• src/Parser/parser.yy (modified) (10 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 : Mon Sep 28 18:18:32 2015
-// Update Count     : 1402
+// Last Modified On : Thu Oct  8 17:17:54 2015
+// Update Count     : 1473
 // 
 
@@ -104 +104 @@
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
 
+%token ATassign                                                                                 // @=
+
 // Types declaration
 %union
@@ -120 +122 @@
 }
 
-%type<tok> identifier  no_01_identifier  no_attr_identifier no_attr_identifier_01  zero_one
+%type<tok> identifier  no_01_identifier  no_attr_identifier zero_one
 %type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  no_01_identifier_or_type_name
 %type<constant> string_literal_list
@@ -143 +145 @@
 // statements
 %type<sn> labeled_statement                             compound_statement                      expression_statement            selection_statement
-%type<sn> iteration_statement                   jump_statement                          exception_statement                     asm_statement                   ctor_dtor
+%type<sn> iteration_statement                   jump_statement                          exception_statement                     asm_statement
 %type<sn> fall_through_opt                              fall_through
 %type<sn> statement                                             statement_list
@@ -317 +319 @@
         ;
 
+// no zero_one because ambiguity with 0.0 : double constant or field selection
 no_attr_identifier:
         IDENTIFIER
-        ;
-
-no_attr_identifier_01:
-        IDENTIFIER
-        | zero_one
         ;
 
@@ -369 +367 @@
         | postfix_expression DECR
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), $1 ); }
-                // GCC has priority: cast_expression
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99
                 { $$ = 0; }
+        | postfix_expression '{' argument_expression_list '}' // CFA
+                {
+                        Token fn; fn.str = new std::string( "?{}" ); // location undefined
+                        $$ = new CompositeExprNode( new VarRefNode( fn ), (ExpressionNode *)( $1 )->set_link( $3 ) );
+                }
         ;
 
@@ -632 +634 @@
         | exception_statement
         | asm_statement
-        | ctor_dtor
+        | '^' postfix_expression '{' argument_expression_list '}' ';' // CFA
+                {
+                        Token fn; fn.str = new std::string( "^?{}" ); // location undefined
+                        $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
+                                (ExpressionNode *)(new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), $2 ))->set_link( $4 ) ), 0 );
+                }
         ;
 
@@ -945 +952 @@
         ;
 
-ctor_dtor:                                                                                              // CFA, constructor/destructor
-        no_attr_identifier_01 '{' argument_expression_list '}' ';'
-                {
-                        Token fn; fn.str = new std::string( "?{}" ); fn.loc = $1.loc;
-                        $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
-                                   (ExpressionNode *)((new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), new VarRefNode( $1 ) ))->set_link( $3 )) ), 0 );
-                }
-        | '^' no_attr_identifier_01 '{' '}' ';'
-                {
-                        Token fn; fn.str = new std::string( "^?{}" ); fn.loc = $2.loc;
-                        $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
-                                   new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), new VarRefNode( $2 ) ) ), 0 );
-                }
-        ;
-
 //******************************* DECLARATIONS *********************************
 
@@ -1689 +1681 @@
         | '=' initializer
                 { $$ = $2; }
+        | ATassign initializer
+                { $$ = $2; }
         ;
 
@@ -1697 +1691 @@
 
 initializer_list:
-        initializer
+        // empty
+                { $$ = 0; }
+        | initializer
         | designation initializer                                       { $$ = $2->set_designators( $1 ); }
         | initializer_list ',' initializer                      { $$ = (InitializerNode *)( $1->set_link( $3 ) ); }