Merge branch 'master' of github.com:diakopter/6model

diakopter · Nov 6, 2011 · efc1cca · efc1cca
2 parents 565c225 + 82cda6a
commit efc1cca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lua/runtime/Init.lua b/lua/runtime/Init.lua
@@ -149,7 +149,7 @@ function makeInit ()
                         CaptureHelper.FormWith( { Value }));
                     io.write(Ops.unbox_str(nil, StrVal));
                 end
-                return CaptureHelper.Nil();
+                return CaptureHelper.Nil(TC);
             end));
         SettingContext.LexPad:SetByName("say",
         CodeObjectUtility.WrapNativeMethod(function (TC, self, C)
@@ -160,7 +160,7 @@ function makeInit ()
                         CaptureHelper.FormWith( { Value }));
                     io.write(Ops.unbox_str(nil, StrVal), "\n");
                 end
-                return CaptureHelper.Nil();
+                return CaptureHelper.Nil(TC);
             end));
         SettingContext.LexPad:SetByName("capture", REPRRegistry.get_REPR_by_name("P6capture"):type_object_for(nil, nil));
 

diff --git a/lua/runtime/Metamodel/KnowHOW/KnowHOWBootstrapper.lua b/lua/runtime/Metamodel/KnowHOW/KnowHOWBootstrapper.lua
@@ -25,15 +25,15 @@ function KnowHOWBootstrapper.Bootstrap ()
             local HOW = CaptureHelper.GetPositional(Cap, 1);
             local Attr = CaptureHelper.GetPositional(Cap, 3);
             HOW.Attributes:Add(Attr);
-            return CaptureHelper.Nil();
+            return CaptureHelper.Nil(TC);
         end);
     KnowHOWMeths.add_method = CodeObjectUtility.WrapNativeMethod(
         function (TC, Ignored, Cap)
             local HOW = CaptureHelper.GetPositional(Cap, 1);
             local Name = CaptureHelper.GetPositionalAsString(Cap, 3);
             local Method = CaptureHelper.GetPositional(Cap, 4);
             HOW.Methods[Name] = Method;
-            return CaptureHelper.Nil();
+            return CaptureHelper.Nil(TC);
         end);
     KnowHOWMeths.find_method = CodeObjectUtility.WrapNativeMethod(
         function (TC, Ignored, Cap)

diff --git a/lua/runtime/Runtime/CaptureHelper.lua b/lua/runtime/Runtime/CaptureHelper.lua
@@ -49,6 +49,7 @@ function CaptureHelper.GetPositionalAsString (Capture, Pos)
     return Ops.unbox_str(nil, CaptureHelper.GetPositional(Capture, Pos));
 end
 
-function CaptureHelper.Nil ()
-    return nil;
+-- only slightly less horrible.
+function CaptureHelper.Nil (TC)
+    return TC.DefaultListType.STable.REPR:instance_of(TC, TC.DefaultListType);
 end