Adding simple implicit return
Ruby return semantics are easy to grasp, not so easy to code. So many cases. Added support for common cases, return const/variable or call.
This commit is contained in:
parent
4c76ff3388
commit
32f908c127
@ -9,9 +9,31 @@ module Ruby
|
|||||||
end
|
end
|
||||||
|
|
||||||
def to_vool
|
def to_vool
|
||||||
|
if @body.is_a?(Statements)
|
||||||
|
@body << replace_return( @body.pop )
|
||||||
|
else
|
||||||
|
@body = replace_return( @body )
|
||||||
|
end
|
||||||
Vool::MethodStatement.new( @name , @args.dup , @body.to_vool)
|
Vool::MethodStatement.new( @name , @args.dup , @body.to_vool)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def replace_return(statement)
|
||||||
|
case statement
|
||||||
|
when SendStatement , YieldStatement, Variable , Constant
|
||||||
|
return ReturnStatement.new( statement )
|
||||||
|
when IvarAssignment
|
||||||
|
ret = ReturnStatement.new( InstanceVariable.new(statement.name) )
|
||||||
|
return Statements.new([statement , ret])
|
||||||
|
when LocalAssignment
|
||||||
|
ret = ReturnStatement.new( LocalVariable.new(statement.name) )
|
||||||
|
return Statements.new([statement , ret])
|
||||||
|
when ReturnStatement , IfStatement , WhileStatement ,BlockStatement
|
||||||
|
return statement
|
||||||
|
else
|
||||||
|
raise "Not implemented implicit return #{statement.class}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def to_s(depth = 0)
|
def to_s(depth = 0)
|
||||||
arg_str = @args.collect{|a| a.to_s}.join(', ')
|
arg_str = @args.collect{|a| a.to_s}.join(', ')
|
||||||
at_depth(depth , "def #{name}(#{arg_str})" , @body.to_s(depth + 1) , "end")
|
at_depth(depth , "def #{name}(#{arg_str})" , @body.to_s(depth + 1) , "end")
|
||||||
|
@ -5,7 +5,7 @@ module Ruby
|
|||||||
attr_reader :return_value
|
attr_reader :return_value
|
||||||
|
|
||||||
def initialize(value)
|
def initialize(value)
|
||||||
@return_value = value
|
@return_value = value || NilConstant.new
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_vool
|
def to_vool
|
||||||
|
@ -23,6 +23,9 @@ module Ruby
|
|||||||
def shift
|
def shift
|
||||||
@statements.shift
|
@statements.shift
|
||||||
end
|
end
|
||||||
|
def pop
|
||||||
|
@statements.pop
|
||||||
|
end
|
||||||
def [](i)
|
def [](i)
|
||||||
@statements[i]
|
@statements[i]
|
||||||
end
|
end
|
||||||
|
@ -29,7 +29,9 @@ module Vool
|
|||||||
end
|
end
|
||||||
|
|
||||||
def to_s(depth = 0)
|
def to_s(depth = 0)
|
||||||
at_depth(depth , "while (#{@condition})" , @body.to_s(depth + 1) , "end" )
|
lines =[ "while (#{@condition})" , @body.to_s(1) , "end"]
|
||||||
|
lines.unshift( @hoisted.to_s) if @hoisted
|
||||||
|
at_depth(depth , *lines )
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user