kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ext/ripper/tools/dsl.rb: Serialize dispatch calls

Browse source 
To avoid the unspecified behavior (the evaluation order of arguments).
In `$$ = foo(bar(), baz());`, it is unspecified which `bar` or `baz` is
called earlier.

This commit changes the code to `v1=bar(); v2=baz(); $$ = foo();`.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-01-20 17:45:24 +00:00
parent 7ba7a2f70e
commit d24f1fddd7
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/ripper/tools/dsl.rb
View file

@ -1,7 +1,11 @@
# Simple DSL implementation for Ripper code generation
#
# input: /*% ripper: stmts_add(stmts_new, void_stmt) %*/
# output: $$ = dispatch2(stmts_add, dispatch0(stmts_new), dispatch0(void_stmt))
# output:
# VALUE v1, v2;
# v1 = dispatch0(stmts_new);
# v2 = dispatch0(void_stmt);
# $$ = dispatch2(stmts_add, v1, v2);
class DSL
def initialize(code, options)
@ -9,6 +13,7 @@ class DSL
@error = options.include?("error")
@brace = options.include?("brace")
@final = options.include?("final")
@vars = 0
# create $1 == "$1", $2 == "$2", ...
re, s = "", ""
@ -21,7 +26,8 @@ class DSL
# struct parser_params *p
p = "p"
@code = eval(code)
@code = ""
@last_value = eval(code)
end
attr_reader :events
@ -33,17 +39,29 @@ class DSL
def generate
s = "$$"
s = "p->result" if @final
s = "#{ s } = #@code;"
s = "#@code#{ s }=#@last_value;"
s = "{VALUE #{ (1..@vars).map {|v| "v#{ v }" }.join(",") };#{ s }}" if @vars > 0
s << "ripper_error(p);" if @error
s = "{#{ s }}" if @brace
"\t\t\t#{s}"
end
def new_var
"v#{ @vars += 1 }"
end
def method_missing(event, *args)
if event.to_s =~ /!\z/
event = $`
@events[event] = args.size
"dispatch#{ args.size }(#{ [event, *args].join(", ") })"
vars = []
args.each do |arg|
vars << v = new_var
@code << "#{ v }=#{ arg };"
end
v = new_var
@code << "#{ v }=dispatch#{ args.size }(#{ [event, *vars].join(",") });"
v
elsif args.empty? and /\Aid[A-Z]/ =~ event.to_s
event
else