Changeset 417117e for src/AST

Timestamp:

Jun 28, 2019, 3:50:21 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

03bf5c8

Parents:

55b6476

Message:

Assorted cleanup

Location:

src/AST

Files:

• Eval.hpp (added)
• Expr.cpp (modified) (3 diffs)
• Pass.impl.hpp (modified) (2 diffs)
• TypeSubstitution.cpp (modified) (1 diff)

src/AST/Expr.cpp

@@ -20 +20 @@
 #include <vector>
 
+#include "Eval.hpp"                // for call
 #include "GenericSubstitution.hpp"
 #include "Stmt.hpp"
@@ -51 +52 @@
         assert( arg );
 
-        UntypedExpr * ret = new UntypedExpr{
-                loc, new NameExpr{loc, "*?"}, std::vector<ptr<Expr>>{ ptr<Expr>{ arg } }
-        };
+        UntypedExpr * ret = call( loc, "*?", arg );
         if ( const Type * ty = arg->result ) {
                 const Type * base = InitTweak::getPointerBase( ty );
@@ -74 +73 @@
         assert( lhs && rhs );
 
-        UntypedExpr * ret = new UntypedExpr{
-                loc, new NameExpr{loc, "?=?"}, std::vector<ptr<Expr>>{ ptr<Expr>{ lhs }, ptr<Expr>{ rhs } }
-        };
+        UntypedExpr * ret = call( loc, "?=?", lhs, rhs );
         if ( lhs->result && rhs->result ) {
                 // if both expressions are typed, assumes that this assignment is a C bitwise assignment,

src/AST/Pass.impl.hpp

@@ -1920 +1920 @@
                                 guard_symtab guard { *this };
                                 auto new_node = p.second->accept( *this );
-                                if (new_node != p.second) mutated = false;
+                                if (new_node != p.second) mutated = true;
                                 new_map.insert({ p.first, new_node });
                         }
@@ -1936 +1936 @@
                                 guard_symtab guard { *this };
                                 auto new_node = p.second->accept( *this );
-                                if (new_node != p.second) mutated = false;
+                                if (new_node != p.second) mutated = true;
                                 new_map.insert({ p.first, new_node });
                         }

src/AST/TypeSubstitution.cpp

@@ -183 +183 @@
                 // bind type variables from generic type instantiations
                 if ( auto decl = type->aggr() ) {
-                        const std::vector<ptr<TypeDecl>> &baseParameters =  decl->params;
-                        if (! type->params.empty()) {
-                                for ( const TypeDecl * tyvar : baseParameters ) {
+                        if ( ! type->params.empty() ) {
+                                for ( const TypeDecl * tyvar : decl->params ) {
                                         boundVars.insert( tyvar->name );
                                 } // for