Changeset 665f432 for src/AST

Timestamp:

Nov 20, 2019, 6:55:39 PM (5 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:

1a69a90, 9802f4c

Parents:

57c764c

Message:

Fixed trac #149 where operand names in asm statements where incorrectly resolved (i.e., should not have been resolved)

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

@@ -887 +887 @@
                 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)
@@ -2258 +2258 @@
                         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

@@ -556 +556 @@
 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

@@ -1300 +1300 @@
                         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 );