Changes in src/AST/Expr.hpp [312029a:e67991f]

File:

• src/AST/Expr.hpp (modified) (4 diffs)

src/AST/Expr.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri May 10 10:30:00 2019
-// Last Modified By : Peter A. Buhr
+// Last Modified By : Aaron B. Moss
 // Created On       : Fri May 10 10:30:00 2019
-// Update Count     : 7
+// Update Count     : 1
 //
 
@@ -26 +26 @@
 #include "Fwd.hpp"        // for UniqueId
 #include "Label.hpp"
-#include "Decl.hpp"
 #include "ParseNode.hpp"
 #include "Visitor.hpp"
@@ -301 +300 @@
 public:
         ptr<Expr> arg;
-        ast::AggregateDecl::Aggregate target;
-
-        KeywordCastExpr( const CodeLocation & loc, const Expr * a, ast::AggregateDecl::Aggregate t )
+        enum Target { Coroutine, Thread, Monitor, NUMBER_OF_TARGETS } target;
+
+        KeywordCastExpr( const CodeLocation & loc, const Expr * a, Target t )
         : Expr( loc ), arg( a ), target( t ) {}
 
         /// Get a name for the target type
-        const char * targetString() const;
+        const std::string& targetString() const;
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -557 +556 @@
 class AsmExpr final : public Expr {
 public:
-        std::string inout;
+        ptr<Expr> inout;
         ptr<Expr> constraint;
         ptr<Expr> operand;
 
-        AsmExpr( const CodeLocation & loc, const std::string & io, const Expr * con, const Expr * op )
+        AsmExpr( const CodeLocation & loc, const Expr * io, const Expr * con, const Expr * op )
         : Expr( loc ), inout( io ), constraint( con ), operand( op ) {}