Changes in src/AST/Convert.cpp [7edd5c1:f6e6a55]

File:

• src/AST/Convert.cpp (modified) (5 diffs)

src/AST/Convert.cpp

@@ -93 +93 @@
         };
 
-        template<typename T>
-        Getter<T> get() {
-                return Getter<T>{ *this };
-        }
+    template<typename T>
+    Getter<T> get() {
+        return Getter<T>{ *this };
+    }
 
         Label makeLabel(Statement * labelled, const ast::Label& label) {
@@ -1651 +1651 @@
                         // GET_ACCEPT_1(type, FunctionType),
                         std::move(forall),
-                        std::move(assertions),
                         std::move(paramVars),
                         std::move(returnVars),
@@ -1665 +1664 @@
                 cache.emplace( old, decl );
 
+                decl->assertions = std::move(assertions);
                 decl->withExprs = GET_ACCEPT_V(withExprs, Expr);
                 decl->stmts = GET_ACCEPT_1(statements, CompoundStmt);
@@ -1730 +1730 @@
         }
 
-
+        // Convert SynTree::EnumDecl to AST::EnumDecl
         virtual void visit( const EnumDecl * old ) override final {
                 if ( inCache( old ) ) return;
@@ -2729 +2729 @@
                         ty->forall.emplace_back(new ast::TypeInstType(param));
                         for (auto asst : param->assertions) {
-                                ty->assertions.emplace_back(
-                                        new ast::VariableExpr(param->location, asst));
+                                ty->assertions.emplace_back(new ast::VariableExpr({}, asst));
                         }
                 }