Changeset a073d46 for src/Parser/ParseNode.h

Timestamp:

Feb 9, 2017, 5:31:49 PM (7 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:

132fad4

Parents:

9e45e46 (diff), e994912 (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) (3 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  6 15:52:21 2017
-// Update Count     : 657
+// Last Modified On : Thu Feb  9 14:45:28 2017
+// Update Count     : 658
 //
 
@@ -251 +251 @@
         static DeclarationNode * newAttr( std::string *, DeclarationNode * type ); // @ attributes
         static DeclarationNode * newAttribute( std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
+        static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
 
         DeclarationNode();
@@ -329 +330 @@
         bool extension = false;
         std::string error;
+        StatementNode * asmStmt;
 
         static UniqueName anonymous;