Changeset 3b56166 for src/SynTree/Expression.h

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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) (4 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 : Thr Aug 15 13:46:00 2019
-// Update Count     : 54
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 16:50:19 2019
+// Update Count     : 60
 //
 
@@ -28 +28 @@
 #include "Label.h"                // for Label
 #include "Mutator.h"              // for Mutator
+#include "Declaration.h"          // for Aggregate
 #include "SynTree.h"              // for UniqueId
 #include "Visitor.h"              // for Visitor
@@ -229 +230 @@
 public:
         Expression * arg;
-        enum Target {
-                Coroutine, Thread, Monitor, NUMBER_OF_TARGETS
-        } target;
-
-        KeywordCastExpr( Expression * arg, Target target );
+        struct Concrete {
+                std::string field;
+                std::string getter;
+        };
+        AggregateDecl::Aggregate target;
+        Concrete concrete_target;
+
+        KeywordCastExpr( Expression * arg, AggregateDecl::Aggregate target );
         KeywordCastExpr( const KeywordCastExpr & other );
         virtual ~KeywordCastExpr();
 
-        const std::string & targetString() const;
+        const char * targetString() const;
 
         virtual KeywordCastExpr * clone() const override { return new KeywordCastExpr( * this ); }
@@ -575 +579 @@
 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 ); }