Merge branch 'master' of http://matthias.benkard.de/code/mulklisp

1 files changed, 8 insertions, 24 deletions

diff --git a/MLKForm.h b/MLKForm.h
index 29483ef..5263dbd 100644
--- a/MLKForm.h
+++ b/MLKForm.h
@@ -91,6 +91,7 @@
 {
   id _body;
   NSArray *_bodyForms;
+  id _bodyContext;
 }
 
 -(void) splitDeclarationsAndBody:(id)object;
@@ -133,14 +134,6 @@
 @end
 
 
-@interface MLKSimpleDefmacroForm : MLKDeclaringForm
-{
-  MLKSymbol *_lambdaListName;
-  MLKSymbol *_name;
-}
-@end
-
-
 @interface MLKEvalWhenForm : MLKBodyForm
 {
   BOOL _compileToplevel;
@@ -281,22 +274,6 @@
 @end
 
 
-@interface MLKSetForm : MLKCompoundForm
-{
-  MLKForm *_variableForm;
-  MLKForm *_valueForm;
-}
-@end
-
-
-@interface MLKFSetForm : MLKCompoundForm
-{
-  MLKForm *_functionNameForm;
-  MLKForm *_valueForm;
-}
-@end
-
-
 @interface MLKThrowForm : MLKCompoundForm
 {
   MLKForm *_tagForm;
@@ -319,6 +296,10 @@
 }
 
 +(Class) dispatchClassForObject:(id)object;
+
+-(id) name;
+-(id) lambdaListName;
+-(id) bodyForms;
 @end
 
 
@@ -329,6 +310,9 @@
 }
 
 +(Class) dispatchClassForObject:(id)object;
+
+-(id) name;
+-(id) valueForm;
 @end