Changeset 9a8930f for src/SynTree

Timestamp:

Jun 4, 2015, 2:07:40 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

0423f25, eb3261f

Parents:

a61fea9a (diff), 1136d96 (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:

enable AM_MAINTAINER_MODE, add operator ?{}, formatting

Location:

src/SynTree

Files:

• Mutator.h (modified) (2 diffs)
• ObjectDecl.cc (modified) (2 diffs)
• Statement.cc (modified) (2 diffs)
• Statement.h (modified) (2 diffs)

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:12:28 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 29 16:34:08 2015
+// Update Count     : 4
 //
 #include <cassert>
@@ -104 +104 @@
                 assert( newnode );
                 return newnode;
-///         return tree->acceptMutator( mutator );
         } else {
                 return 0;

src/SynTree/ObjectDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:14:18 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu May 28 14:10:02 2015
+// Update Count     : 8
 //
 
@@ -65 +65 @@
 
 void ObjectDecl::printShort( std::ostream &os, int indent ) const {
+#if 0
+        if ( get_mangleName() != "") {
+                os << get_mangleName() << ": a "; 
+        } else 
+#endif
         if ( get_name() != "" ) {
                 os << get_name() << ": a ";

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 15:41:13 2015
-// Update Count     : 8
+// Last Modified On : Tue Jun 02 13:07:09 2015
+// Update Count     : 14
 //
 
@@ -124 +124 @@
 CaseStmt::~CaseStmt() {
         delete condition;
+}
+
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
+        return new CaseStmt( labels, 0, branches, true );
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  3 11:55:15 2015
-// Update Count     : 6
+// Last Modified On : Thu Jun  4 14:03:31 2015
+// Update Count     : 14
 //
 
@@ -149 +149 @@
               std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         virtual ~CaseStmt();
+
+        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(),
+                std::list<Statement *> stmts = std::list<Statement *>() );
 
         bool isDefault() { return _isDefault; }