Changeset 3d5701e for src/AST/Expr.hpp

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 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:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

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