From 1bf9034de882d364390e8887945a150bfb3873c1 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 15 Mar 2009 05:50:11 +0000 Subject: Clean up ATuple, AType, Exp. git-svn-id: http://svn.drobilla.net/resp/tuplr@98 ad02d1e2-f140-0410-9f75-f8b11f17cedd --- llvm.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'llvm.cpp') diff --git a/llvm.cpp b/llvm.cpp index 7cfb3b0..871fa18 100644 --- a/llvm.cpp +++ b/llvm.cpp @@ -240,7 +240,7 @@ AClosure::liftCall(CEnv& cenv, const vector& argsT) { TEnv::GenericTypes::const_iterator gt = cenv.tenv.genericTypes.find(this); assert(gt != cenv.tenv.genericTypes.end()); - AType* genericType = new AType(*gt->second, gt->second->loc); + AType* genericType = new AType(*gt->second); // Find type and build substitution assert(argsT.size() == prot()->size()); @@ -589,7 +589,7 @@ eval(CEnv& cenv, const string& name, istream& is) try { while (true) { SExp exp = readExpression(cursor, is); - if (exp.type == SExp::LIST && exp.list.empty()) + if (exp.type == SExp::LIST && exp.empty()) break; result = cenv.penv.parse(exp); // Parse input @@ -607,7 +607,7 @@ eval(CEnv& cenv, const string& name, istream& is) if (!ctype) throw Error("body has non-compilable type", cursor); // Create function for top-level of program - Function* f = compileFunction(cenv, "main", ctype, ATuple()); + Function* f = compileFunction(cenv, "main", ctype, ATuple(cursor)); // Compile all expressions into it Value* val = NULL; @@ -637,7 +637,7 @@ repl(CEnv& cenv) try { SExp exp = readExpression(cursor, std::cin); - if (exp.type == SExp::LIST && exp.list.empty()) + if (exp.type == SExp::LIST && exp.empty()) break; AST* body = cenv.penv.parse(exp); // Parse input @@ -660,7 +660,7 @@ repl(CEnv& cenv) if (lltype(bodyT)) { // Create anonymous function to insert code into - Function* f = compileFunction(cenv, cenv.gensym("_repl"), lltype(bodyT), ATuple()); + Function* f = compileFunction(cenv, cenv.gensym("_repl"), lltype(bodyT), ATuple(cursor)); try { Value* retVal = LLVal(cenv.compile(body)); llengine(cenv)->builder.CreateRet(retVal); // Finish function -- cgit v1.2.1