Changeset 85521c7 for src/Parser/ParseNode.h

Timestamp:

Feb 1, 2018, 5:40:01 PM (6 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:

0188a0b

Parents:

d0a045c7 (diff), 33c0ce8 (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/ParseNode.h (modified) (1 diff)

src/Parser/ParseNode.h

@@ -262 +262 @@
         DeclarationNode * addBitfield( ExpressionNode * size );
         DeclarationNode * addVarArgs();
-        DeclarationNode * addFunctionBody( StatementNode * body, StatementNode * with = nullptr );
+        DeclarationNode * addFunctionBody( StatementNode * body, ExpressionNode * with = nullptr );
         DeclarationNode * addOldDeclList( DeclarationNode * list );
         DeclarationNode * setBase( TypeData * newType );