Changeset a073d46 for src/Parser/DeclarationNode.cc

Timestamp:

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

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/DeclarationNode.cc (modified) (6 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  6 16:01:29 2017
-// Update Count     : 739
+// Last Modified On : Thu Feb  9 14:48:40 2017
+// Update Count     : 741
 //
 
@@ -56 +56 @@
                 asmName( nullptr ),
                 initializer( nullptr ),
-                extension( false ) {
+                extension( false ),
+                asmStmt( nullptr ) {
 
 //      variable.name = nullptr;
@@ -77 +78 @@
         delete type;
         delete bitfieldWidth;
+
+        delete asmStmt;
         // asmName, no delete, passed to next stage
         delete initializer;
@@ -98 +101 @@
         newnode->initializer = maybeClone( initializer );
         newnode->extension = extension;
+        newnode->asmStmt = maybeClone( asmStmt );
         newnode->error = error;
 
@@ -411 +415 @@
         newnode->attributes.push_back( new Attribute( *name, exprs ) );
         delete name;
+        return newnode;
+}
+
+DeclarationNode * DeclarationNode::newAsmStmt( StatementNode * stmt ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->asmStmt = stmt;
         return newnode;
 }
@@ -980 +990 @@
 Declaration * DeclarationNode::build() const {
         if ( ! error.empty() ) throw SemanticError( error + " in declaration of ", this );
+
+        if ( asmStmt ) {
+                return new AsmDecl( safe_dynamic_cast<AsmStmt *>( asmStmt->build() ) );
+        } // if
 
 //      if ( variable.name ) {