Refactor the interpreter so as to build upon the MLKForm class cluster.

The transition is not finished yet, so lots of things are broken right now.

1 files changed, 5 insertions, 5 deletions

diff --git a/MLKForm.m b/MLKForm.m
index c8a5416..16ab207 100644
--- a/MLKForm.m
+++ b/MLKForm.m
@@ -18,7 +18,7 @@
 
 #import "MLKCons.h"
 #import "MLKForm.h"
-#import "MLKLLVMCompiler.h"
+#import "MLKInterpreter.h"
 #import "util.h"
 #import "special-symbols.h"
 
@@ -361,11 +361,11 @@
   int i;
 
   self = [super complete];
-  LASSIGN (_foreignName, [[_tail cdr] car]);
-  LASSIGN (_name, [_tail car]);
-  _returnType = MLKForeignTypeWithTypeDesignator ([[[_tail cdr] cdr] car]);
+  LASSIGN (_foreignName, [_tail car]);
+  LASSIGN (_foreignLibraryDesignator, [[_tail cdr] car]);
+  _returnType = MLKForeignTypeWithTypeDesignator ([[[[_tail cdr] cdr] cdr] car]);
 
-  argtypes = [[[_tail cdr] cdr] cdr];
+  argtypes = [[[_tail cdr] cdr] car];
 
   _argc = [argtypes length];
   _argumentTypes = malloc (_argc * sizeof (MLKForeignType));