From 05fc2a9fd9326bd059681b7684a74e1ad1de1ec6 Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <matthias@benkard.de>
Date: Fri, 27 Jun 2008 23:53:25 +0200
Subject: MLKInterpreter: Fix macro support.

---
 MLKLexicalContext.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'MLKLexicalContext.h')

diff --git a/MLKLexicalContext.h b/MLKLexicalContext.h
index 552e77d..d7335e6 100644
--- a/MLKLexicalContext.h
+++ b/MLKLexicalContext.h
@@ -19,6 +19,7 @@
 #import "MLKFuncallable.h"
 #import "MLKLispValue.h"
 
+#import <Foundation/NSArray.h>
 #import <Foundation/NSSet.h>
 
 @class MLKEnvironment, MLKLexicalEnvironment, MLKSymbol, NSLinkedList, NSSet,
@@ -27,8 +28,8 @@
 
 @interface MLKLexicalContext : MLKLispValue
 {
-  NSArray *_knownMacros;
-  NSArray *_knownSymbolMacros;
+  NSMutableSet *_knownMacros;
+  NSMutableSet *_knownSymbolMacros;
   MLKEnvironment *_macros;
   MLKEnvironment *_symbolMacros;
   MLKEnvironment *_goTags;
@@ -62,12 +63,13 @@
 -(BOOL) symbolNamesMacro:(MLKSymbol *)symbol;
 -(BOOL) symbolNamesSymbolMacro:(MLKSymbol *)symbol;
 
--(id) macroForSymbol:(MLKSymbol *)symbol;
+-(id <MLKFuncallable>) macroForSymbol:(MLKSymbol *)symbol;
 -(void) setMacro:(id <MLKFuncallable>)function forSymbol:(MLKSymbol *)symbol;
 -(void) addMacro:(id <MLKFuncallable>)value forSymbol:(MLKSymbol *)symbol;
 
--(id) symbolMacroForSymbol:(MLKSymbol *)symbol;
+-(id <MLKFuncallable>) symbolMacroForSymbol:(MLKSymbol *)symbol;
 -(void) setSymbolMacro:(id <MLKFuncallable>)function forSymbol:(MLKSymbol *)symbol;
+-(void) addSymbolMacro:(id <MLKFuncallable>)value forSymbol:(MLKSymbol *)symbol;
 
 -(id) goTagForSymbol:(MLKSymbol *)symbol;
 
-- 
cgit v1.2.3