fix while.to_vool

sanitize normalizer on the way
- return ruby, let caller to_vool
- return single statement, not single? statements
This commit is contained in:
Torsten Ruger 2018-07-20 17:51:17 +03:00
parent 9b8bd57db4
commit 6a58a71c0a
5 changed files with 47 additions and 10 deletions

View File

@ -14,11 +14,9 @@ module Ruby
def to_vool
cond , rest = *normalize_name(@condition)
fals = @if_false ? @if_false.to_vool : nil
me = Vool::IfStatement.new(cond , @if_true.to_vool, fals)
me = Vool::IfStatement.new(cond.to_vool , @if_true.to_vool, @if_false&.to_vool)
return me unless rest
rest << me
rest
Vool::Statements.new([ rest.to_vool , me])
end
def has_false?

View File

@ -12,11 +12,10 @@ module Ruby
if( condition.is_a?(ScopeStatement) and condition.single?)
condition = condition.first
end
return [condition.to_vool] if condition.is_a?(Named) or condition.is_a?(Constant)
condition = condition.to_vool
return [condition] if condition.is_a?(Named) or condition.is_a?(Constant)
local = "tmp_#{object_id}".to_sym
assign = Vool::Statements.new [Vool::LocalAssignment.new( local , condition)]
[Vool::LocalVariable.new(local) , assign]
assign = LocalAssignment.new( local , condition)
[LocalVariable.new(local) , assign]
end
end
end

View File

@ -13,7 +13,7 @@ module Ruby
def to_vool
cond , rest = *normalize_name(@condition)
WhileStatement.new(cond , @body.normalize , rest)
Vool::WhileStatement.new(cond.to_vool , @body.to_vool , rest&.to_vool)
end
def to_s(depth = 0)

View File

@ -19,7 +19,6 @@ module Ruby
lst = compile( basic_while )
assert_equal TrueConstant , lst.body.class
end
def reverse_while
"true while(false)"
end

View File

@ -0,0 +1,41 @@
require_relative 'helper'
module Ruby
class TestWhileStatementVool < MiniTest::Test
include RubyTests
def setup
@lst = compile( "while(@arg) ; @arg = 1 ; end" ).to_vool
end
def test_class
assert_equal Vool::WhileStatement , @lst.class
end
def test_body_class
assert_equal Vool::IvarAssignment , @lst.body.class
end
def test_condition_class
assert_equal Vool::InstanceVariable , @lst.condition.class
end
def test_no_hoist
assert_nil @lst.hoisted
end
end
class TestWhileStatementHoist < MiniTest::Test
include RubyTests
def setup
@lst = compile( "while(arg > 1) ; arg = 1 ; end" ).to_vool
end
def test_class
assert_equal Vool::WhileStatement , @lst.class
assert_equal Vool::LocalAssignment , @lst.body.class
end
def test_condition_class
assert_equal Vool::LocalVariable , @lst.condition.class
end
def test_hoist
assert_equal Vool::LocalAssignment , @lst.hoisted.class
end
def test_hoist_is_cond
assert_equal @lst.hoisted.name , @lst.condition.name
end
end
end