Changeset 9802f4c for src/AST

Timestamp:

Nov 21, 2019, 10:52:18 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

71d6bd8

Parents:

f2d1335 (diff), 665f432 (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' into new-ast

Location:

src/AST

Files:

• Convert.cpp (modified) (2 diffs)
• Expr.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -898 +898 @@
                 auto expr = visitBaseExpr( node,
                         new AsmExpr(
-                                get<Expression>().accept1(node->inout),
+                                new std::string(node->inout),
                                 get<Expression>().accept1(node->constraint),
                                 get<Expression>().accept1(node->operand)
@@ -2270 +2270 @@
                         new ast::AsmExpr(
                                 old->location,
-                                GET_ACCEPT_1(inout, Expr),
+                                old->inout,
                                 GET_ACCEPT_1(constraint, Expr),
                                 GET_ACCEPT_1(operand, Expr)

src/AST/Expr.hpp

@@ -583 +583 @@
 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 ) {}
 

src/AST/Pass.impl.hpp

@@ -1315 +1315 @@
                         maybe_accept( node, &AsmExpr::result );
                 }
-                maybe_accept( node, &AsmExpr::inout      );
                 maybe_accept( node, &AsmExpr::constraint );
                 maybe_accept( node, &AsmExpr::operand    );

src/AST/Print.cpp

@@ -1011 +1011 @@
                 os << "Asm Expression:" << endl;
                 ++indent;
-                if ( node->inout ) node->inout->accept( *this );
+                if ( !node->inout.empty() ) os << "[" << node->inout << "] ";
                 if ( node->constraint ) node->constraint->accept( *this );
                 if ( node->operand ) node->operand->accept( *this );