Changeset b11fac4 for src/Parser/parser.yy

Timestamp:

Apr 13, 2016, 5:40:32 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

02af22de

Parents:

02ad3f5 (diff), 45161b4d (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 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (4 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 : Fri Apr  8 16:21:55 2016
-// Update Count     : 1508
+// Last Modified On : Wed Apr 13 16:58:43 2016
+// Update Count     : 1519
 // 
 
@@ -1438 +1438 @@
                 { $$ = DeclarationNode::newAggregate( $1, 0, 0, $3 ); }
         | aggregate_key no_attr_identifier_or_type_name
-                { $$ = DeclarationNode::newAggregate( $1, $2, 0, 0 ); }
-        | aggregate_key no_attr_identifier_or_type_name '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $4 ); }
+                {
+                        typedefTable.makeTypedef( *$2 );
+                        $$ = DeclarationNode::newAggregate( $1, $2, 0, 0 );
+                }
+        | aggregate_key no_attr_identifier_or_type_name
+                { typedefTable.makeTypedef( *$2 ); }
+                '{' field_declaration_list '}'
+                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5); }
         | aggregate_key '(' type_name_list ')' '{' field_declaration_list '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6 ); }
+                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6 ); }
         | aggregate_key typegen_name                                            // CFA, S/R conflict
                 { $$ = $2; }
@@ -1520 +1525 @@
         enum_key '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( 0, $3 ); }
-        | enum_key no_attr_identifier_or_type_name '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $2, $4 ); }
         | enum_key no_attr_identifier_or_type_name
-                { $$ = DeclarationNode::newEnum( $2, 0 ); }
+                {
+                        typedefTable.makeTypedef( *$2 );
+                        $$ = DeclarationNode::newEnum( $2, 0 );
+                }
+        | enum_key no_attr_identifier_or_type_name
+                { typedefTable.makeTypedef( *$2 ); }
+                '{' enumerator_list comma_opt '}'
+                { $$ = DeclarationNode::newEnum( $2, $5 ); }
         ;
 
@@ -2813 +2823 @@
         std::cout << "Error ";
         if ( yyfilename ) {
-            std::cout << "in file " << yyfilename << " ";
+                std::cout << "in file " << yyfilename << " ";
         } // if
         std::cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << std::endl;