Changeset 353d168 for src/SynTree/Expression.cc

Timestamp:

Aug 19, 2015, 3:59:45 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

830c21a

Parents:

18997b9 (diff), 4aa0858 (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 'override-autogen' into ctor

Conflicts:

src/Parser/ParseNode.h

File:

• src/SynTree/Expression.cc (modified) (4 diffs)

src/SynTree/Expression.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 : Sun Jun  7 08:40:46 2015
-// Update Count     : 16
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 14:02:45 2015
+// Update Count     : 30
 //
 
@@ -38 +38 @@
 Expression::~Expression() {
         delete env;
-        // delete argName;      // xxx -- there's a problem in cloning ConstantExpr I still don't know how to fix
+        delete argName; // xxx -- there's a problem in cloning ConstantExpr I still don't know how to fix
         deleteAll( results );
 }
@@ -72 +72 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << "constant expression " ;
+        os << std::string( indent, ' ' ) << "constant expression " ;
         constant.print( os );
         Expression::print( os, indent );
+        os << std::endl;
 }
 
@@ -332 +333 @@
 }
 
+void AsmExpr::print( std::ostream &os, int indent ) const {
+        os << "Asm Expression: " << std::endl;
+        if ( inout ) inout->print( os, indent + 2 );
+        if ( constraint ) constraint->print( os, indent + 2 );
+        if ( operand ) operand->print( os, indent + 2 );
+}
+
 void UntypedValofExpr::print( std::ostream &os, int indent ) const {
         os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;