Changeset b3c7963 for src/SynTree/Expression.h

Timestamp:

Sep 12, 2017, 5:55:31 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

4639b0d

Parents:

a506df4 (diff), a46478a (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/SynTree/Expression.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug  8 11:54:00 2017
-// Update Count     : 44
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 19:23:46 2017
+// Update Count     : 48
 //
+
 #pragma once
 
@@ -539 +540 @@
   public:
         Expression * inout;
-        ConstantExpr * constraint;
+        Expression * constraint;
         Expression * operand;
 
-        AsmExpr( Expression * inout, ConstantExpr * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
+        AsmExpr( Expression * inout, Expression * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
         AsmExpr( const AsmExpr & other );
         virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
@@ -549 +550 @@
         void set_inout( Expression * newValue ) { inout = newValue; }
 
-        ConstantExpr * get_constraint() const { return constraint; }
-        void set_constraint( ConstantExpr * newValue ) { constraint = newValue; }
+        Expression * get_constraint() const { return constraint; }
+        void set_constraint( Expression * newValue ) { constraint = newValue; }
 
         Expression * get_operand() const { return operand; }