Changeset f87408e for src/Parser/StatementNode.cc

Timestamp:

Aug 22, 2016, 3:32:07 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

79970ed

Parents:

e85a8631 (diff), bd9f8be (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' into ctor

File:

• src/Parser/StatementNode.cc (modified) (2 diffs)

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 15 20:47:11 2016
-// Update Count     : 322
+// Last Modified On : Sun Aug 21 11:59:37 2016
+// Update Count     : 325
 //
 
@@ -137 +137 @@
 }
 
-Statement *build_branch( std::string identifier, BranchStmt::Type kind ) {
-        return new BranchStmt( noLabels, identifier, kind );
+Statement *build_branch( BranchStmt::Type kind ) {
+        Statement * ret = new BranchStmt( noLabels, "", kind );
+        return ret;
+}
+Statement *build_branch( std::string *identifier, BranchStmt::Type kind ) {
+        Statement * ret = new BranchStmt( noLabels, *identifier, kind );
+        delete identifier;                                                                      // allocated by lexer
+        return ret;
 }
 Statement *build_computedgoto( ExpressionNode *ctl ) {