Changeset bac5158 for src/Parser/parser.yy

Timestamp:

Jul 15, 2017, 9:47:54 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

478b1d0

Parents:

994d080 (diff), 6ea87486 (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:

fix conflict

File:

• src/Parser/parser.yy (modified) (2 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 : Sat Jul 15 08:17:48 2017
-// Update Count     : 2450
+// Last Modified On : Sat Jul 15 09:46:26 2017
+// Update Count     : 2451
 //
 
@@ -1679 +1679 @@
         | aggregate_key attribute_list_opt typegen_name         // CFA
                 { $$ = $3->addQualifiers( $2 ); }
+
+// Temp, testing TreeStruct
+    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name
+        {
+            typedefTable.makeTypedef( *$4 );            // create typedef
+            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
+            forall = false;                             // reset
+        }
+      '{' field_declaration_list '}'
+        {
+            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
+                $4, nullptr, nullptr, $7, true )->addQualifiers( $3 );
+        }
+    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name TYPEDEFname
+        {
+            typedefTable.makeTypedef( *$4 );            // create typedef
+            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
+            forall = false;                             // reset
+        }
+      '{' field_declaration_list '}'
+        {
+            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
+                $4, $5, nullptr, $8, true )->addQualifiers( $3 );
+        }
         ;