Merge mulk_benkard@ssh.phx.nearlyfreespeech.net:/home/htdocs/code/mulklisp

1 files changed, 27 insertions, 1 deletions

diff --git a/MLKLexicalContext.m b/MLKLexicalContext.m
index 8574e0b..ccd348a 100644
--- a/MLKLexicalContext.m
+++ b/MLKLexicalContext.m
@@ -81,7 +81,7 @@ static MLKLexicalContext *global_context;
   self = [super init];
 
   LASSIGN (_parent, (aContext ? aContext : [MLKLexicalContext globalContext]));
-  
+
   LASSIGN (_variables, [NSMutableSet setWithSet:vars]);
   LASSIGN (_functions, [NSMutableSet setWithSet:functions]);
 
@@ -297,6 +297,12 @@ static MLKLexicalContext *global_context;
           || [self contextForVariable:name] == [MLKLexicalContext globalContext]);
 }
 
+-(BOOL) functionIsGlobal:(id)name
+{
+  return (![self contextForFunction:name]
+          || [self contextForFunction:name] == [MLKLexicalContext globalContext]);
+}
+
 -(BOOL) functionIsInline:(MLKSymbol *)symbol
 {
   if ([_functions containsObject:symbol])
@@ -456,6 +462,26 @@ static MLKLexicalContext *global_context;
     }
 }
 
+-(intptr_t *) closureDataLengthForSymbol:(id)name
+{
+  id prop = [self propertyForFunction:name
+                                  key:@"LEXCTX.closure-data-length"];
+  
+  if (!prop)
+    {
+      intptr_t *cell = malloc (sizeof(intptr_t));
+      prop = [NSValue valueWithPointer:cell];
+      [self setDeepProperty:prop
+                forFunction:name
+                        key:@"LEXCTX.closure-data-length"];
+      return cell;
+    }
+  else
+    {
+      return (intptr_t*)[prop pointerValue];
+    }
+}
+
 -(id) bindingForSymbol:(id)name
 {
   id prop = [self propertyForVariable:name