lots more pass

diakopter · Nov 6, 2011 · 3215eb1 · 3215eb1
1 parent efc1cca
commit 3215eb1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/lua/runtime/Metamodel/KnowHOW/KnowHOWBootstrapper.lua b/lua/runtime/Metamodel/KnowHOW/KnowHOWBootstrapper.lua
@@ -43,7 +43,13 @@ function KnowHOWBootstrapper.Bootstrap ()
             if (HOW.Methods[name] ~= nil) then
                 return HOW.Methods[name];
             else
-                error("No method '"..name.."' found in knowhow '"..(HOW.Name or "(no name available)").."'");
+                local knowhowName;
+                if (type(HOW.Name) == "table") then
+                    knowhowName = Ops.unbox_str(TC, HOW.Name);
+                else
+                    knowhowName = HOW.Name or "(no name available)";
+                end
+                error("No method '"..name.."' found in knowhow '"..knowhowName.."'");
             end
         end);
     KnowHOWMeths.compose = CodeObjectUtility.WrapNativeMethod(

diff --git a/lua/runtime/Metamodel/Representations/P6hash.lua b/lua/runtime/Metamodel/Representations/P6hash.lua
@@ -35,11 +35,7 @@ function makeP6hash ()
         return Object;
     end
     function P6hash:defined(TC, O)
-        if (Obj.Storage ~= nil) then
-            return true;
-        else
-            return false;
-        end
+        return O.Storage ~= nil;
     end
     function P6hash:get_attribute(TC, I, ClassHandle, Name)
         if (I.Storage ~= nil or I.Storage[ClassHandle] == nil) then

diff --git a/lua/runtime/Metamodel/Representations/P6opaque.lua b/lua/runtime/Metamodel/Representations/P6opaque.lua
@@ -35,11 +35,7 @@ function makeP6opaque ()
         return Object;
     end
     function P6opaque:defined(TC, O)
-        if (Obj.Storage ~= nil) then
-            return true;
-        else
-            return false;
-        end
+        return O.Storage ~= nil;
     end
     function P6opaque:get_attribute(TC, I, ClassHandle, Name)
         if (I.Storage == nil or I.Storage[ClassHandle] == nil) then