Clean up function compilation stuff.

Add some utilities to for using named types.


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

1 files changed, 15 insertions, 13 deletions

diff --git a/src/llvm.cpp b/src/llvm.cpp
index 0dfbc69..32aedf7 100644
--- a/src/llvm.cpp
+++ b/src/llvm.cpp
@@ -124,12 +124,15 @@ struct LLVMEngine : public Engine {
 			}
 
 			return PointerType::get(StructType::get(context, ctypes, false), 0);
+		} else if (t->kind == AType::NAME) {
+			assert(false);
 		}
+		assert(false);
 		return PointerType::get(Type::getInt8Ty(context), NULL);
 	}
 
-	CFunc startFunction(CEnv& cenv,
-			const std::string& name, const ATuple* args, const AType* type)
+	CFunc startFunction(
+		CEnv& cenv, const std::string& name, const ATuple* args, const AType* type)
 	{
 		const AType* argsT = type->prot()->as_type();
 		const AType* retT  = type->list_last()->as_type();
@@ -166,7 +169,7 @@ struct LLVMEngine : public Engine {
 		return f;
 	}
 	
-	void pushFunctionArgs(CEnv& cenv, const ATuple* fn, const AType* type, CFunc f);
+	void pushFunctionArgs(CEnv& cenv, const ATuple* prot, const AType* type, CFunc f);
 
 	void appendBlock(LLVMEngine* engine, Function* function, BasicBlock* block) {
 		function->getBasicBlockList().push_back(block);
@@ -349,22 +352,21 @@ LLVMEngine::compileString(CEnv& cenv, const char* str)
 }
 
 void
-LLVMEngine::pushFunctionArgs(CEnv& cenv, const ATuple* fn, const AType* type, CFunc f)
+LLVMEngine::pushFunctionArgs(CEnv& cenv, const ATuple* prot, const AType* type, CFunc cfunc)
 {
 	cenv.push();
 
 	const AType* argsT = type->prot()->as_type();
-
+	Function*    f     = llFunc(cfunc);
+	
 	// Bind argument values in CEnv
-	vector<Value*> args;
-	ATuple::const_iterator p  = fn->prot()->begin();
+	ATuple::const_iterator p  = prot->begin();
 	ATuple::const_iterator pT = argsT->begin();
-	assert(fn->prot()->size() == argsT->size());
-	assert(fn->prot()->size() == f->num_args());
-	for (Function::arg_iterator a = llFunc(f)->arg_begin(); a != llFunc(f)->arg_end(); ++a, ++p, ++pT) {
-		const AType* t  = (*pT)->as_type();
-		const Type*  lt = llType(t);
-		THROW_IF(!lt, fn->loc, "untyped parameter\n");
+	assert(prot->size() == argsT->size());
+	assert(prot->size() == f->num_args());
+	for (Function::arg_iterator a = f->arg_begin(); a != f->arg_end(); ++a, ++p, ++pT) {
+		const AType* t  = cenv.resolveType((*pT)->as_type());
+		THROW_IF(!llType(t), (*p)->loc, "untyped parameter\n");
 		cenv.def((*p)->as_symbol(), *p, t, &*a);
 	}
 }