Changeset 2909b51 for src/SynTree/Expression.h

Timestamp:

Nov 21, 2019, 9:38:54 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0a25c34, f1397d14

Parents:

1c40091 (diff), 49d3128 (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:software/cfa/cfa-cc

File:

• src/SynTree/Expression.h (modified) (1 diff)

src/SynTree/Expression.h

@@ -575 +575 @@
 class AsmExpr : public Expression {
   public:
-        Expression * inout;
+        std::string inout;
         Expression * constraint;
         Expression * operand;
 
-        AsmExpr( Expression * inout, Expression * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
+        AsmExpr( const std::string * _inout, Expression * constraint, Expression * operand ) : inout( _inout ? *_inout : "" ), constraint( constraint ), operand( operand ) { delete _inout; }
         AsmExpr( const AsmExpr & other );
-        virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
-
-        Expression * get_inout() const { return inout; }
-        void set_inout( Expression * newValue ) { inout = newValue; }
-
-        Expression * get_constraint() const { return constraint; }
-        void set_constraint( Expression * newValue ) { constraint = newValue; }
-
-        Expression * get_operand() const { return operand; }
-        void set_operand( Expression * newValue ) { operand = newValue; }
+        virtual ~AsmExpr() { delete constraint; delete operand; };
 
         virtual AsmExpr * clone() const override { return new AsmExpr( * this ); }