More CPS conversion work.

git-svn-id: http://svn.drobilla.net/resp/tuplr@150 ad02d1e2-f140-0410-9f75-f8b11f17cedd

1 files changed, 6 insertions, 4 deletions

diff --git a/tuplr.cpp b/tuplr.cpp
index 5b1a357..52d8b7d 100644
--- a/tuplr.cpp
+++ b/tuplr.cpp
@@ -265,11 +265,13 @@ eval(CEnv& cenv, const string& name, istream& is)
 
 		// Create function for top-level of program
 		CFunction f = cenv.engine()->startFunction(cenv, "main", resultType, ATuple(cursor));
-		
+
 		// Print CPS form
 		CValue val = NULL;
-		/*for (list< pair<SExp, AST*> >::const_iterator i = exprs.begin(); i != exprs.end(); ++i)
-			cout << "CPS: " << i->second->cps(cenv.tenv, cenv.penv.sym("cont")) << endl;*/
+		/*for (list< pair<SExp, AST*> >::const_iterator i = exprs.begin(); i != exprs.end(); ++i) {
+			cout << "CPS: " << endl;
+			pprint(cout, i->second->cps(cenv.tenv, cenv.penv.sym("cont")));
+		}*/
 
 		// Compile all expressions into it
 		for (list< pair<SExp, AST*> >::const_iterator i = exprs.begin(); i != exprs.end(); ++i)
@@ -319,7 +321,7 @@ repl(CEnv& cenv)
 			CFunction f = NULL;
 			try {
 				// Create anonymous function to insert code into
-				f = cenv.engine()->startFunction(cenv, cenv.gensym("_repl"), bodyT, ATuple(cursor));
+				f = cenv.engine()->startFunction(cenv, cenv.penv.gensymstr("_repl"), bodyT, ATuple(cursor));
 				CValue retVal = cenv.compile(body);
 				cenv.engine()->finishFunction(cenv, f, retVal);
 				cenv.out << cenv.engine()->call(cenv, f, bodyT);