bind_attr_with_hint bugfix and minor optimization to caught exception…

… if/then (converts if ((exc.TargetBlock ~= Block and 1 or 0) ~= 0) then to if (exc.TargetBlock ~= Block) then in generated code)
diakopter · Nov 6, 2011 · 2f1109b · 2f1109b
1 parent 15602da
commit 2f1109b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lua/compiler/PAST2LSTCompiler.pm b/lua/compiler/PAST2LSTCompiler.pm
@@ -428,8 +428,9 @@ our multi sub lst_for(PAST::Block $block) {
             $stmts,
             LST::Stmts.new(
                 LST::If.new(
+					:bool(1),
                     LST::Literal.new(
-                        :value("(exc.TargetBlock ~= Block and 1 or 0)")
+                        :value("exc.TargetBlock ~= Block")
                     ),
                     LST::Throw.new()
                 ),

diff --git a/lua/runtime/Metamodel/KnowHOW/KnowHOWREPR.lua b/lua/runtime/Metamodel/KnowHOW/KnowHOWREPR.lua
@@ -22,7 +22,7 @@ function makeKnowHOWREPR ()
         return setmetatable(this, mt);
     end
     function KnowHOWREPR:type_object_for(TC, MetaPackage)
-        local STable = SharedTable.new();
+		local STable = SharedTable.new();
         STable.HOW = MetaPackage;
         STable.REPR = self;
         STable.WHAT = Instance.new(STable);

diff --git a/lua/runtime/Runtime/Ops/Metamodel.lua b/lua/runtime/Runtime/Ops/Metamodel.lua
@@ -35,7 +35,7 @@ function Ops.bind_attr_with_hint(TC, Object, Class, Name, Value, Hint)
     if (Name.Value ~= nil) then
         Name = Ops.unbox_str(TC, Name);
     end
-    Object.STable.REPR:bind_attribute_with_hint(TC, Object, Class, Name, Value);
+    Object.STable.REPR:bind_attribute_with_hint(TC, Object, Class, Name, Hint, Value);
     return Value;
 end