Changeset bd9bcc8 for src/Parser/parser.yy

Timestamp:

Feb 20, 2017, 12:05:49 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3bff885

Parents:

facc44f (diff), d150ea2 (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) (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 : Thu Feb  9 15:00:03 2017
-// Update Count     : 2184
+// Last Modified On : Thu Feb 16 15:56:33 2017
+// Update Count     : 2186
 //
 
@@ -1772 +1772 @@
 
 abstract_parameter_declaration:
-        declaration_specifier
-        | declaration_specifier abstract_parameter_declarator
-                { $$ = $2->addType( $1 ); }
+        declaration_specifier assignment_opt
+                { $$ = $1->addInitializer( $2 ? new InitializerNode( $2 ) : nullptr ); }
+        | declaration_specifier abstract_parameter_declarator assignment_opt
+                { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
         ;