Changeset 5d125e4 for src/Parser/parser.yy

Timestamp:

Jul 15, 2016, 10:16:47 PM (8 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, 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:

873ffb7

Parents:

5ed9061

Message:

start code allowing structures to no fields

File:

• src/Parser/parser.yy (modified) (3 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 Jul 12 17:26:32 2016
-// Update Count     : 1659
+// Last Modified On : Tue Jul 12 20:52:53 2016
+// Update Count     : 1661
 //
 
@@ -1452 +1452 @@
 aggregate_name:
         aggregate_key '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, 0, 0, $3 ); }
+                { $$ = DeclarationNode::newAggregate( $1, 0, 0, $3, true ); }
         | aggregate_key no_attr_identifier_or_type_name
                 {
                         typedefTable.makeTypedef( *$2 );
-                        $$ = DeclarationNode::newAggregate( $1, $2, 0, 0 );
+                        $$ = DeclarationNode::newAggregate( $1, $2, 0, 0, false );
                 }
         | aggregate_key no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$2 ); }
                 '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5 ); }
+                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5, true ); }
         | aggregate_key '(' type_name_list ')' '{' field_declaration_list '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6 ); }
+                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6, false ); }
         | aggregate_key typegen_name                                            // CFA, S/R conflict
                 { $$ = $2; }
@@ -1476 +1476 @@
 
 field_declaration_list:
-        field_declaration
-                { $$ = $1; }
+        // empty
+                { $$ = 0; }
         | field_declaration_list field_declaration
-                { $$ = $1->appendList( $2 ); }
+                { $$ = $1 != 0 ? $1->appendList( $2 ) : $2; }
         ;