Changeset f678663e for src/SynTree/Expression.cc

Timestamp:

Jul 30, 2015, 4:08:34 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, string, with_gc

Children:

8c84ebd, ae4c85a

Parents:

5aa708c (diff), 093f1a0 (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 /u/cforall/software/cfa/cfa-cc

Conflicts:

src/main.cc

File:

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

src/SynTree/Expression.cc

@@ -10 +10 @@
 // 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 On : Tue Jul 28 16:27:17 2015
+// Update Count     : 22
 //
 
@@ -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 );
 }
@@ -332 +332 @@
 }
 
+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;