Simplify Engine function compilation interface.

Removes duplicated code in various backends and reduces Engine code
knowledge of AFn specifics (which belongs in compile.cpp).


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

1 files changed, 20 insertions, 1 deletions

diff --git a/src/compile.cpp b/src/compile.cpp
index 66c3abe..f954b8e 100644
--- a/src/compile.cpp
+++ b/src/compile.cpp
@@ -67,7 +67,26 @@ AFn::compile(CEnv& cenv) const throw()
 	if (f)
 		return f;
 	
-	f = cenv.engine()->compileFunction(cenv, this, type);
+	// Write function declaration
+	f = cenv.engine()->startFunction(cenv, name, prot(), type);
+
+	// Create a new environment frame and bind argument values
+	cenv.engine()->pushFunctionArgs(cenv, this, type, f);
+	assert(!cenv.currentFn);
+	cenv.currentFn = f;
+
+	// Write function body
+	CVal retVal = NULL;
+	for (AFn::const_iterator i = begin() + 2; i != end(); ++i)
+		retVal = (*i)->compile(cenv);
+
+	// Write function conclusion
+	cenv.engine()->finishFunction(cenv, f, retVal);
+
+	// Pop environment frame
+	cenv.pop();
+	cenv.currentFn = NULL;
+	
 	cenv.vals.def(cenv.penv.sym(name), f);
 	cenv.addImpl(this, f);
 	return f;