diff options
233 files changed, 45992 insertions, 13641 deletions
@@ -1,3 +1,7 @@ +Mon Jan 01 00:00:00 2007 Koichi Sasada <ko1@atdot.net> + + * Merge YARV + Sun Dec 31 16:22:48 2006 Eric Hodel <drbrain@segment7.net> * array.c: Fix Array#reject. @@ -44,7 +44,7 @@ static void ary_iter_check(VALUE ary) { if (FL_TEST(ary, ARY_ITERLOCK)) { - rb_raise(rb_eRuntimeError, "can't modify array during iteration"); + rb_raise(rb_eRuntimeError, "can't modify array during iteration"); } } #define ARY_SORTLOCK FL_USER3 @@ -143,7 +143,7 @@ ary_new(VALUE klass, long len) rb_raise(rb_eArgError, "array size too big"); } ary = ary_alloc(klass); - if (len == 0) len++; + if (len == 0) len++; RARRAY(ary)->ptr = ALLOC_N(VALUE, len); RARRAY(ary)->aux.capa = len; @@ -250,8 +250,6 @@ rb_check_array_type(VALUE ary) return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary"); } -static VALUE rb_ary_replace(VALUE, VALUE); - /* * call-seq: * Array.new(size=0, obj=nil) @@ -325,7 +323,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary) rb_raise(rb_eArgError, "array size too big"); } rb_ary_modify(ary); - RESIZE_CAPA(ary, len); + RESIZE_CAPA(ary, len); if (rb_block_given_p()) { long i; @@ -543,10 +541,10 @@ rb_ary_shift(VALUE ary) top = RARRAY_PTR(ary)[0]; if (!ARY_SHARED_P(ary)) { if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) { - MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1); + MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1); RARRAY(ary)->len--; - return top; - } + return top; + } RARRAY_PTR(ary)[0] = Qnil; ary_make_shared(ary); } @@ -590,7 +588,7 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary) if (ARY_SHARED_P(ary)) { RARRAY(ary)->ptr += n; RARRAY(ary)->len -= n; - } + } else { MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n); RARRAY(ary)->len -= n; @@ -675,7 +673,7 @@ rb_ary_subseq(VALUE ary, long beg, long len) if (len == 0) return ary_new(klass, 0); shared = ary_make_shared(ary); - ptr = RARRAY_PTR(ary); + ptr = RARRAY_PTR(ary); ary2 = ary_alloc(klass); RARRAY(ary2)->ptr = ptr + beg; RARRAY(ary2)->len = len; @@ -775,8 +773,8 @@ rb_ary_at(VALUE ary, VALUE pos) /* * call-seq: * array.first -> obj or nil - * array.first(n) -> an_array - * + * array.first(n) -> an_array + * * Returns the first element, or the first +n+ elements, of the array. * If the array is empty, the first form returns <code>nil</code>, and the * second form returns an empty array. @@ -931,7 +929,7 @@ rb_ary_rindex(int argc, VALUE *argv, VALUE ary) long i = RARRAY_LEN(ary); if (rb_scan_args(argc, argv, "01", &val) == 0) { - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_ENUMERATOR(ary, 0, 0); while (i--) { if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) return LONG2NUM(i); @@ -1145,11 +1143,23 @@ each_i(VALUE ary) * a -- b -- c -- */ +VALUE yarv_invoke_Array_each_special_block(VALUE ary); + VALUE rb_ary_each(VALUE ary) { + long i; + VALUE val; + RETURN_ENUMERATOR(ary, 0, 0); + + val = yarv_invoke_Array_each_special_block(ary); + if(val != Qundef){ + return val; + } + ITERATE(each_i, ary); + return ary; } static VALUE @@ -1158,7 +1168,7 @@ each_index_i(VALUE ary) long i; for (i=0; i<RARRAY_LEN(ary); i++) { - rb_yield(LONG2NUM(i)); + rb_yield(LONG2NUM(i)); } return ary; } @@ -1530,7 +1540,7 @@ sort_i(VALUE ary) data.ary = ary; data.ptr = RARRAY_PTR(ary); data.len = RARRAY_LEN(ary); ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary), sizeof(VALUE), - rb_block_given_p()?sort_1:sort_2, &data); + rb_block_given_p()?sort_1:sort_2, &data); return ary; } @@ -1890,7 +1900,6 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary) return rb_ary_delete_at(ary, NUM2LONG(arg1)); } - static VALUE reject_bang_i(VALUE ary) { @@ -1905,10 +1914,10 @@ reject_bang_i(VALUE ary) } i2++; } + if (RARRAY_LEN(ary) == i2) return Qnil; if (i2 < RARRAY_LEN(ary)) RARRAY(ary)->len = i2; - return ary; } @@ -2075,7 +2084,7 @@ rb_ary_transpose(VALUE ary) * a #=> ["x", "y", "z"] */ -static VALUE +VALUE rb_ary_replace(VALUE copy, VALUE orig) { VALUE shared; @@ -2087,7 +2096,7 @@ rb_ary_replace(VALUE copy, VALUE orig) if (copy == orig) return copy; shared = ary_make_shared(orig); ptr = RARRAY(copy)->ptr; - xfree(ptr); + xfree(ptr); RARRAY(copy)->ptr = RARRAY(shared)->ptr; RARRAY(copy)->len = RARRAY(shared)->len; RARRAY(copy)->aux.shared = shared; @@ -2804,16 +2813,16 @@ flatten(VALUE ary, long idx, VALUE ary2, VALUE memo, int level) rb_ary_push(memo, id); rb_ary_splice(ary, idx, 1, ary2); if (level != 0) { - while (i < lim) { - VALUE tmp; + while (i < lim) { + VALUE tmp; - tmp = rb_check_array_type(rb_ary_elt(ary, i)); - if (!NIL_P(tmp)) { + tmp = rb_check_array_type(rb_ary_elt(ary, i)); + if (!NIL_P(tmp)) { n = flatten(ary, i, tmp, memo, level); - i += n; lim += n; - } - i++; + i += n; lim += n; } + i++; + } } rb_ary_pop(memo); @@ -2822,7 +2831,7 @@ flatten(VALUE ary, long idx, VALUE ary2, VALUE memo, int level) /* * call-seq: - * array.flatten! -> array or nil + * array.flatten! -> array or nil * array.flatten!(level) -> array or nil * * Flattens _self_ in place. @@ -2831,9 +2840,9 @@ flatten(VALUE ary, long idx, VALUE ary2, VALUE memo, int level) * argument determins the level of recursion to flatten. * * a = [ 1, 2, [3, [4, 5] ] ] - * a.flatten! #=> [1, 2, 3, 4, 5] - * a.flatten! #=> nil - * a #=> [1, 2, 3, 4, 5] + * a.flatten! #=> [1, 2, 3, 4, 5] + * a.flatten! #=> nil + * a #=> [1, 2, 3, 4, 5] * a = [ 1, 2, [3, [4, 5] ] ] * a.flatten!(1) #=> [1, 2, 3, [4, 5]] */ diff --git a/benchmark/bm_app_answer.rb b/benchmark/bm_app_answer.rb new file mode 100644 index 0000000000..00f830e1dc --- /dev/null +++ b/benchmark/bm_app_answer.rb @@ -0,0 +1,15 @@ +def ack(m, n)
+ if m == 0 then
+ n + 1
+ elsif n == 0 then
+ ack(m - 1, 1)
+ else
+ ack(m - 1, ack(m, n - 1))
+ end
+end
+
+def the_answer_to_life_the_universe_and_everything
+ (ack(3,7).to_s.split(//).inject(0){|s,x| s+x.to_i}.to_s + "2" ).to_i
+end
+
+answer = the_answer_to_life_the_universe_and_everything
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/bm_app_factorial.rb new file mode 100644 index 0000000000..cfafd626a8 --- /dev/null +++ b/benchmark/bm_app_factorial.rb @@ -0,0 +1,11 @@ +def fact(n)
+ if(n > 1)
+ n * fact(n-1)
+ else
+ 1
+ end
+end
+
+8.times{
+ fact(5000)
+}
\ No newline at end of file diff --git a/benchmark/bm_app_fib.rb b/benchmark/bm_app_fib.rb new file mode 100644 index 0000000000..65a149e5c4 --- /dev/null +++ b/benchmark/bm_app_fib.rb @@ -0,0 +1,10 @@ +def fib n
+ if n < 3
+ 1
+ else
+ fib(n-1) + fib(n-2)
+ end
+end
+
+fib(34)
+
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb new file mode 100644 index 0000000000..e981775ad3 --- /dev/null +++ b/benchmark/bm_app_mandelbrot.rb @@ -0,0 +1,23 @@ +require 'complex'
+
+def mandelbrot? z
+ i = 0
+ while i<100
+ i+=1
+ z = z * z
+ return false if z.abs > 2
+ end
+ true
+end
+
+ary = []
+
+(0..100).each{|dx|
+ (0..100).each{|dy|
+ x = dx / 50.0
+ y = dy / 50.0
+ c = Complex(x, y)
+ ary << c if mandelbrot?(c)
+ }
+}
+
diff --git a/benchmark/bm_app_pentomino.rb b/benchmark/bm_app_pentomino.rb new file mode 100644 index 0000000000..0fc80fade9 --- /dev/null +++ b/benchmark/bm_app_pentomino.rb @@ -0,0 +1,259 @@ +#!/usr/local/bin/ruby
+# This program is contributed by Shin Nishiyama
+
+
+# modified by K.Sasada
+
+NP = 5
+ROW = 8 + NP
+COL = 8
+
+$p = []
+$b = []
+$no = 0
+
+def piece(n, a, nb)
+ nb.each{|x|
+ a[n] = x
+ if n == NP-1
+ $p << [a.sort]
+ else
+ nbc=nb.clone
+ [-ROW, -1, 1, ROW].each{|d|
+ if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
+ nbc << x+d
+ end
+ }
+ nbc.delete x
+ piece(n+1,a[0..n],nbc)
+ end
+ }
+end
+
+def kikaku(a)
+ a.collect {|x| x - a[0]}
+end
+def ud(a)
+ kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
+end
+def rl(a)
+ kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
+end
+def xy(a)
+ kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
+end
+
+def mkpieces
+ piece(0,[],[0])
+ $p.each do |a|
+ a0 = a[0]
+ a[1] = ud(a0)
+ a[2] = rl(a0)
+ a[3] = ud(rl(a0))
+ a[4] = xy(a0)
+ a[5] = ud(xy(a0))
+ a[6] = rl(xy(a0))
+ a[7] = ud(rl(xy(a0)))
+ a.sort!
+ a.uniq!
+ end
+ $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
+end
+
+def mkboard
+ (0...ROW*COL).each{|i|
+ if i % ROW >= ROW-NP
+ $b[i] = -2
+ else
+ $b[i] = -1
+ end
+ $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
+ }
+end
+
+def pboard
+ return # skip print
+ print "No. #$no\n"
+ (0...COL).each{|i|
+ print "|"
+ (0...ROW-NP).each{|j|
+ x = $b[i*ROW+j]
+ if x < 0
+ print "..|"
+ else
+ printf "%2d|",x+1
+ end
+ }
+ print "\n"
+ }
+ print "\n"
+end
+
+$pnum=[]
+def setpiece(a,pos)
+ if a.length == $p.length then
+ $no += 1
+ pboard
+ return
+ end
+ while $b[pos] != -1
+ pos += 1
+ end
+ ($pnum - a).each do |i|
+ $p[i].each do |x|
+ f = 0
+ x.each{|s|
+ if $b[pos+s] != -1
+ f=1
+ break
+ end
+ }
+ if f == 0 then
+ x.each{|s|
+ $b[pos+s] = i
+ }
+ a << i
+ setpiece(a.clone, pos)
+ a.pop
+ x.each{|s|
+ $b[pos+s] = -1
+ }
+ end
+ end
+ end
+end
+
+mkpieces
+mkboard
+$p[4] = [$p[4][0]]
+$pnum = (0...$p.length).to_a
+setpiece([],0)
+
+
+__END__
+
+# original
+
+NP = 5
+ROW = 8 + NP
+COL = 8
+
+$p = []
+$b = []
+$no = 0
+
+def piece(n,a,nb)
+ for x in nb
+ a[n] = x
+ if n == NP-1
+ $p << [a.sort]
+ else
+ nbc=nb.clone
+ for d in [-ROW, -1, 1, ROW]
+ if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
+ nbc << x+d
+ end
+ end
+ nbc.delete x
+ piece(n+1,a[0..n],nbc)
+ end
+ end
+end
+
+def kikaku(a)
+ a.collect {|x| x - a[0]}
+end
+def ud(a)
+ kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
+end
+def rl(a)
+ kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
+end
+def xy(a)
+ kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
+end
+
+def mkpieces
+ piece(0,[],[0])
+ $p.each do |a|
+ a0 = a[0]
+ a[1] = ud(a0)
+ a[2] = rl(a0)
+ a[3] = ud(rl(a0))
+ a[4] = xy(a0)
+ a[5] = ud(xy(a0))
+ a[6] = rl(xy(a0))
+ a[7] = ud(rl(xy(a0)))
+ a.sort!
+ a.uniq!
+ end
+ $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
+end
+
+def mkboard
+ for i in 0...ROW*COL
+ if i % ROW >= ROW-NP
+ $b[i] = -2
+ else
+ $b[i] = -1
+ end
+ $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
+ end
+end
+
+def pboard
+ print "No. #$no\n"
+ for i in 0...COL
+ print "|"
+ for j in 0...ROW-NP
+ x = $b[i*ROW+j]
+ if x < 0
+ print "..|"
+ else
+ printf "%2d|",x+1
+ end
+ end
+ print "\n"
+ end
+ print "\n"
+end
+
+$pnum=[]
+def setpiece(a,pos)
+ if a.length == $p.length then
+ $no += 1
+ pboard
+ return
+ end
+ while $b[pos] != -1
+ pos += 1
+ end
+ ($pnum - a).each do |i|
+ $p[i].each do |x|
+ f = 0
+ for s in x do
+ if $b[pos+s] != -1
+ f=1
+ break
+ end
+ end
+ if f == 0 then
+ for s in x do
+ $b[pos+s] = i
+ end
+ a << i
+ setpiece(a.clone, pos)
+ a.pop
+ for s in x do
+ $b[pos+s] = -1
+ end
+ end
+ end
+ end
+end
+
+mkpieces
+mkboard
+$p[4] = [$p[4][0]]
+$pnum = (0...$p.length).to_a
+setpiece([],0)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb new file mode 100644 index 0000000000..0e3297e62e --- /dev/null +++ b/benchmark/bm_app_raise.rb @@ -0,0 +1,8 @@ +i=0
+while i<300000
+ i+=1
+ begin
+ raise
+ rescue
+ end
+end
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb new file mode 100644 index 0000000000..cc0e929da1 --- /dev/null +++ b/benchmark/bm_app_strconcat.rb @@ -0,0 +1,5 @@ +i=0
+while i<500000
+ "#{1+1} #{1+1} #{1+1}"
+ i+=1
+end
diff --git a/benchmark/bm_app_tak.rb b/benchmark/bm_app_tak.rb new file mode 100644 index 0000000000..d70d5db8f8 --- /dev/null +++ b/benchmark/bm_app_tak.rb @@ -0,0 +1,13 @@ +
+def tak x, y, z
+ unless y < x
+ z
+ else
+ tak( tak(x-1, y, z),
+ tak(y-1, z, x),
+ tak(z-1, x, y))
+ end
+end
+
+tak(18, 9, 0)
+
diff --git a/benchmark/bm_app_tarai.rb b/benchmark/bm_app_tarai.rb new file mode 100644 index 0000000000..851f36d990 --- /dev/null +++ b/benchmark/bm_app_tarai.rb @@ -0,0 +1,10 @@ +def tarai( x, y, z )
+ if x <= y
+ then y
+ else tarai(tarai(x-1, y, z),
+ tarai(y-1, z, x),
+ tarai(z-1, x, y))
+ end
+end
+
+tarai(12, 6, 0)
diff --git a/benchmark/bm_loop_times.rb b/benchmark/bm_loop_times.rb new file mode 100644 index 0000000000..6bda28d8f6 --- /dev/null +++ b/benchmark/bm_loop_times.rb @@ -0,0 +1 @@ +30000000.times{|e|}
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb new file mode 100644 index 0000000000..59b89cc519 --- /dev/null +++ b/benchmark/bm_loop_whileloop.rb @@ -0,0 +1,4 @@ +i = 0
+while i<30000000 # benchmark loop 1
+ i+=1
+end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb new file mode 100644 index 0000000000..976d4a9bad --- /dev/null +++ b/benchmark/bm_loop_whileloop2.rb @@ -0,0 +1,5 @@ +i=0
+while i<6000000 # benchmark loop 2
+ i+=1
+end
+
diff --git a/benchmark/bm_so_ackermann.rb b/benchmark/bm_so_ackermann.rb new file mode 100644 index 0000000000..fce9585825 --- /dev/null +++ b/benchmark/bm_so_ackermann.rb @@ -0,0 +1,19 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: ackermann-ruby.code,v 1.4 2004/11/13 07:40:41 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+def ack(m, n)
+ if m == 0 then
+ n + 1
+ elsif n == 0 then
+ ack(m - 1, 1)
+ else
+ ack(m - 1, ack(m, n - 1))
+ end
+end
+
+NUM = 9
+ack(3, NUM)
+
+
diff --git a/benchmark/bm_so_array.rb b/benchmark/bm_so_array.rb new file mode 100644 index 0000000000..a82a37cf16 --- /dev/null +++ b/benchmark/bm_so_array.rb @@ -0,0 +1,23 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: ary-ruby.code,v 1.4 2004/11/13 07:41:27 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Paul Brannan and Mark Hubbart
+
+n = 9000 # Integer(ARGV.shift || 1)
+
+x = Array.new(n)
+y = Array.new(n, 0)
+
+n.times{|bi|
+ x[bi] = bi + 1
+}
+
+(0 .. 999).each do |e|
+ (n-1).step(0,-1) do |bi|
+ y[bi] += x.at(bi)
+ end
+end
+# puts "#{y.first} #{y.last}"
+
+
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb new file mode 100644 index 0000000000..153efea1db --- /dev/null +++ b/benchmark/bm_so_concatenate.rb @@ -0,0 +1,18 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: strcat-ruby.code,v 1.4 2004/11/13 07:43:28 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
+
+STUFF = "hello\n"
+i=0
+while i<10
+ i+=1
+ hello = ''
+ 400000.times do |e|
+ hello << STUFF
+ end
+end
+# puts hello.length
+
+
diff --git a/benchmark/bm_so_count_words.rb b/benchmark/bm_so_count_words.rb new file mode 100644 index 0000000000..a24062d258 --- /dev/null +++ b/benchmark/bm_so_count_words.rb @@ -0,0 +1,18 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Paul Brannan
+
+input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
+
+nl = nw = nc = 0
+while true
+ data = (input.read(4096) or break) << (input.gets || "")
+ nc += data.length
+ nl += data.count("\n")
+ ((data.strip! || data).tr!("\n", " ") || data).squeeze!
+ #nw += data.count(" ") + 1
+end
+# STDERR.puts "#{nl} #{nw} #{nc}"
+
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb new file mode 100644 index 0000000000..d829474750 --- /dev/null +++ b/benchmark/bm_so_exception.rb @@ -0,0 +1,61 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: except-ruby.code,v 1.4 2004/11/13 07:41:33 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+$HI = 0
+$LO = 0
+NUM = 250000 # Integer(ARGV[0] || 1)
+
+
+class Lo_Exception < Exception
+ def initialize(num)
+ @value = num
+ end
+end
+
+class Hi_Exception < Exception
+ def initialize(num)
+ @value = num
+ end
+end
+
+def some_function(num)
+ begin
+ hi_function(num)
+ rescue
+ print "We shouldn't get here, exception is: #{$!.type}\n"
+ end
+end
+
+def hi_function(num)
+ begin
+ lo_function(num)
+ rescue Hi_Exception
+ $HI = $HI + 1
+ end
+end
+
+def lo_function(num)
+ begin
+ blowup(num)
+ rescue Lo_Exception
+ $LO = $LO + 1
+ end
+end
+
+def blowup(num)
+ if num % 2 == 0
+ raise Lo_Exception.new(num)
+ else
+ raise Hi_Exception.new(num)
+ end
+end
+
+
+i = 1
+max = NUM+1
+while i < max
+ i+=1
+ some_function(i+1)
+end
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb new file mode 100644 index 0000000000..1fcf24bbc6 --- /dev/null +++ b/benchmark/bm_so_lists.rb @@ -0,0 +1,47 @@ +#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
+
+NUM = 100
+SIZE = 10000
+
+def test_lists()
+ # create a list of integers (Li1) from 1 to SIZE
+ li1 = (1..SIZE).to_a
+ # copy the list to li2 (not by individual items)
+ li2 = li1.dup
+ # remove each individual item from left side of li2 and
+ # append to right side of li3 (preserving order)
+ li3 = Array.new
+ while (not li2.empty?)
+ li3.push(li2.shift)
+ end
+ # li2 must now be empty
+ # remove each individual item from right side of li3 and
+ # append to right side of li2 (reversing list)
+ while (not li3.empty?)
+ li2.push(li3.pop)
+ end
+ # li3 must now be empty
+ # reverse li1 in place
+ li1.reverse!
+ # check that first item is now SIZE
+ if li1[0] != SIZE then
+ p "not SIZE"
+ 0
+ else
+ # compare li1 and li2 for equality
+ if li1 != li2 then
+ return(0)
+ else
+ # return the length of the list
+ li1.length
+ end
+ end
+end
+
+i = 0
+while i<NUM
+ i+=1
+ result = test_lists()
+end
+
+result
diff --git a/benchmark/bm_so_matrix.rb b/benchmark/bm_so_matrix.rb new file mode 100644 index 0000000000..2ba22205dc --- /dev/null +++ b/benchmark/bm_so_matrix.rb @@ -0,0 +1,48 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: matrix-ruby.code,v 1.4 2004/11/13 07:42:14 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+n = 60 #Integer(ARGV.shift || 1)
+
+size = 30
+
+def mkmatrix(rows, cols)
+ count = 1
+ mx = Array.new(rows)
+ (0 .. (rows - 1)).each do |bi|
+ row = Array.new(cols, 0)
+ (0 .. (cols - 1)).each do |j|
+ row[j] = count
+ count += 1
+ end
+ mx[bi] = row
+ end
+ mx
+end
+
+def mmult(rows, cols, m1, m2)
+ m3 = Array.new(rows)
+ (0 .. (rows - 1)).each do |bi|
+ row = Array.new(cols, 0)
+ (0 .. (cols - 1)).each do |j|
+ val = 0
+ (0 .. (cols - 1)).each do |k|
+ val += m1.at(bi).at(k) * m2.at(k).at(j)
+ end
+ row[j] = val
+ end
+ m3[bi] = row
+ end
+ m3
+end
+
+m1 = mkmatrix(size, size)
+m2 = mkmatrix(size, size)
+mm = Array.new
+n.times do
+ mm = mmult(size, size, m1, m2)
+end
+# puts "#{mm[0][0]} #{mm[2][3]} #{mm[3][2]} #{mm[4][4]}"
+
+
diff --git a/benchmark/bm_so_nested_loop.rb b/benchmark/bm_so_nested_loop.rb new file mode 100644 index 0000000000..4667d1b183 --- /dev/null +++ b/benchmark/bm_so_nested_loop.rb @@ -0,0 +1,24 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: nestedloop-ruby.code,v 1.4 2004/11/13 07:42:22 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# from Avi Bryant
+
+n = 16 # Integer(ARGV.shift || 1)
+x = 0
+n.times do
+ n.times do
+ n.times do
+ n.times do
+ n.times do
+ n.times do
+ x += 1
+ end
+ end
+ end
+ end
+ end
+end
+# puts x
+
+
diff --git a/benchmark/bm_so_object.rb b/benchmark/bm_so_object.rb new file mode 100644 index 0000000000..a900177f4c --- /dev/null +++ b/benchmark/bm_so_object.rb @@ -0,0 +1,56 @@ +#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: objinst-ruby.code,v 1.4 2004/11/13 07:42:25 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Aristarkh Zagorodnikov
+
+class Toggle
+ def initialize(start_state)
+ @bool = start_state
+ end
+
+ def value
+ @bool
+ end
+
+ def activate
+ @bool = !@bool
+ self
+ end
+end
+
+class NthToggle < Toggle
+ def initialize(start_state, max_counter)
+ super start_state
+ @count_max = max_counter
+ @counter = 0
+ end
+
+ def activate
+ @counter += 1
+ if @counter >= @count_max
+ @bool = !@bool
+ @counter = 0
+ end
+ self
+ end
+end
+
+n = 1500000 # (ARGV.shift || 1).to_i
+
+toggle = Toggle.new 1
+5.times do
+ toggle.activate.value ? 'true' : 'false'
+end
+n.times do
+ toggle = Toggle.new 1
+end
+
+ntoggle = NthToggle.new 1, 3
+8.times do
+ ntoggle.activate.value ? 'true' : 'false'
+end
+n.times do
+ ntoggle = NthToggle.new 1, 3
+end
+
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb new file mode 100644 index 0000000000..8bc30841a8 --- /dev/null +++ b/benchmark/bm_so_random.rb @@ -0,0 +1,20 @@ +# from http://www.bagley.org/~doug/shootout/bench/random/random.ruby
+
+IM = 139968.0
+IA = 3877.0
+IC = 29573.0
+
+$last = 42.0
+
+def gen_random(max)
+ (max * ($last = ($last * IA + IC) % IM)) / IM
+end
+
+N = 1000000
+
+i=0
+while i<N
+ i+=1
+ gen_random(100.0)
+end
+# "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb new file mode 100644 index 0000000000..c84d5bfcb2 --- /dev/null +++ b/benchmark/bm_so_sieve.rb @@ -0,0 +1,24 @@ +# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
+num = 40
+count = i = j = 0
+flags0 = Array.new(8192,1)
+k = 0
+while k < num
+ k+=1
+ count = 0
+ flags = flags0.dup
+ i = 2
+ while i<8192
+ i+=1
+ if flags[i]
+ # remove all multiples of prime: i
+ j = i*i
+ while j < 8192
+ j += i
+ flags[j] = nil
+ end
+ count += 1
+ end
+ end
+end
+count
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb new file mode 100644 index 0000000000..1a7f98b3ce --- /dev/null +++ b/benchmark/bm_vm1_block.rb @@ -0,0 +1,10 @@ +def m
+ yield
+end
+
+i=0
+while i<30000000 # while loop 1
+ i+=1
+ m{
+ }
+end
\ No newline at end of file diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb new file mode 100644 index 0000000000..0077592045 --- /dev/null +++ b/benchmark/bm_vm1_const.rb @@ -0,0 +1,8 @@ +Const = 1
+
+i = 0
+while i<30000000 # while loop 1
+ i+= 1
+ j = Const
+ k = Const
+end
diff --git a/benchmark/bm_vm1_ensure.rb b/benchmark/bm_vm1_ensure.rb new file mode 100644 index 0000000000..cdb4444c4c --- /dev/null +++ b/benchmark/bm_vm1_ensure.rb @@ -0,0 +1,11 @@ +i=0
+while i<30000000 # benchmark loop 1
+ i+=1
+ begin
+ begin
+ ensure
+ end
+ ensure
+ end
+end
+
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb new file mode 100644 index 0000000000..764d77bc42 --- /dev/null +++ b/benchmark/bm_vm1_length.rb @@ -0,0 +1,9 @@ +a = 'abc'
+b = [1, 2, 3]
+i=0
+while i<30000000 # while loop 1
+ i+=1
+ a.length
+ b.length
+end
+
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb new file mode 100644 index 0000000000..2904e1a105 --- /dev/null +++ b/benchmark/bm_vm1_rescue.rb @@ -0,0 +1,7 @@ +i=0
+while i<30000000 # while loop 1
+ i+=1
+ begin
+ rescue
+ end
+end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb new file mode 100644 index 0000000000..c0a20ba184 --- /dev/null +++ b/benchmark/bm_vm1_simplereturn.rb @@ -0,0 +1,9 @@ +def m
+ return 1
+end
+i=0
+while i<30000000 # while loop 1
+ i+=1
+ m
+end
+
diff --git a/benchmark/bm_vm1_swap.rb b/benchmark/bm_vm1_swap.rb new file mode 100644 index 0000000000..785c999ab1 --- /dev/null +++ b/benchmark/bm_vm1_swap.rb @@ -0,0 +1,8 @@ +a = 1
+b = 2
+i=0
+while i<30000000 # while loop 1
+ i+=1
+ a, b = b, a
+end
+
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb new file mode 100644 index 0000000000..d1a989c7e5 --- /dev/null +++ b/benchmark/bm_vm2_array.rb @@ -0,0 +1,5 @@ +i=0
+while i<6000000 # benchmark loop 2
+ i+=1
+ a = [1,2,3,4,5,6,7,8,9,10]
+end
diff --git a/benchmark/bm_vm2_method.rb b/benchmark/bm_vm2_method.rb new file mode 100644 index 0000000000..4c9734f9c1 --- /dev/null +++ b/benchmark/bm_vm2_method.rb @@ -0,0 +1,9 @@ +def m
+ nil
+end
+
+i=0
+while i<6000000 # benchmark loop 2
+ i+=1
+ m; m; m; m; m; m; m; m;
+end
diff --git a/benchmark/bm_vm2_poly_method.rb b/benchmark/bm_vm2_poly_method.rb new file mode 100644 index 0000000000..3341ce6912 --- /dev/null +++ b/benchmark/bm_vm2_poly_method.rb @@ -0,0 +1,20 @@ +class C1
+ def m
+ 1
+ end
+end
+class C2
+ def m
+ 2
+ end
+end
+
+o1 = C1.new
+o2 = C2.new
+
+i=0
+while i<6000000 # benchmark loop 2
+ o = (i % 2 == 0) ? o1 : o2
+ o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+ i+=1
+end
diff --git a/benchmark/bm_vm2_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb new file mode 100644 index 0000000000..b5255f8797 --- /dev/null +++ b/benchmark/bm_vm2_poly_method_ov.rb @@ -0,0 +1,20 @@ +class C1
+ def m
+ 1
+ end
+end
+class C2
+ def m
+ 2
+ end
+end
+
+o1 = C1.new
+o2 = C2.new
+
+i=0
+while i<6000000 # benchmark loop 2
+ o = (i % 2 == 0) ? o1 : o2
+# o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+ i+=1
+end
diff --git a/benchmark/bm_vm2_proc.rb b/benchmark/bm_vm2_proc.rb new file mode 100644 index 0000000000..d2892386b5 --- /dev/null +++ b/benchmark/bm_vm2_proc.rb @@ -0,0 +1,14 @@ +def m &b
+ b
+end
+
+pr = m{
+ a = 1
+}
+
+i=0
+while i<6000000 # benchmark loop 2
+ i+=1
+ pr.call
+end
+
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb new file mode 100644 index 0000000000..515cd0e531 --- /dev/null +++ b/benchmark/bm_vm2_regexp.rb @@ -0,0 +1,6 @@ +i=0
+str = 'xxxhogexxx'
+while i<6000000 # benchmark loop 2
+ /hoge/ =~ str
+ i+=1
+end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb new file mode 100644 index 0000000000..5b23a24dab --- /dev/null +++ b/benchmark/bm_vm2_send.rb @@ -0,0 +1,12 @@ +class C
+ def m
+ end
+end
+
+o = C.new
+
+i=0
+while i<6000000 # benchmark loop 2
+ i+=1
+ o.__send__ :m
+end
diff --git a/benchmark/bm_vm2_super.rb b/benchmark/bm_vm2_super.rb new file mode 100644 index 0000000000..7511f7be87 --- /dev/null +++ b/benchmark/bm_vm2_super.rb @@ -0,0 +1,20 @@ +
+class C
+ def m
+ 1
+ end
+end
+
+class CC < C
+ def m
+ super()
+ end
+end
+
+obj = CC.new
+
+i = 0
+while i<6000000 # benchmark loop 2
+ obj.m
+ i+=1
+end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb new file mode 100644 index 0000000000..4df6c9fa84 --- /dev/null +++ b/benchmark/bm_vm2_unif1.rb @@ -0,0 +1,8 @@ +i = 0
+def m a, b
+end
+
+while i<6000000 # benchmark loop 2
+ i+=1
+ m 100, 200
+end
diff --git a/benchmark/bm_vm2_zsuper.rb b/benchmark/bm_vm2_zsuper.rb new file mode 100644 index 0000000000..c829bb9292 --- /dev/null +++ b/benchmark/bm_vm2_zsuper.rb @@ -0,0 +1,20 @@ +i = 0
+
+class C
+ def m a
+ 1
+ end
+end
+
+class CC < C
+ def m a
+ super
+ end
+end
+
+obj = CC.new
+
+while i<6000000 # benchmark loop 2
+ obj.m 10
+ i+=1
+end
diff --git a/benchmark/bm_vm3_thread_create_join.rb b/benchmark/bm_vm3_thread_create_join.rb new file mode 100644 index 0000000000..a99451a58b --- /dev/null +++ b/benchmark/bm_vm3_thread_create_join.rb @@ -0,0 +1,6 @@ +i=0
+while i<1000 # benchmark loop 3
+ i+=1
+ Thread.new{
+ }.join
+end
diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb new file mode 100644 index 0000000000..dc45f5a153 --- /dev/null +++ b/benchmark/bmx_temp.rb @@ -0,0 +1,57 @@ +
+i=0
+while i<20000000
+ x = 1 # "foo"
+ i+=1
+end
+
+__END__
+
+class Range
+ def each
+ f = self.first
+ l = self.last
+ while f < l
+ yield
+ f = f.succ
+ end
+ end
+end
+
+(0..10000000).each{
+}
+
+__END__
+class Fixnum_
+ def times
+ i = 0
+ while i<self
+ yield(i)
+ i+=1
+ end
+ end
+end
+
+10000000.times{
+}
+__END__
+
+ths = (1..10).map{
+ Thread.new{
+ 1000000.times{
+ }
+ }
+}
+ths.each{|e|
+ e.join
+}
+
+__END__
+$pr = proc{}
+def m
+ $pr.call
+end
+
+1000000.times{|e|
+ m
+}
diff --git a/benchmark/other-lang/ack.pl b/benchmark/other-lang/ack.pl new file mode 100644 index 0000000000..8933c33ae5 --- /dev/null +++ b/benchmark/other-lang/ack.pl @@ -0,0 +1,11 @@ +use integer;
+
+sub Ack {
+ return $_[0] ? ($_[1] ? Ack($_[0]-1, Ack($_[0], $_[1]-1))
+ : Ack($_[0]-1, 1))
+ : $_[1]+1;
+}
+
+my $NUM = 9;
+$NUM = 1 if ($NUM < 1);
+my $ack = Ack(3, $NUM);
diff --git a/benchmark/other-lang/ack.py b/benchmark/other-lang/ack.py new file mode 100644 index 0000000000..971796f689 --- /dev/null +++ b/benchmark/other-lang/ack.py @@ -0,0 +1,16 @@ +import sys
+sys.setrecursionlimit(5000000)
+
+def Ack(M, N):
+ if (not M):
+ return( N + 1 )
+ if (not N):
+ return( Ack(M-1, 1) )
+ return( Ack(M-1, Ack(M, N-1)) )
+
+def main():
+ NUM = 9
+ sys.setrecursionlimit(10000)
+ Ack(3, NUM)
+
+main()
diff --git a/benchmark/other-lang/ack.rb b/benchmark/other-lang/ack.rb new file mode 100644 index 0000000000..7886183ff0 --- /dev/null +++ b/benchmark/other-lang/ack.rb @@ -0,0 +1,12 @@ +def ack(m, n)
+ if m == 0 then
+ n + 1
+ elsif n == 0 then
+ ack(m - 1, 1)
+ else
+ ack(m - 1, ack(m, n - 1))
+ end
+end
+
+NUM = 9
+ack(3, NUM)
diff --git a/benchmark/other-lang/ack.scm b/benchmark/other-lang/ack.scm new file mode 100644 index 0000000000..e9e1886933 --- /dev/null +++ b/benchmark/other-lang/ack.scm @@ -0,0 +1,7 @@ +(define (ack m n)
+ (cond ((zero? m) (+ n 1))
+ ((zero? n) (ack (- m 1) 1))
+ (else (ack (- m 1) (ack m (- n 1))))))
+
+(ack 3 9)
+
diff --git a/benchmark/other-lang/eval.rb b/benchmark/other-lang/eval.rb new file mode 100644 index 0000000000..e6ff94d294 --- /dev/null +++ b/benchmark/other-lang/eval.rb @@ -0,0 +1,66 @@ +
+Bench = %w(
+ loop
+ ack
+ fib
+ tak
+ fact
+)
+
+Lang = <<EOP.map{|l| l.strip}
+ ruby-cyg
+ ../../../test6/miniruby
+ perl
+ python
+ gosh
+EOP
+
+Bench.replace ['loop2']
+Lang.replace ['ruby-cyg']
+
+Ext = %w(
+ .rb
+ .rb
+ .pl
+ .py
+ .scm
+)
+
+p Bench
+p Lang
+
+require 'benchmark'
+
+def bench cmd
+ m = Benchmark.measure{
+ #p cmd
+ system(cmd)
+ }
+ [m.utime, m.real]
+end
+
+Result = []
+Bench.each{|b|
+ r = []
+ Lang.each_with_index{|l, idx|
+ cmd = "#{l} #{b}#{Ext[idx]}"
+ r << bench(cmd)
+ }
+ Result << r
+}
+
+require 'pp'
+# utime
+puts Lang.join("\t")
+Bench.each_with_index{|b, bi|
+ print b, "\t"
+ puts Result[bi].map{|e| e[0]}.join("\t")
+}
+
+# rtime
+puts Lang.join("\t")
+Bench.each_with_index{|b, bi|
+ print b, "\t"
+ puts Result[bi].map{|e| e[1]}.join("\t")
+}
+
diff --git a/benchmark/other-lang/fact.pl b/benchmark/other-lang/fact.pl new file mode 100644 index 0000000000..2cef18534c --- /dev/null +++ b/benchmark/other-lang/fact.pl @@ -0,0 +1,13 @@ +sub fact{
+ my $n = @_[0];
+ if($n < 2){
+ return 1;
+ }
+ else{
+ return $n * fact($n-1);
+ }
+}
+
+for($i=0; $i<10000; $i++){
+ &fact(100);
+}
diff --git a/benchmark/other-lang/fact.py b/benchmark/other-lang/fact.py new file mode 100644 index 0000000000..460e4057f4 --- /dev/null +++ b/benchmark/other-lang/fact.py @@ -0,0 +1,18 @@ +#import sys
+#sys.setrecursionlimit(1000)
+
+def factL(n):
+ r = 1
+ for x in range(2, n):
+ r *= x
+ return r
+
+def factR(n):
+ if n < 2:
+ return 1
+ else:
+ return n * factR(n-1)
+
+for i in range(10000):
+ factR(100)
+
diff --git a/benchmark/other-lang/fact.rb b/benchmark/other-lang/fact.rb new file mode 100644 index 0000000000..c75320824c --- /dev/null +++ b/benchmark/other-lang/fact.rb @@ -0,0 +1,13 @@ +def fact(n)
+ if n < 2
+ 1
+ else
+ n * fact(n-1)
+ end
+end
+
+i=0
+while i<10000
+ i+=1
+ fact(100)
+end
diff --git a/benchmark/other-lang/fact.scm b/benchmark/other-lang/fact.scm new file mode 100644 index 0000000000..511990f797 --- /dev/null +++ b/benchmark/other-lang/fact.scm @@ -0,0 +1,8 @@ +(define (fact n)
+ (if (< n 2)
+ 1
+ (* n (fact (- n 1)))))
+
+(dotimes (i 10000)
+ (fact 100))
+
diff --git a/benchmark/other-lang/fib.pl b/benchmark/other-lang/fib.pl new file mode 100644 index 0000000000..d660a2337b --- /dev/null +++ b/benchmark/other-lang/fib.pl @@ -0,0 +1,11 @@ +sub fib{
+ my $n = $_[0];
+ if($n < 3){
+ return 1;
+ }
+ else{
+ return fib($n-1) + fib($n-2);
+ }
+};
+
+&fib(34);
diff --git a/benchmark/other-lang/fib.py b/benchmark/other-lang/fib.py new file mode 100644 index 0000000000..40f87f3e9c --- /dev/null +++ b/benchmark/other-lang/fib.py @@ -0,0 +1,7 @@ +def fib(n):
+ if n < 3:
+ return 1
+ else:
+ return fib(n-1) + fib(n-2)
+
+fib(34)
diff --git a/benchmark/other-lang/fib.rb b/benchmark/other-lang/fib.rb new file mode 100644 index 0000000000..7e0e8daa7e --- /dev/null +++ b/benchmark/other-lang/fib.rb @@ -0,0 +1,9 @@ +def fib n
+ if n < 3
+ 1
+ else
+ fib(n-1) + fib(n-2)
+ end
+end
+
+fib(34)
diff --git a/benchmark/other-lang/fib.scm b/benchmark/other-lang/fib.scm new file mode 100644 index 0000000000..ea63503b11 --- /dev/null +++ b/benchmark/other-lang/fib.scm @@ -0,0 +1,7 @@ +(define (fib n)
+ (if (< n 3)
+ 1
+ (+ (fib (- n 1)) (fib (- n 2)))))
+
+(fib 34)
+
diff --git a/benchmark/other-lang/loop.pl b/benchmark/other-lang/loop.pl new file mode 100644 index 0000000000..ecacef4477 --- /dev/null +++ b/benchmark/other-lang/loop.pl @@ -0,0 +1,3 @@ +for($i=0; $i<30000000; $i++){
+}
+
diff --git a/benchmark/other-lang/loop.py b/benchmark/other-lang/loop.py new file mode 100644 index 0000000000..b47089fd39 --- /dev/null +++ b/benchmark/other-lang/loop.py @@ -0,0 +1,2 @@ +for i in xrange(30000000):
+ pass
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb new file mode 100644 index 0000000000..35cd67a7a3 --- /dev/null +++ b/benchmark/other-lang/loop.rb @@ -0,0 +1,4 @@ +i=0
+while i<30000000
+ i+=1
+end
diff --git a/benchmark/other-lang/loop.scm b/benchmark/other-lang/loop.scm new file mode 100644 index 0000000000..1646ac3c1d --- /dev/null +++ b/benchmark/other-lang/loop.scm @@ -0,0 +1 @@ +(dotimes (x 30000000))
diff --git a/benchmark/other-lang/loop2.rb b/benchmark/other-lang/loop2.rb new file mode 100644 index 0000000000..f3085926a3 --- /dev/null +++ b/benchmark/other-lang/loop2.rb @@ -0,0 +1 @@ +30000000.times{}
diff --git a/benchmark/other-lang/tak.pl b/benchmark/other-lang/tak.pl new file mode 100644 index 0000000000..c7bb626e61 --- /dev/null +++ b/benchmark/other-lang/tak.pl @@ -0,0 +1,11 @@ +sub tak {
+ local($x, $y, $z) = @_;
+ if (!($y < $x)) {
+ return $z;
+ } else {
+ return &tak(&tak($x - 1, $y, $z),
+ &tak($y - 1, $z, $x),
+ &tak($z - 1, $x, $y));
+ }
+}
+&tak(18, 9, 0);
diff --git a/benchmark/other-lang/tak.py b/benchmark/other-lang/tak.py new file mode 100644 index 0000000000..9b7bd8f23c --- /dev/null +++ b/benchmark/other-lang/tak.py @@ -0,0 +1,8 @@ +def tak(x, y, z):
+ if not(y<x):
+ return z
+ else:
+ return tak(tak(x-1, y, z),
+ tak(y-1, z, x),
+ tak(z-1, x, y))
+tak(18, 9, 0)
diff --git a/benchmark/other-lang/tak.rb b/benchmark/other-lang/tak.rb new file mode 100644 index 0000000000..d70d5db8f8 --- /dev/null +++ b/benchmark/other-lang/tak.rb @@ -0,0 +1,13 @@ +
+def tak x, y, z
+ unless y < x
+ z
+ else
+ tak( tak(x-1, y, z),
+ tak(y-1, z, x),
+ tak(z-1, x, y))
+ end
+end
+
+tak(18, 9, 0)
+
diff --git a/benchmark/other-lang/tak.scm b/benchmark/other-lang/tak.scm new file mode 100644 index 0000000000..45cc576767 --- /dev/null +++ b/benchmark/other-lang/tak.scm @@ -0,0 +1,10 @@ +(define (tak x y z)
+ (if (not (< y x))
+ z
+ (tak (tak (- x 1) y z)
+ (tak (- y 1) z x)
+ (tak (- z 1) x y))))
+
+(tak 18 9 0)
+
+
diff --git a/benchmark/report.rb b/benchmark/report.rb new file mode 100644 index 0000000000..99def55aee --- /dev/null +++ b/benchmark/report.rb @@ -0,0 +1,81 @@ +#
+# YARV benchmark driver
+#
+
+require 'yarvutil'
+require 'benchmark'
+require 'rbconfig'
+
+def exec_command type, file, w
+ <<-EOP
+ $DRIVER_PATH = '#{File.dirname($0)}'
+ $LOAD_PATH.replace $LOAD_PATH | #{$LOAD_PATH.inspect}
+ require 'benchmark'
+ require 'yarvutil'
+# print '#{type}'
+ begin
+ puts Benchmark.measure{
+ #{w}('#{file}')
+ }.utime
+ rescue Exception => exec_command_error_variable
+ puts "\t" + exec_command_error_variable.message
+ end
+ EOP
+end
+
+def benchmark cmd
+ rubybin = ENV['RUBY'] || File.join(
+ Config::CONFIG["bindir"],
+ Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"])
+
+ IO.popen(rubybin, 'r+'){|io|
+ io.write cmd
+ io.close_write
+ return io.gets
+ }
+end
+
+def ruby_exec file
+ prog = exec_command 'ruby', file, 'load'
+ benchmark prog
+end
+
+def yarv_exec file
+ prog = exec_command 'yarv', file, 'YARVUtil.load_bm'
+ benchmark prog
+end
+
+$wr = $wy = nil
+
+def measure bench
+ file = File.dirname($0) + "/bm_#{bench}.rb"
+ r = ruby_exec(file).to_f
+ y = yarv_exec(file).to_f
+ puts "#{bench}\t#{r}\t#{y}"
+end
+
+def measure2
+ r = ruby_exec.to_f
+ y = yarv_exec.to_f
+ puts r/y
+end
+
+if $0 == __FILE__
+ %w{
+ whileloop
+ whileloop2
+ times
+ const
+ method
+ poly_method
+ block
+ rescue
+ rescue2
+ }.each{|bench|
+ measure bench
+ }
+end
+
+
+
+
diff --git a/benchmark/run.rb b/benchmark/run.rb new file mode 100644 index 0000000000..b84d093828 --- /dev/null +++ b/benchmark/run.rb @@ -0,0 +1,137 @@ +#
+# YARV benchmark driver
+#
+
+require 'yarvutil'
+require 'benchmark'
+require 'rbconfig'
+
+$yarvonly = false
+$rubyonly = false
+
+$results = []
+
+puts "ruby #{RUBY_VERSION} #{RUBY_PLATFORM}(#{RUBY_RELEASE_DATE})"
+puts YARVCore::VERSION + " rev: #{YARVCore::REV} (#{YARVCore::DATE})"
+puts YARVCore::OPTS
+puts
+
+def bm file
+ prog = File.read(file).map{|e| e.rstrip}.join("\n")
+ return if prog.empty?
+
+ /[a-z]+_(.+)\.rb/ =~ file
+ bm_name = $1
+ puts '-----------------------------------------------------------' unless $yarvonly || $rubyonly
+ puts "#{bm_name}: "
+
+
+puts <<EOS unless $yarvonly || $rubyonly
+#{prog}
+--
+EOS
+ #iseq = YARVUtil.parse(File.read(file))
+ #vm = YARVCore::VM.new
+ begin
+ Benchmark.bm{|x|
+ # x.report("yarv"){ YARVUtil.load_bm(file) }
+ } unless $yarvonly || $rubyonly
+
+ result = [bm_name]
+ result << ruby_exec(file) unless $yarvonly
+ result << yarv_exec(file) unless $rubyonly
+ $results << result
+
+ # puts YARVUtil.parse(File.read(file), file, 1).disasm
+
+ # x.report("ruby"){ load(file, false) }
+ # x.report("yarv"){ vm.eval iseq }
+ rescue Exception => e
+ puts
+ puts "** benchmark failure: #{e}"
+ puts e.backtrace
+ end
+end
+
+def exec_command type, file, w
+ <<-EOP
+ $DRIVER_PATH = '#{File.dirname($0)}'
+ $LOAD_PATH.replace $LOAD_PATH | #{$LOAD_PATH.inspect}
+ require 'benchmark'
+ require 'yarvutil'
+ print '#{type}'
+ begin
+ puts Benchmark.measure{
+ #{w}('#{file}')
+ }
+ rescue Exception => exec_command_error_variable
+ puts "\t" + exec_command_error_variable.message
+ end
+ EOP
+end
+
+def benchmark prog
+ rubybin = ENV['RUBY'] || File.join(
+ Config::CONFIG["bindir"],
+ Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"])
+
+ #
+ tmpfile = Tempfile.new('yarvbench')
+ tmpfile.write(prog)
+ tmpfile.close
+
+ cmd = "#{rubybin} #{tmpfile.path}"
+ result = `#{cmd}`
+ puts result
+ tmpfile.close(true)
+ result
+end
+
+def ruby_exec file
+ prog = exec_command 'ruby', file, 'load'
+ benchmark prog
+end
+
+def yarv_exec file
+ prog = exec_command 'yarv', file, 'YARVUtil.load_bm'
+ benchmark prog
+end
+
+if $0 == __FILE__
+ ARGV.each{|arg|
+ if /\A(--yarv)|(-y)/ =~ arg
+ $yarvonly = true
+ elsif /\A(--ruby)|(-r)/ =~ arg
+ $rubyonly = true
+ end
+ }
+ ARGV.delete_if{|arg|
+ /\A-/ =~ arg
+ }
+
+ if ARGV.empty?
+ Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
+ bm file
+ }
+ else
+ ARGV.each{|file|
+ Dir.glob(File.join(File.dirname(__FILE__), file + '*')){|ef|
+ # file = "#{File.dirname(__FILE__)}/#{file}.rb"
+ bm ef
+ }
+ }
+ end
+
+ puts
+ puts "-- benchmark summary ---------------------------"
+ $results.each{|res|
+ print res.shift, "\t"
+ (res||[]).each{|result|
+ /([\d\.]+)/ =~ result
+ print $1 + "\t" if $1
+ }
+ puts
+ }
+end
+
+
diff --git a/benchmark/run_rite.rb b/benchmark/run_rite.rb new file mode 100644 index 0000000000..3b437c82ab --- /dev/null +++ b/benchmark/run_rite.rb @@ -0,0 +1,129 @@ +#
+# YARV benchmark driver
+#
+
+require 'benchmark'
+require 'rbconfig'
+
+$yarvonly = false
+$rubyonly = false
+
+$results = []
+
+# prepare 'wc.input'
+def prepare_wc_input
+ wcinput = File.join(File.dirname($0), 'wc.input')
+ wcbase = File.join(File.dirname($0), 'wc.input.base')
+ unless FileTest.exist?(wcinput)
+ data = File.read(wcbase)
+ 13.times{
+ data << data
+ }
+ open(wcinput, 'w'){|f| f.write data}
+ end
+end
+
+prepare_wc_input
+
+def bm file
+ prog = File.read(file).map{|e| e.rstrip}.join("\n")
+ return if prog.empty?
+
+ /[a-z]+_(.+)\.rb/ =~ file
+ bm_name = $1
+ puts '-----------------------------------------------------------' unless $yarvonly || $rubyonly
+ puts "#{bm_name}: "
+
+
+puts <<EOS unless $yarvonly || $rubyonly
+#{prog}
+--
+EOS
+ #iseq = YARVUtil.parse(File.read(file))
+ #vm = YARVCore::VM.new
+ begin
+ result = [bm_name]
+ result << ruby_exec(file) unless $yarvonly
+ result << yarv_exec(file) unless $rubyonly
+ $results << result
+
+ # puts YARVUtil.parse(File.read(file), file, 1).disasm
+
+ # x.report("ruby"){ load(file, false) }
+ # x.report("yarv"){ vm.eval iseq }
+ rescue Exception => e
+ puts
+ puts "** benchmark failure: #{e}"
+ puts e.backtrace
+ end
+end
+
+def benchmark file, bin
+ m = Benchmark.measure{
+ `#{bin} #{$opts} #{file}`
+ }
+ sec = '%.3f' % m.real
+ puts " #{sec}"
+ sec
+end
+
+def ruby_exec file
+ print 'ruby'
+ benchmark file, $ruby_program
+end
+
+def yarv_exec file
+ print 'yarv'
+ benchmark file, $yarv_program
+end
+
+if $0 == __FILE__
+ ARGV.each{|arg|
+ case arg
+ when /\A--yarv-program=(.+)/
+ $yarv_program = $1
+ when /\A--ruby-program=(.+)/
+ $ruby_program = $1
+ when /\A--opts=(.+)/
+ $opts = $1
+ when /\A(--yarv)|(-y)/
+ $yarvonly = true
+ when /\A(--ruby)|(-r)/
+ $rubyonly = true
+ end
+ }
+ ARGV.delete_if{|arg|
+ /\A-/ =~ arg
+ }
+
+ puts "Ruby:"
+ system("#{$ruby_program} -v")
+ puts
+ puts "YARV:"
+ system("#{$yarv_program} -v")
+
+ if ARGV.empty?
+ Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
+ bm file
+ }
+ else
+ ARGV.each{|file|
+ Dir.glob(File.join(File.dirname(__FILE__), file + '*')){|ef|
+ # file = "#{File.dirname(__FILE__)}/#{file}.rb"
+ bm ef
+ }
+ }
+ end
+
+ puts
+ puts "-- benchmark summary ---------------------------"
+ $results.each{|res|
+ print res.shift, "\t"
+ (res||[]).each{|result|
+ /([\d\.]+)/ =~ result
+ print $1 + "\t" if $1
+ }
+ puts
+ }
+end
+
diff --git a/benchmark/runc.rb b/benchmark/runc.rb new file mode 100644 index 0000000000..20e06b2355 --- /dev/null +++ b/benchmark/runc.rb @@ -0,0 +1,29 @@ +#
+#
+#
+
+require 'benchmark'
+require 'rbconfig'
+
+$rubybin = ENV['RUBY'] || File.join(
+ Config::CONFIG["bindir"],
+ Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"])
+
+def runfile file
+ puts file
+ file = File.join(File.dirname($0), 'contrib', file)
+ Benchmark.bm{|x|
+ x.report('ruby'){
+ system("#{$rubybin} #{file}")
+ }
+ x.report('yarv'){
+ system("#{$rubybin} -rite -I.. #{file}")
+ }
+ }
+end
+
+ARGV.each{|file|
+ runfile file
+}
+
+
diff --git a/benchmark/wc.input.base b/benchmark/wc.input.base new file mode 100644 index 0000000000..88b5c69c96 --- /dev/null +++ b/benchmark/wc.input.base @@ -0,0 +1,25 @@ +Subject: Re: Who was Izchak Miller?
+From: "Jane D. Anonymous" <nobody@yale.edu>
+Date: 1996/04/28
+Message-Id: <4lv7bc$oh@news.ycc.yale.edu>
+References: <317C405E.5DFA@panix.com> <4lk6vl$gde@ns.oar.net>
+To: 75176.2330@compuserve.com
+Content-Type: text/plain; charset=us-ascii
+Organization: Yale University
+X-Url: news:4lk6vl$gde@ns.oar.net
+Mime-Version: 1.0
+Newsgroups: rec.games.roguelike.nethack
+X-Mailer: Mozilla 1.1N (Macintosh; I; 68K)
+
+Hello there, Izchak Miller was my father. When I was younger I spent
+many a night, hunched over the keyboard with a cup of tea, playing
+nethack with him and my brother. my dad was a philosopher with a strong
+weakness for fantasy/sci fi. I remember when he started to get involved
+with the Nethack team- my brother's Dungeons and Dragons monster book
+found a regular place beside my dad's desk. it's nice to see him living
+on in the game he loved so much :-).
+ Tamar Miller
+
+The following is a really long word of 5000 characters:
+
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
diff --git a/blockinlining.c b/blockinlining.c new file mode 100644 index 0000000000..7a74f3492e --- /dev/null +++ b/blockinlining.c @@ -0,0 +1,461 @@ +/********************************************************************** + + blockinlining.c - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#include "ruby.h" +#include "node.h" +#include "yarvcore.h" + +VALUE yarv_new_iseqval(VALUE node, VALUE name, VALUE file, + VALUE parent, VALUE type, VALUE block_opt, VALUE opt); + +static VALUE +yarv_iseq_special_block(yarv_iseq_t *iseq, void *builder) +{ +#if OPT_BLOCKINLINING + VALUE parent = Qfalse; + VALUE iseqval; + + if (iseq->argc > 1 || iseq->arg_simple == 0) { + /* argument check */ + return 0; + } + + if (iseq->cached_special_block_builder) { + if (iseq->cached_special_block_builder == builder) { + return iseq->cached_special_block; + } + else { + return 0; + } + } + else { + iseq->cached_special_block_builder = (void *)1; + } + + if (iseq->parent_iseq) { + parent = iseq->parent_iseq->self; + } + iseqval = yarv_iseq_new_with_bopt(iseq->node, iseq->name, iseq->file_name, + parent, iseq->type, + GC_GUARDED_PTR(builder)); + if (0) { + printf("%s\n", RSTRING_PTR(iseq_disasm(iseqval))); + } + iseq->cached_special_block = iseqval; + iseq->cached_special_block_builder = builder; + return iseqval; +#else + return 0; +#endif +} + +static NODE * +new_block(NODE * head, NODE * tail) +{ + head = NEW_BLOCK(head); + tail = NEW_BLOCK(tail); + head->nd_next = tail; + return head; +} + +static NODE * +new_ary(NODE * head, NODE * tail) +{ + head = NEW_ARRAY(head); + head->nd_next = tail; + return head; +} + +static NODE * +new_assign(NODE * lnode, NODE * rhs) +{ + switch (nd_type(lnode)) { + case NODE_LASGN:{ + return NEW_NODE(NODE_LASGN, lnode->nd_vid, rhs, lnode->nd_cnt); + /* NEW_LASGN(lnode->nd_vid, rhs); */ + } + case NODE_GASGN:{ + return NEW_GASGN(lnode->nd_vid, rhs); + } + case NODE_DASGN:{ + return NEW_DASGN(lnode->nd_vid, rhs); + } + case NODE_ATTRASGN:{ + NODE *args = 0; + if (lnode->nd_args) { + args = NEW_ARRAY(lnode->nd_args->nd_head); + args->nd_next = NEW_ARRAY(rhs); + args->nd_alen = 2; + } + else { + args = NEW_ARRAY(rhs); + } + + return NEW_ATTRASGN(lnode->nd_recv, + lnode->nd_mid, + args); + } + default: + rb_bug("unimplemented (block inlining): %s", node_name(nd_type(lnode))); + } + return 0; +} + +static NODE * +build_Integer_times_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode, + VALUE param_vars, VALUE local_vars) +{ + /* Special Block for Integer#times + {|e, _self| + _e = e + while(e < _self) + e = _e + redo_point: + BODY + next_point: + _e = _e.succ + end + } + + {|e, _self| + while(e < _self) + BODY + next_point: + e = e.succ + end + } + */ + ID _self = rb_intern("#_self"); + if (iseq->argc == 0) { + ID e = rb_intern("#e"); + rb_ary_push(param_vars, ID2SYM(e)); + rb_ary_push(param_vars, ID2SYM(_self)); + iseq->argc += 2; + + node = + NEW_WHILE(NEW_CALL + (NEW_DVAR(e), idLT, new_ary(NEW_DVAR(_self), 0)), + new_block(NEW_OPTBLOCK(node), + NEW_DASGN(e, + NEW_CALL(NEW_DVAR(e), idSucc, 0))), + Qundef); + } + else { + ID _e = rb_intern("#_e"); + ID e = SYM2ID(rb_ary_entry(param_vars, 0)); + NODE *assign; + + rb_ary_push(param_vars, ID2SYM(_self)); + rb_ary_push(local_vars, ID2SYM(_e)); + iseq->argc++; + + if (nd_type(lnode) == NODE_DASGN_CURR) { + assign = NEW_DASGN(e, NEW_DVAR(_e)); + } + else { + assign = new_assign(lnode, NEW_DVAR(_e)); + } + + node = + new_block(NEW_DASGN(_e, NEW_DVAR(e)), + NEW_WHILE(NEW_CALL + (NEW_DVAR(_e), idLT, + new_ary(NEW_DVAR(_self), 0)), + new_block(assign, + new_block(NEW_OPTBLOCK(node), + NEW_DASGN(_e, + NEW_CALL + (NEW_DVAR(_e), + idSucc, 0)))), + Qundef)); + } + return node; +} + +VALUE +yarv_invoke_Integer_times_special_block(VALUE num) +{ + yarv_thread_t *th = GET_THREAD(); + yarv_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]); + + if (orig_block && BUILTIN_TYPE(orig_block->iseq) != T_NODE) { + VALUE tsiseqval = yarv_iseq_special_block(orig_block->iseq, + build_Integer_times_node); + yarv_iseq_t *tsiseq; + VALUE argv[2], val; + + if (tsiseqval) { + yarv_block_t block = *orig_block; + GetISeqPtr(tsiseqval, tsiseq); + block.iseq = tsiseq; + th->cfp->lfp[0] = GC_GUARDED_PTR(&block); + argv[0] = INT2FIX(0); + argv[1] = num; + val = th_invoke_yield(th, 2, argv); + if (val == Qundef) { + return num; + } + else { + return val; + } + } + } + return Qundef; +} + +static NODE * +build_Range_each_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode, + VALUE param_vars, VALUE local_vars, ID mid) +{ + /* Special Block for Range#each + {|e, _last| + _e = e + while _e < _last + e = _e + next_point: + BODY + redo_point: + _e = _e.succ + end + } + {|e, _last| + while e < _last + BODY + redo_point: + e = e.succ + end + } + */ + ID _last = rb_intern("#_last"); + if (iseq->argc == 0) { + ID e = rb_intern("#e"); + rb_ary_push(param_vars, ID2SYM(e)); + rb_ary_push(param_vars, ID2SYM(_last)); + iseq->argc += 2; + + node = + NEW_WHILE(NEW_CALL(NEW_DVAR(e), mid, new_ary(NEW_DVAR(_last), 0)), + new_block(NEW_OPTBLOCK(node), + NEW_DASGN(e, + NEW_CALL(NEW_DVAR(e), idSucc, 0))), + Qundef); + } + else { + ID _e = rb_intern("#_e"); + ID e = SYM2ID(rb_ary_entry(param_vars, 0)); + NODE *assign; + + rb_ary_push(param_vars, ID2SYM(_last)); + rb_ary_push(local_vars, ID2SYM(_e)); + iseq->argc++; + + if (nd_type(lnode) == NODE_DASGN_CURR) { + assign = NEW_DASGN(e, NEW_DVAR(_e)); + } + else { + assign = new_assign(lnode, NEW_DVAR(_e)); + } + + node = + new_block(NEW_DASGN(_e, NEW_DVAR(e)), + NEW_WHILE(NEW_CALL + (NEW_DVAR(_e), mid, + new_ary(NEW_DVAR(_last), 0)), + new_block(assign, + new_block(NEW_OPTBLOCK(node), + NEW_DASGN(_e, + NEW_CALL + (NEW_DVAR(_e), + idSucc, 0)))), + Qundef)); + } + return node; +} + +static NODE * +build_Range_each_node_LE(yarv_iseq_t *iseq, NODE * node, NODE * lnode, + VALUE param_vars, VALUE local_vars) +{ + return build_Range_each_node(iseq, node, lnode, + param_vars, local_vars, idLE); +} + +static NODE * +build_Range_each_node_LT(yarv_iseq_t *iseq, NODE * node, NODE * lnode, + VALUE param_vars, VALUE local_vars) +{ + return build_Range_each_node(iseq, node, lnode, + param_vars, local_vars, idLT); +} + +VALUE +yarv_invoke_Range_each_special_block(VALUE range, + VALUE beg, VALUE end, int excl) +{ + yarv_thread_t *th = GET_THREAD(); + yarv_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]); + + if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) { + void *builder = + excl ? build_Range_each_node_LT : build_Range_each_node_LE; + VALUE tsiseqval = yarv_iseq_special_block(orig_block->iseq, builder); + yarv_iseq_t *tsiseq; + VALUE argv[2]; + + if (tsiseqval) { + VALUE val; + yarv_block_t block = *orig_block; + GetISeqPtr(tsiseqval, tsiseq); + block.iseq = tsiseq; + th->cfp->lfp[0] = GC_GUARDED_PTR(&block); + argv[0] = beg; + argv[1] = end; + val = th_invoke_yield(th, 2, argv); + if (val == Qundef) { + return range; + } + else { + return val; + } + } + } + return Qundef; +} + + +static NODE * +build_Array_each_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode, + VALUE param_vars, VALUE local_vars) +{ + /* Special block for Array#each + ary.each{|e| + BODY + } + => + {|e, _self| + _i = 0 + while _i < _self.length + e = _self[_i] + redo_point: + BODY + next_point: + _i = _i.succ + end + } + + ary.each{ + BODY + } + => + {|_i, _self| + _i = 0 + while _i < _self.length + redo_point: + BODY + next_point: + _i = _i.succ + end + } + */ + + ID _self = rb_intern("#_self"); + ID _i = rb_intern("#_i"); + + if (iseq->argc == 0) { + ID _e = rb_intern("#_e"); + rb_ary_push(param_vars, ID2SYM(_e)); + rb_ary_push(param_vars, ID2SYM(_self)); + iseq->argc += 2; + rb_ary_push(local_vars, ID2SYM(_i)); + + node = + new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))), + NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT, + new_ary(NEW_CALL + (NEW_DVAR(_self), idLength, + 0), 0)), + new_block(NEW_OPTBLOCK(node), + NEW_DASGN(_i, + NEW_CALL(NEW_DVAR(_i), + idSucc, 0))), + Qundef)); + } + else { + ID e = SYM2ID(rb_ary_entry(param_vars, 0)); + NODE *assign; + + rb_ary_push(param_vars, ID2SYM(_self)); + iseq->argc++; + rb_ary_push(local_vars, ID2SYM(_i)); + + if (nd_type(lnode) == NODE_DASGN_CURR) { + assign = NEW_DASGN(e, + NEW_CALL(NEW_DVAR(_self), idAREF, + new_ary(NEW_DVAR(_i), 0))); + } + else { + assign = new_assign(lnode, + NEW_CALL(NEW_DVAR(_self), idAREF, + new_ary(NEW_DVAR(_i), 0))); + } + + node = + new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))), + NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT, + new_ary(NEW_CALL + (NEW_DVAR(_self), idLength, + 0), 0)), new_block(assign, + new_block + (NEW_OPTBLOCK + (node), + NEW_DASGN + (_i, + NEW_CALL + (NEW_DVAR + (_i), + idSucc, + 0)))), + Qundef)); + } + return node; +} + +VALUE +yarv_invoke_Array_each_special_block(VALUE ary) +{ + yarv_thread_t *th = GET_THREAD(); + yarv_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]); + + if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) { + VALUE tsiseqval = yarv_iseq_special_block(orig_block->iseq, + build_Array_each_node); + yarv_iseq_t *tsiseq; + VALUE argv[2]; + + if (tsiseqval) { + VALUE val; + yarv_block_t block = *orig_block; + GetISeqPtr(tsiseqval, tsiseq); + block.iseq = tsiseq; + th->cfp->lfp[0] = GC_GUARDED_PTR(&block); + argv[0] = 0; + argv[1] = ary; + val = th_invoke_yield(th, 2, argv); + if (val == Qundef) { + return ary; + } + else { + return val; + } + } + } + return Qundef; +} diff --git a/call_cfunc.ci b/call_cfunc.ci new file mode 100644 index 0000000000..7b8bfe85e9 --- /dev/null +++ b/call_cfunc.ci @@ -0,0 +1,94 @@ +/* -*-c-*- */ + +/* from ruby1.9/eval.c */ + +static inline VALUE +call_cfunc(func, recv, len, argc, argv) + VALUE (*func) (); + VALUE recv; + int len, argc; + const VALUE *argv; +{ + // printf("len: %d, argc: %d\n", len, argc); + + if (len >= 0 && argc != len) { + rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)", + argc, len); + } + + switch (len) { + case -2: + return (*func) (recv, rb_ary_new4(argc, argv)); + break; + case -1: + return (*func) (argc, argv, recv); + break; + case 0: + return (*func) (recv); + break; + case 1: + return (*func) (recv, argv[0]); + break; + case 2: + return (*func) (recv, argv[0], argv[1]); + break; + case 3: + return (*func) (recv, argv[0], argv[1], argv[2]); + break; + case 4: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3]); + break; + case 5: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4]); + break; + case 6: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5]); + break; + case 7: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6]); + break; + case 8: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7]); + break; + case 9: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7], argv[8]); + break; + case 10: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7], argv[8], argv[9]); + break; + case 11: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7], argv[8], argv[9], + argv[10]); + break; + case 12: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7], argv[8], argv[9], + argv[10], argv[11]); + break; + case 13: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], + argv[11], argv[12]); + break; + case 14: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], + argv[11], argv[12], argv[13]); + break; + case 15: + return (*func) (recv, argv[0], argv[1], argv[2], argv[3], argv[4], + argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], + argv[11], argv[12], argv[13], argv[14]); + break; + default: + rb_raise(rb_eArgError, "too many arguments(%d)", len); + break; + } + return Qnil; /* not reached */ +} @@ -56,10 +56,26 @@ rb_class_new(VALUE super) return rb_class_boot(super); } +struct clone_method_data { + st_table *tbl; + VALUE klass; +}; + static int -clone_method(ID mid, NODE *body, st_table *tbl) +clone_method(ID mid, NODE *body, struct clone_method_data *data) { - st_insert(tbl, mid, (st_data_t)NEW_METHOD(body->nd_body, body->nd_noex)); + if (body == 0) { + st_insert(data->tbl, mid, 0); + } + else { + st_insert(data->tbl, mid, + (st_data_t) + NEW_FBODY( + NEW_METHOD(body->nd_body->nd_body, + data->klass, /* TODO */ + body->nd_body->nd_noex), + 0)); + } return ST_CONTINUE; } @@ -82,9 +98,11 @@ rb_mod_init_copy(VALUE clone, VALUE orig) st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0); } if (RCLASS(orig)->m_tbl) { - RCLASS(clone)->m_tbl = st_init_numtable(); + struct clone_method_data data; + data.tbl = RCLASS(clone)->m_tbl = st_init_numtable(); + data.klass = clone; st_foreach(RCLASS(orig)->m_tbl, clone_method, - (st_data_t)RCLASS(clone)->m_tbl); + (st_data_t)&data); } return clone; @@ -111,6 +129,7 @@ rb_singleton_class_clone(VALUE obj) if (!FL_TEST(klass, FL_SINGLETON)) return klass; else { + struct clone_method_data data; /* copy singleton(unnamed) class */ NEWOBJ(clone, struct RClass); OBJSETUP(clone, 0, RBASIC(klass)->flags); @@ -129,8 +148,10 @@ rb_singleton_class_clone(VALUE obj) clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl); } clone->m_tbl = st_init_numtable(); + data.tbl = clone->m_tbl; + data.klass = (VALUE)clone; st_foreach(RCLASS(klass)->m_tbl, clone_method, - (st_data_t)clone->m_tbl); + (st_data_t)&data); rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone); FL_SET(clone, FL_SINGLETON); return (VALUE)clone; @@ -359,27 +380,27 @@ rb_include_module(VALUE klass, VALUE module) OBJ_INFECT(klass, module); c = klass; while (module) { - int superclass_seen = Qfalse; + int superclass_seen = Qfalse; if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl) rb_raise(rb_eArgError, "cyclic include detected"); - /* ignore if the module included already in superclasses */ - for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) { - switch (BUILTIN_TYPE(p)) { - case T_ICLASS: - if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) { - if (!superclass_seen) { - c = p; /* move insertion point */ - } - goto skip; - } - break; - case T_CLASS: - superclass_seen = Qtrue; - break; - } - } - c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super); + /* ignore if the module included already in superclasses */ + for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) { + switch (BUILTIN_TYPE(p)) { + case T_ICLASS: + if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) { + if (!superclass_seen) { + c = p; /* move insertion point */ + } + goto skip; + } + break; + case T_CLASS: + superclass_seen = Qtrue; + break; + } + } + c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super); changed = 1; skip: module = RCLASS(module)->super; @@ -492,6 +513,7 @@ static int ins_methods_push(ID name, long type, VALUE ary, long visi) { if (type == -1) return ST_CONTINUE; + switch (visi) { case NOEX_PRIVATE: case NOEX_PROTECTED: @@ -544,10 +566,17 @@ method_entry(ID key, NODE *body, st_table *list) { long type; - if (key == ID_ALLOCATOR) return ST_CONTINUE; + if (key == ID_ALLOCATOR) { + return ST_CONTINUE; + } + if (!st_lookup(list, key, 0)) { - if (!body->nd_body) type = -1; /* none */ - else type = VISI(body->nd_noex); + if (body ==0 || !body->nd_body->nd_body) { + type = -1; /* none */ + } + else { + type = VISI(body->nd_body->nd_noex); + } st_add_direct(list, key, type); } return ST_CONTINUE; @@ -1,15 +1,11 @@ bin: $(PROGRAM) $(WPROGRAM) -lib: $(LIBRUBY) -dll: $(LIBRUBY_SO) +lib: $(LIBRUBY); +dll: $(LIBRUBY_SO); RUBYOPT = -STATIC_RUBY = static-ruby - EXTCONF = extconf.rb RBCONFIG = ./.rbconfig.time -LIBRUBY_EXTS = ./.libruby-with-ext.time -RDOCOUT = $(EXTOUT)/rdoc DMYEXT = dmyext.$(OBJEXT) MAINOBJ = main.$(OBJEXT) @@ -28,6 +24,9 @@ OBJS = array.$(OBJEXT) \ error.$(OBJEXT) \ euc_jp.$(OBJEXT) \ eval.$(OBJEXT) \ + eval_load.$(OBJEXT) \ + eval_proc.$(OBJEXT) \ + eval_thread.$(OBJEXT) \ file.$(OBJEXT) \ gc.$(OBJEXT) \ hash.$(OBJEXT) \ @@ -61,218 +60,94 @@ OBJS = array.$(OBJEXT) \ util.$(OBJEXT) \ variable.$(OBJEXT) \ version.$(OBJEXT) \ + blockinlining.$(OBJEXT) \ + compile.$(OBJEXT) \ + debug.$(OBJEXT) \ + iseq.$(OBJEXT) \ + vm.$(OBJEXT) \ + vm_dump.$(OBJEXT) \ + yarvcore.$(OBJEXT) \ + thread.$(OBJEXT) \ $(MISSING) SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ - --extout="$(EXTOUT)" \ --make="$(MAKE)" \ --mflags="$(MFLAGS)" \ --make-flags="$(MAKEFLAGS)" -EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) -- -INSTRUBY_ARGS = $(SCRIPT_ARGS) --installed-list $(INSTALLED_LIST) - -PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \ - $(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE) - -TESTSDIR = $(srcdir)/test -TESTWORKDIR = testwork +EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) - @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) + $(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) + prog: $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT) $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) -$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE) +$(LIBRUBY_A): $(OBJS) $(DMYEXT) -$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) +$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(ARCHFILE) -$(LIBRUBY_EXTS): - @exit > $@ - -$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) +static-ruby: $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) @$(RM) $@ - $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS) + $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ -ruby.imp: $(OBJS) - @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ +ruby.imp: $(LIBRUBY_A) + @$(NM) -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ install: install-nodoc $(RDOCTARGET) install-all: install-nodoc install-doc -install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc -pre-install-nodoc:: pre-install-local pre-install-ext -do-install-nodoc: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --mantype="$(MANTYPE)" -post-install-nodoc:: post-install-local post-install-ext - +install-nodoc: install-local install-ext install-local: pre-install-local do-install-local post-install-local -pre-install-local:: pre-install-bin pre-install-lib pre-install-man -do-install-local: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)" -post-install-local:: post-install-bin post-install-lib post-install-man - install-ext: pre-install-ext do-install-ext post-install-ext -pre-install-ext:: pre-install-ext-arch pre-install-ext-comm -do-install-ext: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext -post-install-ext:: post-install-ext-arch post-install-ext-comm - -install-arch: pre-install-arch do-install-arch post-install-arch -pre-install-arch:: pre-install-bin pre-install-ext-arch -do-install-arch: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin --install=ext-arch -post-install-arch:: post-install-bin post-install-ext-arch - -install-comm: pre-install-comm do-install-comm post-install-comm -pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man -do-install-comm: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man -post-install-comm:: post-install-lib post-install-ext-comm post-install-man - -install-bin: pre-install-bin do-install-bin post-install-bin -pre-install-bin:: install-prereq -do-install-bin: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin -post-install-bin:: - @$(NULLCMD) - -install-lib: pre-install-lib do-install-lib post-install-lib -pre-install-lib:: install-prereq -do-install-lib: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib -post-install-lib:: - @$(NULLCMD) - -install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm -pre-install-ext-comm:: install-prereq -do-install-ext-comm: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-comm -post-install-ext-comm:: - @$(NULLCMD) - -install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch -pre-install-ext-arch:: install-prereq -do-install-ext-arch: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-arch -post-install-ext-arch:: - @$(NULLCMD) - -install-man: pre-install-man do-install-man post-install-man -pre-install-man:: install-prereq -do-install-man: - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" -post-install-man:: - @$(NULLCMD) - -what-where: no-install -no-install: no-install-nodoc no-install-doc -what-where-all: no-install-all -no-install-all: no-install-nodoc - -what-where-nodoc: no-install-nodoc -no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc -pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext -dont-install-nodoc: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --mantype="$(MANTYPE)" -post-no-install-nodoc:: post-no-install-local post-no-install-ext -what-where-local: no-install-local -no-install-local: pre-no-install-local dont-install-local post-no-install-local -pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man -dont-install-local: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)" -post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man +do-install-local: $(RBCONFIG) + $(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --mantype="$(MANTYPE)" +do-install-ext: $(RBCONFIG) + $(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) install + +install-bin: $(RBCONFIG) + $(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=bin +install-lib: $(RBCONFIG) + $(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=lib +install-man: $(RBCONFIG) + $(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=man --mantype="$(MANTYPE)" +what-where-all no-install-all: no-install no-install-doc +what-where no-install: no-install-local no-install-ext +what-where-local: no-install-local +no-install-local: $(RBCONFIG) + $(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)" what-where-ext: no-install-ext -no-install-ext: pre-no-install-ext dont-install-ext post-no-install-ext -pre-no-install-ext:: pre-no-install-ext-arch pre-no-install-ext-comm -dont-install-ext: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext -post-no-install-ext:: post-no-install-ext-arch post-no-install-ext-comm - -what-where-arch: no-install-arch -no-install-arch: pre-no-install-arch dont-install-arch post-no-install-arch -pre-no-install-arch:: pre-no-install-bin pre-no-install-ext-arch -dont-install-arch: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin --install=ext-arch -post-no-install-arch:: post-no-install-lib post-no-install-man post-no-install-ext-arch - -what-where-comm: no-install-comm -no-install-comm: pre-no-install-comm dont-install-comm post-no-install-comm -pre-no-install-comm:: pre-no-install-lib pre-no-install-ext-comm pre-no-install-man -dont-install-comm: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man -post-no-install-comm:: post-no-install-lib post-no-install-ext-comm post-no-install-man - -what-where-bin: no-install-bin -no-install-bin: pre-no-install-bin dont-install-bin post-no-install-bin -pre-no-install-bin:: install-prereq -dont-install-bin: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin -post-no-install-bin:: - @$(NULLCMD) - -what-where-lib: no-install-lib -no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib -pre-no-install-lib:: install-prereq -dont-install-lib: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib -post-no-install-lib:: - @$(NULLCMD) - -what-where-ext-comm: no-install-ext-comm -no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm -pre-no-install-ext-comm:: install-prereq -dont-install-ext-comm: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-comm -post-no-install-ext-comm:: - @$(NULLCMD) - -what-where-ext-arch: no-install-ext-arch -no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch -pre-no-install-ext-arch:: install-prereq -dont-install-ext-arch: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-arch -post-no-install-ext-arch:: - @$(NULLCMD) - -what-where-man: no-install-man -no-install-man: pre-no-install-man dont-install-man post-no-install-man -pre-no-install-man:: install-prereq -dont-install-man: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" -post-no-install-man:: - @$(NULLCMD) - -install-doc: rdoc pre-install-doc do-install-doc post-install-doc -pre-install-doc:: install-prereq -do-install-doc: $(PROGRAM) - $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)" -post-install-doc:: - @$(NULLCMD) +no-install-ext: $(RBCONFIG) + $(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(EXTMK_ARGS) install -rdoc: $(PROGRAM) PHONY +install-doc: pre-install-doc do-install-doc post-install-doc +do-install-doc: $(PROGRAM) @echo Generating RDoc documentation - $(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)" + $(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RIDATADIR)" "$(srcdir)" + +pre-install: pre-install-local pre-install-ext +pre-install-local:: PHONY +pre-install-ext:: PHONY +pre-install-doc:: PHONY -what-where-doc: no-install-doc -no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc -pre-no-install-doc:: install-prereq -dont-install-doc:: - $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)" -post-no-install-doc:: - @$(NULLCMD) +post-install: post-install-local post-install-ext +post-install-local:: PHONY +post-install-ext:: PHONY +post-install-doc:: PHONY -install-prereq: - @exit > $(INSTALLED_LIST) +# no ext +# clean: clean-ext clean-local +clean: clean-local -clean: clean-ext clean-local clean-local:: @$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) - @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time + @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) + @$(RM) *.inc + clean-ext: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean @@ -292,15 +167,15 @@ check: test test-all test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY @$(MINIRUBY) $(srcdir)/rubytest.rb -test-all: - $(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS) +test-all: miniruby$(EXEEXT) ruby + $(RUNRUBY) -C "$(srcdir)/test" runner.rb --runner=$(TESTUI) $(TESTS) extconf: $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) - @$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ + $(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb @@ -336,8 +211,6 @@ nt.$(OBJEXT): {$(VPATH)}nt.c x68.$(OBJEXT): {$(VPATH)}x68.c os2.$(OBJEXT): {$(VPATH)}os2.c dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c -ia64.$(OBJEXT): {$(VPATH)}ia64.s - $(CC) $(CFLAGS) -c $< # when I use -I., there is confliction at "OpenFile" # so, set . into environment varible "include" @@ -374,13 +247,41 @@ enumerator.$(OBJEXT): {$(VPATH)}enumerator.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}env.h {$(VPATH)}st.h + {$(VPATH)}st.h vm_opts.h euc_jp.$(OBJEXT): {$(VPATH)}euc_jp.c {$(VPATH)}regenc.h \ {$(VPATH)}oniguruma.h -eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \ + +eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h \ + {$(VPATH)}eval_method.h {$(VPATH)}eval_safe.h {$(VPATH)}eval_jump.h \ + {$(VPATH)}ruby.h config.h {$(VPATH)}yarvcore.h \ + {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ + {$(VPATH)}node.h {$(VPATH)}util.h \ + {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}yarv.h +eval_load.$(OBJEXT): {$(VPATH)}eval_load.c {$(VPATH)}eval_intern.h \ + {$(VPATH)}ruby.h config.h \ + {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ + {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}yarvcore.h \ + {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}yarv.h +eval_thread.$(OBJEXT): {$(VPATH)}eval_thread.c {$(VPATH)}eval_intern.h \ + {$(VPATH)}ruby.h config.h {$(VPATH)}yarvcore.h \ + {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ + {$(VPATH)}node.h {$(VPATH)}util.h \ + {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}yarv.h +eval_proc.$(OBJEXT): {$(VPATH)}eval_proc.c {$(VPATH)}eval_intern.h \ + {$(VPATH)}ruby.h config.h {$(VPATH)}yarvcore.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \ - {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h + {$(VPATH)}node.h {$(VPATH)}util.h \ + {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}yarv.h + +thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \ + {$(VPATH)}thread_win32.h {$(VPATH)}thread_pthread.h \ + {$(VPATH)}thread_win32.ci {$(VPATH)}thread_pthread.ci \ + {$(VPATH)}ruby.h config.h \ + {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ + {$(VPATH)}node.h {$(VPATH)}util.h \ + {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h \ + {$(VPATH)}yarv.h {$(VPATH)}yarvcore.h + file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \ @@ -388,8 +289,7 @@ file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \ gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \ - {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}regint.h \ - {$(VPATH)}oniguruma.h + {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}yarvcore.h hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h @@ -406,7 +306,7 @@ marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \ math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \ - {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \ + {$(VPATH)}defines.h {$(VPATH)}intern.h \ {$(VPATH)}missing.h object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ @@ -415,7 +315,7 @@ pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \ + {$(VPATH)}node.h {$(VPATH)}st.h \ {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h @@ -428,7 +328,7 @@ range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}regint.h {$(VPATH)}oniguruma.h + {$(VPATH)}re.h {$(VPATH)}regex.h regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}oniguruma.h \ {$(VPATH)}regint.h {$(VPATH)}regparse.h {$(VPATH)}regenc.h config.h regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \ @@ -444,7 +344,7 @@ ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}rubysig.h + {$(VPATH)}rubysig.h {$(VPATH)}yarvcore.h sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \ {$(VPATH)}oniguruma.h config.h sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \ @@ -452,7 +352,7 @@ sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \ st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}regint.h {$(VPATH)}oniguruma.h + {$(VPATH)}re.h {$(VPATH)}regex.h struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \ @@ -464,7 +364,112 @@ util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}util.h variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h + {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ - {$(VPATH)}version.h + {$(VPATH)}version.h {$(VPATH)}yarv_version.h + +compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}yarvcore.h \ + {$(VPATH)}compile.h {$(VPATH)}debug.h \ + insns.inc insns_info.inc optinsn.inc opt_sc.inc optunifs.inc vm_opts.h +iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}yarvcore.h {$(VPATH)}debug.h vm_opts.h +vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}vm.h {$(VPATH)}insnhelper.h \ + {$(VPATH)}yarvcore.h {$(VPATH)}debug.h \ + {$(VPATH)}vm_evalbody.ci {$(VPATH)}call_cfunc.ci \ + insns.inc vm.inc vmtc.inc vm_macro.inc vm_opts.h {$(VPATH)}eval_intern.h +vm_dump.$(OBJEXT): {$(VPATH)}yarvcore.h {$(VPATH)}vm.h +yarvcore.$(OBJEXT): {$(VPATH)}yarvcore.c {$(VPATH)}yarvcore.h \ + {$(VPATH)}yarv_version.h {$(VPATH)}debug.h +debug.$(OBJEXT): {$(VPATH)}debug.h +blockinlining.$(OBJEXT): {$(VPATH)}yarv.h {$(VPATH)}yarvcore.h vm_opts.h + + +BASERUBY = ruby + +INSNS2VMOPT = $(CPPFLAGS) --srcdir=$(srcdir) + +minsns.inc: + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) + +opt_sc.inc: + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) + +optinsn.inc: + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) optinsn.inc + +optunifs.inc: + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) optunifs.inc + +insns.inc: + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) + +vmtc.inc: + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) vmtc.inc + +vm.inc: $(srcdir)/insns.def + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) vm.inc + +vm_macro.inc: $(srcdir)/vm_macro.def + $(BASERUBY) $(srcdir)/rb/insns2vm.rb $(INSNS2VMOPT) vm_macro.inc + +vm_opts.h: $(srcdir)/vm_opts.h.base + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) + +incs: + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) + +docs: + $(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT) + +yarv-test-all: miniruby$(EXEEXT) + $(BASERUBY) -I$(srcdir) $(srcdir)/yarvtest/runner.rb $(OPT) yarv=$(MINIRUBY) ruby=$(BASERUBY) + +yarv-test-each: miniruby$(EXEEXT) + $(BASERUBY) -I$(srcdir) $(srcdir)/yarvtest/test_$(ITEM).rb $(OPT) yarv=$(MINIRUBY) ruby=$(BASERUBY) + +allload: miniruby$(EXEEXT) + $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/allload.rb `$(BASERUBY) -rrbconfig -e 'print Config::CONFIG["rubylibdir"]'` + +run: miniruby$(EXEEXT) + $(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb $(RUNOPT) + +runruby: $(RUBY) + ./$(RUBY) -I$(srcdir)/lib -I. $(srcdir)/tool/runruby.rb $(srcdir)/test.rb + +parse: miniruby$(EXEEXT) + $(MINIRUBY) $(srcdir)/tool/parse.rb $(srcdir)/test.rb + +benchmark: $(RUBY) + $(BASERUBY) -I$(srcdir) -I$(srcdir)/lib $(srcdir)/benchmark/run_rite.rb $(OPT) $(ITEMS) --yarv-program=./$(PROGRAM) --ruby-program=$(BASERUBY) --opts=-I$(srcdir)/lib + +tbench: prog + $(BASERUBY) -I$(srcdir) -I$(srcdir)/lib $(srcdir)/benchmark/run_rite.rb bmx $(OPT) --yarv-program=./$(PROGRAM) --ruby-program=$(BASERUBY) --opts=-I$(srcdir)/lib + +bench-each: $(RUBY) + $(BASERUBY) -I$(srcdir) $(srcdir)/benchmark/run_rite.rb bm_$(ITEM) $(OPT) --yarv-program=./$(RUBY) --ruby-program=$(BASERUBY) --opts=-I$(srcdir)/lib + +aotc: + $(RUBY) -I$(srcdir) -I. $(srcdir)/tool/aotcompile.rb $(INSNS2VMOPT) + +# for GCC +vmasm: + $(CC) $(CFLAGS) $(CPPFLAGS) -S $(srcdir)/vm.c + +# vm.o : CFLAGS += -fno-crossjumping + +run.gdb: + echo b debug_breakpoint > run.gdb + echo handle SIGINT nostop + echo handle SIGPIPE nostop + echo run >> run.gdb + +gdb: miniruby$(EXEEXT) run.gdb + gdb -x run.gdb --quiet --args $(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb + +# Intel VTune + +vtune: miniruby$(EXEEXT) + vtl activity -c sampling -app ".\miniruby$(EXEEXT)","-I$(srcdir)/lib $(srcdir)/test.rb" run + vtl view -hf -mn miniruby$(EXEEXT) -sum -sort -cd + vtl view -ha -mn miniruby$(EXEEXT) -sum -sort -cd | $(BASERUBY) $(srcdir)/tool/vtlh.rb > ha.lines + diff --git a/compile.c b/compile.c new file mode 100644 index 0000000000..025e655457 --- /dev/null +++ b/compile.c @@ -0,0 +1,4914 @@ +/********************************************************************** + + compile.c - ruby node tree -> yarv instruction sequence + + $Author$ + $Date$ + created at: 04/01/01 03:42:15 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#include "ruby.h" +#include "node.h" + +#include "yarvcore.h" +#include "compile.h" +#include "insns.inc" +#include "insns_info.inc" + + +#ifdef HAVE_STDARG_PROTOTYPES +#include <stdarg.h> +#define va_init_list(a,b) va_start(a,b) +#else +#include <varargs.h> +#define va_init_list(a,b) va_start(a) +#endif + +/* types */ + +#define ISEQ_ELEMENT_NONE INT2FIX(0x00) +#define ISEQ_ELEMENT_LABEL INT2FIX(0x01) +#define ISEQ_ELEMENT_INSN INT2FIX(0x02) +#define ISEQ_ELEMENT_SEQ INT2FIX(0x03) + +typedef struct iseq_link_element { + int type; + struct iseq_link_element *next; + struct iseq_link_element *prev; +} LINK_ELEMENT; + +typedef struct iseq_link_anchor { + LINK_ELEMENT anchor; + LINK_ELEMENT *last; +} LINK_ANCHOR; + +typedef struct iseq_label_data { + LINK_ELEMENT link; + int label_no; + int position; + int sc_state; + int set; + int sp; +} LABEL; + +typedef struct iseq_insn_data { + LINK_ELEMENT link; + int insn_id; + int line_no; + int operand_size; + int sc_state; + VALUE *operands; +} INSN; + +struct ensure_range { + LABEL *begin; + LABEL *end; + struct ensure_range *next; +}; + +struct iseq_compile_data_ensure_node_stack { + NODE *ensure_node; + struct iseq_compile_data_ensure_node_stack *prev; + struct ensure_range *erange; +}; + + +/* for debug */ +#if CPDEBUG > 0 +static long gl_node_level = 0; +static long gl_tmp = 0; +static void debug_list(LINK_ANCHOR *anchor); +#endif + +static void dump_disasm_anchor(LINK_ANCHOR *anc); +static void dump_disasm_list(LINK_ELEMENT *elem); + +static int insn_data_length(INSN *iobj); +static int insn_data_line_no(INSN *iobj); +static int calc_sp_depth(int depth, INSN *iobj); +static int insn_ret_num(int insn); + +static void ADD_ELEM(LINK_ANCHOR *anchor, LINK_ELEMENT *elem); + +static INSN *new_insn_body(yarv_iseq_t *iseq, int line_no, + int insn_id, int argc, ...); +static LABEL *new_label_body(yarv_iseq_t *iseq, int line); + +static int iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *anchor, + NODE * n, int); +static int iseq_setup(yarv_iseq_t *iseq, LINK_ANCHOR *anchor); + +static int iseq_optimize(yarv_iseq_t *iseq, LINK_ANCHOR *anchor); +static int iseq_insns_unification(yarv_iseq_t *iseq, LINK_ANCHOR *anchor); +static int set_sequence_stackcaching(yarv_iseq_t *iseq, LINK_ANCHOR *anchor); +static int set_sequence(yarv_iseq_t *iseq, LINK_ANCHOR *anchor); + +static int set_exception_table(yarv_iseq_t *iseq); +static int set_localtbl(yarv_iseq_t *iseq, ID *tbl); +static int set_localtbl_eval(yarv_iseq_t *iseq, ID *tbl); +static int set_arguments(yarv_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node); +static NODE *set_block_local_tbl(yarv_iseq_t *iseq, NODE * node, + LINK_ANCHOR *anchor); +static int set_exception_tbl(yarv_iseq_t *iseq); +static int set_optargs_table(yarv_iseq_t *iseq); + +static int +iseq_add_mark_object(yarv_iseq_t *iseq, VALUE v) +{ + rb_ary_push(iseq->iseq_mark_ary, v); + return COMPILE_OK; +} + +static int +iseq_add_mark_object_compile_time(yarv_iseq_t *iseq, VALUE v) +{ + rb_ary_push(iseq->compile_data->mark_ary, v); + return COMPILE_OK; +} + + +#include "optinsn.inc" + +#if OPT_INSTRUCTIONS_UNIFICATION +#include "optunifs.inc" +#endif + +VALUE +iseq_compile(VALUE self, NODE *narg) +{ + DECL_ANCHOR(list_anchor); + yarv_iseq_t *iseq; + NODE *node = (NODE *) narg; + GetISeqPtr(self, iseq); + + debugs("[compile step 1 (traverse each node)]\n"); + + + iseq->node = node; + + if (iseq->type == ISEQ_TYPE_BLOCK) { + node = set_block_local_tbl(iseq, node, list_anchor); + } + + if (node && nd_type(node) == NODE_SCOPE) { + /* with node scope */ + NODE *sn_body = node->nd_next; /* sn: scope node */ + NODE *ndargs = 0; + + if (iseq->type != ISEQ_TYPE_BLOCK) { + set_localtbl(iseq, ((NODE *) node)->nd_tbl); + } + + if (sn_body) { + switch (nd_type(sn_body)) { + case NODE_BLOCK: + if (nd_type(sn_body->nd_head) == NODE_ARGS) { + /* some method attribute process */ + ndargs = sn_body->nd_head; + set_arguments(iseq, list_anchor, ndargs); + + /* with sn_body->nd_head */ + if (iseq->type == ISEQ_TYPE_METHOD) { + COMPILE(list_anchor, "normal method", + sn_body->nd_next); + } + else if (iseq->type == ISEQ_TYPE_CLASS) { + COMPILE(list_anchor, "class/module", + sn_body->nd_next); + } + else { + rb_bug("must be class or method"); + } + } + else { + /* normal block */ + if (iseq->type == ISEQ_TYPE_CLASS) { + COMPILE(list_anchor, "class/module", sn_body); + } + else if (iseq->type == ISEQ_TYPE_BLOCK) { + COMPILE(list_anchor, "normal block", sn_body); + } + else { + rb_bug("must be class or block"); + } + } + break; + case NODE_ARGS: + /* empty method */ + /* some method attribute process */ + debugs("empty method\n"); + + set_arguments(iseq, list_anchor, sn_body); + ADD_INSN(list_anchor, nd_line(sn_body), putnil); + break; + + default: + COMPILE(list_anchor, "other scope", sn_body); + break; + } + } + else { + /* sn_body == 0 */ + ADD_INSN(list_anchor, 0, putnil); + } + } + else { + if (iseq->type == ISEQ_TYPE_BLOCK) { + VALUE tmp; + LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0); + LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0); + + ADD_LABEL(list_anchor, iseq->compile_data->start_label); + COMPILE(list_anchor, "block body", node); + ADD_LABEL(list_anchor, iseq->compile_data->end_label); + + /* wide range catch handler must put at last */ + ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start); + ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, 0, end); + } + else if (iseq->type == ISEQ_TYPE_TOP) { + set_localtbl(iseq, GET_THREAD()->top_local_tbl); + COMPILE(list_anchor, "top level node", node); + } + else if (iseq->type == ISEQ_TYPE_EVAL) { + set_localtbl_eval(iseq, GET_THREAD()->top_local_tbl); + COMPILE(list_anchor, "eval node", node); + } + else if (iseq->type == ISEQ_TYPE_RESCUE) { + set_exception_tbl(iseq); + COMPILE(list_anchor, "rescue", node); + } + else if (iseq->type == ISEQ_TYPE_ENSURE) { + set_exception_tbl(iseq); + COMPILE_POPED(list_anchor, "ensure", node); + } + else if (iseq->type == ISEQ_TYPE_DEFINED_GUARD) { + COMPILE(list_anchor, "defined guard", node); + } + else if (node == 0) { + COMPILE(list_anchor, "nil", node); + } + else { + rb_bug("unknown scope"); + } + } + + GC_CHECK(); + + if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) { + ADD_INSN2(list_anchor, 0, getdynamic, INT2FIX(1), INT2FIX(0)); + ADD_INSN1(list_anchor, 0, throw, INT2FIX(0) /* continue throw */ ); + } + else { + ADD_INSN(list_anchor, iseq->compile_data->last_line, leave); + } + + return iseq_setup(iseq, list_anchor); +} + +VALUE th_eval(void *); + +static int +iseq_translate_direct_threaded_code(yarv_iseq_t *iseq) +{ +#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE + +#if OPT_DIRECT_THREADED_CODE + void **table = (void **)th_eval(0); +#else + extern void **insns_address_table(); + void **table = get_insns_address_table(); +#endif + int i; + + iseq->iseq_encoded = ALLOC_N(VALUE, iseq->size); + MEMCPY(iseq->iseq_encoded, iseq->iseq, VALUE, iseq->size); + + for (i = 0; i < iseq->size; /* */ ) { + int insn = iseq->iseq_encoded[i]; + int len = insn_len(insn); + iseq->iseq_encoded[i] = (VALUE)table[insn]; + i += len; + } +#else + iseq->iseq_encoded = iseq->iseq; +#endif + return COMPILE_OK; +} + +/*********************************************/ +/* definition of data structure for compiler */ +/*********************************************/ + + +static void * +compile_data_alloc(yarv_iseq_t *iseq, size_t size) +{ + void *ptr = 0; + struct iseq_compile_data_storage *storage = + iseq->compile_data->storage_current; + + if (storage->pos + size > storage->size) { + unsigned long alloc_size = storage->size * 2; + + retry: + if (alloc_size < size) { + alloc_size *= 2; + goto retry; + } + storage->next = (void *)ALLOC_N(char, alloc_size + + sizeof(struct + iseq_compile_data_storage)); + storage = iseq->compile_data->storage_current = storage->next; + + storage->next = 0; + storage->pos = 0; + storage->size = alloc_size; + storage->buff = (char *)(&storage->buff + 1); + } + + ptr = (void *)&storage->buff[storage->pos]; + storage->pos += size; + return ptr; +} + +static INSN * +compile_data_alloc_insn(yarv_iseq_t *iseq) +{ + return (INSN *)compile_data_alloc(iseq, sizeof(INSN)); +} + +static LABEL * +compile_data_alloc_label(yarv_iseq_t *iseq) +{ + return (LABEL *)compile_data_alloc(iseq, sizeof(LABEL)); +} + +/* + * To make Array to LinkedList, use link_anchor + */ + +static void +verify_list(char *info, LINK_ANCHOR *anchor) +{ +#if CPDEBUG > 0 + int flag = 0; + LINK_ELEMENT *list = anchor->anchor.next, *plist = &anchor->anchor; + + while (list) { + if (plist != list->prev) { + flag += 1; + } + plist = list; + list = list->next; + } + + if (anchor->last != plist && anchor->last != 0) { + flag |= 0x70000; + } + + if (flag != 0) { + rb_bug("list verify error: %08x (%s)", flag, info); + } +#endif +} + +/* + * elem1, elem2 => elem1, elem2, elem + */ +static void +ADD_ELEM(LINK_ANCHOR *anchor, LINK_ELEMENT *elem) +{ + elem->prev = anchor->last; + anchor->last->next = elem; + anchor->last = elem; + verify_list("add", anchor); +} + +/*******************************************/ +#if 0 +/* + * elem1, elemX => elem1, elem2, elemX + */ +static void +INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2) +{ + elem2->next = elem1->next; + elem2->prev = elem1; + elem1->next = elem2; + if (elem2->next) { + elem2->next->prev = elem2; + } +} +#endif + +/* + * elemX, elem1 => elemX, elem2, elem1 + */ +static void +INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2) +{ + elem2->prev = elem1->prev; + elem2->next = elem1; + elem1->prev = elem2; + if (elem2->prev) { + elem2->prev->next = elem2; + } +} +/*******************************************/ + +/* + * elemX, elem1, elemY => elemX, elem2, elemY + */ +static void +REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2) +{ + elem2->prev = elem1->prev; + elem2->next = elem1->next; + if (elem1->prev) { + elem1->prev->next = elem2; + } + if (elem1->next) { + elem1->next->prev = elem2; + } +} + +static void +REMOVE_ELEM(LINK_ELEMENT *elem) +{ + elem->prev->next = elem->next; + if (elem->next) { + elem->next->prev = elem->prev; + } +} + +static LINK_ELEMENT * +FIRST_ELEMENT(LINK_ANCHOR *anchor) +{ + return anchor->anchor.next; +} + +/* +static LINK_ELEMENT * +LAST_ELEMENT(LINK_ANCHOR *anchor) +{ + return anchor->last; +} + */ + +static LINK_ELEMENT * +POP_ELEMENT(LINK_ANCHOR *anchor) +{ + LINK_ELEMENT *elem = anchor->last; + anchor->last = anchor->last->prev; + anchor->last->next = 0; + verify_list("pop", anchor); + return elem; +} + +static LINK_ELEMENT * +SHIFT_ELEMENT(LINK_ANCHOR *anchor) +{ + LINK_ELEMENT *elem = anchor->anchor.next; + if (elem) { + anchor->anchor.next = elem->next; + } + return elem; +} + +static int +LIST_SIZE(LINK_ANCHOR *anchor) +{ + LINK_ELEMENT *elem = anchor->anchor.next; + int size = 0; + while (elem) { + size += 1; + elem = elem->next; + } + return size; +} + +static int +LIST_SIZE_ZERO(LINK_ANCHOR *anchor) +{ + if (anchor->anchor.next == 0) { + return 1; + } + else { + return 0; + } +} + +/* + * anc1: e1, e2, e3 + * anc2: e4, e5 + *#=> + * anc1: e1, e2, e3, e4, e5 + * anc2: e4, e5 (broken) + */ +static void +APPEND_LIST(LINK_ANCHOR *anc1, LINK_ANCHOR *anc2) +{ + if (anc2->anchor.next) { + anc1->last->next = anc2->anchor.next; + anc2->anchor.next->prev = anc1->last; + anc1->last = anc2->last; + } + verify_list("append", anc1); +} + +/* + * anc1: e1, e2, e3 + * anc2: e4, e5 + *#=> + * anc1: e4, e5, e1, e2, e3 + * anc2: e4, e5 (broken) + */ +static void +INSERT_LIST(LINK_ANCHOR *anc1, LINK_ANCHOR *anc2) +{ + if (anc2->anchor.next) { + LINK_ELEMENT *first = anc1->anchor.next; + anc1->anchor.next = anc2->anchor.next; + anc1->anchor.next->prev = &anc1->anchor; + anc2->last->next = first; + if (first) { + first->prev = anc2->last; + } + else { + anc1->last = anc2->last; + } + } + + verify_list("append", anc1); +} + +#if 0 +/* + * anc1: e1, e2, e3 + * anc2: e4, e5 + *#=> + * anc1: e4, e5 + * anc2: e1, e2, e3 + */ +static void +SWAP_LIST(LINK_ANCHOR *anc1, LINK_ANCHOR *anc2) +{ + LINK_ANCHOR tmp = *anc2; + + /* it has bug */ + *anc2 = *anc1; + *anc1 = tmp; + + verify_list("swap1", anc1); + verify_list("swap2", anc2); +} + +static LINK_ANCHOR * +REVERSE_LIST(LINK_ANCHOR *anc) +{ + LINK_ELEMENT *first, *last, *elem, *e; + first = &anc->anchor; + elem = first->next; + last = anc->last; + + if (elem != 0) { + anc->anchor.next = last; + anc->last = elem; + } + else { + /* null list */ + return anc; + } + while (elem) { + e = elem->next; + elem->next = elem->prev; + elem->prev = e; + elem = e; + } + + first->next = last; + last->prev = first; + anc->last->next = 0; + + verify_list("reverse", anc); + return anc; +} +#endif + +#if CPDEBUG > 0 +static void +debug_list(LINK_ANCHOR *anchor) +{ + LINK_ELEMENT *list = FIRST_ELEMENT(anchor); + printf("----\n"); + printf("anch: %p, frst: %p, last: %p\n", &anchor->anchor, + anchor->anchor.next, anchor->last); + while (list) { + printf("curr: %p, next: %p, prev: %p, type: %d\n", list, list->next, + list->prev, FIX2INT(list->type)); + list = list->next; + } + printf("----\n"); + + dump_disasm_list(anchor->anchor.next); + verify_list("debug list", anchor); +} +#endif + +static LABEL * +new_label_body(yarv_iseq_t *iseq, int line) +{ + LABEL *labelobj = compile_data_alloc_label(iseq); + static int label_no = 0; + + labelobj->link.type = ISEQ_ELEMENT_LABEL; + labelobj->link.next = 0; + + labelobj->label_no = label_no++; + labelobj->sc_state = 0; + labelobj->sp = -1; + return labelobj; +} + +static INSN * +new_insn_core(yarv_iseq_t *iseq, int line_no, + int insn_id, int argc, VALUE *argv) +{ + INSN *iobj = compile_data_alloc_insn(iseq); + + iobj->link.type = ISEQ_ELEMENT_INSN; + iobj->link.next = 0; + iobj->insn_id = insn_id; + iobj->line_no = line_no; + iobj->operands = argv; + iobj->operand_size = argc; + iobj->sc_state = 0; + return iobj; +} + +static INSN * +new_insn_body(yarv_iseq_t *iseq, int line_no, int insn_id, int argc, ...) +{ + VALUE *operands = 0; + va_list argv; + if (argc > 0) { + int i; + va_init_list(argv, argc); + operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc); + for (i = 0; i < argc; i++) { + VALUE v = va_arg(argv, VALUE); + operands[i] = v; + } + va_end(argv); + } + return new_insn_core(iseq, line_no, insn_id, argc, operands); +} + +static INSN * +new_insn_send(yarv_iseq_t *iseq, int line_no, + VALUE id, VALUE argc, VALUE block, VALUE flag) +{ + INSN *iobj = 0; + VALUE *operands = + (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 5); + operands[0] = id; + operands[1] = argc; + operands[2] = block; + operands[3] = flag; + operands[4] = 0; + iobj = new_insn_core(iseq, line_no, BIN(send), 5, operands); + return iobj; +} + +static VALUE +new_child_iseq(yarv_iseq_t *iseq, NODE *node, + VALUE name, VALUE parent, VALUE type) +{ + VALUE args[6]; + VALUE ret; + + debugs("[new_child_iseq]> ---------------------------------------\n"); + ret = yarv_iseq_new_with_opt(node, name, iseq_filename(iseq->self), + parent, type, iseq->compile_data->option); + debugs("[new_child_iseq]< ---------------------------------------\n"); + iseq_add_mark_object(iseq, ret); + return ret; +} + +static int +iseq_setup(yarv_iseq_t *iseq, LINK_ANCHOR *anchor) +{ + // debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); + + GC_CHECK(); + if (CPDEBUG > 5) + dump_disasm_list(FIRST_ELEMENT(anchor)); + GC_CHECK(); + + debugs("[compile step 3.1 (iseq_optimize)]\n"); + iseq_optimize(iseq, anchor); + + if (CPDEBUG > 5) + dump_disasm_list(FIRST_ELEMENT(anchor)); + GC_CHECK(); + + if (iseq->compile_data->option->instructions_unification) { + debugs("[compile step 3.2 (iseq_insns_unification)]\n"); + iseq_insns_unification(iseq, anchor); + if (CPDEBUG > 5) + dump_disasm_list(FIRST_ELEMENT(anchor)); + GC_CHECK(); + } + + if (iseq->compile_data->option->stack_caching) { + debugs("[compile step 3.3 (set_sequence_stackcaching)]\n"); + set_sequence_stackcaching(iseq, anchor); + if (CPDEBUG > 5) + dump_disasm_list(FIRST_ELEMENT(anchor)); + GC_CHECK(); + } + + debugs("[compile step 4.1 (set_sequence)]\n"); + set_sequence(iseq, anchor); + if (CPDEBUG > 5) + dump_disasm_list(FIRST_ELEMENT(anchor)); + GC_CHECK(); + + GC_CHECK(); + debugs("[compile step 4.2 (set_exception_table)]\n"); + set_exception_table(iseq); + + debugs("[compile step 4.3 (set_optargs_table)] \n"); + set_optargs_table(iseq); + + debugs("[compile step 5 (iseq_translate_direct_threaded_code)] \n"); + iseq_translate_direct_threaded_code(iseq); + GC_CHECK(); + + if (CPDEBUG > 1) { + VALUE str = iseq_disasm(iseq->self); + printf("%s\n", StringValueCStr(str)); + fflush(stdout); + } + debugs("[compile step: finish]\n"); + + return 0; +} + +VALUE +iseq_assemble_setup(VALUE self, VALUE args, VALUE locals, VALUE insn_ary) +{ + /* unsupported */ + return Qnil; +} + +int +set_exception_tbl(yarv_iseq_t *iseq) +{ + static ID id_dollar_bang; + + if (!id_dollar_bang) { + id_dollar_bang = rb_intern("#$!"); + } + iseq->local_tbl = (ID *)ALLOC_N(ID *, 1); + iseq->local_size = 1; + iseq->local_tbl[0] = id_dollar_bang; + return COMPILE_OK; +} + +static int +search_block_local_variables(NODE * node, VALUE local_vars) +{ + switch (nd_type(node)) { + case NODE_DASGN_CURR:{ + rb_ary_push(local_vars, ID2SYM(node->nd_vid)); + break; + } + case NODE_MASGN:{ + NODE *narg = node->nd_head; + while (narg) { + search_block_local_variables(narg->nd_head, local_vars); + narg = narg->nd_next; + } + if (node->nd_args != 0 && (long)node->nd_args != -1) { + search_block_local_variables(node->nd_args, local_vars); + break; + } + } + default: + break; + } + return COMPILE_OK; +} + +static NODE * +search_block_local_parameters(yarv_iseq_t *iseq, NODE * lnode) +{ + NODE *node = lnode; + NODE *nelem; + VALUE local_vars = rb_ary_new(); + VALUE param_vars = rb_ary_new(); + + /* search args */ + if (node->nd_var && (VALUE)node->nd_var != 1) { + switch (nd_type(node->nd_var)) { + case NODE_DASGN_CURR: + iseq->argc = 1; + rb_ary_push(param_vars, ID2SYM(node->nd_var->nd_vid)); + debugi("block 1arg", node->nd_var->nd_vid); + break; + case NODE_MASGN:{ + int i; + nelem = node->nd_var->nd_head; + if (nelem != 0) { + iseq->argc = node->nd_var->nd_head->nd_alen; + for (i = 0; i < iseq->argc; i++, nelem = nelem->nd_next) { + if (nd_type(nelem->nd_head) == NODE_DASGN_CURR) { + rb_ary_push(param_vars, + ID2SYM(nelem->nd_head->nd_vid)); + debugi("block arg", nelem->nd_head->nd_vid); + } + else { + char buff[0x20]; + ID id; + int idx = iseq->argc - RARRAY_LEN(param_vars); + snprintf(buff, 0x20, "#blp%d", idx); + id = rb_intern(buff); + rb_ary_push(param_vars, ID2SYM(id)); + debugi("block arg (auto)", id); + search_block_local_variables(nelem->nd_head, + local_vars); + } + } + } + if (node->nd_var->nd_args) { + NODE *sn = node->nd_var->nd_args; + if ((long)sn != -1) { + if (nd_type(sn) == NODE_DASGN_CURR) { + rb_ary_push(param_vars, ID2SYM(sn->nd_vid)); + } + else { + rb_ary_push(param_vars, + ID2SYM(rb_intern("#blp_splat"))); + debugi("block/splat (auto)", + rb_intern("#blp_splat")); + } + } + } + break; + } + default: + rb_ary_push(param_vars, ID2SYM(rb_intern("#blp"))); + debugi("block 1arg (auto)", rb_intern("#blp")); + iseq->argc = 1; + break; + } + } + else { + iseq->argc = 0; + } + + node = node->nd_body; + + /* other block local variables 2 */ + if (node && nd_type(node) == NODE_BLOCK) { + nelem = node->nd_head; + if (nelem && nd_type(nelem) == NODE_DASGN_CURR) { + while (nelem && nd_type(nelem) == NODE_DASGN_CURR) { + if (!rb_ary_includes(local_vars, ID2SYM(nelem->nd_vid))) { + debugi("block initialized variable", nelem->nd_vid); + rb_ary_push(local_vars, ID2SYM(nelem->nd_vid)); + } + nelem = nelem->nd_value; + } + if (nelem == 0) { + node = node->nd_next; + } + } + } + + /* translate to block inlining code */ + if (iseq->special_block_builder != 0) { + node = ((NODE * (*)(yarv_iseq_t *, NODE *, NODE *, VALUE, VALUE)) + iseq->special_block_builder) (iseq, node, lnode->nd_var, + param_vars, local_vars); + } + + rb_ary_concat(param_vars, local_vars); + local_vars = param_vars; + + { + int i, size = RARRAY_LEN(local_vars); + + if (size > 0) { + iseq->local_tbl = ALLOC_N(ID, size); + for (i = 0; i < size; i++) { + iseq->local_tbl[i] = SYM2ID(RARRAY_PTR(local_vars)[i]); + debugi("block local variable", iseq->local_tbl[i]); + } + } + iseq->local_size = size; + } + return node; +} + +static int +set_block_initializer(yarv_iseq_t *iseq, NODE * node, LINK_ANCHOR *anchor, int didx) +{ + DECL_ANCHOR(anc); + LINK_ELEMENT *elem; + + COMPILE_POPED(anc, "set_block_local_tbl#masgn/other", node); + + if (nd_type(node) == NODE_ATTRASGN) { + INSN *iobj = (INSN *)anc->last->prev; + iobj->operands[1] = INT2FIX(FIX2INT(iobj->operands[1]) + 1); + INSERT_ELEM_PREV((void *)iobj, + (void *)new_insn_body(iseq, nd_line(node), + BIN(getdynamic), 2, + INT2FIX(didx), INT2FIX(0))); + } + else { + ADD_INSN2(anchor, nd_line(node), getdynamic, + INT2FIX(didx), INT2FIX(0)); + elem = FIRST_ELEMENT(anc); + if (elem->type == ISEQ_ELEMENT_INSN && + ((INSN *)elem)->insn_id == BIN(putnil)) { + SHIFT_ELEMENT(anc); + } + } + APPEND_LIST(anchor, anc); + + return COMPILE_OK; +} + +static NODE * +set_block_local_tbl(yarv_iseq_t *iseq, NODE * node, LINK_ANCHOR *anchor) +{ + NODE *rnode; + + /* argument check */ + if (iseq->type != ISEQ_TYPE_BLOCK) { + rb_bug("set_block_local_tbl: unexpected iseq type"); + } + + rnode = search_block_local_parameters(iseq, node); + + if ((VALUE)node->nd_var == 1) { + /* TODO */ + } + else if (node->nd_var) { + NODE *nargs = node->nd_var; + switch (nd_type(nargs)) { + case NODE_MASGN:{ + NODE *massign = nargs; + int i = 0; + if (nargs->nd_head != 0) { + NODE *lhsn = massign->nd_head; + + while (lhsn) { + if (nd_type(lhsn->nd_head) != NODE_DASGN_CURR) { + /* idx-th param, current level */ + set_block_initializer(iseq, lhsn->nd_head, + anchor, iseq->local_size - i); + } + i++; + lhsn = lhsn->nd_next; + } + } + + /* check rest */ + if (massign->nd_args != 0 && (long)massign->nd_args != -1) { + iseq->argc++; + iseq->arg_rest = i + 1; + + if (nd_type(massign->nd_args) != NODE_DASGN_CURR) { + set_block_initializer(iseq, massign->nd_args, + anchor, iseq->local_size - i); + } + } + else if (i == 1) { + iseq->arg_rest = -1; + } + break; + } + + case NODE_DASGN_CURR: + break; + + /* for 1.x compatibility */ + default:{ + /* first param, current level */ + set_block_initializer(iseq, nargs, anchor, iseq->local_size); + break; + } + } + } + + if (iseq->arg_opts || iseq->arg_rest) { + iseq->arg_simple = 0; + } + else { + iseq->arg_simple = 1; + } + + if (nd_type(node) == NODE_FOR) { + iseq->compile_data->for_iseq = 1; + } + return rnode; +} + +static int +get_dyna_var_idx_at_raw(yarv_iseq_t *iseq, ID id) +{ + int i; + for (i = 0; i < iseq->local_size; i++) { + if (iseq->local_tbl[i] == id) { + return i; + } + } + return -1; +} + +static int +get_dyna_var_idx(yarv_iseq_t *iseq, ID id, int *level, int *ls) +{ + int lv = 0, idx; + + while (iseq) { + if ((idx = get_dyna_var_idx_at_raw(iseq, id)) >= 0) { + *level = lv; + *ls = iseq->local_size; + return idx; + } + iseq = iseq->parent_iseq; + lv++; + } + return -1; +} + +/** + + */ +static int +set_arguments(yarv_iseq_t *iseq, LINK_ANCHOR *optargs, NODE * node) +{ + int i, j; + + if (node) { + /* normal method */ + if (node->nd_frml) { + iseq->argc = RARRAY_LEN(node->nd_frml); + } + else { + iseq->argc = 0; + } + + if (node->nd_rest) { + iseq->arg_rest = node->nd_rest->nd_cnt - 2 + 1; + } + + /* optional initializer */ + if (node->nd_opt) { + NODE *optarg = node->nd_opt; + LABEL *label; + VALUE labels = rb_ary_new(); + i = 0; + while (optarg) { + label = NEW_LABEL(nd_line(node)); + rb_ary_push(labels, (VALUE)label | 1); + ADD_LABEL(optargs, label); + COMPILE_POPED(optargs, "optarg", optarg->nd_head); + + optarg = optarg->nd_next; + i += 1; + } + /* last label */ + label = NEW_LABEL(nd_line(node)); + rb_ary_push(labels, (VALUE)label | 1); + ADD_LABEL(optargs, label); + i += 1; + + iseq->arg_opts = i; + iseq->arg_opt_tbl = ALLOC_N(VALUE, i); + MEMCPY(iseq->arg_opt_tbl, RARRAY_PTR(labels), VALUE, i); + for (j = 0; j < i; j++) { + iseq->arg_opt_tbl[j] &= ~1; + } + } + else { + iseq->arg_opts = 0; + } + } + else { + iseq->argc = 0; + iseq->arg_rest = 0; + iseq->arg_opts = 0; + } + + if (iseq->arg_rest != 0 || iseq->arg_opts != 0) { + iseq->arg_simple = 0; + } + else { + iseq->arg_simple = 1; + } + return COMPILE_OK; +} + +static int +set_localtbl(yarv_iseq_t *iseq, ID *tbl) +{ + int size; + if (tbl) { + size = *tbl - 2 /* $~, $_ */ + 1 /* svar location */ ; + } + else { + size = 1; + } + iseq->local_tbl = (ID *)ALLOC_N(ID *, size); + if (tbl && size > 1) { + MEMCPY(iseq->local_tbl + 1, tbl + 3, ID *, size - 1); + } + iseq->local_size = size; + return COMPILE_OK; +} + +static int +set_localtbl_eval(yarv_iseq_t *iseq, ID *tbl) +{ + int size; + if (tbl) { + size = *tbl; + } + else { + size = 0; + } + if (tbl) { + iseq->local_tbl = (ID *)ALLOC_N(ID *, size); + MEMCPY(iseq->local_tbl, tbl + 1, ID *, size); + } + iseq->local_size = size; + return COMPILE_OK; +} + +/** + ruby insn object array -> raw instruction sequence + */ +static int +set_sequence(yarv_iseq_t *iseq, LINK_ANCHOR *anchor) +{ + LABEL *lobj; + INSN *iobj; + struct insn_info_struct *insn_info_tbl; + LINK_ELEMENT *list; + VALUE *generated_iseq; + + int k, pos, sp, stack_max = 0; + + GC_CHECK(); + + /* set label position */ + list = FIRST_ELEMENT(anchor); + k = pos = 0; + while (list) { + switch (list->type) { + case ISEQ_ELEMENT_INSN:{ + iobj = (INSN *)list; + pos += insn_data_length(iobj); + + k += 1; + break; + } + case ISEQ_ELEMENT_LABEL:{ + lobj = (LABEL *)list; + lobj->position = pos; + lobj->set = Qtrue; + break; + } + case ISEQ_ELEMENT_NONE:{ + /* ignore */ + break; + } + default: + dump_disasm_list(FIRST_ELEMENT(anchor)); + dump_disasm_list(list); + rb_bug("error: set_sequence"); + break; + } + list = list->next; + } + + /* make instruction sequence */ + generated_iseq = ALLOC_N(VALUE, pos); + insn_info_tbl = ALLOC_N(struct insn_info_struct, k); + + GC_CHECK(); + + list = FIRST_ELEMENT(anchor); + k = pos = sp = 0; + + while (list) { + switch (list->type) { + case ISEQ_ELEMENT_INSN:{ + int j, len, insn; + char *types; + VALUE *operands; + + iobj = (INSN *)list; + + if (iobj->insn_id == BIN(emptstack) && sp == 0) { + iobj->insn_id = BIN(nop); + } + else { + sp = calc_sp_depth(sp, iobj); + if (sp > stack_max) { + stack_max = sp; + } + } + + // fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); + + operands = iobj->operands; + insn = iobj->insn_id; + generated_iseq[pos] = insn; + types = insn_op_types(insn); + len = insn_len(insn); + + /* operand check */ + if (iobj->operand_size != len - 1) { + dump_disasm_list(list); + rb_bug("operand size miss! (%d for %d)", + iobj->operand_size, len - 1); + return 0; + } + + for (j = 0; types[j]; j++) { + char type = types[j]; + // printf("--> [%c - (%d-%d)]\n", type, k, j); + switch (type) { + case TS_OFFSET:{ + /* label(destination position) */ + lobj = (LABEL *)operands[j]; + if (lobj->set != Qtrue) { + rb_bug("unknown label"); + } + if (lobj->sp == -1) { + lobj->sp = sp; + } + generated_iseq[pos + 1 + j] = + lobj->position - (pos + len); + break; + } + case TS_CDHASH:{ + /* + * [obj, label, ...] + */ + int i; + VALUE lits = operands[j]; + VALUE map = rb_hash_new(); + + for (i=0; i < RARRAY_LEN(lits); i+=2) { + VALUE obj = rb_ary_entry(lits, i); + VALUE lv = rb_ary_entry(lits, i+1); + lobj = (LABEL *)(lv & ~1); + + if (lobj->set != Qtrue) { + rb_bug("unknown label"); + } + rb_hash_aset(map, obj, + INT2FIX(lobj->position - (pos+len))); + } + generated_iseq[pos + 1 + j] = map; + iseq_add_mark_object(iseq, map); + break; + } + case TS_LINDEX: + case TS_DINDEX: + case TS_NUM: /* ulong */ + generated_iseq[pos + 1 + j] = FIX2INT(operands[j]); + break; + case TS_ISEQ: /* iseq */ + { + VALUE v = operands[j]; + yarv_iseq_t *block = 0; + if (v) { + GetISeqPtr(v, block); + } + generated_iseq[pos + 1 + j] = (VALUE)block; + break; + } + case TS_VALUE: /* VALUE */ + { + VALUE v = operands[j]; + generated_iseq[pos + 1 + j] = v; + /* to mark ruby object */ + if (!SPECIAL_CONST_P(v)) { + iseq_add_mark_object(iseq, v); + } + break; + } + case TS_IC: /* inline cache */ + { + VALUE v = (VALUE)NEW_INLINE_CACHE_ENTRY(); + generated_iseq[pos + 1 + j] = v; + iseq_add_mark_object(iseq, v); + break; + } + case TS_ID: /* ID */ + generated_iseq[pos + 1 + j] = SYM2ID(operands[j]); + break; + case TS_GENTRY: + { + struct global_entry *entry = + (struct global_entry *)(operands[j] & (~1)); + generated_iseq[pos + 1 + j] = (VALUE)entry; + } + break; + default: + rb_bug("unknown operand type: %c", type); + return 0; + } + } + insn_info_tbl[k].line_no = iobj->line_no; + insn_info_tbl[k].position = pos; + pos += len; + k++; + break; + } + case ISEQ_ELEMENT_LABEL:{ + lobj = (LABEL *)list; + if (lobj->sp == -1) { + lobj->sp = sp; + } + else { + sp = lobj->sp; + } + break; + } + default: + /* ignore */ + break; + } + list = list->next; + } + + { + iseq->iseq = (void *)generated_iseq; + iseq->size = pos; + iseq->insn_info_tbl = insn_info_tbl; + iseq->insn_info_size = k; + iseq->stack_max = stack_max; + } + return COMPILE_OK; +} + +static int +label_get_position(LABEL *lobj) +{ + return lobj->position; +} + +static int +label_get_sp(LABEL *lobj) +{ + return lobj->sp; +} + +static int +set_exception_table(yarv_iseq_t *iseq) +{ + VALUE *tptr, *ptr; + int tlen, i; + struct catch_table_entry *entry; + + tlen = RARRAY_LEN(iseq->compile_data->catch_table_ary); + tptr = RARRAY_PTR(iseq->compile_data->catch_table_ary); + + iseq->catch_table = ALLOC_N(struct catch_table_entry, tlen); + iseq->catch_table_size = tlen; + + for (i = 0; i < tlen; i++) { + ptr = RARRAY_PTR(tptr[i]); + entry = &iseq->catch_table[i]; + entry->type = ptr[0] & 0xffff; + entry->start = label_get_position((LABEL *)(ptr[1] & ~1)); + entry->end = label_get_position((LABEL *)(ptr[2] & ~1)); + entry->iseq = ptr[3]; + + /* register iseq as mark object */ + if (entry->iseq != 0) { + iseq_add_mark_object(iseq, entry->iseq); + } + + /* stack depth */ + if (ptr[4]) { + LABEL *lobj = (LABEL *)(ptr[4] & ~1); + entry->cont = label_get_position(lobj); + entry->sp = label_get_sp(lobj); + + /* TODO: Dirty Hack! Fix me */ + if (entry->type == CATCH_TYPE_RESCUE || + entry->type == CATCH_TYPE_BREAK || + (((ptr[0] & 0x10000) == 0) + && entry->type == CATCH_TYPE_NEXT)) { + entry->sp--; + } + } + else { + entry->cont = 0; + } + } + // + iseq->compile_data->catch_table_ary = 0; /* free */ + return COMPILE_OK; +} + +/* + * set optional argument table + * def foo(a, b=expr1, c=expr2) + * => + * b: + * expr1 + * c: + * expr2 + */ +static int +set_optargs_table(yarv_iseq_t *iseq) +{ + int i; + + if (iseq->arg_opts != 0) { + for (i = 0; i < iseq->arg_opts; i++) { + iseq->arg_opt_tbl[i] = + label_get_position((LABEL *)iseq->arg_opt_tbl[i]); + } + } + return COMPILE_OK; +} + +static LINK_ELEMENT * +get_destination_insn(INSN *iobj) +{ + LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0); + LINK_ELEMENT *list; + + list = lobj->link.next; + while (list) { + if (list->type == ISEQ_ELEMENT_INSN) { + break; + } + list = list->next; + } + return list; +} + +static LINK_ELEMENT * +get_next_insn(INSN *iobj) +{ + LINK_ELEMENT *list = iobj->link.next; + + while (list) { + if (list->type == ISEQ_ELEMENT_INSN) { + return list; + } + list = list->next; + } + return 0; +} + +static LINK_ELEMENT * +get_prev_insn(INSN *iobj) +{ + LINK_ELEMENT *list = iobj->link.prev; + + while (list) { + if (list->type == ISEQ_ELEMENT_INSN) { + return list; + } + list = list->prev; + } + return 0; +} + +static int +iseq_peephole_optimize(yarv_iseq_t *iseq, LINK_ELEMENT *list) +{ + INSN *iobj = (INSN *)list; + again: + if (iobj->insn_id == BIN(jump)) { + INSN *niobj, *diobj, *piobj; + /* + * useless jump elimination: + * jump LABEL1 + * ... + * LABEL1: + * jump LABEL2 + * + * => in this case, first jump instruction should jump tp + * LABEL2 directly + */ + diobj = (INSN *)get_destination_insn(iobj); + niobj = (INSN *)get_next_insn(iobj); + + if (diobj == niobj) { + REMOVE_ELEM(&iobj->link); + } + else if (iobj != diobj && diobj->insn_id == BIN(jump)) { + OPERAND_AT(iobj, 0) = OPERAND_AT(diobj, 0); + goto again; + } + else if (diobj->insn_id == BIN(leave)) { + INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave), + diobj->operand_size, + diobj->operands); + /* replace */ + REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj); + } + /* + * useless jump elimination (if/unless destination): + * if L1 + * jump L2 + * L1: + * ... + * L2: + * + * ==> + * unless L2 + * L1: + * ... + * L2: + */ + else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 && + (piobj->insn_id == BIN(branchif) || + piobj->insn_id == BIN(branchunless))) { + if (niobj == (INSN *)get_destination_insn(piobj)) { + piobj->insn_id = (piobj->insn_id == BIN(branchif)) + ? BIN(branchunless) : BIN(branchif) ; + OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0); + REMOVE_ELEM(&iobj->link); + } + } + } + if (iobj->insn_id == BIN(branchif) || + iobj->insn_id == BIN(branchunless)) { + /* + * if L1 + * ... + * L1: + * jump L2 + * => + * if L2 + */ + INSN *nobj = (INSN *)get_destination_insn(iobj); + if (nobj->insn_id == BIN(jump)) { + OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0); + } + } + + if (iobj->insn_id == BIN(leave)) { + INSN *piobj = (INSN *)get_prev_insn((INSN *)list); + if (piobj->insn_id == BIN(send)) { + /* TODO: tail call optimization */ + if (piobj->operands[2] == 0) { + //piobj->operands[3] = INT2FIX(FIX2INT(piobj->operands[3]) | VM_CALL_TAILCALL_BIT); + //piobj->operands[3] = INT2FIX(FIX2INT(piobj->operands[3]) | VM_CALL_TAILRECURSION_BIT); + } + } + } + return COMPILE_OK; +} + +static int +insn_set_specialized_instruction(INSN *iobj, int insn_id) +{ + iobj->insn_id = insn_id; + iobj->operand_size = 0; + return COMPILE_OK; +} + + +static int +iseq_specialized_instruction(yarv_iseq_t *iseq, INSN *iobj) +{ + if (iobj->insn_id == BIN(send)) { + ID mid = SYM2ID(OPERAND_AT(iobj, 0)); + int argc = FIX2INT(OPERAND_AT(iobj, 1)); + VALUE block = OPERAND_AT(iobj, 2); + VALUE flag = OPERAND_AT(iobj, 3); + + /* TODO: should be more sophisticated search */ + if (block == 0 && flag == INT2FIX(0)) { + if (argc == 0) { + if (mid == idLength) { + insn_set_specialized_instruction(iobj, BIN(opt_length)); + } + else if (mid == idSucc) { + insn_set_specialized_instruction(iobj, BIN(opt_succ)); + } + } + else if (argc == 1) { + if (0) { + } + else if (mid == idPLUS) { + insn_set_specialized_instruction(iobj, BIN(opt_plus)); + } + else if (mid == idMINUS) { + insn_set_specialized_instruction(iobj, BIN(opt_minus)); + } + else if (mid == idMULT) { + insn_set_specialized_instruction(iobj, BIN(opt_mult)); + } + else if (mid == idDIV) { + insn_set_specialized_instruction(iobj, BIN(opt_div)); + } + else if (mid == idMOD) { + insn_set_specialized_instruction(iobj, BIN(opt_mod)); + } + else if (mid == idEq) { + insn_set_specialized_instruction(iobj, BIN(opt_eq)); + } + else if (mid == idLT) { + insn_set_specialized_instruction(iobj, BIN(opt_lt)); + } + else if (mid == idLE) { + insn_set_specialized_instruction(iobj, BIN(opt_le)); + } + else if (mid == idLTLT) { + insn_set_specialized_instruction(iobj, BIN(opt_ltlt)); + } + else if (mid == idAREF) { + insn_set_specialized_instruction(iobj, BIN(opt_aref)); + } + } + } + } + return COMPILE_OK; +} + +static int +iseq_optimize(yarv_iseq_t *iseq, LINK_ANCHOR *anchor) +{ + LINK_ELEMENT *list; + const int do_peephole = iseq->compile_data->option->peephole_optimization; + const int do_si = iseq->compile_data->option->specialized_instruction; + const int do_ou = iseq->compile_data->option->operands_unification; + list = FIRST_ELEMENT(anchor); + + while (list) { + if (list->type == ISEQ_ELEMENT_INSN) { + if (do_peephole) { + iseq_peephole_optimize(iseq, list); + } + if (do_si) { + iseq_specialized_instruction(iseq, (INSN *)list); + } + if (do_ou) { + insn_operands_unification((INSN *)list); + } + } + list = list->next; + } + return COMPILE_OK; +} + +#if OPT_INSTRUCTIONS_UNIFICATION +static INSN * +new_unified_insn(yarv_iseq_t *iseq, + int insn_id, int size, LINK_ELEMENT *seq_list) +{ + INSN *iobj = 0; + LINK_ELEMENT *list = seq_list; + int i, argc = 0; + VALUE *operands = 0, *ptr = 0; + + + /* count argc */ + for (i = 0; i < size; i++) { + iobj = (INSN *)list; + argc += iobj->operand_size; + list = list->next; + } + + if (argc > 0) { + ptr = operands = + (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc); + } + + /* copy operands */ + list = seq_list; + for (i = 0; i < size; i++) { + iobj = (INSN *)list; + MEMCPY(ptr, iobj->operands, VALUE, iobj->operand_size); + ptr += iobj->operand_size; + list = list->next; + } + + return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands); +} +#endif + +/* + * This scheme can get more performance if do this optimize with + * label address resolving. + * It's future work (if compile time was bottle neck). + */ +static int +iseq_insns_unification(yarv_iseq_t *iseq, LINK_ANCHOR *anchor) +{ +#if OPT_INSTRUCTIONS_UNIFICATION + LINK_ELEMENT *list; + INSN *iobj, *niobj; + int id, j, k; + + list = FIRST_ELEMENT(anchor); + while (list) { + if (list->type == ISEQ_ELEMENT_INSN) { + iobj = (INSN *)list; + id = iobj->insn_id; + if (unified_insns_data[id] != 0) { + int **entry = unified_insns_data[id]; + for (j = 1; j < (int)entry[0]; j++) { + int *unified = entry[j]; + LINK_ELEMENT *li = list->next; + for (k = 2; k < unified[1]; k++) { + if (li->type != ISEQ_ELEMENT_INSN || + ((INSN *)li)->insn_id != unified[k]) { + goto miss; + } + li = li->next; + } + /* matched */ + niobj = + new_unified_insn(iseq, unified[0], unified[1] - 1, + list); + + /* insert to list */ + niobj->link.prev = (LINK_ELEMENT *)iobj->link.prev; + niobj->link.next = li; + if (li) { + li->prev = (LINK_ELEMENT *)niobj; + } + + list->prev->next = (LINK_ELEMENT *)niobj; + list = (LINK_ELEMENT *)niobj; + break; + miss:; + } + } + } + list = list->next; + } +#endif + return COMPILE_OK; +} + +#if OPT_STACK_CACHING + +#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)] +#define SC_NEXT(insn) sc_insn_next[insn] + +#include "opt_sc.inc" + +static int +insn_set_sc_state(INSN *iobj, int state) +{ + int nstate; + int insn_id; + + insn_id = iobj->insn_id; + iobj->insn_id = SC_INSN(insn_id, state); + nstate = SC_NEXT(iobj->insn_id); + + if (insn_id == BIN(jump) || + insn_id == BIN(branchif) || insn_id == BIN(branchunless)) { + LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0); + + if (lobj->sc_state != 0) { + if (lobj->sc_state != nstate) { + dump_disasm_list((LINK_ELEMENT *)iobj); + dump_disasm_list((LINK_ELEMENT *)lobj); + printf("\n-- %d, %d\n", lobj->sc_state, nstate); + rb_bug("insn_set_sc_state error\n"); + return 0; + } + } + else { + lobj->sc_state = nstate; + } + if (insn_id == BIN(jump)) { + nstate = SCS_XX; + } + } + else if (insn_id == BIN(leave)) { + nstate = SCS_XX; + } + + return nstate; +} + +static int +label_set_sc_state(LABEL *lobj, int state) +{ + if (lobj->sc_state != 0) { + if (lobj->sc_state != state) { + state = lobj->sc_state; + } + } + else { + lobj->sc_state = state; + } + + return state; +} + + +#endif + +static int +set_sequence_stackcaching(yarv_iseq_t *iseq, LINK_ANCHOR *anchor) +{ +#if OPT_STACK_CACHING + LINK_ELEMENT *list; + int state, insn_id; + + /* initialize */ + state = SCS_XX; + list = FIRST_ELEMENT(anchor); + // dump_disasm_list(list); + + /* for each list element */ + while (list) { + redo_point: + switch (list->type) { + case ISEQ_ELEMENT_INSN:{ + INSN *iobj = (INSN *)list; + insn_id = iobj->insn_id; + + // dump_disasm_list(list); + + switch (insn_id) { + case BIN(nop):{ + /* exception merge point */ + if (state != SCS_AX) { + INSN *rpobj = + new_insn_body(iseq, 0, BIN(reput), 0); + + /* replace this insn */ + REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj); + list = (LINK_ELEMENT *)rpobj; + goto redo_point; + } + break; + } + case BIN(swap):{ + if (state == SCS_AB || state == SCS_BA) { + state = (state == SCS_AB ? SCS_BA : SCS_AB); + + REMOVE_ELEM(list); + list = list->next; + goto redo_point; + } + break; + } + case BIN(pop):{ + switch (state) { + case SCS_AX: + case SCS_BX: + state = SCS_XX; + break; + case SCS_AB: + state = SCS_AX; + break; + case SCS_BA: + state = SCS_BX; + break; + case SCS_XX: + goto normal_insn; + default: + rb_bug("unreachable"); + } + /* remove useless pop */ + REMOVE_ELEM(list); + list = list->next; + goto redo_point; + } + default:; + /* none */ + } /* end of switch */ + normal_insn: + state = insn_set_sc_state(iobj, state); + break; + } + case ISEQ_ELEMENT_LABEL:{ + LABEL *lobj; + lobj = (LABEL *)list; + + state = label_set_sc_state(lobj, state); + } + default: + break; + } + list = list->next; + } +#endif + return COMPILE_OK; +} + + + +static int +compile_dstr(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node) +{ + NODE *list = node->nd_next; + VALUE lit = node->nd_lit; + int cnt = 1; + + debugp_param("nd_lit", lit); + ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit); + + while (list) { + COMPILE(ret, "each string", list->nd_head); + cnt++; + list = list->nd_next; + } + + ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt)); + return COMPILE_OK; +} + +static int +compile_branch_condition(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond, + LABEL *then_label, LABEL *else_label) +{ + switch (nd_type(cond)) { + case NODE_NOT: + compile_branch_condition(iseq, ret, cond->nd_body, else_label, + then_label); + break; + + case NODE_AND:{ + LABEL *label = NEW_LABEL(nd_line(cond)); + compile_branch_condition(iseq, ret, cond->nd_1st, label, + else_label); + ADD_LABEL(ret, label); + compile_branch_condition(iseq, ret, cond->nd_2nd, then_label, + else_label); + break; + } + case NODE_OR:{ + LABEL *label = NEW_LABEL(nd_line(cond)); + compile_branch_condition(iseq, ret, cond->nd_1st, then_label, + label); + ADD_LABEL(ret, label); + compile_branch_condition(iseq, ret, cond->nd_2nd, then_label, + else_label); + break; + } + case NODE_LIT: /* NODE_LIT is always not true */ + case NODE_TRUE: + case NODE_STR: + /* printf("useless conditon eliminate (%s)\n", node_name(nd_type(cond))); */ + ADD_INSNL(ret, nd_line(cond), jump, then_label); + break; + case NODE_FALSE: + case NODE_NIL: + /* printf("useless conditon eliminate (%s)\n", node_name(nd_type(cond))); */ + ADD_INSNL(ret, nd_line(cond), jump, else_label); + break; + default: + COMPILE(ret, "branch condition", cond); + ADD_INSNL(ret, nd_line(cond), branchunless, else_label); + ADD_INSNL(ret, nd_line(cond), jump, then_label); + break; + } + return COMPILE_OK; +} + +static int +compile_array(yarv_iseq_t *iseq, + LINK_ANCHOR *ret, NODE * node_root, VALUE opt_p) +{ + NODE *node = node_root; + int len = node->nd_alen, line = nd_line(node), i=0; + DECL_ANCHOR(anchor); + + while (node) { + i++; + if (opt_p && nd_type(node->nd_head) != NODE_LIT) { + opt_p = Qfalse; + } + COMPILE(anchor, "array element", node->nd_head); + node = node->nd_next; + } + + if (len != i) { + if (0) rb_bug("node error: compile_array (%d: %d-%d)", + nd_line(node_root), len, i); + len = i; + } + + if (opt_p == Qtrue) { + VALUE ary = rb_ary_new(); + node = node_root; + while (node) { + rb_ary_push(ary, node->nd_head->nd_lit); + node = node->nd_next; + } + + iseq_add_mark_object_compile_time(iseq, ary); + ADD_INSN1(ret, nd_line(node_root), duparray, ary); + } + else { + ADD_INSN1(anchor, line, newarray, INT2FIX(len)); + APPEND_LIST(ret, anchor); + } + return len; +} + +static VALUE +case_when_optimizable_literal(NODE * node) +{ + if (nd_type(node) == NODE_LIT) { + VALUE v = node->nd_lit; + VALUE klass = CLASS_OF(v); + if (klass == rb_cSymbol || rb_obj_is_kind_of(v, rb_cNumeric)) { + return v; + } + } + else if (nd_type(node) == NODE_STR) { + return node->nd_lit; + } + return Qfalse; +} + +static VALUE +when_vals(yarv_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, VALUE special_literals) +{ + while (vals) { + VALUE lit; + NODE* val; + + val = vals->nd_head; + + if (special_literals && + (lit = case_when_optimizable_literal(val)) != Qfalse) { + rb_ary_push(special_literals, lit); + rb_ary_push(special_literals, (VALUE)(l1) | 1); + } + else { + special_literals = Qfalse; + } + + COMPILE(cond_seq, "when cond", val); + ADD_INSN1(cond_seq, nd_line(val), topn, INT2FIX(1)); + ADD_SEND(cond_seq, nd_line(val), ID2SYM(idEqq), INT2FIX(1)); + ADD_INSNL(cond_seq, nd_line(val), branchif, l1); + vals = vals->nd_next; + } + return special_literals; +} + +static int +make_masgn_lhs(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node) +{ + + switch (nd_type(node)) { + case NODE_ATTRASGN:{ + INSN *iobj; + VALUE dupidx; + + COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node); + POP_ELEMENT(ret); /* pop pop insn */ + iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */ + + dupidx = iobj->operands[1]; + dupidx = INT2FIX(FIX2INT(dupidx) + 1); + iobj->operands[1] = dupidx; + + ADD_INSN1(ret, nd_line(node), topn, dupidx); + ADD_ELEM(ret, (LINK_ELEMENT *)iobj); + ADD_INSN(ret, nd_line(node), pop); /* result */ + ADD_INSN(ret, nd_line(node), pop); /* rhs */ + break; + } + + case NODE_MASGN: + COMPILE_POPED(ret, "nest masgn lhs", node); + break; + + default:{ + DECL_ANCHOR(anchor); + COMPILE_POPED(anchor, "masgn lhs", node); + // dump_disasm_list(FIRST_ELEMENT(anchor)); + REMOVE_ELEM(FIRST_ELEMENT(anchor)); + // dump_disasm_list(FIRST_ELEMENT(anchor)); + ADD_SEQ(ret, anchor); + // ADD_ELEM(ret, LAST_ELEMENT(anchor)); + } + } + + return COMPILE_OK; +} + +static int +compile_massign(yarv_iseq_t *iseq, LINK_ANCHOR *ret, + NODE * rhsn, NODE * splatn, NODE * lhsn, int llen) +{ + if (lhsn != 0) { + compile_massign(iseq, ret, rhsn, splatn, lhsn->nd_next, llen + 1); + make_masgn_lhs(iseq, ret, lhsn->nd_head); + } + else { + int lhs_splat = 0; + + if (splatn && (VALUE)splatn != -1) { + lhs_splat = 1; + } + + if (rhsn) { + switch (nd_type(rhsn)) { + case NODE_ARRAY:{ + int rlen = rhsn->nd_alen; + int max = rlen > llen ? rlen : llen; + int i, si = 0; + + for (i = 0; i < max; i++) { + if (i < rlen && i < llen) { + /* a, b = c, d */ + COMPILE(ret, "masgn val1", rhsn->nd_head); + rhsn = rhsn->nd_next; + } + else if (i < rlen) { + if (lhs_splat) { + while (rhsn) { + /* a, *b = x, y, z */ + si++; + COMPILE(ret, "masgn rhs for lhs splat", + rhsn->nd_head); + rhsn = rhsn->nd_next; + } + break; + } + else { + /* a, b = c, d, e */ + COMPILE_POPED(ret, "masgn rhs (popped)", + rhsn->nd_head); + rhsn = rhsn->nd_next; + } + } + else if (i < llen) { + /* a, b, c = c, d */ + ADD_INSN(ret, 0, putnil); + } + } + + if (lhs_splat) { + ADD_INSN1(ret, 0, newarray, INT2FIX(si)); + } + break; + } + case NODE_TO_ARY: + COMPILE(ret, "rhs to ary", rhsn->nd_head); + ADD_INSN2(ret, nd_line(rhsn), expandarray, INT2FIX(llen), + INT2FIX(lhs_splat)); + break; + + case NODE_SPLAT: + COMPILE(ret, "rhs to ary (splat)", rhsn->nd_head); + ADD_INSN2(ret, nd_line(rhsn), expandarray, INT2FIX(llen), + INT2FIX(lhs_splat)); + break; + + case NODE_ARGSCAT:{ + NODE *ary = rhsn->nd_head; + int idx = 0; + + while (ary) { + if (idx < llen || lhs_splat) { + COMPILE(ret, "rhs aggscat each head", + ary->nd_head); + } + else { + COMPILE_POPED(ret, + "rhs aggscat each head (popped)", + ary->nd_head); + } + ary = ary->nd_next; + idx++; + } + + if (llen > idx) { + COMPILE(ret, "rhs to ary (argscat/splat)", + rhsn->nd_body); + ADD_INSN2(ret, nd_line(rhsn), expandarray, + INT2FIX(llen - idx), INT2FIX(lhs_splat)); + } + else if (lhs_splat) { + COMPILE(ret, "rhs to ary (argscat/splat)", + rhsn->nd_body); + ADD_INSN2(ret, nd_line(rhsn), expandarray, + INT2FIX(llen - idx), INT2FIX(lhs_splat)); + } + break; + } + default: + COMPILE(ret, "rhs to ary (splat/default)", rhsn); + ADD_INSN2(ret, nd_line(rhsn), expandarray, INT2FIX(llen), + INT2FIX(lhs_splat)); + // rb_bug("unknown rhs: %s", node_name(nd_type(rhsn))); + } + } + else { + /* nested massign */ + ADD_INSN2(ret, 0, expandarray, INT2FIX(llen), INT2FIX(lhs_splat)); + } + + if (lhs_splat) { + make_masgn_lhs(iseq, ret, splatn); + } + } + return COMPILE_OK; +} + +static int +compile_colon2(yarv_iseq_t *iseq, NODE * node, + LINK_ANCHOR *pref, LINK_ANCHOR *body) +{ + switch (nd_type(node)) { + case NODE_CONST: + debugi("compile_colon2 - colon", node->nd_vid); + ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid)); + break; + case NODE_COLON3: + debugi("compile_colon2 - colon3", node->nd_mid); + ADD_INSN(body, nd_line(node), pop); + ADD_INSN1(body, nd_line(node), putobject, rb_cObject); + ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid)); + break; + case NODE_COLON2: + compile_colon2(iseq, node->nd_head, pref, body); + debugi("compile_colon2 - colon2", node->nd_mid); + ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid)); + break; + default: + COMPILE(pref, "const colon2 prefix", node); + break; + } + return COMPILE_OK; +} + +static int +compile_cpath(LINK_ANCHOR *ret, yarv_iseq_t *iseq, NODE *cpath) +{ + if(cpath->nd_head) { + COMPILE(ret, "nd_else->nd_head", cpath->nd_head); + } + else if (nd_type(cpath) == NODE_COLON2) { + COMPILE(ret, "cpath (NODE_COLON2)", cpath->nd_head); + } + else { + ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject); + } + return COMPILE_OK; +} + +static int +defined_expr(yarv_iseq_t *iseq, LINK_ANCHOR *ret, + NODE * node, LABEL *lfinish, VALUE needstr) +{ + char *estr = 0; + + switch (nd_type(node)) { + + /* easy literals */ + case NODE_NIL: + estr = "nil"; + break; + case NODE_SELF: + estr = "self"; + break; + case NODE_TRUE: + estr = "true"; + break; + case NODE_FALSE: + estr = "false"; + break; + case NODE_STR: + case NODE_LIT: + estr = "expression"; + break; + + /* variables */ + case NODE_LVAR: + estr = "local-variable"; + break; + case NODE_DVAR: + estr = "local-variable(in-block)"; + break; + + case NODE_IVAR: + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_IVAR), + ID2SYM(node->nd_vid), needstr); + return 1; + + case NODE_GVAR: + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_GVAR), + ((VALUE)node->nd_entry) | 1, needstr); + return 1; + + case NODE_CVAR: + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CVAR), + ID2SYM(node->nd_vid), needstr); + return 1; + + case NODE_CONST: + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST), + ID2SYM(node->nd_vid), needstr); + return 1; + case NODE_COLON2: + if (rb_is_const_id(node->nd_mid)) { + LABEL *lcont = NEW_LABEL(nd_line(node)); + defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse); + + ADD_INSNL(ret, nd_line(node), branchif, lcont) ; + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSNL(ret, nd_line(node), jump, lfinish); + + ADD_LABEL(ret, lcont); + COMPILE(ret, "defined/colon2#nd_head", node->nd_head); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST), + ID2SYM(node->nd_mid), needstr); + } + else { + LABEL *lcont = NEW_LABEL(nd_line(node)); + defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse); + + ADD_INSNL(ret, nd_line(node), branchif, lcont) ; + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSNL(ret, nd_line(node), jump, lfinish); + + ADD_LABEL(ret, lcont); + COMPILE(ret, "defined/colon2#nd_head", node->nd_head); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD), + ID2SYM(node->nd_mid), needstr); + } + return 1; + case NODE_COLON3: + ADD_INSN1(ret, nd_line(node), putobject, rb_cObject); + ADD_INSN3(ret, nd_line(node), defined, + INT2FIX(DEFINED_CONST), ID2SYM(node->nd_mid), needstr); + return 1; + + /* method dispatch */ + case NODE_CALL: + case NODE_VCALL: + case NODE_FCALL: + if (nd_type(node) == NODE_CALL) { + LABEL *lcont = NEW_LABEL(nd_line(node)); + + defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse); + ADD_INSNL(ret, nd_line(node), branchif, lcont) ; + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSNL(ret, nd_line(node), jump, lfinish); + + ADD_LABEL(ret, lcont); + COMPILE(ret, "defined/recv", node->nd_recv); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD), + ID2SYM(node->nd_mid), needstr); + } + else { + ADD_INSN(ret, nd_line(node), putself); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_FUNC), + ID2SYM(node->nd_mid), needstr); + } + return 1; + + case NODE_YIELD: + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_YIELD), 0, + needstr); + return 1; + + case NODE_NTH_REF: + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_REF), + INT2FIX(node->nd_nth), needstr); + return 1; + + case NODE_ZSUPER: + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0, + needstr); + return 1; + + default:{ + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + LABEL *ldefed = NEW_LABEL(nd_line(node)); + VALUE str = rb_str_new2("expression"); + VALUE tmp; + VALUE ensure = NEW_CHILD_ISEQVAL(NEW_NIL(), + rb_str_concat(rb_str_new2 + ("defined guard in "), + iseq->name), + ISEQ_TYPE_DEFINED_GUARD); + + iseq_add_mark_object_compile_time(iseq, str); + + ADD_LABEL(ret, lstart); + COMPILE(ret, "defined expr (others)", node); + ADD_INSNL(ret, nd_line(node), branchif, ldefed) ; + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSNL(ret, nd_line(node), jump, lend); + ADD_LABEL(ret, ldefed); + ADD_INSN1(ret, nd_line(node), putobject, str); + ADD_LABEL(ret, lend); + + ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, lstart, lend, ensure, lfinish); + return 1; + // rb_bug("unimplemented defined: %s", node_name(nd_type(node))); + } /* end of default */ + } + + if (estr != 0) { + if (needstr != Qfalse) { + VALUE str = rb_str_new2(estr); + ADD_INSN1(ret, nd_line(node), putstring, str); + iseq_add_mark_object_compile_time(iseq, str); + } + else { + ADD_INSN1(ret, nd_line(node), putobject, Qtrue); + } + return 1; + } + return 0; +} + +#define BUFSIZE 0x100 + +static VALUE +make_name_for_block(yarv_iseq_t *iseq) +{ + char buf[BUFSIZE]; + if (iseq->parent_iseq == 0) { + snprintf(buf, BUFSIZE, "block in %s", RSTRING_PTR(iseq->name)); + } + else { + int level = 1; + yarv_iseq_t *ip = iseq; + while (1) { + if (ip->local_iseq != ip) { + ip = ip->parent_iseq; + } + else { + break; + } + level++; + } + snprintf(buf, BUFSIZE, "block (%d levels) in %s", level, + RSTRING_PTR(ip->name)); + } + return rb_str_new2(buf); +} + +static VALUE +make_name_with_str(const char *fmt, const char *str) +{ + char buf[BUFSIZE]; + snprintf(buf, BUFSIZE, fmt, str); + return rb_str_new2(buf); +} + +static void +add_ensure_range(yarv_iseq_t *iseq, struct ensure_range *erange, + LABEL *lstart, LABEL *lend) +{ + struct ensure_range *ne = + compile_data_alloc(iseq, sizeof(struct ensure_range)); + + while (erange->next != 0) { + erange = erange->next; + } + ne->next = 0; + ne->begin = lend; + ne->end = erange->end; + erange->end = lstart; + + erange->next = ne; +} + +static void +add_ensure_iseq(LINK_ANCHOR *ret, yarv_iseq_t *iseq) +{ + struct iseq_compile_data_ensure_node_stack *enlp = + iseq->compile_data->ensure_node_stack; + struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp; + DECL_ANCHOR(ensure); + + while (enlp) { + DECL_ANCHOR(ensure_part); + LABEL *lstart = NEW_LABEL(0); + LABEL *lend = NEW_LABEL(0); + add_ensure_range(iseq, enlp->erange, lstart, lend); + + iseq->compile_data->ensure_node_stack = enlp->prev; + ADD_LABEL(ensure_part, lstart); + COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node); + ADD_LABEL(ensure_part, lend); + + ADD_SEQ(ensure, ensure_part); + enlp = enlp->prev; + } + iseq->compile_data->ensure_node_stack = prev_enlp; + ADD_SEQ(ret, ensure); +} + +static VALUE +setup_arg(yarv_iseq_t *iseq, LINK_ANCHOR *args, NODE *node, VALUE *flag) +{ + VALUE argc = INT2FIX(0); + NODE *argn = node->nd_args; + NODE *argp = 0; + DECL_ANCHOR(arg_block); + DECL_ANCHOR(args_push); + + if (argn && nd_type(argn) == NODE_BLOCK_PASS) { + COMPILE(arg_block, "block", argn->nd_body); + *flag |= VM_CALL_ARGS_BLOCKARG_BIT; + argn = argn->nd_head; + } + + setup_argn: + if (argn) { + switch (nd_type(argn)) { + case NODE_SPLAT: { + COMPILE(args, "args (splat)", argn->nd_head); + argc = INT2FIX(1); + *flag |= VM_CALL_ARGS_SPLAT_BIT; + break; + } + case NODE_ARGSCAT: { + argc = INT2FIX(compile_array(iseq, args, argn->nd_head, Qfalse) + 1); + POP_ELEMENT(args); + COMPILE(args, "args (cat: splat)", argn->nd_body); + *flag |= VM_CALL_ARGS_SPLAT_BIT; + break; + } + case NODE_ARGSPUSH: { + DECL_ANCHOR(args_push_e); + COMPILE(args_push_e, "argspush (cdr)", argn->nd_body); + ADD_INSN(args_push_e, nd_line(node), concatarray); + INSERT_LIST(args_push, args_push_e); + argn = argn->nd_head; + goto setup_argn; + } + default: { + argc = INT2FIX(compile_array(iseq, args, argn, Qfalse)); + POP_ELEMENT(args); + break; + } + } + } + + if (!LIST_SIZE_ZERO(args_push)) { + ADD_SEQ(args, args_push); + } + + if (*flag & VM_CALL_ARGS_BLOCKARG_BIT) { + ADD_SEQ(args, arg_block); + } + return argc; +} + + +/** + compile each node + + self: InstructionSequence + node: Ruby compiled node + poped: This node will be poped + */ +static int +iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) +{ + VALUE tmp; /* reserved for macro */ + int type; + + GC_CHECK(); + + if (node == 0) { + if (!poped) { + debug_nodeprint("NODE_NIL(implicit)"); + debug_nodeprint_close(); + ADD_INSN(ret, 0, putnil); + return COMPILE_OK; + } + return COMPILE_OK; + } + + iseq->compile_data->last_line = nd_line(node); + debug_nodeprint(node); + + type = nd_type(node); + + switch (type) { + + case NODE_METHOD:{ + /* OK */ + bp(); + COMPILE_ERROR(("BUG: unknown node: NODE_METHOD")); + break; + } + case NODE_FBODY:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_FBODY")); + break; + } + case NODE_CFUNC:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_CFUNC")); + break; + } + case NODE_SCOPE:{ + /* OK */ + COMPILE_ERROR(("BUG: shouldn't reach: NODE_SCOPE")); + break; + } + case NODE_BLOCK:{ + while (node && nd_type(node) == NODE_BLOCK) { + COMPILE_(ret, "BLOCK body", node->nd_head, + (node->nd_next == 0 && poped == 0) ? 0 : 1); + node = node->nd_next; + } + if (node) { + COMPILE_(ret, "BLOCK next", node->nd_next, poped); + } + break; + } + case NODE_IF:{ + DECL_ANCHOR(cond_seq); + DECL_ANCHOR(then_seq); + DECL_ANCHOR(else_seq); + LABEL *then_label, *else_label, *end_label; + + then_label = NEW_LABEL(nd_line(node)); + else_label = NEW_LABEL(nd_line(node)); + end_label = NEW_LABEL(nd_line(node)); + + compile_branch_condition(iseq, cond_seq, node->nd_cond, + then_label, else_label); + COMPILE_(then_seq, "then", node->nd_body, poped); + COMPILE_(else_seq, "else", node->nd_else, poped); + + ADD_SEQ(ret, cond_seq); + + ADD_LABEL(ret, then_label); + ADD_SEQ(ret, then_seq); + ADD_INSNL(ret, nd_line(node), jump, end_label); + + ADD_LABEL(ret, else_label); + ADD_SEQ(ret, else_seq); + + ADD_LABEL(ret, end_label); + + break; + } + case NODE_CASE:{ + NODE *vals; + NODE *val; + NODE *tempnode = node; + LABEL *endlabel, *elselabel; + DECL_ANCHOR(head); + DECL_ANCHOR(body_seq); + DECL_ANCHOR(cond_seq); + VALUE special_literals = rb_ary_new(); + + if (node->nd_head == 0) { + COMPILE_(ret, "when", node->nd_body, poped); + break; + } + COMPILE(head, "case base", node->nd_head); + + node = node->nd_body; + type = nd_type(node); + + if (type != NODE_WHEN) { + COMPILE_ERROR(("NODE_CASE: unexpected node. must be NODE_WHEN, but %s", node_name(type))); + } + + endlabel = NEW_LABEL(nd_line(node)); + elselabel = NEW_LABEL(nd_line(node)); + + ADD_SEQ(ret, head); /* case VAL */ + + while (type == NODE_WHEN) { + LABEL *l1; + + l1 = NEW_LABEL(nd_line(node)); + ADD_LABEL(body_seq, l1); + ADD_INSN(body_seq, nd_line(node), pop); + COMPILE_(body_seq, "when body", node->nd_body, poped); + ADD_INSNL(body_seq, nd_line(node), jump, endlabel); + + vals = node->nd_head; + if (vals) { + if (nd_type(vals) == NODE_ARRAY) { + special_literals = when_vals(iseq, cond_seq, vals, l1, special_literals); + } + else if (nd_type(vals) == NODE_SPLAT || nd_type(vals) == NODE_ARGSCAT) { + NODE *val = vals->nd_head; + special_literals = 0; + + if (nd_type(vals) == NODE_ARGSCAT) { + when_vals(iseq, cond_seq, vals->nd_head, l1, 0); + val = vals->nd_body; + } + + COMPILE(cond_seq, "when/cond splat", val); + ADD_INSN1(cond_seq, nd_line(val), checkincludearray, Qtrue); + ADD_INSNL(cond_seq, nd_line(val), branchif, l1); + } + else { + rb_bug("NODE_CASAE: unknown node (%s)", node_name(nd_type(vals))); + } + } + else { + rb_bug("NODE_CASAE: must be NODE_ARRAY, but 0\n"); + } + + node = node->nd_next; + if (!node) { + break; + } + type = nd_type(node); + } + /* else */ + if (node) { + ADD_LABEL(cond_seq, elselabel); + ADD_INSN(cond_seq, nd_line(node), pop); + COMPILE_(cond_seq, "else", node, poped); + ADD_INSNL(cond_seq, nd_line(node), jump, endlabel); + } + else { + debugs("== else (implicit)\n"); + ADD_LABEL(cond_seq, elselabel); + ADD_INSN(cond_seq, nd_line(tempnode), pop); + if (!poped) { + ADD_INSN(cond_seq, nd_line(tempnode), putnil); + } + ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel); + } + + if (special_literals) { + ADD_INSN(ret, nd_line(tempnode), dup); + ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch, + special_literals, elselabel); + iseq_add_mark_object_compile_time(iseq, special_literals); + } + + ADD_SEQ(ret, cond_seq); + ADD_SEQ(ret, body_seq); + ADD_LABEL(ret, endlabel); + break; + } + case NODE_WHEN:{ + NODE *vals; + NODE *val; + NODE *orig_node = node; + LABEL *endlabel; + DECL_ANCHOR(body_seq); + + endlabel = NEW_LABEL(nd_line(node)); + + while (node && nd_type(node) == NODE_WHEN) { + LABEL *l1 = NEW_LABEL(nd_line(node)); + ADD_LABEL(body_seq, l1); + COMPILE_(body_seq, "when", node->nd_body, poped); + ADD_INSNL(body_seq, nd_line(node), jump, endlabel); + + vals = node->nd_head; + if (vals && nd_type(vals) == NODE_ARRAY) { + while (vals) { + val = vals->nd_head; + COMPILE(ret, "when2", val); + ADD_INSNL(ret, nd_line(val), branchif, l1) ; + vals = vals->nd_next; + } + } + else if (nd_type(vals) == NODE_SPLAT || nd_type(vals) == NODE_ARGSCAT) { + NODE *val = vals->nd_head; + + if (nd_type(vals) == NODE_ARGSCAT) { + NODE *vs = vals->nd_head; + val = vals->nd_body; + + while (vs) { + NODE* val = vs->nd_head; + COMPILE(ret, "when/argscat", val); + ADD_INSNL(ret, nd_line(val), branchif, l1); + vs = vs->nd_next; + } + } + + ADD_INSN(ret, nd_line(val), putnil); + COMPILE(ret, "when2/splat", val); + ADD_INSN1(ret, nd_line(val), checkincludearray, Qfalse); + ADD_INSN(ret, nd_line(val), pop); + ADD_INSNL(ret, nd_line(val), branchif, l1); + } + else { + rb_bug("err"); + } + node = node->nd_next; + } + /* else */ + COMPILE_(ret, "else", node, poped); + ADD_INSNL(ret, nd_line(orig_node), jump, endlabel); + + ADD_SEQ(ret, body_seq); + ADD_LABEL(ret, endlabel); + + break; + } + case NODE_OPT_N: + case NODE_WHILE: + case NODE_UNTIL:{ + LABEL *prev_start_label = iseq->compile_data->start_label; + LABEL *prev_end_label = iseq->compile_data->end_label; + LABEL *prev_redo_label = iseq->compile_data->redo_label; + VALUE prev_loopval_popped = iseq->compile_data->loopval_popped; + + struct iseq_compile_data_ensure_node_stack *enlp = + iseq->compile_data->ensure_node_stack; + + LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(nd_line(node)); /* next */ + LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(nd_line(node)); /* redo */ + LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(nd_line(node)); /* break */ + LABEL *end_label = NEW_LABEL(nd_line(node)); + + iseq->compile_data->loopval_popped = 0; + iseq->compile_data->ensure_node_stack = 0; + + if (type == NODE_OPT_N || node->nd_state) { + ADD_INSNL(ret, nd_line(node), jump, next_label); + } + + ADD_LABEL(ret, redo_label); + COMPILE_POPED(ret, "while body", node->nd_body); + ADD_LABEL(ret, next_label); /* next */ + + if (type == NODE_WHILE) { + compile_branch_condition(iseq, ret, node->nd_cond, + redo_label, end_label); + } + else if (type == NODE_UNTIL) { + /* untile */ + compile_branch_condition(iseq, ret, node->nd_cond, + end_label, redo_label); + } + else { + ADD_INSN(ret, nd_line(node), putself); + ADD_CALL(ret, nd_line(node), ID2SYM(idGets), INT2FIX(0)); + ADD_INSNL(ret, nd_line(node), branchif, redo_label) ; + /* opt_n */ + } + + ADD_LABEL(ret, end_label); + + if (node->nd_state == Qundef) { + ADD_INSN(ret, nd_line(node), putundef); + } + else { + ADD_INSN(ret, nd_line(node), putnil); + } + + ADD_LABEL(ret, break_label); /* braek */ + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + + ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label, + 0, break_label); + ADD_CATCH_ENTRY(CATCH_TYPE_NEXT | 0x10000, redo_label, + break_label, 0, iseq->compile_data->start_label); + ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, 0, + iseq->compile_data->redo_label); + + iseq->compile_data->start_label = prev_start_label; + iseq->compile_data->end_label = prev_end_label; + iseq->compile_data->redo_label = prev_redo_label; + iseq->compile_data->loopval_popped = prev_loopval_popped; + iseq->compile_data->ensure_node_stack = enlp; + break; + } + case NODE_ITER: + case NODE_FOR:{ + VALUE prevblock = iseq->compile_data->current_block; + LABEL *retry_label = NEW_LABEL(nd_line(node)); + LABEL *retry_end_l = NEW_LABEL(nd_line(node)); + ID mid = 0; + + ADD_LABEL(ret, retry_label); + if (nd_type(node) == NODE_FOR) { + COMPILE(ret, "iter caller (for)", node->nd_iter); + + iseq->compile_data->current_block = + NEW_CHILD_ISEQVAL(node, make_name_for_block(iseq), + ISEQ_TYPE_BLOCK); + + mid = idEach; + ADD_SEND_R(ret, nd_line(node), ID2SYM(idEach), INT2FIX(0), + iseq->compile_data->current_block, INT2FIX(0)); + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + } + else { + iseq->compile_data->current_block = + NEW_CHILD_ISEQVAL(node, make_name_for_block(iseq), + ISEQ_TYPE_BLOCK); + COMPILE_(ret, "iter caller", node->nd_iter, poped); + } + ADD_LABEL(ret, retry_end_l); + iseq->compile_data->current_block = prevblock; + + ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, retry_label, retry_end_l, 0, + retry_label); + break; + } + case NODE_BREAK:{ + unsigned long level = 0; + + if (iseq->compile_data->redo_label != 0) { + /* while/until */ + add_ensure_iseq(ret, iseq); + COMPILE_(ret, "break val (while/until)", node->nd_stts, + iseq->compile_data->loopval_popped); + ADD_INSNL(ret, nd_line(node), jump, + iseq->compile_data->end_label); + } + else if (iseq->type == ISEQ_TYPE_BLOCK) { + break_by_insn: + /* escape from block */ + COMPILE(ret, "break val (block)", node->nd_stts); + ADD_INSN1(ret, nd_line(node), throw, + INT2FIX(level | 0x02) /* TAG_BREAK */ ); + } + else if (iseq->type == ISEQ_TYPE_EVAL) { + COMPILE_ERROR(("Can't escape from eval with break")); + } + else { + yarv_iseq_t *ip = iseq->parent_iseq; + while (ip) { + level++; + if (ip->compile_data->redo_label != 0) { + level = 0x8000; + if (ip->compile_data->loopval_popped == 0) { + /* need value */ + level |= 0x4000; + } + goto break_by_insn; + } + else if (ip->type == ISEQ_TYPE_BLOCK) { + level <<= 16; + goto break_by_insn; + } + ip = ip->parent_iseq; + } + COMPILE_ERROR(("Illegal break")); + } + break; + } + case NODE_NEXT:{ + unsigned long level = 0; + + if (iseq->compile_data->redo_label != 0) { + add_ensure_iseq(ret, iseq); + ADD_INSNL(ret, nd_line(node), jump, + iseq->compile_data->start_label); + } + else if (iseq->compile_data->end_label) { + COMPILE(ret, "next val", node->nd_stts); + add_ensure_iseq(ret, iseq); + ADD_INSNL(ret, nd_line(node), jump, + iseq->compile_data->end_label); + } + else if (iseq->type == ISEQ_TYPE_EVAL) { + COMPILE_ERROR(("Can't escape from eval with next")); + } + else { + yarv_iseq_t *ip = iseq->parent_iseq; + while (ip) { + level = 0x8000; + if (ip->type == ISEQ_TYPE_BLOCK) { + level |= 0x4000; + break; + } + else if (ip->compile_data->redo_label != 0) { + break; + } + ip = ip->parent_iseq; + } + if (ip != 0) { + COMPILE(ret, "next val", node->nd_stts); + add_ensure_iseq(ret, iseq); + ADD_INSN1(ret, nd_line(node), throw, + INT2FIX(level | 0x03) /* TAG_NEXT */ ); + } + else { + COMPILE_ERROR(("Illegal next")); + } + } + break; + } + case NODE_REDO:{ + if (iseq->compile_data->redo_label) { + add_ensure_iseq(ret, iseq); + ADD_INSNL(ret, nd_line(node), jump, + iseq->compile_data->redo_label); + if (!poped) { /* for stack consistency */ + ADD_INSN(ret, nd_line(node), putnil); + } + } + else if (iseq->type == ISEQ_TYPE_EVAL) { + COMPILE_ERROR(("Can't escape from eval with redo")); + } + else if (iseq->compile_data->start_label) { + ADD_INSNL(ret, nd_line(node), jump, + iseq->compile_data->start_label); + if (!poped) { /* for stack consistency */ + ADD_INSN(ret, nd_line(node), putnil); + } + } + else { + yarv_iseq_t *ip = iseq->parent_iseq; + unsigned long level = 0x8000 | 0x4000; + while (ip) { + if (ip->type == ISEQ_TYPE_BLOCK) { + break; + } + else if (ip->type == ISEQ_TYPE_EVAL) { + COMPILE_ERROR(("Can't escape from eval with redo")); + } + else if (ip->compile_data->redo_label != 0) { + break; + } + ip = ip->parent_iseq; + } + if (ip != 0) { + add_ensure_iseq(ret, iseq); + ADD_INSN1(ret, nd_line(node), throw, + INT2FIX(level | 0x05) /* TAG_REDO */ ); + } + else { + COMPILE_ERROR(("Illegal redo")); + } + } + break; + } + case NODE_RETRY:{ + if (iseq->type == ISEQ_TYPE_BLOCK || + iseq->type == ISEQ_TYPE_RESCUE) { + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN1(ret, nd_line(node), throw, + INT2FIX(0x04) /* TAG_RETRY */ ); + } + else { + COMPILE_ERROR(("Illegal retry")); + } + break; + } + case NODE_BEGIN:{ + COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped); + break; + } + case NODE_RESCUE:{ + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + LABEL *lcont = NEW_LABEL(nd_line(node)); + VALUE rescue = NEW_CHILD_ISEQVAL(node->nd_resq, + rb_str_concat(rb_str_new2 + ("rescue in "), + iseq->name), + ISEQ_TYPE_RESCUE); + + ADD_LABEL(ret, lstart); + COMPILE(ret, "rescue head", node->nd_head); + ADD_LABEL(ret, lend); + if (node->nd_else) { + ADD_INSN(ret, nd_line(node), pop); + COMPILE(ret, "rescue else", node->nd_else); + } + ADD_INSN(ret, nd_line(node), nop); + ADD_LABEL(ret, lcont); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + + /* resgister catch entry */ + ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont); + ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, 0, lstart); + break; + } + case NODE_RESBODY:{ + NODE *resq = node; + NODE *narg; + LABEL *label_miss, *label_hit; + + while (resq) { + label_miss = NEW_LABEL(nd_line(node)); + label_hit = NEW_LABEL(nd_line(node)); + + narg = resq->nd_args; + while (narg) { + COMPILE(ret, "rescue arg", narg->nd_head); + ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(1), + INT2FIX(0)); + ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1)); + ADD_INSNL(ret, nd_line(node), branchif, label_hit) ; + narg = narg->nd_next; + } + if (resq->nd_args == 0) { + ADD_INSN1(ret, nd_line(node), putobject, + rb_eStandardError); + ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(1), + INT2FIX(0)); + ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1)); + ADD_INSNL(ret, nd_line(node), branchif, label_hit) ; + } + ADD_INSNL(ret, nd_line(node), jump, label_miss); + ADD_LABEL(ret, label_hit); + COMPILE(ret, "resbody body", resq->nd_body); + ADD_INSN(ret, nd_line(node), leave); + ADD_LABEL(ret, label_miss); + resq = resq->nd_head; + } + break; + } + case NODE_ENSURE:{ + DECL_ANCHOR(ensr); + VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr, + rb_str_concat(rb_str_new2 + ("ensure in "), + iseq->name), + ISEQ_TYPE_ENSURE); + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + LABEL *lcont = NEW_LABEL(nd_line(node)); + struct ensure_range er = { lstart, lend, 0 }; + struct iseq_compile_data_ensure_node_stack enl = { + node->nd_ensr, + iseq->compile_data->ensure_node_stack, /* prev */ + &er, + }; + struct ensure_range *erange; + + COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr); + + iseq->compile_data->ensure_node_stack = &enl; + + ADD_LABEL(ret, lstart); + COMPILE_(ret, "ensure head", node->nd_head, poped); + ADD_LABEL(ret, lend); + if (ensr->anchor.next == 0) { + ADD_INSN(ret, nd_line(node), nop); + } + else { + ADD_SEQ(ret, ensr); + } + ADD_LABEL(ret, lcont); + + erange = iseq->compile_data->ensure_node_stack->erange; + while (erange) { + ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end, + ensure, lcont); + erange = erange->next; + } + iseq->compile_data->ensure_node_stack = enl.prev; + break; + } + + case NODE_AND: + case NODE_OR:{ + LABEL *end_label = NEW_LABEL(nd_line(node)); + COMPILE(ret, "nd_1st", node->nd_1st); + if (!poped) { + ADD_INSN(ret, nd_line(node), dup); + } + if (type == NODE_AND) { + ADD_INSNL(ret, nd_line(node), branchunless, end_label); + } + else { + ADD_INSNL(ret, nd_line(node), branchif, end_label) ; + } + if (!poped) { + ADD_INSN(ret, nd_line(node), pop); + } + COMPILE_(ret, "nd_2nd", node->nd_2nd, poped); + ADD_LABEL(ret, end_label); + break; + } + case NODE_NOT:{ + COMPILE(ret, "value", node->nd_body); + ADD_INSN(ret, nd_line(node), putnot); + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + + case NODE_MASGN:{ + compile_massign(iseq, ret, node->nd_value, /* rhsn */ + node->nd_args, /* splat */ + node->nd_head, /* lhsn */ + 0); + if (!poped) { + ADD_INSN1(ret, nd_line(node), putobject, Qtrue); + } + break; + } + + case NODE_LASGN:{ + int idx = iseq->local_iseq->local_size + 2 - node->nd_cnt; + debugs("lvar: %d\n", idx); + COMPILE(ret, "lvalue", node->nd_value); + + if (!poped) { + ADD_INSN(ret, nd_line(node), dup); + } + ADD_INSN1(ret, nd_line(node), setlocal, INT2FIX(idx)); + + break; + } + case NODE_DASGN: + case NODE_DASGN_CURR:{ + int idx, lv, ls; + COMPILE(ret, "dvalue", node->nd_value); + debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid))); + + if (!poped) { + ADD_INSN(ret, nd_line(node), dup); + } + idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls); + if (nd_type(node) == NODE_DASGN_CURR && + lv > 0 && + iseq->type == ISEQ_TYPE_BLOCK && + iseq->compile_data->for_iseq != 1) { + + dpi(node->nd_vid); + rb_bug("NODE_DASGN_CURR, but lv == %d (line: %d)", lv, + nd_line(node)); + } + + if (idx < 0) { + debugi("unknown id", node->nd_vid); + COMPILE_ERROR(("NODE_DASGN error")); + } + ADD_INSN2(ret, nd_line(node), setdynamic, + INT2FIX(ls - idx), INT2FIX(lv)); + break; + } + case NODE_GASGN:{ + COMPILE(ret, "lvalue", node->nd_value); + + if (!poped) { + ADD_INSN(ret, nd_line(node), dup); + } + ADD_INSN1(ret, nd_line(node), setglobal, + (((long)node->nd_entry) | 1)); + break; + } + case NODE_IASGN:{ + COMPILE(ret, "lvalue", node->nd_value); + if (!poped) { + ADD_INSN(ret, nd_line(node), dup); + } + ADD_INSN1(ret, nd_line(node), setinstancevariable, + ID2SYM(node->nd_vid)); + break; + } + case NODE_CDECL:{ + COMPILE(ret, "lvalue", node->nd_value); + + if (!poped) { + ADD_INSN(ret, nd_line(node), dup); + } + + if (node->nd_vid) { + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN1(ret, nd_line(node), setconstant, + ID2SYM(node->nd_vid)); + } + else { + compile_cpath(ret, iseq, node->nd_else); + ADD_INSN1(ret, nd_line(node), setconstant, + ID2SYM(node->nd_else->nd_mid)); + } + break; + } + case NODE_CVASGN: + case NODE_CVDECL:{ + COMPILE(ret, "cvasgn val", node->nd_value); + if (!poped) { + ADD_INSN(ret, nd_line(node), dup); + } + ADD_INSN2(ret, nd_line(node), setclassvariable, + ID2SYM(node->nd_vid), + nd_type(node) == NODE_CVDECL ? Qtrue : Qfalse); + break; + } + case NODE_OP_ASGN1:{ + DECL_ANCHOR(args); + int argc; + ID id = node->nd_mid; + + /* + * a[x] (op)= y + * + * eval a # a + * eval x # a x + * dupn 2 # a x a x + * send :[] # a x a[x] + * eval y # a x a[x] y + * send op # a x a[x]+y + * send []= # ret + */ + + /* + * nd_recv[nd_args->nd_body] (nd_mid)= nd_args->nd_head; + * NODE_OP_ASGN nd_recv + * nd_args->nd_head + * nd_args->nd_body + * nd_mid + */ + + COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv); + argc = compile_array(iseq, args, node->nd_args->nd_body, Qfalse); + POP_ELEMENT(args); + ADD_SEQ(ret, args); + ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(argc+1)); + ADD_SEND(ret, nd_line(node), ID2SYM(idAREF), INT2FIX(argc)); + + if (id == 0 || id == 1) { + /* 0: or, 1: and + a[x] ||= y + + unless/if a[x] + a[x]= y + else + nil + end + */ + LABEL *label = NEW_LABEL(nd_line(node)); + LABEL *lfin = NEW_LABEL(nd_line(node)); + + if (id == 0) { + /* or */ + ADD_INSN(ret, nd_line(node), dup); + ADD_INSNL(ret, nd_line(node), branchif, label) ; + ADD_INSN(ret, nd_line(node), pop); + } + else { + /* and */ + ADD_INSNL(ret, nd_line(node), branchunless, label); + } + + COMPILE(ret, "NODE_OP_ASGN1 args->head: ", + node->nd_args->nd_head); + ADD_SEND(ret, nd_line(node), ID2SYM(idASET), + INT2FIX(argc + 1)); + ADD_INSNL(ret, nd_line(node), jump, lfin); + ADD_LABEL(ret, label); + if (id == 0) { /* or */ + ADD_INSN(ret, nd_line(node), swap); + ADD_INSN(ret, nd_line(node), pop); + ADD_INSN(ret, nd_line(node), swap); + ADD_INSN(ret, nd_line(node), pop); + } + else if (id == 1) { /* and */ + ADD_INSN(ret, nd_line(node), pop); + ADD_INSN(ret, nd_line(node), pop); + ADD_INSN(ret, nd_line(node), putnil); + } + ADD_LABEL(ret, lfin); + } + else { + COMPILE(ret, "NODE_OP_ASGN1 args->head: ", + node->nd_args->nd_head); + ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1)); + ADD_SEND(ret, nd_line(node), ID2SYM(idASET), + INT2FIX(argc + 1)); + } + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + + break; + } + case NODE_OP_ASGN2:{ + ID atype = node->nd_next->nd_mid; + LABEL *lfin = NEW_LABEL(nd_line(node)); + LABEL *lcfin = NEW_LABEL(nd_line(node)); + /* + class C; attr_accessor :c; end + r = C.new + r.a &&= v # asgn2 + + eval r # r + dup # r r + eval r.a # r o + + # or + dup # r o o + if lcfin # r o + pop # r + eval v # r v + send a= # v + jump lfin # v + + lcfin: # r o + swap # o r + pop # o + + lfin: # v + + # and + dup # r o o + unless lcfin + pop # r + eval v # r v + send a= # v + jump lfin # v + + # others + eval v # r o v + send ?? # r w + send a= # w + + */ + + COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv); + ADD_INSN(ret, nd_line(node), dup); + ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_vid), + INT2FIX(0)); + + if (atype == 0 || atype == 1) { /* 0: OR or 1: AND */ + ADD_INSN(ret, nd_line(node), dup); + if (atype == 0) { + ADD_INSNL(ret, nd_line(node), branchif, lcfin) ; + } + else { + ADD_INSNL(ret, nd_line(node), branchunless, lcfin); + } + ADD_INSN(ret, nd_line(node), pop); + COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); + ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid), + INT2FIX(1)); + ADD_INSNL(ret, nd_line(node), jump, lfin); + + ADD_LABEL(ret, lcfin); + ADD_INSN(ret, nd_line(node), swap); + ADD_INSN(ret, nd_line(node), pop); + + ADD_LABEL(ret, lfin); + } + else { + COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); + ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid), + INT2FIX(1)); + ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid), + INT2FIX(1)); + } + + if (poped) { + /* we can apply more optimize */ + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_OP_ASGN_AND: + case NODE_OP_ASGN_OR:{ + LABEL *lfin = NEW_LABEL(nd_line(node)); + LABEL *lassign = NEW_LABEL(nd_line(node)); + + if (nd_type(node) == NODE_OP_ASGN_OR) { + defined_expr(iseq, ret, node->nd_head, lassign, Qfalse); + ADD_INSNL(ret, nd_line(node), branchunless, lassign); + } + + COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head); + ADD_INSN(ret, nd_line(node), dup); + + if (nd_type(node) == NODE_OP_ASGN_AND) { + ADD_INSNL(ret, nd_line(node), branchunless, lfin); + } + else { + ADD_INSNL(ret, nd_line(node), branchif, lfin) ; + } + + ADD_INSN(ret, nd_line(node), pop); + ADD_LABEL(ret, lassign); + COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value); + ADD_LABEL(ret, lfin); + + if (poped) { + /* we can apply more optimize */ + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_CALL: + case NODE_FCALL: + case NODE_VCALL:{ /* VCALL: variable or call */ + /* + call: obj.method(...) + fcall: func(...) + vcall: func + */ + DECL_ANCHOR(recv); + DECL_ANCHOR(args); + ID mid = node->nd_mid; + VALUE argc; + VALUE flag = 0; + VALUE parent_block = iseq->compile_data->current_block; + iseq->compile_data->current_block = Qfalse; + +#if SUPPORT_JOKE + if (nd_type(node) == NODE_VCALL) { + if (mid == idBitblt) { + ADD_INSN(ret, nd_line(node), bitblt); + break; + } + else if (mid == idAnswer) { + ADD_INSN(ret, nd_line(node), answer); + break; + } + } + /* only joke */ + { + static ID goto_id; + static ID label_id; + VALUE label; + VALUE label_sym; + + if (goto_id == 0) { + goto_id = rb_intern("__goto__"); + label_id = rb_intern("__label__"); + } + + if (nd_type(node) == NODE_FCALL && + (mid == goto_id || mid == label_id)) { + if (nd_type(node->nd_args->nd_head) == NODE_LIT && + SYMBOL_P(node->nd_args->nd_head->nd_lit)) { + + label_sym = label = node->nd_args->nd_head->nd_lit; + if ((label = + rb_hash_aref(iseq->compile_data, + label_sym)) == Qnil) { + rb_hash_aset(iseq->compile_data, label_sym, + label = NEW_LABEL(nd_line(node))); + } + } + else { + rb_bug("illegal goto/label format"); + } + + + if (mid == goto_id) { + ADD_INSNL(ret, nd_line(node), jump, label); + } + else { + ADD_LABEL(ret, label); + } + break; + } + } +#endif + /* reciever */ + if (type == NODE_CALL) { + COMPILE(recv, "recv", node->nd_recv); + } + else if (type == NODE_FCALL || type == NODE_VCALL) { + ADD_INSN(recv, nd_line(node), putself); + } + + /* args */ + if (nd_type(node) != NODE_VCALL) { + argc = setup_arg(iseq, args, node, &flag); + } + else { + argc = INT2FIX(0); + } + + ADD_SEQ(ret, recv); + ADD_SEQ(ret, args); + + debugp_param("call args argc", argc); + debugp_param("call method", ID2SYM(mid)); + + switch (nd_type(node)) { + case NODE_VCALL: + flag |= VM_CALL_VCALL_BIT; + /* VCALL is funcall, so fall through */ + case NODE_FCALL: + flag |= VM_CALL_FCALL_BIT; + } + + ADD_SEND_R(ret, nd_line(node), ID2SYM(mid), + argc, parent_block, INT2FIX(flag)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_SUPER: + case NODE_ZSUPER:{ + DECL_ANCHOR(args); + VALUE argc; + VALUE flag = 0; + VALUE parent_block = iseq->compile_data->current_block; + iseq->compile_data->current_block = Qfalse; + + if (nd_type(node) == NODE_SUPER) { + argc = setup_arg(iseq, args, node, &flag); + } + else { + /* NODE_ZSUPER */ + int i; + yarv_iseq_t *liseq = iseq->local_iseq; + + argc = INT2FIX(liseq->argc); + + /* normal arguments */ + for (i = 0; i < liseq->argc; i++) { + int idx = liseq->local_size - i; + ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx)); + } + if (!liseq->arg_simple) { + if (liseq->arg_opts) { + /* optional arguments */ + int j; + for (j = 0; j < liseq->arg_opts - 1; j++) { + int idx = liseq->local_size - (i + j); + ADD_INSN1(args, nd_line(node), getlocal, + INT2FIX(idx)); + } + i += j; + argc = INT2FIX(i); + } + if (liseq->arg_rest) { + /* rest arguments */ + int idx = liseq->local_size - liseq->arg_rest + 1; + ADD_INSN1(args, nd_line(node), getlocal, + INT2FIX(idx)); + argc = INT2FIX(liseq->arg_rest); + flag |= VM_CALL_ARGS_SPLAT_BIT; + } + } + } + + /* dummy reciever */ + ADD_INSN1(ret, nd_line(node), putobject, + nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue); + ADD_SEQ(ret, args); + ADD_INSN3(ret, nd_line(node), invokesuper, + argc, parent_block, INT2FIX(flag)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_ARRAY:{ + compile_array(iseq, ret, node, Qtrue); + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_ZARRAY:{ + if (!poped) { + ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(0)); + } + break; + } + case NODE_VALUES:{ + NODE *n = node; + while (n) { + COMPILE(ret, "values item", n->nd_head); + n = n->nd_next; + } + ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(node->nd_alen)); + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_HASH:{ + DECL_ANCHOR(list); + VALUE size = 0; + int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY; + + switch (type) { + case NODE_ARRAY:{ + compile_array(iseq, list, node->nd_head, Qfalse); + size = OPERAND_AT(POP_ELEMENT(list), 0); + ADD_SEQ(ret, list); + break; + } + case NODE_ZARRAY: + size = INT2FIX(0); + break; + + default: + rb_bug("can't make hash with this node: %s", node_name(type)); + } + + ADD_INSN1(ret, nd_line(node), newhash, size); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_RETURN:{ + yarv_iseq_t *is = iseq; + + while (is) { + if (is->type == ISEQ_TYPE_TOP || is->type == ISEQ_TYPE_CLASS) { + COMPILE_ERROR(("Illegal return")); + break; + } + else { + if (is->type == ISEQ_TYPE_METHOD) { + ADD_INSN(ret, nd_line(node), emptstack); + } + + COMPILE(ret, "return nd_stts (return val)", + node->nd_stts); + + if (is->type == ISEQ_TYPE_METHOD) { + add_ensure_iseq(ret, iseq); + ADD_INSN(ret, nd_line(node), leave); + } + else { + ADD_INSN1(ret, nd_line(node), throw, + INT2FIX(0x01) /* TAG_RETURN */ ); + } + break; + } + } + + break; + } + case NODE_YIELD:{ + DECL_ANCHOR(args); + int argc; + unsigned long flag = 0; + + if (iseq->type == ISEQ_TYPE_TOP || iseq->type == ISEQ_TYPE_CLASS) { + COMPILE_ERROR(("Illegal yield")); + } + + if (node->nd_head) { + if (nd_type(node->nd_head) == NODE_ARRAY) { + NODE *p; + for (argc = 0, p = node->nd_head; p; + p = p->nd_next, argc++) { + /* count argc */ + } + if (argc == 1) { + COMPILE(args, "yield with an arg", node->nd_head); + } + else { + compile_array(iseq, args, node->nd_head, Qfalse); + POP_ELEMENT(args); + } + debugs("argc: %d\n", argc); + } + else { + if (nd_type(node->nd_head) == NODE_ARGSCAT) { + if (node->nd_state == 2) { + flag |= VM_CALL_ARGS_SPLAT_BIT; + } + + compile_array(iseq, args, node->nd_head->nd_head, + Qfalse); + POP_ELEMENT(args); + argc = LIST_SIZE(args) + 1; + + COMPILE(args, "args(cat: splat)", + node->nd_head->nd_body); + } + else if (nd_type(node->nd_head) == NODE_SPLAT) { + if (node->nd_state == 2) { + flag |= VM_CALL_ARGS_SPLAT_BIT; + } + + argc = 1; + COMPILE(args, "splat", node->nd_head->nd_head); + } + else { + COMPILE(args, "nd_head(1)", node->nd_head); + argc = 1; + } + } + } + else { + argc = 0; + } + ADD_SEQ(ret, args); + ADD_INSN2(ret, nd_line(node), invokeblock, INT2FIX(argc), + INT2FIX(flag)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_LVAR:{ + if (!poped) { + int idx = iseq->local_iseq->local_size + 2 - node->nd_cnt; + debugs("idx: %d\n", idx); + ADD_INSN1(ret, nd_line(node), getlocal, INT2FIX(idx)); + } + break; + } + case NODE_DVAR:{ + int lv, idx, ls; + debugi("nd_vid", node->nd_vid); + if (!poped) { + idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls); + if (idx < 0) { + rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid)); + } + ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(ls - idx), + INT2FIX(lv)); + } + break; + } + case NODE_GVAR:{ + ADD_INSN1(ret, nd_line(node), getglobal, + (((long)node->nd_entry) | 1)); + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_IVAR:{ + debugi("nd_vid", node->nd_vid); + if (!poped) { + ADD_INSN1(ret, nd_line(node), getinstancevariable, + ID2SYM(node->nd_vid)); + } + break; + } + case NODE_CONST:{ + debugi("nd_vid", node->nd_vid); + + if (iseq->compile_data->option->inline_const_cache) { + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + + ADD_LABEL(ret, lstart); + ADD_INSN2(ret, nd_line(node), getinlinecache, + NEW_INLINE_CACHE_ENTRY(), lend); + ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid)); + ADD_INSN1(ret, nd_line(node), setinlinecache, lstart); + ADD_LABEL(ret, lend); + } + else { + ADD_INSN(ret, nd_line(node), putnil); + ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid)); + } + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_CVAR:{ + if (!poped) { + ADD_INSN1(ret, nd_line(node), getclassvariable, + ID2SYM(node->nd_vid)); + } + break; + } + case NODE_NTH_REF:{ + ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(node->nd_cnt), + INT2FIX(node->nd_nth << 1)); + break; + } + case NODE_BACK_REF:{ + ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(node->nd_cnt), + INT2FIX(0x01 | (node->nd_nth << 1))); + break; + } + case NODE_MATCH: + case NODE_MATCH2: + case NODE_MATCH3:{ + DECL_ANCHOR(recv); + DECL_ANCHOR(val); + + switch(nd_type(node)) { + case NODE_MATCH: + ADD_INSN1(recv, nd_line(node), putobject, node->nd_lit); + ADD_INSN2(val, nd_line(node), getspecial, INT2FIX(0), + INT2FIX(0)); + break; + case NODE_MATCH2: + COMPILE(recv, "reciever", node->nd_recv); + COMPILE(val, "value", node->nd_value); + break; + case NODE_MATCH3: + COMPILE(recv, "reciever", node->nd_value); + COMPILE(val, "value", node->nd_recv); + break; + } + + if (iseq->compile_data->option->specialized_instruction) { + /* TODO: detect by node */ + if (recv->last == recv->anchor.next && + INSN_OF(recv->last) == BIN(putobject) && + nd_type(node) == NODE_MATCH2) { + ADD_SEQ(ret, val); + ADD_INSN1(ret, nd_line(node), opt_regexpmatch1, + OPERAND_AT(recv->last, 0)); + } + else { + ADD_SEQ(ret, recv); + ADD_SEQ(ret, val); + ADD_INSN(ret, nd_line(node), opt_regexpmatch2); + } + } + else { + ADD_SEQ(ret, recv); + ADD_SEQ(ret, val); + ADD_SEND(ret, nd_line(node), ID2SYM(idEqTilde), INT2FIX(1)); + } + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_LIT:{ + debugp_param("lit", node->nd_lit); + if (!poped) { + ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit); + } + break; + } + case NODE_STR:{ + debugp_param("nd_lit", node->nd_lit); + if (!poped) { + ADD_INSN1(ret, nd_line(node), putstring, node->nd_lit); + } + break; + } + case NODE_DSTR:{ + compile_dstr(iseq, ret, node); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_XSTR:{ + ADD_INSN(ret, nd_line(node), putself); + ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit); + ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_DXSTR:{ + ADD_INSN(ret, nd_line(node), putself); + compile_dstr(iseq, ret, node); + ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_EVSTR:{ + COMPILE(ret, "nd_body", node->nd_body); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + else { + ADD_INSN(ret, nd_line(node), tostring); + } + break; + } + case NODE_DREGX:{ + compile_dstr(iseq, ret, node); + ADD_INSN1(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_DREGX_ONCE:{ + /* fix me: once? */ + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + + ADD_LABEL(ret, lstart); + ADD_INSN2(ret, nd_line(node), onceinlinecache, + NEW_INLINE_CACHE_ENTRY(), lend); + ADD_INSN(ret, nd_line(node), pop); + + compile_dstr(iseq, ret, node); + ADD_INSN1(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag)); + + ADD_INSN1(ret, nd_line(node), setinlinecache, lstart); + ADD_LABEL(ret, lend); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_ARGS:{ + /* OK */ + COMPILE_ERROR(("BUG: should not reach here: compile_each#NODE_ARGS")); + break; + } + case NODE_ARGSCAT:{ + COMPILE(ret, "argscat head", node->nd_head); + COMPILE(ret, "argscat body", node->nd_body); + ADD_INSN(ret, nd_line(node), concatarray); + break; + } + case NODE_ARGSPUSH:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_ARGSPUSH")); + break; + } + case NODE_SPLAT:{ + COMPILE(ret, "splat", node->nd_head); + ADD_INSN1(ret, nd_line(node), splatarray, Qfalse); + break; + } + case NODE_TO_ARY:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_TO_ARY")); + break; + } + case NODE_BLOCK_ARG:{ + iseq->arg_block = node->nd_cnt - 2 + 1; + iseq->arg_simple = 0; + break; + } + case NODE_BLOCK_PASS:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_BLOCK_PASS")); + break; + } + case NODE_DEFN:{ + VALUE iseqval = NEW_ISEQVAL(node->nd_defn, + rb_str_new2(rb_id2name(node->nd_mid)), + ISEQ_TYPE_METHOD); + + debugp_param("defn/iseq", iseqval); + + ADD_INSN (ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), definemethod, + ID2SYM(node->nd_mid), iseqval, INT2FIX(0)); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } + debugp_param("defn", iseqval); + break; + } + case NODE_DEFS:{ + VALUE iseqval = NEW_ISEQVAL(node->nd_defn, + rb_str_new2(rb_id2name(node->nd_mid)), + ISEQ_TYPE_METHOD); + + debugp_param("defs/iseq", iseqval); + + COMPILE(ret, "defs: recv", node->nd_recv); + ADD_INSN3(ret, nd_line(node), definemethod, + ID2SYM(node->nd_mid), iseqval, INT2FIX(1)); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } + break; + } + case NODE_ALIAS:{ + VALUE s1, s2; + + if (nd_type(node->u1.node) != NODE_LIT || + nd_type(node->u2.node) != NODE_LIT) { + rb_bug("alias args must be NODE_LIT"); + } + s1 = node->u1.node->nd_lit; + s2 = node->u2.node->nd_lit; + + ADD_INSN3(ret, nd_line(node), alias, Qfalse, ID2SYM(rb_to_id(s1)), + ID2SYM(rb_to_id(s2))); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } + break; + } + case NODE_VALIAS:{ + ADD_INSN3(ret, nd_line(node), alias, Qtrue, ID2SYM(node->u1.id), + ID2SYM(node->u2.id)); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } + break; + } + case NODE_UNDEF:{ + if (nd_type(node->u2.node) != NODE_LIT) { + rb_bug("undef args must be NODE_LIT"); + } + ADD_INSN1(ret, nd_line(node), undef, + ID2SYM(rb_to_id(node->u2.node->nd_lit))); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } + break; + } + case NODE_CLASS:{ + VALUE iseqval = + NEW_CHILD_ISEQVAL( + node->nd_body, + make_name_with_str("<class:%s>", + rb_id2name(node->nd_cpath->nd_mid)), + ISEQ_TYPE_CLASS); + compile_cpath(ret, iseq, node->nd_cpath); + COMPILE(ret, "super", node->nd_super); + ADD_INSN3(ret, nd_line(node), defineclass, + ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(0)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_MODULE:{ + VALUE iseqval = NEW_CHILD_ISEQVAL(node->nd_body, + make_name_with_str + ("<module:%s>", + rb_id2name(node->nd_cpath-> + nd_mid)), + ISEQ_TYPE_CLASS); + + COMPILE(ret, "mbase", node->nd_cpath->nd_head); + ADD_INSN (ret, nd_line(node), putnil); /* dummy */ + ADD_INSN3(ret, nd_line(node), defineclass, + ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(2)); + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_SCLASS:{ + VALUE iseqval = + NEW_ISEQVAL(node->nd_body, rb_str_new2("singletonclass"), + ISEQ_TYPE_CLASS); + + COMPILE(ret, "sclass#recv", node->nd_recv); + ADD_INSN (ret, nd_line(node), putnil); + ADD_INSN3(ret, nd_line(node), defineclass, + ID2SYM(rb_intern("singletonclass")), iseqval, INT2FIX(1)); + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_COLON2:{ + if (rb_is_const_id(node->nd_mid)) { + /* constant */ + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + DECL_ANCHOR(pref); + DECL_ANCHOR(body); + + compile_colon2(iseq, node, pref, body); + if (LIST_SIZE_ZERO(pref)) { + if (iseq->compile_data->option->inline_const_cache) { + ADD_LABEL(ret, lstart); + ADD_INSN2(ret, nd_line(node), getinlinecache, + NEW_INLINE_CACHE_ENTRY(), lend); + } + else { + ADD_INSN(ret, nd_line(node), putnil); + } + + ADD_SEQ(ret, body); + + if (iseq->compile_data->option->inline_const_cache) { + ADD_INSN1(ret, nd_line(node), setinlinecache, lstart); + ADD_LABEL(ret, lend); + } + } + else { + ADD_SEQ(ret, pref); + ADD_SEQ(ret, body); + } + } + else { + /* function call */ + ADD_INSN(ret, nd_line(node), putself); + COMPILE(ret, "colon2#nd_head", node->nd_head); + ADD_CALL(ret, nd_line(node), ID2SYM(node->nd_mid), + INT2FIX(1)); + } + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_COLON3:{ + LABEL *lstart = NEW_LABEL(nd_line(node)); + LABEL *lend = NEW_LABEL(nd_line(node)); + debugi("colon3#nd_mid", node->nd_mid); + + /* add cache insn */ + if (iseq->compile_data->option->inline_const_cache) { + ADD_LABEL(ret, lstart); + ADD_INSN2(ret, nd_line(node), getinlinecache, + NEW_INLINE_CACHE_ENTRY(), lend); + ADD_INSN(ret, nd_line(node), pop); + } + + ADD_INSN1(ret, nd_line(node), putobject, rb_cObject); + ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_mid)); + + if (iseq->compile_data->option->inline_const_cache) { + ADD_INSN1(ret, nd_line(node), setinlinecache, lstart); + ADD_LABEL(ret, lend); + } + + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_CREF:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_CREF")); + break; + } + case NODE_DOT2: + case NODE_DOT3:{ + int flag = type == NODE_DOT2 ? INT2FIX(0) : INT2FIX(1); + COMPILE(ret, "min", (NODE *) node->nd_beg); + COMPILE(ret, "max", (NODE *) node->nd_end); + if (poped) { + ADD_INSN(ret, nd_line(node), pop); + ADD_INSN(ret, nd_line(node), pop); + } + else { + ADD_INSN1(ret, nd_line(node), newrange, flag); + } + break; + } + case NODE_FLIP2: + case NODE_FLIP3:{ + LABEL *lend = NEW_LABEL(nd_line(node)); + LABEL *lfin = NEW_LABEL(nd_line(node)); + LABEL *ltrue = NEW_LABEL(nd_line(node)); + + ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(node->nd_cnt), + INT2FIX(0)); + ADD_INSNL(ret, nd_line(node), branchif, lend) ; + + /* *flip == 0 */ + COMPILE(ret, "flip2 beg", node->nd_beg); + ADD_INSN(ret, nd_line(node), dup); + ADD_INSNL(ret, nd_line(node), branchunless, lfin); + if (nd_type(node) == NODE_FLIP3) { + ADD_INSN(ret, nd_line(node), dup); + ADD_INSN1(ret, nd_line(node), setspecial, INT2FIX(node->nd_cnt)); + ADD_INSNL(ret, nd_line(node), jump, lfin); + } + else { + ADD_INSN1(ret, nd_line(node), setspecial, INT2FIX(node->nd_cnt)); + } + + /* *flip == 1 */ + ADD_LABEL(ret, lend); + COMPILE(ret, "flip2 end", node->nd_end); + ADD_INSNL(ret, nd_line(node), branchunless, ltrue); + ADD_INSN1(ret, nd_line(node), putobject, Qfalse); + ADD_INSN1(ret, nd_line(node), setspecial, INT2FIX(node->nd_cnt)); + + ADD_LABEL(ret, ltrue); + ADD_INSN1(ret, nd_line(node), putobject, Qtrue); + + ADD_LABEL(ret, lfin); + break; + } + case NODE_ATTRSET:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_ATTRSET")); + break; + } + case NODE_SELF:{ + if (!poped) { + ADD_INSN(ret, nd_line(node), putself); + } + + break; + } + case NODE_NIL:{ + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } + break; + } + case NODE_TRUE:{ + if (!poped) { + ADD_INSN1(ret, nd_line(node), putobject, Qtrue); + } + break; + } + case NODE_FALSE:{ + if (!poped) { + ADD_INSN1(ret, nd_line(node), putobject, Qfalse); + } + break; + } + case NODE_ERRINFO:{ + if (!poped) { + if (iseq->type == ISEQ_TYPE_RESCUE) { + ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(1), + INT2FIX(0)); + } + else { + yarv_iseq_t *ip = iseq; + int level = 0; + while (ip) { + if (ip->type == ISEQ_TYPE_RESCUE) { + break; + } + ip = ip->parent_iseq; + level++; + } + if (ip) { + ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(1), + INT2FIX(level)); + } + else { + ADD_INSN(ret, nd_line(node), putnil); + } + } + } + break; + } + case NODE_DEFINED:{ + if (!poped) { + LABEL *lfinish = NEW_LABEL(nd_line(node)); + defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue); + ADD_LABEL(ret, lfinish); + } + break; + } + case NODE_POSTEXE:{ + VALUE block = NEW_CHILD_ISEQVAL(node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK); + ADD_INSN1(ret, nd_line(node), postexe, block); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } + break; + } +#ifdef C_ALLOCA + case NODE_ALLOCA:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_ALLOCA")); + break; + } +#endif + case NODE_BMETHOD:{ + /* block method, OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_BMETHOD")); + break; + } + case NODE_MEMO:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_MEMO")); + break; + } + case NODE_IFUNC:{ + /* OK */ + COMPILE_ERROR(("BUG: unknown node: NODE_IFUNC")); + break; + } + case NODE_DSYM:{ + compile_dstr(iseq, ret, node); + if (!poped) { + ADD_SEND(ret, nd_line(node), ID2SYM(idIntern), INT2FIX(0)); + } + else { + ADD_INSN(ret, nd_line(node), pop); + } + break; + } + case NODE_ATTRASGN:{ + DECL_ANCHOR(recv); + DECL_ANCHOR(args); + VALUE flag = 0; + VALUE argc; + + argc = setup_arg(iseq, args, node, &flag); + + if (node->nd_recv == (NODE *) 1) { + ADD_INSN(recv, nd_line(node), putself); + } + else { + COMPILE(recv, "recv", node->nd_recv); + } + + debugp_param("argc", argc); + debugp_param("nd_mid", ID2SYM(node->nd_mid)); + + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + ADD_SEQ(ret, recv); + ADD_SEQ(ret, args); + ADD_INSN1(ret, nd_line(node), setn, INT2FIX(FIX2INT(argc) + 1)); + } + else { + ADD_SEQ(ret, recv); + ADD_SEQ(ret, args); + } + ADD_SEND_R(ret, nd_line(node), ID2SYM(node->nd_mid), argc, 0, INT2FIX(flag)); + ADD_INSN(ret, nd_line(node), pop); + + break; + } + case NODE_OPTBLOCK:{ + /* for optimize */ + LABEL *redo_label = NEW_LABEL(0); + LABEL *next_label = NEW_LABEL(0); + + iseq->compile_data->start_label = next_label; + iseq->compile_data->redo_label = redo_label; + + ADD_LABEL(ret, redo_label); + COMPILE_(ret, "optblock body", node->nd_head, 1 /* pop */ ); + ADD_LABEL(ret, next_label); + ADD_INSN(ret, 0, opt_checkenv); + break; + } + case NODE_PRELUDE:{ + COMPILE_POPED(ret, "prelude", node->nd_head); + COMPILE_(ret, "body", node->nd_body, poped); + break; + } + default: + COMPILE_ERROR(("BUG: unknown node (default): %s", node_name(type))); + return Qnil; + } + + debug_nodeprint_close(); + return COMPILE_OK; +} + +/***************************/ +/* instruction information */ +/***************************/ + +static int +insn_data_length(INSN *iobj) +{ + return insn_len(iobj->insn_id); +} + +static int +calc_sp_depth(int depth, INSN *insn) +{ + return insn_stack_increase(depth, insn->insn_id, insn->operands); +} + +static int +insn_data_line_no(INSN *iobj) +{ + return insn_len(iobj->line_no); +} + +static VALUE +insn_data_to_s_detail(INSN *iobj) +{ + VALUE str = rb_str_new(0, 0); + char buff[0x100]; + + snprintf(buff, sizeof(buff), "%-16s", insn_name(iobj->insn_id)); + rb_str_cat2(str, buff); + if (iobj->operands) { + char *types = insn_op_types(iobj->insn_id); + int j; + + for (j = 0; types[j]; j++) { + char type = types[j]; + + switch (type) { + case TS_OFFSET: /* label(destination position) */ + { + char buff[0x100]; + LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j); + snprintf(buff, sizeof(buff), "<L%03d>", lobj->label_no); + rb_str_concat(str, rb_str_new2(buff)); + break; + } + break; + case TS_ISEQ: /* iseq */ + { + yarv_iseq_t *iseq = (yarv_iseq_t *)OPERAND_AT(iobj, j); + VALUE val = Qnil; + if (iseq) { + val = iseq->self; + } + rb_str_concat(str, rb_inspect(val)); + } + break; + case TS_LINDEX: + case TS_DINDEX: + case TS_NUM: /* ulong */ + case TS_VALUE: /* VALUE */ + rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j))); + break; + case TS_ID: /* ID */ + rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j))); + break; + case TS_GENTRY: + { + struct global_entry *entry = (struct global_entry *) + (OPERAND_AT(iobj, j) & (~1)); + rb_str_cat2(str, rb_id2name(entry->id)); + } + case TS_IC: /* method cache */ + rb_str_cat2(str, "<ic>"); + break; + case TS_CDHASH: /* case/when condition cache */ + rb_str_cat2(str, "<ch>"); + break; + default:{ + rb_bug("unknown operand type: %c", type); + } + } + if (types[j + 1]) { + rb_str_cat2(str, ", "); + } + } + } + return str; +} + +static void +dump_disasm_anchor(LINK_ANCHOR *anc) +{ + dump_disasm_list(FIRST_ELEMENT(anc)); +} + +static void +dump_disasm_list(struct iseq_link_element *link) +{ + int pos = 0; + INSN *iobj; + LABEL *lobj; + VALUE str; + + printf("-- raw disasm--------\n"); + + while (link) { + switch (link->type) { + case ISEQ_ELEMENT_INSN:{ + iobj = (INSN *)link; + str = insn_data_to_s_detail(iobj); + printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str), + insn_data_line_no(iobj)); + pos += insn_data_length(iobj); + break; + } + case ISEQ_ELEMENT_LABEL:{ + lobj = (LABEL *)link; + printf("<L%03d>\n", lobj->label_no); + break; + } + case ISEQ_ELEMENT_NONE:{ + printf("[none]\n"); + break; + } + default: + /* ignore */ + printf("%ld\n", FIX2LONG(link->type)); + rb_bug("dump_disasm_list error"); + } + link = link->next; + } + printf("---------------------\n"); +} + +int +nd_line_debug(NODE * n) +{ + return nd_line(n); +} + +VALUE +insns_name_array(void) +{ + VALUE ary = rb_ary_new(); + int i; + for (i = 0; i < sizeof(insn_name_info) / sizeof(insn_name_info[0]); i++) { + rb_ary_push(ary, rb_str_new2(insn_name_info[i])); + } + return ary; +} + +static LABEL * +register_label(yarv_iseq_t *iseq, struct st_table *labels_table, VALUE obj) +{ + LABEL *label = 0; + obj = rb_convert_type(obj, T_SYMBOL, "Symbol", "to_sym"); + + if (st_lookup(labels_table, obj, (st_data_t *)&label) == 0) { + label = NEW_LABEL(0); + st_insert(labels_table, obj, (st_data_t)label); + } + return label; +} + +static VALUE +get_exception_sym2type(VALUE sym) +{ + static VALUE symRescue, symEnsure, symRetry; + static VALUE symBreak, symRedo, symNext; + + if (symRescue == 0) { + symRescue = ID2SYM(rb_intern("rescue")); + symEnsure = ID2SYM(rb_intern("ensure")); + symRetry = ID2SYM(rb_intern("retry")); + symBreak = ID2SYM(rb_intern("break")); + symRedo = ID2SYM(rb_intern("redo")); + symNext = ID2SYM(rb_intern("next")); + } + + if (sym == symRescue) return CATCH_TYPE_RESCUE; + if (sym == symEnsure) return CATCH_TYPE_ENSURE; + if (sym == symRetry) return CATCH_TYPE_RETRY; + if (sym == symBreak) return CATCH_TYPE_BREAK; + if (sym == symRedo) return CATCH_TYPE_REDO; + if (sym == symNext) return CATCH_TYPE_NEXT; + rb_bug("get_exception_sym2type"); + return 0; +} + +VALUE iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt); + +static int +iseq_build_exception(yarv_iseq_t *iseq, struct st_table *labels_table, + VALUE exception) +{ + int i; + VALUE tmp; + + for (i=0; i<RARRAY_LEN(exception); i++) { + VALUE v = rb_ary_entry(exception, i); + VALUE *ptr = RARRAY_PTR(v); + VALUE type = get_exception_sym2type(ptr[0]); + VALUE eiseqval; + LABEL *lstart, *lend, *lcont; + int sp; + + if (ptr[1] == Qnil) { + eiseqval = 0; + } + else { + eiseqval = iseq_load(0, ptr[1], iseq->self, Qnil); + } + + lstart = register_label(iseq, labels_table, ptr[2]); + lend = register_label(iseq, labels_table, ptr[3]); + lcont = register_label(iseq, labels_table, ptr[4]); + sp = NUM2INT(ptr[5]); + + ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont); + } + return COMPILE_OK; +} + + +struct st_table *insn_make_insn_table(void); + +static int +iseq_build_body(yarv_iseq_t *iseq, LINK_ANCHOR *anchor, + VALUE body, VALUE line, struct st_table *labels_table) +{ + /* TODO: body should be freezed */ + VALUE *ptr = RARRAY_PTR(body); + int len = RARRAY_LEN(body); + int i, j; + int line_no = 0; + /* + * index -> LABEL *label + */ + static struct st_table *insn_table; + + if (insn_table == 0) { + insn_table = insn_make_insn_table(); + } + + for (i=0; i<len; i++) { + VALUE obj = ptr[i]; + + if (SYMBOL_P(obj)) { + LABEL *label = register_label(iseq, labels_table, obj); + ADD_LABEL(anchor, label); + } + else if (FIXNUM_P(obj)) { + line_no = NUM2INT(obj); + } + else if (TYPE(obj) == T_ARRAY) { + VALUE *argv = 0; + int argc = RARRAY_LEN(obj) - 1; + VALUE insn_id; + + if (st_lookup(insn_table, rb_ary_entry(obj, 0), &insn_id) == 0) { + // TODO: exception + rb_bug("unknown instruction: "); + } + + if (argc != insn_len(insn_id)-1) { + rb_bug("operand size mismatch"); + } + + if (argc > 0) { + argv = compile_data_alloc(iseq, sizeof(VALUE) * argc); + for (j=0; j<argc; j++) { + VALUE op = rb_ary_entry(obj, j+1); + switch (insn_op_type(insn_id, j)) { + case TS_OFFSET: { + LABEL *label = register_label(iseq, labels_table, op); + argv[j] = (VALUE)label; + break; + } + case TS_LINDEX: + case TS_DINDEX: + case TS_NUM: + argv[j] = (NUM2INT(op), op); + break; + case TS_VALUE: + argv[j] = op; + if (!SPECIAL_CONST_P(op)) { + iseq_add_mark_object(iseq, op); + } + break; + case TS_ISEQ: + { + if (op != Qnil) { + if (TYPE(op) == T_ARRAY) { + argv[j] = + iseq_load(0, op, iseq->self, Qnil); + } + else if (CLASS_OF(op) == cYarvISeq) { + argv[j] = op; + } + else { + /* TODO: exception */ + rb_bug("not an iseq"); + } + iseq_add_mark_object(iseq, argv[j]); + } + else { + argv[j] = 0; + } + } + break; + case TS_GENTRY: + op = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym"); + argv[j] = (VALUE)rb_global_entry(SYM2ID(op)); + break; + case TS_IC: + argv[j] = (VALUE)NEW_INLINE_CACHE_ENTRY(); + iseq_add_mark_object(iseq, argv[j]); + break; + case TS_ID: + argv[j] = rb_convert_type(op, T_SYMBOL, + "Symbol", "to_sym"); + break; + case TS_CDHASH: + { + int i; + op = rb_convert_type(op, T_ARRAY, "Array", "to_ary"); + for (i=0; i<RARRAY_LEN(op); i+=2) { + VALUE sym = rb_ary_entry(op, i+1); + LABEL *label = + register_label(iseq, labels_table, sym); + rb_ary_store(op, i+1, (VALUE)label | 1); + } + argv[j] = op; + } + break; + default: + rb_bug("unknown operand: %c", insn_op_type(insn_id, j)); + } + } + } + ADD_ELEM(anchor, + (LINK_ELEMENT*)new_insn_core(iseq, line_no, + insn_id, argc, argv)); + } + else { + rb_raise(rb_eTypeError, "unexpected object for instruction"); + } + } + st_free_table(labels_table); + iseq_setup(iseq, anchor); + return COMPILE_OK; +} + +VALUE +iseq_build_from_ary(yarv_iseq_t *iseq, VALUE line, + VALUE locals, VALUE args, VALUE exception, VALUE body) +{ + int i; + int opt = 0; + ID *tbl; + struct st_table *labels_table = st_init_numtable(); + + DECL_ANCHOR(anchor); + + if (iseq->type == ISEQ_TYPE_METHOD || + iseq->type == ISEQ_TYPE_TOP || + iseq->type == ISEQ_TYPE_CLASS) { + opt = 1; + } + + iseq->local_size = opt + RARRAY_LEN(locals); + iseq->local_tbl = (ID *)ALLOC_N(ID *, iseq->local_size); + tbl = iseq->local_tbl + opt; + + for (i=0; i<RARRAY_LEN(locals); i++) { + tbl[i] = SYM2ID(RARRAY_PTR(locals)[i]); + } + + /* args */ + if (FIXNUM_P(args)) { + iseq->argc = FIX2INT(args); + iseq->arg_simple = 1; + } + else { + /* + * [argc, # argc + * opts, # opts + * [label1, label2, ...] # opt labels + * rest_iex, + * block_idx, + * ] + * or + * argc (Fixnum) # arg_simple + */ + int i = 0; + VALUE argc = rb_ary_entry(args, i++); + VALUE arg_opts = rb_ary_entry(args, i++); + VALUE arg_opt_labels = rb_ary_entry(args, i++); + VALUE arg_rest = rb_ary_entry(args, i++); + VALUE arg_block = rb_ary_entry(args, i++); + + iseq->argc = FIX2INT(argc); + iseq->arg_opts = FIX2INT(arg_opts); + iseq->arg_rest = FIX2INT(arg_rest); + iseq->arg_block = FIX2INT(arg_block); + + iseq->arg_opt_tbl = (VALUE *)ALLOC_N(VALUE, iseq->arg_opts); + + for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) { + iseq->arg_opt_tbl[i] = + (VALUE)register_label(iseq, labels_table, + rb_ary_entry(arg_opt_labels, i)); + } + } + + /* exception */ + iseq_build_exception(iseq, labels_table, exception); + + /* body */ + iseq_build_body(iseq, anchor, body, line, labels_table); + return iseq->self; +} diff --git a/compile.h b/compile.h new file mode 100644 index 0000000000..2955977688 --- /dev/null +++ b/compile.h @@ -0,0 +1,210 @@ +/********************************************************************** + + compile.h - + + $Author$ + $Date$ + created at: 04/01/01 23:36:57 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifndef _COMPILER_H_INCLUDED_ +#define _COMPILER_H_INCLUDED_ + +#include "version.h" + +#if YARVDEBUG > CPDEBUG +#undef CPDEBUG +#define CPDEBUG YARVDEBUG +#endif + +/* */ +/** + * debug function(macro) interface depend on CPDEBUG + * + * debug level: + * 0: no debug output + * 1: show node type + * 2: show node important parameters + * ... + * 5: show other parameters + * 10: show every AST array + */ + +#if 0 +#undef CPDEBUG +#define CPDEBUG 2 +#endif + +#if CPDEBUG > 0 + +#define debugp(header, value) \ + (debug_indent(0, CPDEBUG, gl_node_level * 2), \ + debug_value(0, CPDEBUG, header, value)) + +#define debugi(header, id) \ + (debug_indent(0, CPDEBUG, gl_node_level * 2), \ + debug_id(0, CPDEBUG, header, id)) + +#define debugp_param(header, value) \ + (debug_indent(1, CPDEBUG, gl_node_level * 2), \ + debug_value(1, CPDEBUG, header, value)) + +#define debugp_verbose(header, value) \ + (debug_indent(2, CPDEBUG, gl_node_level * 2), \ + debug_value(2, CPDEBUG, header, value)) + +#define debugp_verbose_node(header, value) \ + (debug_indent(10, CPDEBUG, gl_node_level * 2), \ + debug_value(10, CPDEBUG, header, value)) + +#define debug_nodeprint(node) \ + debug_indent(-1, CPDEBUG, gl_node_level*2); \ + printf("node: %s (%d)\n", node_name(nd_type(node)), nd_line(node)); \ + gl_node_level ++; + +#define debug_nodeprint_close() gl_node_level --; + +#else + +static inline ID +r_id(ID id) +{ + return id; +} + +static inline VALUE +r_value(VALUE value) +{ + return value; +} + +#define debugi(header, id) r_id(id) +#define debugp(header, value) r_value(value) +#define debugp_verbose(header, value) r_value(value) +#define debugp_verbose_node(header, value) r_value(value) +#define debugp_param(header, value) r_value(value) +#define debug_nodeprint(node) +#define debug_nodeprint_close() +#endif + +#if CPDEBUG > 1 +#define debugs debug_indent(-1, CPDEBUG, gl_node_level*2), printf +#define debug_compile(msg, v) (debug_indent(-1, CPDEBUG, gl_node_level*2), printf("%s", msg), (v)) +#else +#define debugs if(0)printf +#define debug_compile(msg, v) (v) +#endif + + +/* create new label */ +#define NEW_LABEL(l) new_label_body(iseq, l) + +#define iseq_filename(iseq) \ + (((yarv_iseq_t*)DATA_PTR(iseq))->file_name) + +#define NEW_ISEQVAL(node, name, type) \ + new_child_iseq(iseq, node, name, 0, type) + +#define NEW_CHILD_ISEQVAL(node, name, type) \ + new_child_iseq(iseq, node, name, iseq->self, type) + +#define NEW_SPECIAQL_BLOCK_ISEQVAL(iseq, sym) \ + new_child_iseq(iseq, iseq->node, iseq->name, iseq->parent_iseq, iseq->type, sym) + +/* add instructions */ +#define ADD_SEQ(seq1, seq2) \ + APPEND_LIST(seq1, seq2) + +/* add an instruction */ +#define ADD_INSN(seq, line, insn) \ + ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, BIN(insn), 0)) + +/* add an instruction with label operand */ +#define ADD_INSNL(seq, line, insn, label) \ + ADD_ELEM(seq, (LINK_ELEMENT *) \ + new_insn_body(iseq, line, BIN(insn), 1, (VALUE)label)) + +/* add an instruction with some operands (1, 2, 3, 5) */ +#define ADD_INSN1(seq, line, insn, op1) \ + ADD_ELEM(seq, (LINK_ELEMENT *) \ + new_insn_body(iseq, line, BIN(insn), 1, (VALUE)op1)) + +#define ADD_INSN2(seq, line, insn, op1, op2) \ + ADD_ELEM(seq, (LINK_ELEMENT *) \ + new_insn_body(iseq, line, BIN(insn), 2, (VALUE)op1, (VALUE)op2)) + +#define ADD_INSN3(seq, line, insn, op1, op2, op3) \ + ADD_ELEM(seq, (LINK_ELEMENT *) \ + new_insn_body(iseq, line, BIN(insn), 3, (VALUE)op1, (VALUE)op2, (VALUE)op3)) + +/* Specific Insn factory */ +#define ADD_SEND(seq, line, id, argc) \ + ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(0)) + +#define ADD_CALL(seq, line, id, argc) \ + ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT)) + +#define ADD_SEND_R(seq, line, id, argc, block, flag) \ + ADD_ELEM(seq, (LINK_ELEMENT *) \ + new_insn_send(iseq, line, \ + (VALUE)id, (VALUE)argc, (VALUE)block, (VALUE)flag)) + +/* add label */ +#define ADD_LABEL(seq, label) \ + ADD_ELEM(seq, (LINK_ELEMENT *)label) + +#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc) \ + (tmp = rb_ary_new(), \ + rb_ary_push(tmp, type), \ + rb_ary_push(tmp, (VALUE) ls | 1), \ + rb_ary_push(tmp, (VALUE) le | 1), \ + rb_ary_push(tmp, iseqv), \ + rb_ary_push(tmp, (VALUE) lc | 1), \ + rb_ary_push(iseq->compile_data->catch_table_ary, tmp)) + +/* compile node */ +#define COMPILE(anchor, desc, node) \ + (debug_compile("== " desc "\n", \ + iseq_compile_each(iseq, anchor, node, 0))) + +/* compile node, this node's value will be poped */ +#define COMPILE_POPED(anchor, desc, node) \ + (debug_compile("== " desc "\n", \ + iseq_compile_each(iseq, anchor, node, 1))) + +/* compile node, which is poped when 'poped' is true */ +#define COMPILE_(anchor, desc, node, poped) \ + (debug_compile("== " desc "\n", \ + iseq_compile_each(iseq, anchor, node, poped))) + +#define OPERAND_AT(insn, idx) \ + (((INSN*)(insn))->operands[idx]) + +#define INSN_OF(insn) \ + (((INSN*)(insn))->insn_id) + +/* error */ +#define COMPILE_ERROR(strs) \ +{ \ + VALUE tmp = GET_THREAD()->errinfo; \ + if(CPDEBUG)rb_bug strs; \ + GET_THREAD()->errinfo = iseq->compile_data->err_info; \ + rb_compile_error strs; \ + iseq->compile_data->err_info = GET_THREAD()->errinfo; \ + GET_THREAD()->errinfo = tmp; \ + ret = 0; \ + break; \ +} + + +#define COMPILE_OK 1 +#define COMPILE_NG 0 + +#define DECL_ANCHOR(name) \ + LINK_ANCHOR name##_body__ = {{0,}, &name##_body__.anchor}; \ + LINK_ANCHOR *name = & name##_body__ + +#endif // _COMPILER_H_INCLUDED_ diff --git a/configure.in b/configure.in index 1fd0155821..be6bbd2129 100644 --- a/configure.in +++ b/configure.in @@ -71,6 +71,7 @@ fi if test "$program_prefix" = NONE; then program_prefix= fi + AC_CANONICAL_TARGET target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'` ac_install_sh='' # unusable for extension libraries. @@ -183,7 +184,7 @@ cygwin*|mingw*) AC_TRY_LINK([#include <stdio.h>], [FILE* volatile f = stdin; return 0;], [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext | - tr A-Z a-z | + tr A-Z a-z | sed -n '/^[[ ]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`], [rb_cv_msvcrt=msvcrt]) test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt]) @@ -345,7 +346,7 @@ AC_ARG_WITH(libc_r, AC_ARG_ENABLE(pthread, [ --enable-pthread use pthread library.], - [enable_pthread=$enableval], [enable_pthread=no]) + [enable_pthread=$enableval], [enable_pthread=yes]) dnl Checks for libraries. case "$target_os" in @@ -831,6 +832,8 @@ if test x"$ac_cv_header_ucontext_h" = xyes; then fi fi +AC_CHECK_FUNCS(backtrace) + dnl default value for $KANJI DEFAULT_KCODE="KCODE_NONE" @@ -1004,11 +1007,11 @@ if test "$with_dln_a_out" != yes; then LDFLAGS='-brtl' XLDFLAGS='-bE:ruby.imp' fi - : ${ARCHFILE="ruby.imp"} + : ${ARCHFILE="ruby.imp"} TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)' TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)' - : ${LIBPATHENV=SHLIB_PATH} - rb_cv_dlopen=yes ;; + : ${LIBPATHENV=SHLIB_PATH} + rb_cv_dlopen=yes ;; human*) : ${DLDFLAGS=''} : ${LDSHARED=''} : ${LDFLAGS=''} @@ -1354,7 +1357,7 @@ if test "$enable_shared" = 'yes'; then fi if test "$enable_rpath" = yes; then if test "$GCC" = yes; then - LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" + LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" else LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" fi diff --git a/debug.c b/debug.c new file mode 100644 index 0000000000..c143046fe7 --- /dev/null +++ b/debug.c @@ -0,0 +1,71 @@ +/********************************************************************** + + debug.c - + + $Author$ + $Date$ + created at: 04/08/25 02:31:54 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#include "ruby.h" + +void +debug_indent(int level, int debug_level, int indent_level) +{ + if (level < debug_level) { + int i; + for (i = 0; i < indent_level; i++) { + fprintf(stderr, " "); + } + fflush(stderr); + } +} + +VALUE +debug_value(int level, int debug_level, char *header, VALUE obj) +{ + if (level < debug_level) { + VALUE str; + str = rb_inspect(obj); + fprintf(stderr, "DBG> %s: %s\n", header, + obj == -1 ? "" : StringValueCStr(str)); + fflush(stderr); + } + return obj; +} + +void +debug_v(VALUE v) +{ + debug_value(0, 1, "", v); +} + +ID +debug_id(int level, int debug_level, char *header, ID id) +{ + if (level < debug_level) { + fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id)); + fflush(stderr); + } + return id; +} + +void +gc_check_func(void) +{ + int i; +#define GCMKMAX 0x10 + for (i = 0; i < GCMKMAX; i++) { + rb_ary_new2(1000); + } + rb_gc(); +} + +void +debug_breakpoint(void) +{ + /* */ +} diff --git a/debug.h b/debug.h new file mode 100644 index 0000000000..1262f63c6d --- /dev/null +++ b/debug.h @@ -0,0 +1,47 @@ +/********************************************************************** + + debug.h - YARV Debug function interface + + $Author$ + $Date$ + created at: 04/08/25 02:33:49 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifndef _DEBUG_H_INCLUDED_ +#define _DEBUG_H_INCLUDED_ + +#include <ruby.h> + +VALUE debug_value(int level, int debug_level, char *header, VALUE v); +ID debug_id(int level, int debug_level, char *header, ID id); +void debug_indent(int level, int debug_level, int indent_level); + +#define dpv(h,v) debug_value(-1, 0, h, v) +#define dp(v) debug_value(-1, 0, "", v) +#define dpi(i) debug_id (-1, 0, "", i) +#define bp() debug_breakpoint() + +void gc_check_func(); + +#if GCDEBUG == 1 + +#define GC_CHECK() \ + gc_check_func() + +#elif GCDEBUG == 2 + +#define GC_CHECK() \ + (printf("** %s:%d gc start\n", __FILE__, __LINE__), \ + gc_check_func(), \ + printf("** end\n")) + +#else + +#define GC_CHECK() + +#endif + +#endif // _DEBUG_H_INCLUDED_ diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV new file mode 100644 index 0000000000..48b00f272c --- /dev/null +++ b/doc/ChangeLog-YARV @@ -0,0 +1,6917 @@ +# $Id: ChangeLog 590 2006-12-31 09:02:34Z ko1 $
+#
+# YARV ChangeLog
+# from Mon, 03 May 2004 01:24:19 +0900
+#
+
+Sun Dec 31 18:01:50 2006 Koichi Sasada <ko1@atdot.net>
+
+ * bin/* : ruby/trunk/bin 11437
+
+
+Sun Dec 31 17:42:05 2006 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : remove old Kernel#funcall definition
+
+
+2006-12-30(Sat) 07:59:26 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * catch up ruby/trunk 11437
+
+ * eval_intern.h : reorder tag initialization
+
+ * eval.c : fix to support __send!, funcall and prohibit funcall as
+ send
+
+ * eval_error.h, eval_jump.h, eval_safe.h : fix prototypes
+
+ * eval_method.h, vm.c : check re-definition at rb_add_method()
+
+ * yarvcore.h : fix typo
+
+ * compile.c : fix white spaces
+
+ * lib/delegate.rb : fix to support __send, ...
+
+ * lib/getoptlong.rb : fix to work on YARV
+
+ * lib/rss/parser.rb : use __send! instead of __send__
+
+ * sample/test.rb : comment out codes which use |&b| type block parameter
+
+ * ext/ripper/extconf.rb : turn off
+
+ * test/ripper/test_files.rb, test_parser_events.rb,
+ test_scanner_events.rb : fix to check it has ripper module
+
+ * vm_dump.c : remove showing file path length limitation
+
+ * yarvtest/test_eval.rb : use __send! instead of __send__
+
+
+2006-12-19(Tue) 11:46:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * doc/* : added
+
+ * ext/openssl : added
+
+ * ext/ripper : added
+
+ * test/openssl : added
+
+ * test/ripper : added
+
+ * misc : added
+
+ * rb/ -> tool/ : renamed
+
+ * common.mk : fixed for above change
+
+ * ruby_doc/* : move to topdir
+
+ * sample/* : added
+
+ * test2.rb : removed
+
+
+2006-12-15(Fri) 09:42:46 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : remove obsolete codes
+
+ * insns.def : fix a comment of getconstant
+
+
+2006-12-13(Wed) 16:26:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * blockinlining.c, compile.c, compile.h, debug.c, debug.h,
+ insnhelper.h, insns.def, iseq.c, thread.c, thread_pthread.ci,
+ thread_pthread.h, thread_win32.ci, thread_win32.h, vm.c, vm.h,
+ vm_dump.c, vm_evalbody.ci, vm_opts.h.base, yarv.h,
+ yarv_version.h, yarvcore.c, yarvcore.h :
+ add a header includes copyright
+
+
+2006-12-12(Tue) 13:13:32 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb : add PREFETCH() statement
+
+ * vm.h : ditto
+
+ * yarvcore.h : fix LIKELY(x) and
+ remove main_thread_val field from yarv_vm_t
+
+ * yarvcore.c : ditto
+
+ * thread.c : support fork
+
+ * eval_thread.c : ditto
+
+ * process.c : ditto
+
+ * signal.c : ditto
+
+ * test/ruby/test_signal.rb :
+
+ * thread_pthread.ci : rename timer thread functions
+
+ * thread_win32.ci : ditto
+
+
+2006-11-10(Fri) 21:29:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix to compile arguments
+
+ * insns.def : fix to duplicate first array value on concatarray
+ instruction
+
+ * yarvtest/test_bin.rb : add a test for above change
+
+ * sample/test.rb : fix to catch up Ruby HEAD (fix to remove test about
+ module duplicate)
+
+
+2006-11-10(Fri) 12:49:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm_macro.def : fix to inherit visibility on
+ NODE_SUPER method invocation
+
+
+2006-11-10(Fri) 09:13:46 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * class.c : revert module duplicate inclusion
+
+ * parse.y : catch up current Ruby HEAD
+
+ * node.h : ditto
+
+ * compile.c : ditto
+
+ * gc.c : ditto
+
+ * iseq.c : ditto
+
+ * eval_thread.c : define Continuation (null class)
+
+ * vm_dump.c : fix to output backtrae to stderr
+
+ * yarvtest/test_block.rb : remove unsupported test
+
+ * yarvtest/test_class.rb : add a test about super
+
+ * yarvtest/test_syntax.rb : add a test about case/when
+
+
+2006-11-09(Thu) 10:22:59 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * call_cfunc.h -> call_cfunc.ci : renamed
+
+ * vm_evalbody.h, vm_evalbody.ci : ditto
+
+ * thread_pthread.h, thread_pthread.ci : separate declaration and
+ implementation
+
+ * thread_win32.h, thread_win32.ci : ditto
+
+ * thread.c : use *.ci instead of *.c as implementation
+
+ * vm.c : ditto
+
+ * common.mk : fix rules for above changes
+
+
+2006-11-08(Wed) 17:23:23 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm_dump.c : show C level backtrace (pointer only) with
+ backtrace() function (glibc feature)
+
+ * configure.in : ditto
+
+ * yarvcore.c : add NSDR method (show C level backtrace)
+
+ * error.c : fix indent
+
+
+2006-11-07(Tue) 13:17:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c (rb_set_errinfo) : added
+
+ * ruby.h : ditto
+
+ * version.h : fix version number
+
+ * lib/webrick/utils.rb : fix to remove Thread.critical
+
+ * ext/dbm, dl, gdbm, iconv, io, pty, sdbm : added
+
+ * test/dbm, gdbm, io, logger, net, readline, sdbm, soap,
+ webrick, win32ole, wsdl, xsd : added
+
+
+2006-11-06(Mon) 22:32:18 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c : import Ruby HEAD
+
+ * ext/socket/extconf.rb : ditto
+
+ * ext/socket/socket.c : ditto
+
+ * gc.c : ditto
+
+ * lib/date.rb : ditto
+
+ * lib/net/imap.rb : ditto
+
+ * lib/rss/0.9.rb : ditto
+
+ * lib/set.rb : ditto
+
+ * lib/soap/mapping/rubytypeFactory.rb : ditto
+
+ * lib/soap/mimemessage.rb : ditto
+
+ * lib/soap/property.rb : ditto
+
+ * lib/webrick/httprequest.rb : ditto
+
+ * lib/webrick/httputils.rb : ditto
+
+ * lib/xmlrpc/create.rb : ditto
+
+ * lib/xsd/codegen/gensupport.rb : ditto
+
+ * object.c : ditto
+
+ * ruby.h : ditto
+
+ * string.c : ditto
+
+ * version.h : ditto
+
+ * rb/ir.rb : fix to use "diffs" directory
+
+ * vm_dump.c : add "const"
+
+
+2006-11-06(Mon) 16:36:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_proc.c : remove "static" from external global variables
+
+ * eval_thread.c : ditto
+
+ * array.c : fix indent
+
+ * insns.def : add a suitable cast
+
+ * vm_macro.def : allow scalar value on splat arguments
+
+ * yarvtest/test_block.rb : fix to synchronize Ruby HEAD
+
+ * rb/insns2vm.rb : remove String#each for 1.9
+
+ * template/vm.inc.tmpl : ditto (remove String#each_with_index)
+
+
+2006-11-06(Mon) 13:22:34 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * iseq.c : fixed GC debugging outputs
+
+ * rb/parse.rb : fixed output format
+
+
+2006-11-04(Sat) 09:46:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix to duplicate "#{'foo'}" string
+
+ * yarvtest/test_bin.rb : add a test for above
+
+ * ext/readline/readline.c : import Ruby HEAD
+
+ * keywords : ditto
+
+ * lex.c : ditto
+
+ * parse.y : ditto
+
+ * lib/mkmf.rb : ditto
+
+ * test/ruby/test_hash.rb : fix to current specification
+
+ * test/ruby/test_string.rb : ditto
+
+
+2006-11-03(Fri) 20:58:36 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * ext/nkf/nkf-utf8/utf8tbl.h : missed to add
+
+ * configure.in : import ruby HEAD
+
+ * test/ruby/test_array.rb : ditto
+
+ * test/ruby/test_assignment.rb : ditto
+
+ * test/ruby/test_clone.rb : ditto
+
+ * test/socket/test_socket.rb : ditto
+
+ * test/socket/test_unix.rb : ditto
+
+ * test/strscan/test_stringscanner.rb : ditto
+
+ * test/testunit/collector/test_dir.rb : ditto
+
+
+2006-11-03(Fri) 20:22:24 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c : import current ruby HEAD and apply API changes
+ This version has some known bugs
+
+ * bignum.c : ditto
+
+ * blockinlining.c : ditto
+
+ * class.c : ditto
+
+ * compile.c : ditto
+
+ * dir.c : ditto
+
+ * dln.c : ditto
+
+ * enum.c : ditto
+
+ * enumerator.c : ditto
+
+ * error.c : ditto
+
+ * eval.c : ditto
+
+ * eval_error.h : ditto
+
+ * eval_jump.h : ditto
+
+ * eval_load.c : ditto
+
+ * eval_proc.c : ditto
+
+ * ext/*
+
+ * file.c : ditto
+
+ * gc.c : ditto
+
+ * hash.c : ditto
+
+ * insns.def : ditto
+
+ * instruby.rb : ditto
+
+ * intern.h : ditto
+
+ * io.c : ditto
+
+ * iseq.c : ditto
+
+ * lib/*
+
+ * marshal.c : ditto
+
+ * math.c : ditto
+
+ * missing/vsnprintf.c : ditto
+
+ * mkconfig.rb : ditto
+
+ * node.h : ditto
+
+ * numeric.c : ditto
+
+ * object.c : ditto
+
+ * oniguruma.h : ditto
+
+ * pack.c : ditto
+
+ * parse.y : ditto
+
+ * prec.c : ditto
+
+ * process.c : ditto
+
+ * random.c : ditto
+
+ * range.c : ditto
+
+ * rb/ir.rb : ditto
+
+ * re.c : ditto
+
+ * regcomp.c : ditto
+
+ * regerror.c : ditto
+
+ * regexec.c : ditto
+
+ * regint.h : ditto
+
+ * regparse.c : ditto
+
+ * regparse.h : ditto
+
+ * ruby.c : ditto
+
+ * ruby.h : ditto
+
+ * rubytest.rb : ditto
+
+ * runruby.rb : ditto
+
+ * sample/test.rb : ditto
+
+ * signal.c : ditto
+
+ * sprintf.c : ditto
+
+ * st.c : ditto
+
+ * st.h : ditto
+
+ * string.c : ditto
+
+ * struct.c : ditto
+
+ * test/*
+
+ * thread.c : ditto
+
+ * time.c : ditto
+
+ * util.c : ditto
+
+ * variable.c : ditto
+
+ * version.h : ditto
+
+ * vm.c : ditto
+
+ * vm_dump.c : ditto
+
+ * vm_macro.def : ditto
+
+ * win32/*
+
+
+2006-10-31(Tue) 22:47:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * parse.y : fix NEWHEAP bugs (import HEAD)
+
+ * ruby.c, intern.h, yarvcore.c (rb_load_file) : change to
+ return parsed node pointer
+
+ * rb/ir.rb : add check mode
+
+
+2006-09-01(Fri) 22:05:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix a bug of peephole optimization and enable
+ regexp optimization
+
+
+2006-08-21(Mon) 05:27:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/mathn.rb : remove "remove_method :gcd2"
+
+ * opt_insn_unif.def : unset opt setting
+
+ * opt_operand.def : ditto
+
+
+2006-08-18(Fri) 17:55:31 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add dependency of yarvcore.h to thread.o
+
+ * gc.c : change comment line
+
+ * thread.c : remove some line break
+
+ * yarvcore.c : reoder initialize sequence to mark main thread
+
+
+2006-08-18(Fri) 16:51:34 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : add a support for cache values per thread
+
+ * yarvcore.c : ditto
+
+ * gc.c : ditto
+
+ * thread.c : move a expression after acquiring lock
+
+ * compile.c : add a cast to remove warning
+
+
+2006-08-18(Fri) 02:07:45 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix to return rhs value on ATTRASGIN
+
+ * insns.def (setn) : add insn setn
+
+ * yarvtest/test_bin.rb : add tests for above
+
+
+2006-08-17(Thu) 22:46:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : clear callee_id ([yarv-dev:1073])
+
+
+2006-08-17(Thu) 22:14:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread_pthread.h : fix error message
+
+
+2006-08-17(Thu) 12:23:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : change initilize routine order ([yarv-dev:1067])
+
+ * yarvcore.c (Init_yarv) : init th->machine_stack_start
+
+ * thread_pthread.h : add malloc value check ([yarv-dev:1066])
+
+ * insns.def (opt_eq) : fix typo ([yarv-dev:1072])
+
+ * yarvtest/test_opts.rb : add a test for above
+
+ * yarvtest/test_class.rb : add a test for last commit
+
+
+2006-08-17(Thu) 11:02:16 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * class.c (clone_method) : check undef-ed method ([yarv-dev:1068])
+
+
+2006-08-15(Tue) 15:07:43 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix opt_plus routine ([yarv-dev-en:149])
+
+ * yarvtest/test_opts.rb : add tests for above
+
+
+2006-08-06(Sun) 06:24:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : fix build rule (build only ruby binary when benchmark)
+
+ * yarvcore.[ch] : fix and add yarv_iseq_new_with_* API
+
+ * blockinlining.c : ditto
+
+ * compile.c : ditto
+
+ * compile.h : ditto
+
+ * iseq.c : ditto
+
+ * eval_method.h : check redefinition for specialized instruction
+
+ * insnhelper.h : ditto
+
+ * insns.def : ditto
+
+ * vm.c : ditto
+
+ * vm.h : ditto
+
+ * numeric.c : add Fixnum#succ
+
+ * thread.c : remove duplicated method Thread#current
+
+ * yarvcore.c : remove duplicated method Proc#clone
+
+ * yarvtest/test_opts.rb : added
+
+
+2006-07-20(Thu) 04:10:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix [yarv-dev:1041] problem (raise TypeError)
+
+ * eval.c : rb_funcall2 send as NOEX_PRIVATE and check scope
+
+
+2006-07-20(Thu) 03:38:46 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : fix [yarv-dev:1040] bug
+
+
+2006-07-18(Tue) 18:45:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * some files : set property "svn:eol-style" as native
+
+
+2006-07-18(Tue) 18:35:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * gc.h : fix a static function name
+
+ * vm.c : remove Japanese comments
+
+ * yarvcore.c : add a comment
+
+ * some files : set property "svn:eol-style" as native
+
+
+2006-07-18(Tue) 16:48:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : remove unused code
+
+ * compile.c : add checking value
+
+ * iseq.c : ditto
+
+ * yarvcore.c : fix yarv_th_eval prototype declaration
+
+ * yarvtest/yarvtest.rb : use compile instead of parse method
+
+
+2006-07-12(Wed) 15:18:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarv_version.h : 0.4.1
+
+ * Changes : ditto
+
+
+2006-07-12(Wed) 13:38:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : fix indent
+
+ * gc.h : fix syntax bug
+
+ * thread_pthread.h : vanish warnning message
+
+ * iseq.c : ditto
+
+ * compile.c : ditto
+
+ * thread.c : ditto
+
+ * vm.c : ditto
+
+ * yarvcore.c : prohibit tail call optimization to mark
+ iseq object
+
+ * yarvcore.h : add some allocator function declaration
+
+ * yarvtest/test_eval.rb : remove output
+
+
+2006-07-12(Wed) 05:01:23 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : undef alloc funcs
+
+ * eval_proc.c : ditto (use factory faction)
+
+ * thread.c : ditto
+
+ * vm.c : ditto
+
+ * iseq.c : fix compile option creation
+
+ * rb/allload.rb : use compile_file method
+
+ * rb/compile.rb : ditto
+
+ * rb/parse.rb : ditto
+
+ * template/insnstbl.html : hide mail addr
+
+
+2006-07-11(Tue) 21:34:29 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_dir.rb: new test test_JVN_13947696.
+
+
+2006-07-11(Tue) 21:26:41 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_alias.rb: new test test_JVN_83768862.
+
+
+2006-07-11(Tue) 11:33:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix compile error on C90
+
+
+2006-07-11(Tue) 10:40:23 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * disasm.c : removed
+
+ * iseq.c : added
+
+ * common.mk : ditto
+
+ * blockinlining.c : Get*Val => Get*Ptr
+
+ * eval.c : ditto
+
+ * yarvcore.c : ditto
+
+ * eval_proc.c : ditto
+
+ * vm_dump.c : ditto
+
+ * vm_macro.def : ditto
+
+ * signal.c : ditto
+
+ * vm.c : ditto
+
+ * thread.c : ditto
+
+ * compile.c : rename local variable insnobj => iobj
+
+ * compile.c : support yarv_compile_option_t
+
+ * gc.h : added
+
+ * insns.def : use OPT_CHECKED_RUN instead of IGNORE_OPTIMIZE
+
+ * rb/compile.rb : use compile option
+
+ * template/optinsn.inc.tmpl : fix function name
+
+ * vm_opts.h.base : change macros
+
+ * rb/insns2vm.rb : ditto
+
+ * yarv.h : fix yarvcore_eval_parsed parameter type
+
+ * yarvcore.c : fix some interfaces (functions)
+
+ * yarvcore.h : add a type yarv_compile_option_t
+
+
+2006-07-06(Thu) 13:45:20 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/yasm.rb : pass builder object if block arity == 1
+
+
+2006-07-05(Wed) 11:23:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/yasm.rb : fix method name
+
+ * vm.c (th_set_top_stack) : check toplevel or not
+
+
+2006-07-04(Tue) 20:05:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/compile.rb : added
+
+ * yarvtest/yarvtest.rb : disable load/store test
+
+
+2006-07-04(Tue) 18:17:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix some bugs about load iseq data
+
+ * disasm.c : ditto (store)
+
+ * eval.c (rb_f_local_variables) : fix bugs
+
+ * insns.def : fix otp_ltlt condition bug
+
+ * vm.c : ditto
+
+ * yarvcore.c : rename some functions
+
+ * yarvtest/yarvtest.rb : add iseq load/store tests
+ (to enable this, remove comment)
+
+
+2006-07-03(Mon) 01:54:23 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_thread.c : add parameter "th" to thread_set_raised
+
+ * yarvcore.h : ditto
+
+ * eval_intern.h : ditto
+
+ * eval.c : ditto
+
+ * eval_error.h : declare with ANSI style
+
+ * disasm.c : rename iseq_iseq2simpledata() to iseq_data_to_ary
+
+ * lib/yasm.rb : rename Instruction#to_simpledata to
+ Instruction#to_a
+
+ * yarvcore.c : ditto
+
+ * vm.c : fix bug (Proc.new{|*args| p args}.call(1) #=> 1)
+
+ * yarvtest/test_proc.rb : add a tests for above
+
+
+2006-06-21(Wed) 09:19:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : remove yarv_iseq_t#catch_table_ary and
+ add yarv_iseq_t#compile_data#catch_table_ary
+
+ * compile.h : ditto
+
+ * yarvcore.c : ditto
+
+ * yarvcore.h : ditto
+
+ * eval_thread.c : remove unused code
+
+ * thread.c : add rb_gc_mark_threads() (from eval_thread.c)
+
+
+2006-05-31(Wed) 21:26:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * parse.y : prohibit tail call optimization to mark vparsr
+ object
+
+
+2006-05-25(Thu) 15:37:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * blockinlining.c : support NEW_ATTRASGN node
+
+ * class.c : skip undefined method to collect ([yarv-dev:999])
+
+ * yarvtest/test_class.rb : add a test for above
+
+ * compile.c : fix opt_regexpmatch1 condition
+
+ * lib/monitor.rb : fix [yarv-dev:1009]
+
+ * rb/insns2vm.rb : fix typo
+
+ * thread.c : prohibit unlock by not mutex owner thread
+
+ * vm_opts.h.base : change default option
+
+
+2006-05-18(Thu) 16:00:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * intern.h : fix prototype declarations for last re.c change
+
+
+2006-05-18(Thu) 12:12:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/runruby.rb : added
+
+ * thread.c (rb_thread_alone) : check if vm->living_threads
+ is available
+
+
+2006-05-18(Thu) 12:05:35 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * signal.c : not mask SIGSEGV
+
+ * thread.c : fix debug output on Win32
+
+ * thread.c, thread_pthread.h : add some debug prints
+
+ * yarvcore.c : mark machine registers on thread_mark
+
+
+2006-05-17(Wed) 18:09:20 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * dir.c (sys_warning): should not call a vararg function
+ rb_sys_warning() indirectly. [ruby-core:07886]
+
+
+2006-05-17(Wed) 16:41:41 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (rb_reg_initialize): should not allow modifying literal
+ regexps. frozen check moved from rb_reg_initialize_m as well.
+
+ * re.c (rb_reg_initialize): should not modify untainted objects in
+ safe levels higher than 3.
+
+ * re.c (rb_memcmp): type change from char* to const void*.
+
+ * dir.c (dir_close): should not close untainted dir stream.
+
+ * dir.c (GetDIR): add tainted/frozen check for each dir operation.
+
+
+2006-05-07(Sun) 21:06:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c : remove Mutex#unlock_and_stop and add Mutex#sleep
+
+ * lib/monitor.rb : ditto
+
+ * lib/thread.rb : ditto
+
+ * thread_pthread.h : fix stack size
+
+ * thread_win32.h : fix sleep
+
+ * yarvcore.h : disable to use get/setcontext
+
+ * lib/webrick/server.rb : add experimental implementation
+ using thraeds pool
+
+
+2006-05-05(Fri) 13:59:00 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/ruby/test_signal.rb : disable a test
+
+ * thread.c : do trylock before lock on mutex_lock
+
+ * thread_win32.h : use CriticalSection instead of Mutex
+
+
+2006-05-05(Fri) 03:03:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : vtune rule make run test.rb
+
+ * disasm.c : fix syntax errors (on VC)
+
+ * yarvcore.c : ditto
+
+ * lib/thread.rb : Mutex#synchronize is defined here
+
+ * lib/*.rb : ditto
+
+ * signal.c : separate pthread or not
+
+ * thread.c : support lightweight wakeup
+
+ * thread_pthread.h : ditto
+
+ * thread_win32.h : ditto
+
+ * yarvcore.h : ditto
+
+ * yarvtest/test_thread.rb : restore last change
+
+
+2006-05-04(Thu) 18:11:43 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_thread.c : remove rb_thread_interrupt
+
+ * intern.h : ditto
+
+ * signal.c : change signal transfer route
+
+ * thread.c : ditto
+
+ * thread_pthread.h : ditto
+
+ * thread_win32.h : ditto
+
+ * yarv.h : support GET_VM()
+
+ * yarvcore.h : change yarv_thread_t/yarv_vm_t structure
+
+ * yarvtest/test_thread.rb : decrease threads to test
+
+
+2006-05-04(Thu) 00:26:18 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread_pthread.h : experimental support of thread cache
+
+
+2006-04-25(Tue) 22:30:14 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : remove struct yarv_cmethod_info, add
+ data structure for profiling and extend yarv_control_frame_t
+
+ * vm.c : make pop_frame() and apply above change
+
+ * eval.c : ditto
+
+ * vm_dump.c : ditto
+
+ * vm_macro.def : ditto
+
+ * insns.def (leave): use pop_frame() instead of
+ POP_CONTROL_STACK_FRAME() macro
+
+ * insnhelper.h : remove some macros
+
+ * yarvcore.c : change th_set_top_stack() prototype
+
+
+2006-04-18(Tue) 18:37:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, disasm.c : support export/import exception
+ information
+
+ * yarvcore.h : change "struct catch_table_entry" member variable
+ order
+
+
+2006-04-13(Thu) 17:11:30 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * bignum.c : import ruby 1.9 HEAD (Ruby 1.9.0 2006-04-08)
+
+ * dir.c : ditto
+
+ * enumerator.c : ditto
+
+ * ext/.document : ditto
+
+ * ext/extmk.rb : ditto
+
+ * ext/nkf/lib/kconv.rb : ditto
+
+ * ext/nkf/nkf-utf8/nkf.c : ditto
+
+ * ext/nkf/nkf-utf8/utf8tbl.c : ditto
+
+ * ext/nkf/nkf.c : ditto
+
+ * ext/nkf/test.rb : ditto
+
+ * ext/socket/.cvsignore : ditto
+
+ * ext/win32ole/sample/excel2.rb : ditto
+
+ * ext/win32ole/tests/testOLEMETHOD.rb : ditto
+
+ * ext/win32ole/tests/testOLEPARAM.rb : ditto
+
+ * ext/win32ole/tests/testOLETYPE.rb : ditto
+
+ * ext/win32ole/tests/testOLETYPELIB.rb : ditto
+
+ * ext/win32ole/tests/testOLEVARIABLE.rb : ditto
+
+ * ext/win32ole/tests/testOLEVARIANT.rb : ditto
+
+ * ext/win32ole/tests/testWIN32OLE.rb : ditto
+
+ * ext/win32ole/tests/testall.rb : ditto
+
+ * ext/win32ole/win32ole.c : ditto
+
+ * gc.c : ditto
+
+ * instruby.rb : ditto
+
+ * io.c : ditto
+
+ * lib/delegate.rb : ditto
+
+ * lib/fileutils.rb : ditto
+
+ * lib/find.rb : ditto
+
+ * lib/irb/ruby-lex.rb : ditto
+
+ * lib/mkmf.rb : ditto
+
+ * lib/net/http.rb : ditto
+
+ * lib/open-uri.rb : ditto
+
+ * lib/pathname.rb : ditto
+
+ * lib/rational.rb : ditto
+
+ * lib/rdoc/parsers/parse_rb.rb : ditto
+
+ * lib/rdoc/ri/ri_paths.rb : ditto
+
+ * lib/resolv.rb : ditto
+
+ * lib/test/unit/collector/objectspace.rb : ditto
+
+ * lib/webrick/httpservlet/cgihandler.rb : ditto
+
+ * math.c : ditto
+
+ * mkconfig.rb : ditto
+
+ * object.c : ditto
+
+ * oniguruma.h : ditto
+
+ * pack.c : ditto
+
+ * parse.y : ditto
+
+ * re.c : ditto
+
+ * re.h : ditto
+
+ * regcomp.c : ditto
+
+ * regerror.c : ditto
+
+ * regparse.c : ditto
+
+ * ruby.h : ditto
+
+ * rubytest.rb : ditto
+
+ * runruby.rb : ditto
+
+ * string.c : ditto
+
+ * test/digest/test_digest.rb : ditto
+
+ * test/pathname/test_pathname.rb : ditto
+
+ * test/ruby/envutil.rb : ditto
+
+ * test/ruby/test_float.rb : ditto
+
+ * test/ruby/test_pack.rb : ditto
+
+ * time.c : ditto
+
+ * util.c : ditto
+
+ * version.h : ditto
+
+ * win32/mkexports.rb : ditto
+
+ * win32/resource.rb : ditto
+
+ * win32/win32.c : ditto
+
+
+2006-04-11(Tue) 11:26:53 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/yasm.rb : move to lib/yasm.rb
+
+
+2006-04-09(Sun) 03:04:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : change to accept method iseq object when loading from
+ simple data
+
+ * yarvcore.c : add a debug output
+
+ * rb/yasm.rb : change some interfaces
+
+
+2006-04-07(Fri) 20:25:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix miss about range of catch "next"
+
+ * eval.c : add braces
+
+
+2006-04-07(Fri) 11:09:43 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : fix some make rules
+
+ * insns.def : rename some instructions name
+
+ * rb/insns2vm.rb : change some operand type name
+
+ * vm_evalbody.h : ditto
+
+ * template/insns.inc.tmpl : add YARV_MAX_INSTRUCTION_SIZE macro
+
+ * compile.c, disasm.c, yarvcore.c : support load/store iseq from/to simple
+ data structure such as array, literals, and so on
+
+ * rb/yasm.rb : supported
+
+ * vm.c : change interface of eval_define_method
+
+ * yarvcore.h : remove unused externals
+
+
+2006-03-08(Wed) 10:31:29 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/delegate.rb (DelegateClass): do not delegate #send and
+ #funcall.
+
+
+2006-02-27(Mon) 22:39:17 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/thread.rb: last commit causes busy loop, revert it. [yarv-dev:990]
+
+ * lib/thread.rb: non_block=true wrongly caused ThreadError.
+
+
+2006-02-27(Mon) 21:33:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : fix to display command line
+
+ * compile.c : fix comparison between a pointer and 0
+
+ * debug.c : fix to output stder
+
+ * disasm.c : add debug function
+
+ * vm_dump.c : ditto
+
+ * eval_proc.c : fix to skip class definition
+
+ * ruby.h : fix T_VALUE to T_VALUES
+
+ * gc.c : ditto
+
+ * node.h : fix prototypes
+
+ * vm.c : add VM_DEBUG macro
+
+ * vm.c : fix compile error on VC++
+
+ * vm.c : fix to inherit last lfp[0] on th_set_finish_env
+
+ * vm.c : fix to add one svar location for any frame
+
+ * vm_macro.def : ditto
+
+ * yarvcore.h : add YARV_CLASS_SPECIAL_P() and YARV_BLOCK_PTR_P()
+
+ * rdoc/ : removed
+
+ * insns.def : fix to propagete throw state
+
+
+2006-02-27(Mon) 13:54:47 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * ext/syslog: imported from Ruby CVS trunk HEAD.
+
+ * ext/racc: ditto.
+
+
+2006-02-27(Mon) 12:47:10 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * parse.y: follow coding style change.
+
+
+2006-02-27(Mon) 11:53:07 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/README: imported from Ruby CVS trunk HEAD.
+
+ * lib/gserver.rb: ditto.
+
+ * lib/readbytes.rb: ditto.
+
+ * lib/parsearg.rb: ditto.
+
+ * lib/racc: ditto.
+
+ * lib/rinda: ditto.
+
+
+2006-02-27(Mon) 11:27:19 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/thread.rb (Queue#pop): faster code. [yarv-dev:973]
+
+ * lib/thread.rb (Queue#pop): avoid to push same thread in to
+ @waiting.
+
+
+2006-02-23(Thu) 23:32:53 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/open3.rb: imported from Ruby CVS trunk HEAD (rev 1.12).
+
+
+2006-02-23(Thu) 15:10:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : support rb_frame_self()
+
+ * eval_intern.h (th_get_ruby_level_cfp) : return 0 if no cfp
+
+ * eval_load.c : comment out scope set
+
+ * yarvcore.c : fix to initialize/free process of iseq
+
+ * vm.c (th_invoke_proc) : fix to set special cref always
+
+ * yarvtest/test_proc.rb : add a test for above
+
+
+2006-02-22(Wed) 23:33:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add rule "runruby"
+
+ * eval_thread.c : remove obsolete comment
+
+ * eval.c : remove unused functions
+
+ * signal.c : ditto
+
+ * gc.c : add rb_register_mark_object() and use it
+
+ * eval_load.c : ditto
+
+ * eval_proc.c : ditto
+
+ * ext/etc/etc.c : ditto
+
+ * ext/win32ole/win32ole.c : ditto
+
+ * ruby.h : ditto
+
+ * yarvcore.h : ditto
+
+ * thread.c : add rb_thread_run_parallel()
+
+ * yarvcore.c : change bootstrap
+
+
+2006-02-22(Wed) 19:27:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * ext/win32ole/.cvsignore : removed
+
+ * ext/win32ole/.document : ditto
+
+
+2006-02-22(Wed) 18:17:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : set Binding as YARVCore::VM::Binding
+
+
+2006-02-22(Wed) 12:54:45 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * ChangeLog : remove needless line
+
+
+2006-02-22(Wed) 12:49:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rubysig.h : remove CHECK_INTS
+
+ * eval.c : ditto
+
+ * eval_load.c : ditto
+
+ * ext/readline/readline.c : ditto
+
+ * thread.c : ditto
+
+ * win32/win32.c : ditto
+
+ * yarv_version.h : 0.4.0
+
+ * Changes : ditto
+
+
+2006-02-22(Wed) 11:36:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test.rb : removed
+
+
+2006-02-22(Wed) 11:12:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * README : renewed
+
+ * version.c : fixed version message
+
+ * yarvext/ : removed
+
+
+2006-02-22(Wed) 10:33:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/.document : imported from Ruby 1.9 HEAD
+
+ * .document : ditto
+
+ * ext/.document : ditto
+
+ * lib/ftools.rb : ditto
+
+ * lib/rdoc/ : ditto
+
+ * eval_thread.c : remove unused functions
+
+ * process.c : ditto
+
+ * rb/insns2vm.rb : compare modified date of vm_opts.h and
+ vm_opts.h.base
+
+ * ruby.h : rename RValue to RValues
+
+ * gc.c : ditto
+
+ * vm.c : ditto
+
+
+2006-02-22(Wed) 06:32:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * configure.in : remove last commit
+
+
+2006-02-22(Wed) 06:18:53 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * configure.in : add default program prefix "-yarv"
+
+
+2006-02-22(Wed) 06:11:36 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : change default rule (same as HEAD)
+
+ * configure : removed
+
+ * eval.c : remove last commit
+
+ * vm.c : fix stack traverse
+
+ * yarvcore.c : initialize top of control frame
+
+ * version.c : 2.0
+
+ * version.h : ditto
+
+
+2006-02-22(Wed) 04:50:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : change to rewind C level control frame
+
+ * vm.c : change to initialize cfp#proc and fix comparison of
+ cfp and limit_cfp
+
+ * yarvcore.c : remove last commit
+
+
+2006-02-22(Wed) 03:25:56 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : initialize each stack of thread
+
+
+2006-02-22(Wed) 00:02:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c : fix synchornize return value ([yarv-dev:957])
+ and some synchornization error
+
+ * thread_pthread.h : add debug helper function
+
+
+2006-02-21(Tue) 20:54:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : fix place of rb_thread_terminate_all()
+
+ * eval_thread.c : remove unused functions
+
+ * yarv.h : remove GET_VM()
+
+ * eval_jump.h : ditto
+
+ * insns.def : ditto
+
+ * vm_dump.c :
+
+ * intern.h : change rb_thread_signal_raise/exit interface
+
+ * signal.c : ditto
+
+ * thread.c : ditto
+
+ * test/ruby/test_beginendblock.rb : use block with IO.popen
+
+ * thread_pthread.h : fix interrupt process
+
+ * thread_win32.h : ditto
+
+ * yarvcore.c : fix thread free process
+
+ * yarvcore.h : remove yarv_vm_t#thread_critical, etc
+
+
+2006-02-21(Tue) 12:42:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_thread.c : remove unused function rb_thread_schedule()
+
+ * thread.c : rename yarv_thread_schedule to rb_thread_schedule()
+
+ * thread.c, eval.c : fix to terminate all thread and barrier at
+ eval.c#ruby_cleanup()
+
+ * thread_win32.h : remove native_thread_cleanup()
+
+ * thread_pthread.h : ditto
+
+ * yarvcore.c : ditto
+
+ * yarvtest/test_thread.rb : separete assersions to tests
+
+
+2006-02-21(Tue) 02:13:33 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (f_arglist): should set command_start = Qtrue for
+ command body. [ruby-talk:180648]
+
+
+2006-02-20(Mon) 20:41:07 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c : fix to synchronize signal_thread_list access
+ and fix typo
+
+
+2006-02-20(Mon) 17:54:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_proc.c : remove unused Binding functions and
+ set is_lambda of Proc used define_method
+
+ * yarvcore.c : support Proc#dup/clone, Binding#dup/clone
+
+ * sample/test.rb : remove unsupport features (Proc as Binding)
+
+
+2006-02-20(Mon) 16:28:59 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add a dependency to vm.c on eval_intern.h
+
+ * eval_intern.h : fix to initialize tag->tag
+
+ * yarvtest/test_jump.rb : add tests for above
+
+ * eval_jump.h : use local variable
+
+
+2006-02-20(Mon) 15:13:24 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bm_vm3_thread_create_join.rb : added
+
+ * test/yaml/test_yaml.rb : imported from Ruby CVS trunk HEAD
+
+
+2006-02-20(Mon) 14:49:46 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/yaml.rb: imported from Ruby CVS trunk HEAD.
+
+ * lib/yaml: ditto.
+
+ * ext/syck: ditto.
+
+
+2006-02-20(Mon) 13:58:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support block parameter which is NODE_ATTRASGN
+
+ * yarvtest/test_block.rb : add tests for above
+
+ * compile.c : fix NODE_DASGN_CURR level check
+
+ * compile.c : fix "||=" (at firtst, check "defined? val")
+
+ * compile.c : fix NODE_MATCH3 (permute receiver and argument)
+
+ * yarvtest/test_bin.rb : add tests for above
+
+ * eval.c : add rb_each()
+
+ * test/ruby/test_signal.rb : increment a timeout value
+
+ * thread.c, yarvcore.h : fix "join" flow
+
+ * thread_pthread.h : ditto
+
+ * thread_win32.h : ditto
+
+ * yarvtest/test_thread.rb : add a test for above
+
+ * vm.h, vm.c, vm_dump.c, insns.def : add FRAME_MAGIC_LAMBDA and
+ support return from lambda (especially retrun from method defined
+ by "define_method")
+
+ * yarvtest/test_method.rb : add a test for above
+
+ * yarvcore.c : remove unused functions
+
+
+2006-02-20(Mon) 11:22:31 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_eval.rb: now Object#funcall is defined.
+
+
+2006-02-20(Mon) 11:04:32 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/irb/lc/ja/CVS: removed.
+
+
+2006-02-20(Mon) 10:55:59 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/mutex_m.rb: imported from Ruby CVS trunk HEAD.
+
+ * lib/observer.rb: ditto.
+
+ * lib/wsdl: ditto.
+
+ * lib/monitor.rb: ditto (removing Thread.critical=).
+
+ * lib/xsd: ditto.
+
+ * lib/soap: ditto.
+
+ * lib/drb.rb: ditto.
+
+ * lib/drb: ditto.
+
+
+2006-02-20(Mon) 10:49:31 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * yarvcore.c (Init_yarvcore): fix typo (duo -> dup).
+
+
+2006-02-19(Sun) 01:27:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : "return" from lambda{} break block
+
+ * eval.c : Unsupport Proc as Binding
+
+ * test/ruby/test_eval.rb : apply above changes
+
+ * yarvcore.c : remove unused function yarv_yield_values()
+
+
+2006-02-18(Sat) 03:19:36 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c, insns.def : fix passing value when thread killed
+
+ * yarvtest/test_thread.rb : add tests for above
+
+
+2006-02-19(Sun) 01:19:42 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/thread.rb (SizedQueue): didn't work. This patch was
+ contributed by yukimizake. [yarv-dev:916]
+
+
+2006-02-18(Sat) 03:19:36 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c, insns.def : fix passing value when thread killed
+
+ * yarvtest/test_thread.rb : add tests for above
+
+
+2006-02-18(Sat) 02:40:18 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, vm.c, vm_macro.def : change BMETHOD algorithm
+ ([yarv-dev:914])
+
+ * yarvtest/test_class.rb : add a test for above
+
+
+2006-02-17(Fri) 23:59:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c, yarv.h : change th_invoke_proc() interface
+
+ * eval_proc.c : ditto
+
+ * signal.c : ditto
+
+ * thread.c : ditto
+
+ * yarvcore.c : ditto
+
+ * vm_macro.def : ditto and fix NODE_BMETHOD call
+
+ * vm.c : change name ("th_set_env()" to "push_frame()") and
+ change interface
+
+ * insns.def : ditto
+
+ * eval.c : remove proc_jump_error()
+
+ * benchmark/bm_app_answer.rb : added
+
+ * vm_opts.h.base : add optimize option
+
+
+2006-02-17(Fri) 13:37:57 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, ruby.h : add rb_errinfo()
+
+ * eval_error.h (error_pos) : fix process order
+
+ * bin/erb : imported from ruby 1.9
+
+ * bin/irb : ditto
+
+ * bin/rdoc : ditto
+
+ * bin/ri : ditto
+
+ * bin/testrb : ditto
+
+ * ext/curses/.cvsignore : ditto
+
+ * ext/curses/curses.c : ditto
+
+ * ext/curses/depend : ditto
+
+ * ext/curses/extconf.rb : ditto
+
+ * ext/curses/hello.rb : ditto
+
+ * ext/curses/mouse.rb : ditto
+
+ * ext/curses/rain.rb : ditto
+
+ * ext/curses/view.rb : ditto
+
+ * ext/curses/view2.rb : ditto
+
+ * ext/fcntl/.cvsignore : ditto
+
+ * ext/fcntl/depend : ditto
+
+ * ext/fcntl/extconf.rb : ditto
+
+ * ext/fcntl/fcntl.c : ditto
+
+ * ext/readline/README : ditto
+
+ * ext/readline/README.ja : ditto
+
+ * ext/readline/depend : ditto
+
+ * ext/readline/extconf.rb : ditto
+
+ * ext/readline/readline.c : ditto
+
+ * ext/win32ole/.document : ditto
+
+ * ext/zlib/doc/zlib.rd : ditto
+
+ * ext/zlib/extconf.rb : ditto
+
+ * ext/zlib/zlib.c : ditto
+
+ * lib/cgi/.document : ditto
+
+ * lib/cgi/session.rb : ditto
+
+ * lib/cgi/session/pstore.rb : ditto
+
+ * lib/shell/builtin-command.rb : ditto
+
+ * lib/shell/command-processor.rb : ditto
+
+ * lib/shell/error.rb : ditto
+
+ * lib/shell/filter.rb : ditto
+
+ * lib/shell/process-controller.rb : ditto
+
+ * lib/shell/system-command.rb : ditto
+
+ * lib/shell/version.rb : ditto
+
+ * lib/xmlrpc/.document : ditto
+
+ * lib/xmlrpc/README.rdoc : ditto
+
+ * lib/xmlrpc/README.txt : ditto
+
+ * lib/xmlrpc/base64.rb : ditto
+
+ * lib/xmlrpc/client.rb : ditto
+
+ * lib/xmlrpc/config.rb : ditto
+
+ * lib/xmlrpc/create.rb : ditto
+
+ * lib/xmlrpc/datetime.rb : ditto
+
+ * lib/xmlrpc/httpserver.rb : ditto
+
+ * lib/xmlrpc/marshal.rb : ditto
+
+ * lib/xmlrpc/parser.rb : ditto
+
+ * lib/xmlrpc/server.rb : ditto
+
+ * lib/xmlrpc/utils.rb : ditto
+
+ * rdoc/README : ditto
+
+ * rdoc/code_objects.rb : ditto
+
+ * rdoc/diagram.rb : ditto
+
+ * rdoc/dot/dot.rb : ditto
+
+ * rdoc/generators/chm_generator.rb : ditto
+
+ * rdoc/generators/html_generator.rb : ditto
+
+ * rdoc/generators/ri_generator.rb : ditto
+
+ * rdoc/generators/template/chm/chm.rb : ditto
+
+ * rdoc/generators/template/html/hefss.rb : ditto
+
+ * rdoc/generators/template/html/html.rb : ditto
+
+ * rdoc/generators/template/html/kilmer.rb : ditto
+
+ * rdoc/generators/template/html/old_html.rb : ditto
+
+ * rdoc/generators/template/html/one_page_html.rb : ditto
+
+ * rdoc/generators/template/xml/rdf.rb : ditto
+
+ * rdoc/generators/template/xml/xml.rb : ditto
+
+ * rdoc/generators/xml_generator.rb : ditto
+
+ * rdoc/markup/sample/rdoc2latex.rb : ditto
+
+ * rdoc/markup/sample/sample.rb : ditto
+
+ * rdoc/markup/simple_markup.rb : ditto
+
+ * rdoc/markup/simple_markup/fragments.rb : ditto
+
+ * rdoc/markup/simple_markup/inline.rb : ditto
+
+ * rdoc/markup/simple_markup/lines.rb : ditto
+
+ * rdoc/markup/simple_markup/preprocess.rb : ditto
+
+ * rdoc/markup/simple_markup/to_flow.rb : ditto
+
+ * rdoc/markup/simple_markup/to_html.rb : ditto
+
+ * rdoc/markup/simple_markup/to_latex.rb : ditto
+
+ * rdoc/markup/test/AllTests.rb : ditto
+
+ * rdoc/markup/test/TestInline.rb : ditto
+
+ * rdoc/markup/test/TestParse.rb : ditto
+
+ * rdoc/options.rb : ditto
+
+ * rdoc/parsers/parse_c.rb : ditto
+
+ * rdoc/parsers/parse_f95.rb : ditto
+
+ * rdoc/parsers/parse_rb.rb : ditto
+
+ * rdoc/parsers/parse_simple.rb : ditto
+
+ * rdoc/parsers/parserfactory.rb : ditto
+
+ * rdoc/rdoc.rb : ditto
+
+ * rdoc/ri/ri_cache.rb : ditto
+
+ * rdoc/ri/ri_descriptions.rb : ditto
+
+ * rdoc/ri/ri_display.rb : ditto
+
+ * rdoc/ri/ri_driver.rb : ditto
+
+ * rdoc/ri/ri_formatter.rb : ditto
+
+ * rdoc/ri/ri_options.rb : ditto
+
+ * rdoc/ri/ri_paths.rb : ditto
+
+ * rdoc/ri/ri_reader.rb : ditto
+
+ * rdoc/ri/ri_util.rb : ditto
+
+ * rdoc/ri/ri_writer.rb : ditto
+
+ * rdoc/template.rb : ditto
+
+ * rdoc/tokenstream.rb : ditto
+
+ * rdoc/usage.rb : ditto
+
+ * test/xmlrpc/data/bug_bool.expected : ditto
+
+ * test/xmlrpc/data/bug_bool.xml : ditto
+
+ * test/xmlrpc/data/bug_cdata.expected : ditto
+
+ * test/xmlrpc/data/bug_cdata.xml : ditto
+
+ * test/xmlrpc/data/bug_covert.expected : ditto
+
+ * test/xmlrpc/data/bug_covert.xml : ditto
+
+ * test/xmlrpc/data/datetime_iso8601.xml : ditto
+
+ * test/xmlrpc/data/fault.xml : ditto
+
+ * test/xmlrpc/data/value.expected : ditto
+
+ * test/xmlrpc/data/value.xml : ditto
+
+ * test/xmlrpc/data/xml1.expected : ditto
+
+ * test/xmlrpc/data/xml1.xml : ditto
+
+ * test/xmlrpc/test_datetime.rb : ditto
+
+ * test/xmlrpc/test_features.rb : ditto
+
+ * test/xmlrpc/test_marshal.rb : ditto
+
+ * test/xmlrpc/test_parser.rb : ditto
+
+ * test/xmlrpc/test_webrick_server.rb : ditto
+
+ * test/xmlrpc/webrick_testing.rb : ditto
+
+ * test/zlib/test_zlib.rb : ditto
+
+
+2006-02-17(Fri) 09:41:35 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * thread.c (sleep_timeval): sleep should always sleep for
+ specified amount of time. [ruby-talk:180067]
+
+
+2006-02-17(Fri) 02:20:32 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_safe.h, ruby.h : remove ruby_safe_level and add
+ rb_safe_level() and rb_set_safe_level_force()
+
+ * eval.c : use above functions
+
+ * eval_jump.h : ditto
+
+ * eval_load.c : ditto
+
+ * eval_method.h : ditto
+
+ * eval_proc.c : ditto
+
+ * eval_thread.c : ditto
+
+ * gc.c : ditto
+
+ * signal.c : ditto
+
+ * variable.c : ditto
+
+ * ext/win32ole/win32ole.c : ditto
+
+ * vm.c (th_invoke_proc) : save and restore safe level
+
+ * yarvtest/test_proc.rb : add tests for above
+
+ * thread.c : remove unused functions
+
+
+2006-02-17(Fri) 01:08:23 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : remove a setspecial second unused operand
+
+ * eval_load.c : remove unused variable th
+
+ * eval_proc.c, yarvcore.c : remove some functions from eval_proc.c
+ and move to yarvcore.c
+
+ * insns.def : fix to delete warnings
+
+ * sample/test.rb : comment out Proc#clone tests
+
+ * version.c : add constant RUBY_VM_DATE
+
+ * vm.c : fix some functions
+
+
+2006-02-16(Thu) 22:58:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, vm.c : use th_yield_setup_args at yield and Proc#call
+
+
+2006-02-16(Thu) 19:51:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix analysis of block parameter
+
+ * disasm.c : remove rb_bug() (temporarily)
+
+ * insns.def, vm.c : fix passing block parameter
+
+ * sample/test.rb : add "Proc = YARVCore::VM::Proc"
+
+ * test/ruby/test_readpartial.rb : disable on mswin32
+
+ * test/socket/test_tcp.rb : ditto
+
+ * thread.c : fix syntax error (for non GCC)
+
+
+2006-02-15(Wed) 22:34:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_method.h : move rb_clear_cache_by_id position
+
+ * thread.c : fix Thread#kill
+
+ * test/ruby/test_readpartial.rb : enable tests except cygwin version
+
+ * test/ruby/test_signal.rb : ditto and enable timeout
+
+
+2006-02-15(Wed) 22:13:29 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/runit: forgot to commit.
+
+
+2006-02-15(Wed) 22:12:25 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/weakref.rb: do not use Thread.critical=.
+
+ * lib/singleton.rb: ditto.
+
+ * lib/timeout.rb: ditto.
+
+ * lib/thread.rb: ditto.
+
+ * test/inlinetest.rb: forgot to commit.
+
+
+2006-02-15(Wed) 21:34:17 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/test_pp.rb: imported from Ruby CVS trunk HEAD.
+
+ * test/test_shellwords.rb: ditto.
+
+ * test/test_set.rb: ditto.
+
+ * test/test_time.rb: ditto.
+
+ * test/test_ipaddr.rb: ditto.
+
+ * test/test_prettyprint.rb: ditto.
+
+ * test/test_tsort.rb: ditto.
+
+ * test/strscan: ditto.
+
+ * test/testunit: ditto.
+
+
+2006-02-15(Wed) 20:03:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_method.h : duplicate NODE_METHOD at make an alias
+
+ * yarvtest/test_method.rb : add a test for above
+
+
+2006-02-15(Wed) 19:48:59 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/rss: imported from Ruby CVS trunk HEAD.
+
+
+2006-02-15(Wed) 19:47:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, compile.c, vm.c : remove methoddef, singletonmethoddef
+ instructions and make new insn definemethod
+
+ * yarvcore.c : set toplevel visibility to private
+
+
+2006-02-15(Wed) 17:39:16 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_intern.h :
+
+ * eval_jump.h, vm.c : localjump_error() and jump_tag_but_local_jump()
+ move to th_localjump_error and th_jump_tag_but_local_jump at vm.c
+
+ * eval.c : ditto
+
+ * eval_load.c : ditto
+
+ * insns.def : ditto
+
+ * vm.c : ditto
+
+ * vm.c (th_make_jump_tag_but_local_jump) : added
+
+ * opt_insn_unif.def : fix indnet (revert change)
+
+ * opt_operand.def : ditto
+
+ * rb/insns2vm.rb : fix error message
+
+ * thread.c : raise exception at join if illegal local jump
+
+
+2006-02-15(Wed) 14:21:45 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ChangeLog: add local variables line to support Emacs.
+
+ * eval.c (rb_obj_instance_exec): add new method from 1.9.
+
+ * eval.c (rb_mod_module_exec): ditto.
+
+ * eval.c (yield_under_i): should not pass self as an argument to
+ the block for instance_eval. [ruby-core:07364]
+
+ * eval.c (rb_obj_instance_eval): should be no singleton classes for
+ true, false, and nil. [ruby-dev:28186]
+
+
+2006-02-14(Tue) 19:30:20 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c : fix indent
+
+ * eval.c : fix block_given
+
+ * gc.c : add STACK_START and use it as a substitute for
+ rb_gc_stack_start
+
+ * vm.c : fix to raise error if th_yield doesn't have block given
+
+ * yarvcore.c : fix to skip iseq mark array at ObjectSpace.each_object
+
+
+2006-02-14(Tue) 18:15:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * configure.in : enable pthread by deafult
+
+ * ascii.c : import ruby 1.9 HEAD
+
+ * bignum.c : ditto
+
+ * compar.c : ditto
+
+ * configure : ditto
+
+ * defines.h : ditto
+
+ * dln.c : ditto
+
+ * dln.h : ditto
+
+ * enum.c : ditto
+
+ * enumerator.c : ditto
+
+ * euc_jp.c : ditto
+
+ * ext/win32ole/tests/testWIN32OLE.rb : ditto
+
+ * ext/win32ole/win32ole.c : ditto
+
+ * file.c : ditto
+
+ * hash.c : ditto
+
+ * io.c : ditto
+
+ * lex.c : ditto
+
+ * lib/irb/init.rb : ditto
+
+ * lib/rexml/document.rb : ditto
+
+ * main.c : ditto
+
+ * marshal.c : ditto
+
+ * math.c : ditto
+
+ * missing.h : ditto
+
+ * object.c : ditto
+
+ * oniguruma.h : ditto
+
+ * pack.c : ditto
+
+ * process.c : ditto
+
+ * random.c : ditto
+
+ * range.c : ditto
+
+ * rb/ir.rb : ditto
+
+ * re.c : ditto
+
+ * regcomp.c : ditto
+
+ * regenc.c : ditto
+
+ * regenc.h : ditto
+
+ * regerror.c : ditto
+
+ * regexec.c : ditto
+
+ * regint.h : ditto
+
+ * regparse.c : ditto
+
+ * regparse.h : ditto
+
+ * ruby.c : ditto
+
+ * ruby.h : ditto
+
+ * rubyio.h : ditto
+
+ * sjis.c : ditto
+
+ * sprintf.c : ditto
+
+ * st.c : ditto
+
+ * st.h : ditto
+
+ * struct.c : ditto
+
+ * test/ruby/envutil.rb : ditto
+
+ * test/ruby/test_struct.rb : ditto
+
+ * time.c : ditto
+
+ * utf8.c : ditto
+
+ * util.c : ditto
+
+ * util.h : ditto
+
+ * version.h : ditto
+
+ * win32/Makefile.sub : ditto
+
+ * win32/win32.c : ditto
+
+
+2006-02-14(Tue) 16:40:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, eval_proc.c : fix rb_proc_arity
+
+ * eval.c : declare funcall same as send (temporarily)
+
+ * lib/thread.rb : added
+
+ * test/pathname/test_pathname.rb : imported from ruby 1.9
+
+ * test/scanf/data.txt : ditto
+
+ * test/scanf/test_scanf.rb : ditto
+
+ * test/scanf/test_scanfblocks.rb : ditto
+
+ * test/scanf/test_scanfio.rb : ditto
+
+ * test/socket/test_socket.rb : ditto
+
+ * test/socket/test_tcp.rb : ditto
+
+ * test/socket/test_udp.rb : ditto
+
+ * test/socket/test_unix.rb : ditto
+
+ * test/stringio/test_stringio.rb : ditto
+
+ * test/uri/test_common.rb : ditto
+
+ * test/uri/test_ftp.rb : ditto
+
+ * test/uri/test_generic.rb : ditto
+
+ * test/uri/test_http.rb : ditto
+
+ * test/uri/test_ldap.rb : ditto
+
+ * test/uri/test_mailto.rb : ditto
+
+
+2006-02-14(Tue) 15:59:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c : Change Thread.critical warnning message
+
+ * lib/webrick.rb : imported from ruby 1.9
+
+ * lib/webrick/accesslog.rb : ditto
+
+ * lib/webrick/cgi.rb : ditto
+
+ * lib/webrick/compat.rb : ditto
+
+ * lib/webrick/config.rb : ditto
+
+ * lib/webrick/cookie.rb : ditto
+
+ * lib/webrick/htmlutils.rb : ditto
+
+ * lib/webrick/httpauth.rb : ditto
+
+ * lib/webrick/httpauth/authenticator.rb : ditto
+
+ * lib/webrick/httpauth/basicauth.rb : ditto
+
+ * lib/webrick/httpauth/digestauth.rb : ditto
+
+ * lib/webrick/httpauth/htdigest.rb : ditto
+
+ * lib/webrick/httpauth/htgroup.rb : ditto
+
+ * lib/webrick/httpauth/htpasswd.rb : ditto
+
+ * lib/webrick/httpauth/userdb.rb : ditto
+
+ * lib/webrick/httpproxy.rb : ditto
+
+ * lib/webrick/httprequest.rb : ditto
+
+ * lib/webrick/httpresponse.rb : ditto
+
+ * lib/webrick/https.rb : ditto
+
+ * lib/webrick/httpserver.rb : ditto
+
+ * lib/webrick/httpservlet.rb : ditto
+
+ * lib/webrick/httpservlet/abstract.rb : ditto
+
+ * lib/webrick/httpservlet/cgi_runner.rb : ditto
+
+ * lib/webrick/httpservlet/cgihandler.rb : ditto
+
+ * lib/webrick/httpservlet/erbhandler.rb : ditto
+
+ * lib/webrick/httpservlet/filehandler.rb : ditto
+
+ * lib/webrick/httpservlet/prochandler.rb : ditto
+
+ * lib/webrick/httpstatus.rb : ditto
+
+ * lib/webrick/httputils.rb : ditto
+
+ * lib/webrick/httpversion.rb : ditto
+
+ * lib/webrick/log.rb : ditto
+
+ * lib/webrick/server.rb : ditto
+
+ * lib/webrick/ssl.rb : ditto
+
+ * lib/webrick/utils.rb : ditto
+
+ * lib/webrick/version.rb : ditto
+
+
+2006-02-14(Tue) 14:55:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : support "defined?($1)", ...
+
+ * yarvtest/test_syntax.rb : add a test for above
+
+ * rb/makedocs.rb : fix template directory path
+
+ * vm.c : fix to handle break from proc
+
+
+2006-02-14(Tue) 12:42:59 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : fix rb_iterate hook
+
+ * yarvtest/test_block.rb : add a tests for above
+
+ * vm.c : remove unused comment
+
+
+2006-02-14(Tue) 12:01:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : fix to check passed block at block_given_p
+
+ * eval_proc.c : fix to pass block at Method#call
+
+ * runruby.rb : fix to apply ruby
+
+ * test/runner.rb : GC.stress (comment out)
+
+ * vm.c : fix indnet
+
+
+2006-02-14(Tue) 08:04:33 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/tempfile.rb: use Mutex instead of Thread.critical.
+
+ * lib/rss/dublincore.rb: |x,| -> |x,_| to avoid YARV bug (tmp).
+
+ * lib/rexml: imported from ruby CVS trunk HEAD.
+
+ * test/digest: ditto.
+
+ * test/fileutils: ditto.
+
+ * test/ostruct: ditto.
+
+ * test/erb: ditto.
+
+ * test/optparse: ditto.
+
+ * test/ruby/test_signal.rb: turn off a test to avoid unknown error
+ (tmp).
+
+
+2006-02-14(Tue) 07:52:03 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/digest: imported from ruby CVS trunk HEAD.
+
+ * test/fileutils: ditto.
+
+ * test/ostruct: ditto.
+
+ * test/erb: ditto.
+
+ * test/optparse: ditto.
+
+
+2006-02-14(Tue) 06:26:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, parse.y : support BEGIN{} (remove local scope)
+
+ * test/ruby/beginmainend.rb : fix to apply YARV's specification
+
+ * test/ruby/test_beginendblock.rb : enable BEGIN{} test
+
+ * signal.c : exit at double segv
+
+ * insns.def (preexe) : remove instruction "preexe"
+
+
+2006-02-14(Tue) 05:53:56 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * eval.c (ruby_cleanup): th->errinfo contains a NODE while
+ break'ing, check it before refering klass.
+
+
+2006-02-14(Tue) 05:45:07 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix stack calc of send
+
+ * sample/test.rb : remove SEGV causing code
+
+
+2006-02-14(Tue) 02:24:21 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_module.rb: list order is not a matter.
+
+ * test/csv: imported from ruby CVS trunk HEAD.
+
+
+2006-02-14(Tue) 02:06:25 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_beginendblock.rb: unlock tests.
+
+ * test/ruby/beginmainend.rb: new file (imported from ruby CVS
+ trunk HEAD).
+
+ * test/ruby/endblockwarn.rb: new file (imported from ruby CVS
+ trunk HEAD).
+
+ * test/ruby/test_file.rb: new file (imported from ruby CVS trunk
+ HEAD).
+
+
+2006-02-14(Tue) 01:42:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * error.c : fix include file positon
+
+ * test/ruby/test_signal.rb : skip test_exit_action on cygwin
+
+
+2006-02-14(Tue) 01:36:57 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_class.rb: new file (imported from rubicon).
+
+
+2006-02-14(Tue) 01:32:23 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_module.rb: ignore PP mixins.
+
+
+2006-02-14(Tue) 01:24:56 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_lambda.rb: removed (->(){...} syntax is
+ obsolete).
+
+
+2006-02-14(Tue) 01:20:54 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_module.rb: import many tests from rubicon.
+
+
+2006-02-14(Tue) 01:06:57 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix to avoid stack consistency error
+
+ * yarvtest/test_exception.rb : add a test for above
+
+
+2006-02-14(Tue) 00:42:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, vm_macro.def : rename VM_CALL_SUPER to VM_CALL_SUPER_BIT
+
+ * insns.def (send) : set a flag of super as fcall
+
+ * yarvtest/test_class.rb : add a test for above
+
+
+2006-02-14(Tue) 00:31:24 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_eval.rb: fix typo.
+
+ * test/ruby/test_signal.rb: unlock tests.
+
+
+2006-02-13(Mon) 23:53:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, vm_macro.def : fix NODE_ZSUPER dispatch and
+ fix error message when super without suitable method ([yarv-dev:846])
+
+ * yarvcore.h : add VM_CALL_SUPER definition
+
+ * yarvtest/test_method.rb : add a test of Module#private_class_method
+
+
+2006-02-13(Mon) 22:49:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : traverse all iseq to find super method ([yarv-dev:859])
+
+ * yarvtest/test_class.rb : add a test for above
+
+ * yarvcore.c : add clear iseq->defined_method_id
+
+ * signal.c : fix to prohibit double segv handler kicked
+
+
+2006-02-13(Mon) 22:09:12 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_DECL, NODE_CLASS with NODE_CLON3 prefix
+
+ * yarvtest/test_class.rb : add tests for above
+
+
+2006-02-13(Mon) 21:20:57 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix indent
+
+ * compile.c : fix to prohibit "redo" from eval expression
+
+
+2006-02-13(Mon) 20:36:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : fix constant search bug ([yarv-dev:788])
+
+ * yarvtest/test_class.rb : add a test of [yarv-dev:788]
+
+
+2006-02-13(Mon) 18:09:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/ruby/test_clone.rb : enable tests with Class#clone
+
+ * test/ruby/test_marshal.rb : ditto
+
+
+2006-02-13(Mon) 17:42:37 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * class.c : support Class#clone
+
+ * compile.c, insns.def : remove popcref
+
+ * yarvcore.h, vm.c, insns.def : remove yarv_thread_t#cref_stack
+
+ * eval.c, eval_intern.h, eval_load.c : ditto
+
+ * yarvtest/test_class.rb : add tests for singleton class
+
+ * gc.c : remove "FRAME *" unused variable
+
+ * insnhelper.h : fix COPY_CREF
+
+ * rb/mklog.rb : add default message
+
+ * vm_macro.def : support NODE_ZSUPER as method type
+
+
+2006-02-13(Mon) 00:11:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * blockinlining.c : refoctoring with CFLAGS+=-Wunused
+
+ * eval.c : ditto
+
+ * eval_intern.h : ditto
+
+ * eval_load.c : ditto
+
+ * eval_method.h : ditto
+
+ * eval_proc.c : ditto
+
+ * eval_thread.c : ditto
+
+ * insns.def : ditto
+
+ * parse.y : ditto
+
+ * thread.c : ditto
+
+ * vm.c : ditto
+
+
+2006-02-13(Mon) 02:32:34 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_const.rb: show better message.
+
+ * test/ruby/test_eval.rb: ditto.
+
+ * test/ruby/test_module.rb: new file.
+
+
+2006-02-12(Sun) 22:22:35 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c : revert last commit
+
+ * ascii.c : ditto
+
+ * bignum.c : ditto
+
+ * class.c : ditto
+
+ * compar.c : ditto
+
+ * defines.h : ditto
+
+ * dir.c : ditto
+
+ * dln.c : ditto
+
+ * dln.h : ditto
+
+ * enum.c : ditto
+
+ * enumerator.c : ditto
+
+ * error.c : ditto
+
+ * euc_jp.c : ditto
+
+ * file.c : ditto
+
+ * gc.c : ditto
+
+ * hash.c : ditto
+
+ * intern.h : ditto
+
+ * io.c : ditto
+
+ * lex.c : ditto
+
+ * main.c : ditto
+
+ * marshal.c : ditto
+
+ * math.c : ditto
+
+ * missing.h : ditto
+
+ * node.h : ditto
+
+ * numeric.c : ditto
+
+ * object.c : ditto
+
+ * oniguruma.h : ditto
+
+ * pack.c : ditto
+
+ * prec.c : ditto
+
+ * process.c : ditto
+
+ * random.c : ditto
+
+ * range.c : ditto
+
+ * rb/mklog.rb : ditto
+
+ * re.c : ditto
+
+ * regcomp.c : ditto
+
+ * regenc.c : ditto
+
+ * regenc.h : ditto
+
+ * regerror.c : ditto
+
+ * regex.h : ditto
+
+ * regexec.c : ditto
+
+ * regint.h : ditto
+
+ * regparse.c : ditto
+
+ * regparse.h : ditto
+
+ * ruby.c : ditto
+
+ * ruby.h : ditto
+
+ * rubyio.h : ditto
+
+ * rubysig.h : ditto
+
+ * signal.c : ditto
+
+ * sjis.c : ditto
+
+ * sprintf.c : ditto
+
+ * st.c : ditto
+
+ * st.h : ditto
+
+ * string.c : ditto
+
+ * struct.c : ditto
+
+ * time.c : ditto
+
+ * utf8.c : ditto
+
+ * util.c : ditto
+
+ * util.h : ditto
+
+ * variable.c : ditto
+
+ * version.c : ditto
+
+
+2006-02-12(Sun) 21:33:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c : fix to ruby's indent
+
+ * ascii.c : ditto
+
+ * bignum.c : ditto
+
+ * blockinlining.c : ditto
+
+ * call_cfunc.h : ditto
+
+ * class.c : ditto
+
+ * compar.c : ditto
+
+ * compile.c : ditto
+
+ * compile.h : ditto
+
+ * debug.c : ditto
+
+ * debug.h : ditto
+
+ * defines.h : ditto
+
+ * dir.c : ditto
+
+ * disasm.c : ditto
+
+ * dln.c : ditto
+
+ * dln.h : ditto
+
+ * enum.c : ditto
+
+ * enumerator.c : ditto
+
+ * error.c : ditto
+
+ * euc_jp.c : ditto
+
+ * eval.c : ditto
+
+ * eval_error.h : ditto
+
+ * eval_intern.h : ditto
+
+ * eval_jump.h : ditto
+
+ * eval_load.c : ditto
+
+ * eval_method.h : ditto
+
+ * eval_proc.c : ditto
+
+ * eval_safe.h : ditto
+
+ * eval_thread.c : ditto
+
+ * file.c : ditto
+
+ * gc.c : ditto
+
+ * hash.c : ditto
+
+ * insnhelper.h : ditto
+
+ * insns.def : ditto
+
+ * intern.h : ditto
+
+ * io.c : ditto
+
+ * lex.c : ditto
+
+ * main.c : ditto
+
+ * marshal.c : ditto
+
+ * math.c : ditto
+
+ * missing.h : ditto
+
+ * node.h : ditto
+
+ * numeric.c : ditto
+
+ * object.c : ditto
+
+ * oniguruma.h : ditto
+
+ * opt_insn_unif.def : ditto
+
+ * opt_operand.def : ditto
+
+ * pack.c : ditto
+
+ * prec.c : ditto
+
+ * process.c : ditto
+
+ * random.c : ditto
+
+ * range.c : ditto
+
+ * re.c : ditto
+
+ * re.h : ditto
+
+ * regcomp.c : ditto
+
+ * regenc.c : ditto
+
+ * regenc.h : ditto
+
+ * regerror.c : ditto
+
+ * regex.h : ditto
+
+ * regexec.c : ditto
+
+ * regint.h : ditto
+
+ * regparse.c : ditto
+
+ * regparse.h : ditto
+
+ * ruby.c : ditto
+
+ * ruby.h : ditto
+
+ * rubyio.h : ditto
+
+ * rubysig.h : ditto
+
+ * signal.c : ditto
+
+ * sjis.c : ditto
+
+ * sprintf.c : ditto
+
+ * st.c : ditto
+
+ * st.h : ditto
+
+ * string.c : ditto
+
+ * struct.c : ditto
+
+ * test.rb : ditto
+
+ * thread.c : ditto
+
+ * thread_pthread.h : ditto
+
+ * thread_win32.h : ditto
+
+ * time.c : ditto
+
+ * utf8.c : ditto
+
+ * util.c : ditto
+
+ * util.h : ditto
+
+ * variable.c : ditto
+
+ * version.c : ditto
+
+ * vm.c : ditto
+
+ * vm.h : ditto
+
+ * vm_dump.c : ditto
+
+ * vm_evalbody.h : ditto
+
+ * vm_macro.def : ditto
+
+ * yarv.h : ditto
+
+ * yarv_version.h : ditto
+
+ * yarvcore.c : ditto
+
+ * yarvcore.h : ditto
+
+
+2006-02-12(Sun) 15:53:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/abbrev.rb : added
+
+ * lib/base64.rb : ditto
+
+ * lib/cgi-lib.rb : ditto
+
+ * lib/csv.rb : ditto
+
+ * lib/date2.rb : ditto
+
+ * lib/eregex.rb : ditto
+
+ * lib/ipaddr.rb : ditto
+
+ * lib/irb.rb : ditto
+
+ * lib/irb/cmd/chws.rb : ditto
+
+ * lib/irb/cmd/fork.rb : ditto
+
+ * lib/irb/cmd/help.rb : ditto
+
+ * lib/irb/cmd/load.rb : ditto
+
+ * lib/irb/cmd/nop.rb : ditto
+
+ * lib/irb/cmd/pushws.rb : ditto
+
+ * lib/irb/cmd/subirb.rb : ditto
+
+ * lib/irb/completion.rb : ditto
+
+ * lib/irb/context.rb : ditto
+
+ * lib/irb/ext/change-ws.rb : ditto
+
+ * lib/irb/ext/history.rb : ditto
+
+ * lib/irb/ext/loader.rb : ditto
+
+ * lib/irb/ext/math-mode.rb : ditto
+
+ * lib/irb/ext/multi-irb.rb : ditto
+
+ * lib/irb/ext/save-history.rb : ditto
+
+ * lib/irb/ext/tracer.rb : ditto
+
+ * lib/irb/ext/use-loader.rb : ditto
+
+ * lib/irb/ext/workspaces.rb : ditto
+
+ * lib/irb/extend-command.rb : ditto
+
+ * lib/irb/frame.rb : ditto
+
+ * lib/irb/help.rb : ditto
+
+ * lib/irb/init.rb : ditto
+
+ * lib/irb/input-method.rb : ditto
+
+ * lib/irb/lc/error.rb : ditto
+
+ * lib/irb/lc/help-message : ditto
+
+ * lib/irb/lc/ja/CVS/Entries : ditto
+
+ * lib/irb/lc/ja/CVS/Repository : ditto
+
+ * lib/irb/lc/ja/CVS/Root : ditto
+
+ * lib/irb/lc/ja/error.rb : ditto
+
+ * lib/irb/lc/ja/help-message : ditto
+
+ * lib/irb/locale.rb : ditto
+
+ * lib/irb/notifier.rb : ditto
+
+ * lib/irb/output-method.rb : ditto
+
+ * lib/irb/ruby-lex.rb : ditto
+
+ * lib/irb/ruby-token.rb : ditto
+
+ * lib/irb/slex.rb : ditto
+
+ * lib/irb/version.rb : ditto
+
+ * lib/irb/workspace.rb : ditto
+
+ * lib/irb/ws-for-case-2.rb : ditto
+
+ * lib/irb/xmp.rb : ditto
+
+ * lib/jcode.rb : ditto
+
+ * lib/logger.rb : ditto
+
+ * lib/mailread.rb : ditto
+
+ * lib/mathn.rb : ditto
+
+ * lib/parsedate.rb : ditto
+
+ * lib/pathname.rb : ditto
+
+ * lib/ping.rb : ditto
+
+ * lib/pstore.rb : ditto
+
+ * lib/resolv-replace.rb : ditto
+
+ * lib/resolv.rb : ditto
+
+ * lib/rss.rb : ditto
+
+ * lib/rss/0.9.rb : ditto
+
+ * lib/rss/1.0.rb : ditto
+
+ * lib/rss/2.0.rb : ditto
+
+ * lib/rss/content.rb : ditto
+
+ * lib/rss/converter.rb : ditto
+
+ * lib/rss/dublincore.rb : ditto
+
+ * lib/rss/image.rb : ditto
+
+ * lib/rss/maker.rb : ditto
+
+ * lib/rss/maker/0.9.rb : ditto
+
+ * lib/rss/maker/1.0.rb : ditto
+
+ * lib/rss/maker/2.0.rb : ditto
+
+ * lib/rss/maker/base.rb : ditto
+
+ * lib/rss/maker/content.rb : ditto
+
+ * lib/rss/maker/dublincore.rb : ditto
+
+ * lib/rss/maker/image.rb : ditto
+
+ * lib/rss/maker/syndication.rb : ditto
+
+ * lib/rss/maker/taxonomy.rb : ditto
+
+ * lib/rss/maker/trackback.rb : ditto
+
+ * lib/rss/parser.rb : ditto
+
+ * lib/rss/rexmlparser.rb : ditto
+
+ * lib/rss/rss.rb : ditto
+
+ * lib/rss/syndication.rb : ditto
+
+ * lib/rss/taxonomy.rb : ditto
+
+ * lib/rss/trackback.rb : ditto
+
+ * lib/rss/utils.rb : ditto
+
+ * lib/rss/xml-stylesheet.rb : ditto
+
+ * lib/rss/xmlparser.rb : ditto
+
+ * lib/rss/xmlscanner.rb : ditto
+
+ * lib/rubyunit.rb : ditto
+
+ * lib/scanf.rb : ditto
+
+ * lib/shell.rb : ditto
+
+ * lib/singleton.rb : ditto
+
+ * lib/tsort.rb : ditto
+
+ * lib/weakref.rb : ditto
+
+ * eval_jump.c : removed
+
+
+2006-02-12(Sun) 15:39:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * parse.y : fix to remove including env.h
+
+ * yarvtest/test_exception.rb : fix syntax (add 'end')
+
+
+2006-02-12(Sun) 15:14:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * env.h : removed
+
+ * common.mk : remove env.h dependency
+
+ * compile.c, eval_intern.h : remove include env.h
+
+ * vm.c : ditto
+
+ * ruby.h, gc.c, error.c : remove T_SCOPE, T_VARMAP
+
+ * parse.y, eval.c : use rb_parse_in_eval() instead of ruby_in_eval
+
+ * yarvcore.c, yarvcore.h : add a prase_in_eval member to yarv_thread_t
+
+ * insns.def : add push value to throw instruction
+ for stack consistency
+
+ * yarvtest/test_exception.rb : add a test for above
+
+ * test/ruby/test_gc.rb : fix typo
+
+
+2006-02-12(Sun) 05:05:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, eval_intern.h, eval_load.c, eval_proc.c, node.h,
+ insnhelper.h, insns.def, vm.c, yarvcore.c, yarvcore.h :
+ change cref data structure and unify ruby_class and ruby_cbase
+ and some refoctoring
+
+
+2006-02-11(Sat) 23:41:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def (methoddef) : fix method declaration in method
+
+ * thread.c : Thread.critical to show warning (no effect)
+
+
+2006-02-11(Sat) 20:20:18 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix [yarv-dev:831]
+
+ * yarvtest/test_class.rb : add a test for above
+
+
+2006-02-11(Sat) 14:29:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/mklog.rb : use svk
+
+ * error.c : remove newline
+
+ * eval.c (rb_block_call) : added
+
+ * eval_thread.c : remove some unused functions, comments
+
+ * thread.c : add comments (move from eval_thread.c) and support Mutex
+
+ * thread.c (rb_thread_select) : supported
+
+ * thread_pthread.h (native_mutex_trylock) : added (macro)
+
+ * thread_win32.h (native_mutex_trylock) : added
+
+ * yarvcore.c : remove unused code
+
+ * array.c : import ruby 1.9
+
+ * compar.c : ditto
+
+ * dln.c : ditto
+
+ * enum.c : ditto
+
+ * enumerator.c : ditto
+
+ * ext/digest/digest.c : ditto
+
+ * ext/digest/digest.h : ditto
+
+ * ext/digest/sha2/sha2.c : ditto
+
+ * ext/etc/etc.c : ditto
+
+ * ext/win32ole/win32ole.c : ditto
+
+ * hash.c : ditto
+
+ * intern.h : ditto
+
+ * io.c : ditto
+
+ * main.c : ditto
+
+ * missing.h : ditto
+
+ * missing/flock.c : ditto
+
+ * missing/isinf.c : ditto
+
+ * missing/vsnprintf.c : ditto
+
+ * lib/cgi.rb : ditto
+
+ * lib/complex.rb : ditto
+
+ * lib/delegate.rb : ditto
+
+ * lib/erb.rb : ditto
+
+ * lib/fileutils.rb : ditto
+
+ * lib/matrix.rb : ditto
+
+ * lib/mkmf.rb : ditto
+
+ * lib/optparse.rb : ditto
+
+ * lib/ostruct.rb : ditto
+
+ * lib/pp.rb : ditto
+
+ * lib/timeout.rb : ditto
+
+ * lib/tmpdir.rb : ditto
+
+ * lib/test/unit/autorunner.rb : ditto
+
+ * node.h : ditto
+
+ * object.c : ditto
+
+ * parse.y : ditto
+
+ * ruby.c : ditto
+
+ * sample/test.rb : ditto
+
+ * sprintf.c : ditto
+
+ * st.c : ditto
+
+ * test/ruby/test_whileuntil.rb : ditto
+
+ * test/runner.rb : ditto
+
+ * time.c : ditto
+
+ * lib/net/.document : added
+
+ * lib/net/ftp.rb : ditto
+
+ * lib/net/http.rb : ditto
+
+ * lib/net/https.rb : ditto
+
+ * lib/net/imap.rb : ditto
+
+ * lib/net/pop.rb : ditto
+
+ * lib/net/protocol.rb : ditto
+
+ * lib/net/smtp.rb : ditto
+
+ * lib/net/telnet.rb : ditto
+
+ * lib/open-uri.rb : ditto
+
+
+2006-02-10(Fri) 08:07:34 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def, yarvcore.h : support defined?(private_method) and
+ defined?(protected_method) (separate DEFINE_METHOD / DEFINE_FUNC)
+
+ * yarvtest/test_syntax.rb : add a test for above
+
+ * compile.c (iseq_compile_each) : fix NODE_RETURN bug
+ (double ensure invoke)
+
+ * yarvtest/test_flow.rb : add a test for above
+
+ * eval.c (get_errinfo) : fix to search $!
+
+ * yarvtest/test_exception.rb : add tests for above
+
+ * eval_safe.h : support $SAFE
+
+ * ext/socket/socket.c : import ruby 1.9
+
+ * gc.c (gc_mark_children) : fix making T_VALUE
+
+ * test/ruby/test_gc.rb : use GC.stress
+
+ * signal.c (sighandler) : send interrupt signal if thread blocked
+
+ * test/ruby/test_proc.rb : remove assert false
+
+ * test/ruby/test_readpartial.rb : change fail message
+
+ * test/ruby/test_signal.rb : remove assert false
+
+ * thread.c (thread_start_func_2) : set local_lfp/local_svar
+ at thread creation
+
+ * thread_pthread.h : export native_thread_interrupt
+
+ * thread_win32.h : export native_thread_interrupt
+
+ * version.h : import ruby 1.9
+
+ * vm.c (lfp_svar), yarvcore.h : fix to use Thread local svar
+
+ * yarvtest/test_thread.rb : add a test for above
+
+ * win32/Makefile.sub : import ruby 1.9
+
+ * win32/dir.h : ditto
+
+ * win32/setup.mak : ditto
+
+ * win32/win32.c : ditto
+
+ * yarvtest/yarvtest.rb : fix to remove using ARGV
+
+
+2006-02-10(Fri) 01:04:58 +0900 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
+ invoking finalizers.
+
+ * gc.c (rb_gc_finalize_deferred): ditto.
+
+
+2006-02-08(Wed) 23:17:44 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_proc.rb: method names were wrongly duplicated.
+
+
+2006-02-08(Wed) 21:30:01 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * ext/nkf: added (imported from ruby CVS trunk HEAD).
+
+ * ext/nkf/depend: new file (rev 1.5).
+
+ * ext/nkf/extconf.rb: new file (rev 1.2).
+
+ * ext/nkf/nkf.c: new file (rev 1.12).
+
+ * ext/nkf/test.rb: new file (rev 1.7).
+
+ * ext/nkf/nkf-utf8/nkf.c: new file (rev 1.17).
+
+ * ext/nkf/nkf-utf8/config.h: new file (rev 1.4).
+
+ * ext/nkf/nkf-utf8/utf8tbl.c: new file (rev 1.6).
+
+ * ext/nkf/lib/kconv.rb: new file (rev 1.13).
+
+ * test/nkf: added (imported from ruby CVS trunk HEAD).
+
+ * test/nkf/test_kconv.rb: new file (rev 1.1).
+
+ * test/nkf/test_nkf.rb: new file (rev 1.1).
+
+
+2006-02-08(Wed) 21:07:36 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/find.rb: new file (imported from ruby CVS trunk HEAD,
+ rev 1.15).
+
+
+2006-02-07(Tue) 17:58:18 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : support BEGIN{} and add preexe instruction
+
+ * insns.def : fix getspecial/setspecial instructions
+ to catch up svar change
+
+ * test/ruby/test_system.rb : remove stopper
+
+ * thread.c (rb_thread_fd_writable) : add a debug output
+
+ * thread.c (rb_thread_wait_fd) : add a debug output
+
+ * vm.c (lfp_svar) : refactoring and fix some problems
+
+ * vm_dump.c (yarv_bug) : add branch
+
+ * yarv.h : remove unused declarations
+
+ * yarvcore.c (vm_free) : VM object should not free by GC
+
+
+2006-02-07(Tue) 14:42:25 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, eval_load.c : remove rb_thread_start_1()
+
+ * eval.c : fix some prototypes and indents
+
+ * eval_thread.c, thread.c : move some functions
+ from eval_thread.c to thread.c
+
+ * signal.c (sighandler) : add line braek in error message
+
+ * yarvcore.c, yarvcore.h, thread.c : support ThreadGroup
+
+ * ruby.h, gc.c, vm.c : make new basic type RValue and T_VALUE.
+ RValue includes three values in itself. RValue is used as
+ svar
+
+
+2006-02-06(Mon) 23:51:41 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_hash.rb: import many tests from rubicon.
+
+
+2006-02-04(Sat) 18:36:41 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_array.rb: import many tests from rubicon.
+
+
+2006-02-04(Sat) 17:47:44 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_signal.rb (test_exit_action): lib/timeout.rb is
+ not implemented yet.
+
+
+2006-02-04(Sat) 17:42:31 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_readpartial.rb: lib/timeout.rb is not implemented
+ yet.
+
+
+2006-02-04(Sat) 16:22:38 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_pipe.rb: remove useless require.
+
+ * test/ruby/test_signal.rb: turn off the test case which causes
+ segmentation fault (tmp).
+
+
+2006-02-04(Sat) 08:19:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add dependency to yarvcore.h on signal.o
+
+ * compile.c (iseq_compile_each) : fix [yarv-dev:795] problem
+ (prohibit "break", "next" jump from eval)
+
+ * eval.c : fix indent
+
+ * eval_thread.c, thread.c : remove some functions and move to thread.c
+
+ * insns.def, vm.c : fix [yarv-dev:799] and [yarv-dev:800]
+
+ * yarvtest/test_class.rb : add a test for above
+
+ * test/ruby/test_gc.rb : remove GC.debug_flag control
+
+ * test/ruby/test_readpartial.rb : disable
+
+ * test/ruby/test_signal.rb : disable
+
+ * thread.c : fix thread_debug() and many bugs
+
+ * thread.c (yarv_thread_s_new) : move living_threads setting
+
+ * thread.c (yarv_thread_join) : fix
+
+ * thread_pthread.h : add type native_thread_data_t (dummy)
+ and support interrupt blocking thread
+
+ * thread_pthread.h (native_thread_apply_priority) : added
+
+ * thread_win32.h : add type native_thread_data_t (dummy)
+ and support interrupt blocking thread
+
+ * yarvcore.h : use win32 thread system on cygwin and fix
+ some struct members
+
+ * yarvtest/test_thread.rb : added
+
+
+2006-02-03(Fri) 00:08:09 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_string.rb: import many tests from rubicon.
+
+
+2006-02-02(Thu) 23:20:13 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/envutil.rb: new file (imported from ruby trunk HEAD).
+
+ * test/ruby/marshaltestlib.rb: ditto.
+
+ * test/ruby/test_array.rb: ditto.
+
+ * test/ruby/test_beginendblock.rb: ditto.
+
+ * test/ruby/test_clone.rb: ditto.
+
+ * test/ruby/test_dir.rb: ditto.
+
+ * test/ruby/test_env.rb: ditto.
+
+ * test/ruby/test_file.rb: ditto.
+
+ * test/ruby/test_float.rb: ditto.
+
+ * test/ruby/test_fnmatch.rb: ditto.
+
+ * test/ruby/test_hash.rb: ditto.
+
+ * test/ruby/test_io.rb: ditto.
+
+ * test/ruby/test_marshal.rb: ditto.
+
+ * test/ruby/test_math.rb: ditto.
+
+ * test/ruby/test_pack.rb: ditto.
+
+ * test/ruby/test_path.rb: ditto.
+
+ * test/ruby/test_pipe.rb: ditto.
+
+ * test/ruby/test_rand.rb: ditto.
+
+ * test/ruby/test_range.rb: ditto.
+
+ * test/ruby/test_readpartial.rb: ditto.
+
+ * test/ruby/test_regexp.rb: ditto.
+
+ * test/ruby/test_settracefunc.rb: ditto.
+
+ * test/ruby/test_signal.rb: ditto.
+
+ * test/ruby/test_sprintf.rb: ditto.
+
+ * test/ruby/test_string.rb: ditto.
+
+ * test/ruby/test_stringchar.rb: ditto.
+
+ * test/ruby/test_struct.rb: ditto.
+
+ * test/ruby/test_symbol.rb: ditto.
+
+ * test/ruby/test_system.rb: ditto.
+
+ * test/ruby/test_time.rb: ditto.
+
+ * test/ruby/ut_eof.rb: ditto.
+
+
+2006-02-02(Thu) 22:53:44 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_proc.rb: test [yarv-dev:777].
+
+
+2006-02-01(Wed) 03:51:39 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c : add GC.debug_flag= method
+
+ * insns.def : support method definition in method
+
+ * yarvtest/test_method.rb : add tests for above
+
+
+2006-01-29(Sun) 11:40:26 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_proc.c (proc_alloc) : fix [yarv-dev:777]
+
+ * yarvtest/test_proc.rb : add a test for above
+
+ * insns.def : fix [yarv-dev:782] and add YARV_CHECK_INTS()
+
+ * yarvtest/test_class.rb : add a test for above
+
+ * thread_win32.h : fix [yarv-dev-en:23]
+
+ * vm.c (th_call0) : add YARV_CHECK_INTS()
+
+
+2006-01-09(Mon) 11:56:34 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * yarvcore.h: add prototype (remove warning).
+
+ * vm.c (th_invoke_proc): make save variables volatile.
+
+ * eval.c (eval): initialize local variables (remove warnings).
+
+ * eval_thread.c (rb_exec_recursive): ditto.
+
+ * yarvcore.c (thread_mark): ditto.
+
+ * vm.c (th_invoke_proc): ditto.
+
+ * eval.c: remove useless prototypes.
+
+
+2006-01-09(Mon) 10:25:12 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * eval_thread.c: rb_thread_join is required to build ruby on
+ Linux.
+
+ * compile.c: unify coding style.
+
+ * yarvcore.c: ditto.
+
+
+2006-01-06(Fri) 09:21:34 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * vm.c: coding style change only.
+
+
+2006-01-04(Wed) 14:12:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c (ruby_init), eval_intern.h : use POP_TAG_INIT() at bootstrap
+
+ * eval_thread.c : remove unused functions and comments
+
+ * intern.h : expose rb_make_exception()
+
+ * signal.c : support signal
+
+ * thread.c (yarv_thread_execute_interrupts) : added
+
+ * thread_pthread.h (thread_timer) : set interrupt_flag of
+ current runnning threads
+
+ * vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
+ occurres
+
+ * yarv.h : add yarv_set_current_running_thread_raw() for bootstrap
+
+ * yarvcore.c : add yarv_segv() and segv() method for test
+
+ * yarvcore.c (Init_yarvcore) : set yarv_thread_t#running_thread
+
+ * yarvcore.h : fix yarv_thread_t members
+
+
+2006-01-03(Tue) 22:25:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * disasm.c (insn_operand_intern) : fix to add child iseq
+
+ * eval.c, gc.c : remove obsolete static variables (ruby_scope,
+ ruby_dyna_vars, ruby_frame)
+
+ * eval.c (rb_mod_s_constants) : use ruby_cref()
+
+ * eval.c (eval) : use th_restore_klass()
+
+ * eval_proc.c (rb_f_binding) : use th_store_klass()
+
+ * insns.def (concatarray) : fix insn ([expr, *nil] => [expr])
+
+ * vm.c (th_set_env), insnhelper.h : remove macro
+
+ * vm.c (eval_get_cvar_base) : use get_cref
+
+ * vm.c (th_make_proc) : use th_store_klass()
+
+ * vm_macro.def (macro_eval_invoke_func) : fix option args size
+
+ * vm_macro.def (macro_eval_invoke_func) : raise stack overflow error
+
+ * yarvcore.h : add yarv_stored_klass_t type
+
+ * yarvcore.c : fix mark functions around yarv_stored_klass_t
+
+
+2006-01-01(Sun) 05:14:26 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * lib/benchmark.rb: new file (imported from original ruby, rev
+ 1.10).
+
+
+2006-01-01(Sun) 03:51:10 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * yarvcore.c: add prototype.
+
+ * re.c: remove warning: long -> unsigned long.
+
+ * debug.c: adjust coding style.
+
+ * yarv.h: ditto.
+
+
+2006-01-01(Sun) 03:43:33 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * variable.c: add prototype.
+
+ * eval.c: ditto.
+
+ * eval_load.c: ditto.
+
+
+2006-01-01(Sun) 02:41:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add address analyse to vtune rule
+
+ * rb/vtlh.rb : added for above
+
+ * rb/insns2vm.rb, template/vm.inc.tmpl : insert #line directive
+ to reference above
+
+ * vm_macro.def (macro_eval_invoke_cfunc) : fix indent
+
+ * yarvtest/test_method.rb : fix indent, spacing
+ and add a test for alias
+
+
+2005-12-31(Sat) 12:42:05 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add Intel VTune rule (make vtune)
+
+ * eval.c, yarvcore.h : fix to remove yarv_thread_t#local_*
+
+ * parse.y (top_local_init_gen) : fix a problem ([yarv-dev:765])
+
+ * yarvtest/test_eval.rb : add a test for above
+
+ * vm.c (thread_eval) :remove unused function
+
+ * yarvcore.c (Init_yarvcore) : remove YARVCore::Thread::eval method
+
+ * yarvcore.c (thread_eval) : remove unused function
+
+
+2005-12-31(Sat) 06:05:00 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c (eval_search_super_klass) : pass block to method missing
+
+ * vm_macro.def (macro_eval_invoke_method) : ditto
+
+ * yarvtest/test_method.rb : add a test for above
+
+
+2005-12-31(Sat) 03:11:14 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c (eval), eval_proc.c (rb_f_binding) : save klass, etc to
+ binding and use it at eval
+
+ * eval_intern.h : ditto
+
+ * yarvtest/test_eval.rb : add tests for above
+
+ * yarvcore.c (th_get_special_cref) : added
+
+ * yarvcore.h : add a prototype of above
+
+ * vm.c (th_get_cref) : refactoring
+
+ * vm.c (eval_get_ev_const) : fix SEGV at A::B (A is not class/module)
+ ([yarv-dev:758])
+
+ * yarvtest/test_bin.rb : add a test for above
+
+ * rb/mklog.rb : use external diff command and show function name
+
+
+2005-12-30(Fri) 19:07:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, yarvcore.h, eval.c, eval_proc.c : support
+ Ruby's Binding
+
+ * yarvcore.c : support TOPLEVEL_BINDING
+
+ * yarvtest/test_eval.rb : add tests for above
+
+
+2005-12-30(Fri) 13:12:28 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_eval.rb: more tests for
+ module_eval/instance_eval.
+
+
+2005-12-30(Fri) 05:06:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add dependency (yarvcore.h) for gc.c
+
+ * eval.c, eval_intern.h, eval_load.c, eval_method.h,
+ insns.def, insnhelper.h, vm.c, yarvcore.c, yarvcore.h :
+ re-write class reference
+
+ * yarvtest/test_eval.rb : added
+
+ * yarvtest/test_proc.rb :
+
+
+2005-12-29(Thu) 12:27:12 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, yarvcore.h :
+ remvoe needless yarv_iseq_t#rewind_frame_size
+
+
+2005-12-29(Thu) 11:17:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add dependency to test-all rule
+
+ * eval.c (rb_sourceline), vm.c (th_get_sourceline) :
+ fix to skip process if iseq is ifunc
+
+ * test/ruby/test_lambda.rb : assert(fail, ...) instead of assert_fail
+
+ * test/ruby/test_proc.rb : ditto
+
+ * vm_dump.c : fix stack dump (iseq name)
+
+ * vm_macro.def : store proc (block proc) to cfp#proc for GC mark
+
+ * yarvcore.c : mark above on thread_mark
+
+ * eval.c (exec_under) : replace block#self ([yarv-dev:751])
+
+
+2005-12-29(Thu) 01:56:46 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : fix setting of Proc cref ([yarv-dev:741])
+
+ * yarvcore.c : fix indent
+
+
+2005-12-29(Thu) 00:17:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * disasm.c : show (block) local variable simple (not as symbol)
+
+ * gc.c : fix syntax error
+
+
+2005-12-28(Wed) 23:35:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * class.c (method_entry) : fixed for undefed method ([yarv-dev:743])
+
+ * compile.c : fix errinfo dvar id (#$!)
+ and fix NODE_ERRINFO compilation
+
+ * eval_proc.c, yarvcore.c : support YARVCore::VM::Proc.new
+
+ * insns.def : remove useless TODO comments
+
+ * insns.def : fix to use strict array conversion on
+ checkarrayinclude
+
+ * insns.def : fix defined?(yield) ([yarv-dev:744])
+
+ * yarvcore.h : change yarv_iseq_t layout
+
+
+2005-12-28(Wed) 16:49:55 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_eval.rb: add TODO comment.
+
+ * test/ruby/test_iterator.rb: rename YARVCore::VM::Proc -> Proc
+ (tmp).
+
+ * test/ruby/test_lambda.rb: use assert_fail.
+
+ * test/ruby/test_proc.rb: ditto.
+
+
+2005-12-28(Wed) 16:28:35 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_clone.rb: removed (tmp).
+
+ * test/ruby/test_eval.rb: define missing method Object#funcall
+ (tmp).
+
+ * test/ruby/test_lambda.rb: turn off tests for "->".
+
+ * test/ruby/test_proc.rb: turn off tests for |&b|.
+
+ * test/ruby/test_proc.rb: turn off tests for $SAFE setter.
+
+
+2005-12-28(Wed) 15:31:46 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix calculation of stack_max
+
+ * eval.c (rb_iter) : fix block/retry handling
+
+ * yarvtest/test_flow.rb : add tests for above
+
+ * insns.def : fix block passing on super (super(&nil))
+
+ * vm_macro.def, insns.def : fix convert method of object to array
+
+ * yarvtest/test_method.rb : fix a test for above
+
+ * vm.c : fix backtrace generate algorithm
+
+
+2005-12-28(Wed) 10:36:45 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, compile.h : refactoring (remove self passing, etc)
+
+ * disasm.c : support showing ID of method/dynamic local variables
+
+ * rb/allload.rb : add verbose version (it's enable by $DEBUG)
+
+ * template/insns.inc.tmpl, template/insns_info.inc.tmpl,
+ template/minsns.inc.tmpl, template/opt_sc.inc.tmpl,
+ template/optinsn.inc.tmpl, template/optunifs.inc.tmpl,
+ template/vmtc.inc.tmpl : fix a comment
+
+ * variable.c (mod_av_set) : fix to clear inline cache ([yarv-dev:720])
+
+ * eval_method.h : fix to clear inline method cache
+
+ * vm.c, rb/insns2vm.rb, template/insns_info.inc.tmpl, compile.c,
+ insns.def, vm_evalbody.h, vm_macro.def :
+ fix operands types (ulong -> num_t, ...)
+
+ * vm_macro.def : fix to check SPECIAL_CONST_P() at splat array
+ ([yarv-dev:722])
+
+ * yarvcore.c : fix to throw syntax error
+
+ * yarvcore.h, eval.c, eval_error.h, eval_jump.h :
+ add yarv_vm_t#exit_code to fix problem at cleanup ([yarv-dev:723])
+
+ * insns.def : fix to invoke zsuper in method defined by define_method
+ ([yarv-dev:704])
+
+ * yarvtest/test_class.rb : add tests for above
+
+ * yarvtest/test_method.rb : fix comments
+
+
+2005-12-27(Tue) 01:52:07 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c, intern.h, insns.def : expose rb_ary_replace and use it
+ in insns.def
+
+ * eval.c : fix to use SCOPE_* to NOEX_*
+
+ * eval_intern.h : remove SCOPE_*
+ and fix SCOPE_TEST() and SCOPE_SET(f)
+
+ * eval_load.c : save and store klass and visibility
+ at require and load
+
+ * eval_method.h : fix undefed method node ([yarv-dev-en:8])
+
+ * eval_proc.c : fix define_method ([yarv-dev:704])
+
+ * insnhelper.h, vm.h : remove GET_VM_STATE_VERSION(),
+ INC_VM_STATE_VERSION() and move these to vm.h
+
+ * insns.def : supportintg visibility
+
+ * node.h : remove NOEX_RECV
+
+ * variable.c, vm.c : add rb_vm_change_state() and use it in
+ remove_const
+
+ * vm.c, insns.def, yarvcore.h, yarvcore.c : add eval_push_cref(),
+ eval_pop_cref() and th_cref_init to manage current visibility
+
+ * yarv.h : add a prototype of rb_vm_change_state()
+
+ * yarvcore.h, insns.def : add defined_method_id and support
+ super in define_method scope
+
+ * yarvtest/test_class.rb : add tests for above
+
+
+2005-12-26(Mon) 20:44:38 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_basicinstructions.rb: new file.
+
+
+2005-12-26(Mon) 08:40:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c (eval_get_ev_const) : fix to skip nil
+
+
+2005-12-26(Mon) 08:27:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insnhelper.h : fix GET_CVAR_EV_KLASS [yarv-dev:703]
+
+
+2005-12-26(Mon) 07:51:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : add emptstack insn for all NODE_RETURN
+ and optimize it if it's not needed
+
+ * yarvtest/test_flow.rb : add a test for above
+
+
+2005-12-26(Mon) 07:08:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, gc.c : add "gc_debug_flag" to debug gc
+
+ * insns.def : add emptstack
+
+ * compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl :
+ change interface of insn_stack_increase
+
+ * compile.c : fix return from ensure in method [yarv-dev:702]
+
+ * yarvtest/test_flow.rb : add tests for above
+
+
+2005-12-26(Mon) 02:15:02 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_alias.rb: do not use unimplemented defined?.
+
+
+2005-12-26(Mon) 02:00:11 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * test/runner.rb: new file.
+
+ * test/ruby/test_alias.rb: new file.
+
+ * test/ruby/test_clone.rb: new file.
+
+ * test/ruby/test_eval.rb: new file.
+
+ * test/ruby/test_iterator.rb: new file.
+
+ * test/ruby/test_lambda.rb: new file.
+
+ * test/ruby/test_proc.rb: new file.
+
+ * test/ruby/test_super.rb: new file.
+
+ * test/ruby/test_assignment.rb: new file.
+
+ * test/ruby/test_bignum.rb: new file.
+
+ * test/ruby/test_call.rb: new file.
+
+ * test/ruby/test_case.rb: new file.
+
+ * test/ruby/test_condition.rb: new file.
+
+ * test/ruby/test_const.rb: new file.
+
+ * test/ruby/test_defined.rb: new file.
+
+ * test/ruby/test_exception.rb: new file.
+
+ * test/ruby/test_gc.rb: new file.
+
+ * test/ruby/test_ifunless.rb: new file.
+
+ * test/ruby/test_method.rb: new file.
+
+ * test/ruby/test_trace.rb: new file.
+
+ * test/ruby/test_variable.rb: new file.
+
+ * test/ruby/test_whileuntil.rb: new file.
+
+
+2005-12-25(Sun) 07:40:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * blockinlining.c, compile.c : fix block inlining
+
+ * rb/insns2vm.rb : fix to support tracing stack depth
+ with operands unification
+
+ * vm_dump.c : fix to print Qundef on stack dump
+
+
+2005-12-25(Sun) 01:45:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl :
+ trace stack depth at compile time
+ and use it as cont_sp for exception handling
+
+ * yarvtest/test_exception.rb : add tests for above
+
+ * yarvtest/test_flow.rb : ditto
+
+ * Merry Xmas :)
+
+
+2005-12-24(Sat) 19:34:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, compile.h : fix ADD_CATCH_ENTRY and add LABEL#sp
+
+ * eval_jump.h : fix catch to remove illegal error
+
+
+2005-12-24(Sat) 09:05:23 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_method.h : change data structure for RClass#m_tbl
+
+ * class.c, eval.c, eval_proc.c : fix for above changes
+
+ * node.h, gc.c : change NODE_FBODY, NODE_METHOD members
+ for above changes
+
+ * insns.def : support private/protected visibility
+
+ * vm_macro.def : ditto
+
+ * vm.c : ditto
+
+ * thread.c : fix typo
+
+ * thread_pthread.h : fix typo
+
+ * thread_win32.h : fix typo
+
+ * eval.c, yarvcore.h : add yarv_thread_t#method_missing_reason
+ to pass method_missing reason and use it to build error message
+
+ * compile.c : use ADD_CALL instead of ADD_SEND for
+ NODE_X(D)STR, NODE_CONST (func)
+
+
+2005-12-22(Thu) 02:45:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarv_version.h, Changes : 0.3.3
+
+
+2005-12-20(Tue) 04:04:45 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix self::Const access
+
+ * yarvtest/test_bin.rb : add a test for above
+
+
+2005-12-20(Tue) 01:52:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix to expand VALUES value
+
+ * yarvtest/test_massign.rb : add a test for above
+
+
+2005-12-20(Tue) 01:32:35 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, insnhelper.h : fix cvar in singleton method/class
+
+ * yarvtest/test_bin.rb : add tests for above
+
+
+2005-12-20(Tue) 01:03:34 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, yarvcore.h : support all defined?() syntax
+
+ * compile.c : fix NODE_COLON2
+
+ * yarvtest/test_bin.rb : add or fix tests for above
+
+ * win32/* : update all
+
+
+2005-12-17(Sat) 10:46:08 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * vm_macro.def: fix printf type mismatch for LP64 system (again).
+
+ * parse.y: introduce descriptive macro for special values of
+ lvtbl->dvars.
+
+
+2005-12-17(Sat) 09:39:27 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * vm_macro.def (macro_eval_invoke_method): fix printf type mismatch
+ for LP64 system.
+
+
+2005-12-14(Wed) 03:49:40 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : change rescue/ensure iseq name
+
+ * eval.c, intern.h : fix a prototype
+
+ * insns.def, yarvcore.h : add trace_function
+
+ * vm.c : fix deadly bug (illegal pointer cast)
+
+ * vm_dump.c : remove unused local variables
+
+ * vm_macro.def : add parameter size check
+
+ * yarvtest/test_bin.rb : comment out 2 assertions
+
+
+2005-12-13(Tue) 03:55:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_proc.c : fix indent
+
+ * insns.def : fix getspecial instruction to return nil
+ if no entry
+
+ * yarvtest/test_syntax.rb : add a test for above
+
+ * lib/un.rb : added
+
+ * template/*.tmpl : fix typo
+
+
+2005-12-13(Mon) 01:38:17 +0900 Minero Aoki <aamine@loveruby.net>
+
+ * yarv.h: add prototypes.
+
+ * intern.h: ditto.
+
+ * eval.c: ditto.
+
+ * debug.c: ditto.
+
+ * thread_pthread.h: fix printf type mismatch for LP64 system
+ (Linux/AMD64).
+
+ * variable.c: ditto.
+
+ * object.c: ditto.
+
+ * gc.c: ditto.
+
+ * process.c: ditto.
+
+ * error.c: ditto.
+
+ * vm.c: ditto.
+
+ * vm.h: ditto.
+
+ * vm_dump.c: ditto.
+
+ * disasm.c: ditto.
+
+ * marshal.c: ditto.
+
+ * eval_thread.c: ditto.
+
+
+2005-12-11(Sun) 22:00:34 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : call "inherited" method when a class is inherited
+
+ * yarvcore.h : fix yarv_iseq_t field layout
+
+ * common.mk : add dependence on yarvcore.h to eval*.o files
+
+ * compile.c : fix NODE_POSTEXE logic
+
+ * insnhelper.h : use GC_GUARDED_PTR_REF instead of magic number
+
+ * eval_proc.c : fix indent
+
+ * configure : re-autoconf
+
+
+2005-12-10(Sat) 03:57:20 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : fix blockinlining.o build rule
+
+ * insns.def : remove logic for zsuper
+
+ * template/optinsn.inc.tmpl :
+
+ * vm.c : remove thread_yield_light_prepare, thread_yield_light_invoke
+
+ * compile.c : support NODE_ZSUPER with optargs, restarg
+
+ * yarvtest/test_class.rb : add tests for above
+
+
+2005-12-09(Fri) 01:13:37 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c, numeric.c, range.c : add prototype of
+ block inlining function
+
+ * blockinlining.c, vm_opts.h.base : add block inlining flag
+
+ * common.mk, debug.h, debug.c : add debug_breakpoint() for gdb
+
+ * compile.c : fix to use size_t on compile_data_alloc(),
+ fix illegal cast, fix to set arg_simple at compiling block,
+
+ * compile.c, vm.c : fix NODE_NEXT, NODE_BREAK logic
+
+ * yarvtest/test_flow.rb : add a test for above
+
+ * yarvcore.c, yarvcore.h, compile.c, eval.c : remove
+ yarv_iseq_t#root_iseq and add yarv_iseq_t#local_iseq and fix
+ to use this member field
+
+ * eval_method.h : fix indent
+
+ * gc.c : fix indent
+
+ * insns.def, compile.c : remove "zsuper" instruction (use "super"
+ instead). This is because NODE_ZSUPER represent with only "super"
+ instruction
+
+ * yarvcore.c : add proc_arity
+
+
+2005-12-05(Mon) 03:58:30 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * array.c, blockinlining.c : support block inlining for Array#each
+
+ * disasm.c : fix catch table format
+
+ * insns.def : fix stack consistency error message
+
+ * vm.c : fix to skip pushing value at "next"
+
+ * yarvcore.h : move definision of
+ "struct iseq_compile_data_ensure_node_stack" to compile.c
+
+ * compile.c : fix ensure catch table creation
+
+ * yarvtest/test_flow.rb : add tests for above
+
+
+2005-12-03(Sat) 22:27:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * blockinlining.c, compile.c, yarvcore.c, yarvcore.h,
+ numeric.c, range.c : collect block inlining logic to blockinlining.c
+
+
+2005-12-03(Sat) 20:24:07 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * blockinlining.c, common.mk : add blockinlining.c
+
+ * yarvcore.c, yarvcore.h, blockinlining.c, compile.c, compile.h,
+ gc.c, node.h, numeric.c, range.c :
+ support block inlining for Integer#times, Range#each
+
+ * compile.c : fix to set block redo/next point at last,
+ and fix NODE_OP_ASGN1
+
+ * compile.c, vm.c : add specialized instruction "opt_le"
+
+ * disasm.c : fix to show block, and to show catch type as string
+ and change node_name logic
+
+ * eval_thread.c : fix function type declaration
+
+ * insns.def : add instruction "putundef", "opt_checkenv"
+ to support block inlining and add stack check routine
+
+ * lib/cgi.rb : add global variable $CGI_DONTINPUT
+
+ * opt_operand.def : add some operand unification rules
+
+ * rb/insns2vm.rb : fix operand unification logic for BLOCKISEQ
+
+ * vm.c : fix exception handling routine (collect stack operations)
+
+ * vm_macro.def : fix macro_eval_invoke_bmethod
+
+ * yarvsubst.c : removed
+
+ * yarvtest/test_syn.rb : rename to yarvtest/test_syntax.rb
+
+ * yarvtest/yarvtest.rb : remove tempfile explicitly
+
+
+2005-11-30(Wed) 01:13:57 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add vm_opts.h rule
+
+ * vm.c, insns.def : fix proc creation under class and block
+ environment
+
+
+2005-11-29(Tue) 16:39:07 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, eval_proc.c, vm.c, vm_macro.def :
+ support define_method and invoke NODE_BMETHOD method
+
+
+2005-11-29(Tue) 13:18:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : add iseq_add_mark_object, iseq_add_mark_object_compile_time
+ and use it to mark objects on iseq
+
+ * compile.h, compile.c : remove cast on NEW_CHILD_ISEQVAL, NEW_ISEQVAL
+ and interface
+
+ * compile.c, disasm.c, insns.def, vm_macro.def, rb/insns2vm.rb :
+ add BLOCKISEQ parameter type
+
+ * gc.c : fix garbage_collect to return true if only allocate memory
+
+ * vm.c : fix insertion order of proc/env
+
+ * vm_evalbody.h : add typedef yarv_iseq_t *BLOCKISEQ
+
+ * yarvcore.c, yarvcore.c : add idTimes
+
+ * yarvcore.c : fix proc_mark, env_mark around iseq mark
+
+
+2005-11-28(Mon) 09:02:57 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def, vm_evalbody.h : support super
+ with splat argument and block (and zsuper with block)
+
+ * yarvtest/test_class.rb : add tests for above
+
+ * compile.c, yarvcore.h, yarvcore.c, insns.def, time.c, string.c :
+ add opt_succ insn
+
+ * eval_method.h : fix indent
+
+ * eval_thread.c : apply cast to vanish a warning
+
+ * lib/tempfile.rb, lib/tmpdir.rb : added
+
+ * vm.c : eval_method_missing added
+
+ * vm_macro.def : refactoring
+
+
+2005-11-21(Mon) 21:21:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, compile.h, yarvcore.c : remove "iseqobj"
+ variables and rename to "iseq"
+
+
+2005-11-21(Mon) 07:31:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix block parameter error
+
+ * ext/* : added
+
+ * lib/optparse* : added
+
+ * benchmark/bm_so_sieve.rb : fix parameter
+
+
+
+2005-11-21(Mon) 03:47:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : optimize condition in literal
+
+ * thread_win32.h : fix win32 thread function prototype
+
+
+2005-11-20(Sun) 17:58:24 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix NODE_AND/OR bug
+
+ * eval.c : support rb_frame_this_func()
+
+
+2005-11-20(Sun) 12:32:31 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, yarvcore.c, yarvcore.h : support NODE_OPT_N
+
+ * compile.h : add macro ADD_CALL
+
+ * debug.c : add debug_v() and change to use only printf
+ on debug_id()
+
+ * sample/test.rb :
+
+ * vm.c : fix make_proc_from_block
+
+
+2005-11-19(Sat) 14:55:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * import ruby 1.9.0 (2005-11-18)
+
+
+2005-11-19(Sat) 06:08:37 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/test : added
+
+
+2005-11-19(Sat) 05:48:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : useless jump elimination (if/unless destination)
+
+ * eval.c : rb_iter_break support,
+ fix rb_iterate (clear errinfo if break)
+
+ * eval_proc.c : support rb_node_arity (YARV_METHOD_NODE)
+
+ * insns.def : change variable name
+
+ * vm.c : fix th_invoke_yield and add th_iter_break()
+
+ * vm_dump.c : fix yarv_bug()
+
+ * yarvcore.c : fix proc_mark to check IFUNC node and add
+ global ruby method SDR() for debug
+
+ * yarvtest/test_syn.rb : add a test for all condition combination
+
+
+2005-11-15(Tue) 05:52:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/forwardable.rb : added
+
+ * common.mk : remove "vm.o : CFLAGS += -fno-crossjumping" rule
+
+ * compile.c, yarvcore.h, insns.def : add FCALL/VCALL flag
+
+ * compile.c, insns.def : add onceinlinecache instruction
+
+ * eval.c : support $!, $@, raise (== raise $!)
+
+ * opt_operand.def : add some unification rule (send flags)
+
+ * vm.c : fix return process
+
+ * vm_macro.def : fix option prameters
+
+ * yarvtest/test_method.rb : add tests for above
+
+
+2005-11-15(Tue) 00:42:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : support rb_frame_pop() and rb_frame_callee(),
+ add rb_sourcefile(), rb_souceline(),
+
+
+ * compile.c : support postposition while/until,
+ fix block parameter index
+
+ * yarvtest/test_syn.rb : add tests for above
+
+ * yarvcore.c : fix env_mark
+
+ * vm.h, yarvcore.h : move vm.h#cmethod_info to
+ yarvcore.h#yarv_cmethod_info
+
+ * vm.c : add th_get_sourceline()
+
+ * eval_intern.h : fix PASS_PASSED_BLOCK()
+
+ * eval_load.c : fix re-enter require (temporalily)
+
+ * insns.def : permit re-open class when superclass is same
+
+
+2005-11-11(Fri) 01:20:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : add "allload" rule
+
+ * compile.c, yarvcore.h, insns.def, vm_macro.def, disasm.c :
+ change arg_rest, arg_block offset (1)
+
+ * insns.def : add postexe instruction
+
+ * insns.def, vm.c : support rest block parameter
+
+ * yarvtest/test_block.rb : add tests for above
+
+ * rb/allload.rb : get path from ARGV
+
+ * vm_opts.h.base : set default off
+
+
+2005-11-01(Tue) 08:28:19 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/other-lang/eval.rb : fix path
+
+ * lib/English.rb, lib/cgi.rb, lib/complex.rb, lib/delegate.rb :
+ added
+
+
+2005-11-01(Tue) 08:18:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : push and pop values after checkincludearray for
+ stack caching
+
+
+2005-10-31(Mon) 15:37:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bm_app_mandelbrot.rb : added
+
+ * benchmark/bm_app_factorial.rb : fixed parameter
+
+ * benchmark/bm_so_count_words.rb, benchmark/run_rite.rb : use
+ real file
+
+ * common.mk : add "ext" rule, add some dependencies and add option
+ to bench-each rule (renamed from bench-item)
+
+ * compile.c : fix get_root_iseq_object (check iseq type),
+ support splat case/when. support //o (regexp)
+
+ * eval.c : support *_eval, fix rb_obj_call_init to pass block
+
+ * eval_jump.h : support throw/catch
+
+ * eval_load.c : save klass_nest_stack when require
+
+ * eval_method.h : fix ruby_cbase()
+
+ * insnhelper.h : GET_EV_KLASS checks toplevel or not
+
+ * insns.def, yarvcore.c : fix singleton method definition and fix
+ super class's method
+
+ * lib/shellwords.rb : use String() instead of String.new()
+
+ * vm.c : check class iseq or not when making Proc and
+ add eval_search_super_klass function
+
+ * vm.h : CMETHOD_INFO_P to yarvcore.h
+
+ * vm_macro.def : splat if object type is T_ARRAY
+
+ * vm_opts.h, vm_opts.h.base : rename to vm_opts.h.base
+ insns2vm.rb will copy it to build directory
+
+ * yarvcore.c : add Proc#[]
+
+ * yarvcore.h : change INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE
+ to 512
+
+ * yarvtest/test_* : invalidate splat non array code (like: "*1")
+
+ * yarvtest/yarvtest.rb : use tempfile instead of popen
+
+
+2005-10-28(Fri) 09:11:53 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvtest/test_method.rb : fix test
+
+
+2005-10-28(Fri) 08:43:29 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run_rite.rb : add -I options to run benchmark
+
+ * common.mk : pass options to some rules with RUNOPT
+ and add -I options
+
+ * compile.c : fix massign with constant
+
+ * yarvtest/test_massign.rb : add tests for above
+
+ * eval_load.c : fix load_wait()
+
+ * eval_method.h : support ruby_cbase()
+
+ * lib/*.rb : add or modify libraries to run on yarv
+ * parse.y : change to ANSI C style
+
+ * vm.c : fix making proc process under cfunc/ifunc environment
+
+ * vm_macro.def : fix block pass
+
+ * yarvtest/test_method.rb : add tests for above
+
+ * yarvcore.c : add yarv_obj_is_proc()
+
+ * eval.c : fix rb_obj_is_proc to use yarv_obj_is_proc()
+
+
+2005-10-27(Thu) 11:50:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * some files : import from ruby 1.9.0 (2005-10-12)
+
+
+2005-10-16(Sun) 14:50:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, compile.c, yarvcore.h, yarvcore.c : add insns "bitblt" and "answer"
+
+
+2005-10-11(Tue) 17:01:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarv_version.h, Changes : 0.3.2
+
+
+2005-10-11(Tue) 13:35:25 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : add YARV_CHECK_INTS()
+
+ * thread.c, thread_pthread.h, thread_win32.h : kick timer thread
+ when another thread kicked
+
+ * vm.c : remove debug print
+
+ * vm_opts.h : add OPT_CALL_THREADED_CODE
+
+ * yarvtest/yarvtest.rb : remove "\r" from answer
+
+
+2005-10-07(Fri) 09:36:36 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : add member variable "interrupt_flag" to yarv_thread_t
+
+
+2005-10-05(Wed) 21:20:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eva.c, eval_thread.c, ruby.h, eval_error.h, eval_jump.h,
+ eval_load.c, thread.c, error.c, compile.h : remove ruby_errinfo
+
+ * thread_win32.h, thread_pthread.h : set stack size to 4KB
+
+ * vm.c : fix making env routine
+
+ * vm_dump.c, vm.h : support frame type "EVAL" and fix magic number
+
+ * yarvcore.c : fix some mark/free routine
+
+
+2005-10-05(Wed) 09:08:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, eval_intern.h, vm.c, eval_jump.h, yarvcore.h :
+ re-define PUSH/POP/EXEC/JUMP_TAG to use thread local tag
+
+ * inits.c, yarvcore.c : fix boostrap
+
+
+2005-10-03(Mon) 22:28:24 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix NODE_COLON2 bugs
+
+ * compile.h : fix debug routine
+
+ * disasm.c : add space between insn and operand
+
+ * insns.def : add comment of classdef, singletonclassdef
+
+ * vm.c, yarv.h : fix invoke_light routine
+
+ * yarvcore.c : fix to mark each threads
+
+
+2005-10-02(Sun) 05:55:34 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread_pthread.h : add "system_working" global variable
+
+
+2005-10-02(Sun) 01:23:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c : add raw gets (for test), and fix indent
+
+
+2005-10-01(Sat) 23:06:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread_win32.h, common.mk : add thread_win32.h
+
+ * thread.c : support _WIN32 thread
+
+ * thread.c, thread_pthread.h : fix some interface
+
+ * eval_thread.c : remove debug print
+
+ * gc.c : fix stack region
+
+ * win32/Makefile.sub : add -MD flag to LDFLAGS
+
+ * yarvcore.c : fix mark and sweep debug print
+
+ * yarvcore.h : fix VM#living_threads data type to st_table
+
+
+2005-10-01(Sat) 00:25:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c, yarvcore.h : rename GIL (Global Interpreter Lock) to
+ GVL (Global VM Lock)
+
+ * thread_pthread.h : fix pthread mutex initialize
+
+
+2005-09-30(Fri) 20:11:19 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c : support join with timeout
+
+ * yarvcore.h : use GET_VM()
+
+
+2005-09-30(Fri) 14:59:29 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c, common.mk : add thread.c
+
+ * thread.c, gc.c, eval_thread.c, yarvcore.c, yarvcore.h :
+ support native thread (on pthread)
+
+ * insns.def : add YARV_CHECK_INTS() check
+
+ * yarv.h : add GET_VM() macro
+
+
+2005-09-29(Thu) 22:43:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_intern.h, eval_thread.c : move thread_status to eval_intern.h
+
+ * yarvcore.c : fix thread/vm value
+
+ * yarvcore.h : add some parameter to yarv_thread_t
+
+
+2005-09-29(Thu) 01:52:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, yarvcore.h : add line number on last end instruction
+
+ * vm.c : fix line no detection
+
+
+2005-09-28(Wed) 00:02:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk, eval_load.c, eval.c, eval_intern.h : add eval_load.c
+
+ * disasm.c : fix around block local variables
+
+ * eval_proc.c : fix typo
+
+
+2005-09-27(Tue) 16:45:20 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : remove debug print
+
+
+2005-09-27(Tue) 16:41:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : support Kernel.local_variables
+
+ * parse.y, yarvcore.c : move some functions
+ (rb_(backref|lastline)_(get|set)) from parse.y to yarvcore.c
+
+ * yarvcore.h : fix typo of YARV_PREVIOUS_CONTROL_FRAME
+
+
+2005-09-26(Mon) 18:51:29 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, compile.c, parse.y, vm.c, yarvcore.h :
+ eval() works with binding (Env)
+
+ * vm.c : add th_set_eval_stack
+
+ * yarvtest/test_syn.rb : remove an assert "defined?(local_var)"
+
+
+2005-09-25(Sun) 19:30:59 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bm_vm2_send.rb : added
+
+ * common.mk : add rule "bench-item"
+
+ * eval_intern.h : add PASS_PASSED_BLOCK()
+
+ * eval_proc.c : support some functions
+
+ * rb/mklog.rb : added
+
+ * vm.c : fix prototype style and coding style
+
+ * yarv.h : add some prototypes of functions
+
+ * yarvcore.c, yarvcore.h, eval.c : yarv_thread_t#ifuncnode -> passed_block,
+ and add yarv_proc_t#safe_level
+
+
+2005-09-25(Sun) 11:01:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * some files : import from ruby 1.9.0 (2005-09-25)
+
+ * eval*, vm.c, vm_macro.def : remove frame, scope, ...
+
+ * yarvcore.c : remove yarv_block_given_p()
+
+ * yarvcore.h, insnhelper.h : move some macro from insnhelper.h to yarvcore.h
+ to use these in eval.c
+
+
+2005-09-24(Sat) 15:51:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval* : remove dependency to ruby_dyna_vars and ruby_class
+
+
+2005-09-23(Fri) 20:39:14 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval_*.[ch] : split eval.c to some files
+
+ * *.[ch] : import ruby 1.9.0 (2004-09-23)
+
+ * parse.y : remove dependency to ruby_dyna_vars and ruby_scope
+
+
+2005-09-15(Thu) 16:51:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, yarvcore.h : fix "for" scope
+
+ * yarvtest/test_block.rb : add tests for above
+
+
+2005-09-14(Wed) 06:11:43 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, vm_evalbody.h, vm.h, vm_dump.c,
+ compile.c, yarvcore.c : use #ifdef insted of #if for recognize
+ vm options
+
+ * vm_opts.h : fix default options
+
+
+2005-09-10(Sat) 14:10:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm_opts.h : added
+
+ * yarvcore.h, rb/insns2vm.h : use vm_opts.h
+
+
+2005-09-10(Sat) 04:53:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, insns.def, compile.c : add DEFINED_YIELD
+
+ * yarvtest/test_yield.rb : add test_1_ary_and_1_params
+
+ * insns.def : fix splat and svalue
+
+ * vm.c : fix to perform with proc with ifunc (incomplete)
+
+ * sample/test.rb : added (comment out unsupported features)
+
+ * common.mk : add rule "runtest"
+
+
+2005-09-09(Fri) 19:32:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, compile.c : add splatarray
+
+ * yarvtest/test_massign.rb : add tests for above
+
+
+2005-08-31(Wed) 22:55:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c (yarvcore_eval_parsed): fix to return value
+
+ * yarv_version.h, Changes : 0.3.1
+
+
+2005-08-20(Sat) 10:19:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/ir.rb : add some check
+
+ * import today's ruby HEAD
+
+
+2005-08-18(Thu) 23:29:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : fix object file extension
+
+ * rb/ir.rb : added (import ruby script)
+
+ * rb/diff.rb : removed
+
+ * import today's ruby HEAD
+
+
+2005-08-18(Thu) 12:59:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk : rule test -> test2, test1 -> test
+
+ * compile.c : fix when clause bug and splat arugment
+
+
+2005-08-17(Wed) 05:22:31 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix block local parameter setting routine and support
+ massign in block parameter initialze
+
+ * yarvtest/test_yield.rb : add tests for above
+
+ * insns.def, compile.c : support array concat (ex: "[x, *y]")
+
+ * yarvtest/test_bin.rb : add tests for above
+
+
+2005-08-16(Tue) 19:51:19 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support nested massign
+
+ * yarvtest/test_massign.rb : add tests for above
+
+
+2005-08-16(Tue) 10:25:29 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : support rb_yield_0 with 0 args
+
+
+2005-08-16(Tue) 09:09:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * lib/fileutils.rb : imported
+
+ * insns.def : fix yield argument (same as last commit)
+
+ * yarvtest/test_yield.rb : add tests for above
+
+
+2005-08-16(Tue) 08:29:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : fix to support rb_yield_0 with multiple values
+
+ * common.mk : add parse, run1p ruelse
+
+ * compile.c : support yield with ARGSCAT/SPLAT
+
+ * vm.c, insns.def : fix yield arguments to do compatible behaviour
+
+ * yarvtest/test_yield.rb : added for above
+
+
+2005-08-16(Tue) 06:00:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix to set klass_nest_stack on singleton
+ method definition
+
+ * yarvtest/test_method.rb : add a test for above
+
+
+2005-08-16(Tue) 05:34:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test1.rb : added. gdb and run1 rule run this script
+
+ * compile.c : fix error handled variable access
+
+ * yarvtest/test_exception.rb : add tests for above
+
+
+2005-08-16(Tue) 04:26:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * base ruby : ruby 1.9.0 (2005-08-15)
+
+
+2005-08-16(Tue) 03:54:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk, Makefile.in : move some rules to common.mk
+
+ * rb/diff.rb : added
+
+ * yarvtest/yarvtest.rb : fix to compare output last value
+
+
+2005-08-15(Mon) 18:27:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * Changes : 0.3.0
+
+
+2005-08-15(Mon) 17:56:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : fix to add prototype
+
+ * all files : propset svn:eol-style native
+
+
+2005-08-15(Mon) 10:48:53 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c : support rb_load
+
+
+2005-08-15(Mon) 09:42:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : define SDR()
+
+ * vm_dump.c : stack_dump_raw() -> vm_stack_dump_raw()
+
+ * yarvtest/yarvtest.rb : add rite test scheme
+
+ * benchmark/run_rite.rb : added
+
+ * yarvcore.c, inits.c : add Init_vm()
+
+ * yarv.h : add some prototype declarations, GET_THREAD()
+
+ * eval.c : remove unused functions
+
+ * eval.c : support Kernel.eval, some schemes (same as evalc.patch)
+
+
+2005-08-15(Mon) 00:53:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarv_version.h : move configurations to yarvcore.h
+
+ * yarvcore.c : remove VALUE yarv_get_current_running_thread() and
+ add yarv_thread_t *yarv_get_current_running_thread(), ...
+
+ * yarvcore.h : yarv_thread_t#vm -> vm_value
+
+ * compile.c : fix "break from nested classes"
+
+ * yarvext/extconf.rb : use have_func instead of defined?(YARV_PACHED)
+
+ * depend : fix pass
+
+ * eval.c : change to kick VM
+
+ * version.c : fix to show yarv version
+
+ * common.mk : fix dependent
+
+ * inits.c : fix to kick Init_yarvcore
+
+
+2005-08-14(Sun) 02:05:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * README : add description
+
+ * yarvext/depend : move to topdir/depend
+
+2005-08-14(Sun) 01:50:43 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * merge yarv to ruby (prepare)
+
+ * make yarvext/ to build as extension
+
+
+2005-08-13(Sat) 09:36:26 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * evalc.patch, insns.def, compile.c : fix to support current
+ ruby HEAD.
+
+ * 0.2.3
+
+
+2005-08-08(Mon) 19:13:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h, Changes : 0.2.2
+
+
+2005-08-08(Mon) 17:17:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.h, vm.c, insns.def, yarvcore.h, yarvcore.c :
+ remove yarv_iseq_t#iseq_dt and add yarv_iseq_t#encoded.
+ use yarv_iseq_t#encoded anytime
+
+ * vm_evalbody.h, vm.h, extconf.rb, version.h :
+ support call threaded code (incomplete)
+
+
+2005-08-01(Mon) 05:26:12 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : support yield with multiple values
+
+ * compile.c : fix dynavars
+
+ * yarvcore.h : fix to mark defined method
+
+
+2005-07-31(Sun) 23:27:24 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, vm.c, insns.def : fix search object path
+
+ * compile.c : fix "for" statement
+
+ * vm_macro.def : fix rest, opt arguments
+
+
+2005-07-31(Sun) 14:52:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm_macro.def : fix block parameter
+
+ * compile.c : fix to unuse compile_data->in_ensure
+
+ * insns.def : add orphan check when return
+
+
+2005-07-31(Sun) 03:25:05 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c, compile.c, yarvcore.h, insns.def :
+ support jump from rescue/ensure/class/module
+
+ * test/test_flow.rb : add tests for above fix
+
+
+2005-07-30(Sat) 04:44:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : struct iseq_compile_data_ensure_node_stack is added
+
+ * compile.c : insert ensure clause before break/next/redo
+
+ * vm.c : fix return/break handling
+
+ * yarv.h, vm.c : fix lightweight yield
+
+ * vm.c, insns.def, vm_macro.def : change arguments of th_set_env (add sp)
+
+ * test/test_flow.rb : added
+
+ * test/yarvtest.rb : add ae_flow
+
+ * compile.c, vm_macro.def : add tail-call/tail-recursion optimization
+ (experimental)
+
+
+2005-07-29(Fri) 20:14:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : make_name_for_block and make_name_with_str
+ are added
+
+ * insns.def : fix if unmatched size arg size to yield
+
+ * test/test_block.rb : add test for above fix
+
+ * vm.c : add th_backtrace_each and fix backtrace notation
+
+ * yarvcore.c : set top level iseq name to "<main>"
+
+
+2005-07-29(Fri) 13:20:19 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : fix yarv_iseq_t to pass VC (cl)
+
+ * vm_dump.c : ditto
+
+ * compile.h : ditto
+
+ * insnhelper.h : ditto
+
+ * vm_evalbody.h : include 'math.h'
+
+ * insns.def, vm.c : raise error when yield without block
+
+ * vm.c : implement thread_backtrace
+
+ * vm.c, yarvsubst.c, yarv.h : implement thread_yield_light_prepare and
+ thread_yield_light_invoke
+
+ * yarvcore.c : Integer#times uses yarv specific version
+
+
+2005-07-28(Thu) 21:35:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : add another mark function for thread/stack
+
+ * vm_evalbody.h : fix register allocation for x86_64
+
+ * vm.h : use asm for tc on x86_64
+
+
+2005-07-28(Thu) 20:17:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : add mark/free message to debug gc
+
+ * insnhelper.h, insns.def, vm_macro.def : remove and
+ add new RESTORE_REGS
+
+ * vm_evalbody.h : fix register allocation
+
+
+2005-07-28(Thu) 02:00:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c, etc : change VM stack structure. re-write all
+ vm functions to do it
+
+ * vm_macro.def : added
+
+
+2005-07-08(Fri) 01:36:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : don't use fmod on AMD64
+
+
+2005-07-08(Fri) 00:14:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * Changes : added
+
+
+2005-07-07(Thu) 23:54:37 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h : 0.3.0
+
+
+2005-07-07(Thu) 23:52:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * 0.2.1 : released
+
+
+2005-07-07(Thu) 23:50:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h : 0.2.1
+
+
+2005-07-07(Thu) 23:47:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb, extconf.rb : add --[enable|disable]-opt-unify-all-combination
+ and --disable-opts
+
+ * vm.h : DISPATCH_ARCH_DEPEND_WAY is only enabled on GCC 3.x
+
+
+2005-07-06(Wed) 13:20:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * depend, rb/eval.rb : add ITEMS option to benchmark rule
+
+ * benchmark/* : changed
+
+ * benchmark/other-lang/* : added
+
+
+2005-07-04(Mon) 04:02:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h. yarvcore.c : add idDIV, idMOD, idEq, idLength
+
+ * compile.c, insns.def : add specialized insn for above method id
+
+ * test/test_bin.rb : add tests for above
+
+
+2005-07-03(Sun) 20:31:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, yarvcore.h : remove cYarvThrowObject (unused)
+
+ * yarvcore.c, yarvcore.h, insns.def :
+ thread_object#stack_mark_poinetr
+
+ * depend, rb/eval.rb : BOPT, TOPT -> OPT
+
+
+2005-07-03(Sun) 13:53:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, compile.h : INSN_OBJECT, LABEL_OBJECT -> INSN, LABEL,
+ ISEQ_LINK_ELEMENT, ISEQ_LINK_ANCHOR -> LINK_ELEMENT, LINK_ANCHOR,
+ and some fixes
+
+ * tmpl/optinsn.inc.tmpl : ditto
+
+ * yarvcore.c, yarvcore.h : remove label_object, insn_object
+ prepare_iseq_build, cleanup_iseq_build are added
+
+ * insns.def : remove unused variable from send
+
+
+2005-07-02(Sat) 04:19:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : add GC protect for opt_aset
+
+
+2005-07-02(Sat) 03:49:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb : add option -fno-reorder-blocks to vm.asm rule
+
+ * insns.def : fix opt_aset bugs
+
+ * test/test_bin.rb : add tests for aset, aref
+
+
+2005-07-02(Sat) 03:05:12 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run.rb : fix output
+
+ * vm_evalbody.h : add register for x86_64
+
+ * rb/asm_parse.rb : fix to shor size and length
+
+
+2005-07-02(Sat) 02:56:31 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : move specialized instruction point (new_insn_send)
+
+ * insns.def : add opt_aref, opt_aset
+
+
+2005-07-01(Fri) 11:04:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.h : fix to pass VALUE type to new_insn_body
+
+ * insnhelper.h : add cast
+
+ * compile.c : fix getdynamic argument (0 == Qfalse -> I2F(0))
+
+
+2005-06-30(Thu) 23:34:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/eval.rb : add and fix some rules
+
+ * rb/insns2vm.rb : generate all
+
+ * benchmark/run.rb : add -r (ruby only) option
+
+
+2005-06-30(Thu) 23:25:23 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * tmpl/vmtc.inc.tmpl : add const prefix
+
+ * /rb/asm_parse.rb, extconf.rb : added and make assembler analised output
+
+ * opt_operand.def : add send operands unification
+
+ * insnhelper.h : add HEAP_CLASS_OF(obj)
+
+ * insns.def : fix opt_plus, opt_ltlt
+
+ * vm_evalbody.h : move _tag
+
+ * benchmark/run.rb : fix file select
+
+
+2005-06-30(Thu) 06:07:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb : add collect-usage-analysis option
+
+ * opt_operand.def, opt_insn_unif.def : add some rules
+
+
+2005-06-29(Wed) 23:28:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, extconf.rb, vm.h, compile.c :
+ DISPATCH_DIRECT_THREADED_CODE, DISPATCH_THREADED_CODE
+ -> OPT_DIRECT_THREADED_CODE, OPT_INDIRECT_THREADED_CODE.
+ if at least one of then is defined, OPT_THREADED_CODE is defined
+
+ * benchmark/* : fix name and parameters
+
+ * rb/eval.rb : added for YARV evaluation
+
+
+2005-06-29(Wed) 16:16:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run.rb : fix output format
+
+ * call_cfunc.inc -> call_cfunc.h
+
+ * vm.h : add sign by asm statement
+
+
+2005-06-28(Tue) 22:28:40 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : fix method search
+
+
+2005-06-28(Tue) 22:26:34 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb : fix options
+
+
+2005-06-28(Tue) 21:50:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run.rb : fix output format
+
+
+2005-06-28(Tue) 21:34:54 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * depend : add option TOPT to test rules
+
+ * benchmark/run.rb : fix output format
+
+
+2005-06-28(Tue) 21:15:54 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix opt_case_dispatch instruction
+
+ * benchmark/run.rb : output all usertimes when exit benchmark
+
+
+2005-06-28(Tue) 20:35:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb, compile.c, tmpl/optinsn.inc.tmpl, vm.c :
+ change extconf options
+
+2005-06-28(Tue) 13:20:59 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run.rb : add -y, --yarv-only option
+
+ * depend : add BOPT to tbench rule
+
+
+2005-06-27(Mon) 23:31:12 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * depend : add gdb rule
+
+ * vm.h : use inline assembler for x86 (to support gcc 3.4.x)
+
+
+2005-06-27(Mon) 20:04:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, compile.c, disasm.c : remove unused variables
+
+ * vm.h, insnhelper.h, debug.h : fix to reduce warning
+
+ * vm.c, vm_dump.c : move VM state dump (debug) functions to vm_dump.c
+
+ * depend : adde reconf rule
+
+ * insnhelper.h :
+
+ * vm_evalbody.inc : rename to vm_evalbody.h
+
+
+2005-06-27(Mon) 16:50:31 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns2vm.rb : fix generating unif insn
+
+ * compile.c : add useless pop/swap insn elimination with stack caching
+
+ * depend : remove compiled.o dependency
+
+
+2005-06-26(Sun) 14:06:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run.rb : use tmpfile instead of popen
+
+ * rb/insns2vm.rb : fix generating insn unification logic
+
+ * opt_insn_unif.def : add some unification rules
+
+ * compile.c : add verify_list function and fix unification logic
+
+
+2005-06-22(Wed) 12:58:26 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, yarvcore.c, insns.def, compile.c : add mult optimization
+
+ * test/test_bin.rb : add test_fact
+
+
+2005-06-21(Tue) 22:34:07 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, compile.[ch], tmpl/optinsn.inc.tmpl, rb/insns2vm.rb :
+ change data structure (don't use Ruby's array to represent a
+ instruction sequence)
+
+ * disasm.c : add separator
+
+
+2005-06-14(Tue) 07:48:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support "for" statement
+
+ * test/test_block.rb : add test for above
+
+ * yarvcore.[ch] : add global id idEach
+
+
+2005-06-08(Wed) 22:30:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : add if/unless(L1) jump (L2) :L1 => unless/if(L2)
+ optimize (condition reversal) and fix typo
+
+
+2005-06-07(Tue) 08:29:41 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : fix to remove compiler warning
+
+ * version.h : 0.2.1
+
+
+2005-06-07(Tue) 08:16:22 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : iseq_link_element changed to double linked list
+
+ * disasm.c : support dump struct iseq_link_element
+
+ * compile.c : use double linked list instead of array
+ for intermediate representation
+
+
+2005-06-06(Mon) 15:38:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, yarvcore.c : add link structure to insn and label object
+
+ * compile.h, compile.c : remove some variables in function top scope
+ of iseq_compile_each and some optimization (now working)
+
+
+2005-06-04(Sat) 16:12:59 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix previous commit
+
+
+2005-06-04(Sat) 15:56:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix stack caching (after jump state)
+
+
+2005-06-04(Sat) 09:12:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix some point for previous commit
+
+
+2005-06-04(Sat) 07:31:21 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : optimize case/when statement
+ (dispatch on constant time)
+
+ * yarvcore.h, disasm.c, rb/insns2vm.rb : fixed for above
+ (CDHASH)
+
+ * test/test_syn.rb : add test for above
+
+
+2005-06-04(Sat) 03:41:29 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, yarvcore.c : add some temporary variable test
+ (it'll be vanished)
+
+ * compile.c : NODE_CASE optimize (use topn instead of dup/swap)
+
+
+2005-06-03(Fri) 00:54:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : apply flow optimization for while/until statement
+
+
+2005-03-04(Fri) 19:34:32 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb : fix category (comment)
+
+ * depend : remove space betweeen target name and colon
+
+
+2005-03-04(Fri) 15:55:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * tmpl/yarvarch.ja : fix typo
+
+
+2005-03-04(Fri) 13:30:19 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * depend : add a rule for jitcompile.o
+
+ * vm.h : fix a macro argument
+
+ * version.h : 0.2.0
+
+
+2005-03-03(Thu) 08:35:14 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb : remove vm_evalbody.inc call_cfunc.inc from clean target
+
+
+2005-03-03(Thu) 00:54:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * tmpl/insns.inc.tmpl : fixed typo
+
+ * insns.def : store th->pc to current pc
+
+
+2005-03-03(Thu) 00:31:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * tmpl/yarvarch.ja, doc/yarv.rb : write current architecture of yarv
+
+
+2005-03-01(Tue) 13:50:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c (yarvcore_eval_parsed) : added
+ (separeted from yarvcore_eval)
+
+ * yarvcore.c, compile.c : iseq_translate_direct_threaded_code
+ is moved to compile.c
+
+ * depend : add rule for yasmdata.rb
+
+ * rb/yasm.rb : support top-level and method-level assemble
+
+
+2005-02-26(Sat) 08:09:57 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb, compile.c, vm.h : change type long to OFFSET
+
+ * tmpl/yasmdata.rb.tmpl : added
+
+ * rb/insns2vm.rb : add yasmdata_rb method
+
+ * rb/yasm.rb : fix some interface (incomplete)
+
+ * compile.c : iseq_setup added
+
+ * yarvcore.c : YARVCore::InstructionSequence::Instruction#make added
+
+
+2005-02-24(Thu) 07:45:37 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/yasm.rb : added
+
+
+2005-02-24(Thu) 01:13:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : remove useless statements
+
+
+2005-02-24(Thu) 00:46:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb (InsnInfo) : add @is_sc attr and remove
+ is_sc method
+
+ * compile.c : fix NODE_CASE/NODE_WHEN bug (cond at 'when'
+ must not be popped)
+
+ * compile.c : support NODE_OP_ASGN1 to &&= and ||=
+
+ * test/test_bin.rb : add tests for above
+
+
+2005-02-23(Wed) 09:17:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c, yarvcore.c : thread_svar added and fix svar location
+
+
+2005-02-21(Mon) 08:38:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h : make type "struct iseq_compile_data"
+
+ * yarvcore.h : iseq_object#insn_info_ary to iseq_object#insn_info_tbl
+
+
+2005-02-21(Mon) 05:24:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c (compile_string) : remove null check of node
+
+
+2005-02-19(Sat) 03:52:45 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h : 0.1.1
+
+
+2005-02-18(Fri) 20:57:18 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, yarvcore.c : add idLTLT, idMethodMissing
+
+ * compile.c : suopport lval (or others) block parameter
+
+ * test/test_block.rb : add tests for above
+
+ * insns.def (send) : support method_missing
+
+ * test/test_method.rb : add tests for above
+
+ * insns.def : opt_ltlt and
+
+
+2005-02-18(Fri) 08:54:40 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/runc.rb : added
+
+ * benchmark/contrib/pentomino.rb : added opt_ltlt
+ and Float, String plus specialization
+
+
+2005-02-18(Fri) 07:49:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : remove debug print
+
+ * rb/aotcompile.rb : skip if yarvcore.so is not created
+
+
+2005-02-18(Fri) 06:46:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix block passing
+ and block argument
+
+
+2005-02-18(Fri) 05:52:41 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : thread_get_ev_const, thread_get_ev_defined is added
+ (separated from insns.def)
+
+ * insnhelper.h : GET_EV_KLASS(klass) is added
+ (separated from insns.def)
+
+ * yarvcore.h, insns.def, compile.c : support defined? expression (limited)
+
+ * test/test_syn.rb : tests for above is added
+
+ * compile.c, insns.def : support block passed method dispatch
+
+ * test/test_method.rb : tests for above is added
+
+ * compile.h : CALL_ARGS_SPLAT is removed
+
+
+2005-02-16(Wed) 13:32:37 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * disasm.c : fix ID to String method
+
+ * compile.c : NODE_SUPER, NODE_ZSUPER check 'poped'
+ and NODE_RETURN check outer type
+ and NODE_DREGX_ONCE supported (temporarily)
+
+ * test/test_syn.rb : add a test
+
+ * test/test_jump.rb : add a test
+
+
+2005-02-16(Wed) 06:07:41 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.[hc] : use Symbol instead of Fixnum to represent ID
+
+ * rb/insns2vm.rb : add attr_reader :insns, :insn_map
+
+ * vm.h, rb/insns2vm.rb : END_INSN have one arg
+
+ * jitcompile.c : jit compiler framework (experimental)
+
+ * rb/aotcompile.rb : refactoring
+
+ * compiled.c : add constant pool
+
+ * vm_evalbody.inc, call_cfunc.inc, vm.c : separeted from vm.c
+
+ * insns.def : fix return val
+
+ * depend : add rules for compiled.o
+
+
+2005-02-14(Mon) 13:09:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insnhelper.h, yarvcore.h: move YARV_METHOD_NODE to yarvcore.h
+
+ * yarvcore.h : add 2 members jit_compiled and iseq_orig
+ to struct iseq_object
+
+ * yarvcore.c : add yarv_jitcompile and global function jitcompile
+
+ * insns.def : insn opt_call_native_compiled added
+
+ * jitcompile.c : added
+
+
+2005-02-12(Sat) 05:38:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def (putstring) : fixed to duplicate string object
+
+ * rb/insns2vm.rb, tmpl/optunifs.inc.tmpl, compile.c : support
+ instructions unification (aka super instruction)
+
+ * opt_insn_unif.def : added for above
+
+ * benchmark/bm_unif1.rb : added to measure efficiency of unification
+
+ * depend : fixed for above
+
+ * extconf.rb : add option --(enable|disalbe)-opt-insns-unification
+
+
+2005-02-11(Fri) 12:14:39 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, vm.c, insns.def : permit to access svar from
+ cfunc environment
+
+ * test/test_method.rb : add tests for above
+
+
+2005-02-09(Wed) 19:31:06 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * ite.rb : added (ruby -rite [script file])
+
+
+2005-02-09(Wed) 02:25:43 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.[hc] : add member compile_data (hash) to iseq_object
+
+ * compile.c, yarvcore.h : check label is already set
+
+ * compile.c, extconf.rb : support __goto__ and __label__ statement
+
+
+2005-01-25(Tue) 12:49:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_block.rb : add break test to test_times
+
+
+2005-01-25(Tue) 03:34:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb : check ruby version if yarv patch is applied or not
+
+ * evalc.patch : fixed for rb_call_super and above check
+
+
+2005-01-25(Tue) 03:21:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb : refactoring (mainly, make InsnsDef::InsnInfo
+ to represent each instruction information)
+
+ * depend, rb/makedocs.rb : fixed for above
+
+ * yarvcore.c (thread_call_super) : added
+
+ * vm.c (thread_call_super) : added
+
+ * vm.h : add struct cmethod_info
+
+ * insns.def, vm.c : use cmethod_info to represent C method info
+
+ * insns.def : use iseq_object#klass_nest_stack
+ to search super/zsuper's class
+
+ * prosym.rb : removed
+
+ * ToDo : write todo things on wiki
+
+
+
+2005-01-18(Tue) 23:44:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run.rb : check ENV['RUBY'] to use ruby binary
+
+
+2005-01-10(Mon) 08:44:40 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h : 0.1.0
+
+
+2005-01-09(Sun) 22:01:29 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * repository : svn propset svn:eol-style native *.c *.h tmpl/*.tmpl
+
+
+2005-01-09(Sun) 21:48:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : FREE_UNLESS_NULL, MARK_UNLESS_NULL macros are added
+
+ * yarvcore.c : some insn/label methods are added
+
+ * yarvcore.h : add structure menber "insns_ary" to iseq_object
+
+ * vm.c, insns.def (thread_eval_body) : return values with throw
+
+ * prosym.rb : added
+
+ * insns.def : add YARV_AOT_COMPILED and some procedure
+
+ * depend : add compiled.c
+
+ * compiled.c : added to build compiled Ruby program (C source)
+ by AOT compiler
+
+ * rb/aotcompile.rb : AOT compiler
+
+ * aotct.rb, rb/aotctest.rb : test and benchmark AOT compiler
+
+ * rb/allload.rb : added
+
+
+2005-01-09(Sun) 08:30:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c (yarv_yield_values) : added
+
+ * vm.c (thread_call0) : change interface. substitute rb_call0 in
+ yarv environment
+
+ * yarvcore.c (yarv_call0) : fix for above
+
+ * yarvcore.c (yarv_call0_cfunc) : removed
+
+ * yarvcore.c : change passing items for yarv_setup
+
+ * evalc.patch : fix for above
+
+ * benchmark/bm_lists.rb : fix (unsupport block passing)
+
+ * benchmark/run.rb : use full path to ruby
+
+ * insns.def (yield): raise error if argc > expected argc
+
+
+2005-01-08(Sat) 16:07:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb : add descrioptions
+
+ * compile.c : fix bugs (getinlinecache operands)
+
+ * yarvcore.c : initial value of yarvGlobalStateVersion
+ to 1
+
+
+2005-01-08(Sat) 14:39:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, vm.c, evalc.patch : support making backtrace
+ (incompatible with current ruby interpreter)
+
+
+2005-01-08(Sat) 11:25:46 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * evalc.patch : commit for previous commit change
+
+ * yarvcore.h, compile.c, insns.def : MC to IC (inline cache),
+ and changed to using IC by set/getinlinecache
+
+
+2005-01-08(Sat) 10:04:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : add global variable sym[IC]FUNC
+
+ * yarvcore.c (yarv_iterate, yarv_call0_cfunc) : added
+ (each called from rb_iterate, rb_call0 with NODE_CFUNC)
+
+ * vm.c (stack_dump_raw) : fixed to prints more detail
+
+ * vm.c (stack_dump_th, stack_dump_thobj) : added to
+ dumps thread_object states (for VALUE, struct pointer)
+
+ * vm.c (thread_dump_regs) : added
+
+ * vm.c (thread_call0, thread_call0_cfunc, thread_invoke_yield,
+ thread_invoke_yield_cfunc), insns.def (yield, send) :
+ fixed, added to support IFUNC
+
+ * vm.c, yarvcore.c, insns.def : change type purpose
+ thread_object#block_ptr (it holds IFUNC block information,
+ so this type was changed to 'NODE *')
+
+ * vm.c (stack_dump_each) : fixed for above
+
+ * test/test_block.rb (test_ifunc) : test for above
+
+ * vm.c (get_block_objec, thread_make_env_object) : fixed bugs
+
+ * test/test_bin.rb (test_xstr) : remove `ls` test
+
+
+2005-01-06(Thu) 21:35:18 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarv : trying to support NODE_IFUNC (rb_iterate)
+
+
+2005-01-05(Wed) 06:50:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, insns.def, disasm.c, rb/insns2vm.rb, compile.[ch] :
+ support inline method cache
+
+ * extconf.rb : add -*-inline-method-cache (default: enable)
+
+ * test/test_method.rb : add a test for above
+
+ * benchmark/bm_poly_method.rb : added
+
+ * yarvcore.c : add option string
+
+
+2005-01-04(Tue) 17:15:41 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, compile.c : add compile_array and duparray insn
+ to optimize only literal array creation
+
+ * benchmark/bm_array.rb : added
+
+
+2005-01-04(Tue) 10:02:40 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * README : fix version
+
+
+2005-01-04(Tue) 09:57:25 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * ToDo : reflect current status
+
+
+2005-01-04(Tue) 09:43:54 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_VALUES, NODE_ARGSCAT, NODE_SPLAT
+
+ * test/test_massign.rb : add tests for above
+
+ * benchmark/bm_swap.rb : added
+
+
+2005-01-04(Tue) 06:25:45 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.h : COMPILE_ERROR break contol (instead of return)
+
+ * compile.c : support NODE_MASGN
+
+ * insns.def : change expandarray for massign and add topn insn
+
+ * test/test_massign.rb : added
+
+
+2005-01-03(Mon) 21:20:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : store block when create proc
+
+ * test/test_proc.rb : add a test for above change
+
+ * yarvcore.c : add global function "once"
+
+
+2005-01-02(Sun) 00:40:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bm_super.rb : fix bug (remove infinite loop)
+
+
+2005-01-01(Sat) 23:45:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bm_z?super.rb : added
+
+
+2005-01-01(Sat) 23:37:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bmx_so_object.rb : rename to benchmark/bm_so_object.rb
+
+
+2005-01-01(Sat) 23:19:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_OP_ASGN2, NODE_OP_ASGN_AND, NODE_OP_ASGN_OR,
+ NODE_SUPER, NODE_ZSUPER, NODE_MATCH
+
+ * insns.def : support super, zsuper (currently, super can't
+ handle with block)
+
+ * test/test_bin.rb : add test for op_asgin2, op_assgin_and/or
+
+ * test/test_class.rb : add test for super, zsuper
+
+
+2005-01-01(Sat) 20:39:29 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_MATCH
+
+ * yarvcore.c : fix yarv_svar bug (fix condition boundary)
+
+ * insnhelper.h : save cfp/lfp/dfp vars to thread_object (th)
+
+
+2005-01-01(Sat) 20:03:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h : 0.0.1
+
+ * yarvcore.h : add idIntern declaration
+
+ * insns.def : add getspecial, setspecial.
+ implement getclassvariable, setclassvariable.
+ store lfp before reg match (opt_regexpmatch1)
+
+ * compile.c : support ditto, flipflop
+
+ * yarvcore.c : support svar
+
+ * test/test_syn.rb : add test for flipflop
+
+ * test/test_bin.rb : add test for dsym, cvar, backref
+
+
+2005-01-01(Sat) 09:09:32 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : add getspecial insn
+
+ * compile.c : support NODE_NTH_REF, NODE_BACK_REF
+
+
+2005-01-01(Sat) 06:53:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, compile.c : support alias, undef
+
+ * test/test_method.rb : test for above
+
+ * rb/insns2vm.rb : fix enbug
+
+
+2005-01-01(Sat) 06:00:32 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_jump.rb : add test (next with value)
+
+ * yarvcore.h, yarvcore.c, compile.c, compile.h :
+ raise compile error exception instead of rb_bug
+
+ * yarvcore.c, evalc.patch : support "require"
+
+ * test.rb : restore $" after evaluation with ruby
+
+ * rb/insns2vm.rb : remove unnecesary each
+
+
+2004-12-17(Fri) 18:56:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix newhash
+
+
+2004-12-15(Wed) 13:29:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : add version string
+
+ * compile.c : fix rescure clause bug
+
+
+2004-12-14(Tue) 22:46:30 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : add reput insn
+
+ * vm.h : show stack cache registers when stack dump
+
+ * rb/insns2vm.rb, compile.c : fix stack caching bugs
+
+
+2004-12-14(Tue) 00:51:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns2vm.rb, compile.c, tmpl/opt_sc.inc.tmpl : fix bugs
+
+ * rb/mixc-asm.rb : added
+
+
+2004-12-14(Tue) 00:17:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, yarvcore.c, compile.c : fix SC bugs
+ (SC state management)
+
+ * extconf.rb : add option -[enable|disable]-opt-stack-caching
+
+ * insns2vm.rb : accept CPPFLAGS options
+
+ * vm.c : support restrore register for pc
+
+
+2004-12-13(Mon) 16:53:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb : add macro INSN_IS_SC()
+
+
+2004-12-11(Sat) 10:51:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, compile.c : support singleton method definition
+
+ * test/test_method.rb : add test for above
+
+
+2004-12-11(Sat) 03:17:54 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/*.rb : modify
+
+ * extconf.rb : add $cleanfiles
+
+
+2004-12-08(Wed) 13:01:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : change to disable stack caching
+
+
+2004-12-07(Tue) 19:37:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.rb : add default after
+
+ * insns.def : fix to work on stack caching
+
+
+2004-12-07(Tue) 15:07:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * depend : add some dependency to *.inc files
+
+ * vm.c : add "register" and asm("regname") descriptor
+
+ * rb/insns2vm.rb, compile.c : add stack caching support
+
+ * tmpl/opt_sc.inc.tmpl : added to above change
+
+ * rb/makedocs.rb : fix file path
+
+ * extconf.rb : fix option selection
+
+
+2004-12-06(Mon) 11:20:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * extconf.rb : add vm.asm target if compiler is gcc
+
+
+2004-12-06(Mon) 09:56:24 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.h : rename method_frame's member block to block_ptr
+
+ * extconf.rb : add "-fno-crossjumping" option when compiler
+ is gcc
+
+ * opt_operand.def : add unification insn send
+
+ * rb/insns2vm.rb : define symbol instead of declare const
+ variable (for more optmize on VC)
+
+ * insns.def : move enter point in send
+
+
+2004-12-06(Mon) 04:53:51 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, opt_operand.def, rb/insns2vm.rb, depend :
+ support operand unification
+
+
+2004-12-05(Sun) 03:16:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c, insns.def : speed up throw/catch scheme
+
+
+2004-12-05(Sun) 01:47:05 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : fix catch handler bugs
+
+ * test/test_jump.rb : test_complex_jump added
+
+
+2004-12-03(Fri) 20:39:05 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/contrib/mcq.rb : added
+ (from URABE Syouhei)
+
+
+2004-12-03(Fri) 20:35:28 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : support break in rb_yield block
+
+
+2004-12-03(Fri) 14:26:35 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support block local variable in current
+ ruby specification (patche from Kent Sibilev)
+
+ * insns.def : support attr_* (patch from Kent Sibilev)
+
+
+2004-12-02(Thu) 21:04:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * opt_operand.def : added
+
+
+2004-12-02(Thu) 13:20:41 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c, vm.h, vm.c, insns.def, insnhelper.h, yarvutil.rb :
+ add usage analisys framework
+
+ * disasm.c : insn_operand_intern to separate function
+
+ * benchmark/run.rb : run each benchmark on another process
+
+
+2004-12-01(Wed) 10:26:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : yield check block is given
+
+ * benchmark/bm_lists.rb : rename to bmx_lists.rb
+ (because it's not work ... bug?)
+
+ * insns.def : opt_* support other type calc
+
+
+2004-11-30(Tue) 16:14:54 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bm_so_array.rb : added
+
+ * benchmark/bm_so_matrix.rb : added
+
+
+2004-11-30(Tue) 14:11:30 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/getrev.rb : added
+
+ * yarvcore.c : add YARVCore::REV, YARVCore::DATE constant
+
+
+2004-11-30(Tue) 13:05:42 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_OP_ASGN1 (incomplete)
+
+ * insns.def : add dupn
+
+
+2004-11-30(Tue) 08:52:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h : 0.0.0.f
+
+
+2004-11-30(Tue) 08:43:59 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_class.rb : add test_initialize and test_to_s
+
+ * yarvsubst.c : use rb_funcall instead of yarv_funcall
+
+ * evalc.patch : fix ruby's patch
+
+ * benchmark/bm_so_*.rb : change naming rule. "bm_so_*" from
+ language shootout
+
+ * depend : tbench target item is ITEM env val (default: bmx_temp)
+
+ * vm.c : show raw address if environment is in heap at dumping stack trace
+
+ * vm.c : thread_call0 added
+
+ * vm.c : fix thread_yield_light_invoke
+
+ * yarv.h, yarvcore.c : remove yarv_funcall
+
+
+2004-11-29(Mon) 11:37:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test/test_proc.rb : add test test_nestproc
+
+ * yarvsubst.c : comment out yarv_Array_each
+
+ * insns.def : restore lfp/dfp after call_cfunc
+
+ * vm.c : fix stack dump routine
+
+ * vm.c : impliment thread_funcall (temporarily)
+
+ * yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP()
+
+ * yarvcore.c : remove check with yarv_in_work
+
+ * evalc.patch : added
+
+
+2004-11-27(Sat) 00:19:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.c : free -> ruby_xfree
+
+
+2004-11-26(Fri) 02:11:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm,c : fix bug
+
+
+2004-11-22(Mon) 11:19:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/bm_ackermann.rb, bm_proc.rb, bm_simpleiter.rb,
+ bm_so_exception.rb, bm_wc.rb, wc.input added
+
+
+2004-11-22(Mon) 02:31:56 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_proc.rb : add some test
+
+ * yarvcore.c, vm.c : support yield in C method (as rb_yield)
+
+ * vm.c (thread_yield_light_(prepare|invoke)) : support lightweight
+ yield
+
+ * yarv.h : added
+
+ * yarvcore.c, yarv.h : support yarv_is_working, yarv_block_given_p,
+ yarv_yield, yarv_funcall (only dummy function)
+
+ * vm.c : thread_eval_body changed return value
+
+ * yarvsubst.c : added and add yarv_Integer_times, yarv_Array_each
+
+ * yarvcore.h : block_ptr is added to struct thread_object
+
+ * insns.def : pass block when C method call
+
+ * insnhelper.h : add GET_ISEQOBJ(cfp) macro
+
+
+2004-11-21(Sun) 07:25:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c : support Proc#call
+
+ * test/test_proc.rb : added
+
+
+2004-11-19(Fri) 18:04:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def, vm.c : support creating Proc object
+
+
+2004-11-15(Mon) 14:19:27 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def (send) : use clear_local_size to specify
+ clear local table vars.
+
+ * insns.def : block represent data shares lfp, dfp with frame data
+
+
+2004-11-13(Sat) 18:19:41 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, insns.def : add VM_CALL_ARGS_SPLAT_BIT and
+ VM_CALL_ARGS_BLOCKARG_BIT
+
+ * compile.c, compile.h : add ADD_SEND, ADD_SEND_R
+
+
+2004-11-10(Wed) 08:26:25 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * add "vm_" prefix to (block_object, proc_object, env_object)
+
+
+2004-11-03(Wed) 15:52:14 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, yarvcore.c, disasm.c, compile.c, insns.def, vm.c :
+ fix to move x86_64 (illegal cast, etc)
+
+
+2004-11-01(Mon) 04:45:54 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, compile.c, debug.c, version.h :
+ redesgin gc debug scheme (GC_CHECK())
+
+ * yarvcore.c : mark iseqobj->current_block on GC
+
+ * insns.def, compile.c : last "throw" in ensure/rescue block
+ use operand throwobj and before this insn, use "getdynamic 0, 1"
+
+ * benchmark/bm_temp.rb : move to benchmark bmx_temp.rb
+
+ * depend : change some targets
+
+
+2004-10-25(Mon) 19:57:58 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : push exception iseq to iseqobj->iseq_mark_ary
+ to mark for GC
+
+
+2004-10-10(Sun) 16:25:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : remove $_, $' area from method local frame
+ and provide that's special method local variables pointer(LFP[-1])
+
+ * disasm.c : change environment showing format
+
+ * yarvcore.(h|c) : add YarvProc, YarvEnv
+
+ * yarvcore.h : add arg_block field to iseq_object
+ and init -1 as default value
+
+
+2004-09-30(Thu) 19:50:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : support passing splat argument
+
+ * compile.c, insns.def : support rest argument
+
+ * compile.c, insns.def : support optional argument initializer
+
+ * test/test_method.rb : add tests for above
+
+
+2004-09-29(Wed) 10:50:03 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix rescue clause popped
+
+ * benchmark/bm_random.rb : move to benchmark/bmx_random.rb
+
+
+2004-09-29(Wed) 01:25:35 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * many many files: change stack frame design
+
+
+2004-09-16(Thu) 08:51:37 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, yarvcore.h : support 'return' from method
+ in ensure clause
+
+
+2004-09-13(Mon) 21:56:40 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support inline cache constant access
+ on NODE_COLON2, NODE_COLON3
+
+ * depend : add 'vtest' rule(verbose test)
+
+
+2004-09-13(Mon) 10:58:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, yarvcore.h : support redo/next/break in
+ while/until
+
+
+2004-09-13(Mon) 08:50:19 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_jump.rb : added(correctly)
+
+ * benchamark/bm_(ensure|rescue|simplereturn).rb added
+
+
+2004-09-12(Sun) 23:30:20 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_jump.rb : added
+
+ * insns.def, compile.c : add 'putnil' insn
+
+ * compile.c : use '===' when rescue check
+
+ * insns.def : remove 'rescuecheck' insn
+
+ * compile.c : support retry in begin/rescue clause
+
+ * ToDo : added
+
+
+2004-09-08(Wed) 12:34:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvcore.h, yarvcore.c : add idThrow*
+
+ * insns.def, compile.c, vm.c : support retry, break,
+ next, redo, return(imcomplete)
+
+
+2004-09-03(Fri) 13:40:08 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : add nop after rescue body
+
+ * insns.def, vm.c : support stack rewind when thrown
+
+
+2004-09-01(Wed) 17:31:01 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_exception.rb : added
+
+
+2004-09-01(Wed) 13:15:14 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c, insns.def : implementing exception handling
+
+
+2004-09-01(Wed) 00:18:54 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : add 'throw' insn
+
+ * compile.c : support 'rescue' and 'ensure' clause
+
+ * yarvcore.c, yarvcore.h : add 'catch_table' to iseq_struct
+
+
+2004-08-30(Mon) 19:06:12 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.h : NEW_ISEQOBJ don't pass self as parent
+
+ * compile.c : use NEW_CHILD_ISEQOBJ explicitly
+
+
+2004-08-29(Sun) 21:09:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : trying to implement rescue/ensure
+
+ * insns.def : fix yield bug(lfp, dfp link)
+
+
+2004-08-28(Sat) 13:52:15 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix dvar bug
+
+ * test/test_block.rb : add test
+
+ * insns.def, insnhelper.h : remove unused source code
+
+
+2004-08-28(Sat) 08:51:26 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_DASGN
+
+ * test/test_block.rb : add test
+
+
+2004-08-28(Sat) 08:13:04 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : support access to instance variable
+
+ * test/test_class.rb : add test of instance variable
+
+ * benchmark/bm_block.rb : added
+
+
+2004-08-28(Sat) 07:48:43 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_block.rb : fix block parameter name
+
+
+2004-08-28(Sat) 07:27:52 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c, insns.def : support method call with block
+ and yield and add some functions
+
+ * compile.c, insns.def : support dynavars accessor
+
+ * test/test_block.rb : added
+
+ * vm.c : fix block parameter stack dump
+
+
+2004-08-27(Fri) 23:56:47 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c(iseq_compile) : remove parameter iseqtype
+ (this information can access via self)
+
+2004-08-27(Fri) 17:13:35 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_bin.rb : add test(absolute path constant)
+
+ * yarvcore.h, compile.c(iseq_compile) : change parameter
+
+ * insns.def(classdef) : fix bug
+
+
+2004-08-27(Fri) 04:53:13 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : support setconstant, getconstant, classdef,
+ moduledef
+
+ * vm.h : fix debug levels and so on
+
+ * vm.h : foo_WORD -> foo_WC
+
+ * test/test_class.rb : added
+
+
+2004-08-25(Wed) 17:51:50 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix getconstant/setconstant/classdef
+
+
+2004-08-25(Wed) 14:27:10 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * debug.[ch] : added
+
+ * compile.c, disasm.c : use debug interface
+
+ * compile.c : support some nodes
+
+ * compile.c, rb/insns2vm.rb : remove TS_CPATH
+
+ * insns.def : modify classdef/moduledef/singletonclassdef
+ and add popcref
+
+ * and others...
+
+
+2004-08-18(Wed) 20:16:45 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix case/when statement with empty else clause
+
+ * insns.def : enable compile
+
+ * yarvcore.h : add class search path scheme
+
+ * test/test_syn.rb : add switch/case test case
+
+ * tmpl/yarvarch.ja : update documents
+
+
+2004-05-22(Sat) 01:30:44 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvutil.rb : add eval_in_wrap
+
+ * test/test_*.rb : change to use eval_in_wrap
+
+
+2004-05-20(Thu) 02:50:32 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * support global variables
+
+ * benchmark/bm_*.rb : add some benchmarks
+
+ * compile.c : support NODE_ATTRASGN
+
+ * compile.c : add debugi(...)
+
+
+2004-05-19(Wed) 23:19:38 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * test/test_method.rb : added
+
+
+2004-05-19(Wed) 22:56:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : fix typo
+
+ * benchmark/run.rb : sort benchmark order by filename
+
+ * extconf.rb : use --enable/disable-xxx
+
+ * version.h : ditto(don't touch to change yarv options)
+
+
+2004-05-19(Wed) 21:18:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * yarvutil.rb : added
+
+ * test.rb, test/*, benchmark/run.rb : use yarvutil.rb
+
+ * version.h : USE_OPTIMIZED_REGEXP_MATCH added
+
+ * yarvcore.h : add idEqTilde
+
+ * yarvcore.c(yarvcore_parse, yarvcore_eval) : require file and line
+ parameter
+
+ * test/test_bin.rb : add regexp test
+
+ * benchmark/bm_regexp.rb : added
+
+
+2004-05-19(Wed) 13:57:31 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : add compile_dstr(self, node)
+
+ * compile.c : support NODE_MATCH2, NODE_MATCH3, NODE_DXSTR
+
+ * insns.def : add toregexp
+
+
+2004-05-18(Tue) 10:12:20 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_XDSTR
+
+ * test/test_bin.rb : add test for above change
+
+
+2004-05-18(Tue) 09:46:33 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def(send) : store regs before call_cfunc
+
+
+2004-05-18(Tue) 08:55:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : support NODE_DSTR, NODE_EVSTR
+
+ * compile.c : support NODE_XSTR
+
+ * insns.def : add tostring operation
+
+ * rb/makedocs.rb : fix directory path
+
+ * depend : add tbench rule
+
+ * yarvcore.h : add 'exten ID idBackquote'
+
+
+2004-05-18(Tue) 00:09:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h : add USE_OPTIMIZED_BASIC_OPERATION
+
+ * yarvcore.h(struct thread_object) : add 'VALUE stat_insn_usage'
+
+
+2004-05-17(Mon) 11:28:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * version.h, insns.def, yarvcore.c : add FAKE_INLINE_METHOD_CACHE
+
+
+2004-05-17(Mon) 09:05:53 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c : fix generating opt_* insn process
+
+
+2004-05-17(Mon) 08:58:49 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/(bm_tarai.rb, bm_fib.rb) : added
+
+
+2004-05-17(Mon) 08:20:12 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/(bm_tak.rb, bm_reccount.rb) : added
+
+ * insns.def : test method cache(incomplete)
+
+ * insns.def : add expandarray insn
+
+ * yarvcore.c(iseq_init) : add parameter 'parent'
+
+
+2004-05-17(Mon) 01:49:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * benchmark/run.rb, bm_factorial.rb, bm_whileloop.rb : added
+
+ * insns.def(send) : set id to ruby_frame->orig_func
+
+ * check behavior on mswin32 and cygwin
+
+ * insns.def(send) : check stack overflow
+
+
+2004-05-16(Sun) 08:00:55 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * change frame structure(debugging)
+
+
+2004-05-14(Fri) 15:06:02 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns2vm.rb : support file name arguments
+
+
+2004-05-14(Fri) 04:33:09 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def : support (easy) constant
+
+
+2004-05-12(Wed) 01:51:48 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * rb/insns2vm.b : set directory prefix
+
+ * disasm.c : fix bug
+
+
+2004-05-12(Wed) 00:00:17 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.h, compiler.h, version.h : move *DEBUG defs to version.h
+
+
+2004-05-11(Tue) 23:00:11 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * vm.h, version.h, yarvcore.h : move gcc ver check to version.h
+ and include version.h from yarvcore.h
+
+
+2004-05-11(Tue) 19:16:26 +0900 Koichi Sasada <ko1@atdot.net>
+
+ * 0.0.0.d : imported
+
+
+Local variables:
+add-log-time-format: (lambda ()
+ (let* ((time (current-time))
+ (diff (+ (cadr time) 32400))
+ (lo (% diff 65536))
+ (hi (+ (car time) (/ diff 65536))))
+ (format-time-string "%Y-%m-%d(%a) %H:%M:%S +900" (list hi lo) t)))
+indent-tabs-mode: t
+tab-width: 8
+end:
@@ -11,8 +11,8 @@ **********************************************************************/ #include "ruby.h" -#include "env.h" #include "st.h" +#include "yarv.h" #include <stdio.h> #include <stdarg.h> @@ -24,21 +24,23 @@ #endif extern const char ruby_version[], ruby_release_date[], ruby_platform[]; - int ruby_nerrs; +const char *rb_sourcefile(); +int rb_sourceline(); + static int err_position(char *buf, long len) { ruby_set_current_source(); - if (!ruby_sourcefile) { + if (!rb_sourcefile()) { return 0; } - else if (ruby_sourceline == 0) { - return snprintf(buf, len, "%s: ", ruby_sourcefile); + else if (rb_sourceline() == 0) { + return snprintf(buf, len, "%s: ", rb_sourcefile()); } else { - return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline); + return snprintf(buf, len, "%s:%d: ", rb_sourcefile(), rb_sourceline()); } } @@ -67,7 +69,6 @@ void rb_compile_error(const char *fmt, ...) { va_list args; - va_start(args, fmt); err_print(fmt, args); va_end(args); @@ -147,6 +148,8 @@ rb_warn_m(VALUE self, VALUE mesg) return Qnil; } +void yarv_bug(); + void rb_bug(const char *fmt, ...) { @@ -157,6 +160,7 @@ rb_bug(const char *fmt, ...) if (fwrite(buf, 1, len, out) == len || fwrite(buf, 1, len, (out = stdout)) == len) { + yarv_bug(); fputs("[BUG] ", out); va_start(args, fmt); vfprintf(out, fmt, args); @@ -164,6 +168,7 @@ rb_bug(const char *fmt, ...) fprintf(out, "\nruby %s (%s) [%s]\n\n", ruby_version, ruby_release_date, ruby_platform); } + abort(); } @@ -190,8 +195,6 @@ static struct types { {T_SYMBOL, "Symbol"}, /* :symbol */ {T_DATA, "Data"}, /* internal use: wrapped C pointers */ {T_MATCH, "MatchData"}, /* data of $~ */ - {T_VARMAP, "Varmap"}, /* internal use: dynamic variables */ - {T_SCOPE, "Scope"}, /* internal use: variable scope */ {T_NODE, "Node"}, /* internal use: syntax tree node */ {T_UNDEF, "undef"}, /* internal use: #undef; should not happen */ {-1, 0} @@ -1024,9 +1027,9 @@ rb_loaderror(const char *fmt, ...) void rb_notimplement(void) { - rb_raise(rb_eNotImpError, - "The %s() function is unimplemented on this machine", - rb_id2name(ruby_frame->callee)); + rb_raise(rb_eNotImpError, + "The %s() function is unimplemented on this machine", + rb_id2name(rb_frame_callee())); } void @@ -1039,7 +1042,6 @@ rb_fatal(const char *fmt, ...) vsnprintf(buf, BUFSIZ, fmt, args); va_end(args); - ruby_in_eval = 0; rb_exc_fatal(rb_exc_new2(rb_eFatal, buf)); } @@ -1471,22 +1473,21 @@ Init_syserr(void) static void err_append(const char *s) { - extern VALUE ruby_errinfo; - - if (ruby_in_eval) { - if (NIL_P(ruby_errinfo)) { - ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s); - } - else { - VALUE str = rb_obj_as_string(ruby_errinfo); - - rb_str_cat2(str, "\n"); - rb_str_cat2(str, s); - ruby_errinfo = rb_exc_new3(rb_eSyntaxError, str); - } + yarv_thread_t *th = GET_THREAD(); + if (th->parse_in_eval) { + if (NIL_P(th->errinfo)) { + th->errinfo = rb_exc_new2(rb_eSyntaxError, s); } else { - rb_write_error(s); - rb_write_error("\n"); + VALUE str = rb_obj_as_string(GET_THREAD()->errinfo); + + rb_str_cat2(str, "\n"); + rb_str_cat2(str, s); + th->errinfo = rb_exc_new3(rb_eSyntaxError, str); } + } + else { + rb_write_error(s); + rb_write_error("\n"); + } } @@ -12,1067 +12,40 @@ **********************************************************************/ -#include "ruby.h" -#include "node.h" -#include "env.h" -#include "util.h" -#include "rubysig.h" - -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#ifndef EXIT_SUCCESS -#define EXIT_SUCCESS 0 -#endif -#ifndef EXIT_FAILURE -#define EXIT_FAILURE 1 -#endif - -#include <stdio.h> - -#include "st.h" -#include "dln.h" - -#ifdef __APPLE__ -#include <crt_externs.h> -#endif - -/* Make alloca work the best possible way. */ -#ifdef __GNUC__ -# ifndef atarist -# ifndef alloca -# define alloca __builtin_alloca -# endif -# endif /* atarist */ -#else -# ifdef HAVE_ALLOCA_H -# include <alloca.h> -# else -# ifndef _AIX -# ifndef alloca /* predefined by HP cc +Olibcalls */ -void *alloca (); -# endif -# endif /* AIX */ -# endif /* HAVE_ALLOCA_H */ -#endif /* __GNUC__ */ - -#include <stdarg.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#ifdef __BEOS__ -#include <net/socket.h> -#endif - -#ifdef __MACOS__ -#include "macruby_private.h" -#endif - -#ifdef __VMS -#include "vmsruby_private.h" -#endif - -#ifdef USE_CONTEXT - -NORETURN(static void rb_jump_context(rb_jmpbuf_t, int)); -static inline void -rb_jump_context(rb_jmpbuf_t env, int val) -{ - env->status = val; - setcontext(&env->context); - abort(); /* ensure noreturn */ -} -/* - * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc, - * IA64 register stack and SPARC register window combination problem. - * - * Assume following code sequence. - * - * 1. set a register in the register stack/window such as r32/l0. - * 2. call getcontext. - * 3. use the register. - * 4. update the register for other use. - * 5. call setcontext indirectly (or directly). - * - * This code should be run as 1->2->3->4->5->3->4. - * But after second getcontext return (second 3), - * the register is broken (updated). - * It's because getcontext/setcontext doesn't preserve the content of the - * register stack/window. - * - * setjmp also doesn't preserve the content of the register stack/window. - * But it has not the problem because gcc knows setjmp may return twice. - * gcc detects setjmp and generates setjmp safe code. - * - * So setjmp calls before and after getcontext call makes the code - * somewhat safe. - * It fix the problem on IA64. - * It is not required that setjmp is called at run time, since the problem is - * register usage. - * - * Since the magic setjmp is not enough for SPARC, - * inline asm is used to prohibit registers in register windows. - * - * Since the problem is fixed at gcc 4.0.3, the magic is applied only for - * prior versions of gcc. - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21957 - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127 - */ -# define GCC_VERSION_BEFORE(major, minor, patchlevel) \ - (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \ - ((__GNUC__ < (major)) || \ - (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \ - (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel)))) -# if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__)) -# ifdef __pic__ -/* - * %l7 is excluded for PIC because it is PIC register. - * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html - */ -# define PRE_GETCONTEXT \ - ({ __asm__ volatile ("" : : : \ - "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \ - "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \ - "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); }), -# else -# define PRE_GETCONTEXT \ - ({ __asm__ volatile ("" : : : \ - "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \ - "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \ - "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); }), -# endif -# define POST_GETCONTEXT PRE_GETCONTEXT -# elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64) -static jmp_buf function_call_may_return_twice_jmp_buf; -int function_call_may_return_twice_false_1 = 0; -int function_call_may_return_twice_false_2 = 0; -# define PRE_GETCONTEXT \ - (function_call_may_return_twice_false_1 ? \ - setjmp(function_call_may_return_twice_jmp_buf) : \ - 0), -# define POST_GETCONTEXT \ - (function_call_may_return_twice_false_2 ? \ - setjmp(function_call_may_return_twice_jmp_buf) : \ - 0), -# elif defined(__FreeBSD__) && __FreeBSD__ < 7 -/* - * workaround for FreeBSD/i386 getcontext/setcontext bug. - * clear the carry flag by (0 ? ... : ...). - * FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110 - * [ruby-dev:28263] - */ -static int volatile freebsd_clear_carry_flag = 0; -# define PRE_GETCONTEXT \ - (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0), -# endif -# ifndef PRE_GETCONTEXT -# define PRE_GETCONTEXT -# endif -# ifndef POST_GETCONTEXT -# define POST_GETCONTEXT -# endif -# define ruby_longjmp(env, val) rb_jump_context(env, val) -# define ruby_setjmp(just_before_setjmp, j) ((j)->status = 0, \ - (just_before_setjmp), \ - PRE_GETCONTEXT \ - getcontext(&(j)->context), \ - POST_GETCONTEXT \ - (j)->status) -#else -# if !defined(setjmp) && defined(HAVE__SETJMP) -# define ruby_setjmp(just_before_setjmp, env) \ - ((just_before_setjmp), _setjmp(env)) -# define ruby_longjmp(env,val) _longjmp(env,val) -# else -# define ruby_setjmp(just_before_setjmp, env) \ - ((just_before_setjmp), setjmp(env)) -# define ruby_longjmp(env,val) longjmp(env,val) -# endif -#endif - -#include <sys/types.h> -#include <signal.h> -#include <errno.h> - -#if defined(__VMS) -#pragma nostandard -#endif - -#ifdef HAVE_SYS_SELECT_H -#include <sys/select.h> -#endif - -/* - Solaris sys/select.h switches select to select_large_fdset to support larger - file descriptors if FD_SETSIZE is larger than 1024 on 32bit environment. - But Ruby doesn't change FD_SETSIZE because fd_set is allocated dynamically. - So following definition is required to use select_large_fdset. -*/ -#ifdef HAVE_SELECT_LARGE_FDSET -#define select(n, r, w, e, t) select_large_fdset(n, r, w, e, t) -#endif - -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif - -#include <sys/stat.h> +#include "eval_intern.h" VALUE rb_cProc; VALUE rb_cBinding; -static VALUE proc_alloc(VALUE,struct BLOCK*,int); -static VALUE proc_invoke(VALUE,VALUE,VALUE,VALUE,int); -#define INVOKE_CALL (YIELD_CALL|YIELD_VALUES) -#define INVOKE_VALUES YIELD_VALUES - -static VALUE proc_lambda(void); -static VALUE rb_f_binding(VALUE); -static void rb_f_END(void); -static struct BLOCK *passing_block(VALUE,struct BLOCK*); -static int block_orphan(struct BLOCK *data); - -VALUE rb_cMethod; -VALUE rb_cUnboundMethod; -static VALUE umethod_bind(VALUE, VALUE); -static VALUE rb_mod_define_method(int, VALUE*, VALUE); -static VALUE rb_obj_define_method(int, VALUE*, VALUE); -NORETURN(static void rb_raise_jump(VALUE)); -static VALUE rb_make_exception(int argc, VALUE *argv); - -static int vis_mode; -#define VIS_PUBLIC 0 -#define VIS_PRIVATE 1 -#define VIS_PROTECTED 2 -#define VIS_MODFUNC 5 -#define VIS_LOCAL 8 -#define VIS_MASK 15 -#define VIS_SET(f) (vis_mode=(f)) -#define VIS_TEST(f) (vis_mode&(f)) -#define VIS_MODE() (vis_mode) - -VALUE (*ruby_sandbox_save)(struct thread *) = NULL; -VALUE (*ruby_sandbox_restore)(struct thread *) = NULL; -NODE* ruby_current_node; -int ruby_safe_level = 0; -/* safe-level: - 0 - strings from streams/environment/ARGV are tainted (default) - 1 - no dangerous operation by tainted value - 2 - process/file operations prohibited - 3 - all generated objects are tainted - 4 - no global (non-tainted) variable modification/no direct output -*/ - -static VALUE safe_getter(void); -static void safe_setter(VALUE val); -void -rb_secure(int level) -{ - if (level <= ruby_safe_level) { - if (ruby_frame->callee) { - rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d", - rb_id2name(ruby_frame->callee), ruby_safe_level); - } - else { - rb_raise(rb_eSecurityError, "Insecure operation at level %d", ruby_safe_level); - } - } -} - -void -rb_secure_update(VALUE obj) -{ - if (!OBJ_TAINTED(obj)) rb_secure(4); -} +VALUE proc_invoke(VALUE, VALUE, VALUE, VALUE); +VALUE rb_f_binding(VALUE); -void -rb_check_safe_obj(VALUE x) -{ - if (ruby_safe_level > 0 && OBJ_TAINTED(x)){ - if (ruby_frame->callee) { - rb_raise(rb_eSecurityError, "Insecure operation - %s", - rb_id2name(ruby_frame->callee)); - } - else { - rb_raise(rb_eSecurityError, "Insecure operation: -r"); - } - } - rb_secure(4); -} +VALUE rb_f_block_given_p(void); -void -rb_check_safe_str(VALUE x) -{ - rb_check_safe_obj(x); - if (TYPE(x)!= T_STRING) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected String)", - rb_obj_classname(x)); - } -} +ID rb_frame_callee(void); +static VALUE rb_frame_self(void); -NORETURN(static void raise_undef(VALUE, ID)); -static void -raise_undef(VALUE klass, ID id) -{ - rb_name_error(id, "undefined method `%s' for %s `%s'", - rb_id2name(id), - (TYPE(klass) == T_MODULE) ? "module" : "class", - rb_class2name(klass)); -} +NODE *ruby_current_node; static ID removed, singleton_removed, undefined, singleton_undefined; - -#define CACHE_SIZE 0x800 -#define CACHE_MASK 0x7ff -#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK) - -struct cache_entry { /* method hash table. */ - ID mid; /* method's id */ - ID mid0; /* method's original id */ - VALUE klass; /* receiver's class */ - VALUE origin; /* where method defined */ - NODE *method; - int noex; -}; - -static struct cache_entry cache[2][CACHE_SIZE]; -static int ruby_running = 0; - -void -rb_clear_cache() -{ - int i; - - if (!ruby_running) return; - for (i=0; i<CACHE_SIZE; i++) { - cache[0][i].mid = cache[1][i].mid = 0; - } -} - -static void -rb_clear_cache_for_remove(VALUE klass, ID id) -{ - int i, j; - - if (!ruby_running) return; - for (i=0; i<CACHE_SIZE; i++) { - for (j=0; j<2; j++) { - struct cache_entry *ent = cache[j]+i; - if (ent->mid == id && - RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) { - ent->mid = 0; - } - } - } -} - -static void -rb_clear_cache_by_id(ID id) -{ - int i, j; - - if (!ruby_running) return; - for (i=0; i<CACHE_SIZE; i++) { - for (j=0; j<2; j++) { - struct cache_entry *ent = cache[j]+i; - if (ent->mid == id) { - ent->mid = 0; - } - } - } -} - -void -rb_clear_cache_by_class(VALUE klass) -{ - int i, j; - - if (!ruby_running) return; - for (i=0; i<CACHE_SIZE; i++) { - for (j=0; j<2; j++) { - struct cache_entry *ent = cache[j]+i; - if (ent->klass == klass || ent->origin == klass) { - ent->mid = 0; - } - } - } -} - static ID init, eqq, each, aref, aset, match, missing; static ID added, singleton_added; static ID object_id, __send, __send_bang, respond_to; -#define NOEX_SAFE(n) ((n) >> 5) -#define NOEX_WITH(n, v) ((n) | (v) << 5) -#define NOEX_WITH_SAFE(n) NOEX_WITH(n, ruby_safe_level) - -void -rb_add_method(VALUE klass, ID mid, NODE *node, int noex) -{ - NODE *body; - - if (NIL_P(klass)) klass = rb_cObject; - if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) { - rb_raise(rb_eSecurityError, "Insecure: can't define method"); - } - if (!FL_TEST(klass, FL_SINGLETON) && - node && nd_type(node) != NODE_ZSUPER && - (mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) { - noex = NOEX_PRIVATE | noex; - } - else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC && - mid == rb_intern("allocate")) { - rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()", - rb_class2name(rb_iv_get(klass, "__attached__"))); - mid = ID_ALLOCATOR; - } - if (OBJ_FROZEN(klass)) rb_error_frozen("class/module"); - rb_clear_cache_by_id(mid); - body = NEW_METHOD(node, NOEX_WITH_SAFE(noex)); - st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body); - if (node && mid != ID_ALLOCATOR && ruby_running) { - if (FL_TEST(klass, FL_SINGLETON)) { - rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid)); - } - else { - rb_funcall(klass, added, 1, ID2SYM(mid)); - } - } -} - -void -rb_define_alloc_func(VALUE klass, VALUE (*func) (VALUE)) -{ - Check_Type(klass, T_CLASS); - rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), NOEX_PRIVATE); -} - -void -rb_undef_alloc_func(VALUE klass) -{ - Check_Type(klass, T_CLASS); - rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, 0, NOEX_UNDEF); -} - -#define LOOKUP_NORMAL 0 -#define LOOKUP_FCALL 1 -#define LOOKUP_NOSKIP 2 -#define LOOKUP_LOCAL 1 - -static NODE* -search_method(VALUE klass, ID id, VALUE *origin, int flag, int *out) -{ - NODE *body; - - if (flag == LOOKUP_FCALL && ruby_frame->this_class) { - if (st_lookup(RCLASS(ruby_frame->this_class)->m_tbl, id, (st_data_t *)&body) && - body->nd_noex == NOEX_LOCAL) { - if (origin) *origin = ruby_frame->this_class; - if (out) *out = LOOKUP_LOCAL; - return body; - } - } - for (;klass; klass = RCLASS(klass)->super) { - if (st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *)&body) && - (flag == LOOKUP_NOSKIP || body->nd_noex != NOEX_LOCAL)) { - if (origin) *origin = klass; - if (out) *out = LOOKUP_NORMAL; - return body; - } - } - return 0; -} - -static NODE* -rb_get_method_body(VALUE *klassp, ID *idp, int *noexp) -{ - ID id = *idp; - VALUE klass = *klassp; - VALUE origin; - NODE * volatile body; - struct cache_entry *ent; - int noex = *noexp; - int lc; - - if ((body = search_method(klass, id, &origin, noex, &lc)) == 0 || !body->nd_body) { - /* store empty info in cache */ - ent = cache[noex] + EXPR1(klass, id); - ent->klass = klass; - ent->origin = klass; - ent->mid = ent->mid0 = id; - ent->noex = 0; - ent->method = 0; - - return 0; - } - - if (ruby_running) { - VALUE c = (lc == LOOKUP_LOCAL) ? origin : klass; - /* store in cache */ - ent = cache[lc] + EXPR1(c, id); - ent->klass = c; - ent->noex = body->nd_noex; - if (noexp) *noexp = body->nd_noex; - body = body->nd_body; - if (nd_type(body) == NODE_FBODY) { - ent->mid = id; - *klassp = body->nd_orig; - ent->origin = body->nd_orig; - *idp = ent->mid0 = body->nd_mid; - body = ent->method = body->nd_head; - } - else { - *klassp = origin; - ent->origin = origin; - ent->mid = ent->mid0 = id; - ent->method = body; - } - } - else { - if (noexp) *noexp = body->nd_noex; - body = body->nd_body; - if (nd_type(body) == NODE_FBODY) { - *klassp = body->nd_orig; - *idp = body->nd_mid; - body = body->nd_head; - } - else { - *klassp = origin; - } - } - - return body; -} - -NODE* -rb_method_node(VALUE klass, ID id) -{ - int noex = LOOKUP_NORMAL; - struct cache_entry *ent; - - ent = cache[0] + EXPR1(klass, id); - if (ent->mid == id && ent->klass == klass && ent->method){ - return ent->method; - } - - return rb_get_method_body(&klass, &id, &noex); -} - -static void -remove_method(VALUE klass, ID mid) -{ - NODE *body; - - if (klass == rb_cObject) { - rb_secure(4); - } - if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) { - rb_raise(rb_eSecurityError, "Insecure: can't remove method"); - } - if (OBJ_FROZEN(klass)) rb_error_frozen("class/module"); - if (mid == object_id || mid == __send || mid == __send_bang || mid == init) { - rb_warn("removing `%s' may cause serious problem", rb_id2name(mid)); - } - if (!st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body) || - !body->nd_body) { - rb_name_error(mid, "method `%s' not defined in %s", - rb_id2name(mid), rb_class2name(klass)); - } - rb_clear_cache_for_remove(klass, mid); - if (FL_TEST(klass, FL_SINGLETON)) { - rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid)); - } - else { - rb_funcall(klass, removed, 1, ID2SYM(mid)); - } -} - -void -rb_remove_method(VALUE klass, const char *name) -{ - remove_method(klass, rb_intern(name)); -} - -/* - * call-seq: - * remove_method(symbol) => self - * - * Removes the method identified by _symbol_ from the current - * class. For an example, see <code>Module.undef_method</code>. - */ - -static VALUE -rb_mod_remove_method(int argc, VALUE *argv, VALUE mod) -{ - int i; - - for (i=0; i<argc; i++) { - remove_method(mod, rb_to_id(argv[i])); - } - return mod; -} - -#undef rb_disable_super -#undef rb_enable_super - -void -rb_disable_super(VALUE klass, const char *name) -{ - /* obsolete - no use */ -} - -void -rb_enable_super(VALUE klass, const char *name) -{ - rb_warning("rb_enable_super() is obsolete"); -} - -static void -rb_export_method(VALUE klass, ID name, ID noex) -{ - NODE *body; - VALUE origin; - - if (klass == rb_cObject) { - rb_secure(4); - } - body = search_method(klass, name, &origin, LOOKUP_NOSKIP, 0); - if (!body && TYPE(klass) == T_MODULE) { - body = search_method(rb_cObject, name, &origin, LOOKUP_NOSKIP, 0); - } - if (!body || !body->nd_body) { - raise_undef(klass, name); - } - if (body->nd_noex != noex) { - if (klass == origin) { - body->nd_noex = noex; - } - else { - rb_add_method(klass, name, NEW_ZSUPER(), noex); - } - } -} - -static int -method_exists(VALUE klass, ID id, int noex) -{ - struct cache_entry *ent; - int nx = noex; - - switch (noex) { - case LOOKUP_NORMAL: - case LOOKUP_FCALL: - /* is it in the method cache? */ - ent = cache[noex] + EXPR1(klass, id); - if (ent->mid == id && ent->klass == klass) { - if (nx == LOOKUP_NORMAL) { - if (ent->noex == NOEX_PRIVATE) return Qfalse; - } - else if (ent->noex != NOEX_LOCAL) { - if (!ent->method) return Qfalse; - return Qtrue; - } - } - /* fall through */ - default: - if (rb_get_method_body(&klass, &id, &noex)) { - if (nx == LOOKUP_NORMAL && noex == NOEX_PRIVATE) - return Qfalse; - return Qtrue; - } - return Qfalse; - } -} - -int -rb_method_boundp(VALUE klass, ID id, int pub) -{ - return method_exists(klass, id, pub ? LOOKUP_NORMAL : LOOKUP_FCALL); -} - -void -rb_attr(VALUE klass, ID id, int read, int write, int noex) -{ - const char *name; - char *buf; - ID attriv; - size_t len; - - if (!noex) noex = NOEX_PUBLIC; - else { - if (VIS_TEST(VIS_PRIVATE)) { - noex = NOEX_PRIVATE; - rb_warning((VIS_MODE() == VIS_MODFUNC) ? - "attribute accessor as module_function" : - "private attribute?"); - } - else if (VIS_TEST(VIS_PROTECTED)) { - noex = NOEX_PROTECTED; - } - else { - noex = NOEX_PUBLIC; - } - } - - if (!rb_is_local_id(id) && !rb_is_const_id(id)) { - rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id)); - } - name = rb_id2name(id); - if (!name) { - rb_raise(rb_eArgError, "argument needs to be symbol or string"); - } - len = strlen(name)+2; - buf = ALLOCA_N(char,len); - snprintf(buf, len, "@%s", name); - attriv = rb_intern(buf); - if (read) { - rb_add_method(klass, id, NEW_IVAR(attriv), noex); - } - if (write) { - rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex); - } -} - -VALUE ruby_errinfo = Qnil; -extern int ruby_nerrs; - VALUE rb_eLocalJumpError; VALUE rb_eSysStackError; +extern int ruby_nerrs; extern VALUE ruby_top_self; -struct FRAME *ruby_frame; -struct SCOPE *ruby_scope; -static struct FRAME *top_frame; -static struct SCOPE *top_scope; - -static unsigned long frame_unique = 1; - -#define PUSH_FRAME(link) do { \ - struct FRAME _frame; \ - _frame.prev = ruby_frame; \ - _frame.tmp = 0; \ - _frame.node = ruby_current_node; \ - _frame.argc = 0; \ - _frame.self = (link)?ruby_frame->self:0;\ - _frame.block = (link)?ruby_frame->block:0;\ - _frame.flags = 0; \ - _frame.uniq = frame_unique++; \ - _frame.callee = 0; \ - _frame.this_func = 0; \ - _frame.this_class = 0; \ - ruby_frame = &_frame - -#define POP_FRAME() \ - ruby_current_node = _frame.node; \ - ruby_frame = _frame.prev; \ -} while (0) - -static unsigned long block_unique = 1; - -#define PUSH_BLOCK(v,iv,b) do { \ - struct BLOCK _block; \ - _block.var = (iv); \ - _block.body = (b); \ - _block.self = self; \ - _block.frame = *ruby_frame; \ - _block.cref = ruby_cref; \ - _block.frame.node = ruby_current_node;\ - _block.scope = ruby_scope; \ - _block.vmode = vis_mode; \ - _block.flags = BLOCK_D_SCOPE; \ - _block.dyna_vars = ruby_dyna_vars; \ - _block.wrapper = ruby_wrapper; \ - _block.block_obj = 0; \ - if (b) { \ - _block.uniq = block_unique++; \ - prot_tag->blkid = _block.uniq; \ - } \ - else { \ - _block.uniq = 0; \ - prot_tag->blkid = 0; \ - } \ - (v) = &_block - -#define POP_BLOCK() } while (0) - -struct RVarmap *ruby_dyna_vars; -#define PUSH_VARS() do { \ - struct RVarmap * volatile _old; \ - _old = ruby_dyna_vars; \ - ruby_dyna_vars = 0 - -#define POP_VARS() \ - if (_old && (ruby_scope->flags & SCOPE_DONT_RECYCLE)) {\ - if (RBASIC(_old)->flags) /* unless it's already recycled */ \ - FL_SET(_old, DVAR_DONT_RECYCLE); \ - }\ - ruby_dyna_vars = _old; \ -} while (0) - -#define DVAR_DONT_RECYCLE FL_USER2 - -#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH) - -static struct RVarmap* -new_dvar(ID id, VALUE value, struct RVarmap *prev) -{ - NEWOBJ(vars, struct RVarmap); - OBJSETUP(vars, 0, T_VARMAP); - vars->id = id; - vars->val = value; - vars->next = prev; +static VALUE ruby_wrapper; /* security wrapper */ - return vars; -} +static VALUE eval _((VALUE, VALUE, VALUE, char *, int)); -VALUE -rb_dvar_defined(ID id) -{ - struct RVarmap *vars = ruby_dyna_vars; - - while (vars) { - if (vars->id == id) return Qtrue; - vars = vars->next; - } - return Qfalse; -} - -VALUE -rb_dvar_curr(ID id) -{ - struct RVarmap *vars = ruby_dyna_vars; +static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int)); +static VALUE rb_call(VALUE, VALUE, ID, int, const VALUE *, int); - while (vars) { - if (vars->id == 0) break; - if (vars->id == id) return Qtrue; - vars = vars->next; - } - return Qfalse; -} - -VALUE -rb_dvar_ref(ID id) -{ - struct RVarmap *vars = ruby_dyna_vars; - - while (vars) { - if (vars->id == id) { - return vars->val; - } - vars = vars->next; - } - return Qnil; -} - -void -rb_dvar_push(ID id, VALUE value) -{ - ruby_dyna_vars = new_dvar(id, value, ruby_dyna_vars); -} - -static void -dvar_asgn_internal(ID id, VALUE value, int curr) -{ - int n = 0; - struct RVarmap *vars = ruby_dyna_vars; - - while (vars) { - if (curr && vars->id == 0) { - /* first null is a dvar header */ - n++; - if (n == 2) break; - } - if (vars->id == id) { - vars->val = value; - return; - } - vars = vars->next; - } - if (!ruby_dyna_vars) { - ruby_dyna_vars = new_dvar(id, value, 0); - } - else { - vars = new_dvar(id, value, ruby_dyna_vars->next); - ruby_dyna_vars->next = vars; - } -} - -static inline void -dvar_asgn(ID id, VALUE value) -{ - dvar_asgn_internal(id, value, 0); -} - -static inline void -dvar_asgn_curr(ID id, VALUE value) -{ - dvar_asgn_internal(id, value, 1); -} - -VALUE * -rb_svar(int cnt) -{ - struct RVarmap *vars = ruby_dyna_vars; - ID id; - - if (!ruby_scope->local_tbl) return NULL; - if (cnt >= ruby_scope->local_tbl[0]) return NULL; - id = ruby_scope->local_tbl[cnt+1]; - while (vars) { - if (vars->id == id) return &vars->val; - vars = vars->next; - } - if (ruby_scope->local_vars == 0) return NULL; - return &ruby_scope->local_vars[cnt]; -} - -struct tag { - rb_jmpbuf_t buf; - struct FRAME *frame; - VALUE tag; - VALUE retval; - struct SCOPE *scope; - VALUE dst; - struct tag *prev; - int blkid; -}; -static struct tag *prot_tag; - -#define PUSH_TAG(ptag) do { \ - struct tag _tag; \ - _tag.retval = Qnil; \ - _tag.frame = ruby_frame; \ - _tag.prev = prot_tag; \ - _tag.scope = ruby_scope; \ - _tag.tag = ptag; \ - _tag.dst = -1; \ - _tag.blkid = 0; \ - prot_tag = &_tag - -#define PROT_NONE Qfalse /* 0 */ -#define PROT_THREAD Qtrue /* 2 */ -#define PROT_FUNC INT2FIX(0) /* 1 */ -#define PROT_LOOP INT2FIX(1) /* 3 */ -#define PROT_LAMBDA INT2FIX(2) /* 5 */ -#define PROT_YIELD INT2FIX(3) /* 7 */ -#define PROT_TOP INT2FIX(4) /* 9 */ - -#define EXEC_TAG() (FLUSH_REGISTER_WINDOWS, ruby_setjmp(((void)0), prot_tag->buf)) - -#define JUMP_TAG(st) do { \ - ruby_frame = prot_tag->frame; \ - ruby_longjmp(prot_tag->buf,(st)); \ -} while (0) - -#define POP_TAG() \ - prot_tag = _tag.prev; \ -} while (0) - -#define TAG_DST() (_tag.dst == (VALUE)ruby_frame->uniq) - -#define TAG_RETURN 0x1 -#define TAG_BREAK 0x2 -#define TAG_NEXT 0x3 -#define TAG_RETRY 0x4 -#define TAG_REDO 0x5 -#define TAG_RAISE 0x6 -#define TAG_THROW 0x7 -#define TAG_FATAL 0x8 -#define TAG_CONTCALL 0x9 -#define TAG_THREAD 0xa -#define TAG_MASK 0xf - -VALUE ruby_wrapper; /* security wrapper */ - -NODE *ruby_cref = 0; -NODE *ruby_top_cref; -#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref) -#define POP_CREF() ruby_cref = ruby_cref->nd_next - -#define PUSH_SCOPE() do { \ - volatile int _vmode = vis_mode; \ - struct SCOPE * volatile _old; \ - NEWOBJ(_scope, struct SCOPE); \ - OBJSETUP(_scope, 0, T_SCOPE); \ - _scope->local_tbl = 0; \ - _scope->local_vars = 0; \ - _scope->flags = 0; \ - _old = ruby_scope; \ - ruby_scope = _scope; \ - vis_mode = VIS_PUBLIC - -rb_thread_t curr_thread = 0; -rb_thread_t main_thread; -static void scope_dup(struct SCOPE *); - -#define POP_SCOPE() \ - if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\ - if (_old) scope_dup(_old); \ - } \ - if (!(ruby_scope->flags & SCOPE_MALLOC)) {\ - ruby_scope->local_vars = 0; \ - ruby_scope->local_tbl = 0; \ - if (!(ruby_scope->flags & SCOPE_DONT_RECYCLE) && \ - ruby_scope != top_scope) { \ - rb_gc_force_recycle((VALUE)ruby_scope);\ - } \ - } \ - ruby_scope->flags |= SCOPE_NOSTACK; \ - ruby_scope = _old; \ - vis_mode = _vmode; \ -} while (0) - -struct ruby_env { - struct ruby_env *prev; - struct FRAME *frame; - struct SCOPE *scope; - struct BLOCK *block; - struct tag *tag; - NODE *cref; -}; - -static void push_thread_anchor(struct ruby_env *); -static void pop_thread_anchor(struct ruby_env *); - -#define PUSH_THREAD_TAG() PUSH_TAG(PROT_THREAD); \ - do { \ - struct ruby_env _interp; \ - push_thread_anchor(&_interp); -#define POP_THREAD_TAG() \ - pop_thread_anchor(&_interp); \ - } while (0); \ - POP_TAG() - -static VALUE rb_eval(VALUE,NODE*); -static VALUE eval(VALUE,VALUE,VALUE,const char*,int); -static NODE *compile(VALUE, const char*, int); - -static VALUE rb_yield_0(VALUE, VALUE, VALUE, int); - -#define YIELD_CALL 1 -#define YIELD_VALUES 2 -#define YIELD_PROC_INVOKE 4 -#define YIELD_PUBLIC_DEF 8 -#define YIELD_FUNC_AVALUE 1 -#define YIELD_FUNC_SVALUE 2 - -typedef enum calling_scope { - CALLING_NORMAL, - CALLING_FUNCALL, - CALLING_FCALL, - CALLING_VCALL, - CALLING_SUPER, -} calling_scope_t; - -static VALUE rb_call(VALUE,VALUE,ID,int,const VALUE*,struct BLOCK*,calling_scope_t,int,VALUE); -static VALUE module_setup(VALUE,NODE*); - -static VALUE massign(VALUE,NODE*,VALUE,int); -static void assign(VALUE,NODE*,VALUE,int); -static int formal_assign(VALUE, NODE*, int, const VALUE*, VALUE*); +static void rb_clear_trace_func(void); typedef struct event_hook { rb_event_hook_func_t func; @@ -1084,235 +57,24 @@ static rb_event_hook_t *event_hooks; #define EXEC_EVENT_HOOK(event, node, self, id, klass) \ do { \ - rb_event_hook_t *hook = event_hooks; \ - rb_event_hook_func_t hook_func; \ - rb_event_t events; \ + rb_event_hook_t *hook; \ \ - while (hook) { \ - hook_func = hook->func; \ - events = hook->events; \ - hook = hook->next; \ - if (events & event) \ - (*hook_func)(event, node, self, id, klass); \ + for (hook = event_hooks; hook; hook = hook->next) { \ + if (hook->events & event) \ + (*hook->func)(event, node, self, id, klass); \ } \ } while (0) -static VALUE trace_func = 0; -static int tracing = 0; -static void call_trace_func(rb_event_t,NODE*,VALUE,ID,VALUE); - -#if 0 -#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \ - ruby_sourceline = nd_line(ruby_current_node)) -#else -#define SET_CURRENT_SOURCE() ((void)0) -#endif - -void -ruby_set_current_source(void) -{ - if (ruby_current_node) { - ruby_sourcefile = ruby_current_node->nd_file; - ruby_sourceline = nd_line(ruby_current_node); - } -} - -static void -warn_printf(const char *fmt, ...) -{ - char buf[BUFSIZ]; - va_list args; - - va_start(args, fmt); - vsnprintf(buf, BUFSIZ, fmt, args); - va_end(args); - rb_write_error(buf); -} - -static VALUE -error_line(struct FRAME *frame, NODE *node) -{ - char *file; - int line; - - if (node) { - file = node->nd_file; - line = nd_line(node); - } - else { - file = ruby_sourcefile; - line = ruby_sourceline; - } - ruby_set_current_source(); - if (ruby_sourcefile) { - if (frame->callee) { - if (frame->flags & FRAME_FUNC) { - return rb_sprintf("%s:%d:in `%s'", file, line, - rb_id2name(frame->this_func)); - } - else { - VALUE oklass = frame->this_class; - char *rec = 0; - - switch (TYPE(frame->self)) { - case T_NIL: - rec = "nil"; break; - case T_TRUE: - rec = "true"; break; - case T_FALSE: - rec = "false"; break; - } - if (rec) { - return rb_sprintf("%s:%d:in `%s.%s'", file, line, rec, - rb_id2name(frame->this_func)); - } - if (TYPE(oklass) == T_ICLASS) { - oklass = RBASIC(oklass)->klass; - } - else if (FL_TEST(oklass, FL_SINGLETON)) { - oklass = rb_iv_get(oklass, "__attached__"); - } - return rb_sprintf("%s:%d:in `%s#%s'", file, line, - rb_class2name(oklass), - rb_id2name(frame->this_func)); - } - } - else if (!node && ruby_sourceline == 0) { - return rb_str_new2(ruby_sourcefile); - } - } - return rb_sprintf("%s:%d", file, line); -} - -#define warn_print(x) rb_write_error(x) -#define warn_print2(x,l) rb_write_error2(x,l) - -static void -error_pos(void) -{ - VALUE pos = error_line(ruby_frame, 0); - warn_printf("%s", StringValueCStr(pos)); -} - -static VALUE -get_backtrace(VALUE info) -{ - if (NIL_P(info)) return Qnil; - info = rb_funcall(info, rb_intern("backtrace"), 0); - if (NIL_P(info)) return Qnil; - return rb_check_array_type(info); -} - -static void -set_backtrace(VALUE info, VALUE bt) -{ - rb_funcall(info, rb_intern("set_backtrace"), 1, bt); -} - -static void -error_print(void) -{ - VALUE errat = Qnil; /* OK */ - volatile VALUE eclass, e; - const char *einfo; - long elen; - - if (NIL_P(ruby_errinfo)) return; - - PUSH_TAG(PROT_NONE); - if (EXEC_TAG() == 0) { - errat = get_backtrace(ruby_errinfo); - } - else { - errat = Qnil; - } - if (EXEC_TAG()) goto error; - if (NIL_P(errat)){ - ruby_set_current_source(); - if (ruby_sourcefile) - warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline); - else - warn_printf("%d", ruby_sourceline); - } - else if (RARRAY_LEN(errat) == 0) { - error_pos(); - } - else { - VALUE mesg = RARRAY_PTR(errat)[0]; - - if (NIL_P(mesg)) error_pos(); - else { - warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg)); - } - } +static void call_trace_func _((rb_event_t, NODE *, VALUE, ID, VALUE)); - eclass = CLASS_OF(ruby_errinfo); - if (EXEC_TAG() == 0) { - e = rb_funcall(ruby_errinfo, rb_intern("message"), 0, 0); - StringValue(e); - einfo = RSTRING_PTR(e); - elen = RSTRING_LEN(e); - } - else { - einfo = ""; - elen = 0; - } - if (EXEC_TAG()) goto error; - if (eclass == rb_eRuntimeError && elen == 0) { - warn_print(": unhandled exception\n"); - } - else { - VALUE epath; - epath = rb_class_name(eclass); - if (elen == 0) { - warn_print(": "); - warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath)); - warn_print("\n"); - } - else { - char *tail = 0; - long len = elen; +#include "eval_error.h" +#include "eval_method.h" +#include "eval_safe.h" +#include "eval_jump.h" - if (RSTRING_PTR(epath)[0] == '#') epath = 0; - if (tail = memchr(einfo, '\n', elen)) { - len = tail - einfo; - tail++; /* skip newline */ - } - warn_print(": "); - warn_print2(einfo, len); - if (epath) { - warn_print(" ("); - warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath)); - warn_print(")\n"); - } - if (tail) { - warn_print2(tail, elen-len-1); - } - } - } - - if (!NIL_P(errat)) { - long i; - -#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5) -#define TRACE_HEAD 8 -#define TRACE_TAIL 5 - for (i=1; i<RARRAY_LEN(errat); i++) { - if (TYPE(RARRAY_PTR(errat)[i]) == T_STRING) { - warn_printf("\tfrom %s\n", RSTRING_PTR(RARRAY_PTR(errat)[i])); - } - if (i == TRACE_HEAD && RARRAY_LEN(errat) > TRACE_MAX) { - warn_printf("\t ... %ld levels...\n", - RARRAY_LEN(errat) - TRACE_HEAD - TRACE_TAIL); - i = RARRAY_LEN(errat) - TRACE_TAIL; - } - } - } - error: - POP_TAG(); -} +/* initialize ruby */ #if defined(__APPLE__) #define environ (*_NSGetEnviron()) @@ -1321,45 +83,24 @@ extern char **environ; #endif char **rb_origenviron; -void rb_call_inits(void); -void Init_stack(VALUE*); -void Init_heap(void); -void Init_ext(void); +jmp_buf function_call_may_return_twice_jmp_buf; +int function_call_may_return_twice_false = 0; -#ifdef HAVE_NATIVETHREAD -static rb_nativethread_t ruby_thid; -int -is_ruby_native_thread(void) -{ - return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT()); -} +void rb_call_inits _((void)); +void Init_stack _((VALUE *)); +void Init_heap _((void)); +void Init_ext _((void)); +void Init_yarv(void); -# ifdef HAVE_NATIVETHREAD_KILL void -ruby_native_thread_kill(int sig) -{ - NATIVETHREAD_KILL(ruby_thid, sig); -} -# endif -#endif - -NORETURN(static void rb_thread_start_1(void)); - -void -ruby_init(void) +ruby_init() { static int initialized = 0; - static struct FRAME frame; int state; if (initialized) return; initialized = 1; -#ifdef HAVE_NATIVETHREAD - ruby_thid = NATIVETHREAD_CURRENT(); -#endif - - ruby_frame = top_frame = &frame; #ifdef __MACOS__ rb_origenviron = 0; @@ -1367,155 +108,53 @@ ruby_init(void) rb_origenviron = environ; #endif - Init_stack((void*)&state); + Init_stack((void *)&state); + Init_yarv(); Init_heap(); - PUSH_SCOPE(); - top_scope = ruby_scope; - /* default visibility is private at toplevel */ - VIS_SET(VIS_PRIVATE); PUSH_TAG(PROT_NONE); if ((state = EXEC_TAG()) == 0) { rb_call_inits(); - ruby_frame->self = ruby_top_self; - ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0); - ruby_cref = ruby_top_cref; - rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self)); + #ifdef __MACOS__ _macruby_init(); #elif defined(__VMS) _vmsruby_init(); #endif + ruby_prog_init(); ALLOW_INTS; } - POP_TAG(); + POP_TAG_INIT(); + if (state) { error_print(); exit(EXIT_FAILURE); } - POP_SCOPE(); - ruby_scope = top_scope; - top_scope->flags &= ~SCOPE_NOSTACK; ruby_running = 1; } -static VALUE -eval_node(VALUE self, NODE *node) -{ - if (!node) return Qnil; - if (nd_type(node) == NODE_PRELUDE) { - rb_eval(self, node->nd_head); - node = node->nd_body; - } - if (!node) return Qnil; - return rb_eval(self, node); -} - -int ruby_in_eval; - -static void rb_thread_cleanup(void); -static void rb_thread_wait_other_threads(void); - -static int thread_set_raised(void); -static int thread_reset_raised(void); - -static int thread_no_ensure _((void)); - -static VALUE exception_error; -static VALUE sysstack_error; - -static int -sysexit_status(VALUE err) -{ - VALUE st = rb_iv_get(err, "status"); - return NUM2INT(st); -} - -static int -error_handle(int ex) -{ - int status = EXIT_FAILURE; - - if (thread_set_raised()) return EXIT_FAILURE; - switch (ex & TAG_MASK) { - case 0: - status = EXIT_SUCCESS; - break; - - case TAG_RETURN: - error_pos(); - warn_print(": unexpected return\n"); - break; - case TAG_NEXT: - error_pos(); - warn_print(": unexpected next\n"); - break; - case TAG_BREAK: - error_pos(); - warn_print(": unexpected break\n"); - break; - case TAG_REDO: - error_pos(); - warn_print(": unexpected redo\n"); - break; - case TAG_RETRY: - error_pos(); - warn_print(": retry outside of rescue clause\n"); - break; - case TAG_THROW: - if (prot_tag && prot_tag->frame && prot_tag->frame->node) { - NODE *tag = prot_tag->frame->node; - warn_printf("%s:%d: uncaught throw\n", - tag->nd_file, nd_line(tag)); - } - else { - error_pos(); - warn_printf(": unexpected throw\n"); - } - break; - case TAG_RAISE: - case TAG_FATAL: - if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) { - status = sysexit_status(ruby_errinfo); - } - else { - error_print(); - } - break; - default: - rb_bug("Unknown longjmp status %d", ex); - break; - } - thread_reset_raised(); - return status; -} - void ruby_options(int argc, char **argv) { int state; - Init_stack((void*)&state); + Init_stack((void *)&state); PUSH_THREAD_TAG(); if ((state = EXEC_TAG()) == 0) { ruby_process_options(argc, argv); } else { - if (state == TAG_THREAD) { - rb_thread_start_1(); - } - trace_func = 0; - tracing = 0; + rb_clear_trace_func(); exit(error_handle(state)); } POP_THREAD_TAG(); } -void rb_exec_end_proc(void); +void rb_exec_end_proc _((void)); static void -ruby_finalize_0(void) +ruby_finalize_0() { PUSH_TAG(PROT_NONE); if (EXEC_TAG() == 0) { @@ -1526,13 +165,12 @@ ruby_finalize_0(void) } static void -ruby_finalize_1(void) +ruby_finalize_1() { signal(SIGINT, SIG_DFL); - ruby_errinfo = 0; + GET_THREAD()->errinfo = 0; rb_gc_call_finalizer_at_exit(); - trace_func = 0; - tracing = 0; + rb_clear_trace_func(); } void @@ -1546,30 +184,38 @@ int ruby_cleanup(int ex) { int state; - volatile VALUE err = ruby_errinfo; + volatile VALUE err = GET_THREAD()->errinfo; + yarv_vm_t *vm = GET_THREAD()->vm; - ruby_safe_level = 0; - Init_stack((void*)&state); + /* th->errinfo contains a NODE while break'ing */ + if (RTEST(err) && (TYPE(err) != T_NODE) && + rb_obj_is_kind_of(err, rb_eSystemExit)) { + vm->exit_code = NUM2INT(rb_iv_get(err, "status")); + } + else { + vm->exit_code = 0; + } + + GET_THREAD()->safe_level = 0; + Init_stack((void *)&state); PUSH_THREAD_TAG(); if ((state = EXEC_TAG()) == 0) { + if (GET_THREAD()->errinfo) { + err = GET_THREAD()->errinfo; + } ruby_finalize_0(); - rb_thread_cleanup(); - rb_thread_wait_other_threads(); - } - else if (state == TAG_THREAD) { - rb_thread_start_1(); } else if (ex == 0) { ex = state; } - ruby_errinfo = err; + rb_thread_terminate_all(); + GET_THREAD()->errinfo = err; ex = error_handle(ex); ruby_finalize_1(); POP_THREAD_TAG(); - if (err && rb_obj_is_kind_of(err, rb_eSystemExit)) { - VALUE st = rb_iv_get(err, "status"); - return NUM2INT(st); + if (vm->exit_code) { + return vm->exit_code; } return ex; } @@ -1577,70 +223,57 @@ ruby_cleanup(int ex) extern NODE *ruby_eval_tree; static int -ruby_exec_internal(void) +ruby_exec_internal() { int state; - - PUSH_THREAD_TAG(); - /* default visibility is private at toplevel */ - VIS_SET(VIS_PRIVATE); + VALUE val; + PUSH_TAG(0); if ((state = EXEC_TAG()) == 0) { - eval_node(ruby_top_self, ruby_eval_tree); + GET_THREAD()->base_block = 0; + val = yarvcore_eval_parsed(ruby_eval_tree, + rb_str_new2(ruby_sourcefile)); } - else if (state == TAG_THREAD) { - rb_thread_start_1(); - } - POP_THREAD_TAG(); + POP_TAG(); return state; } int -ruby_exec(void) +ruby_exec() { volatile NODE *tmp; - Init_stack((void*)&tmp); + Init_stack((void *)&tmp); return ruby_exec_internal(); } void -ruby_stop(int ex) +ruby_stop(ex) + int ex; { exit(ruby_cleanup(ex)); } void -ruby_run(void) +ruby_run() { int state; static int ex; - if (ruby_nerrs > 0) exit(EXIT_FAILURE); - state = ruby_exec(); - if (state && !ex) ex = state; - ruby_stop(ex); -} + if (ruby_nerrs > 0) { + exit(EXIT_FAILURE); + } -static void -compile_error(const char *at) -{ - VALUE str; + state = ruby_exec(); - ruby_nerrs = 0; - str = rb_str_buf_new2("compile error"); - if (at) { - rb_str_buf_cat2(str, " in "); - rb_str_buf_cat2(str, at); - } - rb_str_buf_cat(str, "\n", 1); - if (!NIL_P(ruby_errinfo)) { - rb_str_append(str, rb_obj_as_string(ruby_errinfo)); + if (state && !ex) { + ex = state; } - rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str)); + ruby_stop(ex); } VALUE -rb_eval_string(const char *str) +rb_eval_string(str) + const char *str; { VALUE v; NODE *oldsrc = ruby_current_node; @@ -1654,13 +287,17 @@ rb_eval_string(const char *str) } VALUE -rb_eval_string_protect(const char *str, int *state) +rb_eval_string_protect(str, state) + const char *str; + int *state; { - return rb_protect((VALUE (*)(VALUE))rb_eval_string, (VALUE)str, state); + return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state); } VALUE -rb_eval_string_wrap(const char *str, int *state) +rb_eval_string_wrap(str, state) + const char *str; + int *state; { int status; VALUE self = ruby_top_self; @@ -1669,16 +306,10 @@ rb_eval_string_wrap(const char *str, int *state) ruby_top_self = rb_obj_clone(ruby_top_self); rb_extend_object(ruby_top_self, ruby_wrapper); - PUSH_FRAME(Qfalse); - ruby_frame->self = self; - PUSH_CREF(ruby_wrapper = rb_module_new()); - PUSH_SCOPE(); val = rb_eval_string_protect(str, &status); ruby_top_self = self; - POP_SCOPE(); - POP_FRAME(); ruby_wrapper = wrapper; if (state) { *state = status; @@ -1689,176 +320,45 @@ rb_eval_string_wrap(const char *str, int *state) return val; } -NORETURN(static void localjump_error(const char*, VALUE, int, VALUE)); -static void -localjump_error(const char *mesg, VALUE value, int reason, VALUE bt) -{ - VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg); - ID id; - - rb_iv_set(exc, "@exit_value", value); - switch (reason) { - case TAG_BREAK: - id = rb_intern("break"); break; - case TAG_REDO: - id = rb_intern("redo"); break; - case TAG_RETRY: - id = rb_intern("retry"); break; - case TAG_NEXT: - id = rb_intern("next"); break; - case TAG_RETURN: - id = rb_intern("return"); break; - default: - id = rb_intern("yield"); break; - } - rb_iv_set(exc, "@reason", ID2SYM(id)); - if (bt) set_backtrace(exc, bt); - rb_exc_raise(exc); -} - -/* - * call_seq: - * local_jump_error.exit_value => obj - * - * Returns the exit value associated with this +LocalJumpError+. - */ -static VALUE -localjump_xvalue(VALUE exc) -{ - return rb_iv_get(exc, "@exit_value"); -} - -/* - * call-seq: - * local_jump_error.reason => symbol - * - * The reason this block was terminated: - * :break, :redo, :retry, :next, :return, or :yield. - */ - -static VALUE -localjump_reason(VALUE exc) -{ - return rb_iv_get(exc, "@reason"); -} - -NORETURN(static void jump_tag_but_local_jump(int,VALUE)); -static void -jump_tag_but_local_jump(int state, VALUE val) -{ - - if (val == Qundef) val = prot_tag->retval; - switch (state) { - case 0: - break; - case TAG_RETURN: - localjump_error("unexpected return", val, state, 0); - break; - case TAG_BREAK: - localjump_error("unexpected break", val, state, 0); - break; - case TAG_NEXT: - localjump_error("unexpected next", val, state, 0); - break; - case TAG_REDO: - localjump_error("unexpected redo", Qnil, state, 0); - break; - case TAG_RETRY: - localjump_error("retry outside of rescue clause", Qnil, state, 0); - break; - default: - break; - } - JUMP_TAG(state); -} - VALUE rb_eval_cmd(VALUE cmd, VALUE arg, int level) { int state; VALUE val = Qnil; /* OK */ - struct SCOPE *saved_scope; - volatile int safe = ruby_safe_level; + volatile int safe = rb_safe_level(); if (OBJ_TAINTED(cmd)) { level = 4; } if (TYPE(cmd) != T_STRING) { + PUSH_TAG(PROT_NONE); - ruby_safe_level = level; + rb_set_safe_level_force(level); if ((state = EXEC_TAG()) == 0) { - val = rb_funcall2(cmd, rb_intern("yield"), - RARRAY_LEN(arg), RARRAY_PTR(arg)); + val = + rb_funcall2(cmd, rb_intern("call"), RARRAY_LEN(arg), + RARRAY_PTR(arg)); } - ruby_safe_level = safe; POP_TAG(); - if (state) JUMP_TAG(state); - return val; - } - saved_scope = ruby_scope; - ruby_scope = top_scope; - PUSH_FRAME(Qfalse); - ruby_frame->self = ruby_top_self; - PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject); + rb_set_safe_level_force(safe); - ruby_safe_level = level; + if (state) + JUMP_TAG(state); + return val; + } PUSH_TAG(PROT_NONE); if ((state = EXEC_TAG()) == 0) { val = eval(ruby_top_self, cmd, Qnil, 0, 0); } - if (ruby_scope->flags & SCOPE_DONT_RECYCLE) - scope_dup(saved_scope); - ruby_scope = saved_scope; - ruby_safe_level = safe; POP_TAG(); - POP_FRAME(); - jump_tag_but_local_jump(state, val); + rb_set_safe_level_force(safe); + th_jump_tag_but_local_jump(state, val); return val; } -#define ruby_cbase (ruby_cref->nd_clss) -VALUE -ruby_current_class_object() -{ - return ruby_cbase; -} - -static VALUE -ev_const_defined(ID id, VALUE self) -{ - VALUE cbase = ruby_cbase; - if (NIL_P(cbase)) cbase = rb_obj_class(self); - return rb_const_defined_fallback(cbase, id, ruby_cref->nd_next); -} - -static VALUE -ev_const_get(ID id, VALUE self) -{ - VALUE cbase = ruby_cbase; - if (NIL_P(cbase)) cbase = rb_obj_class(self); - return rb_const_get_fallback(cbase, id, ruby_cref->nd_next); -} - -static VALUE -cvar_cbase(void) -{ - NODE *cref = ruby_cref; - - while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) { - cref = cref->nd_next; - if (!cref->nd_next) { - rb_warn("class variable access from toplevel singleton method"); - } - } - if (NIL_P(cref->nd_clss)) { - rb_raise(rb_eTypeError, "no class variables available"); - } - return cref->nd_clss; -} - /* * call-seq: * Module.nesting => array @@ -1877,15 +377,15 @@ cvar_cbase(void) static VALUE rb_mod_nesting(void) { - NODE *cbase = ruby_cref; VALUE ary = rb_ary_new(); + NODE *cref = ruby_cref(); - while (cbase && cbase->nd_next) { - if (!NIL_P(cbase->nd_clss)) rb_ary_push(ary, cbase->nd_clss); - cbase = cbase->nd_next; - } - if (ruby_wrapper && RARRAY_LEN(ary) == 0) { - rb_ary_push(ary, ruby_wrapper); + while (cref && cref->nd_next) { + VALUE klass = cref->nd_clss; + if (!NIL_P(klass)) { + rb_ary_push(ary, klass); + } + cref = cref->nd_next; } return ary; } @@ -1907,22 +407,28 @@ rb_mod_nesting(void) static VALUE rb_mod_s_constants(int argc, VALUE *argv, VALUE mod) { - NODE *cbase = ruby_cref; + NODE *cref = ruby_cref(); + VALUE klass; + VALUE cbase = 0; void *data = 0; if (argc > 0) { return rb_mod_constants(argc, argv, rb_cModule); } - while (cbase) { - if (!NIL_P(cbase->nd_clss)) { - data = rb_mod_const_at(cbase->nd_clss, data); + while (cref) { + klass = cref->nd_clss; + if (!NIL_P(klass)) { + data = rb_mod_const_at(cref->nd_clss, data); + if (!cbase) { + cbase = klass; + } } - cbase = cbase->nd_next; + cref = cref->nd_next; } - if (NIL_P(ruby_cbase)) { - data = rb_mod_const_of(ruby_cbase, data); + if (cbase) { + data = rb_mod_const_of(cbase, data); } return rb_const_list(data); } @@ -1930,219 +436,26 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod) void rb_frozen_class_p(VALUE klass) { - const char *desc = "something(?!)"; + char *desc = "something(?!)"; if (OBJ_FROZEN(klass)) { if (FL_TEST(klass, FL_SINGLETON)) desc = "object"; else { switch (TYPE(klass)) { - case T_MODULE: - case T_ICLASS: - desc = "module"; break; - case T_CLASS: - desc = "class"; break; + case T_MODULE: + case T_ICLASS: + desc = "module"; + break; + case T_CLASS: + desc = "class"; + break; } } rb_error_frozen(desc); } } -void -rb_undef(VALUE klass, ID id) -{ - VALUE origin; - NODE *body; - - if (ruby_cbase == rb_cObject && klass == rb_cObject) { - rb_secure(4); - } - if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) { - rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id)); - } - rb_frozen_class_p(klass); - if (id == object_id || id == __send || id == __send_bang || id == init) { - rb_warn("undefining `%s' may cause serious problem", rb_id2name(id)); - } - body = search_method(klass, id, &origin, LOOKUP_NOSKIP, 0); - if (!body || !body->nd_body) { - const char *s0 = " class"; - VALUE c = klass; - - if (FL_TEST(c, FL_SINGLETON)) { - VALUE obj = rb_iv_get(klass, "__attached__"); - - switch (TYPE(obj)) { - case T_MODULE: - case T_CLASS: - c = obj; - s0 = ""; - } - } - else if (TYPE(c) == T_MODULE) { - s0 = " module"; - } - rb_name_error(id, "undefined method `%s' for%s `%s'", - rb_id2name(id),s0,rb_class2name(c)); - } - rb_add_method(klass, id, 0, NOEX_PUBLIC); - if (FL_TEST(klass, FL_SINGLETON)) { - rb_funcall(rb_iv_get(klass, "__attached__"), - singleton_undefined, 1, ID2SYM(id)); - } - else { - rb_funcall(klass, undefined, 1, ID2SYM(id)); - } -} - -/* - * call-seq: - * undef_method(symbol) => self - * - * Prevents the current class from responding to calls to the named - * method. Contrast this with <code>remove_method</code>, which deletes - * the method from the particular class; Ruby will still search - * superclasses and mixed-in modules for a possible receiver. - * - * class Parent - * def hello - * puts "In parent" - * end - * end - * class Child < Parent - * def hello - * puts "In child" - * end - * end - * - * - * c = Child.new - * c.hello - * - * - * class Child - * remove_method :hello # remove from child, still in parent - * end - * c.hello - * - * - * class Child - * undef_method :hello # prevent any calls to 'hello' - * end - * c.hello - * - * <em>produces:</em> - * - * In child - * In parent - * prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError) - */ - -static VALUE -rb_mod_undef_method(int argc, VALUE *argv, VALUE mod) -{ - int i; - - for (i=0; i<argc; i++) { - rb_undef(mod, rb_to_id(argv[i])); - } - return mod; -} - -void -rb_alias(VALUE klass, ID name, ID def) -{ - VALUE origin; - NODE *orig, *body, *node; - VALUE singleton = 0; - - rb_frozen_class_p(klass); - if (name == def) return; - if (klass == rb_cObject) { - rb_secure(4); - } - orig = search_method(klass, def, &origin, LOOKUP_NOSKIP, 0); - if (!orig || !orig->nd_body) { - if (TYPE(klass) == T_MODULE) { - orig = search_method(rb_cObject, def, &origin, LOOKUP_NOSKIP, 0); - } - } - if (!orig || !orig->nd_body) { - raise_undef(klass, def); - } - if (FL_TEST(klass, FL_SINGLETON)) { - singleton = rb_iv_get(klass, "__attached__"); - } - body = orig->nd_body; - orig->nd_cnt++; - if (nd_type(body) == NODE_FBODY) { /* was alias */ - def = body->nd_mid; - origin = body->nd_orig; - body = body->nd_head; - } - - rb_clear_cache_by_id(name); - if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *)&node)) { - if (node->nd_cnt == 0 && node->nd_body) { - rb_warning("discarding old %s", rb_id2name(name)); - } - } - st_insert(RCLASS(klass)->m_tbl, name, - (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), - NOEX_WITH_SAFE(orig->nd_noex))); - if (singleton) { - rb_funcall(singleton, singleton_added, 1, ID2SYM(name)); - } - else { - rb_funcall(klass, added, 1, ID2SYM(name)); - } -} - -/* - * call-seq: - * alias_method(new_name, old_name) => self - * - * Makes <i>new_name</i> a new copy of the method <i>old_name</i>. This can - * be used to retain access to methods that are overridden. - * - * module Mod - * alias_method :orig_exit, :exit - * def exit(code=0) - * puts "Exiting with code #{code}" - * orig_exit(code) - * end - * end - * include Mod - * exit(99) - * - * <em>produces:</em> - * - * Exiting with code 99 - */ - -static VALUE -rb_mod_alias_method(VALUE mod, VALUE newname, VALUE oldname) -{ - rb_alias(mod, rb_to_id(newname), rb_to_id(oldname)); - return mod; -} - -static NODE* -copy_node_scope(NODE *node, NODE *rval) -{ - NODE *cref = NEW_NODE(NODE_CREF,rval->nd_clss,0,rval->nd_next); - NODE *copy = NEW_NODE(NODE_SCOPE,0,cref,node->nd_next); - - if (node->nd_tbl) { - copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1); - MEMCPY(copy->nd_tbl, node->nd_tbl, ID, node->nd_tbl[0]+1); - } - else { - copy->nd_tbl = 0; - } - return copy; -} - #ifdef C_ALLOCA # define TMP_PROTECT NODE * volatile tmp__protect_tmp=0 # define TMP_ALLOC(n) \ @@ -2154,279 +467,19 @@ copy_node_scope(NODE *node, NODE *rval) # define TMP_ALLOC(n) ALLOCA_N(VALUE,n) #endif -#define CALLARGS int argc; VALUE *argv; struct BLOCK *block = 0, _block -#define SETUP_ARGS0(anode,extra) do {\ - NODE *n = anode, *bpass = 0;\ - if (n && nd_type(n) == NODE_BLOCK_PASS) {\ - bpass = n;\ - n = n->nd_head;\ - }\ - if (!n) {\ - argc = 0;\ - argv = 0;\ - }\ - else if (nd_type(n) == NODE_ARRAY) {\ - argc=n->nd_alen;\ - if (argc > 0) {\ - int i;\ - argv = TMP_ALLOC(argc+extra);\ - for (i=0;i<argc;i++) {\ - argv[i] = rb_eval(self,n->nd_head);\ - n=n->nd_next;\ - }\ - }\ - else {\ - argc = 0;\ - argv = 0;\ - }\ - }\ - else {\ - VALUE args = rb_eval(self,n);\ - if (TYPE(args) != T_ARRAY)\ - args = rb_ary_to_ary(args);\ - argc = RARRAY_LEN(args);\ - argv = TMP_ALLOC(argc+extra);\ - MEMCPY(argv, RARRAY_PTR(args), VALUE, argc);\ - }\ - if (bpass) {\ - volatile VALUE save_block = rb_eval(self, bpass->nd_body); \ - block = passing_block(save_block, &_block);\ - }\ -} while (0) - -#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0) - -#define ZSUPER_ARGS() do {\ - argc = ruby_frame->argc;\ - if (argc && DMETHOD_P()) {\ - if (TYPE(RBASIC(ruby_scope)->klass) != T_ARRAY ||\ - RARRAY_LEN(RBASIC(ruby_scope)->klass) != argc) {\ - rb_raise(rb_eRuntimeError, \ - "super: specify arguments explicitly");\ - }\ - argv = RARRAY_PTR(RBASIC(ruby_scope)->klass);\ - }\ - else {\ - argv = ruby_scope->local_vars + 2;\ - }\ -} while (0) - #define MATCH_DATA *rb_svar(node->nd_cnt) -static const char* is_defined(VALUE, NODE*, char*, int); - -static char* -arg_defined(VALUE self, NODE *node, char *buf, char *type) -{ - int argc; - int i; - - if (!node) return type; /* no args */ - if (nd_type(node) == NODE_ARRAY) { - argc=node->nd_alen; - if (argc > 0) { - for (i=0;i<argc;i++) { - if (!is_defined(self, node->nd_head, buf, 0)) - return 0; - node = node->nd_next; - } - } - } - else if (!is_defined(self, node, buf, 0)) { - return 0; - } - return type; -} - -static const char* -is_defined(VALUE self, NODE *node /* OK */, char *buf, int noeval) -{ - VALUE val; /* OK */ - int state, noex; - static const char *ex = "expression"; - - if (!node) return ex; - switch (nd_type(node)) { - case NODE_SUPER: - case NODE_ZSUPER: - if (ruby_frame->this_func == 0) return 0; - else if (ruby_frame->this_class == 0) return 0; - val = ruby_frame->this_class; - if (method_exists(RCLASS(val)->super, ruby_frame->this_func, LOOKUP_FCALL)) { - if (nd_type(node) == NODE_SUPER) { - return arg_defined(self, node->nd_args, buf, "super"); - } - return "super"; - } - break; - - case NODE_VCALL: - case NODE_FCALL: - val = self; - noex = LOOKUP_FCALL; - goto check_bound; - - case NODE_ATTRASGN: - val = self; - if (node->nd_recv == (NODE *)1) goto check_bound; - case NODE_CALL: - if (!is_defined(self, node->nd_recv, buf, Qtrue)) return 0; - if (noeval) return ex; - noex = LOOKUP_NORMAL; - val = rb_eval(self, node->nd_recv); - check_bound: - { - ID id = node->nd_mid; - - val = CLASS_OF(val); - if (!rb_get_method_body(&val, &id, &noex)) - return 0; - if (nd_type(node) == NODE_CALL) { - if ((noex & NOEX_PRIVATE)) return 0; - if ((noex & NOEX_PROTECTED) && - !rb_obj_is_kind_of(self, rb_class_real(val))) - return 0; - } - return arg_defined(self, node->nd_args, buf, - nd_type(node) == NODE_ATTRASGN ? - "assignment" : "method"); - } - break; - - case NODE_MATCH2: - case NODE_MATCH3: - return "method"; - - case NODE_YIELD: - if (rb_block_given_p()) { - return "yield"; - } - break; - - case NODE_SELF: - return "self"; - - case NODE_NIL: - return "nil"; - - case NODE_TRUE: - return "true"; - - case NODE_FALSE: - return "false"; - - case NODE_ATTRSET: - case NODE_OP_ASGN1: - case NODE_OP_ASGN2: - case NODE_MASGN: - case NODE_LASGN: - case NODE_DASGN: - case NODE_DASGN_CURR: - case NODE_GASGN: - case NODE_IASGN: - case NODE_CDECL: - case NODE_CVDECL: - case NODE_CVASGN: - return "assignment"; - - case NODE_LVAR: - return "local-variable"; - case NODE_DVAR: - return "local-variable(in-block)"; - - case NODE_GVAR: - if (rb_gvar_defined(node->nd_entry)) { - return "global-variable"; - } - break; - - case NODE_IVAR: - if (rb_ivar_defined(self, node->nd_vid)) { - return "instance-variable"; - } - break; - - case NODE_CONST: - if (ev_const_defined(node->nd_vid, self)) { - return "constant"; - } - break; - - case NODE_CVAR: - if (rb_cvar_defined(cvar_cbase(), node->nd_vid)) { - return "class variable"; - } - break; - - case NODE_COLON2: - if (!is_defined(self, node->nd_recv, buf, Qtrue)) return 0; - if (noeval) return ex; - val = rb_eval(self, node->nd_recv); - switch (TYPE(val)) { - case T_CLASS: - case T_MODULE: - if (rb_const_defined_from(val, node->nd_mid)) - return "constant"; - break; - default: - if (rb_method_boundp(CLASS_OF(val), node->nd_mid, Qtrue)) { - return "method"; - } - } - break; - - case NODE_COLON3: - if (rb_const_defined_from(rb_cObject, node->nd_mid)) { - return "constant"; - } - break; - - case NODE_NTH_REF: - if (RTEST(rb_reg_nth_defined(node->nd_nth, MATCH_DATA))) { - if (!buf) return ex; - sprintf(buf, "$%d", (int)node->nd_nth); - return buf; - } - break; - - case NODE_BACK_REF: - if (RTEST(rb_reg_nth_defined(0, MATCH_DATA))) { - if (!buf) return ex; - sprintf(buf, "$%c", (char)node->nd_nth); - return buf; - } - break; - - default: - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - rb_eval(self, node); - } - POP_TAG(); - if (!state) { - return ex; - } - ruby_errinfo = Qnil; - break; - } - return 0; -} - -static int handle_rescue(VALUE,NODE*); - -static void blk_free(struct BLOCK *data); - static VALUE -rb_obj_is_proc(VALUE proc) +rb_obj_is_proc(proc) + VALUE proc; { - if (TYPE(proc) == T_DATA && RDATA(proc)->dfree == (RUBY_DATA_FUNC)blk_free) { - return Qtrue; - } - return Qfalse; + return yarv_obj_is_proc(proc); } void -rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events) +rb_add_event_hook(func, events) + rb_event_hook_func_t func; + rb_event_t events; { rb_event_hook_t *hook; @@ -2440,7 +493,6 @@ rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events) int rb_remove_event_hook(rb_event_hook_func_t func) { - rb_event_hook_t *prev, *hook; prev = NULL; @@ -2462,6 +514,12 @@ rb_remove_event_hook(rb_event_hook_func_t func) return -1; } +static void +rb_clear_trace_func(void) +{ + // TODO: fix me +} + /* * call-seq: * set_trace_func(proc) => proc @@ -2511,16 +569,18 @@ set_trace_func(VALUE obj, VALUE trace) { rb_event_hook_t *hook; - rb_secure(4); if (NIL_P(trace)) { - trace_func = 0; + rb_clear_trace_func(); rb_remove_event_hook(call_trace_func); return Qnil; } if (!rb_obj_is_proc(trace)) { rb_raise(rb_eTypeError, "trace_func needs to be Proc"); } - trace_func = trace; + + // register trace func + // trace_func = trace; + for (hook = event_hooks; hook; hook = hook->next) { if (hook->func == call_trace_func) return trace; @@ -2529,7 +589,7 @@ set_trace_func(VALUE obj, VALUE trace) return trace; } -static const char * +static char * get_event_name(rb_event_t event) { switch (event) { @@ -2555,31 +615,31 @@ get_event_name(rb_event_t event) } static void -call_trace_func(rb_event_t event, NODE *node, VALUE self, ID id, VALUE klass /* OK */) +call_trace_func(rb_event_t event, NODE *node, VALUE self, ID id, VALUE klass) { + // TODO: fix me +#if 0 int state, raised; - struct FRAME *prev; NODE *node_save; VALUE srcfile; - const char *event_name; + char *event_name; - if (!trace_func) return; - if (tracing) return; - if (id == ID_ALLOCATOR) return; - if (!node && ruby_sourceline == 0) return; + if (!trace_func) + return; + if (tracing) + return; + if (id == ID_ALLOCATOR) + return; + if (!node && ruby_sourceline == 0) + return; if (!(node_save = ruby_current_node)) { node_save = NEW_BEGIN(0); } tracing = 1; - prev = ruby_frame; - PUSH_FRAME(Qfalse); - *ruby_frame = *prev; - ruby_frame->prev = prev; if (node) { ruby_current_node = node; - ruby_frame->node = node; ruby_sourcefile = node->nd_file; ruby_sourceline = nd_line(node); } @@ -2588,1443 +648,42 @@ call_trace_func(rb_event_t event, NODE *node, VALUE self, ID id, VALUE klass /* klass = RBASIC(klass)->klass; } else if (FL_TEST(klass, FL_SINGLETON)) { - klass = rb_iv_get(klass, "__attached__"); + klass = self; } } PUSH_TAG(PROT_NONE); - raised = thread_reset_raised(); + raised = thread_reset_raised(th); if ((state = EXEC_TAG()) == 0) { - srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)"); + srcfile = rb_str_new2(ruby_sourcefile ? ruby_sourcefile : "(ruby)"); event_name = get_event_name(event); proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name), srcfile, INT2FIX(ruby_sourceline), - id?ID2SYM(id):Qnil, + id ? ID2SYM(id) : Qnil, self ? rb_f_binding(self) : Qnil, - klass?klass:Qnil), - Qundef, 0, 0); + klass ? klass : Qnil), Qundef, 0); } - if (raised) thread_set_raised(); + if (raised) + thread_set_raised(th); POP_TAG(); - POP_FRAME(); tracing = 0; ruby_current_node = node_save; SET_CURRENT_SOURCE(); - if (state) JUMP_TAG(state); -} - -static VALUE -splat(VALUE v, int strict) -{ - VALUE tmp; - - if (v == Qundef) return rb_ary_new2(0); - tmp = rb_check_convert_type(v, T_ARRAY, "Array", "to_splat"); - if (NIL_P(tmp)) { - if (strict) { - rb_raise(rb_eTypeError, "failed to splat"); - } - return rb_ary_new3(1, v); - } - return tmp; -} - -static VALUE -svalue_to_avalue(VALUE v) -{ - return splat(v, Qfalse); -} - -static VALUE -splat_value(VALUE v) -{ - return splat(v, Qtrue); -} - -static VALUE -class_prefix(VALUE self, NODE *cpath) -{ - if (!cpath) { - rb_bug("class path missing"); - } - if (cpath->nd_head) { - VALUE c = rb_eval(self, cpath->nd_head); - switch (TYPE(c)) { - case T_CLASS: - case T_MODULE: - break; - default: - rb_raise(rb_eTypeError, "%s is not a class/module", - RSTRING_PTR(rb_obj_as_string(c))); - } - return c; - } - else if (nd_type(cpath) == NODE_COLON2) { - return ruby_cbase; - } - else if (ruby_wrapper) { - return ruby_wrapper; - } - else { - return rb_cObject; - } -} - -#define return_value(v) do {\ - if ((prot_tag->retval = (v)) == Qundef) {\ - prot_tag->retval = Qnil;\ - }\ -} while (0) - -NORETURN(static void return_jump(VALUE)); -NORETURN(static void break_jump(VALUE)); -NORETURN(static void next_jump(VALUE)); -NORETURN(static void unknown_node(NODE * volatile)); - -static VALUE call_super(int, const VALUE*, struct BLOCK*); -static VALUE call_super_0(VALUE, VALUE, ID mid, int argc, const VALUE*, struct BLOCK *); - -static void -unknown_node(NODE *volatile node) -{ - ruby_current_node = 0; - if (node->flags == 0) { - rb_bug("terminated node (%p)", node); - } - else if (BUILTIN_TYPE(node) != T_NODE) { - rb_bug("not a node 0x%02lx (%p)", BUILTIN_TYPE(node), node); - } - else { - rb_bug("unknown node type %d (%p)", nd_type(node), node); - } -} - -static int -when_cond(VALUE v1, VALUE v2) -{ - if (v1 == Qundef) { - return RTEST(v2); - } - return RTEST(rb_funcall2(v2, eqq, 1, &v1)); -} - -static int -when_check(NODE *tag, VALUE val, VALUE self) -{ - VALUE elm; - long i; - - switch (nd_type(tag)) { - case NODE_ARRAY: - while (tag) { - elm = rb_eval(self, tag->nd_head); - if (when_cond(val, elm)) { - return Qtrue; - } - tag = tag->nd_next; - } - break; - case NODE_SPLAT: - tag = tag->nd_head; - splat: - elm = splat_value(rb_eval(self, tag)); - for (i=0; i<RARRAY_LEN(elm); i++) { - if (when_cond(val, RARRAY_PTR(elm)[i])) { - return Qtrue; - } - } - break; - case NODE_ARGSCAT: - if (when_check(tag->nd_head, val, self)) return Qtrue; - tag = tag->nd_body; - goto splat; - case NODE_ARGSPUSH: - if (when_check(tag->nd_head, val, self)) return Qtrue; - if (when_cond(val, rb_eval(self, tag->nd_body))) return Qtrue; - default: - if (when_cond(val, rb_eval(self, tag))) return Qtrue; - break; - } - return Qfalse; -} - -static VALUE -rb_eval(VALUE self, NODE *n) -{ - NODE * volatile contnode = 0; - NODE * volatile node = n; - int state; - volatile VALUE result = Qnil; - -#define RETURN(v) do { \ - result = (v); \ - goto finish; \ -} while (0) - - again: - if (!node) RETURN(Qnil); - - ruby_current_node = node; - if (node->flags & NODE_NEWLINE) { - EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, - ruby_frame->this_func, - ruby_frame->this_class); - } - switch (nd_type(node)) { - case NODE_BLOCK: - if (contnode) { - result = rb_eval(self, node); - break; - } - contnode = node->nd_next; - node = node->nd_head; - goto again; - - case NODE_POSTEXE: - PUSH_FRAME(Qtrue); - PUSH_BLOCK(ruby_frame->block, 0, node->nd_body); - rb_f_END(); - POP_BLOCK(); - POP_FRAME(); - nd_set_type(node, NODE_NIL); /* exec just once */ - result = Qnil; - break; - - /* begin .. end without clauses */ - case NODE_BEGIN: - node = node->nd_body; - goto again; - - /* nodes for speed-up(default match) */ - case NODE_MATCH: - result = rb_reg_match2(node->nd_lit); - break; - - /* nodes for speed-up(literal match) */ - case NODE_MATCH2: - { - VALUE l = rb_eval(self,node->nd_recv); - VALUE r = rb_eval(self,node->nd_value); - result = rb_reg_match(l, r); - } - break; - - /* nodes for speed-up(literal match) */ - case NODE_MATCH3: - { - VALUE r = rb_eval(self,node->nd_recv); - VALUE l = rb_eval(self,node->nd_value); - if (TYPE(l) == T_STRING) { - result = rb_reg_match(r, l); - } - else { - result = rb_funcall(l, match, 1, r); - } - } - break; - - /* node for speed-up(top-level loop for -n/-p) */ - case NODE_OPT_N: - PUSH_TAG(PROT_LOOP); - switch (state = EXEC_TAG()) { - case 0: - opt_n_next: - while (!NIL_P(rb_gets())) { - opt_n_redo: - rb_eval(self, node->nd_body); - } - break; - - case TAG_REDO: - state = 0; - goto opt_n_redo; - case TAG_NEXT: - state = 0; - goto opt_n_next; - case TAG_BREAK: - state = 0; - default: - break; - } - POP_TAG(); - if (state) JUMP_TAG(state); - RETURN(Qnil); - - case NODE_SELF: - RETURN(self); - - case NODE_NIL: - RETURN(Qnil); - - case NODE_TRUE: - RETURN(Qtrue); - - case NODE_FALSE: - RETURN(Qfalse); - - case NODE_ERRINFO: - RETURN(ruby_errinfo); - - case NODE_IF: - EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, - ruby_frame->this_func, - ruby_frame->this_class); - if (RTEST(rb_eval(self, node->nd_cond))) { - node = node->nd_body; - } - else { - node = node->nd_else; - } - goto again; - - case NODE_CASE: - { - VALUE val = Qundef; - - if (node->nd_head) - val = rb_eval(self, node->nd_head); - node = node->nd_body; - while (node) { - if (nd_type(node) != NODE_WHEN) { - goto again; - } - EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node->nd_head, self, - ruby_frame->this_func, - ruby_frame->this_class); - if (when_check(node->nd_head, val, self)) { - node = node->nd_body; - goto again; - } - node = node->nd_next; - } - } - RETURN(Qnil); - - case NODE_WHILE: - PUSH_TAG(PROT_LOOP); - result = Qnil; - switch (state = EXEC_TAG()) { - case 0: - if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond))) - goto while_out; - do { - while_redo: - rb_eval(self, node->nd_body); - while_next: - ; - } while (RTEST(rb_eval(self, node->nd_cond))); - break; - - case TAG_REDO: - state = 0; - goto while_redo; - case TAG_NEXT: - state = 0; - goto while_next; - case TAG_BREAK: - if (TAG_DST()) { - state = 0; - result = prot_tag->retval; - } - /* fall through */ - default: - break; - } - while_out: - POP_TAG(); - if (state) JUMP_TAG(state); - RETURN(result); - - case NODE_UNTIL: - PUSH_TAG(PROT_LOOP); - result = Qnil; - switch (state = EXEC_TAG()) { - case 0: - if (node->nd_state && RTEST(rb_eval(self, node->nd_cond))) - goto until_out; - do { - until_redo: - rb_eval(self, node->nd_body); - until_next: - ; - } while (!RTEST(rb_eval(self, node->nd_cond))); - break; - - case TAG_REDO: - state = 0; - goto until_redo; - case TAG_NEXT: - state = 0; - goto until_next; - case TAG_BREAK: - if (TAG_DST()) { - state = 0; - result = prot_tag->retval; - } - /* fall through */ - default: - break; - } - until_out: - POP_TAG(); - if (state) JUMP_TAG(state); - RETURN(result); - - case NODE_LAMBDA: - PUSH_TAG(PROT_LOOP); - PUSH_FRAME(Qtrue); - PUSH_BLOCK(ruby_frame->block, node->nd_var, node->nd_body); - state = EXEC_TAG(); - result = proc_lambda(); - POP_BLOCK(); - POP_FRAME(); - POP_TAG(); - break; - - case NODE_BREAK: - break_jump(rb_eval(self, node->nd_stts)); - break; - - case NODE_NEXT: - CHECK_INTS; - next_jump(rb_eval(self, node->nd_stts)); - break; - - case NODE_REDO: - CHECK_INTS; - JUMP_TAG(TAG_REDO); - break; - - case NODE_RETRY: - CHECK_INTS; - JUMP_TAG(TAG_RETRY); - break; - - case NODE_SPLAT: - result = splat_value(rb_eval(self, node->nd_head)); - break; - - case NODE_TO_ARY: - result = rb_ary_to_ary(rb_eval(self, node->nd_head)); - break; - - case NODE_YIELD: - if (node->nd_head) { - result = rb_eval(self, node->nd_head); - ruby_current_node = node; - } - else { - result = Qundef; /* no arg */ - } - SET_CURRENT_SOURCE(); - result = rb_yield_0(result, 0, 0, node->nd_state ? YIELD_VALUES : 0); - break; - - case NODE_RESCUE: - { - volatile VALUE e_info = ruby_errinfo; - volatile int rescuing = 0; - - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - retry_entry: - result = rb_eval(self, node->nd_head); - } - else if (rescuing) { - if (rescuing < 0) { - /* in rescue argument, just reraise */ - } - else if (state == TAG_RETRY) { - rescuing = state = 0; - ruby_errinfo = e_info; - goto retry_entry; - } - else if (state != TAG_RAISE) { - result = prot_tag->retval; - } - } - else if (state == TAG_RAISE) { - NODE *resq = node->nd_resq; - - rescuing = -1; - while (resq) { - ruby_current_node = resq; - if (handle_rescue(self, resq)) { - state = 0; - rescuing = 1; - result = rb_eval(self, resq->nd_body); - break; - } - resq = resq->nd_head; /* next rescue */ - } - } - else { - result = prot_tag->retval; - } - POP_TAG(); - if (state != TAG_RAISE) ruby_errinfo = e_info; - if (state) { - JUMP_TAG(state); - } - /* no exception raised */ - if (!rescuing && (node = node->nd_else)) { /* else clause given */ - goto again; - } - } - break; - - case NODE_ENSURE: - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - result = rb_eval(self, node->nd_head); - } - POP_TAG(); - if (node->nd_ensr && !thread_no_ensure()) { - VALUE retval = prot_tag->retval; /* save retval */ - VALUE errinfo = ruby_errinfo; - - rb_eval(self, node->nd_ensr); - return_value(retval); - ruby_errinfo = errinfo; - } - if (state) JUMP_TAG(state); - break; - - case NODE_AND: - result = rb_eval(self, node->nd_1st); - if (!RTEST(result)) break; - node = node->nd_2nd; - goto again; - - case NODE_OR: - result = rb_eval(self, node->nd_1st); - if (RTEST(result)) break; - node = node->nd_2nd; - goto again; - - case NODE_NOT: - if (RTEST(rb_eval(self, node->nd_body))) result = Qfalse; - else result = Qtrue; - break; - - case NODE_DOT2: - case NODE_DOT3: - { - VALUE beg = rb_eval(self, node->nd_beg); - VALUE end = rb_eval(self, node->nd_end); - result = rb_range_new(beg, end, nd_type(node) == NODE_DOT3); - } - break; - - case NODE_FLIP2: /* like AWK */ - { - VALUE *flip = rb_svar(node->nd_cnt); - if (!flip) rb_bug("unexpected local variable"); - if (!RTEST(*flip)) { - if (RTEST(rb_eval(self, node->nd_beg))) { - *flip = RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue; - result = Qtrue; - } - else { - result = Qfalse; - } - } - else { - if (RTEST(rb_eval(self, node->nd_end))) { - *flip = Qfalse; - } - result = Qtrue; - } - } - break; - - case NODE_FLIP3: /* like SED */ - { - VALUE *flip = rb_svar(node->nd_cnt); - if (!flip) rb_bug("unexpected local variable"); - if (!RTEST(*flip)) { - result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse; - *flip = result; - } - else { - if (RTEST(rb_eval(self, node->nd_end))) { - *flip = Qfalse; - } - result = Qtrue; - } - } - break; - - case NODE_RETURN: - return_jump(rb_eval(self, node->nd_stts)); - break; - - case NODE_ARGSCAT: - { - VALUE args = rb_eval(self, node->nd_head); - result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body))); - } - break; - - case NODE_ARGSPUSH: - { - VALUE args = rb_ary_dup(rb_eval(self, node->nd_head)); - result = rb_ary_push(args, rb_eval(self, node->nd_body)); - } - break; - - case NODE_ATTRASGN: - { - VALUE recv; - calling_scope_t scope; - CALLARGS; - TMP_PROTECT; - - if (node->nd_recv == (NODE *)1) { - recv = self; - scope = CALLING_FCALL; - } - else { - recv = rb_eval(self, node->nd_recv); - scope = CALLING_NORMAL; - } - SETUP_ARGS(node->nd_args); - - ruby_current_node = node; - SET_CURRENT_SOURCE(); - rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,block,scope,0,self); - result = argv[argc-1]; - } - break; - - case NODE_FOR: - { - VALUE recv; - int state; - struct BLOCK *block; - - PUSH_TAG(PROT_LOOP); - PUSH_BLOCK(block, node->nd_var, node->nd_body); - state = EXEC_TAG(); - if (state == 0) { - for_retry: - block->flags &= ~BLOCK_D_SCOPE; - recv = rb_eval(self, node->nd_iter); - ruby_current_node = node; - SET_CURRENT_SOURCE(); - result = rb_call(CLASS_OF(recv),recv,each,0,0, - block,CALLING_NORMAL,1,self); - } - else if (state == TAG_BREAK && TAG_DST()) { - result = prot_tag->retval; - state = 0; - } - else if (state == TAG_RETRY) { - state = 0; - goto for_retry; - } - POP_BLOCK(); - POP_TAG(); - if (state) JUMP_TAG(state); - } - break; - - case NODE_ITER: - { - VALUE recv = self; - calling_scope_t scope; - struct BLOCK *block_given; - - PUSH_TAG(PROT_LOOP); - PUSH_BLOCK(block_given, node->nd_var, node->nd_body); - node = node->nd_iter; /* should be NODE_CALL */ - switch (nd_type(node)) { - case NODE_CALL: - scope = CALLING_NORMAL; break; - case NODE_FCALL: - scope = CALLING_FCALL; break; - case NODE_VCALL: - scope = CALLING_VCALL; break; - case NODE_SUPER: - case NODE_ZSUPER: - scope = CALLING_SUPER; break; - default: - /* error! */ - unknown_node(node); - } - state = EXEC_TAG(); - if (state == 0) { - CALLARGS; - TMP_PROTECT; - - iter_retry: - if (scope == CALLING_NORMAL) { - recv = rb_eval(self, node->nd_recv); - } - if (nd_type(node) == NODE_ZSUPER) { - ZSUPER_ARGS(); - } - else { - SETUP_ARGS(node->nd_args); - ruby_current_node = node; - } - SET_CURRENT_SOURCE(); - switch (scope) { - case CALLING_SUPER: - result = call_super(argc, argv, block_given); - break; - default: - result = rb_call(CLASS_OF(recv),recv,node->nd_mid, - argc,argv,block_given,scope,1,self); - break; - } - } - else if (state == TAG_BREAK && TAG_DST()) { - result = prot_tag->retval; - state = 0; - } - else if (state == TAG_RETRY) { - state = 0; - goto iter_retry; - } - POP_BLOCK(); - POP_TAG(); - if (state) JUMP_TAG(state); - } - break; - - case NODE_CALL: - { - VALUE recv; - CALLARGS; - TMP_PROTECT; - - recv = rb_eval(self, node->nd_recv); - SETUP_ARGS(node->nd_args); - - ruby_current_node = node; - SET_CURRENT_SOURCE(); - result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv, - block,CALLING_NORMAL,0,self); - } - break; - - case NODE_FCALL: - { - CALLARGS; - TMP_PROTECT; - - SETUP_ARGS(node->nd_args); - - ruby_current_node = node; - SET_CURRENT_SOURCE(); - result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv, - block,CALLING_FCALL,0,self); - } - break; - - case NODE_VCALL: - SET_CURRENT_SOURCE(); - result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,0,CALLING_VCALL,0,self); - break; - - case NODE_SUPER: - case NODE_ZSUPER: - { - CALLARGS; - TMP_PROTECT; - - if (ruby_frame->this_class == 0) { - if (ruby_frame->this_func) { - rb_name_error(ruby_frame->callee, - "superclass method `%s' disabled", - rb_id2name(ruby_frame->this_func)); - } - else { - rb_raise(rb_eNoMethodError, "super called outside of method"); - } - } - if (nd_type(node) == NODE_ZSUPER) { - ZSUPER_ARGS(); - SET_CURRENT_SOURCE(); - result = rb_call_super(argc, argv); - } - else { - SETUP_ARGS(node->nd_args); - ruby_current_node = node; - SET_CURRENT_SOURCE(); - result = call_super(argc, argv, block); - } - } - break; - - case NODE_SCOPE: - { - struct FRAME frame; - NODE *saved_cref = 0; - - frame = *ruby_frame; - frame.tmp = ruby_frame; - ruby_frame = &frame; - - PUSH_SCOPE(); - PUSH_TAG(PROT_NONE); - if (node->nd_rval) { - saved_cref = ruby_cref; - ruby_cref = (NODE*)node->nd_rval; - } - if (node->nd_tbl) { - VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1); - *vars++ = (VALUE)node; - ruby_scope->local_vars = vars; - rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]); - ruby_scope->local_tbl = node->nd_tbl; - } - else { - ruby_scope->local_vars = 0; - ruby_scope->local_tbl = 0; - } - if ((state = EXEC_TAG()) == 0) { - result = rb_eval(self, node->nd_next); - } - POP_TAG(); - POP_SCOPE(); - ruby_frame = frame.tmp; - if (saved_cref) - ruby_cref = saved_cref; - if (state) JUMP_TAG(state); - } - break; - - case NODE_OP_ASGN1: - { - CALLARGS; - VALUE recv, val, tmp; - NODE *rval; - TMP_PROTECT; - - recv = rb_eval(self, node->nd_recv); - rval = node->nd_args->nd_head; - SETUP_ARGS0(node->nd_args->nd_body,1); - val = rb_funcall3(recv, aref, argc, argv); - switch (node->nd_mid) { - case 0: /* OR */ - if (RTEST(val)) RETURN(val); - val = rb_eval(self, rval); - break; - case 1: /* AND */ - if (!RTEST(val)) RETURN(val); - val = rb_eval(self, rval); - break; - default: - tmp = rb_eval(self, rval); - val = rb_funcall3(val, node->nd_mid, 1, &tmp); - } - argv[argc] = val; - rb_funcall3(recv, aset, argc+1, argv); - result = val; - } - break; - - case NODE_OP_ASGN2: - { - ID id = node->nd_next->nd_vid; - VALUE recv, val, tmp; - - recv = rb_eval(self, node->nd_recv); - val = rb_funcall3(recv, id, 0, 0); - switch (node->nd_next->nd_mid) { - case 0: /* OR */ - if (RTEST(val)) RETURN(val); - val = rb_eval(self, node->nd_value); - break; - case 1: /* AND */ - if (!RTEST(val)) RETURN(val); - val = rb_eval(self, node->nd_value); - break; - default: - tmp = rb_eval(self, node->nd_value); - val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp); - } - - rb_funcall3(recv, node->nd_next->nd_aid, 1, &val); - result = val; - } - break; - - case NODE_OP_ASGN_AND: - result = rb_eval(self, node->nd_head); - if (!RTEST(result)) break; - node = node->nd_value; - goto again; - - case NODE_OP_ASGN_OR: - if ((node->nd_aid && !is_defined(self, node->nd_head, 0, 0)) || - !RTEST(result = rb_eval(self, node->nd_head))) { - node = node->nd_value; - goto again; - } - break; - - case NODE_MASGN: - result = massign(self, node, rb_eval(self, node->nd_value), 0); - break; - - case NODE_LASGN: - if (ruby_scope->local_vars == 0) - rb_bug("unexpected local variable assignment"); - result = rb_eval(self, node->nd_value); - ruby_scope->local_vars[node->nd_cnt] = result; - break; - - case NODE_DASGN: - result = rb_eval(self, node->nd_value); - dvar_asgn(node->nd_vid, result); - break; - - case NODE_DASGN_CURR: - result = rb_eval(self, node->nd_value); - dvar_asgn_curr(node->nd_vid, result); - break; - - case NODE_GASGN: - result = rb_eval(self, node->nd_value); - rb_gvar_set(node->nd_entry, result); - break; - - case NODE_IASGN: - result = rb_eval(self, node->nd_value); - rb_ivar_set(self, node->nd_vid, result); - break; - - case NODE_CDECL: - result = rb_eval(self, node->nd_value); - if (node->nd_vid == 0) { - rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result); - } - else { - rb_const_set(ruby_cbase, node->nd_vid, result); - } - break; - - case NODE_CVDECL: - if (NIL_P(ruby_cbase)) { - rb_raise(rb_eTypeError, "no class/module to define class variable"); - } - result = rb_eval(self, node->nd_value); - rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qtrue); - break; - - case NODE_CVASGN: - result = rb_eval(self, node->nd_value); - rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qfalse); - break; - - case NODE_LVAR: - if (ruby_scope->local_vars == 0) { - rb_bug("unexpected local variable"); - } - result = ruby_scope->local_vars[node->nd_cnt]; - break; - - case NODE_DVAR: - result = rb_dvar_ref(node->nd_vid); - break; - - case NODE_GVAR: - result = rb_gvar_get(node->nd_entry); - break; - - case NODE_IVAR: - result = rb_ivar_get(self, node->nd_vid); - break; - - case NODE_CONST: - result = ev_const_get(node->nd_vid, self); - break; - - case NODE_CVAR: - result = rb_cvar_get(cvar_cbase(), node->nd_vid); - break; - - case NODE_BLOCK_ARG: - if (ruby_scope->local_vars == 0) - rb_bug("unexpected block argument"); - if (rb_block_given_p()) { - result = rb_block_proc(); - ruby_scope->local_vars[node->nd_cnt] = result; - } - else { - result = Qnil; - } - break; - - case NODE_COLON2: - { - VALUE klass; - - klass = rb_eval(self, node->nd_head); - if (rb_is_const_id(node->nd_mid)) { - switch (TYPE(klass)) { - case T_CLASS: - case T_MODULE: - result = rb_const_get_from(klass, node->nd_mid); - break; - default: - rb_raise(rb_eTypeError, "%s is not a class/module", - RSTRING_PTR(rb_obj_as_string(klass))); - break; - } - } - else { - result = rb_funcall(klass, node->nd_mid, 0, 0); - } - } - break; - - case NODE_COLON3: - result = rb_const_get_from(rb_cObject, node->nd_mid); - break; - - case NODE_NTH_REF: - result = rb_reg_nth_match(node->nd_nth, MATCH_DATA); - break; - - case NODE_BACK_REF: - switch (node->nd_nth) { - case '&': - result = rb_reg_last_match(MATCH_DATA); - break; - case '`': - result = rb_reg_match_pre(MATCH_DATA); - break; - case '\'': - result = rb_reg_match_post(MATCH_DATA); - break; - case '+': - result = rb_reg_match_last(MATCH_DATA); - break; - default: - rb_bug("unexpected back-ref"); - } - break; - - case NODE_HASH: - { - NODE *list; - VALUE hash = rb_hash_new(); - VALUE key, val; - - list = node->nd_head; - while (list) { - key = rb_eval(self, list->nd_head); - list = list->nd_next; - if (list == 0) - rb_bug("odd number list for Hash"); - val = rb_eval(self, list->nd_head); - list = list->nd_next; - rb_hash_aset(hash, key, val); - } - result = hash; - } - break; - - case NODE_ZARRAY: /* zero length list */ - result = rb_ary_new(); - break; - - case NODE_ARRAY: - { - VALUE ary; - long i; - - i = node->nd_alen; - ary = rb_ary_new2(i); - for (i=0;node;node=node->nd_next) { - rb_ary_push(ary, rb_eval(self, node->nd_head)); - } - - result = ary; - } - break; - - case NODE_VALUES: - { - VALUE val; - long i; - - i = node->nd_alen; - val = rb_ary_new2(i); - for (i=0;node;node=node->nd_next) { - rb_ary_push(val, rb_eval(self, node->nd_head)); - } - - result = val; - } - break; - - case NODE_STR: - result = rb_str_new3(node->nd_lit); - break; - - case NODE_EVSTR: - if (!node->nd_body) result = rb_str_new(0,0); - else { - result = rb_obj_as_string(rb_eval(self, node->nd_body)); - } - break; - - case NODE_DSTR: - case NODE_DXSTR: - case NODE_DREGX: - case NODE_DREGX_ONCE: - case NODE_DSYM: - { - VALUE str, str2; - NODE *list = node->nd_next; - - str = rb_str_new3(node->nd_lit); - while (list) { - if (list->nd_head) { - switch (nd_type(list->nd_head)) { - case NODE_STR: - str2 = list->nd_head->nd_lit; - break; - default: - str2 = rb_eval(self, list->nd_head); - break; - } - rb_str_append(str, str2); - OBJ_INFECT(str, str2); - } - list = list->nd_next; - } - switch (nd_type(node)) { - case NODE_DREGX: - result = rb_reg_new(RSTRING_PTR(str), RSTRING_LEN(str), - node->nd_cflag); - break; - case NODE_DREGX_ONCE: /* regexp expand once */ - result = rb_reg_new(RSTRING_PTR(str), RSTRING_LEN(str), - node->nd_cflag); - nd_set_type(node, NODE_LIT); - node->nd_lit = result; - break; - case NODE_LIT: - /* other thread may replace NODE_DREGX_ONCE to NODE_LIT */ - goto again; - case NODE_DXSTR: - result = rb_funcall(self, '`', 1, str); - break; - case NODE_DSYM: - result = rb_str_intern(str); - break; - default: - result = str; - break; - } - } - break; - - case NODE_XSTR: - result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit)); - break; - - case NODE_LIT: - result = node->nd_lit; - break; - - case NODE_DEFN: - if (node->nd_defn) { - NODE *body, *defn; - VALUE origin; - int noex; - - if (NIL_P(ruby_cbase)) { - rb_raise(rb_eTypeError, "no class/module to define method"); - } - if (ruby_cbase == rb_cObject && node->nd_mid == init) { - rb_warn("redefining Object#initialize may cause infinite loop"); - } - if (node->nd_mid == object_id || - node->nd_mid == __send || node->nd_mid == __send_bang) { - rb_warn("redefining `%s' may cause serious problem", - rb_id2name(node->nd_mid)); - } - rb_frozen_class_p(ruby_cbase); - body = search_method(ruby_cbase, node->nd_mid, &origin, LOOKUP_NOSKIP, 0); - if (body){ - if (RTEST(ruby_verbose) && ruby_cbase == origin && - body->nd_cnt == 0 && body->nd_body) { - rb_warning("method redefined; discarding old %s", rb_id2name(node->nd_mid)); - } - } - - if (VIS_TEST(VIS_PRIVATE) || node->nd_mid == init) { - noex = NOEX_PRIVATE; - } - else if (VIS_TEST(VIS_LOCAL)) { - noex = NOEX_LOCAL; - } - else if (VIS_TEST(VIS_PROTECTED)) { - noex = NOEX_PROTECTED; - } - else { - noex = NOEX_PUBLIC; - } - if (body && origin == ruby_cbase && body->nd_body == 0) { - noex |= NOEX_NOSUPER; - } - - defn = copy_node_scope(node->nd_defn, ruby_cref); - rb_add_method(ruby_cbase, node->nd_mid, defn, noex); - if (VIS_MODE() == VIS_MODFUNC) { - rb_add_method(rb_singleton_class(ruby_cbase), - node->nd_mid, defn, NOEX_PUBLIC); - } - result = Qnil; - } - break; - - case NODE_DEFS: - if (node->nd_defn) { - VALUE recv = rb_eval(self, node->nd_recv); - VALUE klass; - NODE *body = 0, *defn; - - if (ruby_safe_level >= 4 && !OBJ_TAINTED(recv)) { - rb_raise(rb_eSecurityError, "Insecure: can't define singleton method"); - } - if (FIXNUM_P(recv) || SYMBOL_P(recv)) { - rb_raise(rb_eTypeError, - "can't define singleton method \"%s\" for %s", - rb_id2name(node->nd_mid), - rb_obj_classname(recv)); - } - - if (OBJ_FROZEN(recv)) rb_error_frozen("object"); - klass = rb_singleton_class(recv); - if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, (st_data_t *)&body)) { - if (ruby_safe_level >= 4) { - rb_raise(rb_eSecurityError, "redefining method prohibited"); - } - if (RTEST(ruby_verbose)) { - rb_warning("redefine %s", rb_id2name(node->nd_mid)); - } - } - defn = copy_node_scope(node->nd_defn, ruby_cref); - rb_add_method(klass, node->nd_mid, defn, - NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0)); - result = Qnil; - } - break; - - case NODE_UNDEF: - if (NIL_P(ruby_cbase)) { - rb_raise(rb_eTypeError, "no class to undef method"); - } - rb_undef(ruby_cbase, rb_to_id(rb_eval(self, node->u2.node))); - result = Qnil; - break; - - case NODE_ALIAS: - if (NIL_P(ruby_cbase)) { - rb_raise(rb_eTypeError, "no class to make alias"); - } - rb_alias(ruby_cbase, rb_to_id(rb_eval(self, node->u1.node)), - rb_to_id(rb_eval(self, node->u2.node))); - result = Qnil; - break; - - case NODE_VALIAS: - rb_alias_variable(node->u1.id, node->u2.id); - result = Qnil; - break; - - case NODE_CLASS: - { - VALUE super, klass, tmp, cbase; - ID cname; - int gen = Qfalse; - - cbase = class_prefix(self, node->nd_cpath); - cname = node->nd_cpath->nd_mid; - - if (NIL_P(ruby_cbase)) { - rb_raise(rb_eTypeError, "no outer class/module"); - } - if (node->nd_super) { - super = rb_eval(self, node->nd_super); - rb_check_inheritable(super); - } - else { - super = 0; - } - - if (rb_const_defined_at(cbase, cname)) { - klass = rb_const_get_at(cbase, cname); - if (TYPE(klass) != T_CLASS) { - rb_raise(rb_eTypeError, "%s is not a class", - rb_id2name(cname)); - } - if (super) { - tmp = rb_class_real(RCLASS(klass)->super); - if (tmp != super) { - rb_raise(rb_eTypeError, "superclass mismatch for class %s", - rb_id2name(cname)); - } - super = 0; - } - if (ruby_safe_level >= 4) { - rb_raise(rb_eSecurityError, "extending class prohibited"); - } - } - else { - if (!super) super = rb_cObject; - klass = rb_define_class_id(cname, super); - rb_set_class_path(klass, cbase, rb_id2name(cname)); - rb_const_set(cbase, cname, klass); - gen = Qtrue; - } - if (ruby_wrapper) { - rb_extend_object(klass, ruby_wrapper); - rb_include_module(klass, ruby_wrapper); - } - if (super && gen) { - rb_class_inherited(super, klass); - } - result = module_setup(klass, node); - } - break; - - case NODE_MODULE: - { - VALUE module, cbase; - ID cname; - - if (NIL_P(ruby_cbase)) { - rb_raise(rb_eTypeError, "no outer class/module"); - } - cbase = class_prefix(self, node->nd_cpath); - cname = node->nd_cpath->nd_mid; - if (rb_const_defined_at(cbase, cname)) { - module = rb_const_get_at(cbase, cname); - if (TYPE(module) != T_MODULE) { - rb_raise(rb_eTypeError, "%s is not a module", - rb_id2name(cname)); - } - if (ruby_safe_level >= 4) { - rb_raise(rb_eSecurityError, "extending module prohibited"); - } - } - else { - module = rb_define_module_id(cname); - rb_set_class_path(module, cbase, rb_id2name(cname)); - rb_const_set(cbase, cname, module); - rb_obj_call_init(module, 0, 0); - } - if (ruby_wrapper) { - rb_extend_object(module, ruby_wrapper); - rb_include_module(module, ruby_wrapper); - } - result = module_setup(module, node); - } - break; - - case NODE_SCLASS: - { - VALUE klass; - - result = rb_eval(self, node->nd_recv); - if (FIXNUM_P(result) || SYMBOL_P(result)) { - rb_raise(rb_eTypeError, "no singleton class for %s", - rb_obj_classname(result)); - } - if (ruby_safe_level >= 4 && !OBJ_TAINTED(result)) - rb_raise(rb_eSecurityError, "Insecure: can't extend object"); - klass = rb_singleton_class(result); - - if (ruby_wrapper) { - rb_extend_object(klass, ruby_wrapper); - rb_include_module(klass, ruby_wrapper); - } - - result = module_setup(klass, node); - } - break; - - case NODE_DEFINED: - { - char buf[20]; - const char *desc = is_defined(self, node->nd_head, buf, 0); - - if (desc) result = rb_str_new2(desc); - else result = Qnil; - } - break; - - default: - unknown_node(node); - } - finish: - CHECK_INTS; - if (contnode) { - node = contnode; - contnode = 0; - goto again; - } - return result; + if (state) + JUMP_TAG(state); +#endif } -static VALUE -module_setup(VALUE module, NODE *n) -{ - NODE * volatile node = n->nd_body; - int state; - struct FRAME frame; - VALUE result = Qnil; /* OK */ - TMP_PROTECT; - - frame = *ruby_frame; - frame.tmp = ruby_frame; - ruby_frame = &frame; - - PUSH_SCOPE(); - PUSH_VARS(); - - if (node->nd_tbl) { - VALUE *vars = TMP_ALLOC(node->nd_tbl[0]+1); - *vars++ = (VALUE)node; - ruby_scope->local_vars = vars; - rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]); - ruby_scope->local_tbl = node->nd_tbl; - } - else { - ruby_scope->local_vars = 0; - ruby_scope->local_tbl = 0; - } - - PUSH_CREF(module); - VIS_SET(VIS_PUBLIC); - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - EXEC_EVENT_HOOK(RUBY_EVENT_CLASS, n, ruby_cbase, - ruby_frame->this_func, ruby_frame->this_class); - result = rb_eval(ruby_cbase, node->nd_next); - } - POP_TAG(); - POP_CREF(); - POP_VARS(); - POP_SCOPE(); - ruby_frame = frame.tmp; - EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0, ruby_frame->this_func, - ruby_frame->this_class); - if (state) JUMP_TAG(state); - - return result; -} +/* + * call-seq: + * obj.respond_to?(symbol, include_private=false) => true or false + * + * Returns +true+> if _obj_ responds to the given + * method. Private methods are included in the search only if the + * optional second parameter evaluates to +true+. + */ static NODE *basic_respond_to = 0; @@ -4040,7 +699,8 @@ rb_obj_respond_to(VALUE obj, ID id, int priv) VALUE args[2]; int n = 0; args[n++] = ID2SYM(id); - if (priv) args[n++] = Qtrue; + if (priv) + args[n++] = Qtrue; return rb_funcall2(obj, respond_to, n, args); } } @@ -4076,12 +736,11 @@ obj_respond_to(int argc, VALUE *argv, VALUE obj) /* * call-seq: - * mod.method_defined?(symbol, inherit=true) => true or false + * mod.method_defined?(symbol) => true or false * * Returns +true+ if the named method is defined by * _mod_ (or its included modules and, if _mod_ is a class, - * its ancestors, if _inherit_ is true). Public and protected - * methods are matched. + * its ancestors). Public and protected methods are matched. * * module A * def method1() end @@ -4099,27 +758,13 @@ obj_respond_to(int argc, VALUE *argv, VALUE obj) * C.method_defined? "method2" #=> true * C.method_defined? "method3" #=> true * C.method_defined? "method4" #=> false - * C.method_defined?("method2", false) #=> false */ static VALUE -rb_mod_method_defined(int argc, VALUE *argv, VALUE mod) +rb_mod_method_defined(mod, mid) + VALUE mod, mid; { - VALUE mid, recur; - ID id; - - if (argc == 1) { - recur = Qtrue; - mid = argv[0]; - } - else { - rb_scan_args(argc, argv, "11", &mid, &recur); - } - id = rb_to_id(mid); - if (!RTEST(recur)) { - return st_is_member(RCLASS(mod)->m_tbl, id) ? Qtrue : Qfalse; - } - return rb_method_boundp(mod, id, Qtrue); + return rb_method_boundp(mod, rb_to_id(mid), 1); } #define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f)) @@ -4154,10 +799,11 @@ static VALUE rb_mod_public_method_defined(VALUE mod, VALUE mid) { ID id = rb_to_id(mid); - int noex = LOOKUP_NOSKIP; + NODE *method; - if (rb_get_method_body(&mod, &id, &noex)) { - if (VISI_CHECK(noex, NOEX_PUBLIC)) + method = rb_method_node(mod, id); + if (method) { + if (VISI_CHECK(method->nd_noex, NOEX_PUBLIC)) return Qtrue; } return Qfalse; @@ -4193,10 +839,11 @@ static VALUE rb_mod_private_method_defined(VALUE mod, VALUE mid) { ID id = rb_to_id(mid); - int noex = LOOKUP_NOSKIP; + NODE *method; - if (rb_get_method_body(&mod, &id, &noex)) { - if (VISI_CHECK(noex, NOEX_PRIVATE)) + method = rb_method_node(mod, id); + if (method) { + if (VISI_CHECK(method->nd_noex, NOEX_PRIVATE)) return Qtrue; } return Qfalse; @@ -4232,157 +879,45 @@ static VALUE rb_mod_protected_method_defined(VALUE mod, VALUE mid) { ID id = rb_to_id(mid); - int noex = LOOKUP_NOSKIP; + NODE *method; - if (rb_get_method_body(&mod, &id, &noex)) { - if (VISI_CHECK(noex, NOEX_PROTECTED)) + method = rb_method_node(mod, id); + if (method) { + if (VISI_CHECK(method->nd_noex, NOEX_PROTECTED)) return Qtrue; } return Qfalse; } -NORETURN(static VALUE terminate_process(int, VALUE)); -static VALUE -terminate_process(int status, VALUE mesg) -{ - VALUE args[2]; - args[0] = INT2NUM(status); - args[1] = mesg; - - rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit)); -} - -void -rb_exit(int status) -{ - if (prot_tag) { - terminate_process(status, rb_str_new("exit", 4)); - } - ruby_finalize(); - exit(status); -} - - -/* - * call-seq: - * exit(integer=0) - * Kernel::exit(integer=0) - * Process::exit(integer=0) - * - * Initiates the termination of the Ruby script by raising the - * <code>SystemExit</code> exception. This exception may be caught. The - * optional parameter is used to return a status code to the invoking - * environment. - * - * begin - * exit - * puts "never get here" - * rescue SystemExit - * puts "rescued a SystemExit exception" - * end - * puts "after begin block" - * - * <em>produces:</em> - * - * rescued a SystemExit exception - * after begin block - * - * Just prior to termination, Ruby executes any <code>at_exit</code> functions - * (see Kernel::at_exit) and runs any object finalizers (see - * ObjectSpace::define_finalizer). - * - * at_exit { puts "at_exit function" } - * ObjectSpace.define_finalizer("string", proc { puts "in finalizer" }) - * exit - * - * <em>produces:</em> - * - * at_exit function - * in finalizer - */ - -VALUE -rb_f_exit(int argc, VALUE *argv) -{ - VALUE status; - int istatus; - - rb_secure(4); - if (rb_scan_args(argc, argv, "01", &status) == 1) { - switch (status) { - case Qtrue: - istatus = EXIT_SUCCESS; - break; - case Qfalse: - istatus = EXIT_FAILURE; - break; - default: - istatus = NUM2INT(status); -#if EXIT_SUCCESS != 0 - if (istatus == 0) istatus = EXIT_SUCCESS; -#endif - break; - } - } - else { - istatus = EXIT_SUCCESS; - } - rb_exit(istatus); - return Qnil; /* not reached */ -} - - -/* - * call-seq: - * abort - * Kernel::abort - * Process::abort - * - * Terminate execution immediately, effectively by calling - * <code>Kernel.exit(1)</code>. If _msg_ is given, it is written - * to STDERR prior to terminating. - */ - -VALUE -rb_f_abort(int argc, VALUE *argv) -{ - rb_secure(4); - if (argc == 0) { - if (!NIL_P(ruby_errinfo)) { - error_print(); - } - rb_exit(EXIT_FAILURE); - } - else { - VALUE mesg; - - rb_scan_args(argc, argv, "1", &mesg); - StringValue(mesg); - rb_io_puts(1, &mesg, rb_stderr); - terminate_process(EXIT_FAILURE, mesg); - } - return Qnil; /* not reached */ -} +NORETURN(void th_iter_break _((yarv_thread_t *))); void -rb_iter_break(void) +rb_iter_break() { - break_jump(Qnil); + th_iter_break(GET_THREAD()); } -NORETURN(static void rb_longjmp(int, VALUE)); -static VALUE make_backtrace(void); +NORETURN(static void rb_longjmp _((int, VALUE))); +static VALUE make_backtrace _((void)); static void -rb_longjmp(int tag, VALUE mesg) +rb_longjmp(tag, mesg) + int tag; + VALUE mesg; { VALUE at; + yarv_thread_t *th = GET_THREAD(); - if (thread_set_raised()) { - ruby_errinfo = exception_error; + //while (th->cfp->pc == 0 || th->cfp->iseq == 0) { + //th->cfp++; + //} + + if (thread_set_raised(th)) { + th->errinfo = exception_error; JUMP_TAG(TAG_FATAL); } - if (NIL_P(mesg)) mesg = ruby_errinfo; + if (NIL_P(mesg)) + mesg = GET_THREAD()->errinfo; if (NIL_P(mesg)) { mesg = rb_exc_new(rb_eRuntimeError, 0, 0); } @@ -4396,60 +931,55 @@ rb_longjmp(int tag, VALUE mesg) } } if (!NIL_P(mesg)) { - ruby_errinfo = mesg; + GET_THREAD()->errinfo = mesg; } - if (RTEST(ruby_debug) && !NIL_P(ruby_errinfo) - && !rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) { - VALUE e = ruby_errinfo; + if (RTEST(ruby_debug) && !NIL_P(GET_THREAD()->errinfo) + && !rb_obj_is_kind_of(GET_THREAD()->errinfo, rb_eSystemExit)) { + VALUE e = GET_THREAD()->errinfo; int status; PUSH_TAG(PROT_NONE); if ((status = EXEC_TAG()) == 0) { e = rb_obj_as_string(e); warn_printf("Exception `%s' at %s:%d - %s\n", - rb_obj_classname(ruby_errinfo), - ruby_sourcefile, ruby_sourceline, - RSTRING_PTR(e)); + rb_obj_classname(GET_THREAD()->errinfo), + ruby_sourcefile, ruby_sourceline, RSTRING_PTR(e)); } POP_TAG(); - if (status == TAG_FATAL && ruby_errinfo == exception_error) { - ruby_errinfo = mesg; + if (status == TAG_FATAL && GET_THREAD()->errinfo == exception_error) { + GET_THREAD()->errinfo = mesg; } else if (status) { - thread_reset_raised(); + thread_reset_raised(th); JUMP_TAG(status); } } rb_trap_restore_mask(); if (tag != TAG_FATAL) { - EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node, - ruby_frame->self, - ruby_frame->this_func, - ruby_frame->this_class); - } - if (!prot_tag) { - error_print(); + // EXEC_EVENT_HOOK(RUBY_EVENT_RAISE ...) } - thread_reset_raised(); + thread_reset_raised(th); JUMP_TAG(tag); } void -rb_exc_raise(VALUE mesg) +rb_exc_raise(mesg) + VALUE mesg; { rb_longjmp(TAG_RAISE, mesg); } void -rb_exc_fatal(VALUE mesg) +rb_exc_fatal(mesg) + VALUE mesg; { rb_longjmp(TAG_FATAL, mesg); } void -rb_interrupt(void) +rb_interrupt() { rb_raise(rb_eInterrupt, ""); } @@ -4478,14 +1008,24 @@ rb_interrupt(void) * raise ArgumentError, "No parameters", caller */ +static VALUE get_errinfo(void); + static VALUE rb_f_raise(int argc, VALUE *argv) { + VALUE err; + if (argc == 0) { + err = get_errinfo(); + if (!NIL_P(err)) { + argc = 1; + argv = &err; + } + } rb_raise_jump(rb_make_exception(argc, argv)); return Qnil; /* not reached */ } -static VALUE +VALUE rb_make_exception(int argc, VALUE *argv) { VALUE mesg; @@ -4494,11 +1034,12 @@ rb_make_exception(int argc, VALUE *argv) mesg = Qnil; switch (argc) { - case 0: + case 0: mesg = Qnil; break; - case 1: - if (NIL_P(argv[0])) break; + case 1: + if (NIL_P(argv[0])) + break; if (TYPE(argv[0]) == T_STRING) { mesg = rb_exc_new3(rb_eRuntimeError, argv[0]); break; @@ -4506,8 +1047,8 @@ rb_make_exception(int argc, VALUE *argv) n = 0; goto exception_call; - case 2: - case 3: + case 2: + case 3: n = 1; exception_call: exception = rb_intern("exception"); @@ -4516,47 +1057,49 @@ rb_make_exception(int argc, VALUE *argv) } mesg = rb_funcall(argv[0], exception, n, argv[1]); break; - default: + default: rb_raise(rb_eArgError, "wrong number of arguments"); break; } if (argc > 0) { if (!rb_obj_is_kind_of(mesg, rb_eException)) rb_raise(rb_eTypeError, "exception object expected"); - if (argc>2) + if (argc > 2) set_backtrace(mesg, argv[2]); } return mesg; } -static void -rb_raise_jump(VALUE mesg) +void +rb_raise_jump(mesg) + VALUE mesg; { - if (ruby_frame != top_frame) { - PUSH_FRAME(Qfalse); /* fake frame */ - *ruby_frame = *_frame.prev->prev; - rb_longjmp(TAG_RAISE, mesg); - POP_FRAME(); - } + // TODO: fix me rb_longjmp(TAG_RAISE, mesg); } void -rb_jump_tag(int tag) +rb_jump_tag(tag) + int tag; { JUMP_TAG(tag); } int -rb_block_given_p(void) +rb_block_given_p() { - if (ruby_frame->block) return Qtrue; - return Qfalse; + yarv_thread_t *th = GET_THREAD(); + if (GC_GUARDED_PTR_REF(th->cfp->lfp[0])) { + return Qtrue; + } + else { + return Qfalse; + } } int -rb_iterator_p(void) +rb_iterator_p() { return rb_block_given_p(); } @@ -4583,360 +1126,57 @@ rb_iterator_p(void) */ -static VALUE -rb_f_block_given_p(void) +VALUE +rb_f_block_given_p() { - if (ruby_frame->prev && ruby_frame->prev->block) + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th->cfp; + cfp = th_get_ruby_level_cfp(th, YARV_PREVIOUS_CONTROL_FRAME(cfp)); + if (GC_GUARDED_PTR_REF(cfp->lfp[0])) { return Qtrue; - return Qfalse; -} - -VALUE rb_eThreadError; - -NORETURN(static void proc_jump_error(int, VALUE)); -static void -proc_jump_error(int state, VALUE result) -{ - char mesg[32]; - const char *statement; - - switch (state) { - case TAG_BREAK: - statement = "break"; break; - case TAG_RETURN: - statement = "return"; break; - case TAG_RETRY: - statement = "retry"; break; - default: - statement = "local-jump"; break; /* should not happen */ } - snprintf(mesg, sizeof mesg, "%s from proc-closure", statement); - localjump_error(mesg, result, state, 0); -} - -NORETURN(static void return_jump(VALUE)); -static void -return_jump(VALUE retval) -{ - struct tag *tt = prot_tag; - - if (retval == Qundef) retval = Qnil; - while (tt) { - if ((tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) || - (tt->tag == PROT_LAMBDA)) - { - tt->dst = (VALUE)tt->frame->uniq; - tt->retval = retval; - JUMP_TAG(TAG_RETURN); - } - if (tt->tag == PROT_THREAD && tt->prev) { - rb_raise(rb_eThreadError, "return can't jump across threads"); - } - tt = tt->prev; - } - localjump_error("unexpected return", retval, TAG_RETURN, 0); -} - -static void -break_jump(VALUE retval) -{ - struct tag *tt = prot_tag; - - if (retval == Qundef) retval = Qnil; - while (tt) { - switch (tt->tag) { - case PROT_THREAD: - /* skip toplevel tag */ - if (!tt->prev) break; - case PROT_YIELD: - case PROT_LAMBDA: - case PROT_LOOP: - tt->dst = (VALUE)tt->frame->uniq; - tt->retval = retval; - JUMP_TAG(TAG_BREAK); - break; - case PROT_FUNC: - tt = 0; - continue; - default: - break; - } - tt = tt->prev; - } - localjump_error("unexpected break", retval, TAG_BREAK, 0); -} - -static void -next_jump(VALUE retval) -{ - struct tag *tt = prot_tag; - - if (retval == Qundef) retval = Qnil; - while (tt) { - switch (tt->tag) { - case PROT_THREAD: - /* skip toplevel tag */ - if (!tt->prev) break; - case PROT_YIELD: - case PROT_LAMBDA: - case PROT_LOOP: - case PROT_FUNC: - tt->dst = (VALUE)tt->frame->uniq; - tt->retval = retval; - JUMP_TAG(TAG_NEXT); - break; - default: - break; - } - tt = tt->prev; + else { + return Qfalse; } - localjump_error("unexpected next", retval, TAG_NEXT, 0); } -static VALUE bmcall(VALUE, VALUE); -static int method_arity(VALUE); +VALUE rb_eThreadError; void -rb_need_block(void) +rb_need_block() { if (!rb_block_given_p()) { - localjump_error("no block given", Qnil, 0, 0); + th_localjump_error("no block given", Qnil, 0); } } static VALUE -rb_yield_0(VALUE val, VALUE self, VALUE klass /* OK */, int flags) +rb_yield_0(VALUE val, VALUE self, VALUE klass /* OK */ , int flags, + int avalue) { - NODE *node, *var; - volatile VALUE result = Qnil; - volatile VALUE old_cref; - volatile VALUE old_wrapper; - struct BLOCK * volatile block; - struct SCOPE * volatile old_scope; - int old_vmode; - struct FRAME frame; - NODE *cnode = ruby_current_node; - int lambda, call; - int state, broken = 0; - - rb_need_block(); - - PUSH_VARS(); - block = ruby_frame->block; - frame = block->frame; - frame.prev = ruby_frame; - frame.node = cnode; - ruby_frame = &(frame); - old_cref = (VALUE)ruby_cref; - ruby_cref = block->cref; - old_wrapper = ruby_wrapper; - ruby_wrapper = block->wrapper; - old_scope = ruby_scope; - ruby_scope = block->scope; - old_vmode = vis_mode; - vis_mode = (flags & YIELD_PUBLIC_DEF) ? VIS_PUBLIC : block->vmode; - if (block->flags & BLOCK_D_SCOPE) { - /* put place holder for dynamic (in-block) local variables */ - ruby_dyna_vars = new_dvar(0, 0, block->dyna_vars); - } - else { - /* FOR does not introduce new scope */ - ruby_dyna_vars = block->dyna_vars; + if (avalue) { + return th_invoke_yield(GET_THREAD(), + RARRAY_LEN(val), RARRAY_PTR(val)); } - if (klass) PUSH_CREF(klass); else { - self = block->self; - } - node = block->body; - var = block->var; - lambda = block->flags & BLOCK_LAMBDA; - call = flags & YIELD_CALL; - if (var) { - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - NODE *bvar = NULL; - block_var: - if (var == (NODE*)1) { /* no parameter || */ - if (lambda && val != Qundef) { - if (TYPE(val) != T_ARRAY) { - rb_raise(rb_eArgError, "wrong number of arguments (1 for 0)"); - } - else if (RARRAY_LEN(val) != 0) { - rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)", - RARRAY_LEN(val)); - } - } - } - else if (var == (NODE*)2) { - if (TYPE(val) == T_ARRAY && RARRAY_LEN(val) != 0) { - rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)", - RARRAY_LEN(val)); - } - } - else if (!bvar && nd_type(var) == NODE_BLOCK_PASS) { - bvar = var->nd_body; - var = var->nd_args; - goto block_var; - } - else if (nd_type(var) == NODE_ARGS) { - if (!(flags & YIELD_VALUES)) val = svalue_to_avalue(val); - formal_assign(self, var, RARRAY_LEN(val), RARRAY_PTR(val), 0); - } - else if (nd_type(var) == NODE_BLOCK) { - if (var->nd_next) { - bvar = var->nd_next->nd_head; - } - var = var->nd_head; - goto block_var; - } - else if (nd_type(var) == NODE_MASGN) { - massign(self, var, val, lambda); - } - else { - if (lambda && val == Qundef) { - rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)"); - } - if (call) { - if (lambda && RARRAY_LEN(val) != 1) { - rb_raise(rb_eArgError, "wrong number of arguments (%ld for 1)", - RARRAY_LEN(val)); - } - if (RARRAY_LEN(val) == 0) - val = Qnil; - else - val = RARRAY_PTR(val)[0]; - } - assign(self, var, val, lambda); - } - if (bvar) { - struct BLOCK *b = ruby_frame->prev->prev->block; - VALUE blk; - - if ((flags & YIELD_PROC_INVOKE) && b) { - blk = proc_alloc(rb_cProc, b, lambda); - } - else { - blk = Qnil; - } - assign(self, bvar, blk, 0); - } - } - POP_TAG(); - if (state) goto pop_state; - } - else if (lambda && call && RARRAY_LEN(val) != 0 && - (!node || nd_type(node) != NODE_IFUNC || - node->nd_cfnc != bmcall)) { - rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)", - RARRAY_LEN(val)); - } - if (!node) { - state = 0; - goto pop_state; - } - ruby_current_node = node; + int argc = (val == Qundef) ? 0 : 1; + VALUE *argv = &val; - PUSH_TAG(lambda ? PROT_NONE : PROT_YIELD); - if ((state = EXEC_TAG()) == 0) { - redo: - if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) { - if (node->nd_state == YIELD_FUNC_AVALUE) { - val = svalue_to_avalue(val); - } - else { - if (val == Qundef && node->nd_state != YIELD_FUNC_SVALUE) - val = Qnil; - } - if ((block->flags&BLOCK_FROM_METHOD) && RTEST(block->block_obj)) { - struct BLOCK *data, _block; - Data_Get_Struct(block->block_obj, struct BLOCK, data); - _block = *data; - _block.uniq = block_unique++; - ruby_frame->block = &_block; - result = (*node->nd_cfnc)(val, node->nd_tval, self); - } - else { - result = (*node->nd_cfnc)(val, node->nd_tval, self); - } - } - else { - result = rb_eval(self, node); + /* TODO: + if (argc == 1 && CLASS_OF(argv[0]) == rb_cValues) { + argc = RARRAY_LEN(argv[0]); + argv = RARRAY_PTR(argv[0]); } + */ + return th_invoke_yield(GET_THREAD(), argc, argv); } - else { - switch (state) { - case TAG_REDO: - state = 0; - CHECK_INTS; - goto redo; - case TAG_NEXT: - state = 0; - result = prot_tag->retval; - break; - case TAG_BREAK: - if (TAG_DST()) { - result = prot_tag->retval; - broken = 1; - } - break; - default: - break; - } - } - POP_TAG(); - pop_state: - if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) && - !FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) { - struct RVarmap *vars = ruby_dyna_vars; - - if (ruby_dyna_vars->id == 0) { - vars = ruby_dyna_vars->next; - rb_gc_force_recycle((VALUE)ruby_dyna_vars); - while (vars && vars->id != 0 && vars != block->dyna_vars) { - struct RVarmap *tmp = vars->next; - rb_gc_force_recycle((VALUE)vars); - vars = tmp; - } - } - } - POP_VARS(); - ruby_frame = ruby_frame->prev; - ruby_cref = (NODE*)old_cref; - ruby_wrapper = old_wrapper; - if (ruby_scope->flags & SCOPE_DONT_RECYCLE) - scope_dup(old_scope); - ruby_scope = old_scope; - vis_mode = old_vmode; - switch (state) { - case 0: - break; - case TAG_BREAK: - if (broken) { - struct tag *tt = prot_tag; - - while (tt) { - if ((tt->tag == PROT_LOOP && tt->blkid == block->uniq) || - (lambda && tt->tag == PROT_LAMBDA)) { - tt->dst = (VALUE)tt->frame->uniq; - tt->retval = result; - JUMP_TAG(TAG_BREAK); - } - tt = tt->prev; - } - proc_jump_error(TAG_BREAK, result); - } - default: - JUMP_TAG(state); - break; - } - ruby_current_node = cnode; - return result; } + VALUE rb_yield(VALUE val) { - return rb_yield_0(val, 0, 0, 0); + return rb_yield_0(val, 0, 0, 0, Qfalse); } VALUE @@ -4947,7 +1187,7 @@ rb_yield_values(int n, ...) VALUE val; if (n == 0) { - return rb_yield_0(Qundef, 0, 0, 0); + return rb_yield_0(Qundef, 0, 0, 0, Qfalse); } val = rb_ary_new2(n); va_start(args, n); @@ -4955,7 +1195,23 @@ rb_yield_values(int n, ...) rb_ary_push(val, va_arg(args, VALUE)); } va_end(args); - return rb_yield_0(val, 0, 0, YIELD_VALUES); + return rb_yield_0(val, 0, 0, 0, Qtrue); +} + +VALUE +rb_yield_splat(VALUE values) +{ + int avalue = Qfalse; + + if (TYPE(values) == T_ARRAY) { + if (RARRAY_LEN(values) == 0) { + values = Qundef; + } + else { + avalue = Qtrue; + } + } + return rb_yield_0(values, 0, 0, 0, avalue); } /* @@ -4976,233 +1232,71 @@ static VALUE rb_f_loop(void) { for (;;) { - rb_yield_0(Qundef, 0, 0, 0); - CHECK_INTS; + rb_yield_0(Qundef, 0, 0, 0, Qfalse); } return Qnil; /* dummy */ } -static VALUE -massign(VALUE self, NODE *node, VALUE val, int pcall) -{ - NODE *list; - long i = 0, len; - volatile VALUE tmp; - VALUE *argv; +#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value) - if (val == Qundef) { - argv = 0; - len = 0; - } - else { - tmp = rb_check_array_type(val); - if (NIL_P(tmp)) { - argv = &val; - len = (val == Qundef) ? 0 : 1; - } - else { - argv = RARRAY_PTR(tmp); - len = RARRAY_LEN(tmp); - } - } - list = node->nd_head; - for (; list && i<len; i++) { - assign(self, list->nd_head, argv[i], pcall); - list = list->nd_next; - } - if (pcall && list) goto arg_error; - if (node->nd_args) { - if ((long)(node->nd_args) == -1) { - /* no check for mere `*' */ - } - else if (!list && i<len) { - assign(self, node->nd_args, rb_ary_new4(len-i, argv+i), pcall); - } - else { - assign(self, node->nd_args, rb_ary_new2(0), pcall); - } - } - else if (pcall && i < len) { - goto arg_error; - } - - while (list) { - i++; - assign(self, list->nd_head, Qnil, pcall); - list = list->nd_next; - } - return val; - - arg_error: - while (list) { - i++; - list = list->nd_next; - } - rb_raise(rb_eArgError, "wrong number of arguments (%ld for %ld)", len, i); -} - -static void -assign(VALUE self, NODE *lhs, VALUE val, int pcall) +VALUE +rb_iterate(VALUE (*it_proc) (VALUE), VALUE data1, + VALUE (*bl_proc) (ANYARGS), VALUE data2) { - ruby_current_node = lhs; - if (val == Qundef) { - rb_warning("assigning void value"); - val = Qnil; - } - switch (nd_type(lhs)) { - case NODE_GASGN: - rb_gvar_set(lhs->nd_entry, val); - break; - - case NODE_IASGN: - rb_ivar_set(self, lhs->nd_vid, val); - break; - - case NODE_LASGN: - if (ruby_scope->local_vars == 0) - rb_bug("unexpected local variable assignment"); - ruby_scope->local_vars[lhs->nd_cnt] = val; - break; - - case NODE_DASGN: - dvar_asgn(lhs->nd_vid, val); - break; - - case NODE_DASGN_CURR: - dvar_asgn_curr(lhs->nd_vid, val); - break; - - case NODE_CDECL: - if (lhs->nd_vid == 0) { - rb_const_set(class_prefix(self, lhs->nd_else), lhs->nd_else->nd_mid, val); - } - else { - rb_const_set(ruby_cbase, lhs->nd_vid, val); - } - break; + int state; + volatile VALUE retval = Qnil; + NODE *node = NEW_IFUNC(bl_proc, data2); + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th->cfp; - case NODE_CVDECL: - if (RTEST(ruby_verbose) && FL_TEST(ruby_cbase, FL_SINGLETON)) { - rb_warn("declaring singleton class variable"); + TH_PUSH_TAG(th); + state = TH_EXEC_TAG(); + if (state == 0) { + iter_retry: + { + yarv_block_t *blockptr = GET_BLOCK_PTR_IN_CFP(th->cfp); + blockptr->iseq = (void *)node; + blockptr->proc = 0; + th->passed_block = blockptr; } - rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qtrue); - break; - - case NODE_CVASGN: - rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qfalse); - break; - - case NODE_MASGN: - massign(self, lhs, val, pcall); - break; + retval = (*it_proc) (data1); + } + else { + VALUE err = th->errinfo; + if (state == TAG_BREAK) { + VALUE *escape_dfp = GET_THROWOBJ_CATCH_POINT(err); + VALUE *cdfp = cfp->dfp; - case NODE_CALL: - case NODE_ATTRASGN: - { - VALUE recv; - calling_scope_t scope; - if (lhs->nd_recv == (NODE *)1) { - recv = self; - scope = CALLING_FUNCALL; - } - else { - recv = rb_eval(self, lhs->nd_recv); - scope = CALLING_NORMAL; - } - if (!lhs->nd_args) { - /* attr set */ - ruby_current_node = lhs; - SET_CURRENT_SOURCE(); - rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, - 0, scope, 0, self); + if (cdfp == escape_dfp) { + state = 0; + th->state = 0; + th->errinfo = Qnil; + th->cfp = cfp; } - else { - /* array set */ - VALUE args; - - args = rb_eval(self, lhs->nd_args); - rb_ary_push(args, val); - ruby_current_node = lhs; - SET_CURRENT_SOURCE(); - rb_call(CLASS_OF(recv), recv, lhs->nd_mid, - RARRAY_LEN(args), RARRAY_PTR(args), - 0, scope, 0, self); + else{ + // SDR(); printf("%p, %p\n", cdfp, escape_dfp); } } - break; - - case NODE_POSTARG: - { - NODE *v = lhs->nd_head; - int cnt; - VALUE *p; + else if (state == TAG_RETRY) { + VALUE *escape_dfp = GET_THROWOBJ_CATCH_POINT(err); + VALUE *cdfp = cfp->dfp; - if (lhs->nd_args && (long)(lhs->nd_args) != -1) { - assign(self, lhs->nd_args, val, 0); - } - cnt = lhs->nd_head->nd_alen; - if (RARRAY_LEN(val) < cnt) { - if (pcall) { - rb_raise(rb_eArgError, "wrong number of arguments"); - } - else { - while (RARRAY_LEN(val) < cnt) { - v = v->nd_next; - cnt--; - } - } - } - p = RARRAY_PTR(val) + RARRAY_LEN(val) - cnt; - while (cnt--) { - assign(self, v->nd_head, *p++, 0); - v = v->nd_next; - } - cnt = lhs->nd_head->nd_alen; - while (cnt--) { - rb_ary_pop(val); + if (cdfp == escape_dfp) { + state = 0; + th->state = 0; + th->errinfo = Qnil; + th->cfp = cfp; + goto iter_retry; } } - break; - - default: - rb_bug("bug in variable assignment"); - break; } -} - -VALUE -rb_iterate(VALUE (*it_proc)(VALUE), VALUE data1, VALUE (*bl_proc)(ANYARGS), VALUE data2) -{ - int state; - volatile VALUE retval = Qnil; - NODE *node = NEW_IFUNC(bl_proc, data2); - VALUE self = ruby_top_self; - - PUSH_TAG(PROT_LOOP); - PUSH_FRAME(Qtrue); - PUSH_BLOCK(ruby_frame->block, 0, node); - state = EXEC_TAG(); - if (state == 0) { - iter_retry: - retval = (*it_proc)(data1); - } - else if (state == TAG_BREAK && TAG_DST()) { - retval = prot_tag->retval; - state = 0; - } - else if (state == TAG_RETRY) { - state = 0; - goto iter_retry; - } - POP_BLOCK(); - POP_FRAME(); - POP_TAG(); + TH_POP_TAG(); switch (state) { case 0: break; default: - JUMP_TAG(state); + TH_JUMP_TAG(th, state); } return retval; } @@ -5219,13 +1313,14 @@ iterate_method(VALUE obj) { struct iter_method_arg *arg; - arg = (struct iter_method_arg*)obj; - return rb_call(CLASS_OF(arg->obj), arg->obj, arg->mid, arg->argc, arg->argv, - ruby_frame->block, CALLING_FUNCALL,1,Qundef); + arg = (struct iter_method_arg *)obj; + return rb_call(CLASS_OF(arg->obj), arg->obj, arg->mid, + arg->argc, arg->argv, NOEX_PRIVATE); } VALUE -rb_block_call(VALUE obj, ID mid, int argc, VALUE *argv, VALUE (*bl_proc)(ANYARGS), VALUE data2) +rb_block_call(VALUE obj, ID mid, int argc, VALUE *argv, + VALUE (*bl_proc) (ANYARGS), VALUE data2) { struct iter_method_arg arg; @@ -5240,56 +1335,30 @@ VALUE rb_each(VALUE obj) { return rb_call(CLASS_OF(obj), obj, rb_intern("each"), 0, 0, - ruby_frame->block, CALLING_FUNCALL,1,Qundef); -} - -static int -handle_rescue(VALUE self, NODE *node) -{ - CALLARGS; - TMP_PROTECT; - - if (!node->nd_args) { - return rb_obj_is_kind_of(ruby_errinfo, rb_eStandardError); - } - - SETUP_ARGS(node->nd_args); - while (argc--) { - if (!rb_obj_is_kind_of(argv[0], rb_cModule)) { - rb_raise(rb_eTypeError, "class or module required for rescue clause"); - } - if (RTEST(rb_funcall(*argv, eqq, 1, ruby_errinfo))) return 1; - argv++; - } - return 0; + NOEX_PRIVATE); } VALUE -rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2, ...) +rb_rescue2(VALUE (*b_proc) (ANYARGS), VALUE data1, VALUE (*r_proc) (ANYARGS), + VALUE data2, ...) { int state; volatile VALUE result; - volatile VALUE e_info = ruby_errinfo; - volatile int handle = Qfalse; - VALUE eclass; + volatile VALUE e_info = GET_THREAD()->errinfo; va_list args; PUSH_TAG(PROT_NONE); - switch (state = EXEC_TAG()) { - case TAG_RETRY: - if (!handle) break; - handle = Qfalse; - state = 0; - ruby_errinfo = Qnil; - case 0: - result = (*b_proc)(data1); - break; - case TAG_RAISE: - if (handle) break; - handle = Qfalse; - va_start(args, data2); + if ((state = EXEC_TAG()) == 0) { + retry_entry: + result = (*b_proc) (data1); + } + else if (state == TAG_RAISE) { + int handle = Qfalse; + VALUE eclass; + + va_init_list(args, data2); while (eclass = va_arg(args, VALUE)) { - if (rb_obj_is_kind_of(ruby_errinfo, eclass)) { + if (rb_obj_is_kind_of(GET_THREAD()->errinfo, eclass)) { handle = Qtrue; break; } @@ -5297,30 +1366,43 @@ rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALU va_end(args); if (handle) { - state = 0; if (r_proc) { - result = (*r_proc)(data2, ruby_errinfo); + PUSH_TAG(PROT_NONE); + if ((state = EXEC_TAG()) == 0) { + result = (*r_proc) (data2, GET_THREAD()->errinfo); + } + POP_TAG(); + if (state == TAG_RETRY) { + state = 0; + GET_THREAD()->errinfo = Qnil; + goto retry_entry; + } } else { result = Qnil; + state = 0; + } + if (state == 0) { + GET_THREAD()->errinfo = e_info; } - ruby_errinfo = e_info; } } POP_TAG(); - if (state) JUMP_TAG(state); + if (state) + JUMP_TAG(state); return result; } VALUE -rb_rescue(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2) +rb_rescue(b_proc, data1, r_proc, data2) + VALUE (*b_proc) (), (*r_proc) (); + VALUE data1, data2; { - return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0); + return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, + (VALUE)0); } -static VALUE cont_protect; - VALUE rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state) { @@ -5328,14 +1410,9 @@ rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state) int status; PUSH_THREAD_TAG(); - cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0); if ((status = EXEC_TAG()) == 0) { - result = (*proc)(data); - } - else if (status == TAG_THREAD) { - rb_thread_start_1(); + result = (*proc) (data); } - cont_protect = ((NODE *)cont_protect)->u1.value; POP_THREAD_TAG(); if (state) { *state = status; @@ -5352,24 +1429,24 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE { int state; volatile VALUE result = Qnil; - VALUE retval; PUSH_TAG(PROT_NONE); if ((state = EXEC_TAG()) == 0) { - result = (*b_proc)(data1); + result = (*b_proc) (data1); } POP_TAG(); - retval = prot_tag ? prot_tag->retval : Qnil; /* save retval */ - if (!thread_no_ensure()) { - (*e_proc)(data2); - } - if (prot_tag) return_value(retval); - if (state) JUMP_TAG(state); + // TODO: fix me + // retval = prot_tag ? prot_tag->retval : Qnil; /* save retval */ + (*e_proc) (data2); + if (state) + JUMP_TAG(state); return result; } VALUE -rb_with_disable_interrupt(VALUE (*proc)(ANYARGS), VALUE data) +rb_with_disable_interrupt(proc, data) + VALUE (*proc) (); + VALUE data; { VALUE result = Qnil; /* OK */ int status; @@ -5381,19 +1458,20 @@ rb_with_disable_interrupt(VALUE (*proc)(ANYARGS), VALUE data) rb_thread_critical = Qtrue; PUSH_TAG(PROT_NONE); if ((status = EXEC_TAG()) == 0) { - result = (*proc)(data); + result = (*proc) (data); } POP_TAG(); rb_thread_critical = thr_critical; } ENABLE_INTS; - if (status) JUMP_TAG(status); + if (status) + JUMP_TAG(status); return result; } static inline void -stack_check(void) +stack_check() { static int overflowing = 0; @@ -5410,13 +1488,6 @@ stack_check(void) } } -static int last_call_status; - -#define CSTAT_PRIV 1 -#define CSTAT_PROT 2 -#define CSTAT_VCALL 4 -#define CSTAT_SUPER 8 - /* * call-seq: * obj.method_missing(symbol [, *args] ) => result @@ -5452,9 +1523,10 @@ rb_method_missing(int argc, const VALUE *argv, VALUE obj) { ID id; VALUE exc = rb_eNoMethodError; - const char *format = 0; + char *format = 0; NODE *cnode = ruby_current_node; - + yarv_thread_t *th = GET_THREAD(); + int last_call_status = th->method_missing_reason; if (argc == 0 || !SYMBOL_P(argv[0])) { rb_raise(rb_eArgError, "no id given"); } @@ -5463,17 +1535,17 @@ rb_method_missing(int argc, const VALUE *argv, VALUE obj) id = SYM2ID(argv[0]); - if (last_call_status & CSTAT_PRIV) { + if (last_call_status & NOEX_PRIVATE) { format = "private method `%s' called for %s"; } - else if (last_call_status & CSTAT_PROT) { + else if (last_call_status & NOEX_PROTECTED) { format = "protected method `%s' called for %s"; } - else if (last_call_status & CSTAT_VCALL) { + else if (last_call_status & NOEX_VCALL) { format = "undefined local variable or method `%s' for %s"; exc = rb_eNameError; } - else if (last_call_status & CSTAT_SUPER) { + else if (last_call_status & NOEX_SUPER) { format = "super: no superclass method `%s'"; } if (!format) { @@ -5484,15 +1556,13 @@ rb_method_missing(int argc, const VALUE *argv, VALUE obj) { int n = 0; VALUE args[3]; - args[n++] = rb_funcall(rb_const_get(exc, rb_intern("message")), '!', 3, rb_str_new2(format), obj, argv[0]); args[n++] = argv[0]; if (exc == rb_eNoMethodError) { - args[n++] = rb_ary_new4(argc-1, argv+1); + args[n++] = rb_ary_new4(argc - 1, argv + 1); } exc = rb_class_new_instance(n, args, exc); - ruby_frame = ruby_frame->prev; /* pop frame for "method_missing" */ rb_exc_raise(exc); } @@ -5500,509 +1570,98 @@ rb_method_missing(int argc, const VALUE *argv, VALUE obj) } static VALUE -method_missing(VALUE obj, ID id, int argc, const VALUE *argv, - struct BLOCK *block, int call_status) +method_missing(VALUE obj, ID id, int argc, const VALUE *argv, int call_status) { VALUE *nargv; - - last_call_status = call_status; + GET_THREAD()->method_missing_reason = call_status; if (id == missing) { - PUSH_FRAME(Qfalse); - ruby_frame->block = block; rb_method_missing(argc, argv, obj); - POP_FRAME(); } else if (id == ID_ALLOCATOR) { - rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj)); - } - if (argc < 0) { - VALUE tmp; - int n; - - argc = -argc; - n = argc / 256 - 1; - argc %= 256; - tmp = svalue_to_avalue(argv[argc]); - nargv = ALLOCA_N(VALUE, argc + RARRAY_LEN(tmp) + n + 1); - MEMCPY(nargv+1, argv, VALUE, argc); - MEMCPY(nargv+1+argc, RARRAY_PTR(tmp), VALUE, RARRAY_LEN(tmp)); - MEMCPY(nargv+1+argc+RARRAY_LEN(tmp), argv+argc+1, VALUE, n); - argc += RARRAY_LEN(tmp)+n; - } - else { - nargv = ALLOCA_N(VALUE, argc+1); - MEMCPY(nargv+1, argv, VALUE, argc); - } - nargv[0] = ID2SYM(id); - return rb_call(CLASS_OF(obj), obj, missing, argc+1, nargv, - block, CALLING_FUNCALL, 0, Qundef); -} - -static inline VALUE -call_cfunc(VALUE (*func)(ANYARGS), VALUE recv, int len, int argc, const VALUE *argv) -{ - if (len >= 0 && argc != len) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", - argc, len); - } - - switch (len) { - case -2: - return (*func)(recv, rb_ary_new4(argc, argv)); - break; - case -1: - return (*func)(argc, argv, recv); - break; - case 0: - return (*func)(recv); - break; - case 1: - return (*func)(recv, argv[0]); - break; - case 2: - return (*func)(recv, argv[0], argv[1]); - break; - case 3: - return (*func)(recv, argv[0], argv[1], argv[2]); - break; - case 4: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3]); - break; - case 5: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4]); - break; - case 6: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5]); - break; - case 7: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6]); - break; - case 8: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7]); - break; - case 9: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7], argv[8]); - break; - case 10: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7], argv[8], argv[9]); - break; - case 11: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]); - break; - case 12: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7], argv[8], argv[9], - argv[10], argv[11]); - break; - case 13: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], - argv[11], argv[12]); - break; - case 14: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], - argv[11], argv[12], argv[13]); - break; - case 15: - return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4], - argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], - argv[11], argv[12], argv[13], argv[14]); - break; - default: - rb_raise(rb_eArgError, "too many arguments (%d)", len); - break; - } - return Qnil; /* not reached */ -} - -static int -formal_assign(VALUE recv, NODE *node, int argc, const VALUE *argv, VALUE *local_vars) -{ - int i; - int nopt = 0; - int npost = 0; - - if (nd_type(node) != NODE_ARGS) { - rb_bug("no argument-node"); - } - - i = node->nd_frml ? RARRAY_LEN(node->nd_frml) : 0; - if (i > argc) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i); - } - if (!node->nd_rest) { - NODE *optnode = node->nd_opt; - - nopt = i; - while (optnode) { - nopt++; - optnode = optnode->nd_next; - } - if (nopt < argc) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, nopt); - } + rb_raise(rb_eTypeError, "allocator undefined for %s", + rb_class2name(obj)); } - if (local_vars) { - if (i > 0) { - /* +2 for $_ and $~ */ - MEMCPY(local_vars+2, argv, VALUE, i); - } - } - else { - int j; - VALUE a = node->nd_frml; - - for (j=0; j<i; j++) { - dvar_asgn_curr(SYM2ID(RARRAY_PTR(a)[j]), argv[j]); - } - } - argv += i; argc -= i; - if (node->nd_rest && nd_type(node->nd_rest) == NODE_POSTARG) { - npost = node->nd_rest->nd_head->nd_alen; - } - if (node->nd_opt) { - NODE *opt = node->nd_opt; - int ac = argc - npost; - - while (opt && ac > 0) { - assign(recv, opt->nd_head, *argv, 1); - argv++; ac--; - ++i; - opt = opt->nd_next; - } - if (opt) { - rb_eval(recv, opt); - while (opt) { - ++i; - opt = opt->nd_next; - } - } - argc = ac + npost; - } - if (!node->nd_rest) { - i = nopt; - } - else { - VALUE v; - int n = 1; - - v = rb_ary_new4(argc,argv); - n += npost; - i += n*256; - i = -i; - assign(recv, node->nd_rest, v, 1); - } - return i; -} - -#define PUSH_METHOD_FRAME() \ - PUSH_FRAME(Qfalse);\ - ruby_frame->callee = id;\ - ruby_frame->this_func = oid;\ - ruby_frame->this_class = (flags & NOEX_NOSUPER)?0:klass;\ - ruby_frame->self = recv;\ - ruby_frame->argc = argc;\ - ruby_frame->block = block;\ - ruby_frame->flags = (flags & NOEX_RECV) ? FRAME_FUNC : 0; - -static VALUE -rb_call0(VALUE klass, VALUE recv, ID id, ID oid, - int argc /* OK */, const VALUE *argv /* OK */, - struct BLOCK *block, - NODE *volatile body, int flags) -{ - NODE *b2; /* OK */ - volatile VALUE result = Qnil; - static int tick; - volatile int safe = -1; - TMP_PROTECT; - - if (NOEX_SAFE(flags) > ruby_safe_level && - ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) { - rb_raise(rb_eSecurityError, "calling insecure method: %s", - rb_id2name(id)); - } - if ((++tick & 0xff) == 0) { - CHECK_INTS; /* better than nothing */ - stack_check(); - rb_gc_finalize_deferred(); - } - if (argc < 0) { - VALUE tmp; - VALUE *nargv; - int n; - - argc = -argc; - n = argc / 256 - 1; - argc %= 256; - tmp = svalue_to_avalue(argv[argc]); - nargv = TMP_ALLOC(argc + RARRAY_LEN(tmp) + n); - MEMCPY(nargv, argv, VALUE, argc); - MEMCPY(nargv+argc, RARRAY_PTR(tmp), VALUE, RARRAY_LEN(tmp)); - MEMCPY(nargv + argc + RARRAY_LEN(tmp), argv + argc + 1, VALUE, n); - argc += RARRAY_LEN(tmp) + n; - argv = nargv; - } - switch (nd_type(body)) { - case NODE_CFUNC: - { - int len = body->nd_argc; - - if (len < -2) { - rb_bug("bad argc (%d) specified for `%s(%s)'", - len, rb_class2name(klass), rb_id2name(id)); - } - PUSH_METHOD_FRAME(); - if (event_hooks) { - int state; - - EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node, - recv, id, klass); - PUSH_TAG(PROT_FUNC); - if ((state = EXEC_TAG()) == 0) { - result = call_cfunc(body->nd_cfnc, recv, len, argc, argv); - } - POP_TAG(); - ruby_current_node = ruby_frame->node; - EXEC_EVENT_HOOK(RUBY_EVENT_C_RETURN, ruby_current_node, - recv, id, klass); - if (state) JUMP_TAG(state); - } - else { - result = call_cfunc(body->nd_cfnc, recv, len, argc, argv); - } - POP_FRAME(); - } - break; - - /* for attr get/set */ - case NODE_IVAR: - if (argc != 0) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc); - } - result = rb_attr_get(recv, body->nd_vid); - break; - - case NODE_ATTRSET: - if (argc != 1) - rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); - result = rb_ivar_set(recv, body->nd_vid, argv[0]); - break; - - case NODE_ZSUPER: /* visibility override */ - result = call_super_0(klass, recv, oid, argc, argv, block); - break; - - case NODE_BMETHOD: - PUSH_METHOD_FRAME(); - ruby_frame->flags |= FRAME_DMETH; - if (event_hooks) { - struct BLOCK *data; - Data_Get_Struct(body->nd_cval, struct BLOCK, data); - EXEC_EVENT_HOOK(RUBY_EVENT_CALL, data->body, recv, id, klass); - } - result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass, - INVOKE_CALL); - if (event_hooks) { - EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass); - } - POP_FRAME(); - break; - - case NODE_SCOPE: - { - int state; - VALUE *local_vars; /* OK */ - NODE *saved_cref = 0; - - PUSH_METHOD_FRAME(); - PUSH_SCOPE(); - if (body->nd_rval) { - saved_cref = ruby_cref; - ruby_cref = (NODE*)body->nd_rval; - } - if (body->nd_tbl) { - local_vars = TMP_ALLOC(body->nd_tbl[0]+1); - *local_vars++ = (VALUE)body; - rb_mem_clear(local_vars, body->nd_tbl[0]); - ruby_scope->local_tbl = body->nd_tbl; - ruby_scope->local_vars = local_vars; - } - else { - local_vars = ruby_scope->local_vars = 0; - ruby_scope->local_tbl = 0; - } - b2 = body = body->nd_next; - - if (NOEX_SAFE(flags) > ruby_safe_level) { - safe = ruby_safe_level; - ruby_safe_level = NOEX_SAFE(flags); - } - PUSH_VARS(); - PUSH_TAG(PROT_FUNC); - if ((state = EXEC_TAG()) == 0) { - NODE *node = 0; - - if (nd_type(body) == NODE_ARGS) { - node = body; - body = 0; - } - else if (nd_type(body) == NODE_BLOCK) { - node = body->nd_head; - body = body->nd_next; - } - if (node) { - ruby_frame->argc = - formal_assign(recv, node, argc, argv, local_vars); - } - - if (event_hooks) { - EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass); - } - result = rb_eval(recv, body); - } - else if (state == TAG_RETURN && TAG_DST()) { - result = prot_tag->retval; - state = 0; - } - POP_TAG(); - if (event_hooks) { - EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass); - } - POP_VARS(); - POP_SCOPE(); - ruby_cref = saved_cref; - if (safe >= 0) ruby_safe_level = safe; - POP_FRAME(); - switch (state) { - case 0: - break; - - case TAG_BREAK: - case TAG_RETURN: - JUMP_TAG(state); - break; - case TAG_RETRY: - if (block) JUMP_TAG(state); - /* fall through */ - default: - jump_tag_but_local_jump(state, result); - break; - } - } - break; + nargv = ALLOCA_N(VALUE, argc + 1); + nargv[0] = ID2SYM(id); + MEMCPY(nargv + 1, argv, VALUE, argc); - default: - unknown_node(body); - break; - } - return result; + return rb_funcall2(obj, missing, argc + 1, nargv); } static VALUE -rb_call(VALUE klass, VALUE recv, ID mid, - int argc /* OK */, const VALUE *argv /* OK */, struct BLOCK *block, - calling_scope_t scope, int iter, VALUE self) +rb_call(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope) { - NODE *body; /* OK */ - int noex; - ID id = mid; - struct cache_entry *ent = 0; + NODE *body, *method; + int noex; + ID id = mid; + struct cache_entry *ent; if (!klass) { - rb_raise(rb_eNotImpError, "method `%s' called on terminated object (%p)", - rb_id2name(mid), (void*)recv); - } - switch (scope) { - case CALLING_FCALL: - case CALLING_VCALL: - if (recv == ruby_frame->self) { - noex = LOOKUP_LOCAL; - break; - } - /* fall thtough */ - default: - noex = LOOKUP_NORMAL; - break; + rb_raise(rb_eNotImpError, + "method `%s' called on terminated object (%p)", + rb_id2name(mid), (void *)recv); } - /* is it in the method cache? */ - if (noex == LOOKUP_LOCAL) { - ent = cache[LOOKUP_FCALL] + EXPR1(ruby_frame->this_class, mid); - if (ent->mid != mid || ent->klass != ruby_frame->this_class) { - ent = NULL; - } - } - if (!ent) { - ent = cache[LOOKUP_NORMAL] + EXPR1(klass, mid); - if (ent->mid != mid || ent->klass != klass) { - ent = NULL; - } - } - if (ent) { + ent = cache + EXPR1(klass, mid); + if (ent->mid == mid && ent->klass == klass) { if (!ent->method) - return method_missing(recv, mid, argc, argv, block, - scope==CALLING_VCALL?CSTAT_VCALL:0); - klass = ent->origin; - id = ent->mid0; - noex = ent->noex; - body = ent->method; - } - else if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) { - if (scope == CALLING_SUPER) { - return method_missing(recv, mid, argc, argv, block, CSTAT_SUPER); + return method_missing(recv, mid, argc, argv, + scope == 2 ? NOEX_VCALL : 0); + id = ent->mid0; + noex = ent->method->nd_noex; + klass = ent->method->nd_clss; + body = ent->method->nd_body; + } + else if ((method = rb_get_method_body(klass, id, &id)) != 0) { + noex = method->nd_noex; + klass = method->nd_clss; + body = method->nd_body; + } + else { + if (scope == 3) { + return method_missing(recv, mid, argc, argv, NOEX_SUPER); } - return method_missing(recv, mid, argc, argv, block, scope==CALLING_VCALL?CSTAT_VCALL:0); + return method_missing(recv, mid, argc, argv, + scope == 2 ? NOEX_VCALL : 0); } - - if (mid != missing && scope == CALLING_NORMAL) { + if (mid != missing) { /* receiver specified form for private method */ - if (noex & NOEX_PRIVATE) - return method_missing(recv, mid, argc, argv, block, CSTAT_PRIV); + if (((noex & NOEX_MASK) & NOEX_PRIVATE) && scope == 0) { + return method_missing(recv, mid, argc, argv, NOEX_PRIVATE); + } /* self must be kind of a specified form for protected method */ - if (noex & NOEX_PROTECTED) { + if (((noex & NOEX_MASK) & NOEX_PROTECTED) && scope == 0) { VALUE defined_class = klass; - if (self == Qundef) self = ruby_frame->self; if (TYPE(defined_class) == T_ICLASS) { defined_class = RBASIC(defined_class)->klass; } - if (!rb_obj_is_kind_of(self, rb_class_real(defined_class))) - return method_missing(recv, mid, argc, argv, block, CSTAT_PROT); - } - } - if (scope > CALLING_NORMAL) { /* pass receiver info */ - noex |= NOEX_RECV; - } - if (block && !iter && !block_orphan(block)) { - VALUE result; - int state; - PUSH_TAG(PROT_LOOP); - state = EXEC_TAG(); - if (state == 0) { - result = rb_call0(klass, recv, mid, id, argc, argv, block, body, noex); - } - else if (state == TAG_BREAK && TAG_DST()) { - result = prot_tag->retval; - state = 0; + if (!rb_obj_is_kind_of(rb_frame_self(), + rb_class_real(defined_class))) { + return method_missing(recv, mid, argc, argv, NOEX_PROTECTED); + } } - POP_TAG(); - if (state) JUMP_TAG(state); - return result; } - else { - return rb_call0(klass, recv, mid, id, argc, argv, block, body, noex); + + { + VALUE val; + //static int level; + //int i; + //for(i=0; i<level; i++){printf(" ");} + //printf("invoke %s (%s)\n", rb_id2name(mid), node_name(nd_type(body))); + //level++; + //printf("%s with %d args\n", rb_id2name(mid), argc); + val = + th_call0(GET_THREAD(), klass, recv, mid, id, argc, argv, body, + noex & NOEX_NOSUPER); + //level--; + //for(i=0; i<level; i++){printf(" ");} + //printf("done %s (%s)\n", rb_id2name(mid), node_name(nd_type(body))); + return val; } } @@ -6012,36 +1671,34 @@ rb_apply(VALUE recv, ID mid, VALUE args) int argc; VALUE *argv; - argc = RARRAY_LEN(args); /* Assigns LONG, but argc is INT */ + argc = RARRAY_LEN(args); /* Assigns LONG, but argc is INT */ argv = ALLOCA_N(VALUE, argc); MEMCPY(argv, RARRAY_PTR(args), VALUE, argc); - return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0,CALLING_FUNCALL,0,Qundef); + return rb_call(CLASS_OF(recv), recv, mid, argc, argv, NOEX_NOSUPER); } static VALUE -send_funcall(int argc, VALUE *argv, VALUE recv, calling_scope_t scope) +send_funcall(int argc, VALUE *argv, VALUE recv, int scope) { VALUE vid; - if (argc == 0) rb_raise(rb_eArgError, "no method name given"); + if (argc == 0) { + rb_raise(rb_eArgError, "no method name given"); + } vid = *argv++; argc--; - vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, - ruby_frame->block, scope, 1, Qundef); - - return vid; + PASS_PASSED_BLOCK(); + return rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, scope); } /* * call-seq: - * obj.send(symbol [, args...]) => obj - * obj.__send(symbol [, args...]) => obj + * obj.send(symbol [, args...]) => obj + * obj.__send__(symbol [, args...]) => obj * * Invokes the method identified by _symbol_, passing it any - * arguments specified. You can use <code>\_\_send__</code> if the name - * +send+ clashes with an existing method in _obj_. Raises an - * NoMethodError exception for private methods except when it is - * called in function call style. + * arguments specified. You can use <code>__send__</code> if the name + * +send+ clashes with an existing method in _obj_. * * class Klass * def hello(*args) @@ -6050,23 +1707,12 @@ send_funcall(int argc, VALUE *argv, VALUE recv, calling_scope_t scope) * end * k = Klass.new * k.send :hello, "gentle", "readers" #=> "Hello gentle readers" - * - * 1.send(:puts, "foo") # NoMethodError exception - * send(:puts, "foo") # prints "foo" */ static VALUE rb_f_send(int argc, VALUE *argv, VALUE recv) { - calling_scope_t scope; - - if (ruby_frame->flags & FRAME_FUNC) { - scope = CALLING_FCALL; - } - else { - scope = CALLING_NORMAL; - } - return send_funcall(argc, argv, recv, scope); + return send_funcall(argc, argv, recv, NOEX_PUBLIC); } /* @@ -6085,7 +1731,7 @@ rb_f_send(int argc, VALUE *argv, VALUE recv) static VALUE rb_f_funcall(int argc, VALUE *argv, VALUE recv) { - return send_funcall(argc, argv, recv, CALLING_FUNCALL); + return send_funcall(argc, argv, recv, NOEX_NOSUPER | NOEX_PRIVATE); } VALUE @@ -6093,14 +1739,14 @@ rb_funcall(VALUE recv, ID mid, int n, ...) { VALUE *argv; va_list ar; - va_start(ar, n); + va_init_list(ar, n); if (n > 0) { long i; argv = ALLOCA_N(VALUE, n); - for (i=0;i<n;i++) { + for (i = 0; i < n; i++) { argv[i] = va_arg(ar, VALUE); } va_end(ar); @@ -6108,91 +1754,33 @@ rb_funcall(VALUE recv, ID mid, int n, ...) else { argv = 0; } - - return rb_call(CLASS_OF(recv), recv, mid, n, argv, 0,CALLING_FUNCALL,0,Qundef); + return rb_call(CLASS_OF(recv), recv, mid, n, argv, + NOEX_NOSUPER | NOEX_PRIVATE); } VALUE rb_funcall2(VALUE recv, ID mid, int argc, const VALUE *argv) { - return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0,CALLING_FUNCALL,0,Qundef); + return rb_call(CLASS_OF(recv), recv, mid, argc, argv, + NOEX_NOSUPER | NOEX_PRIVATE); } VALUE rb_funcall3(VALUE recv, ID mid, int argc, const VALUE *argv) { - return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0,CALLING_NORMAL,0,Qundef); -} - -static VALUE -call_super_0(VALUE klass, VALUE self, ID mid, - int argc, const VALUE *argv, struct BLOCK *block) -{ - if (RCLASS(klass)->super == 0) { - return method_missing(self, mid, argc, argv, block, CSTAT_SUPER); - } - - return rb_call(RCLASS(klass)->super, self, mid, argc, argv, - block, CALLING_SUPER, 1, Qundef); -} - -static VALUE -call_super(int argc, const VALUE *argv, struct BLOCK *block) -{ - if (ruby_frame->this_class == 0) { - rb_name_error(ruby_frame->callee, "calling `super' from `%s' is prohibited", - rb_id2name(ruby_frame->this_func)); - } - return call_super_0(ruby_frame->this_class, ruby_frame->self, - ruby_frame->this_func, argc, argv, block); + return rb_call(CLASS_OF(recv), recv, mid, argc, argv, NOEX_PUBLIC); } VALUE rb_call_super(int argc, const VALUE *argv) { - return call_super(argc, argv, ruby_frame->block); + return th_call_super(GET_THREAD(), argc, argv); } static VALUE backtrace(int lev) { - struct FRAME *frame = ruby_frame; - VALUE str; - volatile VALUE ary; - NODE *n; - - ary = rb_ary_new(); - if (frame->this_func == ID_ALLOCATOR) { - frame = frame->prev; - } - if (lev < 0) { - str = error_line(frame, 0); - rb_ary_push(ary, str); - if (lev < -1) return ary; - } - else { - while (lev-- > 0) { - frame = frame->prev; - if (!frame) { - ary = Qnil; - break; - } - } - } - for (; frame && (n = frame->node); frame = frame->prev) { - if (frame->prev && frame->prev->this_func) { - if (frame->prev->node == n) { - if (frame->prev->this_func == frame->this_func) continue; - } - str = error_line(frame->prev, n); - } - else { - str = rb_sprintf("%s:%d", n->nd_file, nd_line(n)); - } - rb_ary_push(ary, str); - } - - return ary; + return th_backtrace(GET_THREAD(), lev); } /* @@ -6201,7 +1789,7 @@ backtrace(int lev) * * Returns the current execution stack---an array containing strings in * the form ``<em>file:line</em>'' or ``<em>file:line: in - * `method'</em>''. The optional <i>start</i>_ parameter + * `method'</em>''. The optional _start_ parameter * determines the number of initial stack entries to omit from the * result. * @@ -6228,9 +1816,12 @@ rb_f_caller(int argc, VALUE *argv) rb_scan_args(argc, argv, "01", &level); - if (NIL_P(level)) lev = 1; - else lev = NUM2INT(level); - if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev); + if (NIL_P(level)) + lev = 1; + else + lev = NUM2INT(level); + if (lev < 0) + rb_raise(rb_eArgError, "negative level (%d)", lev); return backtrace(lev); } @@ -6242,7 +1833,7 @@ rb_backtrace(void) VALUE ary; ary = backtrace(-1); - for (i=0; i<RARRAY_LEN(ary); i++) { + for (i = 0; i < RARRAY_LEN(ary); i++) { printf("\tfrom %s\n", RSTRING_PTR(RARRAY_PTR(ary)[i])); } } @@ -6253,130 +1844,145 @@ make_backtrace(void) return backtrace(-1); } +static ID +frame_func_id(yarv_control_frame_t *cfp) +{ + yarv_iseq_t *iseq = cfp->iseq; + if (!iseq) { + return cfp->method_id; + } + else if (YARV_IFUNC_P(iseq)) { + return rb_intern("<ifunc>"); + } + else { + return rb_intern(RSTRING_PTR(iseq->name)); + } +} + ID rb_frame_this_func(void) { - return ruby_frame->this_func; + return frame_func_id(GET_THREAD()->cfp); +} + +ID +rb_frame_callee(void) +{ + return frame_func_id(GET_THREAD()->cfp + 1); } -static NODE* -compile(VALUE src, const char *file, int line) +void +rb_frame_pop(void) { - NODE *node; - int critical; + yarv_thread_t *th = GET_THREAD(); + th->cfp = YARV_PREVIOUS_CONTROL_FRAME(th->cfp); +} - ruby_nerrs = 0; - StringValue(src); - critical = rb_thread_critical; - rb_thread_critical = Qtrue; - node = rb_compile_string(file, src, line); - rb_thread_critical = critical; +static VALUE +rb_frame_self(void) +{ + return GET_THREAD()->cfp->self; +} - if (ruby_nerrs == 0) return node; +const char * +rb_sourcefile(void) +{ + yarv_iseq_t *iseq = GET_THREAD()->cfp->iseq; + if (YARV_NORMAL_ISEQ_P(iseq)) { + return RSTRING_PTR(iseq->file_name); + } return 0; } -static VALUE -eval(VALUE self, VALUE src, VALUE scope, const char *file, int line) +int +rb_sourceline(void) { - struct BLOCK *data = NULL; - volatile VALUE result = Qnil; - struct SCOPE * volatile old_scope; - struct RVarmap * volatile old_dyna_vars; - VALUE volatile old_cref; - int volatile old_vmode; - volatile VALUE old_wrapper; - struct FRAME frame; - NODE *nodesave = ruby_current_node; - volatile int safe = ruby_safe_level; - int state; + yarv_thread_t *th = GET_THREAD(); + return th_get_sourceline(th->cfp); +} - if (!NIL_P(scope)) { - if (!rb_obj_is_proc(scope)) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Binding)", - rb_obj_classname(scope)); - } +VALUE th_set_eval_stack(yarv_thread_t *, VALUE iseq); +VALUE th_eval_body(yarv_thread_t *); - Data_Get_Struct(scope, struct BLOCK, data); - /* PUSH BLOCK from data */ - frame = data->frame; - frame.tmp = ruby_frame; /* gc protection */ - ruby_frame = &(frame); - old_scope = ruby_scope; - ruby_scope = data->scope; - old_dyna_vars = ruby_dyna_vars; - ruby_dyna_vars = data->dyna_vars; - old_vmode = vis_mode; - vis_mode = data->vmode; - old_cref = (VALUE)ruby_cref; - ruby_cref = data->cref; - old_wrapper = ruby_wrapper; - ruby_wrapper = data->wrapper; - if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) { - file = data->frame.node->nd_file; - if (!file) file = "__builtin__"; - line = nd_line(data->frame.node); - } +static VALUE +eval(VALUE self, VALUE src, VALUE scope, char *file, int line) +{ + int state; + VALUE result = Qundef; + VALUE envval; + yarv_binding_t *bind = 0; + yarv_thread_t *th = GET_THREAD(); + yarv_env_t *env = NULL; + NODE *stored_cref_stack = 0; - self = data->self; - } if (file == 0) { ruby_set_current_source(); file = ruby_sourcefile; line = ruby_sourceline; } - ruby_in_eval++; - if (TYPE(ruby_cbase) == T_ICLASS) { - ruby_cbase = RBASIC(ruby_cbase)->klass; - } PUSH_TAG(PROT_NONE); if ((state = EXEC_TAG()) == 0) { - NODE *node; - - ruby_safe_level = 0; - result = ruby_errinfo; - ruby_errinfo = Qnil; - node = compile(src, file, line); - ruby_safe_level = safe; - if (ruby_nerrs > 0) { - compile_error(0); - } - if (!NIL_P(result)) ruby_errinfo = result; - result = eval_node(self, node); - } - POP_TAG(); - ruby_in_eval--; - if (!NIL_P(scope)) { - int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE; - - ruby_wrapper = old_wrapper; - ruby_cref = (NODE*)old_cref; - ruby_frame = frame.tmp; - ruby_scope = old_scope; - ruby_dyna_vars = old_dyna_vars; - vis_mode = old_vmode; - if (dont_recycle) { - struct tag *tag; - struct RVarmap *vars; - - scope_dup(ruby_scope); - for (tag=prot_tag; tag; tag=tag->prev) { - scope_dup(tag->scope); + yarv_iseq_t *iseq; + VALUE iseqval; + + if (scope != Qnil) { + if (CLASS_OF(scope) == cYarvBinding) { + GetBindingPtr(scope, bind); + envval = bind->env; + stored_cref_stack = bind->cref_stack; } - for (vars = ruby_dyna_vars; vars; vars = vars->next) { - FL_SET(vars, DVAR_DONT_RECYCLE); + else { + rb_raise(rb_eTypeError, + "wrong argument type %s (expected Binding)", + rb_obj_classname(scope)); } + GetEnvPtr(envval, env); + th->base_block = &env->block; } + else { + yarv_control_frame_t *cfp = th_get_ruby_level_cfp(th, th->cfp); + th->base_block = GET_BLOCK_PTR_IN_CFP(cfp); + th->base_block->iseq = cfp->iseq; /* TODO */ + } + + + /* make eval iseq */ + th->parse_in_eval++; + iseqval = th_compile(th, src, rb_str_new2(file), INT2FIX(line)); + th->parse_in_eval--; + th_set_eval_stack(th, iseqval); + th->base_block = 0; + if (0) { // for debug + printf("%s\n", RSTRING_PTR(iseq_disasm(iseqval))); + } + + /* save new env */ + GetISeqPtr(iseqval, iseq); + if (bind && iseq->local_size > 0) { + bind->env = th_make_env_object(th, th->cfp); + } + + /* push tag */ + if (stored_cref_stack) { + stored_cref_stack = + th_set_special_cref(th, env->block.lfp, stored_cref_stack); + } + /* kick */ + result = th_eval_body(th); } - ruby_current_node = nodesave; - ruby_set_current_source(); + POP_TAG(); + + if (stored_cref_stack) { + th_set_special_cref(th, env->block.lfp, stored_cref_stack); + } + if (state) { if (state == TAG_RAISE) { if (strcmp(file, "(eval)") == 0) { VALUE mesg, errat; - errat = get_backtrace(ruby_errinfo); - mesg = rb_attr_get(ruby_errinfo, rb_intern("mesg")); + errat = get_backtrace(GET_THREAD()->errinfo); + mesg = rb_attr_get(GET_THREAD()->errinfo, rb_intern("mesg")); if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) { if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) { rb_str_update(mesg, 0, 0, rb_str_new2(": ")); @@ -6385,11 +1991,10 @@ eval(VALUE self, VALUE src, VALUE scope, const char *file, int line) RARRAY_PTR(errat)[0] = RARRAY_PTR(backtrace(-2))[0]; } } - rb_exc_raise(ruby_errinfo); + rb_exc_raise(GET_THREAD()->errinfo); } JUMP_TAG(state); } - return result; } @@ -6412,18 +2017,19 @@ eval(VALUE self, VALUE src, VALUE scope, const char *file, int line) * eval "str + ' Fred'", getBinding("bye") #=> "bye Fred" */ -static VALUE +VALUE rb_f_eval(int argc, VALUE *argv, VALUE self) { VALUE src, scope, vfile, vline; - const char *file = "(eval)"; + char *file = "(eval)"; int line = 1; rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline); - if (ruby_safe_level >= 4) { + if (rb_safe_level() >= 4) { StringValue(src); if (!NIL_P(scope) && !OBJ_TAINTED(scope)) { - rb_raise(rb_eSecurityError, "Insecure: can't modify trusted binding"); + rb_raise(rb_eSecurityError, + "Insecure: can't modify trusted binding"); } } else { @@ -6436,65 +2042,86 @@ rb_f_eval(int argc, VALUE *argv, VALUE self) line = NUM2INT(vline); } - if (!NIL_P(vfile)) file = RSTRING_PTR(vfile); - if (NIL_P(scope) && ruby_frame->prev) { - struct FRAME *prev; - VALUE val; - - prev = ruby_frame; - PUSH_FRAME(Qfalse); - *ruby_frame = *prev->prev; - ruby_frame->prev = prev; - val = eval(self, src, scope, file, line); - POP_FRAME(); - - return val; - } + if (!NIL_P(vfile)) + file = RSTRING_PTR(vfile); return eval(self, src, scope, file, line); } +VALUE *th_cfp_svar(yarv_control_frame_t *cfp, int idx); + /* function to call func under the specified class/module context */ static VALUE -exec_under(VALUE (*func) (VALUE), VALUE under, VALUE args) +exec_under(VALUE (*func) (VALUE), VALUE under, VALUE self, VALUE args) { VALUE val = Qnil; /* OK */ + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th->cfp; + yarv_control_frame_t *pcfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); + VALUE stored_self = pcfp->self; + NODE *stored_cref = 0; + NODE **pcref = 0; + + yarv_block_t block; + yarv_block_t *blockptr; int state; - int mode; - struct FRAME *f = ruby_frame; - - PUSH_CREF(under); - PUSH_FRAME(Qtrue); - ruby_frame->self = f->self; - ruby_frame->callee = f->callee; - ruby_frame->this_func = f->this_func; - ruby_frame->this_class = f->this_class; - ruby_frame->argc = f->argc; - - mode = vis_mode; - VIS_SET(VIS_PUBLIC); + + /* replace environment */ + pcfp->self = self; + if ((blockptr = GC_GUARDED_PTR_REF(*th->cfp->lfp)) != 0) { + /* copy block info */ + // TODO: why? + block = *blockptr; + block.self = self; + *th->cfp->lfp = GC_GUARDED_PTR(&block); + } + + while (!YARV_NORMAL_ISEQ_P(cfp->iseq)) { + cfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); + } + + pcref = (NODE **) th_cfp_svar(cfp, -1); + stored_cref = *pcref; + *pcref = th_cref_push(th, under, NOEX_PUBLIC); + PUSH_TAG(PROT_NONE); if ((state = EXEC_TAG()) == 0) { - val = (*func)(args); + val = (*func) (args); } POP_TAG(); - POP_CREF(); - VIS_SET(mode); - POP_FRAME(); - if (state) JUMP_TAG(state); + /* restore environment */ + *pcref = stored_cref; + pcfp->self = stored_self; + + if (state) { + JUMP_TAG(state); + } return val; } static VALUE +yield_under_i(VALUE arg) +{ + int avalue = Qtrue; + + if (arg == Qundef) { + avalue = Qfalse; + } + return rb_yield_0(arg, 0, 0, 0, avalue); +} + +/* block eval under the class/module context */ +static VALUE +yield_under(VALUE under, VALUE self, VALUE values) +{ + return exec_under(yield_under_i, under, self, values); +} + +static VALUE eval_under_i(VALUE arg) { VALUE *args = (VALUE *)arg; - struct FRAME *f = ruby_frame; - - if (f && (f = f->prev) && (f = f->prev)) { - ruby_frame = f; - } - return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]); + return eval(args[0], args[1], Qnil, (char *)args[2], (int)args[3]); } /* string eval under the class/module context */ @@ -6503,7 +2130,7 @@ eval_under(VALUE under, VALUE self, VALUE src, const char *file, int line) { VALUE args[4]; - if (ruby_safe_level >= 4) { + if (rb_safe_level() >= 4) { StringValue(src); } else { @@ -6513,27 +2140,7 @@ eval_under(VALUE under, VALUE self, VALUE src, const char *file, int line) args[1] = src; args[2] = (VALUE)file; args[3] = (VALUE)line; - return exec_under(eval_under_i, under, (VALUE)args); -} - -static VALUE -yield_under_i(VALUE arg) -{ - VALUE *args = (VALUE *)arg; - int flags = YIELD_PUBLIC_DEF; - if (args[0] != Qundef) flags |= YIELD_VALUES; - - return rb_yield_0(args[0], args[1], ruby_cbase, flags); -} - -/* block eval under the class/module context */ -static VALUE -yield_under(VALUE under, VALUE self, VALUE values) -{ - VALUE args[2]; - args[0] = values; - args[1] = self; - return exec_under(yield_under_i, under, (VALUE)args); + return exec_under(eval_under_i, under, self, (VALUE)args); } static VALUE @@ -6541,30 +2148,32 @@ specific_eval(int argc, VALUE *argv, VALUE klass, VALUE self) { if (rb_block_given_p()) { if (argc > 0) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", + argc); } return yield_under(klass, self, Qundef); } else { - const char *file = "(eval)"; - int line = 1; + char *file = "(eval)"; + int line = 1; if (argc == 0) { rb_raise(rb_eArgError, "block not supplied"); } else { - if (ruby_safe_level >= 4) { + if (rb_safe_level() >= 4) { StringValue(argv[0]); } else { SafeStringValue(argv[0]); } if (argc > 3) { - rb_raise(rb_eArgError, "wrong number of arguments: %s(src) or %s{..}", - rb_id2name(ruby_frame->callee), - rb_id2name(ruby_frame->callee)); + rb_raise(rb_eArgError, + "wrong number of arguments: %s(src) or %s{..}", + rb_frame_callee(), rb_frame_callee()); } - if (argc > 2) line = NUM2INT(argv[2]); + if (argc > 2) + line = NUM2INT(argv[2]); if (argc > 1) { file = StringValuePtr(argv[1]); } @@ -6585,10 +2194,7 @@ specific_eval(int argc, VALUE *argv, VALUE klass, VALUE self) * instance variables. In the version of <code>instance_eval</code> * that takes a +String+, the optional second and third * parameters supply a filename and starting line number that are used - * when reporting compilation errors. Note that, if a Proc that is - * converted from a Method object is given as the block, - * <code>instance_eval</code> will not change the context of this - * block and it will be evaluated in Method object's original context. + * when reporting compilation errors. * * class Klass * def initialize @@ -6701,467 +2307,12 @@ rb_mod_module_exec(int argc, VALUE *argv, VALUE mod) return yield_under(mod, mod, rb_ary_new4(argc, argv)); } -VALUE rb_load_path; - -NORETURN(static void load_failed(VALUE)); - -void -rb_load(VALUE fname, int wrap) -{ - VALUE tmp; - int state; - volatile int prohibit_int = rb_prohibit_interrupt; - volatile ID callee, this_func; - volatile VALUE wrapper = ruby_wrapper; - volatile VALUE self = ruby_top_self; - NODE * volatile last_node; - NODE *saved_cref = ruby_cref; - TMP_PROTECT; - - if (!wrap) rb_secure(4); - FilePathValue(fname); - fname = rb_str_new4(fname); - tmp = rb_find_file(fname); - if (!tmp) { - load_failed(fname); - } - fname = tmp; - - ruby_errinfo = Qnil; /* ensure */ - PUSH_VARS(); - ruby_cref = ruby_top_cref; - if (!wrap) { - rb_secure(4); /* should alter global state */ - ruby_wrapper = 0; - } - else { - /* load in anonymous module as toplevel */ - ruby_wrapper = rb_module_new(); - self = rb_obj_clone(ruby_top_self); - rb_extend_object(self, ruby_wrapper); - PUSH_CREF(ruby_wrapper); - /* default visibility is private at loading toplevel */ - VIS_SET(VIS_PRIVATE); - } - PUSH_FRAME(Qfalse); - ruby_frame->self = self; - PUSH_SCOPE(); - PUSH_TAG(PROT_NONE); - /* default visibility is private at loading toplevel */ - VIS_SET(VIS_PRIVATE); - state = EXEC_TAG(); - callee = ruby_frame->callee; - this_func = ruby_frame->this_func; - last_node = ruby_current_node; - if (!ruby_current_node && ruby_sourcefile) { - last_node = NEW_BEGIN(0); - } - ruby_current_node = 0; - if (state == 0) { - NODE * volatile node; - volatile int critical; - - DEFER_INTS; - ruby_in_eval++; - critical = rb_thread_critical; - rb_thread_critical = Qtrue; - rb_load_file(RSTRING_PTR(fname)); - ruby_in_eval--; - node = ruby_eval_tree; - rb_thread_critical = critical; - ALLOW_INTS; - if (ruby_nerrs == 0) { - eval_node(self, node); - } - } - ruby_frame->callee = callee; - ruby_frame->this_func = this_func; - ruby_current_node = last_node; - ruby_sourcefile = 0; - ruby_set_current_source(); - if (ruby_scope->flags == SCOPE_ALLOCA && ruby_cbase == rb_cObject) { - if (ruby_scope->local_tbl) /* toplevel was empty */ - free(ruby_scope->local_tbl); - } - POP_TAG(); - rb_prohibit_interrupt = prohibit_int; - ruby_cref = saved_cref; - POP_SCOPE(); - POP_FRAME(); - POP_VARS(); - ruby_wrapper = wrapper; - if (ruby_nerrs > 0) { - ruby_nerrs = 0; - rb_exc_raise(ruby_errinfo); - } - if (state) jump_tag_but_local_jump(state, Qundef); - if (!NIL_P(ruby_errinfo)) /* exception during load */ - rb_exc_raise(ruby_errinfo); -} - -void -rb_load_protect(VALUE fname, int wrap, int *state) -{ - int status; - - PUSH_THREAD_TAG(); - if ((status = EXEC_TAG()) == 0) { - rb_load(fname, wrap); - } - else if (status == TAG_THREAD) { - rb_thread_start_1(); - } - POP_THREAD_TAG(); - if (state) *state = status; -} - -/* - * call-seq: - * load(filename, wrap=false) => true - * - * Loads and executes the Ruby - * program in the file _filename_. If the filename does not - * resolve to an absolute path, the file is searched for in the library - * directories listed in <code>$:</code>. If the optional _wrap_ - * parameter is +true+, the loaded script will be executed - * under an anonymous module, protecting the calling program's global - * namespace. In no circumstance will any local variables in the loaded - * file be propagated to the loading environment. - */ - - -static VALUE -rb_f_load(int argc, VALUE *argv) -{ - VALUE fname, wrap; - - rb_scan_args(argc, argv, "11", &fname, &wrap); - rb_load(fname, RTEST(wrap)); - return Qtrue; -} - -VALUE ruby_dln_librefs; -static VALUE rb_features; -static st_table *loading_tbl; - -#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0) -#ifdef DLEXT2 -#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0) -#else -#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0) -#endif - -static int -rb_feature_p(const char *feature, const char *ext, int rb) -{ - VALUE v; - char *f, *e; - long i, len, elen; - - if (ext) { - len = ext - feature; - elen = strlen(ext); - } - else { - len = strlen(feature); - elen = 0; - } - for (i = 0; i < RARRAY_LEN(rb_features); ++i) { - v = RARRAY_PTR(rb_features)[i]; - f = StringValuePtr(v); - if (strncmp(f, feature, len) != 0) continue; - if (!*(e = f + len)) { - if (ext) continue; - return 'u'; - } - if (*e != '.') continue; - if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) { - return 's'; - } - if ((rb || !ext) && (strcmp(e, ".rb") == 0)) { - return 'r'; - } - } - return 0; -} - -static const char *const loadable_ext[] = { - ".rb", DLEXT, -#ifdef DLEXT2 - DLEXT2, -#endif - 0 -}; - -static int search_required(VALUE, VALUE *); - -int -rb_provided(const char *feature) -{ - int i; - char *buf; - VALUE fname; - - if (rb_feature_p(feature, 0, Qfalse)) - return Qtrue; - if (loading_tbl) { - if (st_lookup(loading_tbl, (st_data_t)feature, 0)) return Qtrue; - buf = ALLOCA_N(char, strlen(feature)+8); - strcpy(buf, feature); - for (i=0; loadable_ext[i]; i++) { - strcpy(buf+strlen(feature), loadable_ext[i]); - if (st_lookup(loading_tbl, (st_data_t)buf, 0)) return Qtrue; - } - } - if (search_required(rb_str_new2(feature), &fname)) { - feature = RSTRING_PTR(fname); - if (rb_feature_p(feature, 0, Qfalse)) - return Qtrue; - if (loading_tbl && st_lookup(loading_tbl, (st_data_t)feature, 0)) - return Qtrue; - } - return Qfalse; -} - -static void -rb_provide_feature(VALUE feature) -{ - rb_ary_push(rb_features, feature); -} - -void -rb_provide(const char *feature) -{ - rb_provide_feature(rb_str_new2(feature)); -} - -static int -load_wait(char *ftptr) -{ - st_data_t th; - - if (!loading_tbl) return Qfalse; - if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return Qfalse; - do { - if ((rb_thread_t)th == curr_thread) return Qtrue; - CHECK_INTS; - } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th)); - return Qtrue; -} - -/* - * call-seq: - * require(string) => true or false - * - * Ruby tries to load the library named _string_, returning - * +true+ if successful. If the filename does not resolve to - * an absolute path, it will be searched for in the directories listed - * in <code>$:</code>. If the file has the extension ``.rb'', it is - * loaded as a source file; if the extension is ``.so'', ``.o'', or - * ``.dll'', or whatever the default shared library extension is on - * the current platform, Ruby loads the shared library as a Ruby - * extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on - * to the name. The name of the loaded feature is added to the array in - * <code>$"</code>. A feature will not be loaded if it's name already - * appears in <code>$"</code>. However, the file name is not converted - * to an absolute path, so that ``<code>require 'a';require - * './a'</code>'' will load <code>a.rb</code> twice. - * - * require "my-library.rb" - * require "db-driver" - */ - -VALUE -rb_f_require(VALUE obj, VALUE fname) -{ - return rb_require_safe(fname, ruby_safe_level); -} - -static int -search_required(VALUE fname, VALUE *path) -{ - VALUE tmp; - char *ext, *ftptr; - int type, ft = 0; - - *path = 0; - ext = strrchr(ftptr = RSTRING_PTR(fname), '.'); - if (ext && !strchr(ext, '/')) { - if (strcmp(".rb", ext) == 0) { - if (rb_feature_p(ftptr, ext, Qtrue)) return 'r'; - if (tmp = rb_find_file(fname)) { - tmp = rb_file_expand_path(tmp, Qnil); - ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(ftptr, ext, Qtrue)) - *path = tmp; - return 'r'; - } - return 0; - } - else if (IS_SOEXT(ext)) { - if (rb_feature_p(ftptr, ext, Qfalse)) return 's'; - tmp = rb_str_new(RSTRING_PTR(fname), ext-RSTRING_PTR(fname)); -#ifdef DLEXT2 - OBJ_FREEZE(tmp); - if (rb_find_file_ext(&tmp, loadable_ext+1)) { - tmp = rb_file_expand_path(tmp, Qnil); - ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(ftptr, ext, Qfalse)) - *path = tmp; - return 's'; - } -#else - rb_str_cat2(tmp, DLEXT); - OBJ_FREEZE(tmp); - if (tmp = rb_find_file(tmp)) { - tmp = rb_file_expand_path(tmp, Qnil); - ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(ftptr, ext, Qfalse)) - *path = tmp; - return 's'; - } -#endif - } - else if (IS_DLEXT(ext)) { - if (rb_feature_p(ftptr, ext, Qfalse)) return 's'; - if (tmp = rb_find_file(fname)) { - tmp = rb_file_expand_path(tmp, Qnil); - ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(ftptr, ext, Qfalse)) - *path = tmp; - return 's'; - } - } - } - else if ((ft = rb_feature_p(ftptr, 0, Qfalse)) == 'r') { - return 'r'; - } - tmp = fname; - type = rb_find_file_ext(&tmp, loadable_ext); - tmp = rb_file_expand_path(tmp, Qnil); - switch (type) { - case 0: - ftptr = RSTRING_PTR(tmp); - if (ft) break; - return rb_feature_p(ftptr, 0, Qfalse); - - default: - if (ft) break; - case 1: - ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (rb_feature_p(ftptr, ext, !--type)) break; - *path = tmp; - } - return type ? 's' : 'r'; -} - -static void -load_failed(VALUE fname) -{ - rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING_PTR(fname)); -} - -VALUE -rb_require_safe(VALUE fname, int safe) -{ - VALUE result = Qnil; - volatile VALUE errinfo = ruby_errinfo; - int state; - struct { - NODE *node; - ID this_func, callee; - int safe, vmode; - } volatile saved; - char *volatile ftptr = 0; - - saved.node = ruby_current_node; - saved.callee = ruby_frame->callee; - saved.this_func = ruby_frame->this_func; - saved.safe = ruby_safe_level; - saved.vmode = vis_mode; - PUSH_SCOPE(); - PUSH_CREF(ruby_cbase); - VIS_SET(VIS_PUBLIC); - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - VALUE path; - long handle; - int found; - - ruby_safe_level = safe; - FilePathValue(fname); - *(volatile VALUE *)&fname = rb_str_new4(fname); - found = search_required(fname, &path); - if (found) { - if (!path || load_wait(RSTRING_PTR(path))) { - result = Qfalse; - } - else { - ruby_safe_level = 0; - /* loading ruby library should be serialized. */ - if (!loading_tbl) { - loading_tbl = st_init_strtable(); - } - /* partial state */ - ftptr = ruby_strdup(RSTRING_PTR(path)); - st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread); - switch (found) { - case 'r': - rb_load(path, 0); - break; - - case 's': - ruby_current_node = 0; - ruby_sourcefile = rb_source_filename(RSTRING_PTR(path)); - ruby_sourceline = 0; - ruby_frame->callee = 0; - ruby_frame->this_func = 0; - VIS_SET(VIS_PUBLIC); - handle = (long)dln_load(RSTRING_PTR(path)); - rb_ary_push(ruby_dln_librefs, LONG2NUM(handle)); - break; - } - rb_provide_feature(path); - result = Qtrue; - } - } - } - POP_TAG(); - ruby_current_node = saved.node; - ruby_set_current_source(); - ruby_frame->this_func = saved.this_func; - ruby_frame->callee = saved.callee; - ruby_safe_level = saved.safe; - VIS_SET(saved.vmode); - POP_CREF(); - POP_SCOPE(); - if (ftptr) { - if (st_delete(loading_tbl, (st_data_t *)&ftptr, 0)) { /* loading done */ - free(ftptr); - } - } - if (state) JUMP_TAG(state); - if (NIL_P(result)) { - load_failed(fname); - } - ruby_errinfo = errinfo; - - return result; -} - -VALUE -rb_require(const char *fname) -{ - VALUE fn = rb_str_new2(fname); - OBJ_FREEZE(fn); - return rb_require_safe(fn, ruby_safe_level); -} - static void secure_visibility(VALUE self) { - if (ruby_safe_level >= 4 && !OBJ_TAINTED(self)) { - rb_raise(rb_eSecurityError, "Insecure: can't change method visibility"); + if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) { + rb_raise(rb_eSecurityError, + "Insecure: can't change method visibility"); } } @@ -7169,11 +2320,11 @@ static void set_method_visibility(VALUE self, int argc, VALUE *argv, ID ex) { int i; - secure_visibility(self); - for (i=0; i<argc; i++) { + for (i = 0; i < argc; i++) { rb_export_method(self, rb_to_id(argv[i]), ex); } + rb_clear_cache_by_class(self); } /* @@ -7191,7 +2342,7 @@ rb_mod_public(int argc, VALUE *argv, VALUE module) { secure_visibility(module); if (argc == 0) { - VIS_SET(VIS_PUBLIC); + SCOPE_SET(NOEX_PUBLIC); } else { set_method_visibility(module, argc, argv, NOEX_PUBLIC); @@ -7214,7 +2365,7 @@ rb_mod_protected(int argc, VALUE *argv, VALUE module) { secure_visibility(module); if (argc == 0) { - VIS_SET(VIS_PROTECTED); + SCOPE_SET(NOEX_PROTECTED); } else { set_method_visibility(module, argc, argv, NOEX_PROTECTED); @@ -7246,7 +2397,7 @@ rb_mod_private(int argc, VALUE *argv, VALUE module) { secure_visibility(module); if (argc == 0) { - VIS_SET(VIS_PRIVATE); + SCOPE_SET(NOEX_PRIVATE); } else { set_method_visibility(module, argc, argv, NOEX_PRIVATE); @@ -7256,30 +2407,6 @@ rb_mod_private(int argc, VALUE *argv, VALUE module) /* * call-seq: - * local => self - * local(symbol, ...) => self - * - * With no arguments, sets the default visibility for subsequently - * defined methods to local. With arguments, sets the named methods to - * have local visibility. - */ - -static VALUE -rb_mod_local(int argc, VALUE *argv, VALUE module) -{ - secure_visibility(module); - if (argc == 0) { - VIS_SET(VIS_LOCAL); - } - else { - set_method_visibility(module, argc, argv, NOEX_LOCAL); - rb_clear_cache(); - } - return module; -} - -/* - * call-seq: * mod.public_class_method(symbol, ...) => mod * * Makes a list of existing class methods public. @@ -7331,16 +2458,6 @@ top_public(int argc, VALUE *argv) return rb_mod_public(argc, argv, rb_cObject); } -/* - * call-seq: - * private => self - * private(symbol, ...) => self - * - * With no arguments, sets the default visibility for subsequently - * defined methods to private. With arguments, sets the named methods - * to have private visibility. - */ - static VALUE top_private(int argc, VALUE *argv) { @@ -7388,7 +2505,7 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module) { int i; ID id; - NODE *body; + NODE *fbody; if (TYPE(module) != T_MODULE) { rb_raise(rb_eTypeError, "module_function must be called for modules"); @@ -7396,30 +2513,33 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module) secure_visibility(module); if (argc == 0) { - VIS_SET(VIS_MODFUNC); + SCOPE_SET(NOEX_MODFUNC); return module; } set_method_visibility(module, argc, argv, NOEX_PRIVATE); - for (i=0; i<argc; i++) { + + for (i = 0; i < argc; i++) { VALUE m = module; id = rb_to_id(argv[i]); for (;;) { - body = search_method(m, id, &m, LOOKUP_NOSKIP, 0); - if (body == 0) { - body = search_method(rb_cObject, id, &m, LOOKUP_NOSKIP, 0); + fbody = search_method(m, id, &m); + if (fbody == 0) { + fbody = search_method(rb_cObject, id, &m); } - if (body == 0 || body->nd_body == 0) { + if (fbody == 0 || fbody->nd_body == 0) { rb_bug("undefined method `%s'; can't happen", rb_id2name(id)); } - if (nd_type(body->nd_body) != NODE_ZSUPER) { + if (nd_type(fbody->nd_body->nd_body) != NODE_ZSUPER) { break; /* normal case: need not to follow 'super' link */ } m = RCLASS(m)->super; - if (!m) break; + if (!m) + break; } - rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC); + rb_add_method(rb_singleton_class(module), id, fbody->nd_body->nd_body, + NOEX_PUBLIC); } return module; } @@ -7437,17 +2557,17 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module) */ static VALUE -rb_mod_append_features(VALUE module, VALUE dest) +rb_mod_append_features(VALUE module, VALUE include) { - switch (TYPE(dest)) { - case T_CLASS: - case T_MODULE: + switch (TYPE(include)) { + case T_CLASS: + case T_MODULE: break; - default: - Check_Type(dest, T_CLASS); + default: + Check_Type(include, T_CLASS); break; } - rb_include_module(dest, module); + rb_include_module(include, module); return module; } @@ -7464,7 +2584,8 @@ rb_mod_include(int argc, VALUE *argv, VALUE module) { int i; - for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE); + for (i = 0; i < argc; i++) + Check_Type(argv[i], T_MODULE); while (argc--) { rb_funcall(argv[argc], rb_intern("append_features"), 1, module); rb_funcall(argv[argc], rb_intern("included"), 1, module); @@ -7475,8 +2596,8 @@ rb_mod_include(int argc, VALUE *argv, VALUE module) void rb_obj_call_init(VALUE obj, int argc, VALUE *argv) { - rb_call(CLASS_OF(obj), obj, init, argc, argv, - ruby_frame->block, CALLING_FUNCALL, 1, Qundef); + PASS_PASSED_BLOCK(); + rb_funcall2(obj, init, argc, argv); } void @@ -7552,7 +2673,8 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj) if (argc == 0) { rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)"); } - for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE); + for (i = 0; i < argc; i++) + Check_Type(argv[i], T_MODULE); while (argc--) { rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj); rb_funcall(argv[argc], rb_intern("extended"), 1, obj); @@ -7574,296 +2696,153 @@ top_include(int argc, VALUE *argv, VALUE self) { rb_secure(4); if (ruby_wrapper) { - rb_warning("main#include in the wrapped load is effective only in wrapper module"); + rb_warning + ("main#include in the wrapped load is effective only in wrapper module"); return rb_mod_include(argc, argv, ruby_wrapper); } return rb_mod_include(argc, argv, rb_cObject); } -VALUE rb_f_trace_var(int, VALUE *); -VALUE rb_f_untrace_var(int, VALUE *); +VALUE rb_f_trace_var(); +VALUE rb_f_untrace_var(); -static void -errinfo_setter(VALUE val, ID id, VALUE *var) +static VALUE +get_errinfo(void) { - if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) { - rb_raise(rb_eTypeError, "assigning non-exception to $!"); + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th->cfp; + yarv_control_frame_t *end_cfp = YARV_END_CONTROL_FRAME(th); + + while (YARV_VALID_CONTROL_FRAME_P(cfp, end_cfp)) { + if (YARV_NORMAL_ISEQ_P(cfp->iseq)) { + if (cfp->iseq->type == ISEQ_TYPE_RESCUE) { + return cfp->dfp[-1]; + } + else if (cfp->iseq->type == ISEQ_TYPE_ENSURE && + TYPE(cfp->dfp[-1]) != T_NODE) { + return cfp->dfp[-1]; + } + } + cfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); } - *var = val; + return Qnil; } static VALUE -errat_getter(ID id) +errinfo_getter(ID id) { - return get_backtrace(ruby_errinfo); + return get_errinfo(); } -static void -errat_setter(VALUE val, ID id, VALUE *var) +VALUE +rb_errinfo(void) { - if (NIL_P(ruby_errinfo)) { - rb_raise(rb_eArgError, "$! not set"); - } - set_backtrace(ruby_errinfo, val); + return get_errinfo(); } -/* - * call-seq: - * local_variables => array - * - * Returns the names of the current local variables. - * - * fred = 1 - * for i in 1..10 - * # ... - * end - * local_variables #=> ["fred", "i"] - */ - -static VALUE -rb_f_local_variables(void) +static void +errinfo_setter(VALUE val, ID id, VALUE *var) { - ID *tbl; - int n, i; - VALUE ary = rb_ary_new(); - struct RVarmap *vars; - - tbl = ruby_scope->local_tbl; - if (tbl) { - n = *tbl++; - for (i=2; i<n; i++) { /* skip first 2 ($_ and $~) */ - if (!rb_is_local_id(tbl[i])) continue; /* skip flip states */ - rb_ary_push(ary, ID2SYM(tbl[i])); - } + if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) { + rb_raise(rb_eTypeError, "assigning non-exception to $!"); } - - vars = ruby_dyna_vars; - while (vars) { - if (vars->id && rb_is_local_id(vars->id)) { /* skip $_, $~ and flip states */ - rb_ary_push(ary, ID2SYM(vars->id)); - } - vars = vars->next; + else { + GET_THREAD()->errinfo = val; } - - return ary; } -static VALUE rb_f_catch(VALUE,VALUE); -NORETURN(static VALUE rb_f_throw(int,VALUE*)); - -struct end_proc_data { - void (*func)(); - VALUE data; - int safe; - struct end_proc_data *next; -}; - -static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs; - void -rb_set_end_proc(void (*func) (VALUE), VALUE data) +rb_set_errinfo(VALUE err) { - struct end_proc_data *link = ALLOC(struct end_proc_data); - struct end_proc_data **list; - - if (ruby_wrapper) list = &ephemeral_end_procs; - else list = &end_procs; - link->next = *list; - link->func = func; - link->data = data; - link->safe = ruby_safe_level; - *list = link; + errinfo_setter(err, 0, 0); } -void -rb_mark_end_proc(void) +static VALUE +errat_getter(ID id) { - struct end_proc_data *link; - - link = end_procs; - while (link) { - rb_gc_mark(link->data); - link = link->next; + VALUE err = get_errinfo(); + if (!NIL_P(err)) { + return get_backtrace(err); } - link = ephemeral_end_procs; - while (link) { - rb_gc_mark(link->data); - link = link->next; - } - link = tmp_end_procs; - while (link) { - rb_gc_mark(link->data); - link = link->next; + else { + return Qnil; } } static void -call_end_proc(VALUE data) -{ - PUSH_FRAME(Qfalse); - ruby_frame->self = ruby_frame->prev->self; - ruby_frame->node = 0; - proc_invoke(data, rb_ary_new2(0), Qundef, 0, INVOKE_VALUES); - POP_FRAME(); -} - -static void -rb_f_END(void) +errat_setter(VALUE val, ID id, VALUE *var) { - PUSH_FRAME(Qfalse); - rb_set_end_proc(call_end_proc, rb_block_proc()); - POP_FRAME(); + VALUE err = get_errinfo(); + if (NIL_P(err)) { + rb_raise(rb_eArgError, "$! not set"); + } + set_backtrace(err, val); } /* * call-seq: - * at_exit { block } -> proc + * local_variables => array * - * Converts _block_ to a +Proc+ object (and therefore - * binds it at the point of call) and registers it for execution when - * the program exits. If multiple handlers are registered, they are - * executed in reverse order of registration. + * Returns the names of the current local variables. * - * def do_at_exit(str1) - * at_exit { print str1 } + * fred = 1 + * for i in 1..10 + * # ... * end - * at_exit { puts "cruel world" } - * do_at_exit("goodbye ") - * exit - * - * <em>produces:</em> - * - * goodbye cruel world + * local_variables #=> ["fred", "i"] */ +int th_collect_local_variables_in_heap(yarv_thread_t *th, VALUE *dfp, VALUE ary); + static VALUE -rb_f_at_exit(void) +rb_f_local_variables(void) { - VALUE proc; - - if (!rb_block_given_p()) { - rb_raise(rb_eArgError, "called without a block"); - } - proc = rb_block_proc(); - rb_set_end_proc(call_end_proc, proc); - return proc; -} + VALUE ary = rb_ary_new(); + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = + th_get_ruby_level_cfp(th, YARV_PREVIOUS_CONTROL_FRAME(th->cfp)); + int i; -void -rb_exec_end_proc(void) -{ - struct end_proc_data *link, *tmp; - int status; - volatile int safe = ruby_safe_level; - - while (ephemeral_end_procs) { - tmp_end_procs = link = ephemeral_end_procs; - ephemeral_end_procs = 0; - while (link) { - PUSH_TAG(PROT_NONE); - if ((status = EXEC_TAG()) == 0) { - ruby_safe_level = link->safe; - (*link->func)(link->data); + while (1) { + if (cfp->iseq) { + int start = 0; + if (cfp->lfp == cfp->dfp) { + start = 1; } - POP_TAG(); - if (status) { - error_handle(status); + for (i = start; i < cfp->iseq->local_size; i++) { + ID lid = cfp->iseq->local_tbl[i]; + if (lid) { + rb_ary_push(ary, rb_str_new2(rb_id2name(lid))); + } } - tmp = link; - tmp_end_procs = link = link->next; - free(tmp); } - } - while (end_procs) { - tmp_end_procs = link = end_procs; - end_procs = 0; - while (link) { - PUSH_TAG(PROT_NONE); - if ((status = EXEC_TAG()) == 0) { - ruby_safe_level = link->safe; - (*link->func)(link->data); + if (cfp->lfp != cfp->dfp) { + /* block */ + VALUE *dfp = GC_GUARDED_PTR_REF(cfp->dfp[0]); + + if (th_collect_local_variables_in_heap(th, dfp, ary)) { + break; } - POP_TAG(); - if (status) { - error_handle(status); + else { + while (cfp->dfp != dfp) { + cfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); + } } - tmp = link; - tmp_end_procs = link = link->next; - free(tmp); + } + else { + break; } } - ruby_safe_level = safe; -} - -/* - * call-seq: - * __method__ => symbol - * - * Returns the name of the current method as a Symbol. - * If called from inside of an aliased method it will return the original - * nonaliased name. - * If called outside of a method, it returns <code>nil</code>. - * - * def foo - * __method__ - * end - * alias bar foo - * - * foo # => :foo - * bar # => :foo - * - * See also <code>\_\_callee__</code>. - * - */ - -static VALUE -rb_f_method_name(void) -{ - struct FRAME* prev = ruby_frame->prev; - if (prev && prev->this_func) { - return ID2SYM(prev->this_func); - } - else { - return Qnil; - } + return ary; } -/* - * call-seq: - * __callee__ => symbol - * - * Returns the name of the current method as Symbol. - * If called from inside of an aliased method it will return the aliased - * name. - * If called outside of a method, it returns <code>nil</code>. - * - * def foo - * __callee__ - * end - * alias bar foo - * - * foo # => :foo - * bar # => :bar - * - * See also <code>\_\_method__</code>. - * - */ - -static VALUE -rb_f_callee_name(void) -{ - struct FRAME* prev = ruby_frame->prev; - if (prev && prev->callee) { - return ID2SYM(prev->callee); - } - else { - return Qnil; - } -} void -Init_eval(void) +Init_eval() { + /* TODO: fix position */ + GET_THREAD()->vm->mark_object_ary = rb_ary_new(); + init = rb_intern("initialize"); eqq = rb_intern("==="); each = rb_intern("each"); @@ -7883,41 +2862,31 @@ Init_eval(void) __send = rb_intern("__send"); __send_bang = rb_intern("__send!"); - rb_global_variable((VALUE*)&top_scope); - rb_global_variable((VALUE*)&ruby_eval_tree); - rb_global_variable((VALUE*)&ruby_dyna_vars); + rb_global_variable((VALUE *)&ruby_eval_tree); rb_define_virtual_variable("$@", errat_getter, errat_setter); - rb_define_hooked_variable("$!", &ruby_errinfo, 0, errinfo_setter); + rb_define_virtual_variable("$!", errinfo_getter, errinfo_setter); rb_define_global_function("eval", rb_f_eval, -1); rb_define_global_function("iterator?", rb_f_block_given_p, 0); rb_define_global_function("block_given?", rb_f_block_given_p, 0); + rb_define_global_function("method_missing", rb_method_missing, -1); rb_define_global_function("loop", rb_f_loop, 0); - rb_define_private_method(rb_cBasicObject, "method_missing", rb_method_missing, -1); - rb_define_method(rb_cBasicObject, "respond_to?", obj_respond_to, -1); - respond_to = rb_intern("respond_to?"); - rb_global_variable((VALUE*)&basic_respond_to); - basic_respond_to = rb_method_node(rb_cBasicObject, respond_to); - + rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1); + respond_to = rb_intern("respond_to?"); + basic_respond_to = rb_method_node(rb_cObject, respond_to); + rb_register_mark_object((VALUE)basic_respond_to); + rb_define_global_function("raise", rb_f_raise, -1); rb_define_global_function("fail", rb_f_raise, -1); rb_define_global_function("caller", rb_f_caller, -1); - rb_define_global_function("exit", rb_f_exit, -1); - rb_define_global_function("abort", rb_f_abort, -1); - - rb_define_global_function("at_exit", rb_f_at_exit, 0); - - rb_define_global_function("catch", rb_f_catch, 1); - rb_define_global_function("throw", rb_f_throw, -1); - rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */ + rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */ rb_define_global_function("local_variables", rb_f_local_variables, 0); - rb_define_global_function("__method__", rb_f_method_name, 0); - rb_define_global_function("__callee__", rb_f_callee_name, 0); + rb_define_method(rb_mKernel, "send", rb_f_send, -1); rb_define_method(rb_cBasicObject, "send", rb_f_send, -1); rb_define_method(rb_cBasicObject, "__send__", rb_f_send, -1); @@ -7926,7 +2895,6 @@ Init_eval(void) rb_define_method(rb_cBasicObject, "__send!", rb_f_funcall, -1); rb_define_method(rb_mKernel, "instance_eval", rb_obj_instance_eval, -1); rb_define_method(rb_mKernel, "instance_exec", rb_obj_instance_exec, -1); - rb_define_method(rb_mKernel, "define_singleton_method", rb_obj_define_method, -1); rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1); rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1); @@ -7934,9 +2902,8 @@ Init_eval(void) rb_define_private_method(rb_cModule, "public", rb_mod_public, -1); rb_define_private_method(rb_cModule, "protected", rb_mod_protected, -1); rb_define_private_method(rb_cModule, "private", rb_mod_private, -1); - rb_define_private_method(rb_cModule, "local", rb_mod_local, -1); rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1); - rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, -1); + rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1); rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1); rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1); rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1); @@ -7952,7 +2919,6 @@ Init_eval(void) rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1); rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1); rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2); - rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1); rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0); rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1); @@ -7963,5324 +2929,99 @@ Init_eval(void) rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1); - rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */ - rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */ + rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */ + rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */ rb_define_global_function("set_trace_func", set_trace_func, 1); - rb_global_variable(&trace_func); rb_define_virtual_variable("$SAFE", safe_getter, safe_setter); } -/* - * call-seq: - * mod.autoload(name, filename) => nil - * - * Registers _filename_ to be loaded (using <code>Kernel::require</code>) - * the first time that _name_ (which may be a <code>String</code> or - * a symbol) is accessed in the namespace of _mod_. - * - * module A - * end - * A.autoload(:B, "b") - * A::B.doit # autoloads "b" - */ - -static VALUE -rb_mod_autoload(VALUE mod, VALUE sym, VALUE file) -{ - ID id = rb_to_id(sym); - - Check_SafeStr(file); - rb_autoload(mod, id, RSTRING_PTR(file)); - return Qnil; -} - -/* - * call-seq: - * mod.autoload?(name) => String or nil - * - * Returns _filename_ to be loaded if _name_ is registered as - * +autoload+ in the namespace of _mod_. - * - * module A - * end - * A.autoload(:B, "b") - * A.autoload?(:B) # => "b" - */ - -static VALUE -rb_mod_autoload_p(VALUE mod, VALUE sym) -{ - return rb_autoload_p(mod, rb_to_id(sym)); -} - -/* - * call-seq: - * autoload(module, filename) => nil - * - * Registers _filename_ to be loaded (using <code>Kernel::require</code>) - * the first time that _module_ (which may be a <code>String</code> or - * a symbol) is accessed. - * - * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb") - */ - -static VALUE -rb_f_autoload(VALUE obj, VALUE sym, VALUE file) -{ - if (NIL_P(ruby_cbase)) { - rb_raise(rb_eTypeError, "no class/module for autoload target"); - } - return rb_mod_autoload(ruby_cbase, sym, file); -} - -/* - * call-seq: - * autoload(module) => filename or nil - * - * Returns _filename_ to be loaded if _module_ is registered as - * +autoload+. - * - * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb") - * autoload?(:MyModule) # => "/usr/local/lib/modules/my_module.rb" - */ - -static VALUE -rb_f_autoload_p(VALUE obj, VALUE sym) -{ - /* use ruby_cbase as same as rb_f_autoload. */ - if (NIL_P(ruby_cbase)) { - return Qfalse; - } - return rb_mod_autoload_p(ruby_cbase, sym); -} - -void -Init_load(void) -{ - rb_define_readonly_variable("$:", &rb_load_path); - rb_define_readonly_variable("$-I", &rb_load_path); - rb_define_readonly_variable("$LOAD_PATH", &rb_load_path); - rb_load_path = rb_ary_new(); - - rb_define_readonly_variable("$\"", &rb_features); - rb_define_readonly_variable("$LOADED_FEATURES", &rb_features); - rb_features = rb_ary_new(); - - rb_define_global_function("load", rb_f_load, -1); - rb_define_global_function("require", rb_f_require, 1); - rb_define_method(rb_cModule, "autoload", rb_mod_autoload, 2); - rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1); - rb_define_global_function("autoload", rb_f_autoload, 2); - rb_define_global_function("autoload?", rb_f_autoload_p, 1); - rb_global_variable(&ruby_wrapper); - - rb_global_variable(&ruby_dln_librefs); - ruby_dln_librefs = rb_ary_new(); -} - -static void -scope_dup(struct SCOPE *scope) -{ - volatile ID *tbl; - VALUE *vars; - - scope->flags |= SCOPE_DONT_RECYCLE; - if (scope->flags & SCOPE_MALLOC) return; - - if (scope->local_tbl) { - tbl = scope->local_tbl; - vars = ALLOC_N(VALUE, tbl[0]+1); - *vars++ = scope->local_vars[-1]; - MEMCPY(vars, scope->local_vars, VALUE, tbl[0]); - scope->local_vars = vars; - scope->flags |= SCOPE_MALLOC; - } -} - -static void -blk_mark(struct BLOCK *data) -{ - while (data) { - rb_gc_mark_frame(&data->frame); - rb_gc_mark((VALUE)data->scope); - rb_gc_mark((VALUE)data->var); - rb_gc_mark((VALUE)data->body); - rb_gc_mark((VALUE)data->self); - rb_gc_mark((VALUE)data->dyna_vars); - rb_gc_mark((VALUE)data->cref); - rb_gc_mark(data->wrapper); - rb_gc_mark(data->block_obj); - data = data->frame.block; - } -} - -static void -frame_free(struct FRAME *frame) -{ - struct FRAME *tmp; - - frame = frame->prev; - while (frame) { - tmp = frame; - frame = frame->prev; - free(tmp); - } -} - -static void -blk_free(struct BLOCK *data) -{ - void *tmp; - - while (data) { - frame_free(&data->frame); - tmp = data; - data = data->frame.block; - free(tmp); - } -} - -static void -frame_dup(struct FRAME *frame) -{ - struct FRAME *tmp; - - for (;;) { - frame->tmp = 0; /* should not preserve tmp */ - if (!frame->prev) break; - tmp = ALLOC(struct FRAME); - *tmp = *frame->prev; - frame->prev = tmp; - frame = tmp; - } -} - -static void -dvar_nail_down(struct RVarmap *vars) -{ - while (vars) { - if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break; - FL_SET(vars, DVAR_DONT_RECYCLE); - vars = vars->next; - } -} - -static void -blk_nail_down(struct BLOCK *block) -{ - struct BLOCK *tmp; - - dvar_nail_down(block->dyna_vars); - while (block->frame.block) { - tmp = ALLOC_N(struct BLOCK, 1); - MEMCPY(tmp, block->frame.block, struct BLOCK, 1); - scope_dup(tmp->scope); - frame_dup(&tmp->frame); - dvar_nail_down(tmp->dyna_vars); - block->frame.block = tmp; - block = tmp; - } -} - - -static void -blk_dup(struct BLOCK *dup, struct BLOCK *orig) -{ - MEMCPY(dup, orig, struct BLOCK, 1); - frame_dup(&dup->frame); - blk_nail_down(dup); -} - -/* - * MISSING: documentation - */ - -static VALUE -proc_clone(VALUE self) -{ - struct BLOCK *orig, *data; - VALUE bind; - - Data_Get_Struct(self, struct BLOCK, orig); - bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data); - CLONESETUP(bind, self); - blk_dup(data, orig); - if (orig->block_obj) data->block_obj = bind; - - return bind; -} - -/* - * MISSING: documentation - */ - -static VALUE -proc_dup(VALUE self) -{ - struct BLOCK *orig, *data; - VALUE bind; - - Data_Get_Struct(self, struct BLOCK, orig); - bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data); - blk_dup(data, orig); - - return bind; -} - -/* - * call-seq: - * binding -> a_binding - * - * Returns a +Binding+ object, describing the variable and - * method bindings at the point of call. This object can be used when - * calling +eval+ to execute the evaluated command in this - * environment. Also see the description of class +Binding+. - * - * def getBinding(param) - * return binding - * end - * b = getBinding("hello") - * eval("param", b) #=> "hello" - */ - -static VALUE -rb_f_binding(VALUE self) -{ - struct BLOCK *data; - VALUE bind; - - PUSH_FRAME(Qtrue); - PUSH_BLOCK(ruby_frame->block,0,0); - bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data); - *data = *ruby_frame->block; - - data->orig_thread = rb_thread_current(); - data->wrapper = ruby_wrapper; - frame_dup(&data->frame); - if (ruby_frame->prev) { - data->frame.callee = ruby_frame->prev->callee; - data->frame.this_func = ruby_frame->prev->this_func; - data->frame.this_class = ruby_frame->prev->this_class; - } - blk_nail_down(data); - scope_dup(data->scope); - POP_BLOCK(); - POP_FRAME(); - - return bind; -} - -/* - * call-seq: - * binding.eval(string [, filename [,lineno]]) => obj - * - * Evaluates the Ruby expression(s) in <em>string</em>, in the - * <em>binding</em>'s context. If the optional <em>filename</em> and - * <em>lineno</em> parameters are present, they will be used when - * reporting syntax errors. - * - * def getBinding(param) - * return binding - * end - * b = getBinding("hello") - * b.eval("param") #=> "hello" - */ - -static VALUE -bind_eval(int argc, VALUE *argv, VALUE bind) -{ - struct BLOCK *data; - VALUE args[4]; - - rb_scan_args(argc, argv, "12", &args[0], &args[2], &args[3]); - args[1] = bind; - Data_Get_Struct(bind, struct BLOCK, data); - - return rb_f_eval(argc+1, args, data->self); -} - -#define PROC_TSHIFT (FL_USHIFT+1) -#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3) -#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT) -#define PROC_SAFE_SAVED FL_USER4 - -#define SAFE_LEVEL_MAX PROC_TMASK - -#define proc_safe_level_p(data) (RBASIC(data)->flags & PROC_SAFE_SAVED) -#define proc_delete_safe_level(data) FL_UNSET(data, PROC_SAFE_SAVED) - -static void -proc_save_safe_level(VALUE data) -{ - int safe = ruby_safe_level; - if (safe > PROC_TMAX) safe = PROC_TMAX; - FL_UNSET(data, PROC_TMASK); - FL_SET(data, (safe << PROC_TSHIFT) & PROC_TMASK); - FL_SET(data, PROC_SAFE_SAVED); -} - -static int -proc_get_safe_level(VALUE data) -{ - return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT; -} - -static void -proc_set_safe_level(VALUE data) -{ - if (!proc_safe_level_p(data)) return; - ruby_safe_level = proc_get_safe_level(data); -} - -static VALUE -proc_alloc(VALUE klass, struct BLOCK *blk, int lambda) -{ - volatile VALUE block; - struct BLOCK *data; - - block = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data); - *data = *blk; - - if (!lambda && data->block_obj) { - return data->block_obj; - } - data->orig_thread = rb_thread_current(); - data->wrapper = ruby_wrapper; - frame_dup(&data->frame); - blk_nail_down(data); - scope_dup(data->scope); - proc_save_safe_level(block); - if (lambda) { - data->flags |= BLOCK_LAMBDA; - } - else { - data->block_obj = block; - } - return block; -} - -static VALUE -proc_new(VALUE klass, int lambda) -{ - volatile VALUE block; - struct FRAME *frame = ruby_frame; - - if (!rb_block_given_p()) { - if (lambda || !ruby_frame->prev || !ruby_frame->prev->block) { - rb_raise(rb_eArgError, "tried to create Proc object without a block"); - } - frame = ruby_frame->prev; - } - else if (!lambda && frame->block->block_obj) { - VALUE obj = frame->block->block_obj; - if (CLASS_OF(obj) != klass) { - obj = proc_clone(obj); - RBASIC(obj)->klass = klass; - } - return obj; - } - block = proc_alloc(klass, frame->block, lambda); - if (!lambda) { - frame->block->block_obj = block; - } - return block; -} - -/* - * call-seq: - * Proc.new {|...| block } => a_proc - * Proc.new => a_proc - * - * Creates a new <code>Proc</code> object, bound to the current - * context. <code>Proc::new</code> may be called without a block only - * within a method with an attached block, in which case that block is - * converted to the <code>Proc</code> object. - * - * def proc_from - * Proc.new - * end - * proc = proc_from { "hello" } - * proc.call #=> "hello" - */ - -static VALUE -proc_s_new(int argc, VALUE *argv, VALUE klass) -{ - VALUE block = proc_new(klass, Qfalse); - - rb_obj_call_init(block, argc, argv); - return block; -} - -/* - * call-seq: - * proc {|...| block } => a_proc - * - * Equivalent to <code>Proc.new</code>. - */ - -VALUE -rb_block_proc(void) -{ - return proc_new(rb_cProc, Qfalse); -} - -VALUE -rb_f_lambda(void) -{ - rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead"); - return proc_new(rb_cProc, Qtrue); -} - -/* - * call-seq: - * lambda { |...| block } => a_proc - * - * Equivalent to <code>Proc.new</code>, except the resulting Proc objects - * check the number of parameters passed when called. - */ - -static VALUE -proc_lambda(void) -{ - return proc_new(rb_cProc, Qtrue); -} - -static int -block_orphan(struct BLOCK *data) -{ - if (data->flags & (BLOCK_LAMBDA|BLOCK_FROM_METHOD)) { - return 1; - } - if (data->scope->flags & SCOPE_NOSTACK) { - return 1; - } - if (data->orig_thread != rb_thread_current()) { - return 1; - } - return 0; -} - -static VALUE -proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass, int flags) -{ - struct BLOCK _block; - struct BLOCK *data; - volatile VALUE result = Qundef; - int state; - volatile int safe = ruby_safe_level; - volatile VALUE old_wrapper = ruby_wrapper; - volatile int lambda; - VALUE bvar = 0; - - Data_Get_Struct(proc, struct BLOCK, data); - flags |= YIELD_PROC_INVOKE; - lambda = data->flags & BLOCK_LAMBDA; - if (rb_block_given_p() && ruby_frame->callee) { - if (klass != ruby_frame->this_class) - klass = rb_obj_class(proc); - } - - PUSH_VARS(); - ruby_wrapper = data->wrapper; - ruby_dyna_vars = data->dyna_vars; - /* PUSH BLOCK from data */ - _block = *data; - _block.block_obj = bvar; - if (self != Qundef) _block.frame.self = self; - if (klass) _block.frame.this_class = klass; - _block.frame.argc = (flags&YIELD_CALL) ? RARRAY_LEN(args) : 1; - _block.frame.flags = ruby_frame->flags; - if (_block.frame.argc && (ruby_frame->flags & FRAME_DMETH)) { - NEWOBJ(scope, struct SCOPE); - OBJSETUP(scope, args, T_SCOPE); - scope->local_tbl = _block.scope->local_tbl; - scope->local_vars = _block.scope->local_vars; - _block.scope = scope; - } - PUSH_FRAME(Qfalse); - ruby_frame->block = &_block; - PUSH_TAG(lambda ? PROT_LAMBDA : PROT_NONE); - state = EXEC_TAG(); - if (state == 0) { - proc_set_safe_level(proc); - result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0, flags); - } - else if (TAG_DST()) { - result = prot_tag->retval; - } - POP_TAG(); - POP_FRAME(); - ruby_wrapper = old_wrapper; - POP_VARS(); - if (proc_safe_level_p(proc)) - ruby_safe_level = safe; - - switch (state) { - case 0: - break; - case TAG_RETRY: - proc_jump_error(TAG_RETRY, Qnil); /* xxx */ - JUMP_TAG(state); - break; - case TAG_BREAK: - if (lambda && result != Qundef) break; - JUMP_TAG(state); - case TAG_RETURN: - if (result != Qundef) { - if (flags & YIELD_CALL) - break; - return_jump(result); - } - default: - JUMP_TAG(state); - } - return result; -} - -/* CHECKME: are the argument checking semantics correct? */ - -/* - * call-seq: - * prc.call(params,...) => obj - * prc[params,...] => obj - * - * Invokes the block, setting the block's parameters to the values in - * <i>params</i> using something close to method calling semantics. - * Generates a warning if multiple values are passed to a proc that - * expects just one (previously this silently converted the parameters - * to an array). - * - * For procs created using <code>Kernel.proc</code>, generates an - * error if the wrong number of parameters - * are passed to a proc with multiple parameters. For procs created using - * <code>Proc.new</code>, extra parameters are silently discarded. - * - * Returns the value of the last expression evaluated in the block. See - * also <code>Proc#yield</code>. - * - * a_proc = Proc.new {|a, *b| b.collect {|i| i*a }} - * a_proc.call(9, 1, 2, 3) #=> [9, 18, 27] - * a_proc[9, 1, 2, 3] #=> [9, 18, 27] - * a_proc = Proc.new {|a,b| a} - * a_proc.call(1,2,3) - * - * <em>produces:</em> - * - * prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError) - * from prog.rb:4:in `call' - * from prog.rb:5 - */ - -VALUE -rb_proc_call(VALUE proc, VALUE args /* OK */) -{ - return proc_invoke(proc, args, Qundef, 0, INVOKE_CALL); -} - -/* - * call-seq: - * prc.yield(params,...) => obj - * - * Invokes the block, setting the block's parameters to the values in - * <i>params</i> in the same manner the yield statement does. - * - * a_proc = Proc.new {|a, *b| b.collect {|i| i*a }} - * a_proc.yield(9, 1, 2, 3) #=> [9, 18, 27] - * a_proc.yield([9, 1, 2, 3]) #=> [9, 18, 27] - * a_proc = Proc.new {|a,b| a} - * a_proc.yield(1,2,3) # => [1] - */ - -VALUE -rb_proc_yield(int argc, VALUE *argv, VALUE proc) -{ - switch (argc) { - case 1: - if (!NIL_P(argv[0])) { - return proc_invoke(proc, argv[0], Qundef, 0, 0); - } - /* fall through */ - case 0: - return proc_invoke(proc, Qundef, Qundef, 0, 0); - default: - return proc_invoke(proc, rb_ary_new4(argc, argv), Qundef, 0, INVOKE_VALUES); - } -} - -/* :nodoc: */ -static VALUE -nil_yield(int argc, VALUE *argv) -{ - localjump_error("no block given", Qnil, 0, backtrace(0)); - return Qnil; /* not reached */ -} - -int -rb_proc_arity(VALUE proc) -{ - struct BLOCK *data; - NODE *var, *list; - int n; - - Data_Get_Struct(proc, struct BLOCK, data); - var = data->var; - if (var == 0) { - if (!data->body) return 0; - if (nd_type(data->body) == NODE_IFUNC && - data->body->nd_cfnc == bmcall) { - return method_arity(data->body->nd_tval); - } - return 0; - } - if (var == (NODE*)1) return 0; - if (var == (NODE*)2) return 0; - if (nd_type(var) == NODE_BLOCK_ARG) { - var = var->nd_args; - if (var == (NODE*)1) return 0; - if (var == (NODE*)2) return 0; - } - switch (nd_type(var)) { - default: - return 1; - case NODE_MASGN: - list = var->nd_head; - n = 0; - while (list) { - n++; - list = list->nd_next; - } - if (var->nd_args) { - if (var->nd_args != (NODE *)-1 && nd_type(var->nd_args) == NODE_POSTARG) { - return -n-1-var->nd_args->nd_head->nd_alen; - } - return -n-1; - } - return n; - } -} - -/* - * call-seq: - * prc.arity -> fixnum - * - * Returns the number of arguments that would not be ignored. If the block - * is declared to take no arguments, returns 0. If the block is known - * to take exactly n arguments, returns n. If the block has optional - * arguments, return -n-1, where n is the number of mandatory - * arguments. A <code>proc</code> with no argument declarations - * is the same a block declaring <code>||</code> as its arguments. - * - * Proc.new {}.arity #=> 0 - * Proc.new {||}.arity #=> 0 - * Proc.new {|a|}.arity #=> 1 - * Proc.new {|a,b|}.arity #=> 2 - * Proc.new {|a,b,c|}.arity #=> 3 - * Proc.new {|*a|}.arity #=> -1 - * Proc.new {|a,*b|}.arity #=> -2 - */ - -static VALUE -proc_arity(VALUE proc) -{ - int arity = rb_proc_arity(proc); - return INT2FIX(arity); -} - -/* - * call-seq: - * prc == other_proc => true or false - * - * Return <code>true</code> if <i>prc</i> is the same object as - * <i>other_proc</i>, or if they are both procs with the same body. - */ - -static VALUE -proc_eq(VALUE self, VALUE other) -{ - struct BLOCK *data, *data2; - - if (self == other) return Qtrue; - if (TYPE(other) != T_DATA) return Qfalse; - if (RDATA(other)->dmark != (RUBY_DATA_FUNC)blk_mark) return Qfalse; - if (CLASS_OF(self) != CLASS_OF(other)) return Qfalse; - Data_Get_Struct(self, struct BLOCK, data); - Data_Get_Struct(other, struct BLOCK, data2); - if (data->body != data2->body) return Qfalse; - if (data->var != data2->var) return Qfalse; - if (data->scope != data2->scope) return Qfalse; - if (data->dyna_vars != data2->dyna_vars) return Qfalse; - if (data->flags != data2->flags) return Qfalse; - - return Qtrue; -} - -/* - * call-seq: - * prc.hash => integer - * - * Return hash value corresponding to proc body. - */ - -static VALUE -proc_hash(VALUE self) -{ - struct BLOCK *data; - long hash; - - Data_Get_Struct(self, struct BLOCK, data); - hash = (long)data->body; - hash ^= (long)data->var; - hash ^= data->frame.uniq << 16; - hash ^= data->flags; - - return INT2FIX(hash); -} - -/* - * call-seq: - * prc.to_s => string - * - * Shows the unique identifier for this proc, along with - * an indication of where the proc was defined. - */ - -static VALUE -proc_to_s(VALUE self) -{ - struct BLOCK *data; - NODE *node; - char *cname = rb_obj_classname(self); - VALUE str; - - Data_Get_Struct(self, struct BLOCK, data); - if ((node = data->frame.node) || (node = data->body)) { - str = rb_sprintf("#<%s:%p@%s:%d>", cname, data->body, - node->nd_file, nd_line(node)); - } - else { - str = rb_sprintf("#<%s:%p>", cname, data->body); - } - if (OBJ_TAINTED(self)) OBJ_TAINT(str); - - return str; -} - -/* - * call-seq: - * prc.to_proc -> prc - * - * Part of the protocol for converting objects to <code>Proc</code> - * objects. Instances of class <code>Proc</code> simply return - * themselves. - */ - -static VALUE -proc_to_self(VALUE self) -{ - return self; -} - -/* - * call-seq: - * prc.binding => binding - * - * Returns the binding associated with <i>prc</i>. Note that - * <code>Kernel#eval</code> accepts either a <code>Proc</code> or a - * <code>Binding</code> object as its second parameter. - * - * def fred(param) - * proc {} - * end - * - * b = fred(99) - * eval("param", b.binding) #=> 99 - * eval("param", b) #=> 99 - */ - -static VALUE -proc_binding(VALUE proc) -{ - struct BLOCK *orig, *data; - VALUE bind; - - Data_Get_Struct(proc, struct BLOCK, orig); - bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data); - MEMCPY(data, orig, struct BLOCK, 1); - frame_dup(&data->frame); - blk_nail_down(data); - - return bind; -} - -struct block_arg { - VALUE self; - NODE *iter; -}; - -static struct BLOCK * -passing_block(VALUE proc, struct BLOCK *blockp) -{ - VALUE b; - struct BLOCK *data; - volatile int orphan; - - if (NIL_P(proc)) return 0; - if (!rb_obj_is_proc(proc)) { - b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc"); - if (!rb_obj_is_proc(b)) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)", - rb_obj_classname(proc)); - } - proc = b; - } - - if (ruby_safe_level >= 1 && OBJ_TAINTED(proc) && - ruby_safe_level > proc_get_safe_level(proc)) { - rb_raise(rb_eSecurityError, "Insecure: tainted block value"); - } - - Data_Get_Struct(proc, struct BLOCK, data); - orphan = block_orphan(data); - if (!orphan) return data; - - *blockp = *data; - blockp->uniq = block_unique++; - return blockp; -} - -static void -bm_mark(struct METHOD *data) -{ - rb_gc_mark(data->rklass); - rb_gc_mark(data->klass); - rb_gc_mark(data->recv); - rb_gc_mark((VALUE)data->body); -} - -static VALUE -mnew(VALUE klass, VALUE obj, ID id, VALUE mklass) -{ - VALUE method; - NODE *body; - struct METHOD *data; - VALUE rklass = klass; - ID oid = id; - int noex = LOOKUP_NORMAL; - - again: - if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) { - raise_undef(rklass, oid); - } - - if (nd_type(body) == NODE_ZSUPER) { - klass = RCLASS(klass)->super; - goto again; - } - - while (rklass != klass && - (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) { - rklass = RCLASS(rklass)->super; - } - if (TYPE(klass) == T_ICLASS) klass = RBASIC(klass)->klass; - method = Data_Make_Struct(mklass, struct METHOD, bm_mark, -1, data); - data->klass = klass; - data->recv = obj; - data->id = id; - data->body = body; - data->rklass = rklass; - data->oid = oid; - data->safe_level = NOEX_WITH_SAFE(0); - OBJ_INFECT(method, klass); - - return method; -} - - -/********************************************************************** - * - * Document-class : Method - * - * Method objects are created by <code>Object#method</code>, and are - * associated with a particular object (not just with a class). They - * may be used to invoke the method within the object, and as a block - * associated with an iterator. They may also be unbound from one - * object (creating an <code>UnboundMethod</code>) and bound to - * another. - * - * class Thing - * def square(n) - * n*n - * end - * end - * thing = Thing.new - * meth = thing.method(:square) - * - * meth.call(9) #=> 81 - * [ 1, 2, 3 ].collect(&meth) #=> [1, 4, 9] - * - */ - -/* - * call-seq: - * meth == other_meth => true or false - * - * Two method objects are equal if that are bound to the same - * object and contain the same body. - */ - - -static VALUE -method_eq(VALUE method, VALUE other) -{ - struct METHOD *m1, *m2; - - if (TYPE(other) != T_DATA || RDATA(other)->dmark != (RUBY_DATA_FUNC)bm_mark) - return Qfalse; - if (CLASS_OF(method) != CLASS_OF(other)) - return Qfalse; - - Data_Get_Struct(method, struct METHOD, m1); - Data_Get_Struct(other, struct METHOD, m2); - - if (m1->klass != m2->klass || m1->rklass != m2->rklass || - m1->recv != m2->recv || m1->body != m2->body) - return Qfalse; - - return Qtrue; -} - -/* - * call-seq: - * meth.hash => integer - * - * Return a hash value corresponding to the method object. - */ - -static VALUE -method_hash(VALUE method) -{ - struct METHOD *m; - long hash; - - Data_Get_Struct(method, struct METHOD, m); - hash = (long)m->klass; - hash ^= (long)m->rklass; - hash ^= (long)m->recv; - hash ^= (long)m->body; - - return INT2FIX(hash); -} - -/* - * call-seq: - * meth.unbind => unbound_method - * - * Dissociates <i>meth</i> from it's current receiver. The resulting - * <code>UnboundMethod</code> can subsequently be bound to a new object - * of the same class (see <code>UnboundMethod</code>). - */ - -static VALUE -method_unbind(VALUE obj) -{ - VALUE method; - struct METHOD *orig, *data; - - Data_Get_Struct(obj, struct METHOD, orig); - method = Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, data); - data->klass = orig->klass; - data->recv = Qundef; - data->id = orig->id; - data->body = orig->body; - data->rklass = orig->rklass; - data->oid = orig->oid; - OBJ_INFECT(method, obj); - - return method; -} - -/* - * call-seq: - * obj.method(sym) => method - * - * Looks up the named method as a receiver in <i>obj</i>, returning a - * <code>Method</code> object (or raising <code>NameError</code>). The - * <code>Method</code> object acts as a closure in <i>obj</i>'s object - * instance, so instance variables and the value of <code>self</code> - * remain available. Looks for private methods if optional second - * argument is true. - - * - * class Demo - * def initialize(n) - * @iv = n - * end - * def hello() - * "Hello, @iv = #{@iv}" - * end - * end - * - * k = Demo.new(99) - * m = k.method(:hello) - * m.call #=> "Hello, @iv = 99" - * - * l = Demo.new('Fred') - * m = l.method("hello") - * m.call #=> "Hello, @iv = Fred" - */ - -VALUE -rb_obj_method(VALUE obj, VALUE vid) -{ - return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod); -} - -/* - * call-seq: - * mod.instance_method(symbol) => unbound_method - * - * Returns an +UnboundMethod+ representing the given instance method - * in _mod_. - * - * class Interpreter - * def do_a() print "there, "; end - * def do_d() print "Hello "; end - * def do_e() print "!\n"; end - * def do_v() print "Dave"; end - * Dispatcher = { - * ?a => instance_method(:do_a), - * ?d => instance_method(:do_d), - * ?e => instance_method(:do_e), - * ?v => instance_method(:do_v) - * } - * def interpret(string) - * string.each_byte {|b| Dispatcher[b].bind(self).call } - * end - * end - * - * - * interpreter = Interpreter.new - * interpreter.interpret('dave') - * - * <em>produces:</em> - * - * Hello there, Dave! - */ - -static VALUE -rb_mod_method(VALUE mod, VALUE vid) -{ - return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod); -} - -/* - * MISSING: documentation - */ - -static VALUE -method_clone(VALUE self) -{ - VALUE clone; - struct METHOD *orig, *data; - - Data_Get_Struct(self, struct METHOD, orig); - clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data); - CLONESETUP(clone, self); - *data = *orig; - - return clone; -} - -/* - * call-seq: - * meth.call(args, ...) => obj - * meth[args, ...] => obj - * - * Invokes the <i>meth</i> with the specified arguments, returning the - * method's return value. - * - * m = 12.method("+") - * m.call(3) #=> 15 - * m.call(20) #=> 32 - */ - -VALUE -rb_method_call(int argc, VALUE *argv, VALUE method) -{ - VALUE result = Qnil; /* OK */ - struct METHOD *data; - int safe; - - Data_Get_Struct(method, struct METHOD, data); - if (data->recv == Qundef) { - rb_raise(rb_eTypeError, "can't call unbound method; bind first"); - } - if (OBJ_TAINTED(method)) { - safe = NOEX_WITH(data->safe_level, 4); - } - else { - safe = data->safe_level; - } - result = rb_call0(data->klass,data->recv,data->id,data->oid, - argc,argv,ruby_frame->block,data->body,safe); - return result; -} - -/********************************************************************** - * - * Document-class: UnboundMethod - * - * Ruby supports two forms of objectified methods. Class - * <code>Method</code> is used to represent methods that are associated - * with a particular object: these method objects are bound to that - * object. Bound method objects for an object can be created using - * <code>Object#method</code>. - * - * Ruby also supports unbound methods; methods objects that are not - * associated with a particular object. These can be created either by - * calling <code>Module#instance_method</code> or by calling - * <code>unbind</code> on a bound method object. The result of both of - * these is an <code>UnboundMethod</code> object. - * - * Unbound methods can only be called after they are bound to an - * object. That object must be be a kind_of? the method's original - * class. - * - * class Square - * def area - * @side * @side - * end - * def initialize(side) - * @side = side - * end - * end - * - * area_un = Square.instance_method(:area) - * - * s = Square.new(12) - * area = area_un.bind(s) - * area.call #=> 144 - * - * Unbound methods are a reference to the method at the time it was - * objectified: subsequent changes to the underlying class will not - * affect the unbound method. - * - * class Test - * def test - * :original - * end - * end - * um = Test.instance_method(:test) - * class Test - * def test - * :modified - * end - * end - * t = Test.new - * t.test #=> :modified - * um.bind(t).call #=> :original - * - */ - -/* - * call-seq: - * umeth.bind(obj) -> method - * - * Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class - * from which <i>umeth</i> was obtained, - * <code>obj.kind_of?(Klass)</code> must be true. - * - * class A - * def test - * puts "In test, class = #{self.class}" - * end - * end - * class B < A - * end - * class C < B - * end - * - * - * um = B.instance_method(:test) - * bm = um.bind(C.new) - * bm.call - * bm = um.bind(B.new) - * bm.call - * bm = um.bind(A.new) - * bm.call - * - * <em>produces:</em> - * - * In test, class = C - * In test, class = B - * prog.rb:16:in `bind': bind argument must be an instance of B (TypeError) - * from prog.rb:16 - */ - -static VALUE -umethod_bind(VALUE method, VALUE recv) -{ - struct METHOD *data, *bound; - VALUE rklass = CLASS_OF(recv); - - Data_Get_Struct(method, struct METHOD, data); - if (data->rklass != rklass) { - if (FL_TEST(data->rklass, FL_SINGLETON)) { - rb_raise(rb_eTypeError, "singleton method bound for a different object"); - } - if (TYPE(data->rklass) == T_MODULE) { - st_table *m_tbl = RCLASS(data->rklass)->m_tbl; - while (RCLASS(rklass)->m_tbl != m_tbl) { - rklass = RCLASS(rklass)->super; - if (!rklass) goto not_instace; - } - } - else if (!rb_obj_is_kind_of(recv, data->rklass)) { - not_instace: - rb_raise(rb_eTypeError, "bind argument must be an instance of %s", - rb_class2name(data->rklass)); - } - } - - method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound); - *bound = *data; - bound->recv = recv; - bound->rklass = rklass; - - return method; -} - -int -rb_node_arity(NODE *body) -{ - int n; - - switch (nd_type(body)) { - case NODE_CFUNC: - if (body->nd_argc < 0) return -1; - return body->nd_argc; - case NODE_ZSUPER: - return -1; - case NODE_ATTRSET: - return 1; - case NODE_IVAR: - return 0; - case NODE_BMETHOD: - return rb_proc_arity(body->nd_cval); - case NODE_SCOPE: - body = body->nd_next; /* skip NODE_SCOPE */ - if (nd_type(body) == NODE_BLOCK) - body = body->nd_head; - if (!body) return 0; - n = body->nd_frml ? RARRAY_LEN(body->nd_frml) : 0; - if (body->nd_opt) - return -n-1; - if (body->nd_rest) { - if (nd_type(body->nd_rest) == NODE_POSTARG) { - return -n-1-body->nd_rest->nd_head->nd_alen; - } - n = -n-1; - } - return n; - default: - rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body)); - } -} - -/* - * call-seq: - * meth.arity => fixnum - * - * Returns an indication of the number of arguments accepted by a - * method. Returns a nonnegative integer for methods that take a fixed - * number of arguments. For Ruby methods that take a variable number of - * arguments, returns -n-1, where n is the number of required - * arguments. For methods written in C, returns -1 if the call takes a - * variable number of arguments. - * - * class C - * def one; end - * def two(a); end - * def three(*a); end - * def four(a, b); end - * def five(a, b, *c); end - * def six(a, b, *c, &d); end - * end - * c = C.new - * c.method(:one).arity #=> 0 - * c.method(:two).arity #=> 1 - * c.method(:three).arity #=> -1 - * c.method(:four).arity #=> 2 - * c.method(:five).arity #=> -3 - * c.method(:six).arity #=> -3 - * - * "cat".method(:size).arity #=> 0 - * "cat".method(:replace).arity #=> 1 - * "cat".method(:squeeze).arity #=> -1 - * "cat".method(:count).arity #=> -1 - */ - -static VALUE -method_arity_m(VALUE method) -{ - int n = method_arity(method); - return INT2FIX(n); -} - -static int -method_arity(VALUE method) -{ - struct METHOD *data; - - Data_Get_Struct(method, struct METHOD, data); - return rb_node_arity(data->body); -} - -int -rb_mod_method_arity(VALUE mod, ID id) -{ - NODE *node = rb_method_node(mod, id); - return rb_node_arity(node); -} - -int -rb_obj_method_arity(VALUE obj, ID id) -{ - return rb_mod_method_arity(CLASS_OF(obj), id); -} - -/* - * call-seq: - * meth.to_s => string - * meth.inspect => string - * - * Show the name of the underlying method. - * - * "cat".method(:count).inspect #=> "#<Method: String#count>" - */ - -static VALUE -method_inspect(VALUE method) -{ - struct METHOD *data; - VALUE str; - const char *s; - const char *sharp = "#"; - - Data_Get_Struct(method, struct METHOD, data); - str = rb_str_buf_new2("#<"); - s = rb_obj_classname(method); - rb_str_buf_cat2(str, s); - rb_str_buf_cat2(str, ": "); - - if (FL_TEST(data->klass, FL_SINGLETON)) { - VALUE v = rb_iv_get(data->klass, "__attached__"); - - if (data->recv == Qundef) { - rb_str_buf_append(str, rb_inspect(data->klass)); - } - else if (data->recv == v) { - rb_str_buf_append(str, rb_inspect(v)); - sharp = "."; - } - else { - rb_str_buf_append(str, rb_inspect(data->recv)); - rb_str_buf_cat2(str, "("); - rb_str_buf_append(str, rb_inspect(v)); - rb_str_buf_cat2(str, ")"); - sharp = "."; - } - } - else { - rb_str_buf_cat2(str, rb_class2name(data->rklass)); - if (data->rklass != data->klass) { - rb_str_buf_cat2(str, "("); - rb_str_buf_cat2(str, rb_class2name(data->klass)); - rb_str_buf_cat2(str, ")"); - } - } - rb_str_buf_cat2(str, sharp); - rb_str_buf_cat2(str, rb_id2name(data->oid)); - rb_str_buf_cat2(str, ">"); - - return str; -} - -static VALUE -mproc(VALUE method) -{ - VALUE proc; - - proc = rb_block_proc(); - proc_delete_safe_level(proc); - return proc; -} - -static VALUE -bmcall(VALUE args, VALUE method) -{ - volatile VALUE a; - VALUE ret; - a = svalue_to_avalue(args); - ret = rb_method_call(RARRAY_LEN(a), RARRAY_PTR(a), method); - a = Qnil; /* prevent tail call */ - return ret; -} +/* for parser */ VALUE -rb_proc_new( - VALUE (*func)(ANYARGS), /* VALUE yieldarg[, VALUE procarg] */ - VALUE val) -{ - struct BLOCK *data; - VALUE proc = rb_iterate((VALUE(*)(VALUE))mproc, 0, func, val); - - Data_Get_Struct(proc, struct BLOCK, data); - data->body->nd_state = YIELD_FUNC_AVALUE; - return proc; -} - -/* - * call-seq: - * meth.to_proc => prc - * - * Returns a <code>Proc</code> object corresponding to this method. - */ - -static VALUE -method_proc(VALUE method) -{ - VALUE proc; - struct METHOD *mdata; - struct BLOCK *bdata; - - Data_Get_Struct(method, struct METHOD, mdata); - if (nd_type(mdata->body) == NODE_BMETHOD) { - return mdata->body->nd_cval; - } - proc = rb_iterate((VALUE(*)(VALUE))mproc, 0, bmcall, method); - Data_Get_Struct(proc, struct BLOCK, bdata); - bdata->body->nd_file = mdata->body->nd_file; - nd_set_line(bdata->body, nd_line(mdata->body)); - bdata->body->nd_state = YIELD_FUNC_SVALUE; - bdata->flags |= BLOCK_FROM_METHOD; - - return proc; -} - -static VALUE -rb_obj_is_method(VALUE m) -{ - if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) { - return Qtrue; - } - return Qfalse; -} - -/* - * call-seq: - * define_method(symbol, method) => new_method - * define_method(symbol) { block } => proc - * - * Defines an instance method in the receiver. The _method_ - * parameter can be a +Proc+ or +Method+ object. - * If a block is specified, it is used as the method body. This block - * is evaluated using <code>instance_eval</code>, a point that is - * tricky to demonstrate because <code>define_method</code> is private. - * (This is why we resort to the +send+ hack in this example.) - * - * class A - * def fred - * puts "In Fred" - * end - * def create_method(name, &block) - * self.class.send(:define_method, name, &block) - * end - * define_method(:wilma) { puts "Charge it!" } - * end - * class B < A - * define_method(:barney, instance_method(:fred)) - * end - * a = B.new - * a.barney - * a.wilma - * a.create_method(:betty) { p self } - * a.betty - * - * <em>produces:</em> - * - * In Fred - * Charge it! - * #<B:0x401b39e8> - */ - -static VALUE -rb_mod_define_method(int argc, VALUE *argv, VALUE mod) -{ - ID id; - VALUE body; - NODE *node; - int noex; - - if (argc == 1) { - id = rb_to_id(argv[0]); - body = proc_lambda(); - } - else if (argc == 2) { - id = rb_to_id(argv[0]); - body = argv[1]; - if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)", - rb_obj_classname(body)); - } - } - else { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); - } - if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) { - struct METHOD *method = (struct METHOD *)DATA_PTR(body); - VALUE rklass = method->rklass; - if (rklass != mod) { - if (FL_TEST(rklass, FL_SINGLETON)) { - rb_raise(rb_eTypeError, "can't bind singleton method to a different class"); - } - if (!RTEST(rb_class_inherited_p(mod, rklass))) { - rb_raise(rb_eTypeError, "bind argument must be a subclass of %s", - rb_class2name(rklass)); - } - } - node = method->body; - } - else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) { - struct BLOCK *block; - - body = proc_clone(body); - proc_delete_safe_level(body); - Data_Get_Struct(body, struct BLOCK, block); - block->frame.callee = id; - block->frame.this_func = id; - block->frame.this_class = mod; - node = NEW_BMETHOD(body); - } - else { - /* type error */ - rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)"); - } - - if (VIS_TEST(VIS_PRIVATE)) { - noex = NOEX_PRIVATE; - } - else if (VIS_TEST(VIS_PROTECTED)) { - noex = NOEX_PROTECTED; - } - else { - noex = NOEX_PUBLIC; - } - rb_add_method(mod, id, node, noex); - return body; -} - -/* - * call-seq: - * obj.define_singleton_method(symbol, method) => new_method - * obj.define_singleton_method(symbol) { block } => proc - * - * Defines a singleton method for the receiver. The _method_ - * parameter can be a +Proc+ or +Method+ object. - * If a block is specified, it is used as the method body. - * See <code>Kernel#define_method</code>. - */ - -static VALUE -rb_obj_define_method(int argc, VALUE *argv, VALUE obj) -{ - VALUE klass = rb_singleton_class(obj); - - return rb_mod_define_method(argc, argv, klass); -} - -/* - * <code>Proc</code> objects are blocks of code that have been bound to - * a set of local variables. Once bound, the code may be called in - * different contexts and still access those variables. - * - * def gen_times(factor) - * return Proc.new {|n| n*factor } - * end - * - * times3 = gen_times(3) - * times5 = gen_times(5) - * - * times3.call(12) #=> 36 - * times5.call(5) #=> 25 - * times3.call(times5.call(4)) #=> 60 - * - */ - -void -Init_Proc(void) -{ - rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError); - rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0); - rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0); - - rb_global_variable(&exception_error); - exception_error = rb_exc_new2(rb_eFatal, "exception reentered"); - - rb_eSysStackError = rb_define_class("SystemStackError", rb_eException); - rb_global_variable(&sysstack_error); - sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep"); - OBJ_TAINT(sysstack_error); - - rb_cProc = rb_define_class("Proc", rb_cObject); - rb_undef_alloc_func(rb_cProc); - rb_define_singleton_method(rb_cProc, "new", proc_s_new, -1); - - rb_define_method(rb_cProc, "clone", proc_clone, 0); - rb_define_method(rb_cProc, "dup", proc_dup, 0); - rb_define_method(rb_cProc, "call", rb_proc_call, -2); - rb_define_method(rb_cProc, "yield", rb_proc_yield, -1); - rb_define_method(rb_cProc, "arity", proc_arity, 0); - rb_define_method(rb_cProc, "[]", rb_proc_call, -2); - rb_define_method(rb_cProc, "==", proc_eq, 1); - rb_define_method(rb_cProc, "eql?", proc_eq, 1); - rb_define_method(rb_cProc, "hash", proc_hash, 0); - rb_define_method(rb_cProc, "to_s", proc_to_s, 0); - rb_define_method(rb_cProc, "to_proc", proc_to_self, 0); - rb_define_method(rb_cProc, "binding", proc_binding, 0); - - rb_define_global_function("proc", rb_block_proc, 0); - rb_define_global_function("lambda", proc_lambda, 0); - - rb_define_method(rb_cNilClass, "yield", nil_yield, -1); - - rb_cMethod = rb_define_class("Method", rb_cObject); - rb_undef_alloc_func(rb_cMethod); - rb_undef_method(CLASS_OF(rb_cMethod), "new"); - rb_define_method(rb_cMethod, "==", method_eq, 1); - rb_define_method(rb_cMethod, "eql?", method_eq, 1); - rb_define_method(rb_cMethod, "hash", method_hash, 0); - rb_define_method(rb_cMethod, "clone", method_clone, 0); - rb_define_method(rb_cMethod, "call", rb_method_call, -1); - rb_define_method(rb_cMethod, "[]", rb_method_call, -1); - rb_define_method(rb_cMethod, "arity", method_arity_m, 0); - rb_define_method(rb_cMethod, "inspect", method_inspect, 0); - rb_define_method(rb_cMethod, "to_s", method_inspect, 0); - rb_define_method(rb_cMethod, "to_proc", method_proc, 0); - rb_define_method(rb_cMethod, "unbind", method_unbind, 0); - rb_define_method(rb_mKernel, "method", rb_obj_method, 1); - - rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject); - rb_undef_alloc_func(rb_cUnboundMethod); - rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new"); - rb_define_method(rb_cUnboundMethod, "==", method_eq, 1); - rb_define_method(rb_cUnboundMethod, "eql?", method_eq, 1); - rb_define_method(rb_cUnboundMethod, "hash", method_hash, 0); - rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0); - rb_define_method(rb_cUnboundMethod, "arity", method_arity_m, 0); - rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0); - rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0); - rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1); - rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1); -} - -/* - * Objects of class <code>Binding</code> encapsulate the execution - * context at some particular place in the code and retain this context - * for future use. The variables, methods, value of <code>self</code>, - * and possibly an iterator block that can be accessed in this context - * are all retained. Binding objects can be created using - * <code>Kernel#binding</code>, and are made available to the callback - * of <code>Kernel#set_trace_func</code>. - * - * These binding objects can be passed as the second argument of the - * <code>Kernel#eval</code> method, establishing an environment for the - * evaluation. - * - * class Demo - * def initialize(n) - * @secret = n - * end - * def getBinding - * return binding() - * end - * end - * - * k1 = Demo.new(99) - * b1 = k1.getBinding - * k2 = Demo.new(-3) - * b2 = k2.getBinding - * - * eval("@secret", b1) #=> 99 - * eval("@secret", b2) #=> -3 - * eval("@secret") #=> nil - * - * Binding objects have no class-specific methods. - * - */ - -void -Init_Binding(void) -{ - rb_cBinding = rb_define_class("Binding", rb_cObject); - rb_undef_alloc_func(rb_cBinding); - rb_undef_method(CLASS_OF(rb_cBinding), "new"); - rb_define_method(rb_cBinding, "clone", proc_clone, 0); - rb_define_method(rb_cBinding, "dup", proc_dup, 0); - rb_define_method(rb_cBinding, "eval", bind_eval, -1); - rb_define_global_function("binding", rb_f_binding, 0); -} - -/* Windows SEH refers data on the stack. */ -#undef SAVE_WIN32_EXCEPTION_LIST -#if defined _WIN32 || defined __CYGWIN__ -#if defined __CYGWIN__ -typedef unsigned long DWORD; -#endif - -static inline DWORD -win32_get_exception_list(void) -{ - DWORD p; -# if defined _MSC_VER -# ifdef _M_IX86 -# define SAVE_WIN32_EXCEPTION_LIST -# if _MSC_VER >= 1310 - /* warning: unsafe assignment to fs:0 ... this is ok */ -# pragma warning(disable: 4733) -# endif - __asm mov eax, fs:[0]; - __asm mov p, eax; -# endif -# elif defined __GNUC__ -# ifdef __i386__ -# define SAVE_WIN32_EXCEPTION_LIST - __asm__("movl %%fs:0,%0" : "=r"(p)); -# endif -# elif defined __BORLANDC__ -# define SAVE_WIN32_EXCEPTION_LIST - __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */ - p = _EAX; -# endif - return p; -} - -static inline void -win32_set_exception_list(DWORD p) -{ -# if defined _MSC_VER -# ifdef _M_IX86 - __asm mov eax, p; - __asm mov fs:[0], eax; -# endif -# elif defined __GNUC__ -# ifdef __i386__ - __asm__("movl %0,%%fs:0" :: "r"(p)); -# endif -# elif defined __BORLANDC__ - _EAX = p; - __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */ -# endif -} - -#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE -# error unsupported platform -#endif -#endif - -int rb_thread_pending = 0; - -VALUE rb_cThread; - -extern VALUE rb_last_status; - -#define WAIT_FD (1<<0) -#define WAIT_SELECT (1<<1) -#define WAIT_TIME (1<<2) -#define WAIT_JOIN (1<<3) -#define WAIT_PID (1<<4) - -/* +infty, for this purpose */ -#define DELAY_INFTY 1E30 - -#if !defined HAVE_PAUSE -# if defined _WIN32 && !defined __CYGWIN__ -# define pause() Sleep(INFINITE) -# else -# define pause() sleep(0x7fffffff) -# endif -#endif - -#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT) -void -rb_fd_init(volatile rb_fdset_t *fds) -{ - fds->maxfd = 0; - fds->fdset = ALLOC(fd_set); - FD_ZERO(fds->fdset); -} - -void -rb_fd_term(rb_fdset_t *fds) -{ - if (fds->fdset) free(fds->fdset); - fds->maxfd = 0; - fds->fdset = 0; -} - -void -rb_fd_zero(rb_fdset_t *fds) -{ - if (fds->fdset) { - MEMZERO(fds->fdset, fd_mask, howmany(fds->maxfd, NFDBITS)); - FD_ZERO(fds->fdset); - } -} - -static void -rb_fd_resize(int n, rb_fdset_t *fds) -{ - int m = howmany(n + 1, NFDBITS) * sizeof(fd_mask); - int o = howmany(fds->maxfd, NFDBITS) * sizeof(fd_mask); - - if (m < sizeof(fd_set)) m = sizeof(fd_set); - if (o < sizeof(fd_set)) o = sizeof(fd_set); - - if (m > o) { - fds->fdset = realloc(fds->fdset, m); - memset((char *)fds->fdset + o, 0, m - o); - } - if (n >= fds->maxfd) fds->maxfd = n + 1; -} - -void -rb_fd_set(int n, rb_fdset_t *fds) -{ - rb_fd_resize(n, fds); - FD_SET(n, fds->fdset); -} - -void -rb_fd_clr(int n, rb_fdset_t *fds) -{ - if (n >= fds->maxfd) return; - FD_CLR(n, fds->fdset); -} - -int -rb_fd_isset(int n, const rb_fdset_t *fds) -{ - if (n >= fds->maxfd) return 0; - return FD_ISSET(n, fds->fdset) != 0; /* "!= 0" avoids FreeBSD PR 91421 */ -} - -void -rb_fd_copy(rb_fdset_t *dst, const fd_set *src, int max) -{ - int size = howmany(max, NFDBITS) * sizeof(fd_mask); - - if (size < sizeof(fd_set)) size = sizeof(fd_set); - dst->maxfd = max; - dst->fdset = realloc(dst->fdset, size); - memcpy(dst->fdset, src, size); -} - -int -rb_fd_select(int n, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *exceptfds, struct timeval *timeout) -{ - rb_fd_resize(n - 1, readfds); - rb_fd_resize(n - 1, writefds); - rb_fd_resize(n - 1, exceptfds); - return select(n, rb_fd_ptr(readfds), rb_fd_ptr(writefds), rb_fd_ptr(exceptfds), timeout); -} - -#undef FD_ZERO -#undef FD_SET -#undef FD_CLR -#undef FD_ISSET - -#define FD_ZERO(f) rb_fd_zero(f) -#define FD_SET(i, f) rb_fd_set(i, f) -#define FD_CLR(i, f) rb_fd_clr(i, f) -#define FD_ISSET(i, f) rb_fd_isset(i, f) - -#endif - -#define THREAD_RAISED 0x200 /* temporary flag */ -#define THREAD_TERMINATING 0x400 /* persistent flag */ -#define THREAD_NO_ENSURE 0x800 /* persistent flag */ -#define THREAD_FLAGS_MASK 0xc00 /* mask for persistent flags */ - -#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next; -#define END_FOREACH_FROM(f,x) } while (x != f) - -#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x) -#define END_FOREACH(x) END_FOREACH_FROM(curr_thread,x) - -struct thread_status_t { - NODE *node; - - int tracing; - VALUE errinfo; - VALUE last_status; - VALUE last_line; - VALUE last_match; - - int safe; - - enum thread_status status; - int wait_for; - int fd; - rb_fdset_t readfds; - rb_fdset_t writefds; - rb_fdset_t exceptfds; - int select_value; - double delay; - rb_thread_t join; -}; - -#define THREAD_COPY_STATUS(src, dst) (void)( \ - (dst)->node = (src)->node, \ - \ - (dst)->tracing = (src)->tracing, \ - (dst)->errinfo = (src)->errinfo, \ - (dst)->last_status = (src)->last_status, \ - (dst)->last_line = (src)->last_line, \ - (dst)->last_match = (src)->last_match, \ - \ - (dst)->safe = (src)->safe, \ - \ - (dst)->status = (src)->status, \ - (dst)->wait_for = (src)->wait_for, \ - (dst)->fd = (src)->fd, \ - (dst)->readfds = (src)->readfds, \ - (dst)->writefds = (src)->writefds, \ - (dst)->exceptfds = (src)->exceptfds, \ - rb_fd_init(&(src)->readfds), \ - rb_fd_init(&(src)->writefds), \ - rb_fd_init(&(src)->exceptfds), \ - (dst)->select_value = (src)->select_value, \ - (dst)->delay = (src)->delay, \ - (dst)->join = (src)->join, \ - 0) - -static int -thread_set_raised(void) -{ - if (curr_thread->flags & THREAD_RAISED) return 1; - curr_thread->flags |= THREAD_RAISED; - return 0; -} - -static int -thread_reset_raised(void) -{ - if (!(curr_thread->flags & THREAD_RAISED)) return 0; - curr_thread->flags &= ~THREAD_RAISED; - return 1; -} - -static int -thread_no_ensure() -{ - return ((curr_thread->flags & THREAD_NO_ENSURE) == THREAD_NO_ENSURE); -} - -static void rb_thread_ready(rb_thread_t); - -static VALUE -run_trap_eval(VALUE arg) -{ - VALUE *p = (VALUE *)arg; - return rb_eval_cmd(p[0], p[1], (int)p[2]); -} - -static VALUE -rb_trap_eval(VALUE cmd, int sig, int safe) -{ - int state; - VALUE val = Qnil; /* OK */ - volatile struct thread_status_t save; - VALUE arg[3]; - - arg[0] = cmd; - arg[1] = rb_ary_new3(1, INT2FIX(sig)); - arg[2] = (VALUE)safe; - THREAD_COPY_STATUS(curr_thread, &save); - rb_thread_ready(curr_thread); - val = rb_protect(run_trap_eval, (VALUE)&arg, &state); - THREAD_COPY_STATUS(&save, curr_thread); - - if (state) { - rb_trap_immediate = 0; - rb_thread_ready(curr_thread); - JUMP_TAG(state); - } - - if (curr_thread->status == THREAD_STOPPED) { - rb_thread_schedule(); - } - errno = EINTR; - - return val; -} - -static const char * -thread_status_name(enum thread_status status) -{ - switch (status) { - case THREAD_RUNNABLE: - return "run"; - case THREAD_STOPPED: - return "sleep"; - case THREAD_TO_KILL: - return "aborting"; - case THREAD_KILLED: - return "dead"; - default: - return "unknown"; - } -} - -/* $SAFE accessor */ -void -rb_set_safe_level(int level) -{ - if (level > ruby_safe_level) { - if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX; - ruby_safe_level = level; - curr_thread->safe = level; - } -} - -static VALUE -safe_getter(void) -{ - return INT2NUM(ruby_safe_level); -} - -static void -safe_setter(VALUE val) -{ - int level = NUM2INT(val); - - if (level < ruby_safe_level) { - rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d", - ruby_safe_level, level); - } - if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX; - ruby_safe_level = level; - curr_thread->safe = level; -} - -/* Return the current time as a floating-point number */ -static double -timeofday(void) -{ - struct timeval tv; - gettimeofday(&tv, NULL); - return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6; -} - -#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len) -#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr)) - -static void -thread_mark(rb_thread_t th) -{ - struct FRAME *frame; - struct BLOCK *block; - - rb_gc_mark(th->result); - rb_gc_mark(th->thread); - if (th->join) rb_gc_mark(th->join->thread); - - rb_gc_mark(th->wrapper); - rb_gc_mark((VALUE)th->cref); - - rb_gc_mark((VALUE)th->scope); - rb_gc_mark((VALUE)th->dyna_vars); - rb_gc_mark(th->errinfo); - rb_gc_mark(th->last_status); - rb_gc_mark(th->last_line); - rb_gc_mark(th->last_match); - rb_mark_tbl(th->locals); - rb_gc_mark(th->thgroup); - rb_gc_mark_maybe(th->sandbox); - - /* mark data in copied stack */ - if (th == curr_thread) return; - if (th->status == THREAD_KILLED) return; - if (th->stk_len == 0) return; /* stack not active, no need to mark. */ - if (th->stk_ptr) { - rb_gc_mark_locations(th->stk_ptr, th->stk_ptr+th->stk_len); -#if defined(THINK_C) || defined(__human68k__) - rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2); -#endif -#ifdef __ia64 - if (th->bstr_ptr) { - rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len); - } -#endif - } - frame = th->frame; - while (frame && frame != top_frame) { - frame = ADJ(frame); - rb_gc_mark_frame(frame); - if (frame->tmp) { - struct FRAME *tmp = frame->tmp; - - while (tmp && tmp != top_frame) { - tmp = ADJ(tmp); - rb_gc_mark_frame(tmp); - tmp = tmp->prev; - } - } - frame = frame->prev; - } - block = th->block; - while (block) { - block = ADJ(block); - rb_gc_mark_frame(&block->frame); - block = block->frame.block; - } -} - -static struct { - rb_thread_t thread; - VALUE proc, arg; -} new_thread; - -static int -mark_loading_thread(ID key, VALUE value, int lev) -{ - rb_gc_mark(((rb_thread_t)value)->thread); - return ST_CONTINUE; -} - -void -rb_gc_mark_threads(void) -{ - rb_thread_t th; - - /* static global mark */ - rb_gc_mark((VALUE)ruby_cref); - - if (!curr_thread) return; - rb_gc_mark(main_thread->thread); - rb_gc_mark(curr_thread->thread); - FOREACH_THREAD_FROM(main_thread, th) { - switch (th->status) { - case THREAD_TO_KILL: - case THREAD_RUNNABLE: - break; - case THREAD_STOPPED: - if (th->wait_for) break; - default: - continue; - } - rb_gc_mark(th->thread); - } END_FOREACH_FROM(main_thread, th); - if (new_thread.thread) { - rb_gc_mark(new_thread.thread->thread); - rb_gc_mark(new_thread.proc); - rb_gc_mark(new_thread.arg); - } - if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0); -} - -void -rb_gc_abort_threads(void) -{ - rb_thread_t th; - - if (!main_thread) - return; - - FOREACH_THREAD_FROM(main_thread, th) { - if (FL_TEST(th->thread, FL_MARK)) continue; - if (th->status == THREAD_STOPPED) { - th->status = THREAD_TO_KILL; - rb_gc_mark(th->thread); - } - } END_FOREACH_FROM(main_thread, th); -} - -static void -thread_free(rb_thread_t th) -{ - if (th->stk_ptr) free(th->stk_ptr); - th->stk_ptr = 0; -#ifdef __ia64 - if (th->bstr_ptr) free(th->bstr_ptr); - th->bstr_ptr = 0; -#endif - if (th->locals) st_free_table(th->locals); - if (th->status != THREAD_KILLED) { - if (th->prev) th->prev->next = th->next; - if (th->next) th->next->prev = th->prev; - } - rb_fd_term(&th->readfds); - rb_fd_term(&th->writefds); - rb_fd_term(&th->exceptfds); - if (th != main_thread) free(th); -} - -static rb_thread_t -rb_thread_check(VALUE data) -{ - if (TYPE(data) != T_DATA || RDATA(data)->dmark != (RUBY_DATA_FUNC)thread_mark) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)", - rb_obj_classname(data)); - } - return (rb_thread_t)RDATA(data)->data; -} - -static VALUE rb_thread_raise(int, VALUE*, rb_thread_t); - -static VALUE th_raise_exception; -static NODE *th_raise_node; -static VALUE th_cmd; -static int th_sig, th_safe; -static const char *th_signm; - -#define RESTORE_NORMAL 1 -#define RESTORE_FATAL 2 -#define RESTORE_INTERRUPT 3 -#define RESTORE_TRAP 4 -#define RESTORE_RAISE 5 -#define RESTORE_SIGNAL 6 -#define RESTORE_EXIT 7 - -extern VALUE *rb_gc_stack_start; -#ifdef __ia64 -extern VALUE *rb_gc_register_stack_start; -#endif - -static void -rb_thread_save_context(rb_thread_t th) -{ - VALUE *pos; - int len; - static VALUE tval; - - len = ruby_stack_length(&pos); - th->stk_len = 0; - th->stk_pos = pos; - if (len > th->stk_max) { - VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len); - if (!ptr) rb_memerror(); - th->stk_ptr = ptr; - th->stk_max = len; - } - th->stk_len = len; - FLUSH_REGISTER_WINDOWS; - MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len); -#ifdef __ia64 - th->bstr_pos = rb_gc_register_stack_start; - len = (VALUE*)rb_ia64_bsp() - th->bstr_pos; - th->bstr_len = 0; - if (len > th->bstr_max) { - VALUE *ptr = realloc(th->bstr_ptr, sizeof(VALUE) * len); - if (!ptr) rb_memerror(); - th->bstr_ptr = ptr; - th->bstr_max = len; - } - th->bstr_len = len; - rb_ia64_flushrs(); - MEMCPY(th->bstr_ptr, th->bstr_pos, VALUE, th->bstr_len); -#endif -#ifdef SAVE_WIN32_EXCEPTION_LIST - th->win32_exception_list = win32_get_exception_list(); -#endif - - th->frame = ruby_frame; - th->scope = ruby_scope; - ruby_scope->flags |= SCOPE_DONT_RECYCLE; - th->wrapper = ruby_wrapper; - th->cref = ruby_cref; - th->dyna_vars = ruby_dyna_vars; - th->flags &= THREAD_FLAGS_MASK; - th->flags |= (rb_trap_immediate<<8) | vis_mode; - th->tag = prot_tag; - th->tracing = tracing; - th->errinfo = ruby_errinfo; - th->last_status = rb_last_status; - tval = rb_lastline_get(); - rb_lastline_set(th->last_line); - th->last_line = tval; - tval = rb_backref_get(); - rb_backref_set(th->last_match); - th->last_match = tval; - th->safe = ruby_safe_level; - - th->node = ruby_current_node; - if (ruby_sandbox_save != NULL) - { - ruby_sandbox_save(th); - } -} - -static int -rb_thread_switch(int n) -{ - rb_trap_immediate = (curr_thread->flags&(1<<8))?1:0; - switch (n) { - case 0: - return 0; - case RESTORE_FATAL: - JUMP_TAG(TAG_FATAL); - break; - case RESTORE_INTERRUPT: - rb_interrupt(); - break; - case RESTORE_TRAP: - rb_trap_eval(th_cmd, th_sig, th_safe); - break; - case RESTORE_RAISE: - ruby_frame->callee = 0; - ruby_frame->this_func = 0; - ruby_current_node = th_raise_node; - rb_raise_jump(th_raise_exception); - break; - case RESTORE_SIGNAL: - rb_raise(rb_eSignal, "SIG%s", th_signm); - break; - case RESTORE_EXIT: - ruby_errinfo = th_raise_exception; - ruby_current_node = th_raise_node; - if (!rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) { - terminate_process(EXIT_FAILURE, ruby_errinfo); - } - rb_exc_raise(th_raise_exception); - break; - case RESTORE_NORMAL: - default: - break; - } - return 1; -} - -#define THREAD_SAVE_CONTEXT(th) \ - (rb_thread_switch((FLUSH_REGISTER_WINDOWS, ruby_setjmp(rb_thread_save_context(th), (th)->context)))) - -NORETURN(static void rb_thread_restore_context(rb_thread_t,int)); -NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int,void*))); -NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int, VALUE *))); - -static void -rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp) -{ - /* vp prevents tail call */ - static rb_thread_t tmp; - static int ex; - static VALUE tval; - - rb_trap_immediate = 0; /* inhibit interrupts from here */ - if (ruby_sandbox_restore != NULL) - { - ruby_sandbox_restore(th); - } - ruby_frame = th->frame; - ruby_scope = th->scope; - ruby_wrapper = th->wrapper; - ruby_cref = th->cref; - vis_mode = th->flags&VIS_MASK; - ruby_dyna_vars = th->dyna_vars; - prot_tag = th->tag; - tracing = th->tracing; - ruby_errinfo = th->errinfo; - rb_last_status = th->last_status; - ruby_safe_level = th->safe; - - ruby_current_node = th->node; - -#ifdef SAVE_WIN32_EXCEPTION_LIST - win32_set_exception_list(th->win32_exception_list); -#endif - tmp = th; - ex = exit; - FLUSH_REGISTER_WINDOWS; - MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len); -#ifdef __ia64 - MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len); -#endif - - tval = rb_lastline_get(); - rb_lastline_set(tmp->last_line); - tmp->last_line = tval; - tval = rb_backref_get(); - rb_backref_set(tmp->last_match); - tmp->last_match = tval; - - ruby_longjmp(tmp->context, ex); -} - -#ifdef __ia64 -#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4 -#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4 -static volatile int C(a), C(b), C(c), C(d), C(e); -static volatile int C(f), C(g), C(h), C(i), C(j); -static volatile int C(k), C(l), C(m), C(n), C(o); -static volatile int C(p), C(q), C(r), C(s), C(t); -int rb_dummy_false = 0; -NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, void *, VALUE *))); -static void -register_stack_extend(rb_thread_t th, int exit, void *vp, VALUE *curr_bsp) -{ - if (rb_dummy_false) { - /* use registers as much as possible */ - E(a) = E(b) = E(c) = E(d) = E(e) = - E(f) = E(g) = E(h) = E(i) = E(j) = - E(k) = E(l) = E(m) = E(n) = E(o) = - E(p) = E(q) = E(r) = E(s) = E(t) = 0; - E(a) = E(b) = E(c) = E(d) = E(e) = - E(f) = E(g) = E(h) = E(i) = E(j) = - E(k) = E(l) = E(m) = E(n) = E(o) = - E(p) = E(q) = E(r) = E(s) = E(t) = 0; - } - if (curr_bsp < th->bstr_pos+th->bstr_len) { - register_stack_extend(th, exit, &exit, (VALUE*)rb_ia64_bsp()); - } - rb_thread_restore_context_0(th, exit, &exit); -} -#undef C -#undef E -#endif - -static void -stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame) -{ -#define STACK_PAD_SIZE 1024 - VALUE space[STACK_PAD_SIZE]; - -#if STACK_GROW_DIRECTION < 0 - if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]); -#elif STACK_GROW_DIRECTION > 0 - if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]); -#else - if (addr_in_prev_frame < rb_gc_stack_start) { - /* Stack grows downward */ - if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]); - } - else { - /* Stack grows upward */ - if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]); - } -#endif -#ifdef __ia64 - register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp()); -#else - rb_thread_restore_context_0(th, exit, space); -#endif -} - -static void -rb_thread_restore_context(rb_thread_t th, int exit) -{ - VALUE v; - if (!th->stk_ptr) rb_bug("unsaved context"); - stack_extend(th, exit, &v); -} - -static void -rb_thread_ready(rb_thread_t th) -{ - th->wait_for = 0; - if (th->status != THREAD_TO_KILL) { - th->status = THREAD_RUNNABLE; - } -} - -static void -rb_thread_die(rb_thread_t th) -{ - th->thgroup = 0; - th->status = THREAD_KILLED; - if (th->stk_ptr) free(th->stk_ptr); - th->stk_ptr = 0; -} - -static void -rb_thread_remove(rb_thread_t th) -{ - if (th->status == THREAD_KILLED) return; - - rb_thread_ready(th); - rb_thread_die(th); - th->prev->next = th->next; - th->next->prev = th->prev; -} - -static int -rb_thread_dead(rb_thread_t th) -{ - return th->status == THREAD_KILLED; -} - -void -rb_thread_fd_close(int fd) -{ - rb_thread_t th; - - FOREACH_THREAD(th) { - if (((th->wait_for & WAIT_FD) && fd == th->fd) || - ((th->wait_for & WAIT_SELECT) && (fd < th->fd) && - (FD_ISSET(fd, &th->readfds) || - FD_ISSET(fd, &th->writefds) || - FD_ISSET(fd, &th->exceptfds)))) { - VALUE exc = rb_exc_new2(rb_eIOError, "stream closed"); - rb_thread_raise(1, &exc, th); - } - } - END_FOREACH(th); -} - -NORETURN(static void rb_thread_main_jump(VALUE, int)); -static void -rb_thread_main_jump(VALUE err, int tag) -{ - curr_thread = main_thread; - th_raise_exception = err; - th_raise_node = ruby_current_node; - rb_thread_restore_context(main_thread, tag); -} - -NORETURN(static void rb_thread_deadlock(void)); -static void -rb_thread_deadlock(void) -{ - char msg[21+SIZEOF_LONG*2]; - VALUE e; - - sprintf(msg, "Thread(%p): deadlock", (void*)curr_thread->thread); - e = rb_exc_new2(rb_eFatal, msg); - if (curr_thread == main_thread) { - rb_exc_raise(e); - } - rb_thread_main_jump(e, RESTORE_RAISE); -} - -static void -copy_fds(rb_fdset_t *dst, rb_fdset_t *src, int max) -{ - int n = 0; - int i; - - if (max >= rb_fd_max(src)) max = rb_fd_max(src) - 1; - for (i=0; i<=max; i++) { - if (FD_ISSET(i, src)) { - n = i; - FD_SET(i, dst); - } - } -} - -static int -match_fds(rb_fdset_t *dst, rb_fdset_t *src, int max) -{ - int i; - - if (max >= rb_fd_max(src)) max = rb_fd_max(src) - 1; - if (max >= rb_fd_max(dst)) max = rb_fd_max(dst) - 1; - for (i=0; i<=max; i++) { - if (FD_ISSET(i, src) && FD_ISSET(i, dst)) { - return Qtrue; - } - } - return Qfalse; -} - -static int -intersect_fds(rb_fdset_t *src, rb_fdset_t *dst, int max) -{ - int i, n = 0; - - if (max >= rb_fd_max(dst)) max = rb_fd_max(dst) - 1; - for (i=0; i<=max; i++) { - if (FD_ISSET(i, dst)) { - if (FD_ISSET(i, src)) { - /* Wake up only one thread per fd. */ - FD_CLR(i, src); - n++; - } - else { - FD_CLR(i, dst); - } - } - } - return n; -} - -static int -find_bad_fds(rb_fdset_t *dst, rb_fdset_t *src, int max) -{ - int i, test = Qfalse; - - if (max >= rb_fd_max(src)) max = rb_fd_max(src) - 1; - for (i=0; i<=max; i++) { - if (FD_ISSET(i, src) && !FD_ISSET(i, dst)) { - FD_CLR(i, src); - test = Qtrue; - } - } - return test; -} - -void -rb_thread_schedule(void) +rb_dvar_defined(ID id) { - rb_thread_t next; /* OK */ - rb_thread_t th; - rb_thread_t curr; - int found = 0; - - rb_fdset_t readfds; - rb_fdset_t writefds; - rb_fdset_t exceptfds; - struct timeval delay_tv, *delay_ptr; - double delay, now; /* OK */ - int n, max; - int need_select = 0; - int select_timeout = 0; - -#ifdef HAVE_NATIVETHREAD - if (!is_ruby_native_thread()) { - rb_bug("cross-thread violation on rb_thread_schedule()"); - } -#endif - rb_thread_pending = rb_thread_critical = 0; - if (curr_thread == curr_thread->next - && curr_thread->status == THREAD_RUNNABLE) - return; - - next = 0; - curr = curr_thread; /* starting thread */ - - while (curr->status == THREAD_KILLED) { - curr = curr->prev; - } - - rb_fd_init(&readfds); - rb_fd_init(&writefds); - rb_fd_init(&exceptfds); - - again: - max = -1; - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); - delay = DELAY_INFTY; - now = -1.0; - - FOREACH_THREAD_FROM(curr, th) { - if (!found && th->status <= THREAD_RUNNABLE) { - found = 1; - } - if (th->status != THREAD_STOPPED) continue; - if (th->wait_for & WAIT_JOIN) { - if (rb_thread_dead(th->join)) { - th->status = THREAD_RUNNABLE; - found = 1; - } - } - if (th->wait_for & WAIT_FD) { - FD_SET(th->fd, &readfds); - if (max < th->fd) max = th->fd; - need_select = 1; - } - if (th->wait_for & WAIT_SELECT) { - copy_fds(&readfds, &th->readfds, th->fd); - copy_fds(&writefds, &th->writefds, th->fd); - copy_fds(&exceptfds, &th->exceptfds, th->fd); - if (max < th->fd) max = th->fd; - need_select = 1; - if (th->wait_for & WAIT_TIME) { - select_timeout = 1; - } - th->select_value = 0; - } - if (th->wait_for & WAIT_TIME) { - double th_delay; - - if (now < 0.0) now = timeofday(); - th_delay = th->delay - now; - if (th_delay <= 0.0) { - th->status = THREAD_RUNNABLE; - found = 1; - } - else if (th_delay < delay) { - delay = th_delay; - need_select = 1; - } - else if (th->delay == DELAY_INFTY) { - need_select = 1; - } - } - } - END_FOREACH_FROM(curr, th); - - /* Do the select if needed */ - if (need_select) { - /* Convert delay to a timeval */ - /* If a thread is runnable, just poll */ - if (found) { - delay_tv.tv_sec = 0; - delay_tv.tv_usec = 0; - delay_ptr = &delay_tv; - } - else if (delay == DELAY_INFTY) { - delay_ptr = 0; - } - else { - delay_tv.tv_sec = delay; - delay_tv.tv_usec = (delay - (double)delay_tv.tv_sec)*1e6; - delay_ptr = &delay_tv; - } - - n = rb_fd_select(max+1, &readfds, &writefds, &exceptfds, delay_ptr); - if (n < 0) { - int e = errno; - - if (rb_trap_pending) { - int status; - rb_protect((VALUE (*)(VALUE))rb_trap_exec, Qnil, &status); - if (status) { - rb_fd_term(&readfds); - rb_fd_term(&writefds); - rb_fd_term(&exceptfds); - rb_jump_tag(status); + yarv_thread_t *th = GET_THREAD(); + yarv_iseq_t *iseq; + if (th->base_block && (iseq = th->base_block->iseq)) { + while (iseq->type == ISEQ_TYPE_BLOCK || + iseq->type == ISEQ_TYPE_RESCUE || + iseq->type == ISEQ_TYPE_ENSURE || + iseq->type == ISEQ_TYPE_EVAL) { + int i; + // printf("local size: %d\n", iseq->local_size); + for (i = 0; i < iseq->local_size; i++) { + // printf("id (%4d): %s\n", i, rb_id2name(iseq->local_tbl[i])); + if (iseq->local_tbl[i] == id) { + return Qtrue; } } - if (e == EINTR) goto again; -#ifdef ERESTART - if (e == ERESTART) goto again; -#endif - FOREACH_THREAD_FROM(curr, th) { - if (th->wait_for & WAIT_SELECT) { - int v = 0; - - v |= find_bad_fds(&readfds, &th->readfds, th->fd); - v |= find_bad_fds(&writefds, &th->writefds, th->fd); - v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd); - if (v) { - th->select_value = n; - n = max; - } - } - } - END_FOREACH_FROM(curr, th); + iseq = iseq->parent_iseq; } - if (select_timeout && n == 0) { - if (now < 0.0) now = timeofday(); - FOREACH_THREAD_FROM(curr, th) { - if (((th->wait_for&(WAIT_SELECT|WAIT_TIME)) == (WAIT_SELECT|WAIT_TIME)) && - th->delay <= now) { - th->status = THREAD_RUNNABLE; - th->wait_for = 0; - th->select_value = 0; - found = 1; - intersect_fds(&readfds, &th->readfds, max); - intersect_fds(&writefds, &th->writefds, max); - intersect_fds(&exceptfds, &th->exceptfds, max); - } - } - END_FOREACH_FROM(curr, th); - } - if (n > 0) { - now = -1.0; - /* Some descriptors are ready. - Make the corresponding threads runnable. */ - FOREACH_THREAD_FROM(curr, th) { - if ((th->wait_for&WAIT_FD) && FD_ISSET(th->fd, &readfds)) { - /* Wake up only one thread per fd. */ - FD_CLR(th->fd, &readfds); - th->status = THREAD_RUNNABLE; - th->fd = 0; - th->wait_for = 0; - found = 1; - } - if ((th->wait_for&WAIT_SELECT) && - (match_fds(&readfds, &th->readfds, max) || - match_fds(&writefds, &th->writefds, max) || - match_fds(&exceptfds, &th->exceptfds, max))) { - /* Wake up only one thread per fd. */ - th->status = THREAD_RUNNABLE; - th->wait_for = 0; - n = intersect_fds(&readfds, &th->readfds, max) + - intersect_fds(&writefds, &th->writefds, max) + - intersect_fds(&exceptfds, &th->exceptfds, max); - th->select_value = n; - found = 1; - } - } - END_FOREACH_FROM(curr, th); - } - /* The delays for some of the threads should have expired. - Go through the loop once more, to check the delays. */ - if (!found && delay != DELAY_INFTY) - goto again; } - - rb_fd_term(&readfds); - rb_fd_term(&writefds); - rb_fd_term(&exceptfds); - - FOREACH_THREAD_FROM(curr, th) { - if (th->status == THREAD_TO_KILL) { - next = th; - break; - } - if (th->status == THREAD_RUNNABLE && th->stk_ptr) { - if (!next || next->priority < th->priority) - next = th; - } - } - END_FOREACH_FROM(curr, th); - - if (!next) { - /* raise fatal error to main thread */ - curr_thread->node = ruby_current_node; - if (curr->next == curr) { - TRAP_BEG; - pause(); - TRAP_END; - } - FOREACH_THREAD_FROM(curr, th) { - warn_printf("deadlock %p: %s:", - th->thread, thread_status_name(th->status)); - if (th->wait_for & WAIT_FD) warn_printf("F(%d)", th->fd); - if (th->wait_for & WAIT_SELECT) warn_printf("S"); - if (th->wait_for & WAIT_TIME) warn_printf("T(%f)", th->delay); - if (th->wait_for & WAIT_JOIN) - warn_printf("J(%p)", th->join ? th->join->thread : 0); - if (th->wait_for & WAIT_PID) warn_printf("P"); - if (!th->wait_for) warn_printf("-"); - warn_printf(" %s - %s:%d\n", - th==main_thread ? "(main)" : "", - th->node->nd_file, nd_line(th->node)); - } - END_FOREACH_FROM(curr, th); - next = main_thread; - rb_thread_ready(next); - next->status = THREAD_TO_KILL; - if (!rb_thread_dead(curr_thread)) { - rb_thread_save_context(curr_thread); - } - rb_thread_deadlock(); - } - next->wait_for = 0; - if (next->status == THREAD_RUNNABLE && next == curr_thread) { - return; - } - - /* context switch */ - if (curr == curr_thread) { - if (THREAD_SAVE_CONTEXT(curr)) { - return; - } - } - - curr_thread = next; - if (next->status == THREAD_TO_KILL) { - if (!(next->flags & THREAD_TERMINATING)) { - next->flags |= THREAD_TERMINATING; - /* terminate; execute ensure-clause if any */ - rb_thread_restore_context(next, RESTORE_FATAL); - } - } - rb_thread_restore_context(next, RESTORE_NORMAL); -} - -void -rb_thread_wait_fd(int fd) -{ - if (rb_thread_critical) return; - if (curr_thread == curr_thread->next) return; - if (curr_thread->status == THREAD_TO_KILL) return; - - curr_thread->status = THREAD_STOPPED; - curr_thread->fd = fd; - curr_thread->wait_for = WAIT_FD; - rb_thread_schedule(); -} - -int -rb_thread_fd_writable(int fd) -{ - if (rb_thread_critical) return Qtrue; - if (curr_thread == curr_thread->next) return Qtrue; - if (curr_thread->status == THREAD_TO_KILL) return Qtrue; - if (curr_thread->status == THREAD_KILLED) return Qtrue; - - curr_thread->status = THREAD_STOPPED; - FD_ZERO(&curr_thread->readfds); - FD_ZERO(&curr_thread->writefds); - FD_SET(fd, &curr_thread->writefds); - FD_ZERO(&curr_thread->exceptfds); - curr_thread->fd = fd+1; - curr_thread->wait_for = WAIT_SELECT; - rb_thread_schedule(); return Qfalse; } void -rb_thread_wait_for(struct timeval time) -{ - double date; - - if (rb_thread_critical || - curr_thread == curr_thread->next || - curr_thread->status == THREAD_TO_KILL) { - int n; - int thr_critical = rb_thread_critical; -#ifndef linux - double d, limit; - limit = timeofday()+(double)time.tv_sec+(double)time.tv_usec*1e-6; -#endif - for (;;) { - rb_thread_critical = Qtrue; - TRAP_BEG; - n = select(0, 0, 0, 0, &time); - rb_thread_critical = thr_critical; - TRAP_END; - if (n == 0) return; - if (n < 0) { - switch (errno) { - case EINTR: -#ifdef ERESTART - case ERESTART: -#endif - break; - default: - rb_sys_fail("sleep"); - } - } -#ifndef linux - d = limit - timeofday(); - - time.tv_sec = (int)d; - time.tv_usec = (int)((d - (int)d)*1e6); - if (time.tv_usec < 0) { - time.tv_usec += (long)1e6; - time.tv_sec -= 1; - } - if (time.tv_sec < 0) return; -#endif - } - } - - date = timeofday() + (double)time.tv_sec + (double)time.tv_usec*1e-6; - curr_thread->status = THREAD_STOPPED; - curr_thread->delay = date; - curr_thread->wait_for = WAIT_TIME; - rb_thread_schedule(); -} - -void rb_thread_sleep_forever(void); - -int -rb_thread_alone(void) -{ - return curr_thread == curr_thread->next; -} - -int -rb_thread_select(int max, fd_set *read, fd_set *write, fd_set *except, struct timeval *timeout) -{ -#ifndef linux - double limit; -#endif - int n; - - if (!read && !write && !except) { - if (!timeout) { - rb_thread_sleep_forever(); - return 0; - } - rb_thread_wait_for(*timeout); - return 0; - } - -#ifndef linux - if (timeout) { - limit = timeofday()+ - (double)timeout->tv_sec+(double)timeout->tv_usec*1e-6; - } -#endif - - if (rb_thread_critical || - curr_thread == curr_thread->next || - curr_thread->status == THREAD_TO_KILL) { -#ifndef linux - struct timeval tv, *tvp = timeout; - - if (timeout) { - tv = *timeout; - tvp = &tv; - } -#else - struct timeval *const tvp = timeout; -#endif - for (;;) { - TRAP_BEG; - n = select(max, read, write, except, tvp); - TRAP_END; - if (n < 0) { - switch (errno) { - case EINTR: -#ifdef ERESTART - case ERESTART: -#endif -#ifndef linux - if (timeout) { - double d = limit - timeofday(); - - tv.tv_sec = (unsigned int)d; - tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6); - if (tv.tv_sec < 0) tv.tv_sec = 0; - if (tv.tv_usec < 0) tv.tv_usec = 0; - } -#endif - continue; - default: - break; - } - } - return n; - } - } - - curr_thread->status = THREAD_STOPPED; - if (read) rb_fd_copy(&curr_thread->readfds, read, max); - else FD_ZERO(&curr_thread->readfds); - if (write) rb_fd_copy(&curr_thread->writefds, write, max); - else FD_ZERO(&curr_thread->writefds); - if (except) rb_fd_copy(&curr_thread->exceptfds, except, max); - else FD_ZERO(&curr_thread->exceptfds); - curr_thread->fd = max; - curr_thread->wait_for = WAIT_SELECT; - if (timeout) { - curr_thread->delay = timeofday() + - (double)timeout->tv_sec + (double)timeout->tv_usec*1e-6; - curr_thread->wait_for |= WAIT_TIME; - } - rb_thread_schedule(); - if (read) *read = *rb_fd_ptr(&curr_thread->readfds); - if (write) *write = *rb_fd_ptr(&curr_thread->writefds); - if (except) *except = *rb_fd_ptr(&curr_thread->exceptfds); - return curr_thread->select_value; -} - -static int -rb_thread_join(rb_thread_t th, double limit) -{ - enum thread_status last_status = THREAD_RUNNABLE; - - if (rb_thread_critical) rb_thread_deadlock(); - if (!rb_thread_dead(th)) { - if (th == curr_thread) - rb_raise(rb_eThreadError, "thread %p tried to join itself", - (void*)th->thread); - if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread) - rb_raise(rb_eThreadError, "Thread#join: deadlock %p - mutual join(%p)", - (void*)curr_thread->thread, (void*)th->thread); - if (curr_thread->status == THREAD_TO_KILL) - last_status = THREAD_TO_KILL; - if (limit == 0) return Qfalse; - curr_thread->status = THREAD_STOPPED; - curr_thread->join = th; - curr_thread->wait_for = WAIT_JOIN; - curr_thread->delay = timeofday() + limit; - if (limit < DELAY_INFTY) curr_thread->wait_for |= WAIT_TIME; - rb_thread_schedule(); - curr_thread->status = last_status; - if (!rb_thread_dead(th)) return Qfalse; - } - - if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) { - VALUE oldbt = get_backtrace(th->errinfo); - VALUE errat = make_backtrace(); - VALUE errinfo = rb_obj_dup(th->errinfo); - - if (TYPE(oldbt) == T_ARRAY && RARRAY_LEN(oldbt) > 0) { - rb_ary_unshift(errat, rb_ary_entry(oldbt, 0)); - } - set_backtrace(errinfo, errat); - rb_exc_raise(errinfo); - } - - return Qtrue; -} - - -/* - * call-seq: - * thr.join => thr - * thr.join(limit) => thr - * - * The calling thread will suspend execution and run <i>thr</i>. Does not - * return until <i>thr</i> exits or until <i>limit</i> seconds have passed. If - * the time limit expires, <code>nil</code> will be returned, otherwise - * <i>thr</i> is returned. - * - * Any threads not joined will be killed when the main program exits. If - * <i>thr</i> had previously raised an exception and the - * <code>abort_on_exception</code> and <code>$DEBUG</code> flags are not set - * (so the exception has not yet been processed) it will be processed at this - * time. - * - * a = Thread.new { print "a"; sleep(10); print "b"; print "c" } - * x = Thread.new { print "x"; Thread.pass; print "y"; print "z" } - * x.join # Let x thread finish, a will be killed on exit. - * - * <em>produces:</em> - * - * axyz - * - * The following example illustrates the <i>limit</i> parameter. - * - * y = Thread.new { 4.times { sleep 0.1; puts 'tick... ' }} - * puts "Waiting" until y.join(0.15) - * - * <em>produces:</em> - * - * tick... - * Waiting - * tick... - * Waitingtick... - * - * - * tick... - */ - -static VALUE -rb_thread_join_m(int argc, VALUE *argv, VALUE thread) -{ - VALUE limit; - double delay = DELAY_INFTY; - rb_thread_t th = rb_thread_check(thread); - - rb_scan_args(argc, argv, "01", &limit); - if (!NIL_P(limit)) delay = rb_num2dbl(limit); - if (!rb_thread_join(th, delay)) - return Qnil; - return thread; -} - - -/* - * call-seq: - * Thread.current => thread - * - * Returns the currently executing thread. - * - * Thread.current #=> #<Thread:0x401bdf4c run> - */ - -VALUE -rb_thread_current(void) -{ - return curr_thread->thread; -} - - -/* - * call-seq: - * Thread.main => thread - * - * Returns the main thread for the process. - * - * Thread.main #=> #<Thread:0x401bdf4c run> - */ - -VALUE -rb_thread_main(void) -{ - return main_thread->thread; -} - - -/* - * call-seq: - * Thread.list => array - * - * Returns an array of <code>Thread</code> objects for all threads that are - * either runnable or stopped. - * - * Thread.new { sleep(200) } - * Thread.new { 1000000.times {|i| i*i } } - * Thread.new { Thread.stop } - * Thread.list.each {|t| p t} - * - * <em>produces:</em> - * - * #<Thread:0x401b3e84 sleep> - * #<Thread:0x401b3f38 run> - * #<Thread:0x401b3fb0 sleep> - * #<Thread:0x401bdf4c run> - */ - -VALUE -rb_thread_list(void) -{ - rb_thread_t th; - VALUE ary = rb_ary_new(); - - FOREACH_THREAD(th) { - switch (th->status) { - case THREAD_RUNNABLE: - case THREAD_STOPPED: - case THREAD_TO_KILL: - rb_ary_push(ary, th->thread); - default: - break; - } - } - END_FOREACH(th); - - return ary; -} - - -/* - * call-seq: - * thr.wakeup => thr - * - * Marks <i>thr</i> as eligible for scheduling (it may still remain blocked on - * I/O, however). Does not invoke the scheduler (see <code>Thread#run</code>). - * - * c = Thread.new { Thread.stop; puts "hey!" } - * c.wakeup - * - * <em>produces:</em> - * - * hey! - */ - -VALUE -rb_thread_wakeup(VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - - if (th->status == THREAD_KILLED) - rb_raise(rb_eThreadError, "killed thread"); - rb_thread_ready(th); - - return thread; -} - - -/* - * call-seq: - * thr.run => thr - * - * Wakes up <i>thr</i>, making it eligible for scheduling. If not in a critical - * section, then invokes the scheduler. - * - * a = Thread.new { puts "a"; Thread.stop; puts "c" } - * Thread.pass - * puts "Got here" - * a.run - * a.join - * - * <em>produces:</em> - * - * a - * Got here - * c - */ - -VALUE -rb_thread_run(VALUE thread) -{ - rb_thread_wakeup(thread); - if (!rb_thread_critical) rb_thread_schedule(); - - return thread; -} - - -static void -kill_thread(th, flags) - rb_thread_t th; - int flags; -{ - if (th != curr_thread && th->safe < 4) { - rb_secure(4); - } - if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED) - return; - if (th == th->next || th == main_thread) rb_exit(EXIT_SUCCESS); - - rb_thread_ready(th); - th->flags |= flags; - th->status = THREAD_TO_KILL; - if (!rb_thread_critical) rb_thread_schedule(); -} - - -/* - * call-seq: - * thr.exit => thr - * thr.kill => thr - * thr.terminate => thr - * - * Terminates <i>thr</i> and schedules another thread to be run, returning - * the terminated <code>Thread</code>. If this is the main thread, or the - * last thread, exits the process. - */ - -VALUE -rb_thread_kill(VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - - kill_thread(th, 0); - return thread; -} - - -/* - * call-seq: - * thr.exit! => thr - * thr.kill! => thr - * thr.terminate! => thr - * - * Terminates <i>thr</i> without calling ensure clauses and schedules - * another thread to be run, returning the terminated <code>Thread</code>. - * If this is the main thread, or the last thread, exits the process. - * - * See <code>Thread#exit</code> for the safer version. - */ - -static VALUE -rb_thread_kill_bang(thread) - VALUE thread; -{ - rb_thread_t th = rb_thread_check(thread); - kill_thread(th, THREAD_NO_ENSURE); - return thread; -} - -/* - * call-seq: - * Thread.kill(thread) => thread - * - * Causes the given <em>thread</em> to exit (see <code>Thread::exit</code>). - * - * count = 0 - * a = Thread.new { loop { count += 1 } } - * sleep(0.1) #=> 0 - * Thread.kill(a) #=> #<Thread:0x401b3d30 dead> - * count #=> 93947 - * a.alive? #=> false - */ - -static VALUE -rb_thread_s_kill(VALUE obj, VALUE th) -{ - return rb_thread_kill(th); -} - - -/* - * call-seq: - * Thread.exit => thread - * - * Terminates the currently running thread and schedules another thread to be - * run. If this thread is already marked to be killed, <code>exit</code> - * returns the <code>Thread</code>. If this is the main thread, or the last - * thread, exit the process. - */ - -static VALUE -rb_thread_exit(void) -{ - return rb_thread_kill(curr_thread->thread); -} - - -/* - * call-seq: - * Thread.pass => nil - * - * Invokes the thread scheduler to pass execution to another thread. - * - * a = Thread.new { print "a"; Thread.pass; - * print "b"; Thread.pass; - * print "c" } - * b = Thread.new { print "x"; Thread.pass; - * print "y"; Thread.pass; - * print "z" } - * a.join - * b.join - * - * <em>produces:</em> - * - * axbycz - */ - -static VALUE -rb_thread_pass(void) -{ - rb_thread_schedule(); - return Qnil; -} - - -/* - * call-seq: - * Thread.stop => nil - * - * Stops execution of the current thread, putting it into a ``sleep'' state, - * and schedules execution of another thread. Resets the ``critical'' condition - * to <code>false</code>. - * - * a = Thread.new { print "a"; Thread.stop; print "c" } - * Thread.pass - * print "b" - * a.run - * a.join - * - * <em>produces:</em> - * - * abc - */ - -VALUE -rb_thread_stop(void) +rb_scope_setup_top_local_tbl(ID *tbl) { - enum thread_status last_status = THREAD_RUNNABLE; - - rb_thread_critical = 0; - if (curr_thread == curr_thread->next) { - rb_raise(rb_eThreadError, "stopping only thread\n\tnote: use sleep to stop forever"); - } - if (curr_thread->status == THREAD_TO_KILL) - last_status = THREAD_TO_KILL; - curr_thread->status = THREAD_STOPPED; - rb_thread_schedule(); - curr_thread->status = last_status; - - return Qnil; -} - -struct timeval rb_time_timeval(VALUE time); - -void -rb_thread_polling(void) -{ - if (curr_thread != curr_thread->next) { - curr_thread->status = THREAD_STOPPED; - curr_thread->delay = timeofday() + (double)0.06; - curr_thread->wait_for = WAIT_TIME; - rb_thread_schedule(); - } -} - -void -rb_thread_sleep(int sec) -{ - if (curr_thread == curr_thread->next) { - TRAP_BEG; - sleep(sec); - TRAP_END; - return; - } - rb_thread_wait_for(rb_time_timeval(INT2FIX(sec))); -} - -void -rb_thread_sleep_forever(void) -{ - int thr_critical = rb_thread_critical; - if (curr_thread == curr_thread->next || - curr_thread->status == THREAD_TO_KILL) { - rb_thread_critical = Qtrue; - TRAP_BEG; - pause(); - rb_thread_critical = thr_critical; - TRAP_END; - return; - } - - curr_thread->delay = DELAY_INFTY; - curr_thread->wait_for = WAIT_TIME; - curr_thread->status = THREAD_STOPPED; - rb_thread_schedule(); -} - - -/* - * call-seq: - * thr.priority => integer - * - * Returns the priority of <i>thr</i>. Default is zero; higher-priority threads - * will run before lower-priority threads. - * - * Thread.current.priority #=> 0 - */ - -static VALUE -rb_thread_priority(VALUE thread) -{ - return INT2NUM(rb_thread_check(thread)->priority); -} - - -/* - * call-seq: - * thr.priority= integer => thr - * - * Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads - * will run before lower-priority threads. - * - * count1 = count2 = 0 - * a = Thread.new do - * loop { count1 += 1 } - * end - * a.priority = -1 - * - * b = Thread.new do - * loop { count2 += 1 } - * end - * b.priority = -2 - * sleep 1 #=> 1 - * Thread.critical = 1 - * count1 #=> 622504 - * count2 #=> 5832 - */ - -static VALUE -rb_thread_priority_set(VALUE thread, VALUE prio) -{ - rb_thread_t th; - - rb_secure(4); - th = rb_thread_check(thread); - - th->priority = NUM2INT(prio); - rb_thread_schedule(); - return prio; -} - - -/* - * call-seq: - * thr.safe_level => integer - * - * Returns the safe level in effect for <i>thr</i>. Setting thread-local safe - * levels can help when implementing sandboxes which run insecure code. - * - * thr = Thread.new { $SAFE = 3; sleep } - * Thread.current.safe_level #=> 0 - * thr.safe_level #=> 3 - */ - -static VALUE -rb_thread_safe_level(VALUE thread) -{ - rb_thread_t th; - - th = rb_thread_check(thread); - if (th == curr_thread) { - return INT2NUM(ruby_safe_level); - } - return INT2NUM(th->safe); -} - -static int ruby_thread_abort; -static VALUE thgroup_default; - - -/* - * call-seq: - * Thread.abort_on_exception => true or false - * - * Returns the status of the global ``abort on exception'' condition. The - * default is <code>false</code>. When set to <code>true</code>, or if the - * global <code>$DEBUG</code> flag is <code>true</code> (perhaps because the - * command line option <code>-d</code> was specified) all threads will abort - * (the process will <code>exit(0)</code>) if an exception is raised in any - * thread. See also <code>Thread::abort_on_exception=</code>. - */ - -static VALUE -rb_thread_s_abort_exc(void) -{ - return ruby_thread_abort?Qtrue:Qfalse; -} - - -/* - * call-seq: - * Thread.abort_on_exception= boolean => true or false - * - * When set to <code>true</code>, all threads will abort if an exception is - * raised. Returns the new state. - * - * Thread.abort_on_exception = true - * t1 = Thread.new do - * puts "In new thread" - * raise "Exception from thread" - * end - * sleep(1) - * puts "not reached" - * - * <em>produces:</em> - * - * In new thread - * prog.rb:4: Exception from thread (RuntimeError) - * from prog.rb:2:in `initialize' - * from prog.rb:2:in `new' - * from prog.rb:2 - */ - -static VALUE -rb_thread_s_abort_exc_set(VALUE self, VALUE val) -{ - rb_secure(4); - ruby_thread_abort = RTEST(val); - return val; -} - - -/* - * call-seq: - * thr.abort_on_exception => true or false - * - * Returns the status of the thread-local ``abort on exception'' condition for - * <i>thr</i>. The default is <code>false</code>. See also - * <code>Thread::abort_on_exception=</code>. - */ - -static VALUE -rb_thread_abort_exc(VALUE thread) -{ - return rb_thread_check(thread)->abort?Qtrue:Qfalse; -} - - -/* - * call-seq: - * thr.abort_on_exception= boolean => true or false - * - * When set to <code>true</code>, causes all threads (including the main - * program) to abort if an exception is raised in <i>thr</i>. The process will - * effectively <code>exit(0)</code>. - */ - -static VALUE -rb_thread_abort_exc_set(VALUE thread, VALUE val) -{ - rb_secure(4); - rb_thread_check(thread)->abort = RTEST(val); - return val; -} - - -/* - * call-seq: - * thr.group => thgrp or nil - * - * Returns the <code>ThreadGroup</code> which contains <i>thr</i>, or nil if - * the thread is not a member of any group. - * - * Thread.main.group #=> #<ThreadGroup:0x4029d914> - */ - -VALUE -rb_thread_group(VALUE thread) -{ - VALUE group = rb_thread_check(thread)->thgroup; - if (!group) { - group = Qnil; - } - return group; -} - -#ifdef __ia64 -# define IA64_INIT(x) x -#else -# define IA64_INIT(x) -#endif - -#define THREAD_ALLOC(th) do {\ - th = ALLOC(struct thread);\ -\ - th->next = 0;\ - th->prev = 0;\ -\ - th->status = THREAD_RUNNABLE;\ - th->result = 0;\ - th->flags = 0;\ -\ - th->stk_ptr = 0;\ - th->stk_len = 0;\ - th->stk_max = 0;\ - th->wait_for = 0;\ - IA64_INIT(th->bstr_ptr = 0);\ - IA64_INIT(th->bstr_len = 0);\ - IA64_INIT(th->bstr_max = 0);\ - rb_fd_init(&th->readfds);\ - rb_fd_init(&th->writefds);\ - rb_fd_init(&th->exceptfds);\ - th->delay = 0.0;\ - th->join = 0;\ -\ - th->frame = 0;\ - th->scope = 0;\ - th->wrapper = 0;\ - th->cref = ruby_cref;\ - th->dyna_vars = ruby_dyna_vars;\ - th->block = 0;\ - th->tag = 0;\ - th->tracing = 0;\ - th->errinfo = Qnil;\ - th->last_status = 0;\ - th->last_line = 0;\ - th->last_match = Qnil;\ - th->abort = 0;\ - th->priority = 0;\ - th->thgroup = thgroup_default;\ - th->locals = 0;\ - th->thread = 0;\ - if (curr_thread == 0) {\ - th->sandbox = Qnil;\ - } else {\ - th->sandbox = curr_thread->sandbox;\ - }\ - th->anchor = 0;\ -} while (0) - -static rb_thread_t -rb_thread_alloc(VALUE klass) -{ - rb_thread_t th; - struct RVarmap *vars; - - THREAD_ALLOC(th); - th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th); - - for (vars = th->dyna_vars; vars; vars = vars->next) { - if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break; - FL_SET(vars, DVAR_DONT_RECYCLE); - } - return th; -} - -static int thread_init = 0; - -#if defined(_THREAD_SAFE) -static void -catch_timer(int sig) -{ -#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL) - signal(sig, catch_timer); -#endif - /* cause EINTR */ -} - -static pthread_t time_thread; - -static void* -thread_timer(void *dummy) -{ - for (;;) { -#ifdef HAVE_NANOSLEEP - struct timespec req, rem; - - req.tv_sec = 0; - req.tv_nsec = 10000000; - nanosleep(&req, &rem); -#else - struct timeval tv; - tv.tv_sec = 0; - tv.tv_usec = 10000; - select(0, NULL, NULL, NULL, &tv); -#endif - if (!rb_thread_critical) { - rb_thread_pending = 1; - if (rb_trap_immediate) { - pthread_kill(ruby_thid, SIGVTALRM); - } - } - } -} - -void -rb_thread_start_timer() -{ -} - -void -rb_thread_stop_timer() -{ -} -#elif defined(HAVE_SETITIMER) -static void -catch_timer(int sig) -{ -#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL) - signal(sig, catch_timer); -#endif - if (!rb_thread_critical) { - rb_thread_pending = 1; - } - /* cause EINTR */ -} - -void -rb_thread_start_timer() -{ - struct itimerval tval; - - if (!thread_init) return; - tval.it_interval.tv_sec = 0; - tval.it_interval.tv_usec = 10000; - tval.it_value = tval.it_interval; - setitimer(ITIMER_VIRTUAL, &tval, NULL); -} - -void -rb_thread_stop_timer() -{ - struct itimerval tval; - - if (!thread_init) return; - tval.it_interval.tv_sec = 0; - tval.it_interval.tv_usec = 0; - tval.it_value = tval.it_interval; - setitimer(ITIMER_VIRTUAL, &tval, NULL); -} -#else /* !(_THREAD_SAFE || HAVE_SETITIMER) */ -int rb_thread_tick = THREAD_TICK; -#endif - -NORETURN(static void rb_thread_terminated(rb_thread_t, int, enum thread_status)); -static VALUE rb_thread_yield(VALUE, rb_thread_t); - -static void -push_thread_anchor(struct ruby_env *ip) -{ - ip->tag = prot_tag; - ip->frame = ruby_frame; - ip->scope = ruby_scope; - ip->cref = ruby_cref; - ip->prev = curr_thread->anchor; - curr_thread->anchor = ip; -} - -static void -pop_thread_anchor(struct ruby_env *ip) -{ - curr_thread->anchor = ip->prev; -} - -static void -thread_insert(rb_thread_t th) -{ - if (!th->next) { - /* merge in thread list */ - th->prev = curr_thread; - curr_thread->next->prev = th; - th->next = curr_thread->next; - curr_thread->next = th; - th->priority = curr_thread->priority; - th->thgroup = curr_thread->thgroup; - } -} - -static VALUE -rb_thread_start_0(VALUE (*fn)(ANYARGS), VALUE arg, rb_thread_t th) -{ - volatile rb_thread_t th_save = th; - volatile VALUE thread = th->thread; - struct BLOCK *volatile saved_block = 0; - enum thread_status status; - int state; - - if (OBJ_FROZEN(curr_thread->thgroup)) { - rb_raise(rb_eThreadError, - "can't start a new thread (frozen ThreadGroup)"); - } - - if (!thread_init) { - thread_init = 1; -#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE) -#if defined(POSIX_SIGNAL) - posix_signal(SIGVTALRM, catch_timer); -#else - signal(SIGVTALRM, catch_timer); -#endif - -#ifdef _THREAD_SAFE - pthread_create(&time_thread, 0, thread_timer, 0); -#else - rb_thread_start_timer(); -#endif -#endif - } - - if (THREAD_SAVE_CONTEXT(curr_thread)) { - return thread; - } - - if (fn == rb_thread_yield && curr_thread->anchor) { - struct ruby_env *ip = curr_thread->anchor; - new_thread.thread = th; - new_thread.proc = rb_block_proc(); - new_thread.arg = (VALUE)arg; - th->anchor = ip; - thread_insert(th); - curr_thread = th; - ruby_longjmp((prot_tag = ip->tag)->buf, TAG_THREAD); - } - - if (ruby_frame->block) { /* should nail down higher blocks */ - blk_nail_down(ruby_frame->block); - } - scope_dup(ruby_scope); - - thread_insert(th); - - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - if (THREAD_SAVE_CONTEXT(th) == 0) { - curr_thread = th; - th->result = (*fn)(arg, th); - } - th = th_save; - } - else if (TAG_DST()) { - th = th_save; - th->result = prot_tag->retval; - } - POP_TAG(); - status = th->status; - - if (th == main_thread) ruby_stop(state); - rb_thread_remove(th); - - if (saved_block) { - blk_free(saved_block); - } - - rb_thread_terminated(th, state, status); - return 0; /* not reached */ -} - -static void -rb_thread_terminated(rb_thread_t th, int state, enum thread_status status) -{ - if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) { - th->flags |= THREAD_RAISED; - if (state == TAG_FATAL) { - /* fatal error within this thread, need to stop whole script */ - main_thread->errinfo = ruby_errinfo; - rb_thread_cleanup(); - } - else if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) { - if (th->safe >= 4) { - char buf[32]; - - sprintf(buf, "Insecure exit at level %d", th->safe); - th->errinfo = rb_exc_new2(rb_eSecurityError, buf); - } - else { - /* delegate exception to main_thread */ - rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE); - } - } - else if (th->safe < 4 && (ruby_thread_abort||th->abort||RTEST(ruby_debug))) { - /* exit on main_thread */ - error_print(); - rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT); - } - else { - th->errinfo = ruby_errinfo; - } - } - rb_thread_schedule(); - ruby_stop(0); /* last thread termination */ -} - -static void -rb_thread_start_1(void) -{ - rb_thread_t th = new_thread.thread; - volatile rb_thread_t th_save = th; - VALUE proc = new_thread.proc; - volatile VALUE arg = new_thread.arg; - struct ruby_env *ip = th->anchor; - enum thread_status status; - int state; - - ruby_frame = ip->frame; - ruby_scope = ip->scope; - ruby_cref = ip->cref; - ruby_dyna_vars = ((struct BLOCK *)DATA_PTR(proc))->dyna_vars; - PUSH_FRAME(Qtrue); - *ruby_frame = *ip->frame; - ruby_frame->prev = ip->frame; - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - if (THREAD_SAVE_CONTEXT(th) == 0) { - new_thread.thread = 0; - th->result = rb_proc_yield(RARRAY_LEN(arg), RARRAY_PTR(arg), proc); - } - th = th_save; - } - else if (TAG_DST()) { - th = th_save; - th->result = prot_tag->retval; - } - POP_TAG(); - POP_FRAME(); - status = th->status; - - if (th == main_thread) ruby_stop(state); - rb_thread_remove(th); - rb_thread_terminated(th, state, status); -} - -VALUE -rb_thread_create(VALUE (*fn)(ANYARGS), void *arg) -{ - Init_stack((VALUE*)&arg); - return rb_thread_start_0(fn, (VALUE)arg, rb_thread_alloc(rb_cThread)); -} - -static VALUE -rb_thread_yield(VALUE arg, rb_thread_t th) -{ - const ID *tbl; - - scope_dup(ruby_frame->block->scope); - - tbl = ruby_scope->local_tbl; + yarv_thread_t *th = GET_THREAD(); if (tbl) { - int n = *tbl++; - for (tbl += 2, n -= 2; n > 0; --n) { /* skip first 2 ($_ and $~) */ - ID id = *tbl++; - if (id != 0 && !rb_is_local_id(id)) /* push flip states */ - rb_dvar_push(id, Qfalse); + if (th->top_local_tbl) { + xfree(th->top_local_tbl); + th->top_local_tbl = 0; } - } - rb_dvar_push('_', Qnil); - rb_dvar_push('~', Qnil); - ruby_frame->block->dyna_vars = ruby_dyna_vars; - - return rb_yield_0(arg, 0, 0, 0); -} - -/* - * call-seq: - * Thread.new([arg]*) {|args| block } => thread - * - * Creates and runs a new thread to execute the instructions given in - * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed - * into the block. - * - * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" } - * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" } - * x.join # Let the threads finish before - * a.join # main thread exits... - * - * <em>produces:</em> - * - * abxyzc - */ - -static VALUE -rb_thread_s_new(int argc, VALUE *argv, VALUE klass) -{ - rb_thread_t th = rb_thread_alloc(klass); - volatile VALUE *pos; - - pos = th->stk_pos; - rb_obj_call_init(th->thread, argc, argv); - if (th->stk_pos == 0) { - rb_raise(rb_eThreadError, "uninitialized thread - check `%s#initialize'", - rb_class2name(klass)); - } - - return th->thread; -} - - -/* - * call-seq: - * Thread.new([arg]*) {|args| block } => thread - * - * Creates and runs a new thread to execute the instructions given in - * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed - * into the block. - * - * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" } - * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" } - * x.join # Let the threads finish before - * a.join # main thread exits... - * - * <em>produces:</em> - * - * abxyzc - */ - -static VALUE -rb_thread_initialize(VALUE thread, VALUE args) -{ - rb_thread_t th; - - if (!rb_block_given_p()) { - rb_raise(rb_eThreadError, "must be called with a block"); - } - th = rb_thread_check(thread); - if (th->stk_max) { - NODE *node = th->node; - if (!node) { - rb_raise(rb_eThreadError, "already initialized thread"); - } - rb_raise(rb_eThreadError, "already initialized thread - %s:%d", - node->nd_file, nd_line(node)); - } - return rb_thread_start_0(rb_thread_yield, args, th); -} - - -/* - * call-seq: - * Thread.start([args]*) {|args| block } => thread - * Thread.fork([args]*) {|args| block } => thread - * - * Basically the same as <code>Thread::new</code>. However, if class - * <code>Thread</code> is subclassed, then calling <code>start</code> in that - * subclass will not invoke the subclass's <code>initialize</code> method. - */ - -static VALUE -rb_thread_start(VALUE klass, VALUE args) -{ - if (!rb_block_given_p()) { - rb_raise(rb_eThreadError, "must be called with a block"); - } - return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass)); -} - - -/* - * call-seq: - * thr.value => obj - * - * Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns - * its value. - * - * a = Thread.new { 2 + 2 } - * a.value #=> 4 - */ - -static VALUE -rb_thread_value(VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - - while (!rb_thread_join(th, DELAY_INFTY)); - - return th->result; -} - - -/* - * call-seq: - * thr.status => string, false or nil - * - * Returns the status of <i>thr</i>: ``<code>sleep</code>'' if <i>thr</i> is - * sleeping or waiting on I/O, ``<code>run</code>'' if <i>thr</i> is executing, - * ``<code>aborting</code>'' if <i>thr</i> is aborting, <code>false</code> if - * <i>thr</i> terminated normally, and <code>nil</code> if <i>thr</i> - * terminated with an exception. - * - * a = Thread.new { raise("die now") } - * b = Thread.new { Thread.stop } - * c = Thread.new { Thread.exit } - * d = Thread.new { sleep } - * Thread.critical = true - * d.kill #=> #<Thread:0x401b3678 aborting> - * a.status #=> nil - * b.status #=> "sleep" - * c.status #=> false - * d.status #=> "aborting" - * Thread.current.status #=> "run" - */ - -static VALUE -rb_thread_status(VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - - if (rb_thread_dead(th)) { - if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) - return Qnil; - return Qfalse; - } - - return rb_str_new2(thread_status_name(th->status)); -} - - -/* - * call-seq: - * thr.alive? => true or false - * - * Returns <code>true</code> if <i>thr</i> is running or sleeping. - * - * thr = Thread.new { } - * thr.join #=> #<Thread:0x401b3fb0 dead> - * Thread.current.alive? #=> true - * thr.alive? #=> false - */ - -static VALUE -rb_thread_alive_p(VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - - if (rb_thread_dead(th)) return Qfalse; - return Qtrue; -} - - -/* - * call-seq: - * thr.stop? => true or false - * - * Returns <code>true</code> if <i>thr</i> is dead or sleeping. - * - * a = Thread.new { Thread.stop } - * b = Thread.current - * a.stop? #=> true - * b.stop? #=> false - */ - -static VALUE -rb_thread_stop_p(VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - - if (rb_thread_dead(th)) return Qtrue; - if (th->status == THREAD_STOPPED) return Qtrue; - return Qfalse; -} - -static void -rb_thread_wait_other_threads(void) -{ - rb_thread_t th; - int found; - - /* wait other threads to terminate */ - while (curr_thread != curr_thread->next) { - found = 0; - FOREACH_THREAD(th) { - if (th != curr_thread && th->status != THREAD_STOPPED) { - found = 1; - break; - } - } - END_FOREACH(th); - if (!found) return; - rb_thread_schedule(); - } -} - -static void -rb_thread_cleanup(void) -{ - rb_thread_t curr, th; - - curr = curr_thread; - while (curr->status == THREAD_KILLED) { - curr = curr->prev; - } - - FOREACH_THREAD_FROM(curr, th) { - if (th->status != THREAD_KILLED) { - rb_thread_ready(th); - if (th != main_thread) { - th->thgroup = 0; - th->priority = 0; - th->status = THREAD_TO_KILL; - RDATA(th->thread)->dfree = NULL; - } - } - } - END_FOREACH_FROM(curr, th); -} - -int rb_thread_critical; - - -/* - * call-seq: - * Thread.critical => true or false - * - * Returns the status of the global ``thread critical'' condition. - */ - -static VALUE -rb_thread_critical_get(void) -{ - return rb_thread_critical?Qtrue:Qfalse; -} - - -/* - * call-seq: - * Thread.critical= boolean => true or false - * - * Sets the status of the global ``thread critical'' condition and returns - * it. When set to <code>true</code>, prohibits scheduling of any existing - * thread. Does not block new threads from being created and run. Certain - * thread operations (such as stopping or killing a thread, sleeping in the - * current thread, and raising an exception) may cause a thread to be scheduled - * even when in a critical section. <code>Thread::critical</code> is not - * intended for daily use: it is primarily there to support folks writing - * threading libraries. - */ - -static VALUE -rb_thread_critical_set(VALUE obj, VALUE val) -{ - rb_thread_critical = RTEST(val); - return val; -} - -void -rb_thread_interrupt(void) -{ - rb_thread_critical = 0; - rb_thread_ready(main_thread); - if (curr_thread == main_thread) { - rb_interrupt(); - } - if (!rb_thread_dead(curr_thread)) { - if (THREAD_SAVE_CONTEXT(curr_thread)) { - return; - } - } - curr_thread = main_thread; - rb_thread_restore_context(curr_thread, RESTORE_INTERRUPT); -} - -void -rb_thread_signal_raise(const char *sig) -{ - if (sig == 0) return; /* should not happen */ - rb_thread_critical = 0; - if (curr_thread == main_thread) { - rb_thread_ready(curr_thread); - rb_raise(rb_eSignal, "SIG%s", sig); - } - rb_thread_ready(main_thread); - if (!rb_thread_dead(curr_thread)) { - if (THREAD_SAVE_CONTEXT(curr_thread)) { - return; - } - } - th_signm = sig; /* should be literal */ - curr_thread = main_thread; - rb_thread_restore_context(curr_thread, RESTORE_SIGNAL); -} - -void -rb_thread_trap_eval(VALUE cmd, int sig, int safe) -{ - rb_thread_critical = 0; - if (curr_thread == main_thread) { - rb_trap_eval(cmd, sig, safe); - return; - } - if (!rb_thread_dead(curr_thread)) { - if (THREAD_SAVE_CONTEXT(curr_thread)) { - return; - } - } - th_cmd = cmd; - th_sig = sig; - th_safe = safe; - curr_thread = main_thread; - rb_thread_restore_context(curr_thread, RESTORE_TRAP); -} - -void -rb_thread_signal_exit(void) -{ - VALUE args[2]; - - rb_thread_critical = 0; - if (curr_thread == main_thread) { - rb_thread_ready(curr_thread); - rb_exit(EXIT_SUCCESS); - } - args[0] = INT2NUM(EXIT_SUCCESS); - args[1] = rb_str_new2("exit"); - rb_thread_ready(main_thread); - if (!rb_thread_dead(curr_thread)) { - if (THREAD_SAVE_CONTEXT(curr_thread)) { - return; - } - } - rb_thread_main_jump(rb_class_new_instance(2, args, rb_eSystemExit), - RESTORE_EXIT); -} - -static VALUE -rb_thread_raise(int argc, VALUE *argv, rb_thread_t th) -{ - volatile rb_thread_t th_save = th; - VALUE exc; - - if (!th->next) { - rb_raise(rb_eArgError, "unstarted thread"); - } - if (rb_thread_dead(th)) return Qnil; - exc = rb_make_exception(argc, argv); - if (curr_thread == th) { - rb_raise_jump(exc); - } - - if (!rb_thread_dead(curr_thread)) { - if (THREAD_SAVE_CONTEXT(curr_thread)) { - return th_save->thread; - } - } - - rb_thread_ready(th); - curr_thread = th; - - th_raise_exception = exc; - th_raise_node = ruby_current_node; - rb_thread_restore_context(curr_thread, RESTORE_RAISE); - return Qnil; /* not reached */ -} - - -/* - * call-seq: - * thr.raise(exception) - * - * Raises an exception (see <code>Kernel::raise</code>) from <i>thr</i>. The - * caller does not have to be <i>thr</i>. - * - * Thread.abort_on_exception = true - * a = Thread.new { sleep(200) } - * a.raise("Gotcha") - * - * <em>produces:</em> - * - * prog.rb:3: Gotcha (RuntimeError) - * from prog.rb:2:in `initialize' - * from prog.rb:2:in `new' - * from prog.rb:2 - */ - -static VALUE -rb_thread_raise_m(int argc, VALUE *argv, VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - - if (ruby_safe_level > th->safe) { - rb_secure(4); - } - rb_thread_raise(argc, argv, th); - return Qnil; /* not reached */ -} - -VALUE -rb_thread_local_aref(VALUE thread, ID id) -{ - rb_thread_t th; - VALUE val; - - th = rb_thread_check(thread); - if (ruby_safe_level >= 4 && th != curr_thread) { - rb_raise(rb_eSecurityError, "Insecure: thread locals"); - } - if (!th->locals) return Qnil; - if (st_lookup(th->locals, id, &val)) { - return val; - } - return Qnil; -} - - -/* - * call-seq: - * thr[sym] => obj or nil - * - * Attribute Reference---Returns the value of a thread-local variable, using - * either a symbol or a string name. If the specified variable does not exist, - * returns <code>nil</code>. - * - * a = Thread.new { Thread.current["name"] = "A"; Thread.stop } - * b = Thread.new { Thread.current[:name] = "B"; Thread.stop } - * c = Thread.new { Thread.current["name"] = "C"; Thread.stop } - * Thread.list.each {|x| puts "#{x.inspect}: #{x[:name]}" } - * - * <em>produces:</em> - * - * #<Thread:0x401b3b3c sleep>: C - * #<Thread:0x401b3bc8 sleep>: B - * #<Thread:0x401b3c68 sleep>: A - * #<Thread:0x401bdf4c run>: - */ - -static VALUE -rb_thread_aref(VALUE thread, VALUE id) -{ - return rb_thread_local_aref(thread, rb_to_id(id)); -} - -VALUE -rb_thread_local_aset(VALUE thread, ID id, VALUE val) -{ - rb_thread_t th = rb_thread_check(thread); - - if (ruby_safe_level >= 4 && th != curr_thread) { - rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals"); - } - if (OBJ_FROZEN(thread)) rb_error_frozen("thread locals"); - - if (!th->locals) { - th->locals = st_init_numtable(); - } - if (NIL_P(val)) { - st_delete(th->locals, (st_data_t*)&id, 0); - return Qnil; - } - st_insert(th->locals, id, val); - - return val; -} - - -/* - * call-seq: - * thr[sym] = obj => obj - * - * Attribute Assignment---Sets or creates the value of a thread-local variable, - * using either a symbol or a string. See also <code>Thread#[]</code>. - */ - -static VALUE -rb_thread_aset(VALUE thread, VALUE id, VALUE val) -{ - return rb_thread_local_aset(thread, rb_to_id(id), val); -} - - -/* - * call-seq: - * thr.key?(sym) => true or false - * - * Returns <code>true</code> if the given string (or symbol) exists as a - * thread-local variable. - * - * me = Thread.current - * me[:oliver] = "a" - * me.key?(:oliver) #=> true - * me.key?(:stanley) #=> false - */ - -static VALUE -rb_thread_key_p(VALUE thread, VALUE id) -{ - rb_thread_t th = rb_thread_check(thread); - - if (!th->locals) return Qfalse; - if (st_lookup(th->locals, rb_to_id(id), 0)) - return Qtrue; - return Qfalse; -} - -static int -thread_keys_i(ID key, VALUE value, VALUE ary) -{ - rb_ary_push(ary, ID2SYM(key)); - return ST_CONTINUE; -} - - -/* - * call-seq: - * thr.keys => array - * - * Returns an an array of the names of the thread-local variables (as Symbols). - * - * thr = Thread.new do - * Thread.current[:cat] = 'meow' - * Thread.current["dog"] = 'woof' - * end - * thr.join #=> #<Thread:0x401b3f10 dead> - * thr.keys #=> [:dog, :cat] - */ - -static VALUE -rb_thread_keys(VALUE thread) -{ - rb_thread_t th = rb_thread_check(thread); - VALUE ary = rb_ary_new(); - - if (th->locals) { - st_foreach(th->locals, thread_keys_i, ary); - } - return ary; -} - -/* - * call-seq: - * thr.inspect => string - * - * Dump the name, id, and status of _thr_ to a string. - */ - -static VALUE -rb_thread_inspect(VALUE thread) -{ - char *cname = rb_obj_classname(thread); - rb_thread_t th = rb_thread_check(thread); - const char *status = thread_status_name(th->status); - VALUE str; - - str = rb_sprintf("#<%s:%p %s>", cname, (void*)thread, status); - OBJ_INFECT(str, thread); - - return str; -} - -void -rb_thread_atfork(void) -{ - rb_thread_t th; - - if (rb_thread_alone()) return; - FOREACH_THREAD(th) { - if (th != curr_thread) { - rb_thread_die(th); - } - } - END_FOREACH(th); - main_thread = curr_thread; - curr_thread->next = curr_thread; - curr_thread->prev = curr_thread; -} - - -/* - * Document-class: Continuation - * - * Continuation objects are generated by - * <code>Kernel#callcc</code>. They hold a return address and execution - * context, allowing a nonlocal return to the end of the - * <code>callcc</code> block from anywhere within a program. - * Continuations are somewhat analogous to a structured version of C's - * <code>setjmp/longjmp</code> (although they contain more state, so - * you might consider them closer to threads). - * - * For instance: - * - * arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ] - * callcc{|$cc|} - * puts(message = arr.shift) - * $cc.call unless message =~ /Max/ - * - * <em>produces:</em> - * - * Freddie - * Herbie - * Ron - * Max - * - * This (somewhat contrived) example allows the inner loop to abandon - * processing early: - * - * callcc {|cont| - * for i in 0..4 - * print "\n#{i}: " - * for j in i*5...(i+1)*5 - * cont.call() if j == 17 - * printf "%3d", j - * end - * end - * } - * print "\n" - * - * <em>produces:</em> - * - * 0: 0 1 2 3 4 - * 1: 5 6 7 8 9 - * 2: 10 11 12 13 14 - * 3: 15 16 - */ - -VALUE rb_cCont; - -/* - * call-seq: - * callcc {|cont| block } => obj - * - * Generates a <code>Continuation</code> object, which it passes to the - * associated block. Performing a <em>cont</em><code>.call</code> will - * cause the <code>callcc</code> to return (as will falling through the - * end of the block). The value returned by the <code>callcc</code> is - * the value of the block, or the value passed to - * <em>cont</em><code>.call</code>. See class <code>Continuation</code> - * for more details. Also see <code>Kernel::throw</code> for - * an alternative mechanism for unwinding a call stack. - */ - -static VALUE -rb_callcc(VALUE self) -{ - volatile VALUE cont; - rb_thread_t th; - volatile rb_thread_t th_save; - struct tag *tag; - struct RVarmap *vars; - - THREAD_ALLOC(th); - cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th); - - scope_dup(ruby_scope); - for (tag=prot_tag; tag; tag=tag->prev) { - scope_dup(tag->scope); - } - th->thread = curr_thread->thread; - th->thgroup = cont_protect; - - for (vars = ruby_dyna_vars; vars; vars = vars->next) { - if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break; - FL_SET(vars, DVAR_DONT_RECYCLE); - } - th_save = th; - if (THREAD_SAVE_CONTEXT(th)) { - return th_save->result; + th->top_local_tbl = tbl; } else { - return rb_yield(cont); - } -} - -/* - * call-seq: - * cont.call(args, ...) - * cont[args, ...] - * - * Invokes the continuation. The program continues from the end of the - * <code>callcc</code> block. If no arguments are given, the original - * <code>callcc</code> returns <code>nil</code>. If one argument is - * given, <code>callcc</code> returns it. Otherwise, an array - * containing <i>args</i> is returned. - * - * callcc {|cont| cont.call } #=> nil - * callcc {|cont| cont.call 1 } #=> 1 - * callcc {|cont| cont.call 1, 2, 3 } #=> [1, 2, 3] - */ - -static VALUE -rb_cont_call(int argc, VALUE *argv, VALUE cont) -{ - rb_thread_t th = rb_thread_check(cont); - - if (th->thread != curr_thread->thread) { - rb_raise(rb_eRuntimeError, "continuation called across threads"); - } - if (th->thgroup != cont_protect) { - rb_raise(rb_eRuntimeError, "continuation called across trap"); - } - switch (argc) { - case 0: - th->result = Qnil; - break; - case 1: - th->result = argv[0]; - break; - default: - th->result = rb_ary_new4(argc, argv); - break; - } - - rb_thread_restore_context(th, RESTORE_NORMAL); - return Qnil; -} - -struct thgroup { - int enclosed; - VALUE group; -}; - - -/* - * Document-class: ThreadGroup - * - * <code>ThreadGroup</code> provides a means of keeping track of a number of - * threads as a group. A <code>Thread</code> can belong to only one - * <code>ThreadGroup</code> at a time; adding a thread to a new group will - * remove it from any previous group. - * - * Newly created threads belong to the same group as the thread from which they - * were created. - */ - -static VALUE -thgroup_s_alloc(VALUE klass) -{ - VALUE group; - struct thgroup *data; - - group = Data_Make_Struct(klass, struct thgroup, 0, free, data); - data->enclosed = 0; - data->group = group; - - return group; -} - - -/* - * call-seq: - * thgrp.list => array - * - * Returns an array of all existing <code>Thread</code> objects that belong to - * this group. - * - * ThreadGroup::Default.list #=> [#<Thread:0x401bdf4c run>] - */ - -static VALUE -thgroup_list(VALUE group) -{ - struct thgroup *data; - rb_thread_t th; - VALUE ary; - - Data_Get_Struct(group, struct thgroup, data); - ary = rb_ary_new(); - - FOREACH_THREAD(th) { - if (th->thgroup == data->group) { - rb_ary_push(ary, th->thread); - } + th->top_local_tbl = 0; } - END_FOREACH(th); - - return ary; } - -/* - * call-seq: - * thgrp.enclose => thgrp - * - * Prevents threads from being added to or removed from the receiving - * <code>ThreadGroup</code>. New threads can still be started in an enclosed - * <code>ThreadGroup</code>. - * - * ThreadGroup::Default.enclose #=> #<ThreadGroup:0x4029d914> - * thr = Thread::new { Thread.stop } #=> #<Thread:0x402a7210 sleep> - * tg = ThreadGroup::new #=> #<ThreadGroup:0x402752d4> - * tg.add thr - * - * <em>produces:</em> - * - * ThreadError: can't move from the enclosed thread group - */ - -static VALUE -thgroup_enclose(VALUE group) -{ - struct thgroup *data; - - Data_Get_Struct(group, struct thgroup, data); - data->enclosed = 1; - - return group; -} - - -/* - * call-seq: - * thgrp.enclosed? => true or false - * - * Returns <code>true</code> if <em>thgrp</em> is enclosed. See also - * ThreadGroup#enclose. - */ - -static VALUE -thgroup_enclosed_p(VALUE group) -{ - struct thgroup *data; - - Data_Get_Struct(group, struct thgroup, data); - if (data->enclosed) return Qtrue; - return Qfalse; -} - - -/* - * call-seq: - * thgrp.add(thread) => thgrp - * - * Adds the given <em>thread</em> to this group, removing it from any other - * group to which it may have previously belonged. - * - * puts "Initial group is #{ThreadGroup::Default.list}" - * tg = ThreadGroup.new - * t1 = Thread.new { sleep } - * t2 = Thread.new { sleep } - * puts "t1 is #{t1}" - * puts "t2 is #{t2}" - * tg.add(t1) - * puts "Initial group now #{ThreadGroup::Default.list}" - * puts "tg group now #{tg.list}" - * - * <em>produces:</em> - * - * Initial group is #<Thread:0x401bdf4c> - * t1 is #<Thread:0x401b3c90> - * t2 is #<Thread:0x401b3c18> - * Initial group now #<Thread:0x401b3c18>#<Thread:0x401bdf4c> - * tg group now #<Thread:0x401b3c90> - */ - -static VALUE -thgroup_add(VALUE group, VALUE thread) -{ - rb_thread_t th; - struct thgroup *data; - - rb_secure(4); - th = rb_thread_check(thread); - if (!th->next || !th->prev) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)", - rb_obj_classname(thread)); - } - - if (OBJ_FROZEN(group)) { - rb_raise(rb_eThreadError, "can't move to the frozen thread group"); - } - Data_Get_Struct(group, struct thgroup, data); - if (data->enclosed) { - rb_raise(rb_eThreadError, "can't move to the enclosed thread group"); - } - - if (!th->thgroup) { - return Qnil; - } - if (OBJ_FROZEN(th->thgroup)) { - rb_raise(rb_eThreadError, "can't move from the frozen thread group"); - } - Data_Get_Struct(th->thgroup, struct thgroup, data); - if (data->enclosed) { - rb_raise(rb_eThreadError, "can't move from the enclosed thread group"); - } - - th->thgroup = group; - return group; -} - -/* variables for recursive traversals */ -static ID recursive_key; - - -/* - * +Thread+ encapsulates the behavior of a thread of - * execution, including the main thread of the Ruby script. - * - * In the descriptions of the methods in this class, the parameter _sym_ - * refers to a symbol, which is either a quoted string or a - * +Symbol+ (such as <code>:name</code>). - */ - -void -Init_Thread(void) -{ - VALUE cThGroup; - - rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError); - rb_cThread = rb_define_class("Thread", rb_cObject); - rb_undef_alloc_func(rb_cThread); - - rb_define_singleton_method(rb_cThread, "new", rb_thread_s_new, -1); - rb_define_method(rb_cThread, "initialize", rb_thread_initialize, -2); - rb_define_singleton_method(rb_cThread, "start", rb_thread_start, -2); - rb_define_singleton_method(rb_cThread, "fork", rb_thread_start, -2); - - rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0); - rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1); - rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0); - rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0); - rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0); - rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0); - rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0); - - rb_define_singleton_method(rb_cThread, "critical", rb_thread_critical_get, 0); - rb_define_singleton_method(rb_cThread, "critical=", rb_thread_critical_set, 1); - - rb_define_singleton_method(rb_cThread, "abort_on_exception", rb_thread_s_abort_exc, 0); - rb_define_singleton_method(rb_cThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1); - - rb_define_method(rb_cThread, "run", rb_thread_run, 0); - rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0); - rb_define_method(rb_cThread, "kill", rb_thread_kill, 0); - rb_define_method(rb_cThread, "terminate", rb_thread_kill, 0); - rb_define_method(rb_cThread, "exit", rb_thread_kill, 0); - rb_define_method(rb_cThread, "kill!", rb_thread_kill_bang, 0); - rb_define_method(rb_cThread, "terminate!", rb_thread_kill_bang, 0); - rb_define_method(rb_cThread, "exit!", rb_thread_kill_bang, 0); - rb_define_method(rb_cThread, "value", rb_thread_value, 0); - rb_define_method(rb_cThread, "status", rb_thread_status, 0); - rb_define_method(rb_cThread, "join", rb_thread_join_m, -1); - rb_define_method(rb_cThread, "alive?", rb_thread_alive_p, 0); - rb_define_method(rb_cThread, "stop?", rb_thread_stop_p, 0); - rb_define_method(rb_cThread, "raise", rb_thread_raise_m, -1); - - rb_define_method(rb_cThread, "abort_on_exception", rb_thread_abort_exc, 0); - rb_define_method(rb_cThread, "abort_on_exception=", rb_thread_abort_exc_set, 1); - - rb_define_method(rb_cThread, "priority", rb_thread_priority, 0); - rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1); - rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0); - rb_define_method(rb_cThread, "group", rb_thread_group, 0); - - rb_define_method(rb_cThread, "[]", rb_thread_aref, 1); - rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2); - rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1); - rb_define_method(rb_cThread, "keys", rb_thread_keys, 0); - - rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0); - - rb_cCont = rb_define_class("Continuation", rb_cObject); - rb_undef_alloc_func(rb_cCont); - rb_undef_method(CLASS_OF(rb_cCont), "new"); - rb_define_method(rb_cCont, "call", rb_cont_call, -1); - rb_define_method(rb_cCont, "[]", rb_cont_call, -1); - rb_define_global_function("callcc", rb_callcc, 0); - rb_global_variable(&cont_protect); - - cThGroup = rb_define_class("ThreadGroup", rb_cObject); - rb_define_alloc_func(cThGroup, thgroup_s_alloc); - rb_define_method(cThGroup, "list", thgroup_list, 0); - rb_define_method(cThGroup, "enclose", thgroup_enclose, 0); - rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0); - rb_define_method(cThGroup, "add", thgroup_add, 1); - rb_global_variable(&thgroup_default); - thgroup_default = rb_obj_alloc(cThGroup); - rb_define_const(cThGroup, "Default", thgroup_default); - - /* allocate main thread */ - main_thread = rb_thread_alloc(rb_cThread); - curr_thread = main_thread->prev = main_thread->next = main_thread; - recursive_key = rb_intern("__recursive_key__"); -} - -/* - * call-seq: - * catch(symbol) {| | block } > obj - * - * +catch+ executes its block. If a +throw+ is - * executed, Ruby searches up its stack for a +catch+ block - * with a tag corresponding to the +throw+'s - * _symbol_. If found, that block is terminated, and - * +catch+ returns the value given to +throw+. If - * +throw+ is not called, the block terminates normally, and - * the value of +catch+ is the value of the last expression - * evaluated. +catch+ expressions may be nested, and the - * +throw+ call need not be in lexical scope. - * - * def routine(n) - * puts n - * throw :done if n <= 0 - * routine(n-1) - * end - * - * - * catch(:done) { routine(3) } - * - * <em>produces:</em> - * - * 3 - * 2 - * 1 - * 0 - */ - -static VALUE -rb_f_catch(VALUE dmy, VALUE tag) -{ - int state; - VALUE val = Qnil; /* OK */ - - tag = ID2SYM(rb_to_id(tag)); - PUSH_TAG(tag); - if ((state = EXEC_TAG()) == 0) { - val = rb_yield_0(tag, 0, 0, 0); - } - else if (state == TAG_THROW && tag == prot_tag->dst) { - val = prot_tag->retval; - state = 0; - } - POP_TAG(); - if (state) JUMP_TAG(state); - - return val; -} - -VALUE -rb_catch(const char *tag, VALUE (*func)(ANYARGS), VALUE data) -{ - VALUE vtag = ID2SYM(rb_intern(tag)); - - return rb_block_call(Qnil, rb_intern("catch"), 1, &vtag, func, data); -} - -/* - * call-seq: - * throw(symbol [, obj]) - * - * Transfers control to the end of the active +catch+ block - * waiting for _symbol_. Raises +NameError+ if there - * is no +catch+ block for the symbol. The optional second - * parameter supplies a return value for the +catch+ block, - * which otherwise defaults to +nil+. For examples, see - * <code>Kernel::catch</code>. - */ - -static VALUE -rb_f_throw(int argc, VALUE *argv) +int +rb_scope_base_local_tbl_size(void) { - VALUE tag, value; - struct tag *tt = prot_tag; - - rb_scan_args(argc, argv, "11", &tag, &value); - tag = ID2SYM(rb_to_id(tag)); - - while (tt) { - if (tt->tag == tag) { - tt->dst = tag; - tt->retval = value; - break; - } - if (tt->tag == PROT_THREAD) { - rb_raise(rb_eThreadError, "uncaught throw `%s' in thread %p", - rb_id2name(SYM2ID(tag)), - curr_thread); - } - tt = tt->prev; + yarv_thread_t *th = GET_THREAD(); + if (th->base_block) { + return th->base_block->iseq->local_iseq->local_size + + 2 /* $_, $~ */ - 1 /* svar */ ; } - if (!tt) { - rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag))); + else { + return 0; } - rb_trap_restore_mask(); - JUMP_TAG(TAG_THROW); -#ifndef __GNUC__ - return Qnil; /* not reached */ -#endif } -void -rb_throw(const char *tag, VALUE val) -{ - VALUE argv[2]; - - argv[0] = ID2SYM(rb_intern(tag)); - argv[1] = val; - rb_f_throw(2, argv); -} - -static VALUE -recursive_check(VALUE obj) -{ - VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key); - - if (NIL_P(hash) || TYPE(hash) != T_HASH) { - return Qfalse; - } - else { - VALUE list = rb_hash_aref(hash, ID2SYM(ruby_frame->this_func)); - - if (NIL_P(list) || TYPE(list) != T_ARRAY) return Qfalse; - return rb_ary_includes(list, rb_obj_id(obj)); +ID +rb_scope_base_local_tbl_id(int i) +{ + yarv_thread_t *th = GET_THREAD(); + switch (i) { + case 0: + return rb_intern("$_"); + case 1: + return rb_intern("$~"); + default: + return th->base_block->iseq->local_iseq-> + local_tbl[i - 1 /* tbl[0] is reserved by svar */ ]; } } -static void -recursive_push(VALUE obj) +int +rb_dvar_current(void) { - VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key); - VALUE list, sym; - - sym = ID2SYM(ruby_frame->this_func); - if (NIL_P(hash) || TYPE(hash) != T_HASH) { - hash = rb_hash_new(); - rb_thread_local_aset(rb_thread_current(), recursive_key, hash); - list = Qnil; + yarv_thread_t *th = GET_THREAD(); + if (th->base_block) { + return 1; } else { - list = rb_hash_aref(hash, sym); - } - if (NIL_P(list) || TYPE(list) != T_ARRAY) { - list = rb_ary_new(); - rb_hash_aset(hash, sym, list); + return 0; } - rb_ary_push(list, rb_obj_id(obj)); -} - -static void -recursive_pop(void) -{ - VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key); - VALUE list, sym; - - sym = ID2SYM(ruby_frame->this_func); - if (NIL_P(hash) || TYPE(hash) != T_HASH) { - VALUE symname = rb_inspect(sym); - VALUE thrname = rb_inspect(rb_thread_current()); - rb_raise(rb_eTypeError, "invalid inspect_tbl hash for %s in %s", - StringValuePtr(symname), StringValuePtr(thrname)); - } - list = rb_hash_aref(hash, sym); - if (NIL_P(list) || TYPE(list) != T_ARRAY) { - VALUE symname = rb_inspect(sym); - VALUE thrname = rb_inspect(rb_thread_current()); - rb_raise(rb_eTypeError, "invalid inspect_tbl list for %s in %s", - StringValuePtr(symname), StringValuePtr(thrname)); - } - rb_ary_pop(list); } -VALUE -rb_exec_recursive(VALUE (*func)(VALUE, VALUE, int), VALUE obj, VALUE arg) +int +rb_parse_in_eval(void) { - if (recursive_check(obj)) { - return (*func)(obj, arg, Qtrue); - } - else { - VALUE result; - int state; - - recursive_push(obj); - PUSH_TAG(PROT_NONE); - if ((state = EXEC_TAG()) == 0) { - result = (*func)(obj, arg, Qfalse); - } - POP_TAG(); - recursive_pop(); - if (state) JUMP_TAG(state); - return result; - } + return GET_THREAD()->parse_in_eval != 0; } diff --git a/eval_error.h b/eval_error.h new file mode 100644 index 0000000000..1239665ae9 --- /dev/null +++ b/eval_error.h @@ -0,0 +1,250 @@ +/* + * included by eval.c + */ + +#define SET_CURRENT_SOURCE() ((void)0) + +void +ruby_set_current_source(void) +{ + if (ruby_current_node) { + ruby_sourcefile = ruby_current_node->nd_file; + ruby_sourceline = nd_line(ruby_current_node); + } +} + +static void +warn_printf(const char *fmt, ...) +{ + char buf[BUFSIZ]; + va_list args; + + va_init_list(args, fmt); + vsnprintf(buf, BUFSIZ, fmt, args); + va_end(args); + rb_write_error(buf); +} + +#define warn_print(x) rb_write_error(x) +#define warn_print2(x,l) rb_write_error2(x,l) + +static void +error_pos(void) +{ + ruby_set_current_source(); + if (ruby_sourcefile) { + if (ruby_sourceline == 0) { + warn_printf("%s", ruby_sourcefile); + } + else if (rb_frame_callee()) { + warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline, + rb_id2name(rb_frame_callee())); + } + else { + warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline); + } + } +} + +static VALUE +get_backtrace(VALUE info) +{ + if (NIL_P(info)) + return Qnil; + info = rb_funcall(info, rb_intern("backtrace"), 0); + if (NIL_P(info)) + return Qnil; + return rb_check_array_type(info); +} + +static void +set_backtrace(VALUE info, VALUE bt) +{ + rb_funcall(info, rb_intern("set_backtrace"), 1, bt); +} + +static void +error_print(void) +{ + VALUE errat = Qnil; /* OK */ + volatile VALUE eclass, e; + char *einfo; + long elen; + + if (NIL_P(GET_THREAD()->errinfo)) + return; + + PUSH_TAG(PROT_NONE); + if (EXEC_TAG() == 0) { + errat = get_backtrace(GET_THREAD()->errinfo); + } + else { + errat = Qnil; + } + if (EXEC_TAG()) + goto error; + if (NIL_P(errat)) { + ruby_set_current_source(); + if (ruby_sourcefile) + warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline); + else + warn_printf("%d", ruby_sourceline); + } + else if (RARRAY_LEN(errat) == 0) { + error_pos(); + } + else { + VALUE mesg = RARRAY_PTR(errat)[0]; + + if (NIL_P(mesg)) + error_pos(); + else { + warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg)); + } + } + + eclass = CLASS_OF(GET_THREAD()->errinfo); + if (EXEC_TAG() == 0) { + e = rb_funcall(GET_THREAD()->errinfo, rb_intern("message"), 0, 0); + StringValue(e); + einfo = RSTRING_PTR(e); + elen = RSTRING_LEN(e); + } + else { + einfo = ""; + elen = 0; + } + if (EXEC_TAG()) + goto error; + if (eclass == rb_eRuntimeError && elen == 0) { + warn_print(": unhandled exception\n"); + } + else { + VALUE epath; + + epath = rb_class_name(eclass); + if (elen == 0) { + warn_print(": "); + warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath)); + warn_print("\n"); + } + else { + char *tail = 0; + long len = elen; + + if (RSTRING_PTR(epath)[0] == '#') + epath = 0; + if (tail = memchr(einfo, '\n', elen)) { + len = tail - einfo; + tail++; /* skip newline */ + } + warn_print(": "); + warn_print2(einfo, len); + if (epath) { + warn_print(" ("); + warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath)); + warn_print(")\n"); + } + if (tail) { + warn_print2(tail, elen - len - 1); + } + } + } + + if (!NIL_P(errat)) { + long i; + long len = RARRAY_LEN(errat); + VALUE *ptr = RARRAY_PTR(errat); + +#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5) +#define TRACE_HEAD 8 +#define TRACE_TAIL 5 + + for (i = 1; i < len; i++) { + if (TYPE(ptr[i]) == T_STRING) { + warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i])); + } + if (i == TRACE_HEAD && len > TRACE_MAX) { + warn_printf("\t ... %ld levels...\n", + len - TRACE_HEAD - TRACE_TAIL); + i = len - TRACE_TAIL; + } + } + } + error: + POP_TAG(); +} + +void +print_undef(VALUE klass, ID id) +{ + rb_name_error(id, "undefined method `%s' for %s `%s'", + rb_id2name(id), + (TYPE(klass) == T_MODULE) ? "module" : "class", + rb_class2name(klass)); +} + +VALUE exception_error; +VALUE sysstack_error; + +static int +sysexit_status(VALUE err) +{ + VALUE st = rb_iv_get(err, "status"); + return NUM2INT(st); +} + +static int +error_handle(int ex) +{ + int status = EXIT_FAILURE; + yarv_thread_t *th = GET_THREAD(); + + if (thread_set_raised(th)) + return EXIT_FAILURE; + switch (ex & TAG_MASK) { + case 0: + status = EXIT_SUCCESS; + break; + + case TAG_RETURN: + error_pos(); + warn_print(": unexpected return\n"); + break; + case TAG_NEXT: + error_pos(); + warn_print(": unexpected next\n"); + break; + case TAG_BREAK: + error_pos(); + warn_print(": unexpected break\n"); + break; + case TAG_REDO: + error_pos(); + warn_print(": unexpected redo\n"); + break; + case TAG_RETRY: + error_pos(); + warn_print(": retry outside of rescue clause\n"); + break; + case TAG_THROW: + // TODO: fix me + error_pos(); + warn_printf(": unexpected throw\n"); + break; + case TAG_RAISE: + case TAG_FATAL: + if (rb_obj_is_kind_of(GET_THREAD()->errinfo, rb_eSystemExit)) { + status = sysexit_status(GET_THREAD()->errinfo); + } + else { + error_print(); + } + break; + default: + rb_bug("Unknown longjmp status %d", ex); + break; + } + thread_reset_raised(th); + return status; +} diff --git a/eval_intern.h b/eval_intern.h new file mode 100644 index 0000000000..be0b2c88a7 --- /dev/null +++ b/eval_intern.h @@ -0,0 +1,328 @@ + +#ifndef EVAL_INTERN_H_INCLUDED +#define EVAL_INTERN_H_INCLUDED + +#define PASS_PASSED_BLOCK() \ + (GET_THREAD()->passed_block = \ + GC_GUARDED_PTR_REF((yarv_block_t *)GET_THREAD()->cfp->lfp[0])) + + +#define UNSUPPORTED(func) \ +{ \ + int *a = 0; \ + fprintf(stderr, "%s", "-- unsupported: " #func "\n"); fflush(stderr); \ + *a = 0; \ + rb_bug("unsupported: " #func); \ +} + +#include "ruby.h" +#include "node.h" +#include "util.h" +#include "rubysig.h" +#include "yarv.h" + +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif +#ifndef EXIT_SUCCESS +#define EXIT_SUCCESS 0 +#endif +#ifndef EXIT_FAILURE +#define EXIT_FAILURE 1 +#endif + +#include <stdio.h> +#include <setjmp.h> + +#include "st.h" +#include "dln.h" + +#ifdef __APPLE__ +#include <crt_externs.h> +#endif + +/* Make alloca work the best possible way. */ +#ifdef __GNUC__ +# ifndef atarist +# ifndef alloca +# define alloca __builtin_alloca +# endif +# endif /* atarist */ +#else +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# else +# ifdef _AIX +#pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +void *alloca(); +# endif +# endif /* AIX */ +# endif /* HAVE_ALLOCA_H */ +#endif /* __GNUC__ */ + +#ifdef HAVE_STDARG_PROTOTYPES +#include <stdarg.h> +#define va_init_list(a,b) va_start(a,b) +#else +#include <varargs.h> +#define va_init_list(a,b) va_start(a) +#endif + +#ifndef HAVE_STRING_H +char *strrchr _((const char *, const char)); +#endif + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +#ifdef __BEOS__ +#include <net/socket.h> +#endif + +#ifdef __MACOS__ +#include "macruby_private.h" +#endif + +#ifdef __VMS +#include "vmsruby_private.h" +#endif + +#ifdef USE_CONTEXT + +NORETURN(static void rb_jump_context(rb_jmpbuf_t, int)); +static inline void +rb_jump_context(rb_jmpbuf_t env, int val) +{ + env->status = val; + setcontext(&env->context); + abort(); /* ensure noreturn */ +} + +/* + * FUNCTION_CALL_MAY_RETURN_TWICE is a magic for getcontext, gcc, + * IA64 register stack and SPARC register window combination problem. + * + * Assume following code sequence. + * + * 1. set a register in the register stack/window such as r32/l0. + * 2. call getcontext. + * 3. use the register. + * 4. update the register for other use. + * 5. call setcontext indirectly (or directly). + * + * This code should be run as 1->2->3->4->5->3->4. + * But after second getcontext return (second 3), + * the register is broken (updated). + * It's because getcontext/setcontext doesn't preserve the content of the + * register stack/window. + * + * setjmp also doesn't preserve the content of the register stack/window. + * But it has not the problem because gcc knows setjmp may return twice. + * gcc detects setjmp and generates setjmp safe code. + * + * So setjmp call before getcontext call makes the code somewhat safe. + * It fix the problem on IA64. + * It is not required that setjmp is called at run time, since the problem is + * register usage. + * + * Since the magic setjmp is not enough for SPARC, + * inline asm is used to prohibit registers in register windows. + */ +#if defined (__GNUC__) && (defined(sparc) || defined(__sparc__)) +#define FUNCTION_CALL_MAY_RETURN_TWICE \ + ({ __asm__ volatile ("" : : : \ + "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \ + "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \ + "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); }) +#else +extern jmp_buf function_call_may_return_twice_jmp_buf; +extern int function_call_may_return_twice_false; +#define FUNCTION_CALL_MAY_RETURN_TWICE \ + (function_call_may_return_twice_false ? \ + setjmp(function_call_may_return_twice_jmp_buf) : \ + 0) +#endif +#define ruby_longjmp(env, val) rb_jump_context(env, val) +#define ruby_setjmp(j) ((j)->status = 0, \ + FUNCTION_CALL_MAY_RETURN_TWICE, \ + getcontext(&(j)->context), \ + (j)->status) +#else +#if !defined(setjmp) && defined(HAVE__SETJMP) +#define ruby_setjmp(env) _setjmp(env) +#define ruby_longjmp(env,val) _longjmp(env,val) +#else +#define ruby_setjmp(env) setjmp(env) +#define ruby_longjmp(env,val) longjmp(env,val) +#endif +#endif + +#include <sys/types.h> +#include <signal.h> +#include <errno.h> + +#if defined(__VMS) +#pragma nostandard +#endif + +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif + +/* + Solaris sys/select.h switches select to select_large_fdset to support larger + file descriptors if FD_SETSIZE is larger than 1024 on 32bit environment. + But Ruby doesn't change FD_SETSIZE because fd_set is allocated dynamically. + So following definition is required to use select_large_fdset. +*/ +#ifdef HAVE_SELECT_LARGE_FDSET +#define select(n, r, w, e, t) select_large_fdset(n, r, w, e, t) +#endif + +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + +#include <sys/stat.h> + +#define TH_PUSH_TAG(th) do { \ + yarv_thread_t * const _th = th; \ + struct yarv_tag _tag; \ + _tag.tag = 0; \ + _tag.prev = _th->tag; \ + _th->tag = &_tag; + +#define TH_POP_TAG() \ + _th->tag = _tag.prev; \ +} while (0) + +#define TH_POP_TAG2() \ + _th->tag = _tag.prev + +#define PUSH_TAG(ptag) TH_PUSH_TAG(GET_THREAD()) +#define POP_TAG() TH_POP_TAG() +#define POP_TAG_INIT() } while (0) + +#define PUSH_THREAD_TAG() \ + PUSH_TAG(PROT_THREAD) + +#define POP_THREAD_TAG() \ + POP_TAG() + +#define PROT_NONE Qfalse /* 0 */ +#define PROT_THREAD Qtrue /* 2 */ +#define PROT_FUNC INT2FIX(0) /* 1 */ +#define PROT_LOOP INT2FIX(1) /* 3 */ +#define PROT_LAMBDA INT2FIX(2) /* 5 */ +#define PROT_YIELD INT2FIX(3) /* 7 */ +#define PROT_TOP INT2FIX(4) /* 9 */ + +#define TH_EXEC_TAG() \ + (FLUSH_REGISTER_WINDOWS, ruby_setjmp(_th->tag->buf)) + +#define EXEC_TAG() \ + TH_EXEC_TAG() + +#define TH_JUMP_TAG(th, st) do { \ + ruby_longjmp(th->tag->buf,(st)); \ +} while (0) + +#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), st) + +#define TAG_RETURN 0x1 +#define TAG_BREAK 0x2 +#define TAG_NEXT 0x3 +#define TAG_RETRY 0x4 +#define TAG_REDO 0x5 +#define TAG_RAISE 0x6 +#define TAG_THROW 0x7 +#define TAG_FATAL 0x8 +#define TAG_CONTCALL 0x9 +#define TAG_THREAD 0xa +#define TAG_MASK 0xf + +#define SCOPE_TEST(f) \ + (ruby_cref()->nd_visi & (f)) + +#define SCOPE_CHECK(f) \ + (ruby_cref()->nd_visi == (f)) + +#define SCOPE_SET(f) \ +{ \ + ruby_cref()->nd_visi = (f); \ +} + +struct ruby_env { + struct ruby_env *prev; + struct FRAME *frame; + struct SCOPE *scope; + struct BLOCK *block; + struct iter *iter; + struct tag *tag; + NODE *cref; +}; + +typedef struct thread *rb_thread_t; + +extern VALUE rb_cBinding; +extern VALUE rb_eThreadError; +extern VALUE rb_eLocalJumpError; +extern VALUE rb_eSysStackError; +extern VALUE exception_error; +extern VALUE sysstack_error; + + +void rb_thread_cleanup _((void)); +void rb_thread_wait_other_threads _((void)); + +int thread_set_raised(yarv_thread_t *th); +int thread_reset_raised(yarv_thread_t *th); + +VALUE rb_f_eval(int argc, VALUE *argv, VALUE self); +VALUE rb_make_exception _((int argc, VALUE *argv)); + +NORETURN(void rb_raise_jump _((VALUE))); +NORETURN(void print_undef _((VALUE, ID))); +NORETURN(void th_localjump_error(const char *, VALUE, int)); +NORETURN(void th_jump_tag_but_local_jump(int, VALUE)); + +rb_thread_t rb_vm_curr_thread(); +VALUE th_compile(yarv_thread_t *th, VALUE str, VALUE file, VALUE line); + +NODE *th_get_cref(yarv_thread_t *th, yarv_iseq_t *iseq, yarv_control_frame_t *cfp); +NODE *th_cref_push(yarv_thread_t *th, VALUE, int); +NODE *th_set_special_cref(yarv_thread_t *th, VALUE *lfp, NODE * cref_stack); + +static yarv_control_frame_t * +th_get_ruby_level_cfp(yarv_thread_t *th, yarv_control_frame_t *cfp) +{ + yarv_iseq_t *iseq = 0; + while (!YARV_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) { + if (YARV_NORMAL_ISEQ_P(cfp->iseq)) { + iseq = cfp->iseq; + break; + } + cfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); + } + if (!iseq) { + return 0; + } + return cfp; +} + +static NODE * +ruby_cref() +{ + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th_get_ruby_level_cfp(th, th->cfp); + return th_get_cref(th, cfp->iseq, cfp); +} + +VALUE th_get_cbase(yarv_thread_t *th); + +#define ruby_cbase() th_get_cbase(GET_THREAD()) + +#endif /* EVAL_INTERN_H_INCLUDED */ diff --git a/eval_jump.h b/eval_jump.h new file mode 100644 index 0000000000..5fee304776 --- /dev/null +++ b/eval_jump.h @@ -0,0 +1,411 @@ +/* + * from eval.c + */ + +#include "eval_intern.h" + +NORETURN(static VALUE rb_f_throw _((int, VALUE *))); + +/* + * call-seq: + * throw(symbol [, obj]) + * + * Transfers control to the end of the active +catch+ block + * waiting for _symbol_. Raises +NameError+ if there + * is no +catch+ block for the symbol. The optional second + * parameter supplies a return value for the +catch+ block, + * which otherwise defaults to +nil+. For examples, see + * <code>Kernel::catch</code>. + */ + +static VALUE +rb_f_throw(int argc, VALUE *argv) +{ + VALUE tag, value; + yarv_thread_t *th = GET_THREAD(); + struct yarv_tag *tt = th->tag; + + rb_scan_args(argc, argv, "11", &tag, &value); + tag = ID2SYM(rb_to_id(tag)); + + while (tt) { + if (tt->tag == tag) { + tt->retval = value; + break; + } + tt = tt->prev; + } + if (!tt) { + rb_name_error(SYM2ID(tag), "uncaught throw `%s'", + rb_id2name(SYM2ID(tag))); + } + rb_trap_restore_mask(); + th->errinfo = tag; + + JUMP_TAG(TAG_THROW); +#ifndef __GNUC__ + return Qnil; /* not reached */ +#endif +} + +void +rb_throw(const char *tag, VALUE val) +{ + VALUE argv[2]; + + argv[0] = ID2SYM(rb_intern(tag)); + argv[1] = val; + rb_f_throw(2, argv); +} + +/* + * call-seq: + * catch(symbol) {| | block } > obj + * + * +catch+ executes its block. If a +throw+ is + * executed, Ruby searches up its stack for a +catch+ block + * with a tag corresponding to the +throw+'s + * _symbol_. If found, that block is terminated, and + * +catch+ returns the value given to +throw+. If + * +throw+ is not called, the block terminates normally, and + * the value of +catch+ is the value of the last expression + * evaluated. +catch+ expressions may be nested, and the + * +throw+ call need not be in lexical scope. + * + * def routine(n) + * puts n + * throw :done if n <= 0 + * routine(n-1) + * end + * + * + * catch(:done) { routine(3) } + * + * <em>produces:</em> + * + * 3 + * 2 + * 1 + * 0 + */ + +static VALUE +rb_f_catch(VALUE dmy, VALUE tag) +{ + int state; + VALUE val = Qnil; /* OK */ + yarv_thread_t *th = GET_THREAD(); + + tag = ID2SYM(rb_to_id(tag)); + PUSH_TAG(tag); + + th->tag->tag = tag; + + if ((state = EXEC_TAG()) == 0) { + val = rb_yield_0(tag, 0, 0, 0, Qfalse); + } + else if (state == TAG_THROW && th->errinfo == tag) { + val = th->tag->retval; + th->errinfo = 0; + state = 0; + } + POP_TAG(); + if (state) + JUMP_TAG(state); + + return val; +} + +static VALUE +catch_i(VALUE tag) +{ + return rb_funcall(Qnil, rb_intern("catch"), 1, tag); +} + +VALUE +rb_catch(const char *tag, VALUE (*func)(), VALUE data) +{ + return rb_iterate((VALUE (*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), + func, data); +} + + +/* exit */ + +NORETURN(static VALUE terminate_process _((int, const char *, long))); + +static VALUE +terminate_process(int status, const char *mesg, long mlen) +{ + VALUE args[2]; + yarv_vm_t *vm = GET_THREAD()->vm; + + args[0] = INT2NUM(status); + args[1] = rb_str_new(mesg, mlen); + + vm->exit_code = status; + rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit)); +} + + +void +rb_exit(int status) +{ + if (GET_THREAD()->tag) { + terminate_process(status, "exit", 4); + } + ruby_finalize(); + exit(status); +} + +/* + * call-seq: + * exit(integer=0) + * Kernel::exit(integer=0) + * Process::exit(integer=0) + * + * Initiates the termination of the Ruby script by raising the + * <code>SystemExit</code> exception. This exception may be caught. The + * optional parameter is used to return a status code to the invoking + * environment. + * + * begin + * exit + * puts "never get here" + * rescue SystemExit + * puts "rescued a SystemExit exception" + * end + * puts "after begin block" + * + * <em>produces:</em> + * + * rescued a SystemExit exception + * after begin block + * + * Just prior to termination, Ruby executes any <code>at_exit</code> functions + * (see Kernel::at_exit) and runs any object finalizers (see + * ObjectSpace::define_finalizer). + * + * at_exit { puts "at_exit function" } + * ObjectSpace.define_finalizer("string", proc { puts "in finalizer" }) + * exit + * + * <em>produces:</em> + * + * at_exit function + * in finalizer + */ + +VALUE +rb_f_exit(int argc, VALUE *argv) +{ + VALUE status; + int istatus; + + rb_secure(4); + if (rb_scan_args(argc, argv, "01", &status) == 1) { + switch (status) { + case Qtrue: + istatus = EXIT_SUCCESS; + break; + case Qfalse: + istatus = EXIT_FAILURE; + break; + default: + istatus = NUM2INT(status); +#if EXIT_SUCCESS != 0 + if (istatus == 0) + istatus = EXIT_SUCCESS; +#endif + break; + } + } + else { + istatus = EXIT_SUCCESS; + } + rb_exit(istatus); + return Qnil; /* not reached */ +} + + +/* + * call-seq: + * abort + * Kernel::abort + * Process::abort + * + * Terminate execution immediately, effectively by calling + * <code>Kernel.exit(1)</code>. If _msg_ is given, it is written + * to STDERR prior to terminating. + */ + +VALUE +rb_f_abort(int argc, VALUE *argv) +{ + rb_secure(4); + if (argc == 0) { + if (!NIL_P(GET_THREAD()->errinfo)) { + error_print(); + } + rb_exit(EXIT_FAILURE); + } + else { + VALUE mesg; + + rb_scan_args(argc, argv, "1", &mesg); + StringValue(argv[0]); + rb_io_puts(argc, argv, rb_stderr); + terminate_process(EXIT_FAILURE, RSTRING_PTR(argv[0]), + RSTRING_LEN(argv[0])); + } + return Qnil; /* not reached */ +} + +static void call_end_proc _((VALUE data)); + +static void +call_end_proc(VALUE data) +{ + // TODO: fix me + proc_invoke(data, rb_ary_new2(0), Qundef, 0); +} + +/* + * call-seq: + * at_exit { block } -> proc + * + * Converts _block_ to a +Proc+ object (and therefore + * binds it at the point of call) and registers it for execution when + * the program exits. If multiple handlers are registered, they are + * executed in reverse order of registration. + * + * def do_at_exit(str1) + * at_exit { print str1 } + * end + * at_exit { puts "cruel world" } + * do_at_exit("goodbye ") + * exit + * + * <em>produces:</em> + * + * goodbye cruel world + */ + +static VALUE +rb_f_at_exit(void) +{ + VALUE proc; + + if (!rb_block_given_p()) { + rb_raise(rb_eArgError, "called without a block"); + } + proc = rb_block_proc(); + rb_set_end_proc(call_end_proc, proc); + return proc; +} + +struct end_proc_data { + void (*func) (); + VALUE data; + int safe; + struct end_proc_data *next; +}; + +static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs; + +void +rb_set_end_proc(void (*func)(VALUE), VALUE data) +{ + struct end_proc_data *link = ALLOC(struct end_proc_data); + struct end_proc_data **list; + + if (ruby_wrapper) { + list = &ephemeral_end_procs; + } + else { + list = &end_procs; + } + link->next = *list; + link->func = func; + link->data = data; + link->safe = rb_safe_level(); + *list = link; +} + +void +rb_mark_end_proc(void) +{ + struct end_proc_data *link; + + link = end_procs; + while (link) { + rb_gc_mark(link->data); + link = link->next; + } + link = ephemeral_end_procs; + while (link) { + rb_gc_mark(link->data); + link = link->next; + } + link = tmp_end_procs; + while (link) { + rb_gc_mark(link->data); + link = link->next; + } +} + +void +rb_exec_end_proc(void) +{ + struct end_proc_data *link, *tmp; + int status; + volatile int safe = rb_safe_level(); + + while (ephemeral_end_procs) { + tmp_end_procs = link = ephemeral_end_procs; + ephemeral_end_procs = 0; + while (link) { + PUSH_TAG(PROT_NONE); + if ((status = EXEC_TAG()) == 0) { + rb_set_safe_level_force(link->safe); + (*link->func) (link->data); + } + POP_TAG(); + if (status) { + error_handle(status); + } + tmp = link; + tmp_end_procs = link = link->next; + free(tmp); + } + } + while (end_procs) { + tmp_end_procs = link = end_procs; + end_procs = 0; + while (link) { + PUSH_TAG(PROT_NONE); + if ((status = EXEC_TAG()) == 0) { + rb_set_safe_level_force(link->safe); + (*link->func) (link->data); + } + POP_TAG(); + if (status) { + error_handle(status); + } + tmp = link; + tmp_end_procs = link = link->next; + free(tmp); + } + } + rb_set_safe_level_force(safe); +} + +void +Init_jump() +{ + rb_define_global_function("catch", rb_f_catch, 1); + rb_define_global_function("throw", rb_f_throw, -1); + rb_define_global_function("exit", rb_f_exit, -1); + rb_define_global_function("abort", rb_f_abort, -1); + rb_define_global_function("at_exit", rb_f_at_exit, 0); +} diff --git a/eval_load.c b/eval_load.c new file mode 100644 index 0000000000..53be5587aa --- /dev/null +++ b/eval_load.c @@ -0,0 +1,508 @@ +/* + * load methods from eval.c + */ + +#include "eval_intern.h" + +extern VALUE ruby_top_self; + +VALUE ruby_dln_librefs; +static VALUE rb_features; +static st_table *loading_tbl; + +NORETURN(void jump_tag_but_local_jump(int, VALUE)); + +#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0) +#ifdef DLEXT2 +#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0) +#else +#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0) +#endif + +static int +rb_feature_p(const char *feature, const char *ext, int rb) +{ + VALUE v; + char *f, *e; + long i, len, elen; + + if (ext) { + len = ext - feature; + elen = strlen(ext); + } + else { + len = strlen(feature); + elen = 0; + } + for (i = 0; i < RARRAY_LEN(rb_features); ++i) { + v = RARRAY_PTR(rb_features)[i]; + f = StringValuePtr(v); + if (strncmp(f, feature, len) != 0) + continue; + if (!*(e = f + len)) { + if (ext) + continue; + return 'u'; + } + if (*e != '.') + continue; + if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) { + return 's'; + } + if ((rb || !ext) && (strcmp(e, ".rb") == 0)) { + return 'r'; + } + } + return 0; +} + +static const char *const loadable_ext[] = { + ".rb", DLEXT, +#ifdef DLEXT2 + DLEXT2, +#endif + 0 +}; + +static int search_required _((VALUE, VALUE *)); + +int +rb_provided(const char *feature) +{ + int i; + char *buf; + VALUE fname; + + if (rb_feature_p(feature, 0, Qfalse)) + return Qtrue; + if (loading_tbl) { + if (st_lookup(loading_tbl, (st_data_t) feature, 0)) + return Qtrue; + buf = ALLOCA_N(char, strlen(feature) + 8); + strcpy(buf, feature); + for (i = 0; loadable_ext[i]; i++) { + strcpy(buf + strlen(feature), loadable_ext[i]); + if (st_lookup(loading_tbl, (st_data_t) buf, 0)) + return Qtrue; + } + } + if (search_required(rb_str_new2(feature), &fname)) { + feature = RSTRING_PTR(fname); + if (rb_feature_p(feature, 0, Qfalse)) + return Qtrue; + if (loading_tbl && st_lookup(loading_tbl, (st_data_t) feature, 0)) + return Qtrue; + } + return Qfalse; +} + +static void +rb_provide_feature(VALUE feature) +{ + rb_ary_push(rb_features, feature); +} + +void +rb_provide(const char *feature) +{ + rb_provide_feature(rb_str_new2(feature)); +} + +VALUE rb_load_path; + +NORETURN(static void load_failed _((VALUE))); +void th_klass_init(yarv_thread_t *); + +void +rb_load(VALUE fname, int wrap) +{ + VALUE tmp; + int state; + volatile VALUE self = ruby_top_self; + + FilePathValue(fname); + fname = rb_str_new4(fname); + tmp = rb_find_file(fname); + if (!tmp) { + load_failed(fname); + } + fname = tmp; + + GET_THREAD()->errinfo = Qnil; /* ensure */ + + if (!wrap) { + rb_secure(4); /* should alter global state */ + } + else { + /* load in anonymous module as toplevel */ + self = rb_obj_clone(ruby_top_self); + } + + PUSH_TAG(PROT_NONE); + state = EXEC_TAG(); + if (state == 0) { + yarv_load(RSTRING_PTR(fname)); + } + POP_TAG(); + + if (ruby_nerrs > 0) { + ruby_nerrs = 0; + rb_exc_raise(GET_THREAD()->errinfo); + } + if (state) { + th_jump_tag_but_local_jump(state, Qundef); + } + + if (!NIL_P(GET_THREAD()->errinfo)) { + /* exception during load */ + rb_exc_raise(GET_THREAD()->errinfo); + } +} + +void +rb_load_protect(VALUE fname, int wrap, int *state) +{ + int status; + + PUSH_THREAD_TAG(); + if ((status = EXEC_TAG()) == 0) { + rb_load(fname, wrap); + } + POP_THREAD_TAG(); + if (state) + *state = status; +} + +/* + * call-seq: + * load(filename, wrap=false) => true + * + * Loads and executes the Ruby + * program in the file _filename_. If the filename does not + * resolve to an absolute path, the file is searched for in the library + * directories listed in <code>$:</code>. If the optional _wrap_ + * parameter is +true+, the loaded script will be executed + * under an anonymous module, protecting the calling program's global + * namespace. In no circumstance will any local variables in the loaded + * file be propagated to the loading environment. + */ + + +static VALUE +rb_f_load(argc, argv) + int argc; + VALUE *argv; +{ + VALUE fname, wrap; + + rb_scan_args(argc, argv, "11", &fname, &wrap); + rb_load(fname, RTEST(wrap)); + return Qtrue; +} + +static int +load_wait(char *ftptr) +{ + st_data_t th; + if (!loading_tbl) { + return Qfalse; + } + if (!st_lookup(loading_tbl, (st_data_t) ftptr, &th)) { + return Qfalse; + } + + // TODO: write wait routine + return Qtrue; +} + +/* + * call-seq: + * require(string) => true or false + * + * Ruby tries to load the library named _string_, returning + * +true+ if successful. If the filename does not resolve to + * an absolute path, it will be searched for in the directories listed + * in <code>$:</code>. If the file has the extension ``.rb'', it is + * loaded as a source file; if the extension is ``.so'', ``.o'', or + * ``.dll'', or whatever the default shared library extension is on + * the current platform, Ruby loads the shared library as a Ruby + * extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on + * to the name. The name of the loaded feature is added to the array in + * <code>$"</code>. A feature will not be loaded if it's name already + * appears in <code>$"</code>. However, the file name is not converted + * to an absolute path, so that ``<code>require 'a';require + * './a'</code>'' will load <code>a.rb</code> twice. + * + * require "my-library.rb" + * require "db-driver" + */ + +VALUE +rb_f_require(VALUE obj, VALUE fname) +{ + return rb_require_safe(fname, rb_safe_level()); +} + +static int +search_required(VALUE fname, VALUE *path) +{ + VALUE tmp; + char *ext, *ftptr; + int type, ft = 0; + + *path = 0; + ext = strrchr(ftptr = RSTRING_PTR(fname), '.'); + if (ext && !strchr(ext, '/')) { + if (strcmp(".rb", ext) == 0) { + if (rb_feature_p(ftptr, ext, Qtrue)) + return 'r'; + if (tmp = rb_find_file(fname)) { + tmp = rb_file_expand_path(tmp, Qnil); + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + if (!rb_feature_p(ftptr, ext, Qtrue)) + *path = tmp; + return 'r'; + } + return 0; + } + else if (IS_SOEXT(ext)) { + if (rb_feature_p(ftptr, ext, Qfalse)) + return 's'; + tmp = rb_str_new(RSTRING_PTR(fname), ext - RSTRING_PTR(fname)); +#ifdef DLEXT2 + OBJ_FREEZE(tmp); + if (rb_find_file_ext(&tmp, loadable_ext + 1)) { + tmp = rb_file_expand_path(tmp, Qnil); + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + if (!rb_feature_p(ftptr, ext, Qfalse)) + *path = tmp; + return 's'; + } +#else + rb_str_cat2(tmp, DLEXT); + OBJ_FREEZE(tmp); + if (tmp = rb_find_file(tmp)) { + tmp = rb_file_expand_path(tmp, Qnil); + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + if (!rb_feature_p(ftptr, ext, Qfalse)) + *path = tmp; + return 's'; + } +#endif + } + else if (IS_DLEXT(ext)) { + if (rb_feature_p(ftptr, ext, Qfalse)) + return 's'; + if (tmp = rb_find_file(fname)) { + tmp = rb_file_expand_path(tmp, Qnil); + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + if (!rb_feature_p(ftptr, ext, Qfalse)) + *path = tmp; + return 's'; + } + } + } + else if ((ft = rb_feature_p(ftptr, 0, Qfalse)) == 'r') { + return 'r'; + } + tmp = fname; + type = rb_find_file_ext(&tmp, loadable_ext); + tmp = rb_file_expand_path(tmp, Qnil); + switch (type) { + case 0: + ftptr = RSTRING_PTR(tmp); + if (ft) + break; + return rb_feature_p(ftptr, 0, Qfalse); + + default: + if (ft) + break; + case 1: + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + if (rb_feature_p(ftptr, ext, !--type)) + break; + *path = tmp; + } + return type ? 's' : 'r'; +} + +static void +load_failed(VALUE fname) +{ + rb_raise(rb_eLoadError, "no such file to load -- %s", + RSTRING_PTR(fname)); +} + +VALUE +rb_require_safe(VALUE fname, int safe) +{ + VALUE result = Qnil; + volatile VALUE errinfo = GET_THREAD()->errinfo; + yarv_thread_t *th = GET_THREAD(); + int state; + char *volatile ftptr = 0; + + PUSH_TAG(PROT_NONE); + if ((state = EXEC_TAG()) == 0) { + VALUE path; + long handle; + int found; + + rb_set_safe_level_force(safe); + FilePathValue(fname); + *(volatile VALUE *)&fname = rb_str_new4(fname); + found = search_required(fname, &path); + if (found) { + if (!path || load_wait(RSTRING_PTR(path))) { + result = Qfalse; + } + else { + rb_set_safe_level_force(0); + switch (found) { + case 'r': + /* loading ruby library should be serialized. */ + if (!loading_tbl) { + loading_tbl = st_init_strtable(); + } + /* partial state */ + ftptr = ruby_strdup(RSTRING_PTR(path)); + st_insert(loading_tbl, (st_data_t) ftptr, + (st_data_t) GET_THREAD()->self); + rb_load(path, 0); + break; + + case 's': + ruby_current_node = 0; + ruby_sourcefile = rb_source_filename(RSTRING_PTR(path)); + ruby_sourceline = 0; + //SCOPE_SET(NOEX_PUBLIC); + handle = (long)dln_load(RSTRING_PTR(path)); + rb_ary_push(ruby_dln_librefs, LONG2NUM(handle)); + break; + } + rb_provide_feature(path); + result = Qtrue; + } + } + } + POP_TAG(); + + if (ftptr) { + if (st_delete(loading_tbl, (st_data_t *) & ftptr, 0)) { /* loading done */ + free(ftptr); + } + } + if (state) { + JUMP_TAG(state); + } + + if (NIL_P(result)) { + load_failed(fname); + } + + th->errinfo = errinfo; + + return result; +} + +VALUE +rb_require(const char *fname) +{ + VALUE fn = rb_str_new2(fname); + OBJ_FREEZE(fn); + return rb_require_safe(fn, rb_safe_level()); +} + +/* + * call-seq: + * mod.autoload(name, filename) => nil + * + * Registers _filename_ to be loaded (using <code>Kernel::require</code>) + * the first time that _module_ (which may be a <code>String</code> or + * a symbol) is accessed in the namespace of _mod_. + * + * module A + * end + * A.autoload(:B, "b") + * A::B.doit # autoloads "b" + */ + +static VALUE +rb_mod_autoload(VALUE mod, VALUE sym, VALUE file) +{ + ID id = rb_to_id(sym); + + Check_SafeStr(file); + rb_autoload(mod, id, RSTRING_PTR(file)); + return Qnil; +} + +/* + * MISSING: documentation + */ + +static VALUE +rb_mod_autoload_p(VALUE mod, VALUE sym) +{ + return rb_autoload_p(mod, rb_to_id(sym)); +} + +/* + * call-seq: + * autoload(module, filename) => nil + * + * Registers _filename_ to be loaded (using <code>Kernel::require</code>) + * the first time that _module_ (which may be a <code>String</code> or + * a symbol) is accessed. + * + * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb") + */ + +static VALUE +rb_f_autoload(VALUE obj, VALUE sym, VALUE file) +{ + VALUE klass = ruby_cbase(); + if (NIL_P(klass)) { + rb_raise(rb_eTypeError, "Can not set autoload on singleton class"); + } + return rb_mod_autoload(klass, sym, file); +} + +/* + * MISSING: documentation + */ + +static VALUE +rb_f_autoload_p(VALUE obj, VALUE sym) +{ + /* use ruby_cbase() as same as rb_f_autoload. */ + VALUE klass = ruby_cbase(); + if (NIL_P(klass)) { + return Qnil; + } + return rb_mod_autoload_p(klass, sym); +} + +void +Init_load() +{ + rb_load_path = rb_ary_new(); + rb_define_readonly_variable("$:", &rb_load_path); + rb_define_readonly_variable("$-I", &rb_load_path); + rb_define_readonly_variable("$LOAD_PATH", &rb_load_path); + + rb_features = rb_ary_new(); + rb_define_readonly_variable("$\"", &rb_features); + rb_define_readonly_variable("$LOADED_FEATURES", &rb_features); + + rb_define_global_function("load", rb_f_load, -1); + rb_define_global_function("require", rb_f_require, 1); + rb_define_method(rb_cModule, "autoload", rb_mod_autoload, 2); + rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1); + rb_define_global_function("autoload", rb_f_autoload, 2); + rb_define_global_function("autoload?", rb_f_autoload_p, 1); + + ruby_dln_librefs = rb_ary_new(); + rb_register_mark_object(ruby_dln_librefs); +} diff --git a/eval_method.h b/eval_method.h new file mode 100644 index 0000000000..59e7cef8dc --- /dev/null +++ b/eval_method.h @@ -0,0 +1,612 @@ +/* + * This file is included by eval.c + */ + +#define CACHE_SIZE 0x800 +#define CACHE_MASK 0x7ff +#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK) + +struct cache_entry { /* method hash table. */ + ID mid; /* method's id */ + ID mid0; /* method's original id */ + VALUE klass; /* receiver's class */ + NODE *method; +}; + +static struct cache_entry cache[CACHE_SIZE]; +static int ruby_running = 0; + +void +rb_clear_cache(void) +{ + struct cache_entry *ent, *end; + + rb_vm_change_state(); + + if (!ruby_running) + return; + ent = cache; + end = ent + CACHE_SIZE; + while (ent < end) { + ent->mid = 0; + ent++; + } +} + +static void +rb_clear_cache_for_undef(VALUE klass, ID id) +{ + struct cache_entry *ent, *end; + + rb_vm_change_state(); + + if (!ruby_running) + return; + ent = cache; + end = ent + CACHE_SIZE; + while (ent < end) { + if (ent->method && ent->method->nd_clss == klass && ent->mid == id) { + ent->mid = 0; + } + ent++; + } +} + +static void +rb_clear_cache_by_id(ID id) +{ + struct cache_entry *ent, *end; + + rb_vm_change_state(); + + if (!ruby_running) + return; + ent = cache; + end = ent + CACHE_SIZE; + while (ent < end) { + if (ent->mid == id) { + ent->mid = 0; + } + ent++; + } +} + +void +rb_clear_cache_by_class(VALUE klass) +{ + struct cache_entry *ent, *end; + + rb_vm_change_state(); + + if (!ruby_running) + return; + ent = cache; + end = ent + CACHE_SIZE; + while (ent < end) { + if ((ent->klass == klass) || + (ent->method && ent->method->nd_clss == klass)) { + ent->mid = 0; + } + ent++; + } +} + +void +rb_add_method(VALUE klass, ID mid, NODE * node, int noex) +{ + NODE *body; + + if (NIL_P(klass)) { + klass = rb_cObject; + } + if (rb_safe_level() >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) { + rb_raise(rb_eSecurityError, "Insecure: can't define method"); + } + if (!FL_TEST(klass, FL_SINGLETON) && + node && nd_type(node) != NODE_ZSUPER && + (mid == rb_intern("initialize") || mid == rb_intern("initialize_copy"))) { + noex = NOEX_PRIVATE | noex; + } + else if (FL_TEST(klass, FL_SINGLETON) && node + && nd_type(node) == NODE_CFUNC && mid == rb_intern("allocate")) { + rb_warn + ("defining %s.allocate is deprecated; use rb_define_alloc_func()", + rb_class2name(rb_iv_get(klass, "__attached__"))); + mid = ID_ALLOCATOR; + } + if (OBJ_FROZEN(klass)) { + rb_error_frozen("class/module"); + } + rb_clear_cache_by_id(mid); + + /* + * NODE_METHOD (NEW_METHOD(body, klass, vis)): + * nd_body : method body // (2) // mark + * nd_clss : klass // (1) // mark + * nd_noex : visibility // (3) + * + * NODE_FBODY (NEW_FBODY(method, alias)): + * nd_body : method (NODE_METHOD) // (2) // mark + * nd_oid : original id // (1) + * nd_cnt : alias count // (3) + */ + if (node) { + body = NEW_FBODY(NEW_METHOD(node, klass, noex), 0); + } + else { + body = 0; + } + + { + /* check re-definition */ + NODE *old_node; + + if (st_lookup(RCLASS(klass)->m_tbl, mid, (st_data_t *)&old_node)) { + if (old_node) { + if (nd_type(old_node->nd_body->nd_body) == NODE_CFUNC) { + yarv_check_redefinition_opt_method(old_node); + } + } + if (klass == rb_cObject && node->nd_mid == init) { + rb_warn("redefining Object#initialize may cause infinite loop"); + } + if (RTEST(ruby_verbose) && old_node->nd_cnt == 0 && old_node->nd_body) { + rb_warning("method redefined; discarding old %s", rb_id2name(mid)); + } + } + + if (mid == object_id || mid == __send || mid == __send_bang) { + if (node && nd_type(node) == YARV_METHOD_NODE) { + rb_warn("redefining `%s' may cause serious problem", + rb_id2name(mid)); + } + } + } + + st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t) body); + + if (node && mid != ID_ALLOCATOR && ruby_running) { + if (FL_TEST(klass, FL_SINGLETON)) { + rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, + ID2SYM(mid)); + } + else { + rb_funcall(klass, added, 1, ID2SYM(mid)); + } + } +} + +void +rb_define_alloc_func(VALUE klass, VALUE (*func) _((VALUE))) +{ + Check_Type(klass, T_CLASS); + rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), + NOEX_PRIVATE); +} + +void +rb_undef_alloc_func(VALUE klass) +{ + Check_Type(klass, T_CLASS); + rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, 0, NOEX_UNDEF); +} + +static NODE * +search_method(VALUE klass, ID id, VALUE *klassp) +{ + NODE *body; + + if (!klass) { + return 0; + } + + while (!st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *) & body)) { + klass = RCLASS(klass)->super; + if (!klass) + return 0; + } + + if (klassp) { + *klassp = klass; + } + + return body; +} + +/* + * search method body (NODE_METHOD) + * with : klass and id + * without : method cache + * + * if you need method node with method cache, use + * rb_method_node() + */ +NODE * +rb_get_method_body(VALUE klass, ID id, ID *idp) +{ + NODE *volatile fbody, *body; + NODE *method; + + if ((fbody = search_method(klass, id, 0)) == 0 || !fbody->nd_body) { + /* store empty info in cache */ + struct cache_entry *ent; + ent = cache + EXPR1(klass, id); + ent->klass = klass; + ent->mid = ent->mid0 = id; + ent->method = 0; + return 0; + } + + method = fbody->nd_body; + + if (ruby_running) { + /* store in cache */ + struct cache_entry *ent; + ent = cache + EXPR1(klass, id); + ent->klass = klass; + ent->mid = id; + ent->mid0 = fbody->nd_oid; + ent->method = body = method; + } + else { + body = method; + } + + if (idp) { + *idp = fbody->nd_oid; + } + + return body; +} + +NODE * +rb_method_node(VALUE klass, ID id) +{ + struct cache_entry *ent; + + ent = cache + EXPR1(klass, id); + if (ent->mid == id && ent->klass == klass && ent->method) { + return ent->method; + } + + return rb_get_method_body(klass, id, 0); +} + +static void +remove_method(VALUE klass, ID mid) +{ + NODE *body; + + if (klass == rb_cObject) { + rb_secure(4); + } + if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass)) { + rb_raise(rb_eSecurityError, "Insecure: can't remove method"); + } + if (OBJ_FROZEN(klass)) + rb_error_frozen("class/module"); + if (mid == object_id || mid == __send || mid == __send_bang || mid == init) { + rb_warn("removing `%s' may cause serious problem", rb_id2name(mid)); + } + if (!st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *) & body) || + !body->nd_body) { + rb_name_error(mid, "method `%s' not defined in %s", + rb_id2name(mid), rb_class2name(klass)); + } + rb_clear_cache_for_undef(klass, mid); + if (FL_TEST(klass, FL_SINGLETON)) { + rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, + ID2SYM(mid)); + } + else { + rb_funcall(klass, removed, 1, ID2SYM(mid)); + } +} + +void +rb_remove_method(VALUE klass, const char *name) +{ + remove_method(klass, rb_intern(name)); +} + +/* + * call-seq: + * remove_method(symbol) => self + * + * Removes the method identified by _symbol_ from the current + * class. For an example, see <code>Module.undef_method</code>. + */ + +static VALUE +rb_mod_remove_method(int argc, VALUE *argv, VALUE mod) +{ + int i; + + for (i = 0; i < argc; i++) { + remove_method(mod, rb_to_id(argv[i])); + } + return mod; +} + +#undef rb_disable_super +#undef rb_enable_super + +void +rb_disable_super(VALUE klass, const char *name) +{ + /* obsolete - no use */ +} + +void +rb_enable_super(VALUE klass, const char *name) +{ + rb_warning("rb_enable_super() is obsolete"); +} + +static void +rb_export_method(VALUE klass, ID name, ID noex) +{ + NODE *fbody; + VALUE origin; + + if (klass == rb_cObject) { + rb_secure(4); + } + fbody = search_method(klass, name, &origin); + if (!fbody && TYPE(klass) == T_MODULE) { + fbody = search_method(rb_cObject, name, &origin); + } + if (!fbody || !fbody->nd_body) { + print_undef(klass, name); + } + if (fbody->nd_body->nd_noex != noex) { + if (klass == origin) { + fbody->nd_body->nd_noex = noex; + } + else { + rb_add_method(klass, name, NEW_ZSUPER(), noex); + } + } +} + +int +rb_method_boundp(VALUE klass, ID id, int ex) +{ + NODE *method; + + if ((method = rb_method_node(klass, id)) != 0) { + if (ex && (method->nd_noex & NOEX_PRIVATE)) { + return Qfalse; + } + return Qtrue; + } + return Qfalse; +} + +void +rb_attr(VALUE klass, ID id, int read, int write, int ex) +{ + const char *name; + char *buf; + ID attriv; + int noex; + size_t len; + + if (!ex) { + noex = NOEX_PUBLIC; + } + else { + if (SCOPE_TEST(NOEX_PRIVATE)) { + noex = NOEX_PRIVATE; + rb_warning((SCOPE_CHECK(NOEX_MODFUNC)) ? + "attribute accessor as module_function" : + "private attribute?"); + } + else if (SCOPE_TEST(NOEX_PROTECTED)) { + noex = NOEX_PROTECTED; + } + else { + noex = NOEX_PUBLIC; + } + } + + if (!rb_is_local_id(id) && !rb_is_const_id(id)) { + rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id)); + } + name = rb_id2name(id); + if (!name) { + rb_raise(rb_eArgError, "argument needs to be symbol or string"); + } + len = strlen(name) + 2; + buf = ALLOCA_N(char, len); + snprintf(buf, len, "@%s", name); + attriv = rb_intern(buf); + if (read) { + rb_add_method(klass, id, NEW_IVAR(attriv), noex); + } + if (write) { + rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex); + } +} + +void +rb_undef(VALUE klass, ID id) +{ + VALUE origin; + NODE *body; + + if (ruby_cbase() == rb_cObject && klass == rb_cObject) { + rb_secure(4); + } + if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass)) { + rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", + rb_id2name(id)); + } + rb_frozen_class_p(klass); + if (id == object_id || id == __send || id == __send_bang || id == init) { + rb_warn("undefining `%s' may cause serious problem", rb_id2name(id)); + } + body = search_method(klass, id, &origin); + if (!body || !body->nd_body) { + char *s0 = " class"; + VALUE c = klass; + + if (FL_TEST(c, FL_SINGLETON)) { + VALUE obj = rb_iv_get(klass, "__attached__"); + + switch (TYPE(obj)) { + case T_MODULE: + case T_CLASS: + c = obj; + s0 = ""; + } + } + else if (TYPE(c) == T_MODULE) { + s0 = " module"; + } + rb_name_error(id, "undefined method `%s' for%s `%s'", + rb_id2name(id), s0, rb_class2name(c)); + } + + rb_add_method(klass, id, 0, NOEX_PUBLIC); + + if (FL_TEST(klass, FL_SINGLETON)) { + rb_funcall(rb_iv_get(klass, "__attached__"), + singleton_undefined, 1, ID2SYM(id)); + } + else { + rb_funcall(klass, undefined, 1, ID2SYM(id)); + } +} + +/* + * call-seq: + * undef_method(symbol) => self + * + * Prevents the current class from responding to calls to the named + * method. Contrast this with <code>remove_method</code>, which deletes + * the method from the particular class; Ruby will still search + * superclasses and mixed-in modules for a possible receiver. + * + * class Parent + * def hello + * puts "In parent" + * end + * end + * class Child < Parent + * def hello + * puts "In child" + * end + * end + * + * + * c = Child.new + * c.hello + * + * + * class Child + * remove_method :hello # remove from child, still in parent + * end + * c.hello + * + * + * class Child + * undef_method :hello # prevent any calls to 'hello' + * end + * c.hello + * + * <em>produces:</em> + * + * In child + * In parent + * prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError) + */ + +static VALUE +rb_mod_undef_method(int argc, VALUE *argv, VALUE mod) +{ + int i; + for (i = 0; i < argc; i++) { + rb_undef(mod, rb_to_id(argv[i])); + } + return mod; +} + +void +rb_alias(VALUE klass, ID name, ID def) +{ + NODE *orig_fbody, *node; + VALUE singleton = 0; + + rb_frozen_class_p(klass); + if (name == def) + return; + if (klass == rb_cObject) { + rb_secure(4); + } + orig_fbody = search_method(klass, def, 0); + if (!orig_fbody || !orig_fbody->nd_body) { + if (TYPE(klass) == T_MODULE) { + orig_fbody = search_method(rb_cObject, def, 0); + } + } + if (!orig_fbody || !orig_fbody->nd_body) { + print_undef(klass, def); + } + if (FL_TEST(klass, FL_SINGLETON)) { + singleton = rb_iv_get(klass, "__attached__"); + } + + orig_fbody->nd_cnt++; + + if (RTEST(ruby_verbose) && + st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *) & node)) { + if (node->nd_cnt == 0 && node->nd_body) { + rb_warning("discarding old %s", rb_id2name(name)); + } + } + + st_insert(RCLASS(klass)->m_tbl, name, + (st_data_t) NEW_FBODY( + NEW_METHOD(orig_fbody->nd_body->nd_body, + orig_fbody->nd_body->nd_clss, + orig_fbody->nd_body->nd_noex), def)); + + rb_clear_cache_by_id(name); + + if (singleton) { + rb_funcall(singleton, singleton_added, 1, ID2SYM(name)); + } + else { + rb_funcall(klass, added, 1, ID2SYM(name)); + } +} + +/* + * call-seq: + * alias_method(new_name, old_name) => self + * + * Makes <i>new_name</i> a new copy of the method <i>old_name</i>. This can + * be used to retain access to methods that are overridden. + * + * module Mod + * alias_method :orig_exit, :exit + * def exit(code=0) + * puts "Exiting with code #{code}" + * orig_exit(code) + * end + * end + * include Mod + * exit(99) + * + * <em>produces:</em> + * + * Exiting with code 99 + */ + +static VALUE +rb_mod_alias_method(VALUE mod, VALUE newname, VALUE oldname) +{ + rb_alias(mod, rb_to_id(newname), rb_to_id(oldname)); + return mod; +} diff --git a/eval_proc.c b/eval_proc.c new file mode 100644 index 0000000000..3ff3e3b1de --- /dev/null +++ b/eval_proc.c @@ -0,0 +1,1195 @@ +/* + Proc, Method, Binding from eval.c + */ + +#include "eval_intern.h" + +struct METHOD { + VALUE klass, rklass; + VALUE recv; + ID id, oid; + NODE *body; +}; + +VALUE rb_cUnboundMethod; +VALUE rb_cMethod; + +static VALUE bmcall(VALUE, VALUE); +static int method_arity(VALUE); +static VALUE rb_obj_is_method(VALUE m); + +/* + * MISSING: documentation + */ + +/* + * MISSING: documentation + */ + +/* + * call-seq: + * binding -> a_binding + * + * Returns a +Binding+ object, describing the variable and + * method bindings at the point of call. This object can be used when + * calling +eval+ to execute the evaluated command in this + * environment. Also see the description of class +Binding+. + * + * def getBinding(param) + * return binding + * end + * b = getBinding("hello") + * eval("param", b) #=> "hello" + */ + +VALUE yarv_binding_alloc(VALUE klass); + +VALUE +rb_f_binding(VALUE self) +{ + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th_get_ruby_level_cfp(th, th->cfp); + VALUE bindval = yarv_binding_alloc(cYarvBinding); + yarv_binding_t *bind; + + GetBindingPtr(bindval, bind); + bind->env = th_make_env_object(th, cfp); + bind->cref_stack = ruby_cref(); + return bindval; +} + +/* + * call-seq: + * binding.eval(string [, filename [,lineno]]) => obj + * + * Evaluates the Ruby expression(s) in <em>string</em>, in the + * <em>binding</em>'s context. If the optional <em>filename</em> and + * <em>lineno</em> parameters are present, they will be used when + * reporting syntax errors. + * + * def getBinding(param) + * return binding + * end + * b = getBinding("hello") + * b.eval("param") #=> "hello" + */ + +static VALUE +bind_eval(int argc, VALUE *argv, VALUE bind) +{ + UNSUPPORTED(bind_eval); + return Qnil; +} + +#define PROC_TSHIFT (FL_USHIFT+1) +#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3) +#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT) +#define PROC_NOSAFE FL_USER4 + +#define SAFE_LEVEL_MAX PROC_TMASK + +static VALUE +proc_alloc(VALUE klass, int is_lambda) +{ + VALUE procval = Qnil; + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th->cfp; + yarv_block_t *block; + + if ((GC_GUARDED_PTR_REF(cfp->lfp[0])) != 0 && + !YARV_CLASS_SPECIAL_P(cfp->lfp[0])) { + block = GC_GUARDED_PTR_REF(cfp->lfp[0]); + } + else { + cfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); + if ((GC_GUARDED_PTR_REF(cfp->lfp[0])) != 0 && + !YARV_CLASS_SPECIAL_P(cfp->lfp[0])) { + block = GC_GUARDED_PTR_REF(cfp->lfp[0]); + + if (is_lambda) { + rb_warn("tried to create Proc object without a block"); + } + } + else { + rb_raise(rb_eArgError, + "tried to create Proc object without a block"); + } + } + + cfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); + procval = th_make_proc(th, cfp, block); + + if (is_lambda) { + yarv_proc_t *proc; + GetProcPtr(procval, proc); + proc->is_lambda = Qtrue; + } + return procval; +} + +/* + * call-seq: + * Proc.new {|...| block } => a_proc + * Proc.new => a_proc + * + * Creates a new <code>Proc</code> object, bound to the current + * context. <code>Proc::new</code> may be called without a block only + * within a method with an attached block, in which case that block is + * converted to the <code>Proc</code> object. + * + * def proc_from + * Proc.new + * end + * proc = proc_from { "hello" } + * proc.call #=> "hello" + */ + +VALUE +rb_proc_s_new(VALUE klass) +{ + return proc_alloc(klass, Qfalse); +} + +/* + * call-seq: + * proc { |...| block } => a_proc + * + * Equivalent to <code>Proc.new</code>. + */ + +VALUE +rb_block_proc(void) +{ + return proc_alloc(rb_cProc, Qfalse); +} + +VALUE +rb_block_lambda(void) +{ + return proc_alloc(rb_cProc, Qtrue); +} + +VALUE +rb_f_lambda(void) +{ + rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead"); + return proc_alloc(rb_cProc, Qtrue); +} + +/* + * call-seq: + * lambda { |...| block } => a_proc + * + * Equivalent to <code>Proc.new</code>, except the resulting Proc objects + * check the number of parameters passed when called. + */ + +static VALUE +proc_lambda(void) +{ + return proc_alloc(rb_cProc, Qtrue); +} + +VALUE +proc_invoke(VALUE self, VALUE args, VALUE alt_self, VALUE alt_klass) +{ + yarv_proc_t *proc; + GetProcPtr(self, proc); + + /* ignore self and klass */ + return th_invoke_proc(GET_THREAD(), proc, proc->block.self, + RARRAY_LEN(args), RARRAY_PTR(args)); +} + +/* CHECKME: are the argument checking semantics correct? */ + +/* + * call-seq: + * prc.call(params,...) => obj + * prc[params,...] => obj + * + * Invokes the block, setting the block's parameters to the values in + * <i>params</i> using something close to method calling semantics. + * Generates a warning if multiple values are passed to a proc that + * expects just one (previously this silently converted the parameters + * to an array). + * + * For procs created using <code>Kernel.proc</code>, generates an + * error if the wrong number of parameters + * are passed to a proc with multiple parameters. For procs created using + * <code>Proc.new</code>, extra parameters are silently discarded. + * + * Returns the value of the last expression evaluated in the block. See + * also <code>Proc#yield</code>. + * + * a_proc = Proc.new {|a, *b| b.collect {|i| i*a }} + * a_proc.call(9, 1, 2, 3) #=> [9, 18, 27] + * a_proc[9, 1, 2, 3] #=> [9, 18, 27] + * a_proc = Proc.new {|a,b| a} + * a_proc.call(1,2,3) + * + * <em>produces:</em> + * + * prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError) + * from prog.rb:4:in `call' + * from prog.rb:5 + */ + +VALUE +rb_proc_call(VALUE proc, VALUE args) +{ + return proc_invoke(proc, args, Qundef, 0); +} + +/* + * call-seq: + * prc.arity -> fixnum + * + * Returns the number of arguments that would not be ignored. If the block + * is declared to take no arguments, returns 0. If the block is known + * to take exactly n arguments, returns n. If the block has optional + * arguments, return -n-1, where n is the number of mandatory + * arguments. A <code>proc</code> with no argument declarations + * is the same a block declaring <code>||</code> as its arguments. + * + * Proc.new {}.arity #=> 0 + * Proc.new {||}.arity #=> 0 + * Proc.new {|a|}.arity #=> 1 + * Proc.new {|a,b|}.arity #=> 2 + * Proc.new {|a,b,c|}.arity #=> 3 + * Proc.new {|*a|}.arity #=> -1 + * Proc.new {|a,*b|}.arity #=> -2 + */ + +/* + * call-seq: + * prc == other_proc => true or false + * + * Return <code>true</code> if <i>prc</i> is the same object as + * <i>other_proc</i>, or if they are both procs with the same body. + */ + + +/* + * call-seq: + * prc.hash => integer + * + * Return hash value corresponding to proc body. + */ + + +/* + * call-seq: + * prc.to_s => string + * + * Shows the unique identifier for this proc, along with + * an indication of where the proc was defined. + */ + +/* + * call-seq: + * prc.to_proc -> prc + * + * Part of the protocol for converting objects to <code>Proc</code> + * objects. Instances of class <code>Proc</code> simply return + * themselves. + */ + +/* + * call-seq: + * prc.binding => binding + * + * Returns the binding associated with <i>prc</i>. Note that + * <code>Kernel#eval</code> accepts either a <code>Proc</code> or a + * <code>Binding</code> object as its second parameter. + * + * def fred(param) + * proc {} + * end + * + * b = fred(99) + * eval("param", b.binding) #=> 99 + * eval("param", b) #=> 99 + */ + +void +bm_mark(struct METHOD *data) +{ + rb_gc_mark(data->rklass); + rb_gc_mark(data->klass); + rb_gc_mark(data->recv); + rb_gc_mark((VALUE)data->body); +} + +NODE *rb_get_method_body(VALUE klass, ID id, ID *idp); + +static VALUE +mnew(VALUE klass, VALUE obj, ID id, VALUE mklass) +{ + VALUE method; + NODE *body; + struct METHOD *data; + VALUE rklass = klass; + ID oid = id; + + again: + if ((body = rb_get_method_body(klass, id, 0)) == 0) { + print_undef(rklass, oid); + } + + klass = body->nd_clss; + body = body->nd_body; + + if (nd_type(body) == NODE_ZSUPER) { + klass = RCLASS(klass)->super; + goto again; + } + + while (rklass != klass && + (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) { + rklass = RCLASS(rklass)->super; + } + if (TYPE(klass) == T_ICLASS) + klass = RBASIC(klass)->klass; + method = Data_Make_Struct(mklass, struct METHOD, bm_mark, -1, data); + data->klass = klass; + data->recv = obj; + + data->id = id; + data->body = body; + data->rklass = rklass; + data->oid = oid; + OBJ_INFECT(method, klass); + + return method; +} + + +/********************************************************************** + * + * Document-class : Method + * + * Method objects are created by <code>Object#method</code>, and are + * associated with a particular object (not just with a class). They + * may be used to invoke the method within the object, and as a block + * associated with an iterator. They may also be unbound from one + * object (creating an <code>UnboundMethod</code>) and bound to + * another. + * + * class Thing + * def square(n) + * n*n + * end + * end + * thing = Thing.new + * meth = thing.method(:square) + * + * meth.call(9) #=> 81 + * [ 1, 2, 3 ].collect(&meth) #=> [1, 4, 9] + * + */ + +/* + * call-seq: + * meth == other_meth => true or false + * + * Two method objects are equal if that are bound to the same + * object and contain the same body. + */ + + +static VALUE +method_eq(method, other) + VALUE method, other; +{ + struct METHOD *m1, *m2; + + if (TYPE(other) != T_DATA + || RDATA(other)->dmark != (RUBY_DATA_FUNC) bm_mark) + return Qfalse; + if (CLASS_OF(method) != CLASS_OF(other)) + return Qfalse; + + Data_Get_Struct(method, struct METHOD, m1); + Data_Get_Struct(other, struct METHOD, m2); + + if (m1->klass != m2->klass || m1->rklass != m2->rklass || + m1->recv != m2->recv || m1->body != m2->body) + return Qfalse; + + return Qtrue; +} + +/* + * call-seq: + * meth.hash => integer + * + * Return a hash value corresponding to the method object. + */ + +static VALUE +method_hash(method) + VALUE method; +{ + struct METHOD *m; + long hash; + + Data_Get_Struct(method, struct METHOD, m); + hash = (long)m->klass; + hash ^= (long)m->rklass; + hash ^= (long)m->recv; + hash ^= (long)m->body; + + return INT2FIX(hash); +} + +/* + * call-seq: + * meth.unbind => unbound_method + * + * Dissociates <i>meth</i> from it's current receiver. The resulting + * <code>UnboundMethod</code> can subsequently be bound to a new object + * of the same class (see <code>UnboundMethod</code>). + */ + +static VALUE +method_unbind(obj) + VALUE obj; +{ + VALUE method; + struct METHOD *orig, *data; + + Data_Get_Struct(obj, struct METHOD, orig); + method = + Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, + data); + data->klass = orig->klass; + data->recv = Qundef; + data->id = orig->id; + data->body = orig->body; + data->rklass = orig->rklass; + data->oid = orig->oid; + OBJ_INFECT(method, obj); + + return method; +} + +/* + * call-seq: + * obj.method(sym) => method + * + * Looks up the named method as a receiver in <i>obj</i>, returning a + * <code>Method</code> object (or raising <code>NameError</code>). The + * <code>Method</code> object acts as a closure in <i>obj</i>'s object + * instance, so instance variables and the value of <code>self</code> + * remain available. + * + * class Demo + * def initialize(n) + * @iv = n + * end + * def hello() + * "Hello, @iv = #{@iv}" + * end + * end + * + * k = Demo.new(99) + * m = k.method(:hello) + * m.call #=> "Hello, @iv = 99" + * + * l = Demo.new('Fred') + * m = l.method("hello") + * m.call #=> "Hello, @iv = Fred" + */ + +VALUE +rb_obj_method(obj, vid) + VALUE obj; + VALUE vid; +{ + return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod); +} + +/* + * call-seq: + * mod.instance_method(symbol) => unbound_method + * + * Returns an +UnboundMethod+ representing the given + * instance method in _mod_. + * + * class Interpreter + * def do_a() print "there, "; end + * def do_d() print "Hello "; end + * def do_e() print "!\n"; end + * def do_v() print "Dave"; end + * Dispatcher = { + * ?a => instance_method(:do_a), + * ?d => instance_method(:do_d), + * ?e => instance_method(:do_e), + * ?v => instance_method(:do_v) + * } + * def interpret(string) + * string.each_byte {|b| Dispatcher[b].bind(self).call } + * end + * end + * + * + * interpreter = Interpreter.new + * interpreter.interpret('dave') + * + * <em>produces:</em> + * + * Hello there, Dave! + */ + +static VALUE +rb_mod_method(mod, vid) + VALUE mod; + VALUE vid; +{ + return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod); +} + +/* + * call-seq: + * define_method(symbol, method) => new_method + * define_method(symbol) { block } => proc + * + * Defines an instance method in the receiver. The _method_ + * parameter can be a +Proc+ or +Method+ object. + * If a block is specified, it is used as the method body. This block + * is evaluated using <code>instance_eval</code>, a point that is + * tricky to demonstrate because <code>define_method</code> is private. + * (This is why we resort to the +send+ hack in this example.) + * + * class A + * def fred + * puts "In Fred" + * end + * def create_method(name, &block) + * self.class.send(:define_method, name, &block) + * end + * define_method(:wilma) { puts "Charge it!" } + * end + * class B < A + * define_method(:barney, instance_method(:fred)) + * end + * a = B.new + * a.barney + * a.wilma + * a.create_method(:betty) { p self } + * a.betty + * + * <em>produces:</em> + * + * In Fred + * Charge it! + * #<B:0x401b39e8> + */ + +VALUE yarv_proc_dup(VALUE self); + +static VALUE +rb_mod_define_method(int argc, VALUE *argv, VALUE mod) +{ + ID id; + VALUE body; + NODE *node; + int noex = NOEX_PUBLIC; + + if (argc == 1) { + id = rb_to_id(argv[0]); + body = rb_block_lambda(); + } + else if (argc == 2) { + id = rb_to_id(argv[0]); + body = argv[1]; + if (!rb_obj_is_method(body) && !yarv_obj_is_proc(body)) { + rb_raise(rb_eTypeError, + "wrong argument type %s (expected Proc/Method)", + rb_obj_classname(body)); + } + } + else { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); + } + + if (RDATA(body)->dmark == (RUBY_DATA_FUNC) bm_mark) { + struct METHOD *method = (struct METHOD *)DATA_PTR(body); + VALUE rklass = method->rklass; + if (rklass != mod) { + if (FL_TEST(rklass, FL_SINGLETON)) { + rb_raise(rb_eTypeError, + "can't bind singleton method to a different class"); + } + if (!RTEST(rb_class_inherited_p(mod, rklass))) { + rb_raise(rb_eTypeError, + "bind argument must be a subclass of %s", + rb_class2name(rklass)); + } + } + node = method->body; + } + else if (yarv_obj_is_proc(body)) { + yarv_proc_t *proc; + body = yarv_proc_dup(body); + GetProcPtr(body, proc); + if (BUILTIN_TYPE(proc->block.iseq) != T_NODE) { + proc->block.iseq->defined_method_id = id; + proc->block.iseq->klass = mod; + proc->is_lambda = Qtrue; + } + node = NEW_BMETHOD(body); + } + else { + /* type error */ + rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)"); + } + + /* TODO: visibility */ + + rb_add_method(mod, id, node, noex); + return body; +} + + +/* + * MISSING: documentation + */ + +static VALUE +method_clone(self) + VALUE self; +{ + VALUE clone; + struct METHOD *orig, *data; + + Data_Get_Struct(self, struct METHOD, orig); + clone = + Data_Make_Struct(CLASS_OF(self), struct METHOD, bm_mark, free, data); + CLONESETUP(clone, self); + *data = *orig; + + return clone; +} + +/* + * call-seq: + * meth.call(args, ...) => obj + * meth[args, ...] => obj + * + * Invokes the <i>meth</i> with the specified arguments, returning the + * method's return value. + * + * m = 12.method("+") + * m.call(3) #=> 15 + * m.call(20) #=> 32 + */ + +VALUE +rb_method_call(int argc, VALUE *argv, VALUE method) +{ + VALUE result = Qnil; /* OK */ + struct METHOD *data; + int state; + volatile int safe = -1; + + Data_Get_Struct(method, struct METHOD, data); + if (data->recv == Qundef) { + rb_raise(rb_eTypeError, "can't call unbound method; bind first"); + } + PUSH_TAG(PROT_NONE); + if (OBJ_TAINTED(method)) { + safe = rb_safe_level(); + if (rb_safe_level() < 4) { + rb_set_safe_level_force(4); + } + } + if ((state = EXEC_TAG()) == 0) { + PASS_PASSED_BLOCK(); + result = th_call0(GET_THREAD(), + data->klass, data->recv, data->id, data->oid, + argc, argv, data->body, 0); + } + POP_TAG(); + if (safe >= 0) + rb_set_safe_level_force(safe); + if (state) + JUMP_TAG(state); + return result; +} + +/********************************************************************** + * + * Document-class: UnboundMethod + * + * Ruby supports two forms of objectified methods. Class + * <code>Method</code> is used to represent methods that are associated + * with a particular object: these method objects are bound to that + * object. Bound method objects for an object can be created using + * <code>Object#method</code>. + * + * Ruby also supports unbound methods; methods objects that are not + * associated with a particular object. These can be created either by + * calling <code>Module#instance_method</code> or by calling + * <code>unbind</code> on a bound method object. The result of both of + * these is an <code>UnboundMethod</code> object. + * + * Unbound methods can only be called after they are bound to an + * object. That object must be be a kind_of? the method's original + * class. + * + * class Square + * def area + * @side * @side + * end + * def initialize(side) + * @side = side + * end + * end + * + * area_un = Square.instance_method(:area) + * + * s = Square.new(12) + * area = area_un.bind(s) + * area.call #=> 144 + * + * Unbound methods are a reference to the method at the time it was + * objectified: subsequent changes to the underlying class will not + * affect the unbound method. + * + * class Test + * def test + * :original + * end + * end + * um = Test.instance_method(:test) + * class Test + * def test + * :modified + * end + * end + * t = Test.new + * t.test #=> :modified + * um.bind(t).call #=> :original + * + */ + +/* + * call-seq: + * umeth.bind(obj) -> method + * + * Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class + * from which <i>umeth</i> was obtained, + * <code>obj.kind_of?(Klass)</code> must be true. + * + * class A + * def test + * puts "In test, class = #{self.class}" + * end + * end + * class B < A + * end + * class C < B + * end + * + * + * um = B.instance_method(:test) + * bm = um.bind(C.new) + * bm.call + * bm = um.bind(B.new) + * bm.call + * bm = um.bind(A.new) + * bm.call + * + * <em>produces:</em> + * + * In test, class = C + * In test, class = B + * prog.rb:16:in `bind': bind argument must be an instance of B (TypeError) + * from prog.rb:16 + */ + +static VALUE +umethod_bind(method, recv) + VALUE method, recv; +{ + struct METHOD *data, *bound; + + Data_Get_Struct(method, struct METHOD, data); + if (data->rklass != CLASS_OF(recv)) { + if (FL_TEST(data->rklass, FL_SINGLETON)) { + rb_raise(rb_eTypeError, + "singleton method called for a different object"); + } + if (!rb_obj_is_kind_of(recv, data->rklass)) { + rb_raise(rb_eTypeError, "bind argument must be an instance of %s", + rb_class2name(data->rklass)); + } + } + + method = + Data_Make_Struct(rb_cMethod, struct METHOD, bm_mark, free, bound); + *bound = *data; + bound->recv = recv; + bound->rklass = CLASS_OF(recv); + + return method; +} + +int +rb_node_arity(NODE * body) +{ + int n; + + switch (nd_type(body)) { + case NODE_CFUNC: + if (body->nd_argc < 0) + return -1; + return body->nd_argc; + case NODE_ZSUPER: + return -1; + case NODE_ATTRSET: + return 1; + case NODE_IVAR: + return 0; + case NODE_BMETHOD: + return rb_proc_arity(body->nd_cval); + case NODE_SCOPE: + body = body->nd_next; /* skip NODE_SCOPE */ + if (nd_type(body) == NODE_BLOCK) + body = body->nd_head; + if (!body) + return 0; + n = body->nd_frml ? RARRAY_LEN(body->nd_frml) : 0; + if (body->nd_opt || body->nd_rest) + n = -n - 1; + return n; + case YARV_METHOD_NODE:{ + yarv_iseq_t *iseq; + GetISeqPtr((VALUE)body->nd_body, iseq); + if (iseq->arg_rest == 0 && iseq->arg_opts == 0) { + return iseq->argc; + } + else { + return -iseq->argc - 1; + } + } + default: + rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body)); + } +} + +/* + * call-seq: + * meth.arity => fixnum + * + * Returns an indication of the number of arguments accepted by a + * method. Returns a nonnegative integer for methods that take a fixed + * number of arguments. For Ruby methods that take a variable number of + * arguments, returns -n-1, where n is the number of required + * arguments. For methods written in C, returns -1 if the call takes a + * variable number of arguments. + * + * class C + * def one; end + * def two(a); end + * def three(*a); end + * def four(a, b); end + * def five(a, b, *c); end + * def six(a, b, *c, &d); end + * end + * c = C.new + * c.method(:one).arity #=> 0 + * c.method(:two).arity #=> 1 + * c.method(:three).arity #=> -1 + * c.method(:four).arity #=> 2 + * c.method(:five).arity #=> -3 + * c.method(:six).arity #=> -3 + * + * "cat".method(:size).arity #=> 0 + * "cat".method(:replace).arity #=> 1 + * "cat".method(:squeeze).arity #=> -1 + * "cat".method(:count).arity #=> -1 + */ + +static VALUE +method_arity_m(method) + VALUE method; +{ + int n = method_arity(method); + return INT2FIX(n); +} + +static int +method_arity(method) + VALUE method; +{ + struct METHOD *data; + + Data_Get_Struct(method, struct METHOD, data); + return rb_node_arity(data->body); +} + +int +rb_mod_method_arity(mod, id) + VALUE mod; + ID id; +{ + NODE *node = rb_method_node(mod, id); + return rb_node_arity(node); +} + +int +rb_obj_method_arity(obj, id) + VALUE obj; + ID id; +{ + return rb_mod_method_arity(CLASS_OF(obj), id); +} + +/* + * call-seq: + * meth.to_s => string + * meth.inspect => string + * + * Show the name of the underlying method. + * + * "cat".method(:count).inspect #=> "#<Method: String#count>" + */ + +static VALUE +method_inspect(VALUE method) +{ + struct METHOD *data; + VALUE str; + const char *s; + char *sharp = "#"; + + Data_Get_Struct(method, struct METHOD, data); + str = rb_str_buf_new2("#<"); + s = rb_obj_classname(method); + rb_str_buf_cat2(str, s); + rb_str_buf_cat2(str, ": "); + + if (FL_TEST(data->klass, FL_SINGLETON)) { + VALUE v = rb_iv_get(data->klass, "__attached__"); + + if (data->recv == Qundef) { + rb_str_buf_append(str, rb_inspect(data->klass)); + } + else if (data->recv == v) { + rb_str_buf_append(str, rb_inspect(v)); + sharp = "."; + } + else { + rb_str_buf_append(str, rb_inspect(data->recv)); + rb_str_buf_cat2(str, "("); + rb_str_buf_append(str, rb_inspect(v)); + rb_str_buf_cat2(str, ")"); + sharp = "."; + } + } + else { + rb_str_buf_cat2(str, rb_class2name(data->rklass)); + if (data->rklass != data->klass) { + rb_str_buf_cat2(str, "("); + rb_str_buf_cat2(str, rb_class2name(data->klass)); + rb_str_buf_cat2(str, ")"); + } + } + rb_str_buf_cat2(str, sharp); + rb_str_buf_cat2(str, rb_id2name(data->oid)); + rb_str_buf_cat2(str, ">"); + + return str; +} + +static VALUE +mproc(VALUE method) +{ + return rb_funcall(Qnil, rb_intern("proc"), 0); +} + +static VALUE +bmcall(VALUE args, VALUE method) +{ + volatile VALUE a; + if (CLASS_OF(args) != rb_cArray) { + args = rb_ary_new3(1, args); + } + + a = args; + return rb_method_call(RARRAY_LEN(a), RARRAY_PTR(a), method); +} + +/* + * call-seq: + * meth.to_proc => prc + * + * Returns a <code>Proc</code> object corresponding to this method. + */ + +static VALUE +method_proc(VALUE method) +{ + VALUE proc; + /* + * class Method + * def to_proc + * proc{|*args| + * self.call(*args) + * } + * end + * end + */ + proc = rb_iterate((VALUE (*)(VALUE))mproc, 0, bmcall, method); + return proc; +} + +static VALUE +rb_obj_is_method(VALUE m) +{ + if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC) bm_mark) { + return Qtrue; + } + return Qfalse; +} + +/* + * call_seq: + * local_jump_error.exit_value => obj + * + * Returns the exit value associated with this +LocalJumpError+. + */ +static VALUE +localjump_xvalue(VALUE exc) +{ + return rb_iv_get(exc, "@exit_value"); +} + +/* + * call-seq: + * local_jump_error.reason => symbol + * + * The reason this block was terminated: + * :break, :redo, :retry, :next, :return, or :noreason. + */ + +static VALUE +localjump_reason(VALUE exc) +{ + return rb_iv_get(exc, "@reason"); +} + + +/* + * <code>Proc</code> objects are blocks of code that have been bound to + * a set of local variables. Once bound, the code may be called in + * different contexts and still access those variables. + * + * def gen_times(factor) + * return Proc.new {|n| n*factor } + * end + * + * times3 = gen_times(3) + * times5 = gen_times(5) + * + * times3.call(12) #=> 36 + * times5.call(5) #=> 25 + * times3.call(times5.call(4)) #=> 60 + * + */ + +void +Init_Proc() +{ + rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError); + rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0); + rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0); + + exception_error = rb_exc_new2(rb_eFatal, "exception reentered"); + rb_register_mark_object(exception_error); + + rb_eSysStackError = rb_define_class("SystemStackError", rb_eException); + sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep"); + OBJ_TAINT(sysstack_error); + rb_register_mark_object(sysstack_error); + + rb_define_global_function("proc", rb_block_proc, 0); + rb_define_global_function("lambda", proc_lambda, 0); + + rb_cMethod = rb_define_class("Method", rb_cObject); + rb_undef_alloc_func(rb_cMethod); + rb_undef_method(CLASS_OF(rb_cMethod), "new"); + rb_define_method(rb_cMethod, "==", method_eq, 1); + rb_define_method(rb_cMethod, "eql?", method_eq, 1); + rb_define_method(rb_cMethod, "hash", method_hash, 0); + rb_define_method(rb_cMethod, "clone", method_clone, 0); + rb_define_method(rb_cMethod, "call", rb_method_call, -1); + rb_define_method(rb_cMethod, "[]", rb_method_call, -1); + rb_define_method(rb_cMethod, "arity", method_arity_m, 0); + rb_define_method(rb_cMethod, "inspect", method_inspect, 0); + rb_define_method(rb_cMethod, "to_s", method_inspect, 0); + rb_define_method(rb_cMethod, "to_proc", method_proc, 0); + rb_define_method(rb_cMethod, "unbind", method_unbind, 0); + rb_define_method(rb_mKernel, "method", rb_obj_method, 1); + + rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject); + rb_undef_alloc_func(rb_cUnboundMethod); + rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new"); + rb_define_method(rb_cUnboundMethod, "==", method_eq, 1); + rb_define_method(rb_cUnboundMethod, "eql?", method_eq, 1); + rb_define_method(rb_cUnboundMethod, "hash", method_hash, 0); + rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0); + rb_define_method(rb_cUnboundMethod, "arity", method_arity_m, 0); + rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0); + rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0); + rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1); + + rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1); + rb_define_private_method(rb_cModule, "define_method", + rb_mod_define_method, -1); + +} + +/* + * Objects of class <code>Binding</code> encapsulate the execution + * context at some particular place in the code and retain this context + * for future use. The variables, methods, value of <code>self</code>, + * and possibly an iterator block that can be accessed in this context + * are all retained. Binding objects can be created using + * <code>Kernel#binding</code>, and are made available to the callback + * of <code>Kernel#set_trace_func</code>. + * + * These binding objects can be passed as the second argument of the + * <code>Kernel#eval</code> method, establishing an environment for the + * evaluation. + * + * class Demo + * def initialize(n) + * @secret = n + * end + * def getBinding + * return binding() + * end + * end + * + * k1 = Demo.new(99) + * b1 = k1.getBinding + * k2 = Demo.new(-3) + * b2 = k2.getBinding + * + * eval("@secret", b1) #=> 99 + * eval("@secret", b2) #=> -3 + * eval("@secret") #=> nil + * + * Binding objects have no class-specific methods. + * + */ + +void +Init_Binding() +{ + +} diff --git a/eval_safe.h b/eval_safe.h new file mode 100644 index 0000000000..6748ca87fe --- /dev/null +++ b/eval_safe.h @@ -0,0 +1,117 @@ +/* + * This file is included by eval.c + */ + +/* safe-level: + 0 - strings from streams/environment/ARGV are tainted (default) + 1 - no dangerous operation by tainted value + 2 - process/file operations prohibited + 3 - all generated objects are tainted + 4 - no global (non-tainted) variable modification/no direct output +*/ + +int +rb_safe_level(void) +{ + return GET_THREAD()->safe_level; +} + +void +rb_set_safe_level_force(int safe) +{ + GET_THREAD()->safe_level = safe; +} + +static VALUE safe_getter _((void)); +static void safe_setter _((VALUE val)); + +#define PROC_TSHIFT (FL_USHIFT+1) +#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3) +#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT) +#define PROC_NOSAFE FL_USER4 + +#define SAFE_LEVEL_MAX PROC_TMASK + +/* $SAFE accessor */ +void +rb_set_safe_level(int level) +{ + yarv_thread_t *th = GET_THREAD(); + + if (level > th->safe_level) { + if (level > SAFE_LEVEL_MAX) { + level = SAFE_LEVEL_MAX; + } + th->safe_level = level; + } +} + +static VALUE +safe_getter(void) +{ + return INT2NUM(rb_safe_level()); +} + +static void +safe_setter(VALUE val) +{ + int level = NUM2INT(val); + yarv_thread_t *th = GET_THREAD(); + + if (level < th->safe_level) { + rb_raise(rb_eSecurityError, + "tried to downgrade safe level from %d to %d", + th->safe_level, level); + } + if (level > SAFE_LEVEL_MAX) { + level = SAFE_LEVEL_MAX; + } + th->safe_level = level; +} + +void +rb_secure(int level) +{ + if (level <= rb_safe_level()) { + if (rb_frame_callee()) { + rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d", + rb_id2name(rb_frame_callee()), rb_safe_level()); + } + else { + rb_raise(rb_eSecurityError, "Insecure operation at level %d", + rb_safe_level()); + } + } +} + +void +rb_secure_update(VALUE obj) +{ + if (!OBJ_TAINTED(obj)) + rb_secure(4); +} + +void +rb_check_safe_obj(VALUE x) +{ + if (rb_safe_level() > 0 && OBJ_TAINTED(x)) { + if (rb_frame_callee()) { + rb_raise(rb_eSecurityError, "Insecure operation - %s", + rb_id2name(rb_frame_callee())); + } + else { + rb_raise(rb_eSecurityError, "Insecure operation: -r"); + } + } + rb_secure(4); +} + +void +rb_check_safe_str(VALUE x) +{ + rb_check_safe_obj(x); + if (TYPE(x) != T_STRING) { + rb_raise(rb_eTypeError, "wrong argument type %s (expected String)", + rb_obj_classname(x)); + } +} diff --git a/eval_thread.c b/eval_thread.c new file mode 100644 index 0000000000..1d265d62bf --- /dev/null +++ b/eval_thread.c @@ -0,0 +1,683 @@ +/* + * Thread from eval.c + */ + +#include "eval_intern.h" + +#ifdef __ia64__ +#if defined(__FreeBSD__) +/* + * FreeBSD/ia64 currently does not have a way for a process to get the + * base address for the RSE backing store, so hardcode it. + */ +#define __libc_ia64_register_backing_store_base (4ULL<<61) +#else +#if defined(HAVE_UNWIND_H) && defined(HAVE__UNW_CREATECONTEXTFORSELF) +#include <unwind.h> +#else +#pragma weak __libc_ia64_register_backing_store_base +extern unsigned long __libc_ia64_register_backing_store_base; +#endif +#endif +#endif + +/* Windows SEH refers data on the stack. */ +#undef SAVE_WIN32_EXCEPTION_LIST +#if defined _WIN32 || defined __CYGWIN__ +#if defined __CYGWIN__ +typedef unsigned long DWORD; +#endif + +static inline DWORD +win32_get_exception_list() +{ + DWORD p; +# if defined _MSC_VER +# ifdef _M_IX86 +# define SAVE_WIN32_EXCEPTION_LIST +# if _MSC_VER >= 1310 + /* warning: unsafe assignment to fs:0 ... this is ok */ +# pragma warning(disable: 4733) +# endif + __asm mov eax, fs:[0]; + __asm mov p, eax; +# endif +# elif defined __GNUC__ +# ifdef __i386__ +# define SAVE_WIN32_EXCEPTION_LIST + __asm__("movl %%fs:0,%0":"=r"(p)); +# endif +# elif defined __BORLANDC__ +# define SAVE_WIN32_EXCEPTION_LIST + __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */ + p = _EAX; +# endif + return p; +} + +static inline void +win32_set_exception_list(p) + DWORD p; +{ +# if defined _MSC_VER +# ifdef _M_IX86 + __asm mov eax, p; + __asm mov fs:[0], eax; +# endif +# elif defined __GNUC__ +# ifdef __i386__ + __asm__("movl %0,%%fs:0"::"r"(p)); +# endif +# elif defined __BORLANDC__ + _EAX = p; + __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */ +# endif +} + +#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE +# error unsupported platform +#endif +#endif + +int rb_thread_pending = 0; + +VALUE rb_cThread; + +extern VALUE rb_last_status; + +#define WAIT_FD (1<<0) +#define WAIT_SELECT (1<<1) +#define WAIT_TIME (1<<2) +#define WAIT_JOIN (1<<3) +#define WAIT_PID (1<<4) + +/* +infty, for this purpose */ +#define DELAY_INFTY 1E30 + + +#ifdef NFDBITS +void +rb_fd_init(fds) + volatile rb_fdset_t *fds; +{ + fds->maxfd = 0; + fds->fdset = ALLOC(fd_set); + FD_ZERO(fds->fdset); +} + +void +rb_fd_term(fds) + rb_fdset_t *fds; +{ + if (fds->fdset) + free(fds->fdset); + fds->maxfd = 0; + fds->fdset = 0; +} + +void +rb_fd_zero(fds) + rb_fdset_t *fds; +{ + if (fds->fdset) { + MEMZERO(fds->fdset, fd_mask, howmany(fds->maxfd, NFDBITS)); + FD_ZERO(fds->fdset); + } +} + +static void +rb_fd_resize(n, fds) + int n; + rb_fdset_t *fds; +{ + int m = howmany(n + 1, NFDBITS) * sizeof(fd_mask); + int o = howmany(fds->maxfd, NFDBITS) * sizeof(fd_mask); + + if (m < sizeof(fd_set)) + m = sizeof(fd_set); + if (o < sizeof(fd_set)) + o = sizeof(fd_set); + + if (m > o) { + fds->fdset = realloc(fds->fdset, m); + memset((char *)fds->fdset + o, 0, m - o); + } + if (n >= fds->maxfd) + fds->maxfd = n + 1; +} + +void +rb_fd_set(n, fds) + int n; + rb_fdset_t *fds; +{ + rb_fd_resize(n, fds); + FD_SET(n, fds->fdset); +} + +void +rb_fd_clr(n, fds) + int n; + rb_fdset_t *fds; +{ + if (n >= fds->maxfd) + return; + FD_CLR(n, fds->fdset); +} + +int +rb_fd_isset(n, fds) + int n; + const rb_fdset_t *fds; +{ + if (n >= fds->maxfd) + return 0; + return FD_ISSET(n, fds->fdset); +} + +void +rb_fd_copy(dst, src, max) + rb_fdset_t *dst; + const fd_set *src; + int max; +{ + int size = howmany(max, NFDBITS) * sizeof(fd_mask); + + if (size < sizeof(fd_set)) + size = sizeof(fd_set); + dst->maxfd = max; + dst->fdset = realloc(dst->fdset, size); + memcpy(dst->fdset, src, size); +} + +int +rb_fd_select(n, readfds, writefds, exceptfds, timeout) + int n; + rb_fdset_t *readfds, *writefds, *exceptfds; + struct timeval *timeout; +{ + rb_fd_resize(n - 1, readfds); + rb_fd_resize(n - 1, writefds); + rb_fd_resize(n - 1, exceptfds); + return select(n, rb_fd_ptr(readfds), rb_fd_ptr(writefds), + rb_fd_ptr(exceptfds), timeout); +} + +#undef FD_ZERO +#undef FD_SET +#undef FD_CLR +#undef FD_ISSET + +#define FD_ZERO(f) rb_fd_zero(f) +#define FD_SET(i, f) rb_fd_set(i, f) +#define FD_CLR(i, f) rb_fd_clr(i, f) +#define FD_ISSET(i, f) rb_fd_isset(i, f) + +#endif + +/* typedef struct thread * rb_thread_t; */ + +struct thread { + /* obsolete */ + struct thread *next, *prev; + rb_jmpbuf_t context; +#ifdef SAVE_WIN32_EXCEPTION_LIST + DWORD win32_exception_list; +#endif + + VALUE result; + + long stk_len; + long stk_max; + VALUE *stk_ptr; + VALUE *stk_pos; +#ifdef __ia64__ + VALUE *bstr_ptr; + long bstr_len; +#endif + + struct FRAME *frame; + struct SCOPE *scope; + struct RVarmap *dyna_vars; + struct BLOCK *block; + struct iter *iter; + struct tag *tag; + VALUE klass; + VALUE wrapper; + NODE *cref; + struct ruby_env *anchor; + + int flags; /* misc. states (vmode/rb_trap_immediate/raised) */ + + NODE *node; + + int tracing; + VALUE errinfo; + VALUE last_status; + VALUE last_line; + VALUE last_match; + + int safe; + + enum yarv_thread_status status; + int wait_for; + int fd; + rb_fdset_t readfds; + rb_fdset_t writefds; + rb_fdset_t exceptfds; + int select_value; + double delay; + rb_thread_t join; + + int abort; + int priority; + VALUE thgroup; + + st_table *locals; + + VALUE thread; +}; + +#define THREAD_RAISED 0x200 /* temporary flag */ +#define THREAD_TERMINATING 0x400 /* persistent flag */ +#define THREAD_FLAGS_MASK 0x400 /* mask for persistent flags */ + +#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next; +#define END_FOREACH_FROM(f,x) } while (x != f) + +#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x) +#define END_FOREACH(x) END_FOREACH_FROM(curr_thread,x) + +struct thread_status_t { + NODE *node; + + int tracing; + VALUE errinfo; + VALUE last_status; + VALUE last_line; + VALUE last_match; + + int safe; + + enum yarv_thread_status status; + int wait_for; + int fd; + rb_fdset_t readfds; + rb_fdset_t writefds; + rb_fdset_t exceptfds; + int select_value; + double delay; + rb_thread_t join; +}; + +#define THREAD_COPY_STATUS(src, dst) (void)( \ + (dst)->node = (src)->node, \ + \ + (dst)->tracing = (src)->tracing, \ + (dst)->errinfo = (src)->errinfo, \ + (dst)->last_status = (src)->last_status, \ + (dst)->last_line = (src)->last_line, \ + (dst)->last_match = (src)->last_match, \ + \ + (dst)->safe = (src)->safe, \ + \ + (dst)->status = (src)->status, \ + (dst)->wait_for = (src)->wait_for, \ + (dst)->fd = (src)->fd, \ + (dst)->readfds = (src)->readfds, \ + (dst)->writefds = (src)->writefds, \ + (dst)->exceptfds = (src)->exceptfds, \ + rb_fd_init(&(src)->readfds), \ + rb_fd_init(&(src)->writefds), \ + rb_fd_init(&(src)->exceptfds), \ + (dst)->select_value = (src)->select_value, \ + (dst)->delay = (src)->delay, \ + (dst)->join = (src)->join, \ + 0) + +int +thread_set_raised(yarv_thread_t *th) +{ + if (th->raised_flag) { + return 1; + } + th->raised_flag = 1; + return 0; +} + +int +thread_reset_raised(yarv_thread_t *th) +{ + if (th->raised_flag == 0) { + return 0; + } + th->raised_flag = 0; + return 1; +} + +void +rb_thread_fd_close(fd) + int fd; +{ + // TODO: fix me +} + +VALUE +rb_thread_current() +{ + return GET_THREAD()->self; +} + +static rb_thread_t +rb_thread_alloc(klass) + VALUE klass; +{ + UNSUPPORTED(rb_thread_alloc); + return 0; +} + +static VALUE +rb_thread_start_0(fn, arg, th) + VALUE (*fn) (); + void *arg; + rb_thread_t th; +{ + rb_bug("unsupported: rb_thread_start_0"); + return 0; /* not reached */ +} + +VALUE +rb_thread_create(VALUE (*fn) (), void *arg) +{ + Init_stack((VALUE *)&arg); + return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread)); +} + +/* + * call-seq: + * Thread.new([arg]*) {|args| block } => thread + * + * Creates and runs a new thread to execute the instructions given in + * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed + * into the block. + * + * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" } + * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" } + * x.join # Let the threads finish before + * a.join # main thread exits... + * + * <em>produces:</em> + * + * abxyzc + */ + +/* + * call-seq: + * Thread.new([arg]*) {|args| block } => thread + * + * Creates and runs a new thread to execute the instructions given in + * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed + * into the block. + * + * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" } + * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" } + * x.join # Let the threads finish before + * a.join # main thread exits... + * + * <em>produces:</em> + * + * abxyzc + */ + +/* + * call-seq: + * Thread.start([args]*) {|args| block } => thread + * Thread.fork([args]*) {|args| block } => thread + * + * Basically the same as <code>Thread::new</code>. However, if class + * <code>Thread</code> is subclassed, then calling <code>start</code> in that + * subclass will not invoke the subclass's <code>initialize</code> method. + */ + +int rb_thread_critical; + + +/* + * call-seq: + * Thread.critical => true or false + * + * Returns the status of the global ``thread critical'' condition. + */ + + +/* + * call-seq: + * Thread.critical= boolean => true or false + * + * Sets the status of the global ``thread critical'' condition and returns + * it. When set to <code>true</code>, prohibits scheduling of any existing + * thread. Does not block new threads from being created and run. Certain + * thread operations (such as stopping or killing a thread, sleeping in the + * current thread, and raising an exception) may cause a thread to be scheduled + * even when in a critical section. <code>Thread::critical</code> is not + * intended for daily use: it is primarily there to support folks writing + * threading libraries. + */ + + +/* + * Document-class: Continuation + * + * Continuation objects are generated by + * <code>Kernel#callcc</code>. They hold a return address and execution + * context, allowing a nonlocal return to the end of the + * <code>callcc</code> block from anywhere within a program. + * Continuations are somewhat analogous to a structured version of C's + * <code>setjmp/longjmp</code> (although they contain more state, so + * you might consider them closer to threads). + * + * For instance: + * + * arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ] + * callcc{|$cc|} + * puts(message = arr.shift) + * $cc.call unless message =~ /Max/ + * + * <em>produces:</em> + * + * Freddie + * Herbie + * Ron + * Max + * + * This (somewhat contrived) example allows the inner loop to abandon + * processing early: + * + * callcc {|cont| + * for i in 0..4 + * print "\n#{i}: " + * for j in i*5...(i+1)*5 + * cont.call() if j == 17 + * printf "%3d", j + * end + * end + * } + * print "\n" + * + * <em>produces:</em> + * + * 0: 0 1 2 3 4 + * 1: 5 6 7 8 9 + * 2: 10 11 12 13 14 + * 3: 15 16 + */ + +VALUE rb_cCont; + +/* + * call-seq: + * callcc {|cont| block } => obj + * + * Generates a <code>Continuation</code> object, which it passes to the + * associated block. Performing a <em>cont</em><code>.call</code> will + * cause the <code>callcc</code> to return (as will falling through the + * end of the block). The value returned by the <code>callcc</code> is + * the value of the block, or the value passed to + * <em>cont</em><code>.call</code>. See class <code>Continuation</code> + * for more details. Also see <code>Kernel::throw</code> for + * an alternative mechanism for unwinding a call stack. + */ + +static VALUE +rb_callcc(self) + VALUE self; +{ + UNSUPPORTED(rb_callcc); +} + +/* + * call-seq: + * cont.call(args, ...) + * cont[args, ...] + * + * Invokes the continuation. The program continues from the end of the + * <code>callcc</code> block. If no arguments are given, the original + * <code>callcc</code> returns <code>nil</code>. If one argument is + * given, <code>callcc</code> returns it. Otherwise, an array + * containing <i>args</i> is returned. + * + * callcc {|cont| cont.call } #=> nil + * callcc {|cont| cont.call 1 } #=> 1 + * callcc {|cont| cont.call 1, 2, 3 } #=> [1, 2, 3] + */ + +static VALUE +rb_cont_call(argc, argv, cont) + int argc; + VALUE *argv; + VALUE cont; +{ + UNSUPPORTED(rb_cont_call); +} + + +/* variables for recursive traversals */ +static ID recursive_key; + + +/* + * +Thread+ encapsulates the behavior of a thread of + * execution, including the main thread of the Ruby script. + * + * In the descriptions of the methods in this class, the parameter _sym_ + * refers to a symbol, which is either a quoted string or a + * +Symbol+ (such as <code>:name</code>). + */ + +void +Init_Thread() +{ + recursive_key = rb_intern("__recursive_key__"); + rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError); + rb_cCont = rb_define_class("Continuation", rb_cObject); +} + +static VALUE +recursive_check(obj) + VALUE obj; +{ + VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key); + + if (NIL_P(hash) || TYPE(hash) != T_HASH) { + return Qfalse; + } + else { + VALUE list = rb_hash_aref(hash, ID2SYM(rb_frame_this_func())); + + if (NIL_P(list) || TYPE(list) != T_ARRAY) + return Qfalse; + return rb_ary_includes(list, rb_obj_id(obj)); + } +} + +static void +recursive_push(obj) + VALUE obj; +{ + VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key); + VALUE list, sym; + + sym = ID2SYM(rb_frame_this_func()); + if (NIL_P(hash) || TYPE(hash) != T_HASH) { + hash = rb_hash_new(); + rb_thread_local_aset(rb_thread_current(), recursive_key, hash); + list = Qnil; + } + else { + list = rb_hash_aref(hash, sym); + } + if (NIL_P(list) || TYPE(list) != T_ARRAY) { + list = rb_ary_new(); + rb_hash_aset(hash, sym, list); + } + rb_ary_push(list, rb_obj_id(obj)); +} + +static void +recursive_pop() +{ + VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key); + VALUE list, sym; + + sym = ID2SYM(rb_frame_this_func()); + if (NIL_P(hash) || TYPE(hash) != T_HASH) { + VALUE symname; + VALUE thrname; + symname = rb_inspect(sym); + thrname = rb_inspect(rb_thread_current()); + + rb_raise(rb_eTypeError, "invalid inspect_tbl hash for %s in %s", + StringValuePtr(symname), StringValuePtr(thrname)); + } + list = rb_hash_aref(hash, sym); + if (NIL_P(list) || TYPE(list) != T_ARRAY) { + VALUE symname = rb_inspect(sym); + VALUE thrname = rb_inspect(rb_thread_current()); + rb_raise(rb_eTypeError, "invalid inspect_tbl list for %s in %s", + StringValuePtr(symname), StringValuePtr(thrname)); + } + rb_ary_pop(list); +} + +VALUE +rb_exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg) +{ + if (recursive_check(obj)) { + return (*func) (obj, arg, Qtrue); + } + else { + VALUE result = Qundef; + int state; + + recursive_push(obj); + PUSH_TAG(PROT_NONE); + if ((state = EXEC_TAG()) == 0) { + result = (*func) (obj, arg, Qfalse); + } + POP_TAG(); + recursive_pop(); + if (state) + JUMP_TAG(state); + return result; + } +} + +/* flush_register_windows must not be inlined because flushrs doesn't flush + * current frame in register stack. */ +#ifdef __ia64__ +void +flush_register_windows(void) +{ + __asm__("flushrs"); +} +#endif diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb index f04b0f9142..f6fb35944d 100644 --- a/ext/dl/lib/dl/import.rb +++ b/ext/dl/lib/dl/import.rb @@ -118,12 +118,12 @@ module DL f = import_function(symname, ctype, argtype, opt[:call_type]) name = symname.gsub(/@.+/,'') @func_map[name] = f - define_method(name){|*args,&block| f.call(*args,&block)} - #module_eval(<<-EOS) - # def #{name}(*args, &block) - # @func_map['#{name}'].call(*args,&block) - # end - #EOS + # define_method(name){|*args,&block| f.call(*args,&block)} + module_eval(<<-EOS) + def #{name}(*args, &block) + @func_map['#{name}'].call(*args,&block) + end + EOS module_function(name) f end @@ -142,12 +142,12 @@ module DL raise(RuntimeError, "unknown callback type: #{h[:callback_type]}") end @func_map[name] = f - define_method(name){|*args,&block| f.call(*args,&block)} - #module_eval(<<-EOS) - # def #{name}(*args,&block) - # @func_map['#{name}'].call(*args,&block) - # end - #EOS + #define_method(name){|*args,&block| f.call(*args,&block)} + module_eval(<<-EOS) + def #{name}(*args,&block) + @func_map['#{name}'].call(*args,&block) + end + EOS module_function(name) f end diff --git a/ext/etc/.cvsignore b/ext/etc/.cvsignore index 814345ece8..4088712231 100644 --- a/ext/etc/.cvsignore +++ b/ext/etc/.cvsignore @@ -1,4 +1,3 @@ Makefile mkmf.log *.def -extconf.h diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 1bd767d09c..22907a5c44 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -512,7 +512,6 @@ Init_etc(void) rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0); rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0); - rb_global_variable(&sPasswd); sPasswd = rb_struct_define("Passwd", "name", "passwd", "uid", "gid", #ifdef HAVE_ST_PW_GECOS @@ -539,12 +538,15 @@ Init_etc(void) #endif NULL); + rb_register_mark_object(sPasswd); + #ifdef HAVE_GETGRENT - rb_global_variable(&sGroup); sGroup = rb_struct_define("Group", "name", #ifdef HAVE_ST_GR_PASSWD "passwd", #endif "gid", "mem", NULL); + + rb_register_mark_object(sGroup); #endif } diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 0a5d0dface..be9821130e 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -302,7 +302,7 @@ iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, co } error = rb_class_new_instance(3, args, error); if (!rb_block_given_p()) rb_exc_raise(error); - ruby_errinfo = error; + rb_set_errinfo(error); return rb_yield(failed); } diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 0b50b438a9..ba7e77f647 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -53,7 +53,6 @@ static char **readline_attempted_completion_function(const char *text, static int readline_event() { - CHECK_INTS; rb_thread_schedule(); return 0; } diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb index 6b44073300..99814e5d6c 100644 --- a/ext/ripper/extconf.rb +++ b/ext/ripper/extconf.rb @@ -4,6 +4,9 @@ require 'mkmf' require 'rbconfig' def main + Logging.message "YARV doesn't support Ripper" + return + unless find_executable('bison') unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c") Logging.message 'missing bison; abort' diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index b5defc3a29..04f55a3165 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -1801,7 +1801,7 @@ fole_s_connect(int argc, VALUE *argv, VALUE self) ole_initialize(); rb_scan_args(argc, argv, "1*", &svr_name, &others); - if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) { + if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) { rb_raise(rb_eSecurityError, "Insecure Object Connection - %s", StringValuePtr(svr_name)); } @@ -2182,12 +2182,12 @@ fole_initialize(int argc, VALUE *argv, VALUE self) rb_call_super(0, 0); rb_scan_args(argc, argv, "11*", &svr_name, &host, &others); - if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) { + if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) { rb_raise(rb_eSecurityError, "Insecure Object Creation - %s", StringValuePtr(svr_name)); } if (!NIL_P(host)) { - if (ruby_safe_level > 0 && OBJ_TAINTED(host)) { + if (rb_safe_level() > 0 && OBJ_TAINTED(host)) { rb_raise(rb_eSecurityError, "Insecure Object Creation - %s", StringValuePtr(svr_name)); } @@ -6645,7 +6645,7 @@ fev_initialize(int argc, VALUE *argv, VALUE self) } if(TYPE(itf) != T_NIL) { - if (ruby_safe_level > 0 && OBJ_TAINTED(itf)) { + if (rb_safe_level() > 0 && OBJ_TAINTED(itf)) { rb_raise(rb_eSecurityError, "Insecure Event Creation - %s", StringValuePtr(itf)); } @@ -6854,8 +6854,8 @@ folevariant_value(VALUE self) void Init_win32ole() { - rb_global_variable(&ary_ole_event); ary_ole_event = rb_ary_new(); + rb_register_mark_object(ary_ole_event); id_events = rb_intern("events"); com_vtbl.QueryInterface = QueryInterface; @@ -6865,8 +6865,8 @@ Init_win32ole() com_vtbl.GetTypeInfo = GetTypeInfo; com_vtbl.GetIDsOfNames = GetIDsOfNames; com_vtbl.Invoke = Invoke; - rb_global_variable(&com_hash); com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable()); + rb_register_mark_object(com_hash); cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index ed3f9bcbc6..16aebc61fc 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1759,7 +1759,7 @@ gzfile_read_raw_rescue(VALUE arg) { struct gzfile *gz = (struct gzfile*)arg; VALUE str = Qnil; - if (rb_obj_is_kind_of(ruby_errinfo, rb_eNoMethodError)) { + if (rb_obj_is_kind_of(ruby_errinfo(), rb_eNoMethodError)) { str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE)); if (!NIL_P(str)) { Check_Type(str, T_STRING); @@ -16,8 +16,8 @@ #include "rubysig.h" #include "st.h" #include "node.h" -#include "env.h" #include "re.h" +#include "yarvcore.h" #include <stdio.h> #include <setjmp.h> #include <sys/types.h> @@ -51,7 +51,9 @@ int rb_io_fptr_finalize(struct OpenFile*); # ifdef HAVE_ALLOCA_H # include <alloca.h> # else -# ifndef _AIX +# ifdef _AIX + #pragma alloca +# else # ifndef alloca /* predefined by HP cc +Olibcalls */ void *alloca (); # endif @@ -69,15 +71,115 @@ void *alloca (); static unsigned long malloc_increase = 0; static unsigned long malloc_limit = GC_MALLOC_LIMIT; -static void run_final(VALUE obj); static VALUE nomem_error; + +static int dont_gc; +static int during_gc; +static int need_call_final = 0; +static st_table *finalizer_table = 0; + +#define MARK_STACK_MAX 1024 +static VALUE mark_stack[MARK_STACK_MAX]; +static VALUE *mark_stack_ptr; +static int mark_stack_overflow; + +#undef GC_DEBUG + +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__) +#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */ +#endif + +typedef struct RVALUE { + union { + struct { + unsigned long flags; /* always 0 for freed obj */ + struct RVALUE *next; + } free; + struct RBasic basic; + struct RObject object; + struct RClass klass; + struct RFloat flonum; + struct RString string; + struct RArray array; + struct RRegexp regexp; + struct RHash hash; + struct RData data; + struct RStruct rstruct; + struct RBignum bignum; + struct RFile file; + struct RNode node; + struct RMatch match; + } as; +#ifdef GC_DEBUG + char *file; + int line; +#endif +} RVALUE; + +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__) +#pragma pack(pop) +#endif + +static RVALUE *freelist = 0; +static RVALUE *deferred_final_list = 0; + +#define HEAPS_INCREMENT 10 +static struct heaps_slot { + void *membase; + RVALUE *slot; + int limit; +} *heaps; +static int heaps_length = 0; +static int heaps_used = 0; + +#define HEAP_MIN_SLOTS 10000 +static int heap_slots = HEAP_MIN_SLOTS; + +#define FREE_MIN 4096 + +static RVALUE *himem, *lomem; + +extern st_table *rb_class_tbl; +VALUE *rb_gc_stack_start = 0; +#ifdef __ia64 +VALUE *rb_gc_register_stack_start = 0; +#endif + +int gc_stress = 0; + + +#ifdef DJGPP +/* set stack size (http://www.delorie.com/djgpp/v2faq/faq15_9.html) */ +unsigned int _stklen = 0x180000; /* 1.5 kB */ +#endif + +#if defined(DJGPP) || defined(_WIN32_WCE) +static unsigned int STACK_LEVEL_MAX = 65535; +#elif defined(__human68k__) +unsigned int _stacksize = 262144; +# define STACK_LEVEL_MAX (_stacksize - 4096) +# undef HAVE_GETRLIMIT +#elif defined(HAVE_GETRLIMIT) || defined(_WIN32) +static unsigned int STACK_LEVEL_MAX = 655300; +#else +# define STACK_LEVEL_MAX 655300 +#endif + + + +static void run_final(VALUE obj); static int garbage_collect(void); void -rb_memerror(void) +rb_global_variable(VALUE *var) { - static int recurse = 0; + rb_gc_register_address(var); +} +void +rb_memerror(void) +{ + static int recurse = 0; if (!nomem_error || (recurse > 0 && rb_safe_level() < 4)) { fprintf(stderr, "[FATAL] failed to allocate memory\n"); exit(1); @@ -86,8 +188,6 @@ rb_memerror(void) rb_exc_raise(nomem_error); } -int gc_stress = 0; - /* * call-seq: * GC.stress => true or false @@ -211,11 +311,6 @@ ruby_xfree(void *x) RUBY_CRITICAL(free(x)); } -static int dont_gc; -static int during_gc; -static int need_call_final = 0; -static st_table *finalizer_table = 0; - /* * call-seq: @@ -279,6 +374,13 @@ rb_gc_register_address(VALUE *addr) } void +rb_register_mark_object(VALUE obj) +{ + VALUE ary = GET_THREAD()->vm->mark_object_ary; + rb_ary_push(ary, obj); +} + +void rb_gc_unregister_address(VALUE *addr) { struct gc_list *tmp = global_List; @@ -300,70 +402,6 @@ rb_gc_unregister_address(VALUE *addr) } } -#undef GC_DEBUG - -void -rb_global_variable(VALUE *var) -{ - rb_gc_register_address(var); -} - -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__) -#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */ -#endif - -typedef struct RVALUE { - union { - struct { - unsigned long flags; /* always 0 for freed obj */ - struct RVALUE *next; - } free; - struct RBasic basic; - struct RObject object; - struct RClass klass; - struct RFloat flonum; - struct RString string; - struct RArray array; - struct RRegexp regexp; - struct RHash hash; - struct RData data; - struct RStruct rstruct; - struct RBignum bignum; - struct RFile file; - struct RNode node; - struct RMatch match; - struct RVarmap varmap; - struct SCOPE scope; - } as; -#ifdef GC_DEBUG - char *file; - int line; -#endif -} RVALUE; - -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__) -#pragma pack(pop) -#endif - -static RVALUE *freelist = 0; -static RVALUE *deferred_final_list = 0; - -#define HEAPS_INCREMENT 10 -static struct heaps_slot { - void *membase; - RVALUE *slot; - int limit; -} *heaps; -static int heaps_length = 0; -static int heaps_used = 0; - -#define HEAP_MIN_SLOTS 10000 -static int heap_slots = HEAP_MIN_SLOTS; - -#define FREE_MIN 4096 - -static RVALUE *himem, *lomem; - static void add_heap(void) { @@ -396,13 +434,13 @@ add_heap(void) heap_slots = HEAP_MIN_SLOTS; continue; } - heaps[heaps_used].membase = p; - if ((VALUE)p % sizeof(RVALUE) == 0) - heap_slots += 1; - else - p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE))); - heaps[heaps_used].slot = p; - heaps[heaps_used].limit = heap_slots; + heaps[heaps_used].membase = p; + if ((VALUE)p % sizeof(RVALUE) == 0) + heap_slots += 1; + else + p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE))); + heaps[heaps_used].slot = p; + heaps[heaps_used].limit = heap_slots; break; } pend = p + heap_slots; @@ -410,7 +448,6 @@ add_heap(void) if (himem < pend) himem = pend; heaps_used++; heap_slots *= 1.8; - if (heap_slots <= 0) heap_slots = HEAP_MIN_SLOTS; while (p < pend) { p->as.free.flags = 0; @@ -421,16 +458,20 @@ add_heap(void) } #define RANY(o) ((RVALUE*)(o)) -VALUE -rb_newobj(void) +static VALUE +rb_newobj_from_heap(void) { VALUE obj; - if ((gc_stress || !freelist) && !garbage_collect()) - rb_memerror(); + if (gc_stress || !freelist) { + if(!garbage_collect()) { + rb_memerror(); + } + } obj = (VALUE)freelist; freelist = freelist->as.free.next; + MEMZERO((void*)obj, RVALUE, 1); #ifdef GC_DEBUG RANY(obj)->file = ruby_sourcefile; @@ -439,6 +480,52 @@ rb_newobj(void) return obj; } +#if USE_VALUE_CACHE +static VALUE +rb_fill_value_cache(yarv_thread_t *th) +{ + int i; + VALUE rv; + + // LOCK + for (i=0; i<YARV_VALUE_CACHE_SIZE; i++) { + VALUE v = rb_newobj_from_heap(); + + th->value_cache[i] = v; + RBASIC(v)->flags = FL_MARK; + } + th->value_cache_ptr = &th->value_cache[0]; + rv = rb_newobj_from_heap(); + // UNLOCK + return rv; +} +#endif + +VALUE +rb_newobj(void) +{ +#if USE_VALUE_CACHE && 1 + yarv_thread_t *th = GET_THREAD(); + VALUE v = *th->value_cache_ptr; + + if (v) { + RBASIC(v)->flags = 0; + th->value_cache_ptr++; + } + else { + v = rb_fill_value_cache(th); + } + +#if defined(GC_DEBUG) + printf("cache index: %d, v: %p, th: %p\n", + th->value_cache_ptr - th->value_cache, v, th); +#endif + return v; +#else + return rb_newobj_from_heap(); +#endif +} + VALUE rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree) { @@ -452,50 +539,21 @@ rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_F return (VALUE)data; } -extern st_table *rb_class_tbl; -VALUE *rb_gc_stack_start = 0; -#ifdef __ia64 -VALUE *rb_gc_register_stack_start = 0; -#endif +NOINLINE(void yarv_set_stack_end(VALUE **stack_end_p)); - -#ifdef DJGPP -/* set stack size (http://www.delorie.com/djgpp/v2faq/faq15_9.html) */ -unsigned int _stklen = 0x180000; /* 1.5 kB */ -#endif - -#if defined(DJGPP) || defined(_WIN32_WCE) -static unsigned int STACK_LEVEL_MAX = 65535; -#elif defined(__human68k__) -unsigned int _stacksize = 262144; -# define STACK_LEVEL_MAX (_stacksize - 4096) -# undef HAVE_GETRLIMIT -#elif defined(HAVE_GETRLIMIT) || defined(_WIN32) -static unsigned int STACK_LEVEL_MAX = 655300; -#else -# define STACK_LEVEL_MAX 655300 -#endif - -NOINLINE(static void set_stack_end(VALUE **stack_end_p)); - -static void -set_stack_end(VALUE **stack_end_p) -{ - VALUE stack_end; - *stack_end_p = &stack_end; -} -#define SET_STACK_END VALUE *stack_end; set_stack_end(&stack_end) -#define STACK_END (stack_end) +#define YARV_SET_STACK_END yarv_set_stack_end(&th->machine_stack_end) +#define STACK_START (th->machine_stack_start) +#define STACK_END (th->machine_stack_end) #if defined(sparc) || defined(__sparc__) -# define STACK_LENGTH (rb_gc_stack_start - STACK_END + 0x80) +# define STACK_LENGTH (STACK_START - STACK_END + 0x80) #elif STACK_GROW_DIRECTION < 0 -# define STACK_LENGTH (rb_gc_stack_start - STACK_END) +# define STACK_LENGTH (STACK_START - STACK_END) #elif STACK_GROW_DIRECTION > 0 -# define STACK_LENGTH (STACK_END - rb_gc_stack_start + 1) +# define STACK_LENGTH (STACK_END - STACK_START + 1) #else -# define STACK_LENGTH ((STACK_END < rb_gc_stack_start) ? rb_gc_stack_start - STACK_END\ - : STACK_END - rb_gc_stack_start + 1) +# define STACK_LENGTH ((STACK_END < STACK_START) ? STACK_START - STACK_END\ + : STACK_END - STACK_START + 1) #endif #if STACK_GROW_DIRECTION > 0 # define STACK_UPPER(x, a, b) a @@ -506,10 +564,11 @@ static int grow_direction; static int stack_grow_direction(VALUE *addr) { - SET_STACK_END; + yarv_thread_t *th = GET_THREAD(); + YARV_SET_STACK_END; - if (STACK_END > addr) return grow_direction = 1; - return grow_direction = -1; + if (STACK_END > addr) return grow_direction = 1; + return grow_direction = -1; } # define stack_growup_p(x) ((grow_direction ? grow_direction : stack_grow_direction(x)) > 0) # define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b) @@ -518,32 +577,28 @@ stack_grow_direction(VALUE *addr) #define GC_WATER_MARK 512 #define CHECK_STACK(ret) do {\ - SET_STACK_END;\ + YARV_SET_STACK_END;\ (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\ } while (0) int ruby_stack_length(VALUE **p) { - SET_STACK_END; - if (p) *p = STACK_UPPER(STACK_END, rb_gc_stack_start, STACK_END); - return STACK_LENGTH; + yarv_thread_t *th = GET_THREAD(); + YARV_SET_STACK_END; + if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END); + return STACK_LENGTH; } int ruby_stack_check(void) { - int ret; - - CHECK_STACK(ret); - return ret; + int ret; + yarv_thread_t *th = GET_THREAD(); + CHECK_STACK(ret); + return ret; } -#define MARK_STACK_MAX 1024 -static VALUE mark_stack[MARK_STACK_MAX]; -static VALUE *mark_stack_ptr; -static int mark_stack_overflow; - static void init_mark_stack(void) { @@ -624,7 +679,7 @@ gc_mark_rest(void) MEMCPY(tmp_arry, mark_stack, VALUE, MARK_STACK_MAX); init_mark_stack(); - while (p != tmp_arry){ + while(p != tmp_arry){ p--; gc_mark_children(*p, 0); } @@ -644,7 +699,7 @@ is_pointer_to_heap(void *ptr) for (i=0; i < heaps_used; i++) { heap_org = heaps[i].slot; if (heap_org <= p && p < heap_org + heaps[i].limit) - return Qtrue; + return Qtrue; } return Qfalse; } @@ -785,6 +840,7 @@ gc_mark_children(VALUE ptr, int lev) case NODE_IF: /* 1,2,3 */ case NODE_FOR: case NODE_ITER: + case NODE_CREF: case NODE_WHEN: case NODE_MASGN: case NODE_RESCUE: @@ -795,17 +851,16 @@ gc_mark_children(VALUE ptr, int lev) gc_mark((VALUE)obj->as.node.u2.node, lev); /* fall through */ case NODE_BLOCK: /* 1,3 */ + case NODE_OPTBLOCK: case NODE_ARRAY: case NODE_DSTR: case NODE_DXSTR: case NODE_DREGX: case NODE_DREGX_ONCE: - case NODE_FBODY: case NODE_ENSURE: case NODE_CALL: case NODE_DEFS: case NODE_OP_ASGN1: - case NODE_CREF: gc_mark((VALUE)obj->as.node.u1.node, lev); /* fall through */ case NODE_SUPER: /* 3 */ @@ -814,7 +869,8 @@ gc_mark_children(VALUE ptr, int lev) ptr = (VALUE)obj->as.node.u3.node; goto again; - case NODE_WHILE: /* 1,2 */ + case NODE_METHOD: /* 1,2 */ + case NODE_WHILE: case NODE_UNTIL: case NODE_AND: case NODE_OR: @@ -831,10 +887,9 @@ gc_mark_children(VALUE ptr, int lev) case NODE_MODULE: case NODE_ALIAS: case NODE_VALIAS: - case NODE_LAMBDA: gc_mark((VALUE)obj->as.node.u1.node, lev); /* fall through */ - case NODE_METHOD: /* 2 */ + case NODE_FBODY: /* 2 */ case NODE_NOT: case NODE_GASGN: case NODE_LASGN: @@ -932,7 +987,6 @@ gc_mark_children(VALUE ptr, int lev) else { long i, len = RARRAY_LEN(obj); VALUE *ptr = RARRAY_PTR(obj); - for (i=0; i < len; i++) { gc_mark(*ptr++, lev); } @@ -968,29 +1022,13 @@ gc_mark_children(VALUE ptr, int lev) break; case T_MATCH: - gc_mark(obj->as.match.regexp, lev); + gc_mark(obj->as.match.regexp, lev); if (obj->as.match.str) { ptr = obj->as.match.str; goto again; } break; - case T_VARMAP: - gc_mark(obj->as.varmap.val, lev); - ptr = (VALUE)obj->as.varmap.next; - goto again; - - case T_SCOPE: - if (obj->as.scope.local_vars && (obj->as.scope.flags & SCOPE_MALLOC)) { - int n = obj->as.scope.local_tbl[0]+1; - VALUE *vars = &obj->as.scope.local_vars[-1]; - - while (n--) { - gc_mark(*vars++, lev); - } - } - break; - case T_STRUCT: { long len = RSTRUCT_LEN(obj); @@ -1002,6 +1040,15 @@ gc_mark_children(VALUE ptr, int lev) } break; + case T_VALUES: + { + rb_gc_mark(RVALUES(obj)->v1); + rb_gc_mark(RVALUES(obj)->v2); + ptr = RVALUES(obj)->v3; + goto again; + } + break; + default: rb_bug("rb_gc_mark(): unknown data type 0x%lx(%p) %s", obj->as.basic.flags & T_MASK, obj, @@ -1054,14 +1101,6 @@ gc_sweep(void) int freed = 0; int i; unsigned long live = 0; - unsigned long free_min = 0; - - for (i = 0; i < heaps_used; i++) { - free_min += heaps[i].limit; - } - free_min = free_min * 0.2; - if (free_min < FREE_MIN) - free_min = FREE_MIN; mark_source_filename(ruby_sourcefile); if (source_filenames) { @@ -1104,12 +1143,12 @@ gc_sweep(void) } p++; } - if (n == heaps[i].limit && freed > free_min) { + if (n == heaps[i].limit && freed > FREE_MIN) { RVALUE *pp; heaps[i].limit = 0; for (pp = final_list; pp != final; pp = pp->as.free.next) { - pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */ + p->as.free.flags |= FL_SINGLETON; /* freeing page mark */ } freelist = free; /* cancel this page from freelist */ } @@ -1122,7 +1161,7 @@ gc_sweep(void) if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT; } malloc_increase = 0; - if (freed < free_min) { + if (freed < FREE_MIN) { add_heap(); } during_gc = 0; @@ -1218,9 +1257,10 @@ obj_free(VALUE obj) break; case T_FLOAT: - case T_VARMAP: case T_BLOCK: break; + case T_VALUES: + break; case T_BIGNUM: if (RANY(obj)->as.bignum.digits) { @@ -1240,17 +1280,6 @@ obj_free(VALUE obj) } return; /* no need to free iv_tbl */ - case T_SCOPE: - if (RANY(obj)->as.scope.local_vars && - RANY(obj)->as.scope.flags != SCOPE_ALLOCA) { - VALUE *vars = RANY(obj)->as.scope.local_vars-1; - if (vars[0] == 0) - RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl)); - if (RANY(obj)->as.scope.flags & SCOPE_MALLOC) - RUBY_CRITICAL(free(vars)); - } - break; - case T_STRUCT: if (RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK == 0 && RANY(obj)->as.rstruct.as.heap.ptr) { @@ -1264,12 +1293,6 @@ obj_free(VALUE obj) } } -void -rb_gc_mark_frame(struct FRAME *frame) -{ - gc_mark((VALUE)frame->node, 0); -} - #ifdef __GNUC__ #if defined(__human68k__) || defined(DJGPP) #if defined(__human68k__) @@ -1308,20 +1331,21 @@ int rb_setjmp (rb_jmp_buf); #endif /* __human68k__ or DJGPP */ #endif /* __GNUC__ */ +#define GC_NOTIFY 0 + static int garbage_collect(void) { struct gc_list *list; - struct FRAME * volatile frame; /* gcc 2.7.2.3 -O2 bug?? */ jmp_buf save_regs_gc_mark; - SET_STACK_END; + yarv_thread_t *th = GET_THREAD(); + + if (GC_NOTIFY) printf("start garbage_collect()\n"); - if (!heaps) return Qfalse; -#ifdef HAVE_NATIVETHREAD - if (!is_ruby_native_thread()) { - rb_bug("cross-thread violation on rb_gc()"); + if (!heaps) { + return Qfalse; } -#endif + if (dont_gc || during_gc) { if (!freelist) { add_heap(); @@ -1330,23 +1354,13 @@ garbage_collect(void) } during_gc++; + YARV_SET_STACK_END; + init_mark_stack(); - gc_mark((VALUE)ruby_current_node, 0); + rb_gc_mark(th->vm->self); + rb_gc_mark(th->vm->mark_object_ary); - /* mark frame stack */ - for (frame = ruby_frame; frame; frame = frame->prev) { - rb_gc_mark_frame(frame); - if (frame->tmp) { - struct FRAME *tmp = frame->tmp; - while (tmp) { - rb_gc_mark_frame(tmp); - tmp = tmp->prev; - } - } - } - gc_mark((VALUE)ruby_scope, 0); - gc_mark((VALUE)ruby_dyna_vars, 0); if (finalizer_table) { mark_tbl(finalizer_table, 0); } @@ -1355,24 +1369,45 @@ garbage_collect(void) /* This assumes that all registers are saved into the jmp_buf (and stack) */ setjmp(save_regs_gc_mark); mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *)); + #if STACK_GROW_DIRECTION < 0 - rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start); + rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start); #elif STACK_GROW_DIRECTION > 0 - rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1); + rb_gc_mark_locations(th->machin_stack_start, th->machine_stack_end + 1); #else - if ((VALUE*)STACK_END < rb_gc_stack_start) - rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start); + if (th->machine_stack_end < th->machin_stack_start) + rb_gc_mark_locations(th->machine_stack_end, th->machin_stack_start); else - rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1); + rb_gc_mark_locations(th->machin_stack_start, th->machine_stack_end + 1); #endif -#ifdef __ia64 - /* mark backing store (flushed register stack) */ +#ifdef __ia64__ + /* mark backing store (flushed register window on the stack) */ /* the basic idea from guile GC code */ - rb_gc_mark_locations(rb_gc_register_stack_start, (VALUE*)rb_ia64_bsp()); + { + ucontext_t ctx; + VALUE *top, *bot; +#if defined(HAVE_UNWIND_H) && defined(HAVE__UNW_CREATECONTEXTFORSELF) + _Unwind_Context *unwctx = _UNW_createContextForSelf(); +#endif + + getcontext(&ctx); + mark_locations_array((VALUE*)&ctx.uc_mcontext, + ((size_t)(sizeof(VALUE)-1 + sizeof ctx.uc_mcontext)/sizeof(VALUE))); +#if defined(HAVE_UNWIND_H) && defined(HAVE__UNW_CREATECONTEXTFORSELF) + _UNW_currentContext(unwctx); + bot = (VALUE*)(long)_UNW_getAR(unwctx, _UNW_AR_BSP); + top = (VALUE*)(long)_UNW_getAR(unwctx, _UNW_AR_BSPSTORE); + _UNW_destroyContext(unwctx); +#else + bot = (VALUE*)__libc_ia64_register_backing_store_base; + top = (VALUE*)ctx.uc_mcontext.IA64_BSPSTORE; +#endif + rb_gc_mark_locations(bot, top); + } #endif #if defined(__human68k__) || defined(__mc68000__) rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2), - (VALUE*)((char*)rb_gc_stack_start + 2)); + (VALUE*)((char*)STACK_START + 2)); #endif rb_gc_mark_threads(); rb_gc_mark_symbols(); @@ -1393,24 +1428,39 @@ garbage_collect(void) rb_gc_mark_parser(); /* gc_mark objects whose marking are not completed*/ - do { - while (!MARK_STACK_EMPTY) { - if (mark_stack_overflow){ - gc_mark_all(); - } - else { - gc_mark_rest(); - } + while (!MARK_STACK_EMPTY){ + if (mark_stack_overflow){ + gc_mark_all(); + } + else { + gc_mark_rest(); } - rb_gc_abort_threads(); - } while (!MARK_STACK_EMPTY); + } gc_sweep(); - + if (GC_NOTIFY) printf("end garbage_collect()\n"); return Qtrue; } void +yarv_machine_stack_mark(yarv_thread_t *th) +{ +#if STACK_GROW_DIRECTION < 0 + rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start); +#elif STACK_GROW_DIRECTION > 0 + rb_gc_mark_locations(th->machin_stack_start, th->machine_stack_end); +#else + if (th->machin_stack_start < th->machine_stack_end) { + rb_gc_mark_locations(th->machin_stack_start, th->machine_stack_end); + } + else { + rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start); + } +#endif +} + + +void rb_gc(void) { garbage_collect(); @@ -1604,8 +1654,6 @@ os_live_obj(void) if (p->as.basic.flags) { switch (TYPE(p)) { case T_ICLASS: - case T_VARMAP: - case T_SCOPE: case T_NODE: continue; case T_CLASS: @@ -1636,8 +1684,6 @@ os_obj_of(VALUE of) if (p->as.basic.flags) { switch (TYPE(p)) { case T_ICLASS: - case T_VARMAP: - case T_SCOPE: case T_NODE: continue; case T_CLASS: @@ -1796,7 +1842,7 @@ define_final(int argc, VALUE *argv, VALUE os) need_call_final = 1; FL_SET(obj, FL_FINALIZE); - block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block); + block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block); if (!finalizer_table) { finalizer_table = st_init_numtable(); @@ -1840,7 +1886,7 @@ run_final(VALUE obj) objid = rb_obj_id(obj); /* make obj into id */ rb_thread_critical = Qtrue; args[1] = 0; - args[2] = (VALUE)ruby_safe_level; + args[2] = (VALUE)rb_safe_level(); for (i=0; i<RARRAY_LEN(finalizers); i++) { args[0] = RARRAY_PTR(finalizers)[i]; if (!args[1]) args[1] = rb_ary_new3(1, objid); @@ -1960,8 +2006,8 @@ id2ref(VALUE obj, VALUE objid) if ((ptr % sizeof(RVALUE)) == (4 << 2)) { ID symid = ptr / sizeof(RVALUE); if (rb_id2name(symid) == 0) - rb_raise(rb_eRangeError, "%p is not symbol id value", p0); - return ID2SYM(symid); + rb_raise(rb_eRangeError, "%p is not symbol id value", p0); + return ID2SYM(symid); } if (!is_pointer_to_heap((void *)ptr)|| BUILTIN_TYPE(ptr) >= T_BLOCK) { @@ -2011,7 +2057,7 @@ rb_obj_id(VALUE obj) * nil 00000000000000000000000000000100 * undef 00000000000000000000000000000110 * symbol ssssssssssssssssssssssss00001110 - * object oooooooooooooooooooooooooooooo00 = 0 (mod sizeof(RVALUE)) + * object oooooooooooooooooooooooooooooo00 = 0 (mod sizeof(RVALUE) * fixnum fffffffffffffffffffffffffffffff1 * * object_id space @@ -2020,7 +2066,7 @@ rb_obj_id(VALUE obj) * true 00000000000000000000000000000010 * nil 00000000000000000000000000000100 * undef 00000000000000000000000000000110 - * symbol 000SSSSSSSSSSSSSSSSSSSSSSSSSSS0 S...S % A = 4 (S...S = s...s * A + 4) + * symbol 000SSSSSSSSSSSSSSSSSSSSSSSSSSS0 S...S % A = 4 (S...S = * object oooooooooooooooooooooooooooooo0 o...o % A = 0 * fixnum fffffffffffffffffffffffffffffff1 bignum if required * @@ -2031,6 +2077,9 @@ rb_obj_id(VALUE obj) * 24 if 32-bit, double is 8-byte aligned * 40 if 64-bit */ + if (TYPE(obj) == T_SYMBOL) { + return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG; + } if (SPECIAL_CONST_P(obj)) { return LONG2NUM((long)obj); } @@ -2079,7 +2128,7 @@ Init_GC(void) rb_global_variable(&nomem_error); nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory"); - rb_define_method(rb_cBasicObject, "__id__", rb_obj_id, 0); - rb_define_method(rb_cBasicObject, "object_id", rb_obj_id, 0); rb_define_method(rb_mKernel, "hash", rb_obj_id, 0); + rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0); + rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0); } @@ -0,0 +1,48 @@ + +#ifndef MARK_FREE_DEBUG +#define MARK_FREE_DEBUG 0 +#endif + + +#if MARK_FREE_DEBUG +static int g_indent = 0; + +static void +rb_gc_debug_indent(void) +{ + int i; + for (i = 0; i < g_indent; i++) { + printf(" "); + } +} + +static void +rb_gc_debug_body(char *mode, char *msg, int st, void *ptr) +{ + if (st == 0) { + g_indent--; + } + rb_gc_debug_indent(); + printf("%s: %s %s (%p)\n", mode, st ? "->" : "<-", msg, ptr); + if (st) { + g_indent++; + } + fflush(stdout); +} + +#define MARK_REPORT_ENTER(msg) rb_gc_debug_body("mark", msg, 1, ptr) +#define MARK_REPORT_LEAVE(msg) rb_gc_debug_body("mark", msg, 0, ptr) +#define FREE_REPORT_ENTER(msg) rb_gc_debug_body("free", msg, 1, ptr) +#define FREE_REPORT_LEAVE(msg) rb_gc_debug_body("free", msg, 0, ptr) +#define GC_INFO rb_gc_debug_indent(); printf + +#else +#define MARK_REPORT_ENTER(msg) +#define MARK_REPORT_LEAVE(msg) +#define FREE_REPORT_ENTER(msg) +#define FREE_REPORT_LEAVE(msg) +#define GC_INFO if(0)printf +#endif + +#define MARK_UNLESS_NULL(ptr) if(ptr){rb_gc_mark(ptr);} +#define FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);} @@ -12,43 +12,46 @@ #include "ruby.h" -void Init_Array(void); -void Init_Bignum(void); -void Init_Binding(void); -void Init_Comparable(void); -void Init_Dir(void); -void Init_Enumerable(void); -void Init_Enumerator(void); -void Init_Exception(void); -void Init_syserr(void); -void Init_eval(void); -void Init_load(void); -void Init_Proc(void); -void Init_Thread(void); -void Init_File(void); -void Init_GC(void); -void Init_Hash(void); -void Init_IO(void); -void Init_Math(void); -void Init_marshal(void); -void Init_Numeric(void); -void Init_Object(void); -void Init_pack(void); -void Init_Precision(void); -void Init_sym(void); -void Init_process(void); -void Init_Random(void); -void Init_Range(void); -void Init_Regexp(void); -void Init_signal(void); -void Init_String(void); -void Init_Struct(void); -void Init_Time(void); -void Init_var_tables(void); -void Init_version(void); +void Init_Array _((void)); +void Init_Bignum _((void)); +void Init_Binding _((void)); +void Init_Comparable _((void)); +void Init_Dir _((void)); +void Init_Enumerable _((void)); +void Init_Enumerator _((void)); +void Init_Exception _((void)); +void Init_syserr _((void)); +void Init_eval _((void)); +void Init_load _((void)); +void Init_Proc _((void)); +void Init_Thread _((void)); +void Init_File _((void)); +void Init_GC _((void)); +void Init_Hash _((void)); +void Init_IO _((void)); +void Init_Math _((void)); +void Init_marshal _((void)); +void Init_Numeric _((void)); +void Init_Object _((void)); +void Init_pack _((void)); +void Init_Precision _((void)); +void Init_sym _((void)); +void Init_process _((void)); +void Init_Random _((void)); +void Init_Range _((void)); +void Init_Regexp _((void)); +void Init_signal _((void)); +void Init_String _((void)); +void Init_Struct _((void)); +void Init_Time _((void)); +void Init_var_tables _((void)); +void Init_version _((void)); +void Init_yarvcore _((void)); +void Init_jump _((void)); + void -rb_call_inits(void) +rb_call_inits() { Init_sym(); Init_var_tables(); @@ -57,6 +60,7 @@ rb_call_inits(void) Init_Enumerable(); Init_Precision(); Init_eval(); + Init_jump(); Init_String(); Init_Exception(); Init_Thread(); @@ -82,5 +86,6 @@ rb_call_inits(void) Init_GC(); Init_marshal(); Init_Enumerator(); + Init_yarvcore(); Init_version(); } diff --git a/insnhelper.h b/insnhelper.h new file mode 100644 index 0000000000..16b712e560 --- /dev/null +++ b/insnhelper.h @@ -0,0 +1,146 @@ +/********************************************************************** + + insnhelper.h - helper macros to implement each instructions + + $Author$ + $Date$ + created at: 04/01/01 15:50:34 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifndef _INSNHELPER_H_INCLUDED_ +#define _INSNHELPER_H_INCLUDED_ + +#include "vm.h" + +/* + * deal with control frame pointer + */ + +/**********************************************************/ +/* deal with stack */ +/**********************************************************/ + +#define PUSH(x) (SET_SV(x), INC_SP(1)) +#define TOPN(n) (*(GET_SP()-(n)-1)) +#define POPN(n) (INC_SP(-(n))) +#define POP() (INC_SP(-1)) +#define STACK_ADDR_FROM_TOP(n) (&GET_SP()[-(n)]) + +#define GET_TOS() (tos) /* dummy */ + +/**********************************************************/ +/* deal with registers */ +/**********************************************************/ + +#define REG_CFP (reg_cfp) +#define REG_PC (REG_CFP->pc) +#define REG_SP (REG_CFP->sp) +#define REG_LFP (REG_CFP->lfp) +#define REG_DFP (REG_CFP->dfp) + +#define RESTORE_REGS() \ +{ \ + REG_CFP = th->cfp; \ +} + +#define REG_A reg_a +#define REG_B reg_b + +#ifdef COLLECT_USAGE_ANALYSIS +#define USAGE_ANALYSIS_REGISTER_HELPER(a, b, v) \ + (USAGE_ANALYSIS_REGISTER(a, b), (v)) +#else +#define USAGE_ANALYSIS_REGISTER_HELPER(a, b, v) \ + (v) +#endif + +/* PC */ +#define GET_PC() (USAGE_ANALYSIS_REGISTER_HELPER(0, 0, REG_PC)) +#define SET_PC(x) (REG_PC = (USAGE_ANALYSIS_REGISTER_HELPER(0, 1, x))) +#define GET_CURRENT_INSN() (*GET_PC()) +#define GET_OPERAND(n) (GET_PC()[(n)]) +#define ADD_PC(n) (SET_PC(REG_PC + (n))) + +#define GET_PC_COUNT() (REG_PC - GET_ISEQ()->iseq_encoded) + +#define JUMP(dst) (REG_PC += (dst)) + + +/* FP */ +#define GET_CFP() (USAGE_ANALYSIS_REGISTER_HELPER(2, 0, REG_CFP)) + +#define GET_LFP() (USAGE_ANALYSIS_REGISTER_HELPER(3, 0, REG_LFP)) +#define SET_LFP(x) (REG_LFP = (USAGE_ANALYSIS_REGISTER_HELPER(3, 1, (x)))) +#define GET_DFP() (USAGE_ANALYSIS_REGISTER_HELPER(4, 0, REG_DFP)) +#define SET_DFP(x) (REG_DFP = (USAGE_ANALYSIS_REGISTER_HELPER(4, 1, (x)))) + +#define GET_CONTINUATION_FRAME_PTR(cfp) \ + ((struct continuation_frame *)((cfp) + CC_DIFF_WC())) + +/* SP */ +#define GET_SP() (USAGE_ANALYSIS_REGISTER_HELPER(1, 0, REG_SP)) +#define SET_SP(x) (REG_SP = (USAGE_ANALYSIS_REGISTER_HELPER(1, 1, (x)))) +#define INC_SP(x) (REG_SP += ((VALUE)(USAGE_ANALYSIS_REGISTER_HELPER(1, 1, (VALUE)(x))))) +#define SET_SV(x) (*GET_SP() = (x)) + /* set current stack value as x */ + +#define GET_SP_COUNT() (REG_SP - th->stack) + +/* instruction sequence C struct */ +#define GET_ISEQ() (GET_CFP()->iseq) +#define CLEAR_ENV(env) (GET_ENV_CTRL(env)->is_orphan = Qundef) + + +/**********************************************************/ +/* deal with variables */ +/**********************************************************/ + +#define GET_CURRENT_DYNAMIC(idx) (GET_DFP()[-idx]) +#define GET_PREV_DFP(dfp) ((VALUE *)((dfp)[0] & ~0x03)) + +#define GET_GLOBAL(entry) rb_gvar_get((struct global_entry*)entry) +#define SET_GLOBAL(entry, val) rb_gvar_set((struct global_entry*)entry, val) + +/**********************************************************/ +/* deal with values */ +/**********************************************************/ + +#define GET_SELF() (USAGE_ANALYSIS_REGISTER_HELPER(5, 0, GET_CFP()->self)) + + +/**********************************************************/ +/* deal with control flow 2: method/iterator */ +/**********************************************************/ + +#define COPY_CREF(c1, c2) { \ + NODE *__tmp_c2 = (c2); \ + c1->nd_clss = __tmp_c2->nd_clss; \ + c1->nd_visi = __tmp_c2->nd_visi; \ + c1->nd_next = __tmp_c2->nd_next; \ +} + +/* block */ +#define GET_BLOCK_PTR() \ + ((yarv_block_t *)(GC_GUARDED_PTR_REF(GET_LFP()[0]))) + +#define CHECK_STACK_OVERFLOW(th, cfp, margin) \ + (((VALUE *)(cfp)->sp) + (margin) >= ((VALUE *)cfp)) + +/**********************************************************/ +/* deal with control flow 3: exception */ +/**********************************************************/ + + +/**********************************************************/ +/* others */ +/**********************************************************/ + +/* optimize insn */ +#define FIXNUM_2_P(a, b) ((a) & (b) & 1) +#define BASIC_OP_UNREDEFINED_P(op) ((yarv_redefined_flag & (op)) == 0) +#define HEAP_CLASS_OF(obj) RBASIC(obj)->klass + +#endif // _INSNHELPER_H_INCLUDED_ diff --git a/insns.def b/insns.def new file mode 100644 index 0000000000..99e35a7190 --- /dev/null +++ b/insns.def @@ -0,0 +1,2390 @@ +/** ##skip
+ -*-c-*-
+ insns.def - YARV instruction definitions
+
+ $Author: $
+ $Date: $
+ created at: 04/01/01 01:17:55 JST
+
+ Copyright (C) 2004-2006 Koichi Sasada
+*/
+
+/** ##skip
+ instruction comment
+ @c: category
+ @e: english description
+ @j: japanese description
+
+ instruction form:
+ DEFINE_INSN
+ instrunction_name
+ (instruction_operands, ..)
+ (pop_values, ..)
+ (return value)
+ {
+ .. // insn body
+ }
+
+ */
+
+
+/**
+ @c nop
+ @e nop
+ @j nop
+ */
+DEFINE_INSN
+nop
+()
+()
+()
+{
+ /* none */
+}
+
+/**********************************************************/
+/* deal with variables */
+/**********************************************************/
+
+/**
+ @c variable
+ @e get local variable(which is pointed by idx).
+ @j idx ‚ÅŽw’肳‚ꂽƒ[ƒJƒ‹•Ï”‚ðƒXƒ^ƒbƒN‚É’u‚B
+ */
+DEFINE_INSN
+getlocal
+(lindex_t idx)
+()
+(VALUE val)
+{
+ val = *(GET_LFP() - idx);
+}
+
+/**
+ @c variable
+ @e get local variable (which is pointed by idx) as val.
+ @j idx ‚ÅŽw’肳‚ꂽƒ[ƒJƒ‹•Ï”‚ð val ‚É‚·‚éB
+ */
+DEFINE_INSN
+setlocal
+(lindex_t idx)
+(VALUE val)
+()
+{
+ (*(GET_LFP() - idx)) = val;
+}
+
+/**
+ @c variable
+ @e get special local variable ($~, $_, ..)
+ @j “ÁŽê‚ȃ[ƒJƒ‹•Ï”‚Ì’l‚𓾂é
+ */
+DEFINE_INSN
+getspecial
+(num_t idx, num_t type)
+()
+(VALUE val)
+{
+ if (type == 0) {
+ VALUE *pv = lfp_svar(GET_LFP(), idx);
+ val = *pv;
+ }
+ else {
+ VALUE backref = *lfp_svar(GET_LFP(), 1);
+ if (type & 0x01) {
+ switch (type >> 1) {
+ case '&':
+ val = rb_reg_last_match(backref);
+ break;
+ case '`':
+ val = rb_reg_match_pre(backref);
+ break;
+ case '\'':
+ val = rb_reg_match_post(backref);
+ break;
+ case '+':
+ val = rb_reg_match_last(backref);
+ break;
+ default:
+ rb_bug("unexpected back-ref");
+ }
+ }
+ else {
+ val = rb_reg_nth_match(type >> 1, backref);
+ }
+ }
+}
+
+/**
+ @c variable
+ @e set special local variables
+ @j “Á•Ê‚ȃ[ƒJƒ‹•Ï”‚ðÝ’è‚·‚é
+ */
+DEFINE_INSN
+setspecial
+(num_t idx)
+(VALUE obj)
+()
+{
+ VALUE *pv = lfp_svar(GET_LFP(), idx);
+ *pv = obj;
+}
+
+/**
+ @c variable
+ @e get block local variable(which is pointed by idx and level).
+ level means nest level of block, and specify how above this variable.
+ @j level, idx ‚ÅŽw’肳‚ꂽƒuƒƒbƒNƒ[ƒJƒ‹•Ï”‚Ì’l‚ðƒXƒ^ƒbƒN‚É’u‚B
+ level ‚̓uƒƒbƒN‚̃lƒXƒgƒŒƒxƒ‹‚ÅA‰½’iã‚©‚ðŽ¦‚·B
+ */
+DEFINE_INSN
+getdynamic
+(dindex_t idx, num_t level)
+()
+(VALUE val)
+{
+ int i;
+ VALUE *dfp2 = GET_DFP();
+ for (i = 0; i < level; i++) {
+ dfp2 = GET_PREV_DFP(dfp2);
+ }
+ val = *(dfp2 - idx);
+}
+
+/**
+ @c variable
+ @e set block local variable(which is pointed by 'idx') as val.
+ level means nest level of block, and specify how above this variable.
+ @j level, idx ‚ÅŽw’肳‚ꂽƒuƒƒbƒNƒ[ƒJƒ‹•Ï”‚Ì’l‚ð val ‚É‚·‚éB
+ level ‚̓uƒƒbƒN‚̃lƒXƒgƒŒƒxƒ‹‚ÅA‰½’iã‚©‚ðŽ¦‚·B
+ */
+DEFINE_INSN
+setdynamic
+(dindex_t idx, num_t level)
+(VALUE val)
+()
+{
+ int i;
+ VALUE *dfp2 = GET_DFP();
+ for (i = 0; i < level; i++) {
+ dfp2 = GET_PREV_DFP(dfp2);
+ }
+ *(dfp2 - idx) = val;
+}
+
+/**
+ @c variable
+ @e get instance variable id of obj.
+ @j obj ‚̃Cƒ“ƒXƒ^ƒ“ƒX•Ï” id ‚𓾂éB
+ */
+DEFINE_INSN
+getinstancevariable
+(ID id)
+()
+(VALUE val)
+{
+ val = rb_ivar_get(GET_SELF(), id);
+}
+
+/**
+ @c variable
+ @e set instance variable id of obj as val.
+ @j obj ‚̃Cƒ“ƒXƒ^ƒ“ƒX•Ï”‚ð val ‚É‚·‚éB
+ */
+DEFINE_INSN
+setinstancevariable
+(ID id)
+(VALUE val)
+()
+{
+ rb_ivar_set(GET_SELF(), id, val);
+}
+
+/**
+ @c variable
+ @e get class variable id of klass as val.
+ @j klass ‚̃Nƒ‰ƒX•Ï” id ‚𓾂éB
+ */
+DEFINE_INSN
+getclassvariable
+(ID id)
+()
+(VALUE val)
+{
+ VALUE klass = eval_get_cvar_base(th, GET_ISEQ());
+ val = rb_cvar_get(klass, id);
+}
+
+/**
+ @c variable
+ @e set class variable id of klass as val.
+ @j klass ‚̃Nƒ‰ƒX•Ï” id ‚ð val ‚É‚·‚éB
+ */
+DEFINE_INSN
+setclassvariable
+(ID id, VALUE declp)
+(VALUE val)
+()
+{
+ VALUE klass = eval_get_cvar_base(th, GET_ISEQ());
+
+ if (declp == Qtrue && RTEST(ruby_verbose) && FL_TEST(klass, FL_SINGLETON)) {
+ rb_warn("declaring singleton class variable");
+ }
+ rb_cvar_set(klass, id, val, declp);
+}
+
+/**
+ @c variable
+ @e
+ get constant variable id. if klass is Qnil, constant
+ are searched in current scope. if klass is Qfalse, constant as
+ top level constant. otherwise, get constant under klass
+ class or module.
+ @j
+ ’蔂𓾂éBklass ‚ª Qnil ‚È‚çA‚»‚̃XƒR[ƒv‚Å“¾‚ç‚ê
+ ‚é’蔂𓾂éBQfalse ‚È‚çAƒgƒbƒvƒŒƒxƒ‹ƒXƒR[ƒv‚𓾂éB
+ ‚»‚êˆÈŠO‚È‚çAklass ƒNƒ‰ƒX‚̉º‚̒蔂𓾂éB
+ */
+DEFINE_INSN
+getconstant
+(ID id)
+(VALUE klass)
+(VALUE val)
+{
+ val = eval_get_ev_const(th, GET_ISEQ(), klass, id, 0);
+}
+
+/**
+ @c variable
+ @e
+ set constant variable id. if klass is Qfalse, constant
+ is able to access in this scope. if klass is Qnil, set
+ top level constant. otherwise, set constant under klass
+ class or module.
+
+ @j
+ ’è” id ‚ð val ‚É‚·‚éBklass ‚ª Qfalse ‚È‚çA‚»‚̃XƒR[ƒv
+ ‚Å“¾‚ç‚ê‚é’蔂ðÝ’è id ‚ðÝ’è‚·‚éBQnil ‚È‚çAƒgƒbƒvƒŒƒx
+ ƒ‹ƒXƒR[ƒv‚ðÝ’èA‚»‚êˆÈŠO‚È‚çAklass ƒNƒ‰ƒX‚̉º‚̒蔂ð
+ Ý’è‚·‚éB
+ */
+DEFINE_INSN
+setconstant
+(ID id)
+(VALUE val, VALUE klass)
+()
+{
+ if (klass == Qnil) {
+ klass = th_get_cbase(th);
+ }
+ if (NIL_P(klass)) {
+ rb_raise(rb_eTypeError, "no class/module to define constant");
+ }
+
+ switch (TYPE(klass)) {
+ case T_CLASS:
+ case T_MODULE:
+ break;
+ default:
+ rb_raise(rb_eTypeError, "%s is not a class/module",
+ RSTRING_PTR(rb_obj_as_string(klass)));
+ }
+
+ rb_const_set(klass, id, val);
+ INC_VM_STATE_VERSION();
+}
+
+/**
+ @c variable
+ @e get global variable id.
+ @j ƒOƒ[ƒoƒ‹•Ï” id ‚𓾂éB
+ */
+DEFINE_INSN
+getglobal
+(GENTRY entry)
+()
+(VALUE val)
+{
+ val = GET_GLOBAL(entry);
+}
+
+/**
+ @c variable
+ @e set global variable id as val.
+ @j ƒOƒ[ƒoƒ‹•Ï” id ‚𓾂éB
+ */
+DEFINE_INSN
+setglobal
+(GENTRY entry)
+(VALUE val)
+()
+{
+ SET_GLOBAL(entry, val);
+}
+
+
+/**********************************************************/
+/* deal with values */
+/**********************************************************/
+
+/**
+ @c put
+ @e put nil
+ @j put nil
+ */
+DEFINE_INSN
+putnil
+()
+()
+(VALUE val)
+{
+ val = Qnil;
+}
+
+/**
+ @c put
+ @e put self.
+ @j self ‚ð’u‚B
+ */
+DEFINE_INSN
+putself
+()
+()
+(VALUE val)
+{
+ val = GET_SELF();
+}
+
+/**
+ @c put
+ @e put Qundef. DO NOT USE in NORMAL RUBY PROGRAM
+ @j put Qundef.
+ */
+DEFINE_INSN
+putundef
+()
+()
+(VALUE val)
+{
+ val = Qundef;
+}
+
+/**
+ @c put
+ @e put some object.
+ i.e. Fixnum, true, false, nil, and so on.
+ @j ƒIƒuƒWƒFƒNƒg‚ð’u‚Bi.e. Fixnum, true, false, nil, and so on.
+ */
+DEFINE_INSN
+putobject
+(VALUE val)
+()
+(VALUE val)
+{
+ /* */
+}
+
+/**
+ @c put
+ @e put string val. string will be copied.
+ @j •¶Žš—ñ‚ð’u‚B•¶Žš—ñ‚̓Rƒs[‚µ‚Æ‚B
+ */
+
+DEFINE_INSN
+putstring
+(VALUE val)
+()
+(VALUE val)
+{
+ val = rb_str_new3(val);
+}
+
+/**
+ @c put
+ @e put concatenate strings
+ @j •¶Žš—ñ‚ð˜AŒ‹‚µ‚Ä’u‚B
+ */
+DEFINE_INSN
+concatstrings
+(num_t num)
+(...)
+(VALUE val) // inc += 1 - num;
+{
+ int i;
+ VALUE v;
+
+ val = rb_str_new(0, 0);
+ for (i = num - 1; i >= 0; i--) {
+ v = TOPN(i);
+ rb_str_append(val, v);
+ }
+ POPN(num);
+}
+
+/**
+ @c put
+ @e to_str
+ @j to_str
+ */
+DEFINE_INSN
+tostring
+()
+(VALUE val)
+(VALUE val)
+{
+ val = rb_obj_as_string(val);
+}
+
+/**
+ @c put
+ @e to Regexp
+ @j to Regexp
+ */
+DEFINE_INSN
+toregexp
+(num_t flag)
+(VALUE str)
+(VALUE val)
+{
+ val = rb_reg_new(RSTRING_PTR(str), RSTRING_LEN(str), flag);
+}
+
+/**
+ @c put
+ @e put new array.
+ @j V‚µ‚¢”z—ñ‚ðƒXƒ^ƒbƒNã‚Ì num ŒÂ‚Ì’l‚ʼnŠú‰»‚µ‚Ä’u‚B
+ */
+DEFINE_INSN
+newarray
+(num_t num)
+(...)
+(VALUE val) // inc += 1 - num;
+{
+ val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
+ POPN(num);
+}
+
+/**
+ @c put
+ @e dup array
+ @j ”z—ñ‚ð dup ‚µ‚ăXƒ^ƒbƒN‚É’u‚
+ */
+DEFINE_INSN
+duparray
+(VALUE ary)
+()
+(VALUE val)
+{
+ val = rb_ary_dup(ary);
+}
+
+/**
+ @c put
+ @e expand array to num objects.
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚̃IƒuƒWƒFƒNƒg‚ª”z—ñ‚Å‚ ‚ê‚ÎA‚»‚ê‚ð“WŠJ‚·‚éB
+ ”z—ñƒIƒuƒWƒFƒNƒg‚Ì—v‘f”‚ª numˆÈ‰º‚È‚ç‚ÎA‘ã‚í‚è‚É nil ‚ðÏ‚ÞBnumˆÈã‚È‚çA
+ numˆÈã‚Ì—v‘f‚ÍØ‚èŽÌ‚Ä‚éB
+ ”z—ñƒIƒuƒWƒFƒNƒg‚Å‚È‚¯‚ê‚ÎAnum - 1 ŒÂ‚Ì nil ‚ðÏ‚ÞB
+ ‚à‚µ flag ‚ª^‚È‚çAŽc‚è—v‘f‚Ì”z—ñ‚ðÏ‚Þ
+ */
+DEFINE_INSN
+expandarray
+(num_t num, num_t flag)
+(..., VALUE ary)
+(...) // inc += (num > 0) ? num - 1 + (flag ? 1 : 0) : num + 1 - (flag ? 1 : 0);
+{
+ int i;
+ if ((long)num >= 0) {
+ int len;
+ if (TYPE(ary) != T_ARRAY) {
+ ary = rb_ary_to_ary(ary);
+ }
+ len = RARRAY_LEN(ary);
+ for (i = 0; i < len && i < num; i++) {
+ PUSH(RARRAY_PTR(ary)[i]);
+ }
+ for (; i < num; i++) {
+ PUSH(Qnil);
+ }
+ if (flag) {
+ if (len > num) {
+ PUSH(rb_ary_new4(len - num, &RARRAY_PTR(ary)[num]));
+ }
+ else {
+ PUSH(rb_ary_new());
+ }
+ }
+ }
+ else {
+ long holdnum = -num;
+ VALUE val;
+
+ val = rb_ary_new4(holdnum, STACK_ADDR_FROM_TOP(holdnum));
+ if (CLASS_OF(ary) == rb_cArray) {
+ val = rb_ary_concat(val, ary);
+ }
+ else {
+ rb_ary_push(val, ary);
+ }
+ POPN(holdnum);
+ PUSH(val);
+ }
+}
+
+/**
+ @c put
+ @e concat two arrays
+ @j “ñ‚‚̔z—ñ‚ð‚Æ‚Á‚Ä‚«‚Ä‚‚Á‚‚¯‚é
+ */
+DEFINE_INSN
+concatarray
+()
+(VALUE ary1, VALUE ary2st)
+(VALUE ary)
+{
+ VALUE ary2 = ary2st;
+
+ if (ary2 == Qnil) {
+ ary = ary1;
+ }
+ else {
+ VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_splat");
+ VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_splat");
+
+ if (NIL_P(tmp1)) {
+ tmp1 = rb_ary_new3(1, ary1);
+ }
+
+ if (NIL_P(tmp2)) {
+ tmp2 = rb_ary_new3(1, ary2);
+ }
+
+ if (tmp1 == ary1) {
+ tmp1 = rb_ary_dup(ary1);
+ }
+ ary = rb_ary_concat(tmp1, tmp2);
+ }
+}
+
+/**
+ @c put
+ @e splat array
+ @j splat array
+ */
+DEFINE_INSN
+splatarray
+(VALUE flag)
+(VALUE ary)
+(VALUE obj)
+{
+ VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_splat");
+ if (NIL_P(tmp)) {
+ tmp = rb_ary_new3(1, ary);
+ }
+ obj = tmp;
+
+ if (0) {
+ if (flag == Qfalse) {
+ /* NODE_SPLAT */
+ obj = rb_Array(ary);
+ }
+ else {
+ /* NODE_SVALUE */
+ if (RARRAY_LEN(ary) == 0) {
+ obj = Qnil;
+ }
+ else if (RARRAY_LEN(ary) == 1) {
+ obj = RARRAY_PTR(ary)[0];
+ }
+ else {
+ obj = ary;
+ }
+ }
+ }
+}
+
+/**
+ @c put
+ @e check value is included in ary
+ @j ”z—ñ‚É—v‘f‚ª“ü‚Á‚Ä‚¢‚é‚©‚Ç‚¤‚©ƒ`ƒFƒbƒNBcase/when ‚ÅŽg‚¤
+ */
+DEFINE_INSN
+checkincludearray
+(VALUE flag)
+(VALUE obj, VALUE ary)
+(VALUE obj, VALUE result)
+{
+ int i;
+ result = Qfalse;
+
+ if (TYPE(ary) != T_ARRAY) {
+ ary = rb_Array(ary);
+ }
+
+ if (flag == Qtrue) {
+ /* NODE_CASE */
+ for (i = 0; i < RARRAY_LEN(ary); i++) {
+ // TODO: fix me (use another method dispatch)
+ if (RTEST(rb_funcall2(RARRAY_PTR(ary)[i], idEqq, 1, &obj))) {
+ result = Qtrue;
+ break;
+ }
+ }
+ }
+ else {
+ obj = Qfalse;
+ /* NODE_WHEN */
+ for (i = 0; i < RARRAY_LEN(ary); i++) {
+ if (RTEST(RARRAY_PTR(ary)[i])) {
+ obj = result = Qtrue;
+ break;
+ }
+ }
+ }
+}
+
+/**
+ @c put
+ @e put new Hash.
+ @j Hash.new
+ */
+DEFINE_INSN
+newhash
+(num_t num)
+(...)
+(VALUE val) // inc += 1 - num;
+{
+ int i;
+ VALUE k, v;
+ val = rb_hash_new();
+
+ for (i = num; i > 0; i -= 2) {
+ v = TOPN(i - 2);
+ k = TOPN(i - 1);
+ rb_hash_aset(val, k, v);
+ }
+ POPN(num);
+}
+
+/**
+ @c put
+ @e put new Range object.(Range.new(low, high, flag))
+ @j Range.new(low, high, flag) ‚̂悤‚ȃIƒuƒWƒFƒNƒg‚ð’u‚B
+ */
+DEFINE_INSN
+newrange
+(num_t flag)
+(VALUE low, VALUE high)
+(VALUE val)
+{
+ val = rb_range_new(low, high, flag);
+}
+
+/**
+ @c put
+ @e put !val.
+ @j !val ‚Å‚ ‚éƒIƒuƒWƒFƒNƒg‚ð’u‚B
+ */
+DEFINE_INSN
+putnot
+()
+(VALUE obj)
+(VALUE val)
+{
+ if (RTEST(obj)) {
+ val = Qfalse;
+ }
+ else {
+ val = Qtrue;
+ }
+}
+
+
+/**********************************************************/
+/* deal with stack operation */
+/**********************************************************/
+
+/**
+ @c stack
+ @e pop from stack.
+ @j ƒXƒ^ƒbƒN‚©‚çˆê‚ƒ|ƒbƒv‚·‚éB
+ */
+DEFINE_INSN
+pop
+()
+(VALUE val)
+()
+{
+ val = val;
+ /* none */
+}
+
+/**
+ @c stack
+ @e duplicate stack top.
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚É‚¨‚
+ */
+DEFINE_INSN
+dup
+()
+(VALUE val)
+(VALUE val1, VALUE val2)
+{
+ val1 = val2 = val;
+}
+
+/**
+ @c stack
+ @e duplicate stack top n elements
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚©‚ç n ŒÂ‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚É‚¨‚
+ */
+DEFINE_INSN
+dupn
+(num_t n)
+(...)
+(...) // inc += n;
+{
+ int i;
+ VALUE *sp = STACK_ADDR_FROM_TOP(n);
+ for (i = 0; i < n; i++) {
+ GET_SP()[i] = sp[i];
+ }
+ INC_SP(n);
+}
+
+
+/**
+ @c stack
+ @e swap top 2 vals
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì2‚‚ðŒðŠ·‚·‚éB
+ */
+DEFINE_INSN
+swap
+()
+(VALUE val, VALUE obj)
+(VALUE obj, VALUE val)
+{
+ /* none */
+}
+
+/**
+ @c stack
+ @e
+ @j
+ */
+DEFINE_INSN
+reput
+()
+(..., VALUE val)
+(VALUE val) // inc += 0;
+{
+ /* none */
+}
+
+/**
+ @c stack
+ @e get nth stack value from stack top
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚©‚ç n ŒÂ–Ú‚ðƒXƒ^ƒbƒNƒgƒbƒv‚ɃRƒs[
+ */
+DEFINE_INSN
+topn
+(num_t n)
+(...)
+(VALUE val) // inc += 1;
+{
+ val = TOPN(n);
+}
+
+/**
+ @c stack
+ @e set Nth stack entry to stack top
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì’l‚ð n ŒÂ–ڂ̃Xƒ^ƒbƒN‚ɃRƒs[
+ */
+DEFINE_INSN
+setn
+(num_t n)
+(..., VALUE val)
+(VALUE val) // inc += 0
+{
+ GET_SP()[-n] = val;
+}
+
+/**
+ @c stack
+ @e empt current stack
+ @j current stack ‚ð‹ó‚É‚·‚é
+ */
+DEFINE_INSN
+emptstack
+()
+(...)
+(...) // inc = 0; depth = 0;
+{
+ SET_SP(GET_CFP()->bp);
+}
+
+
+/**********************************************************/
+/* deal with setting */
+/**********************************************************/
+
+/**
+ @c setting
+ @e define (singleton) method id as body
+ @j i“ÁˆÙjƒƒ\ƒbƒh m ‚ð body ‚Æ‚µ‚Ä’è‹`‚·‚éB
+ */
+DEFINE_INSN
+definemethod
+(ID id, ISEQ body, num_t is_singleton)
+(VALUE obj)
+()
+{
+ eval_define_method(th, obj, id, body, is_singleton,
+ get_cref(GET_ISEQ(), GET_LFP()));
+}
+
+
+/**
+ @c setting
+ @e make alias (if v_p is Qtrue, make valias)
+ @j alias ‚ðì‚éB‚à‚µ v_p ‚ª Qtrue ‚È‚çAvalias (global variable) ‚ðì‚é
+ */
+DEFINE_INSN
+alias
+(VALUE v_p, ID id1, ID id2)
+()
+()
+{
+ VALUE klass;
+
+ if (v_p == Qtrue) {
+ rb_alias_variable(id1, id2);
+ }
+ else {
+ klass = get_cref(GET_ISEQ(), GET_LFP())->nd_clss;
+ rb_alias(klass, id1, id2);
+ }
+}
+
+/**
+ @c setting
+ @e undef
+ @j undef
+ */
+DEFINE_INSN
+undef
+(ID id)
+()
+()
+{
+ VALUE klass = get_cref(GET_ISEQ(), GET_LFP())->nd_clss;
+ rb_undef(klass, id);
+ INC_VM_STATE_VERSION();
+}
+
+/**
+ @c setting
+ @e defined?
+ @j defined?
+ */
+DEFINE_INSN
+defined
+(num_t type, VALUE obj, VALUE needstr)
+(VALUE v)
+(VALUE val)
+{
+ VALUE klass;
+ char *expr_type = 0;
+ char buf[0x10];
+
+ val = Qnil;
+
+ switch (type) {
+ case DEFINED_IVAR:
+ if (rb_ivar_defined(GET_SELF(), SYM2ID(obj))) {
+ expr_type = "instance-variable";
+ }
+ break;
+ case DEFINED_GVAR:
+ if (rb_gvar_defined((struct global_entry *)(obj & ~1))) {
+ expr_type = "global-variable";
+ }
+ break;
+ case DEFINED_CVAR:
+ klass = get_cref(GET_ISEQ(), GET_LFP())->nd_clss;
+ if (rb_cvar_defined(klass, SYM2ID(obj))) {
+ expr_type = "class variable";
+ }
+ break;
+ case DEFINED_CONST:
+ klass = v;
+ if (eval_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) {
+ expr_type = "constant";
+ }
+ break;
+ case DEFINED_FUNC:
+ klass = CLASS_OF(v);
+ if (rb_method_boundp(klass, SYM2ID(obj), 0)) {
+ expr_type = "method";
+ }
+ break;
+ case DEFINED_METHOD:{
+ VALUE klass = CLASS_OF(v);
+ NODE *method = (NODE *) rb_method_node(klass, SYM2ID(obj));
+
+ if (method) {
+ if (!(method->nd_noex & NOEX_PRIVATE)) {
+ if (!((method->nd_noex & NOEX_PROTECTED) &&
+ !rb_obj_is_kind_of(GET_SELF(),
+ rb_class_real(klass)))) {
+ expr_type = "method";
+ }
+ }
+ }
+ break;
+ }
+ case DEFINED_YIELD:
+ if (GET_BLOCK_PTR()) {
+ expr_type = "yield";
+ }
+ break;
+ case DEFINED_ZSUPER:{
+ yarv_iseq_t *ip = GET_ISEQ();
+ while (ip) {
+ if (ip->defined_method_id) {
+ break;
+ }
+ ip = ip->parent_iseq;
+ }
+ if (ip) {
+ VALUE klass = eval_search_super_klass(ip->klass, GET_SELF());
+ if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
+ expr_type = "super";
+ }
+ }
+ break;
+ }
+ case DEFINED_REF:{
+ int nth = FIX2INT(obj);
+ VALUE backref = *lfp_svar(GET_LFP(), 1);
+
+ if (rb_reg_nth_match(nth, backref) != Qnil) {
+ snprintf(buf, 0x10, "$%d", nth);
+ expr_type = buf;
+ }
+ break;
+ }
+ default:
+ rb_bug("unimplemented defined? type (VM)");
+ break;
+ }
+ if (expr_type != 0) {
+ if (needstr != Qfalse) {
+ val = rb_str_new2(expr_type);
+ }
+ else {
+ val = Qtrue;
+ }
+ }
+}
+
+/**
+ @c setting
+ @e END{}
+ @j END{}
+ */
+DEFINE_INSN
+postexe
+(ISEQ blockiseq)
+()
+()
+{
+ yarv_block_t *blockptr;
+ VALUE proc;
+
+ blockptr = GET_BLOCK_PTR_IN_CFP(GET_CFP());
+ blockptr->iseq = blockiseq;
+ blockptr->proc = 0;
+
+ proc = th_make_proc(th, GET_CFP(), blockptr);
+ rb_set_end_proc(call_yarv_end_proc, proc);
+}
+
+/**
+ @c setting
+ @e trace
+ @j trace
+ */
+DEFINE_INSN
+trace
+(num_t flag, VALUE args)
+()
+()
+{
+ /* TODO: trace instruction design */
+ if (th->vm->trace_flag & flag) {
+ /* */
+ args = Qnil;
+ }
+}
+
+/**********************************************************/
+/* deal with control flow 1: class/module */
+/**********************************************************/
+
+/**
+ @c class/module
+ @e
+ enter class definition scope. if super is Qfalse, and clsas
+ "klass" is defined, it's redefine. otherwise, define "klass" class.
+ @j
+ ƒNƒ‰ƒX’è‹`ƒXƒR[ƒv‚ÖˆÚs‚·‚éB‚à‚µ super ‚ª Qfalse ‚Å klassƒNƒ‰ƒX‚ª
+ ’è‹`‚³‚ê‚Ä‚¢‚ê‚ÎAÄ’è‹`‚Å‚ ‚éB‚»‚¤‚Å‚È‚¯‚ê‚ÎAklass ƒNƒ‰ƒX‚ð’è‹`‚·‚éB
+ */
+DEFINE_INSN
+defineclass
+(ID id, ISEQ klass_iseq, num_t define_type)
+(VALUE cbase, VALUE super)
+(VALUE val)
+{
+ VALUE klass;
+
+ if (define_type == 0) {
+ /* val is dummy. classdef returns class scope value */
+
+ if (super == Qnil) {
+ super = rb_cObject;
+ }
+ if (cbase == Qnil) {
+ cbase = th_get_cbase(th);
+ }
+
+ /* find klass */
+ if (rb_const_defined_at(cbase, id)) {
+ /* already exist */
+ klass = rb_const_get_at(cbase, id);
+ if (TYPE(klass) != T_CLASS) {
+ rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
+ }
+
+ if (super != rb_cObject) {
+ VALUE tmp;
+ tmp = rb_class_real(RCLASS(klass)->super);
+
+ if (tmp != super) {
+ rb_raise(rb_eTypeError, "superclass mismatch for class %s",
+ rb_id2name(id));
+ }
+ }
+ }
+ else {
+ /* new class declaration */
+ klass = rb_define_class_id(id, super);
+ rb_set_class_path(klass, cbase, rb_id2name(id));
+ rb_const_set(cbase, id, klass);
+ rb_class_inherited(super, klass);
+ }
+ }
+ else if (define_type == 1) {
+ /* val is dummy. classdef returns class scope value */
+ /* super is dummy */
+ klass = rb_singleton_class(cbase);
+ }
+ else if (define_type == 2) {
+ /* val is dummy. classdef returns class scope value */
+ /* super is dummy */
+ if (cbase == Qnil) {
+ cbase = th_get_cbase(th);
+ }
+
+ /* find klass */
+ if (rb_const_defined_at(cbase, id)) {
+ klass = rb_const_get_at(cbase, id);
+ /* already exist */
+ if (TYPE(klass) != T_MODULE) {
+ rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));
+ }
+ }
+ else {
+ /* new module declaration */
+ klass = rb_define_module_id(id);
+ rb_set_class_path(klass, cbase, rb_id2name(id));
+ rb_const_set(cbase, id, klass);
+ }
+ }
+ else {
+ rb_bug("unknown defineclass type: %d", define_type);
+ }
+
+ COPY_CREF(klass_iseq->cref_stack, th_cref_push(th, klass, NOEX_PUBLIC));
+
+ /* enter scope */
+ push_frame(th, klass_iseq,
+ FRAME_MAGIC_CLASS, klass, (VALUE) GET_DFP() | 0x02,
+ klass_iseq->iseq_encoded, GET_SP(), 0,
+ klass_iseq->local_size);
+ RESTORE_REGS();
+
+ INC_VM_STATE_VERSION();
+ NEXT_INSN();
+}
+
+
+/**********************************************************/
+/* deal with control flow 2: method/iterator */
+/**********************************************************/
+
+/**
+ @c method/iterator
+ @e obj.send(id, args..) # args.size => num
+ @j obj.send(id, args..) # args.size => num
+ flag & VM_CALL_ARGS_SPLAT_BIT != 0 -> splat last arg
+ flag & VM_CALL_ARGS_BLOCKARG_BIT != 0 -> Proc as Block
+ flag & VM_CALL_FCALL_BIT != 0 -> FCALL ( func() )
+ flag & VM_CALL_VCALL_BIT != 0 -> VCALL ( func )
+ */
+DEFINE_INSN
+send
+(ID id, num_t op_argc, ISEQ blockiseq, num_t op_flag, IC ic)
+(...)
+(VALUE val) // inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
+{
+ NODE *mn;
+ VALUE recv;
+ VALUE klass;
+ yarv_block_t *blockptr = 0;
+ num_t num = op_argc;
+ num_t flag = op_flag;
+
+ macro_eval_setup_send_arguments(num, blockptr, flag, blockiseq);
+ recv = TOPN(num);
+ klass = CLASS_OF(recv);
+
+ mn = eval_method_search(id, klass, ic);
+
+#if CURRENT_INSN_send || CURRENT_INSN_send_SC_xx_ax
+#if !YARV_AOT_COMPILED
+ if (0) {
+ if (0) {
+ LABEL_IS_SC(start_init_in_send_for_opt_1):
+ num = 1;
+ recv = TOPN(1);
+ }
+ else if (0) {
+ LABEL_IS_SC(start_init_in_send_for_opt_2):
+ num = 2;
+ recv = TOPN(2);
+ }
+ flag = 0;
+ id = tmp_id;
+ klass = CLASS_OF(recv);
+ blockptr = 0;
+ mn = rb_method_node(klass, id);
+ }
+ if (0) {
+ LABEL_IS_SC(start_init_in_super):
+ {
+ yarv_iseq_t *iseq = GET_ISEQ();
+ yarv_iseq_t *ip = iseq;
+
+ num = tmp_num;
+ flag = VM_CALL_FCALL_BIT;
+ recv = GET_SELF();
+
+ while (ip && !ip->klass) {
+ ip = ip->parent_iseq;
+ }
+
+ if (ip == 0) {
+ rb_raise(rb_eNoMethodError, "super called outside of method");
+ }
+
+ id = ip->defined_method_id;
+
+ if (ip != ip->local_iseq) {
+ /* defined by method_defined() */
+ yarv_control_frame_t *lcfp = GET_CFP();
+
+ while (lcfp->iseq != ip) {
+ VALUE *tdfp = GET_PREV_DFP(lcfp->dfp);
+ while (1) {
+ lcfp = YARV_PREVIOUS_CONTROL_FRAME(lcfp);
+ if (lcfp->dfp == tdfp) {
+ break;
+ }
+ }
+ }
+
+ /* dirty hack */
+ id = (ID) ((VALUE *)(lcfp+1)->block_iseq)[0];
+ klass = ((VALUE *)(lcfp+1)->block_iseq)[1];
+
+ if (TOPN(num) == Qfalse) {
+ /* for ZSUPER */
+ int i;
+ POPN(num);
+ num = ip->argc;
+ for (i = 0; i < ip->argc; i++) {
+ PUSH(lcfp->dfp[i - ip->local_size]);
+ }
+ }
+ }
+ klass = eval_search_super_klass(ip->klass, recv);
+ flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
+ blockptr = tmp_blockptr;
+ mn = rb_method_node(klass, id);
+ }
+ }
+ LABEL_IS_SC(start_method_dispatch):
+#endif
+#endif
+ macro_eval_invoke_method(recv, klass, id, num, mn, blockptr);
+ YARV_CHECK_INTS();
+}
+
+/**
+ @c method/iterator
+ @e super(args) # args.size => num
+ @j super(args) # args.size => num
+ */
+DEFINE_INSN
+invokesuper
+(num_t op_argc, ISEQ blockiseq, num_t flag)
+(...)
+(VALUE val) // inc += - op_argc;
+{
+#if YARV_AOT_COMPILED
+ /* TODO: */
+ rb_bug("...");
+#else
+ tmp_num = op_argc;
+ tmp_blockptr = 0;
+ macro_eval_setup_send_arguments(tmp_num, tmp_blockptr, flag, blockiseq);
+ if (!tmp_blockptr && !(flag & VM_CALL_ARGS_BLOCKARG_BIT)) {
+ tmp_blockptr = GET_BLOCK_PTR();
+ }
+ goto LABEL_IS_SC(start_init_in_super);
+#endif
+}
+
+/**
+ @c method/iterator
+ @e yield(args) # args.size => num, flag shows expand argument or not
+ @j yield(args) # args.size => num
+ */
+DEFINE_INSN
+invokeblock
+(num_t num, num_t flag)
+(...)
+(VALUE val) // inc += 1 - num;
+{
+ yarv_block_t *block = GET_BLOCK_PTR();
+ yarv_iseq_t *iseq;
+ int argc = num;
+
+ if (GET_ISEQ()->local_iseq->type != ISEQ_TYPE_METHOD || block == 0) {
+ th_localjump_error("no block given (yield)", Qnil, 0);
+ }
+ iseq = block->iseq;
+
+ if (BUILTIN_TYPE(iseq) != T_NODE) {
+ if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+ VALUE ary = TOPN(0);
+ if (CLASS_OF(ary) != rb_cArray) {
+ /* not a [BUG] */
+ }
+ else {
+ VALUE *ptr = RARRAY_PTR(ary);
+ VALUE *dst = GET_SP() - 1;
+ int i, len = RARRAY_LEN(ary);
+ for (i = 0; i < len; i++) {
+ dst[i] = ptr[i];
+ }
+ argc += i - 1;
+ INC_SP(i - 1);
+ }
+ }
+
+ INC_SP(-argc);
+ argc = th_yield_setup_args(iseq, argc, GET_SP());
+ INC_SP(argc);
+
+ push_frame(th, iseq,
+ FRAME_MAGIC_BLOCK, block->self, (VALUE) block->dfp,
+ iseq->iseq_encoded, GET_SP(), block->lfp,
+ iseq->local_size - argc);
+
+ reg_cfp->sp -= argc;
+ RESTORE_REGS();
+ NEXT_INSN();
+ /* unreachable */
+ }
+ else {
+ val = th_invoke_yield_cfunc(th, block, block->self,
+ num, STACK_ADDR_FROM_TOP(num));
+ POPN(num);
+ }
+}
+
+/**
+ @c method/iterator
+ @e return from this scope.
+ @j ‚±‚̃XƒR[ƒv‚©‚甲‚¯‚éB
+ */
+DEFINE_INSN
+leave
+()
+(VALUE val)
+(VALUE val)
+{
+ if (OPT_CHECKED_RUN) {
+ if (reg_cfp->sp != reg_cfp->bp) {
+ rb_bug("Stack consistency error (sp: %p, bp: %p)",
+ reg_cfp->sp, reg_cfp->bp);
+ }
+ }
+
+ YARV_CHECK_INTS();
+ pop_frame(th);
+ RESTORE_REGS();
+}
+
+/**
+ @c method/iterator
+ @e return from this vm loop
+ @j VM loop ‚©‚甲‚¯‚é
+ */
+DEFINE_INSN
+finish
+()
+(VALUE val)
+(VALUE val)
+{
+ th->cfp++;
+ return val;
+}
+
+/**********************************************************/
+/* deal with control flow 3: exception */
+/**********************************************************/
+
+/**
+ @c exception
+ @e longjump
+ @j longjump
+ */
+DEFINE_INSN
+throw
+(num_t throw_state)
+(VALUE throwobj)
+(VALUE val)
+{
+ num_t state = throw_state & 0xff;
+ num_t flag = throw_state & 0x8000;
+ num_t level = throw_state >> 16;
+ val = Qnil; /* dummy */
+
+ if (state != 0) {
+ VALUE *pt;
+ int i;
+ if (flag != 0) {
+ if (throw_state & 0x4000) {
+ pt = (void *)1;
+ }
+ else {
+ pt = 0;
+ }
+ }
+ else {
+ if (state == TAG_BREAK || state == TAG_RETRY) {
+ pt = GC_GUARDED_PTR_REF((VALUE *) * GET_DFP());
+ for (i = 0; i < level; i++) {
+ pt = GC_GUARDED_PTR_REF((VALUE *) * pt);
+ }
+ }
+ else if (state == TAG_RETURN) {
+ yarv_control_frame_t *cfp = GET_CFP();
+ int is_orphan = 1;
+ VALUE *dfp = GET_DFP();
+
+ /* check orphan */
+ while ((VALUE *) cfp < th->stack + th->stack_size) {
+ if (GET_LFP() == cfp->lfp) {
+ is_orphan = 0;
+ break;
+ }
+ else if (dfp == cfp->dfp) {
+ /* return from lambda{} */
+ if (cfp->magic == FRAME_MAGIC_LAMBDA) {
+ is_orphan = 0;
+ break;
+ }
+ dfp = GC_GUARDED_PTR_REF(*cfp->dfp);
+ }
+ cfp++;
+ }
+ if (is_orphan) {
+ th_localjump_error("unexpected return", throwobj,
+ TAG_RETURN);
+ }
+
+ /* set current lfp */
+ pt = GET_LFP();
+ }
+ else {
+ rb_bug("isns(throw): unsupport thorw type");
+ }
+ }
+ th->state = state;
+ return (VALUE) NEW_THROW_OBJECT(throwobj, (VALUE) pt, state);
+ }
+ else {
+ /* continue throw */
+ VALUE err = throwobj;
+
+ if (FIXNUM_P(err)) {
+ th->state = FIX2INT(err);
+ }
+ else if (SYMBOL_P(err)) {
+ th->state = TAG_THROW;
+ }
+ else if (BUILTIN_TYPE(err) == T_NODE) {
+ th->state = GET_THROWOBJ_STATE(err);
+ }
+ else {
+ th->state = FIX2INT(rb_ivar_get(err, idThrowState));
+ }
+ return err;
+ }
+ /* unreachable */
+}
+
+/**********************************************************/
+/* deal with control flow 4: local jump */
+/**********************************************************/
+
+/**
+ @c jump
+ @e set PC to (PC + dst).
+ @j PC ‚ð (PC + dst) ‚É‚·‚éB
+ */
+DEFINE_INSN
+jump
+(OFFSET dst)
+()
+()
+{
+ YARV_CHECK_INTS();
+ JUMP(dst);
+}
+
+/**
+ @c jump
+ @e if val is not false or nil, set PC to (PC + dst).
+ @j ‚à‚µ val ‚ª false ‚© nil ‚Å‚È‚¯‚ê‚ÎAPC ‚ð (PC + dst) ‚É‚·‚éB
+ */
+DEFINE_INSN
+branchif
+(OFFSET dst)
+(VALUE val)
+()
+{
+ if (RTEST(val)) {
+ YARV_CHECK_INTS();
+ JUMP(dst);
+ }
+}
+
+/**
+ @c jump
+ @e if val is false or nil, set PC to (PC + dst).
+ @j ‚à‚µ val ‚ª false ‚© nil ‚È‚ç‚ÎAPC ‚ð (PC + dst) ‚É‚·‚éB
+ */
+DEFINE_INSN
+branchunless
+(OFFSET dst)
+(VALUE val)
+()
+{
+ if (!RTEST(val)) {
+ YARV_CHECK_INTS();
+ JUMP(dst);
+ }
+}
+
+
+/**********************************************************/
+/* for optimize */
+/**********************************************************/
+
+/**
+ @c optimize
+ @e inline cache
+ @j inline cache
+ */
+DEFINE_INSN
+getinlinecache
+(IC ic, OFFSET dst)
+()
+(VALUE val)
+{
+ if (ic->ic_vmstat == GET_VM_STATE_VERSION()) {
+ val = ic->ic_value;
+ JUMP(dst);
+ }
+ else {
+ /* none */
+ val = Qnil;
+ }
+}
+
+/**
+ @c optimize
+ @e inline cache (once)
+ @j inline cache (once)
+ */
+DEFINE_INSN
+onceinlinecache
+(IC ic, OFFSET dst)
+()
+(VALUE val)
+{
+ if (ic->ic_vmstat) {
+ val = ic->ic_value;
+ JUMP(dst);
+ }
+ else {
+ /* none */
+ val = Qnil;
+ }
+}
+
+/**
+ @c optimize
+ @e set inline cache
+ @j set inline cahce
+ */
+DEFINE_INSN
+setinlinecache
+(OFFSET dst)
+(VALUE val)
+(VALUE val)
+{
+ IC ic = (IC) * (GET_PC() + dst + 1);
+
+ ic->ic_value = val;
+ ic->ic_vmstat = GET_VM_STATE_VERSION();
+}
+
+/**
+ @c optimize
+ @e case dispatcher
+ @j case dispatcher
+ */
+DEFINE_INSN
+opt_case_dispatch
+(CDHASH hash, OFFSET else_offset)
+(..., VALUE key)
+() // inc += -1;
+{
+ if (0) {
+ /* if some === method is overrided */
+ }
+ else {
+ VALUE val;
+ if (st_lookup(RHASH(hash)->tbl, key, &val)) {
+ JUMP(FIX2INT(val));
+ }
+ else {
+ JUMP(else_offset);
+ }
+ }
+}
+
+/**
+ @c optimize
+ @e check environment
+ @j check environment
+ */
+DEFINE_INSN
+opt_checkenv
+()
+()
+()
+{
+ if (GET_CFP()->bp != GET_DFP() + 1) {
+ VALUE *new_dfp = GET_CFP()->bp - 1;
+ /* TODO: copy env and clean stack at creating env? */
+ *new_dfp = *GET_DFP();
+ SET_DFP(new_dfp);
+ }
+}
+
+
+/** simple functions */
+
+
+/**
+ @c optimize
+ @e optimized X+Y.
+ @j Å“K‰»‚³‚ꂽ X+YB
+ */
+DEFINE_INSN
+opt_plus
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (0) {
+
+ }
+#if 1
+ else if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+ /* fixnum + fixnum */
+ val = (recv + (obj & (~1)));
+ if ((~(recv ^ obj) & (recv ^ val)) &
+ ((VALUE)0x01 << ((sizeof(VALUE) * CHAR_BIT) - 1))) {
+ val = rb_big_plus(rb_int2big(FIX2INT(recv)),
+ rb_int2big(FIX2INT(obj)));
+ }
+ }
+#endif
+
+ else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+ if (0) {
+ }
+#if 1
+ else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+ HEAP_CLASS_OF(obj) == rb_cFloat &&
+ BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+ val = rb_float_new(RFLOAT(recv)->value + RFLOAT(obj)->value);
+ }
+#endif
+
+#if 1
+ else if (HEAP_CLASS_OF(recv) == rb_cString &&
+ HEAP_CLASS_OF(obj) == rb_cString &&
+ BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+ val = rb_str_plus(recv, obj);
+ }
+#endif
+#if 1
+ else if (HEAP_CLASS_OF(recv) == rb_cArray &&
+ BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
+ val = rb_ary_plus(recv, obj);
+ }
+#endif
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idPLUS, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idPLUS;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized X-Y.
+ @j Å“K‰»‚³‚ꂽ X-YB
+ */
+DEFINE_INSN
+opt_minus
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
+ long a, b, c;
+
+ a = FIX2LONG(recv);
+ b = FIX2LONG(obj);
+ c = a - b;
+ val = LONG2FIX(c);
+
+ if (FIX2LONG(val) != c) {
+ val = rb_big_minus(rb_int2big(a), rb_int2big(b));
+ }
+ }
+ else {
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idMINUS, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idMINUS;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized X*Y.
+ @j Å“K‰»‚³‚ꂽ X*YB
+ */
+DEFINE_INSN
+opt_mult
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
+ long a, b, c;
+
+ a = FIX2LONG(recv);
+ if (a == 0) {
+ val = recv;
+ }
+ else {
+ b = FIX2LONG(obj);
+ c = a * b;
+ val = LONG2FIX(c);
+
+ if (FIX2LONG(val) != c || c / a != b) {
+ val = rb_big_mul(rb_int2big(a), rb_int2big(b));
+ }
+ }
+ }
+ else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+ if (0) {
+ }
+#if 1
+ else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+ HEAP_CLASS_OF(obj) == rb_cFloat &&
+ BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
+ val = rb_float_new(RFLOAT(recv)->value * RFLOAT(obj)->value);
+ }
+#endif
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idMULT, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idMULT;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized X/Y.
+ @j Å“K‰»‚³‚ꂽ X/YB
+ */
+DEFINE_INSN
+opt_div
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
+ long x, y, div;
+
+ x = FIX2LONG(recv);
+ y = FIX2LONG(obj);
+ {
+ /* copied from numeric.c#fixdivmod */
+ long mod;
+ if (y == 0)
+ rb_num_zerodiv();
+ if (y < 0) {
+ if (x < 0)
+ div = -x / -y;
+ else
+ div = -(x / -y);
+ }
+ else {
+ if (x < 0)
+ div = -(-x / y);
+ else
+ div = x / y;
+ }
+ mod = x - div * y;
+ if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
+ mod += y;
+ div -= 1;
+ }
+ }
+ val = LONG2FIX(div);
+ }
+ else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+ if (0) {
+ }
+#if 1
+ else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+ HEAP_CLASS_OF(obj) == rb_cFloat &&
+ BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
+ val = rb_float_new(RFLOAT(recv)->value / RFLOAT(obj)->value);
+ }
+#endif
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idDIV, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idDIV;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized X%Y.
+ @j Å“K‰»‚³‚ꂽ X%YB
+ */
+DEFINE_INSN
+opt_mod
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
+ long x, y, mod;
+
+ x = FIX2LONG(recv);
+ y = FIX2LONG(obj);
+ {
+ /* copied from numeric.c#fixdivmod */
+ long div;
+
+ if (y == 0)
+ rb_num_zerodiv();
+ if (y < 0) {
+ if (x < 0)
+ div = -x / -y;
+ else
+ div = -(x / -y);
+ }
+ else {
+ if (x < 0)
+ div = -(-x / y);
+ else
+ div = x / y;
+ }
+ mod = x - div * y;
+ if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
+ mod += y;
+ div -= 1;
+ }
+ }
+ val = LONG2FIX(mod);
+ }
+ else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+ if (0) {
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+ HEAP_CLASS_OF(obj) == rb_cFloat &&
+ BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
+ double x = RFLOAT(recv)->value;
+ double y = RFLOAT(obj)->value;
+ double div, mod;
+
+ /* copied from numeric.c#flodivmod */
+#if 0 && defined(HAVE_FMOD) && !__x86_64__ /* temporary */
+ mod = fmod(x, y);
+ printf("-- %f %% %f = %f\n", x, y, mod);
+#else
+ {
+ double z;
+
+ modf(x / y, &z);
+ mod = x - z * y;
+ }
+#endif
+ div = (x - mod) / y;
+ if (y * mod < 0) {
+ mod += y;
+ div -= 1.0;
+ }
+ val = rb_float_new(mod);
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idMOD, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idMOD;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized X==Y.
+ @j Å“K‰»‚³‚ꂽ X==YB
+ */
+DEFINE_INSN
+opt_eq
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_EQ)) {
+ long a = FIX2LONG(recv), b = FIX2LONG(obj);
+
+ if (a == b) {
+ val = Qtrue;
+ }
+ else {
+ val = Qfalse;
+ }
+ }
+ else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+ if (0) {
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+ HEAP_CLASS_OF(obj) == rb_cFloat &&
+ BASIC_OP_UNREDEFINED_P(BOP_EQ)) {
+ double a = RFLOAT(recv)->value;
+ double b = RFLOAT(obj)->value;
+
+ if (isnan(a) || isnan(b)) {
+ val = Qfalse;
+ }
+ else if (a == b) {
+ val = Qtrue;
+ }
+ else {
+ val = Qfalse;
+ }
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cString &&
+ HEAP_CLASS_OF(obj) == rb_cString &&
+ BASIC_OP_UNREDEFINED_P(BOP_EQ)) {
+
+ VALUE str1 = recv;
+ VALUE str2 = obj;
+ if (str1 == str2) {
+ val = Qtrue;
+ }
+ else if (RSTRING_LEN(str1) == RSTRING_LEN(str2) &&
+ rb_memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2),
+ RSTRING_LEN(str1)) == 0) {
+ val = Qtrue;
+ }
+ else {
+ val = Qfalse;
+ }
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idEq, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idEq;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+
+/**
+ @c optimize
+ @e optimized X<Y.
+ @j Å“K‰»‚³‚ꂽ X<YB
+ */
+DEFINE_INSN
+opt_lt
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_LT)) {
+ long a = FIX2LONG(recv), b = FIX2LONG(obj);
+
+ if (a < b) {
+ val = Qtrue;
+ }
+ else {
+ val = Qfalse;
+ }
+ }
+ else {
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idLT, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idLT;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized X<=Y.
+ @j Å“K‰»‚³‚ꂽ X<=YB
+ */
+DEFINE_INSN
+opt_le
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (FIXNUM_2_P(recv, obj) &&
+ BASIC_OP_UNREDEFINED_P(BOP_LE)) {
+ long a = FIX2LONG(recv), b = FIX2LONG(obj);
+
+ if (a <= b) {
+ val = Qtrue;
+ }
+ else {
+ val = Qfalse;
+ }
+ }
+ else {
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idLE, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idLE;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e <<
+ @j <<
+ */
+DEFINE_INSN
+opt_ltlt
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (0) {
+ }
+ if (!SPECIAL_CONST_P(recv)) {
+ if (0) {
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cString &&
+ BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
+ val = rb_str_concat(recv, obj);
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cArray &&
+ BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
+ val = rb_ary_push(recv, obj);
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idLTLT, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idLTLT;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e []
+ @j []
+ */
+DEFINE_INSN
+opt_aref
+()
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+ if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_AREF)) {
+ if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
+ val = rb_ary_entry(recv, FIX2LONG(obj));
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+ val = rb_hash_aref(recv, obj);
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idAREF, 1, obj);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ tmp_id = idAREF;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_1);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e recv[obj] = set
+ @j recv[obj] = set
+ */
+DEFINE_INSN
+opt_aset
+()
+(VALUE recv, VALUE obj, VALUE set)
+(VALUE val)
+{
+ if (!SPECIAL_CONST_P(recv) &&
+ BASIC_OP_UNREDEFINED_P(BOP_ASET)) {
+ if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
+ rb_ary_store(recv, FIX2LONG(obj), set);
+ val = set;
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+ rb_hash_aset(recv, obj, set);
+ val = set;
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idASET, 2, obj, set);
+#else
+ PUSH(recv);
+ PUSH(obj);
+ PUSH(set);
+ tmp_id = idASET;
+ goto LABEL_IS_SC(start_init_in_send_for_opt_2);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized length
+ @j optimized length
+ */
+DEFINE_INSN
+opt_length
+()
+(VALUE recv)
+(VALUE val)
+{
+ if (!SPECIAL_CONST_P(recv) &&
+ BASIC_OP_UNREDEFINED_P(BOP_LENGTH)) {
+ if (HEAP_CLASS_OF(recv) == rb_cArray) {
+ val = LONG2NUM(RARRAY_LEN(recv));
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cString) {
+ val = LONG2NUM(RSTRING_LEN(recv));
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+ val = INT2FIX(RHASH(recv)->tbl->num_entries);
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ INSN_LABEL(normal_dispatch):
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idLength, 0);
+#else
+ val = rb_funcall(recv, idLength, 0);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized succ
+ @j optimized succ
+ */
+DEFINE_INSN
+opt_succ
+()
+(VALUE recv)
+(VALUE val)
+{
+ if (SPECIAL_CONST_P(recv)) {
+ if (FIXNUM_P(recv) &&
+ BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
+ const VALUE obj = INT2FIX(1);
+ /* fixnum + INT2FIX(1) */
+ val = (recv + (obj & (~1)));
+ if ((~(recv ^ obj) & (recv ^ val)) & 0x80000000) {
+ val = rb_big_plus(rb_int2big(INT2FIX(recv)),
+ rb_int2big(INT2FIX(obj)));
+ }
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ else {
+ if (HEAP_CLASS_OF(recv) == rb_cString &&
+ BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
+ val = rb_str_succ(recv);
+ }
+ else if (HEAP_CLASS_OF(recv) == rb_cTime &&
+ BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
+ val = rb_time_succ(recv);
+ }
+ else {
+ goto INSN_LABEL(normal_dispatch);
+ }
+ }
+ if (0) {
+ INSN_LABEL(normal_dispatch):
+ /* other */
+#ifdef YARV_AOT_COMPILED
+ val = rb_funcall(recv, idSucc, 0);
+#else
+ val = rb_funcall(recv, idSucc, 0);
+#endif
+ }
+}
+
+/**
+ @c optimize
+ @e optimized regexp match
+ @j Å“K‰»‚³‚ꂽ³‹K•\Œ»ƒ}ƒbƒ`
+ */
+DEFINE_INSN
+opt_regexpmatch1
+(VALUE r)
+(VALUE obj)
+(VALUE val)
+{
+ val = rb_reg_match(r, obj);
+}
+
+/**
+ @c optimize
+ @e optimized regexp match 2
+ @j Å“K‰»‚³‚ꂽ³‹K•\Œ»ƒ}ƒbƒ` 2
+ */
+DEFINE_INSN
+opt_regexpmatch2
+()
+(VALUE obj2, VALUE obj1)
+(VALUE val)
+{
+ if (TYPE(obj2) == T_STRING) {
+ val = rb_reg_match(obj1, obj2);
+ }
+ else {
+ val = rb_funcall(obj2, idEqTilde, 1, obj1);
+ }
+}
+
+/**
+ @c optimize
+ @e call native compiled method
+ @j ƒlƒCƒeƒBƒuƒRƒ“ƒpƒCƒ‹‚µ‚½ƒƒ\ƒbƒh‚ð kick
+ */
+DEFINE_INSN
+opt_call_native_compiled
+()
+()
+()
+{
+#if __GNUC__ && OPT_USE_JIT_COMPILE
+ yarv_iseq_t *iseq = GET_ISEQ();
+ void *label = (void *)iseq->jit_compiled;
+
+ breakpoint();
+ SET_PC(iseq->iseq_orig);
+ goto *label;
+#else
+ rb_bug("opt_call_native_compiled is not supported");
+#endif
+}
+
+/**
+ @c joke
+ @e BLT
+ @j BLT
+ */
+DEFINE_INSN
+bitblt
+()
+()
+(VALUE ret)
+{
+ ret = rb_str_new2("a bit of bacon, lettuce and tomato");
+}
+
+/**
+ @c joke
+ @e The Answer to Life, the Universe, and Everything
+ @j l¶A‰F’ˆA‚·‚ׂĂ̓š‚¦
+ */
+DEFINE_INSN
+answer
+()
+()
+(VALUE ret)
+{
+ ret = INT2FIX(42);
+}
+
@@ -38,6 +38,10 @@ VALUE rb_ary_new2(long); VALUE rb_ary_new3(long,...); VALUE rb_ary_new4(long, const VALUE *); void rb_ary_free(VALUE); +VALUE rb_values_new(long,...); +VALUE rb_values_new2(long, const VALUE *); +VALUE rb_values_from_ary(VALUE); +VALUE rb_ary_from_values(VALUE); VALUE rb_ary_freeze(VALUE); VALUE rb_ary_aref(int, VALUE*, VALUE); void rb_ary_store(VALUE, long, VALUE); @@ -64,6 +68,7 @@ VALUE rb_ary_assoc(VALUE, VALUE); VALUE rb_ary_rassoc(VALUE, VALUE); VALUE rb_ary_includes(VALUE, VALUE); VALUE rb_ary_cmp(VALUE, VALUE); +VALUE rb_ary_replace(VALUE copy, VALUE orig); VALUE rb_check_array_value(VALUE); VALUE rb_get_values_at(VALUE, long, int, VALUE*, VALUE(*)(VALUE,long)); /* bignum.c */ @@ -226,9 +231,7 @@ VALUE rb_apply(VALUE, ID, VALUE); void rb_backtrace(void); ID rb_frame_this_func(void); VALUE rb_obj_instance_eval(int, VALUE*, VALUE); -VALUE rb_obj_instance_exec(int, VALUE*, VALUE); VALUE rb_mod_module_eval(int, VALUE*, VALUE); -VALUE rb_mod_module_exec(int, VALUE*, VALUE); void rb_load(VALUE, int); void rb_load_protect(VALUE, int, int*); NORETURN(void rb_jump_tag(int)); @@ -271,10 +274,9 @@ VALUE rb_thread_wakeup(VALUE); VALUE rb_thread_run(VALUE); VALUE rb_thread_kill(VALUE); VALUE rb_thread_create(VALUE (*)(ANYARGS), void*); -void rb_thread_interrupt(void); void rb_thread_trap_eval(VALUE, int, int); -void rb_thread_signal_raise(const char*); /* should pass literal */ -void rb_thread_signal_exit(void); +void rb_thread_signal_raise(void *, const char*); /* should pass literal */ +void rb_thread_signal_exit(void *); int rb_thread_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); void rb_thread_wait_for(struct timeval); VALUE rb_thread_current(void); @@ -450,7 +452,7 @@ const char* rb_get_kcode(void); /* ruby.c */ RUBY_EXTERN VALUE rb_argv; RUBY_EXTERN VALUE rb_argv0; -void rb_load_file(const char*); +void *rb_load_file(const char*); void ruby_script(const char*); void ruby_prog_init(void); void ruby_set_argv(int, char**); @@ -568,11 +570,9 @@ VALUE rb_mod_remove_const(VALUE, VALUE); int rb_const_defined(VALUE, ID); int rb_const_defined_at(VALUE, ID); int rb_const_defined_from(VALUE, ID); -int rb_const_defined_fallback(VALUE, ID, struct RNode *); VALUE rb_const_get(VALUE, ID); VALUE rb_const_get_at(VALUE, ID); VALUE rb_const_get_from(VALUE, ID); -VALUE rb_const_get_fallback(VALUE, ID, struct RNode *); void rb_const_set(VALUE, ID, VALUE); VALUE rb_mod_const_missing(VALUE,VALUE); VALUE rb_cvar_defined(VALUE, ID); @@ -588,4 +588,11 @@ VALUE rb_mod_remove_cvar(VALUE, VALUE); void ruby_show_version(void); void ruby_show_copyright(void); +ID rb_frame_callee(void); +VALUE rb_str_succ(VALUE); +VALUE rb_time_succ(VALUE); +void Init_stack(VALUE*); +void rb_frame_pop(void); +NORETURN(void rb_thread_start_1(void)); + #endif /* RUBY_INTERN_H */ diff --git a/iseq.c b/iseq.c new file mode 100644 index 0000000000..73902416fd --- /dev/null +++ b/iseq.c @@ -0,0 +1,1345 @@ +/********************************************************************** + + iseq.c - + + $Author$ + $Date$ + created at: 2006-07-11(Tue) 09:00:03 +0900 + + Copyright (C) 2006 Koichi Sasada + +**********************************************************************/ + +#include <ruby.h> +#include <node.h> + +#include "yarvcore.h" +#include "insns.inc" +#include "insns_info.inc" + +// #define MARK_FREE_DEBUG 1 +#include "gc.h" + +static void +compile_data_free(struct iseq_compile_data *compile_data) +{ + if (compile_data) { + struct iseq_compile_data_storage *cur, *next; + cur = compile_data->storage_head; + while (cur) { + next = cur->next; + ruby_xfree(cur); + cur = next; + } + ruby_xfree(compile_data); + } +} + +static void +iseq_free(void *ptr) +{ + yarv_iseq_t *iseq; + FREE_REPORT_ENTER("iseq"); + + if (ptr) { + iseq = ptr; + /* It's possible that strings are freed + * GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name), + * RSTRING_PTR(iseq->file_name)); + */ + if (iseq->iseq != iseq->iseq_encoded) { + FREE_UNLESS_NULL(iseq->iseq_encoded); + } + + FREE_UNLESS_NULL(iseq->iseq); + FREE_UNLESS_NULL(iseq->insn_info_tbl); + FREE_UNLESS_NULL(iseq->local_tbl); + FREE_UNLESS_NULL(iseq->catch_table); + FREE_UNLESS_NULL(iseq->arg_opt_tbl); + compile_data_free(iseq->compile_data); + ruby_xfree(ptr); + } + FREE_REPORT_LEAVE("iseq"); +} + +static void +iseq_mark(void *ptr) +{ + yarv_iseq_t *iseq; + MARK_REPORT_ENTER("iseq"); + + if (ptr) { + iseq = ptr; + GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->file_name)); + MARK_UNLESS_NULL(iseq->iseq_mark_ary); + MARK_UNLESS_NULL(iseq->name); + MARK_UNLESS_NULL(iseq->file_name); + MARK_UNLESS_NULL((VALUE)iseq->cref_stack); + MARK_UNLESS_NULL(iseq->klass); + MARK_UNLESS_NULL((VALUE)iseq->node); + MARK_UNLESS_NULL(iseq->cached_special_block); + + if (iseq->compile_data != 0) { + MARK_UNLESS_NULL(iseq->compile_data->mark_ary); + MARK_UNLESS_NULL(iseq->compile_data->err_info); + MARK_UNLESS_NULL(iseq->compile_data->catch_table_ary); + } + } + MARK_REPORT_LEAVE("iseq"); +} + +static VALUE +iseq_alloc(VALUE klass) +{ + VALUE volatile obj; + yarv_iseq_t *iseq; + + obj = Data_Make_Struct(klass, yarv_iseq_t, iseq_mark, iseq_free, iseq); + MEMZERO(iseq, yarv_iseq_t, 1); + return obj; +} + +static VALUE +prepare_iseq_build(yarv_iseq_t *iseq, + VALUE name, VALUE file_name, + VALUE parent, VALUE type, VALUE block_opt, + const yarv_compile_option_t *option) +{ + iseq->name = name; + iseq->defined_method_id = 0; + iseq->file_name = file_name; + iseq->iseq_mark_ary = rb_ary_new(); + RBASIC(iseq->iseq_mark_ary)->klass = 0; + + iseq->type = type; + iseq->arg_rest = 0; + iseq->arg_block = 0; + iseq->klass = 0; + iseq->special_block_builder = GC_GUARDED_PTR_REF(block_opt); + iseq->cached_special_block_builder = 0; + iseq->cached_special_block = 0; + + /* set class nest stack */ + if (type == ISEQ_TYPE_TOP) { + /* toplevel is private */ + iseq->cref_stack = NEW_BLOCK(rb_cObject); + iseq->cref_stack->nd_file = 0; + iseq->cref_stack->nd_visi = NOEX_PRIVATE; + } + else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) { + iseq->cref_stack = NEW_BLOCK(0); /* place holder */ + iseq->cref_stack->nd_file = 0; + } + else if (parent) { + yarv_iseq_t *piseq; + GetISeqPtr(parent, piseq); + iseq->cref_stack = piseq->cref_stack; + } + + iseq->compile_data = ALLOC(struct iseq_compile_data); + MEMZERO(iseq->compile_data, struct iseq_compile_data, 1); + iseq->compile_data->mark_ary = rb_ary_new(); + RBASIC(iseq->compile_data->mark_ary)->klass = 0; + + iseq->compile_data->storage_head = iseq->compile_data->storage_current = + (struct iseq_compile_data_storage *) + ALLOC_N(char, INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE + + sizeof(struct iseq_compile_data_storage)); + + iseq->compile_data->catch_table_ary = rb_ary_new(); + iseq->compile_data->storage_head->pos = 0; + iseq->compile_data->storage_head->next = 0; + iseq->compile_data->storage_head->size = + INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE; + iseq->compile_data->storage_head->buff = + (char *)(&iseq->compile_data->storage_head->buff + 1); + iseq->compile_data->option = option; + + if (type == ISEQ_TYPE_TOP || + type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) { + iseq->local_iseq = iseq; + } + else { + yarv_iseq_t *piseq; + GetISeqPtr(parent, piseq); + iseq->local_iseq = piseq->local_iseq; + } + + if (RTEST(parent)) { + yarv_iseq_t *piseq; + GetISeqPtr(parent, piseq); + iseq->parent_iseq = piseq; + } + + return Qtrue; +} + +static VALUE +cleanup_iseq_build(yarv_iseq_t *iseq) +{ + struct iseq_compile_data *data = iseq->compile_data; + iseq->compile_data = 0; + compile_data_free(data); + + if (ruby_nerrs > 0) { + VALUE str = rb_str_buf_new2("compile error"); + ruby_nerrs = 0; + rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str)); + } + return Qtrue; +} + +static yarv_compile_option_t COMPILE_OPTION_DEFAULT = { + OPT_INLINE_CONST_CACHE, /* int inline_const_cache; */ + OPT_PEEPHOLE_OPTIMIZATION, /* int peephole_optimization; */ + OPT_SPECIALISED_INSTRUCTION, /* int specialized_instruction; */ + OPT_OPERANDS_UNIFICATION, /* int operands_unification; */ + OPT_INSTRUCTIONS_UNIFICATION, /* int instructions_unification; */ + OPT_STACK_CACHING, /* int stack_caching; */ +}; +static const yarv_compile_option_t COMPILE_OPTION_FALSE; + +static void +make_compile_option(yarv_compile_option_t *option, VALUE opt) +{ + if (opt == Qnil) { + *option = COMPILE_OPTION_DEFAULT; + } + else if (opt == Qfalse) { + *option = COMPILE_OPTION_FALSE; + } + else if (opt == Qtrue) { + memset(option, 1, sizeof(yarv_compile_option_t)); + } + else if (CLASS_OF(opt) == rb_cHash) { +#define SET_COMPILE_OPTION(o, h, mem) \ + { VALUE flag = rb_hash_aref(h, ID2SYM(rb_intern(#mem))); dp(flag);\ + if (flag == Qtrue) { o->mem = 1; } \ + if (flag == Qfalse) { o->mem = 0; } \ + } + SET_COMPILE_OPTION(option, opt, inline_const_cache); + SET_COMPILE_OPTION(option, opt, peephole_optimization); + SET_COMPILE_OPTION(option, opt, specialized_instruction); + SET_COMPILE_OPTION(option, opt, operands_unification); + SET_COMPILE_OPTION(option, opt, instructions_unification); + SET_COMPILE_OPTION(option, opt, stack_caching); +#undef SET_COMPILE_OPTION + } + else { + rb_raise(rb_eTypeError, "Compile option must be Hash/true/false/nil"); + } +} + +static VALUE +make_compile_option_value(yarv_compile_option_t *option) +{ + VALUE opt = rb_hash_new(); +#define SET_COMPILE_OPTION(o, h, mem) \ + rb_hash_aset(h, ID2SYM(rb_intern(#mem)), o->mem ? Qtrue : Qfalse) + { + SET_COMPILE_OPTION(option, opt, inline_const_cache); + SET_COMPILE_OPTION(option, opt, peephole_optimization); + SET_COMPILE_OPTION(option, opt, specialized_instruction); + SET_COMPILE_OPTION(option, opt, operands_unification); + SET_COMPILE_OPTION(option, opt, instructions_unification); + SET_COMPILE_OPTION(option, opt, stack_caching); + } +#undef SET_COMPILE_OPTION + return opt; +} + +VALUE +yarv_iseq_new(NODE *node, VALUE name, VALUE file_name, + VALUE parent, VALUE type) +{ + return yarv_iseq_new_with_opt(node, name, file_name, parent, type, + &COMPILE_OPTION_DEFAULT); +} + +static VALUE +yarv_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE file_name, + VALUE parent, VALUE type, VALUE bopt, + const yarv_compile_option_t *option) +{ + yarv_iseq_t *iseq; + VALUE self = iseq_alloc(cYarvISeq); + + GetISeqPtr(self, iseq); + iseq->self = self; + + prepare_iseq_build(iseq, name, file_name, parent, type, bopt, option); + iseq_compile(self, node); + cleanup_iseq_build(iseq); + return self; +} + +VALUE +yarv_iseq_new_with_opt(NODE *node, VALUE name, VALUE file_name, + VALUE parent, VALUE type, + const yarv_compile_option_t *option) +{ + return yarv_iseq_new_with_bopt_and_opt(node, name, file_name, parent, type, + Qfalse, option); +} + +VALUE +yarv_iseq_new_with_bopt(NODE *node, VALUE name, VALUE file_name, + VALUE parent, VALUE type, VALUE bopt) +{ + return yarv_iseq_new_with_bopt_and_opt(node, name, file_name, parent, type, + bopt, &COMPILE_OPTION_DEFAULT); +} + +VALUE iseq_build_from_ary(yarv_iseq_t *iseq, VALUE line, + VALUE locals, VALUE args, VALUE exception, VALUE body); + +#define CHECK_ARRAY(v) rb_convert_type(v, T_ARRAY, "Array", "to_ary") +#define CHECK_STRING(v) rb_convert_type(v, T_STRING, "String", "to_str") +#define CHECK_SYMBOL(v) rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym") +#define CHECK_INTEGER(v) (NUM2LONG(v), v) +VALUE +iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt) +{ + VALUE iseqval = iseq_alloc(cYarvISeq); + + VALUE magic, version1, version2, format_type, misc; + VALUE name, filename, line; + VALUE type, body, locals, args, exception; + + VALUE iseq_type; + struct st_table *type_map = 0; + yarv_iseq_t *iseq; + yarv_compile_option_t option; + + /* [magic, major_version, minor_version, format_type, misc, + * name, filename, line, + * type, locals, args, exception_table, body] + */ + + data = CHECK_ARRAY(data); + + magic = CHECK_STRING(rb_ary_entry(data, 0)); + version1 = CHECK_INTEGER(rb_ary_entry(data, 1)); + version2 = CHECK_INTEGER(rb_ary_entry(data, 2)); + format_type = CHECK_INTEGER(rb_ary_entry(data, 3)); + misc = rb_ary_entry(data, 4); /* TODO */ + + name = CHECK_STRING(rb_ary_entry(data, 5)); + filename = CHECK_STRING(rb_ary_entry(data, 6)); + line = CHECK_ARRAY(rb_ary_entry(data, 7)); + + type = CHECK_SYMBOL(rb_ary_entry(data, 8)); + locals = CHECK_ARRAY(rb_ary_entry(data, 9)); + args = rb_ary_entry(data, 10); + if (FIXNUM_P(args) || (args = CHECK_ARRAY(args))) { + /* */ + } + exception = CHECK_ARRAY(rb_ary_entry(data, 11)); + body = CHECK_ARRAY(rb_ary_entry(data, 12)); + + GetISeqPtr(iseqval, iseq); + iseq->self = iseqval; + + if (type_map == 0) { + type_map = st_init_numtable(); + st_insert(type_map, ID2SYM(rb_intern("toplevel")), ISEQ_TYPE_TOP); + st_insert(type_map, ID2SYM(rb_intern("method")), ISEQ_TYPE_METHOD); + st_insert(type_map, ID2SYM(rb_intern("block")), ISEQ_TYPE_BLOCK); + st_insert(type_map, ID2SYM(rb_intern("class")), ISEQ_TYPE_CLASS); + st_insert(type_map, ID2SYM(rb_intern("rescue")), ISEQ_TYPE_RESCUE); + st_insert(type_map, ID2SYM(rb_intern("ensure")), ISEQ_TYPE_ENSURE); + st_insert(type_map, ID2SYM(rb_intern("eval")), ISEQ_TYPE_EVAL); + } + + if (st_lookup(type_map, type, &iseq_type) == 0) { + rb_raise(rb_eTypeError, "unsupport type: %p", type); + } + + if (parent == Qnil) { + parent = 0; + } + + make_compile_option(&option, opt); + prepare_iseq_build(iseq, name, filename, + parent, iseq_type, 0, &option); + + iseq_build_from_ary(iseq, line, locals, args, exception, body); + + cleanup_iseq_build(iseq); + return iseqval; +} + +static VALUE +iseq_s_load(int argc, VALUE *argv, VALUE self) +{ + VALUE data, opt=Qnil; + rb_scan_args(argc, argv, "11", &data, &opt); + + return iseq_load(self, data, 0, opt); +} + +static NODE * +compile_string(VALUE str, VALUE file, VALUE line) +{ + NODE *node; + node = rb_compile_string(StringValueCStr(file), str, NUM2INT(line)); + + if (ruby_nerrs > 0) { + ruby_nerrs = 0; + rb_exc_raise(GET_THREAD()->errinfo); // TODO: check err + } + return node; +} + +static VALUE +iseq_s_compile(int argc, VALUE *argv, VALUE self) +{ + VALUE str, file = Qnil, line = INT2FIX(1), opt = Qnil; + NODE *node; + yarv_compile_option_t option; + + rb_scan_args(argc, argv, "13", &str, &file, &line, &opt); + + file = file == Qnil ? rb_str_new2("<compiled>") : file; + line = line == Qnil ? INT2FIX(1) : line; + + node = compile_string(str, file, line); + make_compile_option(&option, opt); + return yarv_iseq_new_with_opt(node, rb_str_new2("<main>"), file, Qfalse, + ISEQ_TYPE_TOP, &option); +} + +static VALUE +iseq_s_compile_file(int argc, VALUE *argv, VALUE self) +{ + VALUE file, line = INT2FIX(1), opt = Qnil; + VALUE parser; + VALUE f; + NODE *node; + const char *fname; + yarv_compile_option_t option; + + rb_scan_args(argc, argv, "11", &file, &opt); + fname = StringValueCStr(file); + + f = rb_file_open(fname, "r"); + + parser = rb_parser_new(); + node = rb_parser_compile_file(parser, fname, f, NUM2INT(line)); + make_compile_option(&option, opt); + return yarv_iseq_new_with_opt(node, rb_str_new2("<main>"), file, Qfalse, + ISEQ_TYPE_TOP, &option); +} + +static VALUE +iseq_s_compile_option_set(VALUE self, VALUE opt) +{ + yarv_compile_option_t option; + make_compile_option(&option, opt); + COMPILE_OPTION_DEFAULT = option; + return make_compile_option_value(&option); +} + +static yarv_iseq_t * +iseq_check(VALUE val) +{ + yarv_iseq_t *iseq; + GetISeqPtr(val, iseq); + if (!iseq->name) { + rb_raise(rb_eTypeError, "uninitialized InstructionSequence"); + } + return iseq; +} + +VALUE yarv_th_eval(yarv_thread_t *th, VALUE iseqval); + +static VALUE +iseq_eval(VALUE self) +{ + return yarv_th_eval(GET_THREAD(), self); +} + +static VALUE +iseq_inspect(VALUE self) +{ + char buff[0x100]; + yarv_iseq_t *iseq = iseq_check(self); + + snprintf(buff, sizeof(buff), "<ISeq:%s@%s>", + RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->file_name)); + + return rb_str_new2(buff); +} + +VALUE iseq_data_to_ary(yarv_iseq_t *iseq); + +static VALUE +iseq_to_a(VALUE self) +{ + yarv_iseq_t *iseq = iseq_check(self); + return iseq_data_to_ary(iseq); +} + +/* + now, search algorithm is brute force. but this should be binary search. + */ +static unsigned short +find_line_no(yarv_iseq_t *iseqdat, unsigned long pos) +{ + unsigned long i, size = iseqdat->insn_info_size; + struct insn_info_struct *iiary = iseqdat->insn_info_tbl; + + for (i = 0; i < size; i++) { + if (iiary[i].position == pos) { + return iiary[i].line_no; + } + } + // rb_bug("find_line_no: can't find %lu", pos); + return 0; +} + +static unsigned short +find_prev_line_no(yarv_iseq_t *iseqdat, unsigned long pos) +{ + unsigned long i, size = iseqdat->insn_info_size; + struct insn_info_struct *iiary = iseqdat->insn_info_tbl; + + for (i = 0; i < size; i++) { + if (iiary[i].position == pos) { + if (i > 0) { + return iiary[i - 1].line_no; + } + else { + return 0; + } + } + } + rb_bug("find_prev_line_no: can't find - %lu", pos); + return 0; +} + +static VALUE +insn_operand_intern(yarv_iseq_t *iseq, + int insn, int op_no, VALUE op, + int len, int pos, VALUE *pnop, VALUE child) +{ + char *types = insn_op_types(insn); + char type = types[op_no]; + VALUE ret; + char buff[0x100]; + + switch (type) { + case TS_OFFSET: /* LONG */ + snprintf(buff, sizeof(buff), "%ld", pos + len + op); + ret = rb_str_new2(buff); + break; + + case TS_NUM: /* ULONG */ + snprintf(buff, sizeof(buff), "%lu", op); + ret = rb_str_new2(buff); + break; + + case TS_LINDEX: + { + yarv_iseq_t *ip = iseq->local_iseq; + + ret = + rb_str_new2( + rb_id2name(ip->local_tbl[ip->local_size - op + 1])); + break; + } + case TS_DINDEX:{ + if (insn == BIN(getdynamic) || insn == BIN(setdynamic)) { + yarv_iseq_t *ip = iseq; + int level = *pnop; + int i; + for (i = 0; i < level; i++) { + ip = ip->parent_iseq; + } + ret = + rb_str_new2(rb_id2name + (ip->local_tbl[ip->local_size - op])); + } + else { + ret = rb_inspect(INT2FIX(op)); + } + break; + } + case TS_ID: /* ID (symbol) */ + op = ID2SYM(op); + case TS_VALUE: /* VALUE */ + ret = rb_inspect(op); + if (CLASS_OF(op) == cYarvISeq) { + rb_ary_push(child, op); + } + break; + + case TS_ISEQ: /* iseq */ + { + yarv_iseq_t *iseq = (yarv_iseq_t *)op; + if (iseq) { + ret = iseq->name; + if (child) { + rb_ary_push(child, iseq->self); + } + } + else { + ret = rb_str_new2("nil"); + } + break; + } + case TS_GENTRY: + { + struct global_entry *entry = (struct global_entry *)op; + ret = rb_str_new2(rb_id2name(entry->id)); + } + break; + + case TS_IC: + ret = rb_str_new2("<ic>"); + break; + + case TS_CDHASH: + ret = rb_str_new2("<cdhash>"); + break; + + default: + rb_bug("iseq_disasm: unknown operand type: %c", type); + } + return ret; +} + +/** + * Disassemble a instruction + * Iseq -> Iseq inspect object + */ +VALUE +iseq_disasm_insn(VALUE ret, VALUE *iseq, int pos, + yarv_iseq_t *iseqdat, VALUE child) +{ + int insn = iseq[pos]; + int len = insn_len(insn); + int i, j; + char *types = insn_op_types(insn); + VALUE str = rb_str_new(0, 0); + char buff[0x100]; + char insn_name_buff[0x100]; + + strcpy(insn_name_buff, insn_name(insn)); + if (0) { + for (i = 0; insn_name_buff[i]; i++) { + if (insn_name_buff[i] == '_') { + insn_name_buff[i] = 0; + } + } + } + + snprintf(buff, sizeof(buff), "%04d %-16s ", pos, insn_name_buff); + rb_str_cat2(str, buff); + + for (j = 0; types[j]; j++) { + char *types = insn_op_types(insn); + VALUE opstr = insn_operand_intern(iseqdat, insn, j, iseq[pos + j + 1], + len, pos, &iseq[pos + j + 2], + child); + rb_str_concat(str, opstr); + + GC_CHECK(); + if (types[j + 1]) { + rb_str_cat2(str, ", "); + } + } + + { + int line_no = find_line_no(iseqdat, pos); + int prev = find_prev_line_no(iseqdat, pos); + if (line_no && line_no != prev) { + snprintf(buff, sizeof(buff), "%-70s(%4d)", RSTRING_PTR(str), + line_no); + str = rb_str_new2(buff); + } + } + if (ret) { + rb_str_cat2(str, "\n"); + rb_str_concat(ret, str); + } + else { + printf("%s\n", RSTRING_PTR(str)); + } + return len; +} + +static char * +catch_type(int type) +{ + switch (type) { + case CATCH_TYPE_RESCUE: + return "rescue"; + case CATCH_TYPE_ENSURE: + return "ensure"; + case CATCH_TYPE_RETRY: + return "retry"; + case CATCH_TYPE_BREAK: + return "break"; + case CATCH_TYPE_REDO: + return "redo"; + case CATCH_TYPE_NEXT: + return "next"; + default: + rb_bug("unknown catch type (%d)", type); + return 0; + } +} + +VALUE +iseq_disasm(VALUE self) +{ + yarv_iseq_t *iseqdat = iseq_check(self); + VALUE *iseq; + VALUE str = rb_str_new(0, 0); + VALUE child = rb_ary_new(); + unsigned long size; + int i; + ID *tbl; + char buff[0x200]; + + iseq = iseqdat->iseq; + size = iseqdat->size; + + rb_str_cat2(str, "== disasm: "); + + rb_str_concat(str, iseq_inspect(iseqdat->self)); + for (i = RSTRING_LEN(str); i < 72; i++) { + rb_str_cat2(str, "="); + } + rb_str_cat2(str, "\n"); + + /* show catch table information */ + if (iseqdat->catch_table_size != 0) { + rb_str_cat2(str, "== catch table\n"); + } + for (i = 0; i < iseqdat->catch_table_size; i++) { + struct catch_table_entry *entry = &iseqdat->catch_table[i]; + sprintf(buff, + "| catch type: %-6s st: %04d ed: %04d sp: %04d cont: %04d\n", + catch_type((int)entry->type), (int)entry->start, + (int)entry->end, (int)entry->sp, (int)entry->cont); + rb_str_cat2(str, buff); + if (entry->iseq) { + rb_str_concat(str, iseq_disasm(entry->iseq)); + } + } + if (iseqdat->catch_table_size != 0) { + rb_str_cat2(str, "|-------------------------------------" + "-----------------------------------\n"); + } + + /* show local table information */ + tbl = iseqdat->local_tbl; + + if (tbl) { + int opt = 0; + if (iseqdat->type == ISEQ_TYPE_METHOD || + iseqdat->type == ISEQ_TYPE_TOP || + iseqdat->type == ISEQ_TYPE_CLASS) { + opt = 1; + } + + snprintf(buff, sizeof(buff), + "local scope table (size: %d, argc: %d)\n", + iseqdat->local_size, iseqdat->argc); + rb_str_cat2(str, buff); + + for (i = 0; i < iseqdat->local_size - opt; i++) { + const char *name = rb_id2name(tbl[i + opt]); + char info[0x100]; + char argi[0x100] = ""; + char opti[0x100] = ""; + + if (iseqdat->arg_opts) { + int argc = iseqdat->argc; + int opts = iseqdat->arg_opts; + if (i >= argc && i < argc + opts - 1) { + snprintf(opti, sizeof(opti), "Opt=%ld", + iseqdat->arg_opt_tbl[i - argc]); + } + } + + snprintf(argi, sizeof(argi), "%s%s%s%s", /* arg, opts, rest, block */ + iseqdat->argc > i ? "Arg" : "", + opti, + iseqdat->arg_rest - 1 == i ? "Rest" : "", + iseqdat->arg_block - 1 == i ? "Block" : ""); + + snprintf(info, sizeof(info), "%s%s%s%s", name ? name : "?", + *argi ? "<" : "", argi, *argi ? ">" : ""); + + snprintf(buff, sizeof(buff), "[%2d] %-11s", + iseqdat->local_size - i, info); + + rb_str_cat2(str, buff); + } + rb_str_cat2(str, "\n"); + } + + GC_CHECK(); + + /* show each line */ + for (i = 0; i < size;) { + i += iseq_disasm_insn(str, iseq, i, iseqdat, child); + } + + for (i = 0; i < RARRAY_LEN(child); i++) { + VALUE isv = rb_ary_entry(child, i); + rb_str_concat(str, iseq_disasm(isv)); + } + + return str; +} + +char * +node_name(int node) +{ + switch (node) { + case NODE_METHOD: + return "NODE_METHOD"; + case NODE_FBODY: + return "NODE_FBODY"; + case NODE_CFUNC: + return "NODE_CFUNC"; + case NODE_SCOPE: + return "NODE_SCOPE"; + case NODE_BLOCK: + return "NODE_BLOCK"; + case NODE_IF: + return "NODE_IF"; + case NODE_CASE: + return "NODE_CASE"; + case NODE_WHEN: + return "NODE_WHEN"; + case NODE_OPT_N: + return "NODE_OPT_N"; + case NODE_WHILE: + return "NODE_WHILE"; + case NODE_UNTIL: + return "NODE_UNTIL"; + case NODE_ITER: + return "NODE_ITER"; + case NODE_FOR: + return "NODE_FOR"; + case NODE_BREAK: + return "NODE_BREAK"; + case NODE_NEXT: + return "NODE_NEXT"; + case NODE_REDO: + return "NODE_REDO"; + case NODE_RETRY: + return "NODE_RETRY"; + case NODE_BEGIN: + return "NODE_BEGIN"; + case NODE_RESCUE: + return "NODE_RESCUE"; + case NODE_RESBODY: + return "NODE_RESBODY"; + case NODE_ENSURE: + return "NODE_ENSURE"; + case NODE_AND: + return "NODE_AND"; + case NODE_OR: + return "NODE_OR"; + case NODE_NOT: + return "NODE_NOT"; + case NODE_MASGN: + return "NODE_MASGN"; + case NODE_LASGN: + return "NODE_LASGN"; + case NODE_DASGN: + return "NODE_DASGN"; + case NODE_DASGN_CURR: + return "NODE_DASGN_CURR"; + case NODE_GASGN: + return "NODE_GASGN"; + case NODE_IASGN: + return "NODE_IASGN"; + case NODE_CDECL: + return "NODE_CDECL"; + case NODE_CVASGN: + return "NODE_CVASGN"; + case NODE_CVDECL: + return "NODE_CVDECL"; + case NODE_OP_ASGN1: + return "NODE_OP_ASGN1"; + case NODE_OP_ASGN2: + return "NODE_OP_ASGN2"; + case NODE_OP_ASGN_AND: + return "NODE_OP_ASGN_AND"; + case NODE_OP_ASGN_OR: + return "NODE_OP_ASGN_OR"; + case NODE_CALL: + return "NODE_CALL"; + case NODE_FCALL: + return "NODE_FCALL"; + case NODE_VCALL: + return "NODE_VCALL"; + case NODE_SUPER: + return "NODE_SUPER"; + case NODE_ZSUPER: + return "NODE_ZSUPER"; + case NODE_ARRAY: + return "NODE_ARRAY"; + case NODE_ZARRAY: + return "NODE_ZARRAY"; + case NODE_VALUES: + return "NODE_VALUES"; + case NODE_HASH: + return "NODE_HASH"; + case NODE_RETURN: + return "NODE_RETURN"; + case NODE_YIELD: + return "NODE_YIELD"; + case NODE_LVAR: + return "NODE_LVAR"; + case NODE_DVAR: + return "NODE_DVAR"; + case NODE_GVAR: + return "NODE_GVAR"; + case NODE_IVAR: + return "NODE_IVAR"; + case NODE_CONST: + return "NODE_CONST"; + case NODE_CVAR: + return "NODE_CVAR"; + case NODE_NTH_REF: + return "NODE_NTH_REF"; + case NODE_BACK_REF: + return "NODE_BACK_REF"; + case NODE_MATCH: + return "NODE_MATCH"; + case NODE_MATCH2: + return "NODE_MATCH2"; + case NODE_MATCH3: + return "NODE_MATCH3"; + case NODE_LIT: + return "NODE_LIT"; + case NODE_STR: + return "NODE_STR"; + case NODE_DSTR: + return "NODE_DSTR"; + case NODE_XSTR: + return "NODE_XSTR"; + case NODE_DXSTR: + return "NODE_DXSTR"; + case NODE_EVSTR: + return "NODE_EVSTR"; + case NODE_DREGX: + return "NODE_DREGX"; + case NODE_DREGX_ONCE: + return "NODE_DREGX_ONCE"; + case NODE_ARGS: + return "NODE_ARGS"; + case NODE_POSTARG: + return "NODE_POSTARG"; + case NODE_ARGSCAT: + return "NODE_ARGSCAT"; + case NODE_ARGSPUSH: + return "NODE_ARGSPUSH"; + case NODE_SPLAT: + return "NODE_SPLAT"; + case NODE_TO_ARY: + return "NODE_TO_ARY"; + case NODE_BLOCK_ARG: + return "NODE_BLOCK_ARG"; + case NODE_BLOCK_PASS: + return "NODE_BLOCK_PASS"; + case NODE_DEFN: + return "NODE_DEFN"; + case NODE_DEFS: + return "NODE_DEFS"; + case NODE_ALIAS: + return "NODE_ALIAS"; + case NODE_VALIAS: + return "NODE_VALIAS"; + case NODE_UNDEF: + return "NODE_UNDEF"; + case NODE_CLASS: + return "NODE_CLASS"; + case NODE_MODULE: + return "NODE_MODULE"; + case NODE_SCLASS: + return "NODE_SCLASS"; + case NODE_COLON2: + return "NODE_COLON2"; + case NODE_COLON3: + return "NODE_COLON3"; + case NODE_CREF: + return "NODE_CREF"; + case NODE_DOT2: + return "NODE_DOT2"; + case NODE_DOT3: + return "NODE_DOT3"; + case NODE_FLIP2: + return "NODE_FLIP2"; + case NODE_FLIP3: + return "NODE_FLIP3"; + case NODE_ATTRSET: + return "NODE_ATTRSET"; + case NODE_SELF: + return "NODE_SELF"; + case NODE_NIL: + return "NODE_NIL"; + case NODE_TRUE: + return "NODE_TRUE"; + case NODE_FALSE: + return "NODE_FALSE"; + case NODE_ERRINFO: + return "NODE_ERRINFO"; + case NODE_DEFINED: + return "NODE_DEFINED"; + case NODE_POSTEXE: + return "NODE_POSTEXE"; + case NODE_ALLOCA: + return "NODE_ALLOCA"; + case NODE_BMETHOD: + return "NODE_BMETHOD"; + case NODE_MEMO: + return "NODE_MEMO"; + case NODE_IFUNC: + return "NODE_IFUNC"; + case NODE_DSYM: + return "NODE_DSYM"; + case NODE_ATTRASGN: + return "NODE_ATTRASGN"; + case NODE_PRELUDE: + return "NODE_PRELUDE"; + case NODE_LAMBDA: + return "NODE_LAMBDA"; + case NODE_OPTBLOCK: + return "NODE_OPTBLOCK"; + case NODE_LAST: + return "NODE_LAST"; + default: + rb_bug("unknown node (%d)", node); + return 0; + } +} + +int +debug_node(NODE *node) +{ + printf("node type: %d\n", nd_type(node)); + printf("node name: %s\n", node_name(nd_type(node))); + printf("node filename: %s\n", node->nd_file); + return 0; +} + +#define DECL_SYMBOL(name) \ + static VALUE sym_##name + +#define INIT_SYMBOL(name) \ + sym_##name = ID2SYM(rb_intern(#name)) + +static VALUE +register_label(struct st_table *table, int idx) +{ + VALUE sym; + char buff[0x20]; + + snprintf(buff, 0x20, "label_%u", idx); + sym = ID2SYM(rb_intern(buff)); + st_insert(table, idx, sym); + return sym; +} + +static VALUE +exception_type2symbol(VALUE type) +{ + ID id; + switch(type) { + case CATCH_TYPE_RESCUE: id = rb_intern("rescue"); break; + case CATCH_TYPE_ENSURE: id = rb_intern("ensure"); break; + case CATCH_TYPE_RETRY: id = rb_intern("retry"); break; + case CATCH_TYPE_BREAK: id = rb_intern("break"); break; + case CATCH_TYPE_REDO: id = rb_intern("redo"); break; + case CATCH_TYPE_NEXT: id = rb_intern("next"); break; + default: + rb_bug("..."); + } + return ID2SYM(id); +} + +static int +cdhash_each(VALUE key, VALUE value, VALUE ary) +{ + rb_ary_push(ary, key); + rb_ary_push(ary, value); + return ST_CONTINUE; +} + +VALUE +iseq_data_to_ary(yarv_iseq_t *iseq) +{ + int i, pos, opt = 0; + VALUE *seq; + + VALUE val = rb_ary_new(); + VALUE type; /* Symbol */ + VALUE locals = rb_ary_new(); + VALUE args = rb_ary_new(); + VALUE body = rb_ary_new(); /* [[:insn1, ...], ...] */ + VALUE nbody; + VALUE line = rb_ary_new(); + VALUE exception = rb_ary_new(); /* [[....]] */ + + static VALUE insn_syms[YARV_MAX_INSTRUCTION_SIZE]; + struct st_table *labels_table = st_init_numtable(); + + DECL_SYMBOL(toplevel); + DECL_SYMBOL(method); + DECL_SYMBOL(block); + DECL_SYMBOL(class); + DECL_SYMBOL(rescue); + DECL_SYMBOL(ensure); + DECL_SYMBOL(eval); + + if (sym_toplevel == 0) { + int i; + for (i=0; i<YARV_MAX_INSTRUCTION_SIZE; i++) { + insn_syms[i] = ID2SYM(rb_intern(insn_name(i))); + } + INIT_SYMBOL(toplevel); + INIT_SYMBOL(method); + INIT_SYMBOL(block); + INIT_SYMBOL(class); + INIT_SYMBOL(rescue); + INIT_SYMBOL(ensure); + INIT_SYMBOL(eval); + } + + /* type */ + switch(iseq->type) { + case ISEQ_TYPE_TOP: type = sym_toplevel; break; + case ISEQ_TYPE_METHOD: type = sym_method; break; + case ISEQ_TYPE_BLOCK: type = sym_block; break; + case ISEQ_TYPE_CLASS: type = sym_class; break; + case ISEQ_TYPE_RESCUE: type = sym_rescue; break; + case ISEQ_TYPE_ENSURE: type = sym_ensure; break; + case ISEQ_TYPE_EVAL: type = sym_eval; break; + default: rb_bug("unsupported iseq type"); + }; + + if (iseq->type == ISEQ_TYPE_METHOD || + iseq->type == ISEQ_TYPE_TOP || + iseq->type == ISEQ_TYPE_CLASS) { + opt = 1; + } + + /* locals */ + for (i=opt; i<iseq->local_size; i++) { + ID lid = iseq->local_tbl[i]; + if (lid) { + rb_ary_push(locals, ID2SYM(lid)); + } + else { + rb_ary_push(locals, ID2SYM(rb_intern("#arg_rest"))); + } + } + + /* args */ + { + /* + * [argc, # argc + * [label1, label2, ...] # opts + * rest_iex, + * block_idx, + * ] + * or + * argc (Fixnum) # arg_simple + */ + VALUE arg_opt_labels = rb_ary_new(); + int j; + + for (j=0; j<iseq->arg_opts; j++) { + rb_ary_push(arg_opt_labels, + register_label(labels_table, iseq->arg_opt_tbl[j])); + } + + /* commit */ + if (iseq->arg_simple) { + args = INT2FIX(iseq->argc); + } + else { + rb_ary_push(args, INT2FIX(iseq->argc)); + rb_ary_push(args, INT2FIX(iseq->arg_opts)); + rb_ary_push(args, arg_opt_labels); + rb_ary_push(args, INT2FIX(iseq->arg_rest)); + rb_ary_push(args, INT2FIX(iseq->arg_block)); + } + } + + /* body */ + for (seq = iseq->iseq; seq < iseq->iseq + iseq->size; ) { + VALUE ary = rb_ary_new(); + VALUE insn = *seq++; + int j, len = insn_len(insn); + VALUE *nseq = seq + len - 1; + + rb_ary_push(ary, insn_syms[insn]); + for (j=0; j<len-1; j++, seq++) { + switch (insn_op_type(insn, j)) { + case TS_OFFSET: { + unsigned int idx = nseq - iseq->iseq + *seq; + rb_ary_push(ary, register_label(labels_table, idx)); + break; + } + case TS_LINDEX: + case TS_DINDEX: + case TS_NUM: + rb_ary_push(ary, INT2FIX(*seq)); + break; + case TS_VALUE: + rb_ary_push(ary, *seq); + break; + case TS_ISEQ: + { + yarv_iseq_t *iseq = (yarv_iseq_t *)*seq; + if (iseq) { + VALUE val = iseq_data_to_ary(iseq); + rb_ary_push(ary, val); + } + else { + rb_ary_push(ary, Qnil); + } + } + break; + case TS_GENTRY: + { + struct global_entry *entry = (struct global_entry *)*seq; + rb_ary_push(ary, ID2SYM(entry->id)); + } + break; + case TS_IC: + rb_ary_push(ary, Qnil); + break; + case TS_ID: + rb_ary_push(ary, ID2SYM(*seq)); + break; + case TS_CDHASH: + { + VALUE hash = *seq; + VALUE val = rb_ary_new(); + int i; + + rb_hash_foreach(hash, cdhash_each, val); + + for (i=0; i<RARRAY_LEN(val); i+=2) { + VALUE pos = FIX2INT(rb_ary_entry(val, i+1)); + unsigned int idx = nseq - iseq->iseq + pos; + + rb_ary_store(val, i+1, + register_label(labels_table, idx)); + } + rb_ary_push(ary, val); + } + break; + default: + rb_bug("unknown operand: %c", insn_op_type(insn, j)); + } + } + rb_ary_push(body, ary); + } + + nbody = body; + + /* exception */ + for (i=0; i<iseq->catch_table_size; i++) { + VALUE ary = rb_ary_new(); + struct catch_table_entry *entry = &iseq->catch_table[i]; + rb_ary_push(ary, exception_type2symbol(entry->type)); + if (entry->iseq) { + yarv_iseq_t *eiseq; + GetISeqPtr(entry->iseq, eiseq); + rb_ary_push(ary, iseq_data_to_ary(eiseq)); + } + else { + rb_ary_push(ary, Qnil); + } + rb_ary_push(ary, register_label(labels_table, entry->start)); + rb_ary_push(ary, register_label(labels_table, entry->end)); + rb_ary_push(ary, register_label(labels_table, entry->cont)); + rb_ary_push(ary, INT2FIX(entry->sp)); + rb_ary_push(exception, ary); + } + + /* make body with labels */ + body = rb_ary_new(); + + for (i=0, pos=0; i<RARRAY_LEN(nbody); i++) { + VALUE ary = RARRAY_PTR(nbody)[i]; + VALUE label; + + if (st_lookup(labels_table, pos, &label)) { + rb_ary_push(body, label); + } + + rb_ary_push(body, ary); + pos += RARRAY_LEN(ary); + } + + st_free_table(labels_table); + + /* build array */ + + /* [magic, major_version, minor_version, format_type, misc, + * name, filename, line, + * type, args, vars, exception_table, body] + */ + rb_ary_push(val, rb_str_new2("YARVInstructionSimpledataFormat")); + rb_ary_push(val, INT2FIX(1)); + rb_ary_push(val, INT2FIX(1)); + rb_ary_push(val, INT2FIX(1)); + rb_ary_push(val, Qnil); + rb_ary_push(val, iseq->name); + rb_ary_push(val, iseq->file_name); + rb_ary_push(val, line); + rb_ary_push(val, type); + rb_ary_push(val, locals); + rb_ary_push(val, args); + rb_ary_push(val, exception); + rb_ary_push(val, body); + return val; +} + +struct st_table * +insn_make_insn_table(void) +{ + struct st_table *table; + int i; + table = st_init_numtable(); + + for (i=0; i<YARV_MAX_INSTRUCTION_SIZE; i++) { + st_insert(table, ID2SYM(rb_intern(insn_name(i))), i); + } + + return table; +} + + +void +Init_ISeq(void) +{ + /* declare YARVCore::InstructionSequence */ + cYarvISeq = rb_define_class_under(mYarvCore, "InstructionSequence", rb_cObject); + rb_define_alloc_func(cYarvISeq, iseq_alloc); + rb_define_method(cYarvISeq, "inspect", iseq_inspect, 0); + rb_define_method(cYarvISeq, "disasm", iseq_disasm, 0); + rb_define_method(cYarvISeq, "to_a", iseq_to_a, 0); + rb_define_method(cYarvISeq, "eval", iseq_eval, 0); + + rb_define_singleton_method(cYarvISeq, "load", iseq_s_load, -1); + rb_define_singleton_method(cYarvISeq, "compile", iseq_s_compile, -1); + rb_define_singleton_method(cYarvISeq, "new", iseq_s_compile, -1); + rb_define_singleton_method(cYarvISeq, "compile_file", iseq_s_compile_file, -1); + rb_define_singleton_method(cYarvISeq, "compile_option=", + iseq_s_compile_option_set, 1); +} + diff --git a/lib/.document b/lib/.document index a3ce8989fc..3979748e3c 100644 --- a/lib/.document +++ b/lib/.document @@ -77,7 +77,8 @@ set.rb shell shell.rb shellwords.rb -singleton.rb +# TODO: YARV cause error. why ...? +# singleton.rb soap sync.rb tempfile.rb diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 9690469e0c..d62fead596 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -578,7 +578,8 @@ module DRb end raise(DRbConnError, 'connection closed') if str.nil? raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do begin save = Thread.current[:drb_untaint] Thread.current[:drb_untaint] = [] @@ -591,7 +592,7 @@ module DRb end Thread.current[:drb_untaint] = save end - end + #end end def send_request(stream, ref, msg_id, arg, b) # :nodoc: @@ -1741,9 +1742,10 @@ module DRb @server = {} def regist_server(server) @server[server.uri] = server - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do @primary_server = server unless @primary_server - end + #end end module_function :regist_server diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb index 2715c5e9fe..1ede7d6d16 100644 --- a/lib/drb/extservm.rb +++ b/lib/drb/extservm.rb @@ -32,9 +32,10 @@ module DRb def service(name) while true server = nil - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do server = @servers[name] if @servers[name] - end + #end return server if server && server.alive? invoke_service(name) end @@ -42,11 +43,12 @@ module DRb def regist(name, ro) ary = nil - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do @servers[name] = ro ary = @waiting @waiting = [] - end + #end ary.each do |th| begin th.run @@ -57,9 +59,10 @@ module DRb end def unregist(name) - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do @servers.delete(name) - end + #end end private @@ -81,10 +84,11 @@ module DRb def invoke_service_command(name, command) raise "invalid command. name: #{name}" unless command - Thread.exclusive do + # TODO: YARV doesn't have Thread.exclusive + #Thread.exclusive do return if @servers.include?(name) @servers[name] = false - end + #end uri = @uri || DRb.uri Process.detach(Process.spawn("#{command} #{uri} #{name}")) true diff --git a/lib/generator.rb b/lib/generator.rb index c5282785b3..9924ce3b0c 100644 --- a/lib/generator.rb +++ b/lib/generator.rb @@ -246,6 +246,8 @@ end __END__ +__END__ + require 'test/unit' class TC_Generator < Test::Unit::TestCase diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb index 880883a981..92c37610df 100644 --- a/lib/getoptlong.rb +++ b/lib/getoptlong.rb @@ -76,7 +76,7 @@ # end # # dir = ARGV.shift -# +# # Dir.chdir(dir) # for i in (1..repetitions) # print "Hello" @@ -290,6 +290,7 @@ class GetoptLong @argument_flags.clear arguments.each do |*arg| + arg = arg.first # TODO: YARV Hack # # Find an argument flag and it set to `argument_flag'. # @@ -302,6 +303,7 @@ class GetoptLong argument_flag = i end end + raise ArgumentError, "no argument-flag" if argument_flag == nil canonical_name = nil diff --git a/lib/mkmf.rb b/lib/mkmf.rb index acd51419cf..4e00332096 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -268,14 +268,14 @@ end def link_command(ldflags, opt="", libpath=$LIBPATH) RbConfig::expand(TRY_LINK.dup, CONFIG.merge('hdrdir' => $hdrdir.quote, - 'src' => CONFTEST_C, - 'INCFLAGS' => $INCFLAGS, - 'CPPFLAGS' => $CPPFLAGS, - 'CFLAGS' => "#$CFLAGS", - 'ARCH_FLAG' => "#$ARCH_FLAG", - 'LDFLAGS' => "#$LDFLAGS #{ldflags}", - 'LIBPATH' => libpathflag(libpath), - 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", + 'src' => CONFTEST_C, + 'INCFLAGS' => $INCFLAGS, + 'CPPFLAGS' => $CPPFLAGS, + 'CFLAGS' => "#$CFLAGS", + 'ARCH_FLAG' => "#$ARCH_FLAG", + 'LDFLAGS' => "#$LDFLAGS #{ldflags}", + 'LIBPATH' => libpathflag(libpath), + 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")) end @@ -536,7 +536,7 @@ def message(*s) end def checking_for(m, fmt = nil) - f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim + f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim #' m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... " message "%s", m a = r = nil @@ -924,16 +924,16 @@ end def create_header(header = "extconf.h") message "creating %s\n", header - sym = header.tr("a-z./\055", "A-Z___") + sym = header.tr("a-z./\055", "A-Z___") hdr = ["#ifndef #{sym}\n#define #{sym}\n"] - for line in $defs - case line - when /^-D([^=]+)(?:=(.*))?/ + for line in $defs + case line + when /^-D([^=]+)(?:=(.*))?/ hdr << "#define #$1 #{$2 ? Shellwords.shellwords($2)[0] : 1}\n" - when /^-U(.*)/ + when /^-U(.*)/ hdr << "#undef #$1\n" - end - end + end + end hdr << "#endif\n" hdr = hdr.join unless (IO.read(header) == hdr rescue false) @@ -1236,8 +1236,9 @@ DLLIB = #{dllib} EXTSTATIC = #{$static || ""} STATIC_LIB = #{staticlib unless $static.nil?} #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""} -" - install_dirs.each {|*d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]} +" #" + # TODO: fixme + install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]} n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET).' mfile.print " TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB) @@ -1378,7 +1379,7 @@ site-install-rb: install-rb end end if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line) - suffixes << m[1] << m[2] + suffixes << m[1] << m[2] implicit = [[m[1], m[2]], [m.post_match]] next elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line diff --git a/lib/monitor.rb b/lib/monitor.rb index f0e79d8fc8..fdc6ade69e 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -41,13 +41,14 @@ reads a line from ARGF and push it to buf, then call empty_cond.signal. =end - + +require 'thread' # # Adds monitor functionality to an arbitrary object by mixing the module with # +include+. For example: # -# require 'monitor.rb' +# require 'monitor' # # buf = [] # buf.extend(MonitorMixin) @@ -86,70 +87,63 @@ module MonitorMixin class ConditionVariable class Timeout < Exception; end - # Create a new timer with the argument timeout, and add the - # current thread to the list of waiters. Then the thread is - # stopped. It will be resumed when a corresponding #signal - # occurs. def wait(timeout = nil) @monitor.funcall(:mon_check_owner) timer = create_timer(timeout) - - Thread.critical = true - count = @monitor.funcall(:mon_exit_for_cond) - @waiters.push(Thread.current) + count = nil - begin - Thread.stop - return true - rescue Timeout - return false - ensure - Thread.critical = true - if timer && timer.alive? - Thread.kill(timer) - end - if @waiters.include?(Thread.current) # interrupted? - @waiters.delete(Thread.current) - end + @mutex.synchronize{ + count = @monitor.funcall(:mon_exit_for_cond) + @waiters.push(Thread.current) + + begin + @mutex.sleep + return true + rescue Timeout + return false + end + } + ensure + @mutex.synchronize { + if timer && timer.alive? + Thread.kill(timer) + end + if @waiters.include?(Thread.current) # interrupted? + @waiters.delete(Thread.current) + end @monitor.funcall(:mon_enter_for_cond, count) - Thread.critical = false - end + } end - - # call #wait while the supplied block returns +true+. def wait_while while yield wait end end - # call #wait until the supplied block returns +true+. def wait_until until yield wait end end - # Wake up and run the next waiter def signal @monitor.funcall(:mon_check_owner) - Thread.critical = true - t = @waiters.shift - t.wakeup if t - Thread.critical = false + @mutex.synchronize { + t = @waiters.shift + t.wakeup if t + } Thread.pass end - # Wake up all the waiters. def broadcast @monitor.funcall(:mon_check_owner) - Thread.critical = true - for t in @waiters - t.wakeup - end - @waiters.clear - Thread.critical = false + @mutex.synchronize { + for t in @waiters + t.wakeup + end + @waiters.clear + } Thread.pass end @@ -162,6 +156,7 @@ module MonitorMixin def initialize(monitor) @monitor = monitor @waiters = [] + @mutex = Mutex.new end def create_timer(timeout) @@ -170,7 +165,6 @@ module MonitorMixin return Thread.start { Thread.pass sleep(timeout) - Thread.critical = true waiter.raise(Timeout.new) } else @@ -189,15 +183,15 @@ module MonitorMixin # def mon_try_enter result = false - Thread.critical = true - if @mon_owner.nil? - @mon_owner = Thread.current - end - if @mon_owner == Thread.current - @mon_count += 1 - result = true - end - Thread.critical = false + @mon_mutex.synchronize { + if @mon_owner.nil? + @mon_owner = Thread.current + end + if @mon_owner == Thread.current + @mon_count += 1 + result = true + end + } return result end # For backward compatibility @@ -207,10 +201,10 @@ module MonitorMixin # Enters exclusive section. # def mon_enter - Thread.critical = true - mon_acquire(@mon_entering_queue) - @mon_count += 1 - Thread.critical = false + @mon_mutex.synchronize { + mon_acquire(@mon_entering_queue) + @mon_count += 1 + } end # @@ -218,12 +212,12 @@ module MonitorMixin # def mon_exit mon_check_owner - Thread.critical = true - @mon_count -= 1 - if @mon_count == 0 - mon_release - end - Thread.critical = false + @mon_mutex.synchronize { + @mon_count -= 1 + if @mon_count == 0 + mon_release + end + } Thread.pass end @@ -244,9 +238,6 @@ module MonitorMixin # # FIXME: This isn't documented in Nutshell. - # - # Create a new condition variable for this monitor. - # This facilitates control of the monitor with #signal and #wait. # def new_cond return ConditionVariable.new(self) @@ -259,16 +250,14 @@ module MonitorMixin mon_initialize end - # called by initialize method to set defaults for instance variables. def mon_initialize @mon_owner = nil @mon_count = 0 @mon_entering_queue = [] @mon_waiting_queue = [] + @mon_mutex = Mutex.new end - # Throw a ThreadError exception if the current thread - # does't own the monitor def mon_check_owner if @mon_owner != Thread.current raise ThreadError, "current thread not owner" @@ -278,8 +267,8 @@ module MonitorMixin def mon_acquire(queue) while @mon_owner && @mon_owner != Thread.current queue.push(Thread.current) - Thread.stop - Thread.critical = true + @mutex.unlock_and_stop + @mutex.lock end @mon_owner = Thread.current end @@ -304,17 +293,6 @@ module MonitorMixin end end -# Monitors provide means of mutual exclusion for Thread programming. -# A critical region is created by means of the synchronize method, -# which takes a block. -# The condition variables (created with #new_cond) may be used -# to control the execution of a monitor with #signal and #wait. -# -# the Monitor class wraps MonitorMixin, and provides aliases -# alias try_enter try_mon_enter -# alias enter mon_enter -# alias exit mon_exit -# to access its methods more concisely. class Monitor include MonitorMixin alias try_enter try_mon_enter diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb index 8e0d42bc8d..f776767324 100644 --- a/lib/mutex_m.rb +++ b/lib/mutex_m.rb @@ -1,4 +1,4 @@ -#-- +# # mutex_m.rb - # $Release Version: 3.0$ # $Revision: 1.7 $ @@ -7,26 +7,24 @@ # by Keiju ISHITSUKA(keiju@ishitsuka.com) # modified by matz # patched by akira yamada -#++ -# -# == Usage -# -# Extend an object and use it like a Mutex object: # -# require "mutex_m.rb" -# obj = Object.new -# obj.extend Mutex_m -# # ... +# -- +# Usage: +# require "mutex_m.rb" +# obj = Object.new +# obj.extend Mutex_m +# ... +# extended object can be handled like Mutex +# or +# class Foo +# include Mutex_m +# ... +# end +# obj = Foo.new +# this obj can be handled like Mutex # -# Or, include Mutex_m in a class to have its instances behave like a Mutex -# object: -# -# class Foo -# include Mutex_m -# # ... -# end -# -# obj = Foo.new + +require 'thread' module Mutex_m def Mutex_m.define_aliases(cl) @@ -61,58 +59,30 @@ module Mutex_m end # locking - def mu_synchronize - begin - mu_lock - yield - ensure - mu_unlock - end + def mu_synchronize(&block) + @_mutex.synchronize(&block) end def mu_locked? - @mu_locked + @_mutex.locked? end def mu_try_lock - result = false - Thread.critical = true - unless @mu_locked - @mu_locked = true - result = true - end - Thread.critical = false - result + @_mutex.try_lock end def mu_lock - while (Thread.critical = true; @mu_locked) - @mu_waiting.push Thread.current - Thread.stop - end - @mu_locked = true - Thread.critical = false - self + @_mutex.lock end def mu_unlock - return unless @mu_locked - Thread.critical = true - wait = @mu_waiting - @mu_waiting = [] - @mu_locked = false - Thread.critical = false - for w in wait - w.run - end - self + @_mutex.unlock end private def mu_initialize - @mu_waiting = [] - @mu_locked = false; + @_mutex = Mutex.new end def initialize(*args) diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb index f0060cbad5..900536869d 100644 --- a/lib/rss/0.9.rb +++ b/lib/rss/0.9.rb @@ -17,7 +17,7 @@ module RSS include RSS09 include RootElementMixin - include XMLStyleSheetMixin + # include XMLStyleSheetMixin [ ["channel", nil], diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb index 5571640bf2..af64d19183 100644 --- a/lib/rss/dublincore.rb +++ b/lib/rss/dublincore.rb @@ -69,7 +69,7 @@ module RSS } ELEMENT_NAME_INFOS = DublinCoreModel::TEXT_ELEMENTS.to_a - DublinCoreModel::DATE_ELEMENTS.each do |name, | + DublinCoreModel::DATE_ELEMENTS.each do |name, _| ELEMENT_NAME_INFOS << [name, nil] end diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index e63e06e20d..e272978992 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -247,7 +247,7 @@ module RSS end end EOT - __send__("private", "start_#{name}") + __send!("private", "start_#{name}") end end diff --git a/lib/singleton.rb b/lib/singleton.rb index 0ab8517275..2c08f35e37 100644 --- a/lib/singleton.rb +++ b/lib/singleton.rb @@ -60,7 +60,7 @@ # and _dump(depth) hooks allows the (partially) resurrections of # a previous state of ``the instance''. - +require 'thread' module Singleton # disable build-in copying methods @@ -72,65 +72,19 @@ module Singleton end private + # default marshalling strategy - def _dump(depth=-1) + def _dump(depth = -1) '' end -end - -class << Singleton - # Method body of first instance call. - FirstInstanceCall = proc do - # @__instance__ takes on one of the following values - # * nil - before and after a failed creation - # * false - during creation - # * sub_class instance - after a successful creation - # the form makes up for the lack of returns in progs - Thread.critical = true - if @__instance__.nil? - @__instance__ = false - Thread.critical = false - begin - @__instance__ = new - ensure - if @__instance__ - class <<self - remove_method :instance - def instance; @__instance__ end - end - else - @__instance__ = nil # failed instance creation - end - end - elsif _instantiate?() - Thread.critical = false - else - @__instance__ = false - Thread.critical = false - begin - @__instance__ = new - ensure - if @__instance__ - class <<self - remove_method :instance - def instance; @__instance__ end - end - else - @__instance__ = nil - end - end - end - @__instance__ - end - module SingletonClassMethods # properly clone the Singleton pattern - did you know # that duping doesn't copy class methods? def clone Singleton.__init__(super) end - + private # ensure that the Singleton pattern is properly inherited @@ -142,46 +96,47 @@ class << Singleton def _load(str) instance end - - # waiting-loop hook - def _instantiate?() - while false.equal?(@__instance__) - Thread.critical = false - sleep(0.08) # timeout - Thread.critical = true + end + + class << Singleton + def __init__(klass) + klass.instance_eval { + @__instance__ = nil + @__mutex__ = Mutex.new + } + def klass.instance + return @__instance__ if @__instance__ + @__mutex__.synchronize { + return @__instance__ if @__instance__ + @__instance__ = new() + } + @__instance__ end - @__instance__ + klass end - end - - def __init__(klass) - klass.instance_eval { @__instance__ = nil } - class << klass - define_method(:instance,FirstInstanceCall) + + private + + # extending an object with Singleton is a bad idea + undef_method :extend_object + + def append_features(mod) + # help out people counting on transitive mixins + unless mod.instance_of?(Class) + raise TypeError, "Inclusion of the OO-Singleton module in module #{mod}" + end + super end - klass - end - - private - # extending an object with Singleton is a bad idea - undef_method :extend_object - - def append_features(mod) - # help out people counting on transitive mixins - unless mod.instance_of?(Class) - raise TypeError, "Inclusion of the OO-Singleton module in module #{mod}" + + def included(klass) + super + klass.private_class_method :new, :allocate + klass.extend SingletonClassMethods + Singleton.__init__(klass) end - super end - def included(klass) - super - klass.private_class_method :new, :allocate - klass.extend SingletonClassMethods - Singleton.__init__(klass) - end end - if __FILE__ == $0 @@ -223,9 +178,9 @@ class << Ups def _instantiate? @enter.push Thread.current[:i] while false.equal?(@__instance__) - Thread.critical = false + @__mutex__.unlock sleep 0.08 - Thread.critical = true + @__mutex__.lock end @leave.push Thread.current[:i] @__instance__ diff --git a/lib/tempfile.rb b/lib/tempfile.rb index a033a5b29e..6a2d560b54 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -6,12 +6,14 @@ require 'delegate' require 'tmpdir' +require 'thread' # A class for managing temporary files. This library is written to be # thread safe. class Tempfile < DelegateClass(File) MAX_TRY = 10 @@cleanlist = [] + @@lock = Mutex.new # Creates a temporary file of mode 0600 in the temporary directory # whose name is basename.pid.n and opens with mode "w+". A Tempfile @@ -26,27 +28,23 @@ class Tempfile < DelegateClass(File) tmpdir = '/tmp' end - lock = nil + lock = tmpname = nil n = failure = 0 - - begin - Thread.critical = true - + @@lock.synchronize { begin - tmpname = File.join(tmpdir, make_tmpname(basename, n)) - lock = tmpname + '.lock' - n += 1 - end while @@cleanlist.include?(tmpname) or - File.exist?(lock) or File.exist?(tmpname) - - Dir.mkdir(lock) - rescue - failure += 1 - retry if failure < MAX_TRY - raise "cannot generate tempfile `%s'" % tmpname - ensure - Thread.critical = false - end + begin + tmpname = File.join(tmpdir, make_tmpname(basename, n)) + lock = tmpname + '.lock' + n += 1 + end while @@cleanlist.include?(tmpname) or + File.exist?(lock) or File.exist?(tmpname) + Dir.mkdir(lock) + rescue + failure += 1 + retry if failure < MAX_TRY + raise "cannot generate tempfile `%s'" % tmpname + end + } @data = [tmpname] @clean_proc = Tempfile.callback(@data) diff --git a/lib/thread.rb b/lib/thread.rb index 5d4fedc73c..11c9d5a1cc 100644 --- a/lib/thread.rb +++ b/lib/thread.rb @@ -13,7 +13,7 @@ unless defined? Thread end unless defined? ThreadError - class ThreadError<StandardError + class ThreadError < StandardError end end @@ -21,143 +21,12 @@ if $DEBUG Thread.abort_on_exception = true end -class Thread - # - # Wraps a block in Thread.critical, restoring the original value upon exit - # from the critical section. - # - def Thread.exclusive - _old = Thread.critical - begin - Thread.critical = true - return yield - ensure - Thread.critical = _old - end - end -end - -# -# Mutex implements a simple semaphore that can be used to coordinate access to -# shared data from multiple concurrent threads. -# -# Example: -# -# require 'thread' -# semaphore = Mutex.new -# -# a = Thread.new { -# semaphore.synchronize { -# # access shared resource -# } -# } -# -# b = Thread.new { -# semaphore.synchronize { -# # access shared resource -# } -# } -# class Mutex - # - # Creates a new Mutex - # - def initialize - @waiting = [] - @locked = false; - @waiting.taint # enable tainted comunication - self.taint - end - - # - # Returns +true+ if this lock is currently held by some thread. - # - def locked? - @locked && true - end - - # - # Attempts to obtain the lock and returns immediately. Returns +true+ if the - # lock was granted. - # - def try_lock - result = false - Thread.critical = true - unless @locked - @locked = Thread.current - result = true - end - Thread.critical = false - result - end - - # - # Attempts to grab the lock and waits if it isn't available. - # - def lock - while (Thread.critical = true; @locked) - if @locked == Thread.current - raise ThreadError, "deadlock; recursive locking" - end - @waiting.push Thread.current - Thread.stop - end - @locked = Thread.current - Thread.critical = false - self - end - - # - # Releases the lock. Returns +nil+ if ref wasn't locked. - # - def unlock - return unless @locked - Thread.critical = true - @locked = false - begin - t = @waiting.shift - t.wakeup if t - rescue ThreadError - retry - end - Thread.critical = false - begin - t.run if t - rescue ThreadError - end - self - end - - # - # Obtains a lock, runs the block, and releases the lock when the block - # completes. See the example under Mutex. - # def synchronize - lock - begin - yield - ensure - unlock - end - end - - # - # If the mutex is locked, unlocks the mutex, wakes one waiting thread, and - # yields in a critical section. - # - def exclusive_unlock - return unless @locked - Thread.exclusive do - @locked = false - begin - t = @waiting.shift - t.wakeup if t - rescue ThreadError - retry - end - yield - end - self + self.lock + yield + ensure + self.unlock end end @@ -201,12 +70,9 @@ class ConditionVariable # def wait(mutex) begin - mutex.exclusive_unlock do - @waiters.push(Thread.current) - Thread.stop - end - ensure - mutex.lock + # TODO: mutex should not be used + @waiters.push(Thread.current) + mutex.sleep end end @@ -226,6 +92,7 @@ class ConditionVariable # Wakes up all threads waiting for this lock. # def broadcast + # TODO: imcomplete waiters0 = nil Thread.exclusive do waiters0 = @waiters.dup @@ -277,22 +144,23 @@ class Queue @que.taint # enable tainted comunication @waiting.taint self.taint + @mutex = Mutex.new end # # Pushes +obj+ to the queue. # def push(obj) - Thread.critical = true - @que.push obj - begin - t = @waiting.shift - t.wakeup if t - rescue ThreadError - retry - ensure - Thread.critical = false - end + t = nil + @mutex.synchronize{ + @que.push obj + begin + t = @waiting.shift + t.wakeup if t + rescue ThreadError + retry + end + } begin t.run if t rescue ThreadError @@ -315,14 +183,17 @@ class Queue # thread isn't suspended, and an exception is raised. # def pop(non_block=false) - while (Thread.critical = true; @que.empty?) - raise ThreadError, "queue empty" if non_block - @waiting.push Thread.current - Thread.stop + while true + @mutex.synchronize{ + if @que.empty? + raise ThreadError, "queue empty" if non_block + @waiting.push Thread.current + @mutex.sleep + else + return @que.shift + end + } end - @que.shift - ensure - Thread.critical = false end # @@ -336,7 +207,7 @@ class Queue alias deq pop # - # Returns +true+ is the queue is empty. + # Returns +true+ if the queue is empty. # def empty? @que.empty? @@ -375,7 +246,7 @@ end # # See Queue for an example of how a SizedQueue works. # -class SizedQueue<Queue +class SizedQueue < Queue # # Creates a fixed-length queue with a maximum size of +max+. # @@ -398,14 +269,16 @@ class SizedQueue<Queue # Sets the maximum size of the queue. # def max=(max) - Thread.critical = true - if max <= @max - @max = max - Thread.critical = false - else - diff = max - @max - @max = max - Thread.critical = false + diff = nil + @mutex.synchronize { + if max <= @max + @max = max + else + diff = max - @max + @max = max + end + } + if diff diff.times do begin t = @queue_wait.shift @@ -423,13 +296,27 @@ class SizedQueue<Queue # until space becomes available. # def push(obj) - Thread.critical = true - while @que.length >= @max - @queue_wait.push Thread.current - Thread.stop - Thread.critical = true + t = nil + @mutex.synchronize{ + while true + break if @que.length <= @max + @queue_wait.push Thread.current + @mutex.sleep + end + + @que.push obj + begin + t = @waiting.shift + t.wakeup if t + rescue ThreadError + retry + end + } + + begin + t.run if t + rescue ThreadError end - super end # @@ -447,20 +334,20 @@ class SizedQueue<Queue # def pop(*args) retval = super - Thread.critical = true - if @que.length < @max - begin - t = @queue_wait.shift - t.wakeup if t - rescue ThreadError - retry - ensure - Thread.critical = false - end - begin - t.run if t - rescue ThreadError + t = nil + @mutex.synchronize { + if @que.length < @max + begin + t = @queue_wait.shift + t.wakeup if t + rescue ThreadError + retry + end end + } + begin + t.run if t + rescue ThreadError end retval end diff --git a/lib/timeout.rb b/lib/timeout.rb index dc92964c0b..af201c8ee7 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -1,52 +1,41 @@ -#-- # = timeout.rb # # execution timeout # -# = Copyright -# -# Copyright:: (C) 2000 Network Applied Communication Laboratory, Inc. -# Copyright:: (C) 2000 Information-technology Promotion Agency, Japan +# = Synopsis # -#++ +# require 'timeout' +# status = Timeout::timeout(5) { +# # Something that should be interrupted if it takes too much time... +# } # # = Description # -# A way of performing a potentially long-running operation in a thread, and -# terminating it's execution if it hasn't finished within fixed amount of -# time. +# A way of performing a potentially long-running operation in a thread, and terminating +# it's execution if it hasn't finished by a fixed amount of time. # -# Previous versions of timeout didn't use a module for namespace. This version +# Previous versions of timeout didn't provide use a module for namespace. This version # provides both Timeout.timeout, and a backwards-compatible #timeout. # -# = Synopsis -# -# require 'timeout' -# status = Timeout::timeout(5) { -# # Something that should be interrupted if it takes too much time... -# } +# = Copyright # +# Copyright:: (C) 2000 Network Applied Communication Laboratory, Inc. +# Copyright:: (C) 2000 Information-technology Promotion Agency, Japan module Timeout - - ## # Raised by Timeout#timeout when the block times out. - - class Error<Interrupt + class Error < Interrupt end - ## # Executes the method's block. If the block execution terminates before +sec+ # seconds has passed, it returns true. If not, it terminates the execution # and raises +exception+ (which defaults to Timeout::Error). # - # Note that this is both a method of module Timeout, so you can 'include - # Timeout' into your classes so they have a #timeout method, as well as a - # module method, so you can call it directly as Timeout.timeout(). - + # Note that this is both a method of module Timeout, so you can 'include Timeout' + # into your classes so they have a #timeout method, as well as a module method, + # so you can call it directly as Timeout.timeout(). def timeout(sec, exception=Error) return yield if sec == nil or sec.zero? - raise ThreadError, "timeout within critical session" if Thread.critical begin x = Thread.current y = Thread.start { @@ -54,33 +43,28 @@ module Timeout x.raise exception, "execution expired" if x.alive? } yield sec - # return true + return true ensure y.kill if y and y.alive? end end module_function :timeout - end -## # Identical to: # # Timeout::timeout(n, e, &block). # # Defined for backwards compatibility with earlier versions of timeout.rb, see # Timeout#timeout. - -def timeout(n, e=Timeout::Error, &block) # :nodoc: +def timeout(n, e = Timeout::Error, &block) Timeout::timeout(n, e, &block) end -## # Another name for Timeout::Error, defined for backwards compatibility with # earlier versions of timeout.rb. - -TimeoutError = Timeout::Error # :nodoc: +TimeoutError = Timeout::Error if __FILE__ == $0 p timeout(5) { @@ -102,4 +86,3 @@ if __FILE__ == $0 } } end - diff --git a/lib/weakref.rb b/lib/weakref.rb index 048f06f459..20e6a1b4d4 100644 --- a/lib/weakref.rb +++ b/lib/weakref.rb @@ -1,13 +1,6 @@ -require "delegate" - -# WeakRef is a class to represent a reference to an object that is not seen by -# the tracing phase of the garbage collector. This allows the referenced -# object to be garbage collected as if nothing is referring to it. Because -# WeakRef delegates method calls to the referenced object, it may be used in -# place of that object, i.e. it is of the same duck type. +# Weak Reference class that does not bother GCing. # # Usage: -# # foo = Object.new # foo = Object.new # p foo.to_s # original's class @@ -15,18 +8,21 @@ require "delegate" # p foo.to_s # should be same class # ObjectSpace.garbage_collect # p foo.to_s # should raise exception (recycled) -class WeakRef<Delegator - # RefError is raised if an object cannot be referenced by a WeakRef. - class RefError<StandardError +require "delegate" +require 'thread' + +class WeakRef < Delegator + + class RefError < StandardError end @@id_map = {} # obj -> [ref,...] @@id_rev_map = {} # ref -> obj + @@mutex = Mutex.new @@final = lambda {|id| - __old_status = Thread.critical - Thread.critical = true - begin + printf "final: %p\n", id + @@mutex.synchronize { rids = @@id_map[id] if rids for rid in rids @@ -40,20 +36,22 @@ class WeakRef<Delegator @@id_map[rid].delete(id) @@id_map.delete(rid) if @@id_map[rid].empty? end - ensure - Thread.critical = __old_status - end + } } - # Create a new WeakRef from +orig+. def initialize(orig) - __setobj__(orig) + @__id = orig.object_id + printf "orig: %p\n", @__id + ObjectSpace.define_finalizer orig, @@final + ObjectSpace.define_finalizer self, @@final + @@mutex.synchronize { + @@id_map[@__id] = [] unless @@id_map[@__id] + } + @@id_map[@__id].push self.object_id + @@id_rev_map[self.object_id] = @__id super end - # Return the object this WeakRef references. Raises RefError if the object - # has been garbage collected. The object returned is the object to which - # method calls are delegated (see Delegator). def __getobj__ unless @@id_rev_map[self.object_id] == @__id Kernel::raise RefError, "Illegal Reference - probably recycled", Kernel::caller(2) @@ -64,24 +62,9 @@ class WeakRef<Delegator Kernel::raise RefError, "Illegal Reference - probably recycled", Kernel::caller(2) end end - def __setobj__(obj) - @__id = obj.object_id - ObjectSpace.define_finalizer obj, @@final - ObjectSpace.define_finalizer self, @@final - __old_status = Thread.critical - begin - Thread.critical = true - @@id_map[@__id] = [] unless @@id_map[@__id] - ensure - Thread.critical = __old_status - end - @@id_map[@__id].push self.object_id - @@id_rev_map[self.object_id] = @__id end - # Returns true if the referenced object still exists, and false if it has - # been garbage collected. def weakref_alive? @@id_rev_map[self.object_id] == @__id end diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb index 4a447aaf85..3b250886db 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -162,7 +162,7 @@ module WEBrick def timeout(seconds, exception=Timeout::Error) return yield if seconds.nil? or seconds.zero? - raise ThreadError, "timeout within critical session" if Thread.critical + # raise ThreadError, "timeout within critical session" if Thread.critical id = TimeoutHandler.register(seconds, exception) begin yield(seconds) @@ -19,7 +19,11 @@ /* to link startup code with ObjC support */ #if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__) -static void objcdummyfunction( void ) { objc_msgSend(); } +static void +objcdummyfunction(void) +{ + objc_msgSend(); +} #endif int @@ -37,10 +41,9 @@ main(int argc, char **argv, char **envp) #endif { - RUBY_INIT_STACK - ruby_init(); - ruby_options(argc, argv); - ruby_run(); + RUBY_INIT_STACK ruby_init(); + ruby_options(argc, argv); + ruby_run(); } return 0; } @@ -124,6 +124,7 @@ enum node_type { NODE_ATTRASGN, NODE_PRELUDE, NODE_LAMBDA, + NODE_OPTBLOCK, NODE_LAST }; @@ -153,9 +154,6 @@ typedef struct RNode { } u3; } NODE; -extern NODE *ruby_cref; -extern NODE *ruby_top_cref; - #define RNODE(obj) (R_CAST(RNode)(obj)) /* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_NEWLINE */ @@ -169,7 +167,7 @@ extern NODE *ruby_top_cref; RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|(((t)<<NODE_TYPESHIFT)&NODE_TYPEMASK)) #define NODE_LSHIFT (NODE_TYPESHIFT+7) -#define NODE_LMASK (((VALUE)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1) +#define NODE_LMASK (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1) #define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK)) #define nd_set_line(n,l) \ RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT)) @@ -197,6 +195,7 @@ extern NODE *ruby_top_cref; #define nd_cflag u2.id #define nd_cval u3.value +#define nd_oid u1.id #define nd_cnt u3.cnt #define nd_tbl u1.tbl @@ -217,7 +216,7 @@ extern NODE *ruby_top_cref; #define nd_mid u2.id #define nd_args u3.node -#define nd_noex u1.id +#define nd_noex u3.id #define nd_defn u3.node #define nd_cfnc u1.cfunc @@ -228,7 +227,6 @@ extern NODE *ruby_top_cref; #define nd_modl u1.id #define nd_clss u1.value -#define nd_vis u2.argc #define nd_beg u1.node #define nd_end u2.node @@ -240,10 +238,12 @@ extern NODE *ruby_top_cref; #define nd_tag u1.id #define nd_tval u2.value +#define nd_visi u2.argc + #define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2)) -#define NEW_METHOD(n,x) NEW_NODE(NODE_METHOD,x,n,0) -#define NEW_FBODY(n,i,o) NEW_NODE(NODE_FBODY,n,i,o) +#define NEW_METHOD(n,x,v) NEW_NODE(NODE_METHOD,x,n,v) +#define NEW_FBODY(n,i) NEW_NODE(NODE_FBODY,i,n,0) #define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,p,i,NEW_RFUNC(a,d)) #define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_RFUNC(a,d)) #define NEW_CFUNC(f,c) NEW_NODE(NODE_CFUNC,f,c,0) @@ -329,6 +329,7 @@ extern NODE *ruby_top_cref; #define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(b),0) #define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0) #define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0) +#define NEW_CREF(c) (NEW_NODE(NODE_CREF,0,0,c)) #define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0) #define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0) #define NEW_ATTRSET(a) NEW_NODE(NODE_ATTRSET,a,0,0) @@ -343,23 +344,27 @@ extern NODE *ruby_top_cref; #define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b) #define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a) #define NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0) +#define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0) -#define NOEX_PUBLIC 0 -#define NOEX_NOSUPER 1 -#define NOEX_PRIVATE 2 -#define NOEX_PROTECTED 4 -#define NOEX_LOCAL 8 -#define NOEX_MASK 14 +#define NOEX_PUBLIC 0x00 +#define NOEX_NOSUPER 0x01 +#define NOEX_PRIVATE 0x02 +#define NOEX_PROTECTED 0x04 +#define NOEX_LOCAL 0x08 +#define NOEX_MASK 0x0E /* 1110 */ #define NOEX_UNDEF NOEX_NOSUPER -#define NOEX_RECV 16 + +#define NOEX_MODFUNC 0x10 +#define NOEX_SUPER 0x20 +#define NOEX_VCALL 0x40 VALUE rb_parser_new(void); VALUE rb_parser_end_seen_p(VALUE); -NODE *rb_parser_compile_cstr(VALUE, const char*, const char*, int, int); -NODE *rb_parser_compile_string(VALUE, const char*, VALUE, int); -NODE *rb_parser_compile_file(VALUE, const char*, VALUE, int); +NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int); +NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int); +NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int); NODE *rb_compile_cstr(const char*, const char*, int, int); NODE *rb_compile_string(const char*, VALUE, int); @@ -393,99 +398,6 @@ typedef void (*rb_event_hook_func_t)(rb_event_t,NODE*,VALUE,ID,VALUE); void rb_add_event_hook(rb_event_hook_func_t,rb_event_t); int rb_remove_event_hook(rb_event_hook_func_t); -#if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT) -#include <ucontext.h> -#define USE_CONTEXT -#endif -#include <setjmp.h> -#include "st.h" - -#ifdef USE_CONTEXT -typedef struct { - ucontext_t context; - volatile int status; -} rb_jmpbuf_t[1]; -#else -typedef jmp_buf rb_jmpbuf_t; -#endif - -enum thread_status { - THREAD_TO_KILL, - THREAD_RUNNABLE, - THREAD_STOPPED, - THREAD_KILLED, -}; - -typedef struct thread * rb_thread_t; - -struct thread { - struct thread *next, *prev; - rb_jmpbuf_t context; -#if (defined _WIN32 && !defined _WIN32_WCE) || defined __CYGWIN__ - unsigned long win32_exception_list; -#endif - - VALUE result; - - long stk_len; - long stk_max; - VALUE *stk_ptr; - VALUE *stk_pos; -#ifdef __ia64 - long bstr_len; - long bstr_max; - VALUE *bstr_ptr; - VALUE *bstr_pos; -#endif - - struct FRAME *frame; - struct SCOPE *scope; - struct RVarmap *dyna_vars; - struct BLOCK *block; - struct iter *iter; - struct tag *tag; - VALUE wrapper; - NODE *cref; - struct ruby_env *anchor; - - int flags; /* misc. states (rb_trap_immediate/raised) */ - - NODE *node; - - int tracing; - VALUE errinfo; - VALUE last_status; - VALUE last_line; - VALUE last_match; - - int safe; - - enum thread_status status; - int wait_for; - int fd; - rb_fdset_t readfds; - rb_fdset_t writefds; - rb_fdset_t exceptfds; - int select_value; - double delay; - rb_thread_t join; - - int abort; - int priority; - VALUE thgroup; - - st_table *locals; - - VALUE thread; - - VALUE sandbox; -}; - -extern VALUE (*ruby_sandbox_save)(struct thread *); -extern VALUE (*ruby_sandbox_restore)(struct thread *); -extern rb_thread_t curr_thread; -extern rb_thread_t main_thread; - #if defined(__cplusplus) } /* extern "C" { */ #endif @@ -11,7 +11,6 @@ **********************************************************************/ #include "ruby.h" -#include "env.h" #include <ctype.h> #include <math.h> #include <stdio.h> @@ -180,7 +179,7 @@ rb_num_coerce_relop(VALUE x, VALUE y) static VALUE num_sadded(VALUE x, VALUE name) { - ruby_frame = ruby_frame->prev; /* pop frame for "singleton_method_added" */ + // ruby_frame = ruby_frame->prev; /* pop frame for "singleton_method_added" */ /* Numerics should be values; singleton_methods should not be added to them */ rb_raise(rb_eTypeError, "can't define singleton method \"%s\" for %s", @@ -1699,7 +1698,7 @@ int_int_p(VALUE num) /* * call-seq: * int.odd? -> true or false - * + * * Returns <code>true</code> if <i>int</i> is an odd number. */ @@ -1707,7 +1706,7 @@ static VALUE int_odd_p(VALUE num) { if (rb_funcall(num, '%', 1, INT2FIX(2)) != INT2FIX(0)) { - return Qtrue; + return Qtrue; } return Qfalse; } @@ -1715,7 +1714,7 @@ int_odd_p(VALUE num) /* * call-seq: * int.even? -> true or false - * + * * Returns <code>true</code> if <i>int</i> is an even number. */ @@ -1723,13 +1722,31 @@ static VALUE int_even_p(VALUE num) { if (rb_funcall(num, '%', 1, INT2FIX(2)) == INT2FIX(0)) { - return Qtrue; + return Qtrue; } return Qfalse; } /* * call-seq: + * fixnum.next => integer + * fixnum.succ => integer + * + * Returns the <code>Integer</code> equal to <i>int</i> + 1. + * + * 1.next #=> 2 + * (-1).next #=> 0 + */ + +static VALUE +fix_succ(VALUE num) +{ + long i = FIX2LONG(num) + 1; + return LONG2NUM(i); +} + +/* + * call-seq: * int.next => integer * int.succ => integer * @@ -2788,28 +2805,36 @@ int_downto(VALUE from, VALUE to) * 0 1 2 3 4 */ +VALUE yarv_invoke_Integer_times_special_block(VALUE); + static VALUE int_dotimes(VALUE num) { - RETURN_ENUMERATOR(num, 0, 0); - if (FIXNUM_P(num)) { - long i, end; + VALUE val; - end = FIX2LONG(num); - for (i=0; i<end; i++) { - rb_yield(LONG2FIX(i)); - } + RETURN_ENUMERATOR(num, 0, 0); + if((val = yarv_invoke_Integer_times_special_block(num)) != Qundef){ + return val; + } + + if (FIXNUM_P(num)) { + long i, end; + + end = FIX2LONG(num); + for (i=0; i<end; i++) { + rb_yield(LONG2FIX(i)); } - else { - VALUE i = INT2FIX(0); + } + else { + VALUE i = INT2FIX(0); - for (;;) { - if (!RTEST(rb_funcall(i, '<', 1, num))) break; - rb_yield(i); - i = rb_funcall(i, '+', 1, INT2FIX(1)); - } + for (;;) { + if (!RTEST(rb_funcall(i, '<', 1, num))) break; + rb_yield(i); + i = rb_funcall(i, '+', 1, INT2FIX(1)); } - return num; + } + return num; } /* @@ -2976,6 +3001,7 @@ Init_Numeric(void) rb_define_method(rb_cFixnum, "zero?", fix_zero_p, 0); rb_define_method(rb_cFixnum, "odd?", fix_odd_p, 0); rb_define_method(rb_cFixnum, "even?", fix_even_p, 0); + rb_define_method(rb_cFixnum, "succ", fix_succ, 0); rb_cFloat = rb_define_class("Float", rb_cNumeric); @@ -384,7 +384,7 @@ rb_obj_is_instance_of(VALUE obj, VALUE c) * b.kind_of? C #=> false * b.kind_of? M #=> true */ - +#include "debug.h" VALUE rb_obj_is_kind_of(VALUE obj, VALUE c) { @@ -1974,7 +1974,7 @@ rb_cstr_to_dbl(const char *p, int badcheck) if (!p) return 0.0; q = p; - while (ISSPACE(*p)) p++; + while (ISSPACE(*p)) p++; d = strtod(p, &end); if (errno == ERANGE) { OutOfRange(); @@ -1982,7 +1982,7 @@ rb_cstr_to_dbl(const char *p, int badcheck) errno = 0; } if (p == end) { - bad: + bad: if (badcheck) { rb_invalid_str(q, "Float()"); } @@ -1996,8 +1996,8 @@ rb_cstr_to_dbl(const char *p, int badcheck) while (*p) { if (*p == '_') { /* remove underscores between digits */ - if (n == buf || !ISDIGIT(n[-1])) goto bad; - while (*++p == '_'); + if (n == buf || !ISDIGIT(n[-1])) goto bad; + while (*++p == '_'); if (!ISDIGIT(*p)) { if (badcheck) goto bad; break; @@ -2240,9 +2240,9 @@ VALUE ruby_top_self; * that follows, the vertical arrows represent inheritance, and the * parentheses meta-classes. All metaclasses are instances * of the class `Class'. - * + * * +-----------------+ - * | | + * | | * BasicObject-->(BasicObject) | * ^ ^ | * | | | @@ -2270,7 +2270,7 @@ VALUE ruby_top_self; * class hierarchy is a direct subclass of <code>BasicObject</code>. Its * methods are therefore available to all objects unless explicitly * overridden. - * + * * <code>Object</code> mixes in the <code>Kernel</code> module, making * the built-in kernel functions globally accessible. Although the * instance methods of <code>Object</code> are defined by the diff --git a/opt_insn_unif.def b/opt_insn_unif.def new file mode 100644 index 0000000000..c81d72cdb1 --- /dev/null +++ b/opt_insn_unif.def @@ -0,0 +1,29 @@ +#
+# a definition of instruction unification
+#
+#
+
+__END__
+
+putobject putobject
+putobject putstring
+putobject setlocal
+putobject setdynamic
+
+putstring putstring
+putstring putobject
+putstring setlocal
+putstring setdynamic
+
+# putnil end
+
+dup setlocal
+
+# from tarai
+getlocal getlocal
+# getlocal send
+
+# from tak, ackermann
+getlocal putobject
+
+
diff --git a/opt_operand.def b/opt_operand.def new file mode 100644 index 0000000000..fc265cb3cf --- /dev/null +++ b/opt_operand.def @@ -0,0 +1,59 @@ +#
+# configration file for operand union optimization
+#
+# format:
+# [insn name] op1, op2 ...
+#
+# wildcard: *
+#
+
+__END__
+
+getlocal 2
+getlocal 3
+getlocal 4
+
+setlocal 2
+setlocal 3
+setlocal 4
+
+getdynamic *, 0
+getdynamic 1, 0
+getdynamic 2, 0
+getdynamic 3, 0
+getdynamic 4, 0
+
+setdynamic *, 0
+setdynamic 1, 0
+setdynamic 2, 0
+setdynamic 3, 0
+setdynamic 4, 0
+
+putobject INT2FIX(0)
+putobject INT2FIX(1)
+putobject Qtrue
+putobject Qfalse
+
+# CALL
+send *, *, Qfalse, 0, *
+send *, 0, Qfalse, 0, *
+send *, 1, Qfalse, 0, *
+send *, 2, Qfalse, 0, *
+send *, 3, Qfalse, 0, *
+
+# FCALL
+send *, *, Qfalse, 0x04, *
+send *, 0, Qfalse, 0x04, *
+send *, 1, Qfalse, 0x04, *
+send *, 2, Qfalse, 0x04, *
+send *, 3, Qfalse, 0x04, *
+
+# VCALL
+send *, 0, Qfalse, 0x0c, *
+
+
+__END__
+
+
+
+
@@ -17,7 +17,6 @@ #define YYSTACK_USE_ALLOCA 0 #include "ruby.h" -#include "env.h" #include "intern.h" #include "node.h" #include "st.h" @@ -107,17 +106,95 @@ union tmpyystype { struct RVarmap *vars; }; -struct local_vars { +struct vtable { ID *tbl; - int nofree; - int cnt; - int dlev; - int dname_size; - ID *dnames; - struct RVarmap* dyna_vars; + int pos; + int capa; + struct vtable *prev; +}; + +struct local_vars { + struct vtable *tbl; + struct vtable *dnames; + struct vtable *dvars; struct local_vars *prev; + int nofree; }; +#define DVARS_INHERIT ((void*)1) +#define DVARS_TOPSCOPE NULL +#define DVARS_SPECIAL_P(tbl) (!POINTER_P(tbl)) +#define POINTER_P(val) ((unsigned long)(val) & ~3UL) + +static int +vtable_size(struct vtable *tbl) +{ + if (POINTER_P(tbl)) { + return tbl->pos; + } + else { + return 0; + } +} + +#define VTBL_DEBUG 0 + +static struct vtable * +vtable_alloc(struct vtable *prev) +{ + struct vtable *tbl = ALLOC(struct vtable); + tbl->pos = 0; + tbl->capa = 8; + tbl->tbl = ALLOC_N(ID, tbl->capa); + tbl->prev = prev; + if (VTBL_DEBUG) printf("vtable_alloc: %p\n", tbl); + return tbl; +} + +static void +vtable_free(struct vtable *tbl) +{ + if (VTBL_DEBUG)printf("vtable_free: %p\n", tbl); + if (POINTER_P(tbl)) { + if (tbl->tbl) { + xfree(tbl->tbl); + } + if (tbl) { + xfree(tbl); + } + } +} + +static void +vtable_add(struct vtable *tbl, ID id) +{ + if (!POINTER_P(tbl)) { + rb_bug("vtable_add: vtable is not allocated (%p)", tbl); + } + if (VTBL_DEBUG) printf("vtable_add: %p, %s\n", tbl, rb_id2name(id)); + + if (tbl->pos == tbl->capa) { + tbl->capa = tbl->capa * 2; + REALLOC_N(tbl->tbl, ID, tbl->capa); + } + tbl->tbl[tbl->pos++] = id; +} + +static int +vtable_included(struct vtable * tbl, ID id) +{ + int i; + + if (POINTER_P(tbl)) { + for (i = 0; i < tbl->pos; i++) { + if (tbl->tbl[i] == id) { + return 1; + } + } + } + return 0; +} + /* Structure of Lexer Buffer: @@ -310,20 +387,27 @@ static int local_id_gen(struct parser_params*, ID); #define local_id(id) local_id_gen(parser, id) static ID *local_tbl_gen(struct parser_params*); #define local_tbl() local_tbl_gen(parser) +static ID *dyna_tbl_gen(struct parser_params*); +#define dyna_tbl() dyna_tbl_gen(parser) static ID internal_id(void); -static struct RVarmap *dyna_push_gen(struct parser_params*); +static int dyna_push_gen(struct parser_params*); #define dyna_push() dyna_push_gen(parser) static void dyna_pop_gen(struct parser_params*, struct RVarmap*); #define dyna_pop(vars) dyna_pop_gen(parser, vars) static int dyna_in_block_gen(struct parser_params*); -#define dyna_in_block() (lvtbl->dlev > 0) -static NODE *dyna_init_gen(struct parser_params*, NODE*, struct RVarmap *); +#define dyna_in_block() dyna_in_block_gen(parser) +static NODE *dyna_init_gen(struct parser_params*, NODE*, int); #define dyna_init(node, pre) dyna_init_gen(parser, node, pre) static void dyna_var_gen(struct parser_params*,ID); #define dyna_var(id) dyna_var_gen(parser, id) static void dyna_check_gen(struct parser_params*,ID); #define dyna_check(id) dyna_check_gen(parser, id) +static int dvar_defined_gen(struct parser_params*,ID); +#define dvar_defined(id) dvar_defined_gen(parser, id) +static int dvar_curr_gen(struct parser_params*,ID); +#define dvar_curr(id) dvar_curr_gen(parser, id) + static void top_local_init_gen(struct parser_params*); #define top_local_init() top_local_init_gen(parser) @@ -471,7 +555,7 @@ static void ripper_compile_error(struct parser_params*, const char *fmt, ...); /*% %token <val> %*/ - keyword_class + keyword_class keyword_module keyword_def keyword_undef @@ -615,18 +699,16 @@ program : { /*%%%*/ lex_state = EXPR_BEG; top_local_init(); - if (ruby_class == rb_cObject) class_nest = 0; - else class_nest = 1; /*% - lex_state = EXPR_BEG; - class_nest = !parser->toplevel_p; + lex_state = EXPR_BEG; + $$ = Qnil; %*/ } compstmt { /*%%%*/ if ($2 && !compile_for_eval) { - /* last expression should not be void */ + /* last expression should not be void */ if (nd_type($2) != NODE_BLOCK) void_expr($2); else { NODE *node = $2; @@ -637,12 +719,10 @@ program : { } } ruby_eval_tree = block_append(ruby_eval_tree, $2); - top_local_setup(); - class_nest = 0; - /*% - class_nest = 0; - $$ = $2; - parser->result = dispatch1(program, $$); + top_local_setup(); + /*% + $$ = $2; + parser->result = dispatch1(program, $$); %*/ } ; @@ -653,7 +733,7 @@ bodystmt : compstmt opt_ensure { /*%%%*/ - $$ = $1; + $$ = $1; if ($2) { $$ = NEW_RESCUE($1, $2, $3); } @@ -670,12 +750,12 @@ bodystmt : compstmt } } fixpos($$, $1); - /*% - $$ = dispatch4(bodystmt, - escape_Qundef($1), - escape_Qundef($2), - escape_Qundef($3), - escape_Qundef($4)); + /*% + $$ = dispatch4(bodystmt, + escape_Qundef($1), + escape_Qundef($2), + escape_Qundef($3), + escape_Qundef($4)); %*/ } ; @@ -684,9 +764,9 @@ compstmt : stmts opt_terms { /*%%%*/ void_stmts($1); - $$ = $1; + $$ = $1; /*% - $$ = $1; + $$ = $1; %*/ } ; @@ -696,7 +776,7 @@ stmts : none /*%c { $$ = dispatch2(stmts_add, dispatch0(stmts_new), - dispatch0(void_stmt)); + dispatch0(void_stmt)); } %*/ | stmt @@ -724,7 +804,7 @@ stmts : none stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem { /*%%%*/ - $$ = NEW_ALIAS($2, $4); + $$ = NEW_ALIAS($2, $4); /*% $$ = dispatch2(alias, $2, $4); %*/ @@ -732,7 +812,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem | keyword_alias tGVAR tGVAR { /*%%%*/ - $$ = NEW_VALIAS($2, $3); + $$ = NEW_VALIAS($2, $3); /*% $$ = dispatch2(var_alias, $2, $3); %*/ @@ -743,7 +823,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem char buf[3]; sprintf(buf, "$%c", (char)$3->nd_nth); - $$ = NEW_VALIAS($2, rb_intern(buf)); + $$ = NEW_VALIAS($2, rb_intern(buf)); /*% $$ = dispatch2(var_alias, $2, $3); %*/ @@ -751,8 +831,8 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem | keyword_alias tGVAR tNTH_REF { /*%%%*/ - yyerror("can't make alias for the number variables"); - $$ = 0; + yyerror("can't make alias for the number variables"); + $$ = 0; /*% $$ = dispatch2(var_alias, $2, $3); $$ = dispatch1(alias_error, $$); @@ -770,10 +850,10 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem { /*%%%*/ $$ = NEW_IF(cond($3), $1, 0); - fixpos($$, $3); + fixpos($$, $3); if (cond_negative(&$$->nd_cond)) { - $$->nd_else = $$->nd_body; - $$->nd_body = 0; + $$->nd_else = $$->nd_body; + $$->nd_body = 0; } /*% $$ = dispatch2(if_mod, $3, $1); @@ -783,13 +863,13 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem { /*%%%*/ $$ = NEW_UNLESS(cond($3), $1, 0); - fixpos($$, $3); + fixpos($$, $3); if (cond_negative(&$$->nd_cond)) { - $$->nd_body = $$->nd_else; - $$->nd_else = 0; + $$->nd_body = $$->nd_else; + $$->nd_else = 0; } /*% - $$ = dispatch2(unless_mod, $3, $1); + $$ = dispatch2(unless_mod, $3, $1); %*/ } | stmt modifier_while expr_value @@ -838,7 +918,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem if (in_def || in_single) { yyerror("BEGIN in method"); } - local_push(0); + // local_push(0); /*% if (in_def || in_single) { yyerror("BEGIN in method"); @@ -849,8 +929,9 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem { /*%%%*/ ruby_eval_tree_begin = block_append(ruby_eval_tree_begin, - NEW_PREEXE($4)); - local_pop(); + $4); + // NEW_PREEXE($4)); + // local_pop(); $$ = 0; /*% $$ = dispatch1(BEGIN, $4); @@ -864,7 +945,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem /*%%%*/ $$ = NEW_POSTEXE($3); /*% - $$ = dispatch1(END, $3); + $$ = dispatch1(END, $3); %*/ } | lhs '=' command_call @@ -872,7 +953,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem /*%%%*/ $$ = node_assign($1, $3); /*% - $$ = dispatch2(assign, $1, $3); + $$ = dispatch2(assign, $1, $3); %*/ } | mlhs '=' command_call @@ -882,7 +963,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $1->nd_value = ($1->nd_head) ? NEW_TO_ARY($3) : NEW_ARRAY($3); $$ = $1; /*% - $$ = dispatch2(massign, $1, $3); + $$ = dispatch2(massign, $1, $3); %*/ } | var_lhs tOP_ASGN command_call @@ -911,7 +992,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $$ = 0; } /*% - $$ = dispatch3(opassign, $1, $2, $3); + $$ = dispatch3(opassign, $1, $2, $3); %*/ } | primary_value '[' opt_call_args rbracket tOP_ASGN command_call @@ -928,10 +1009,10 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $5 = 1; } $$ = NEW_OP_ASGN1($1, $5, args); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch2(aref_field, $1, escape_Qundef($3)); - $$ = dispatch3(opassign, $$, $5, $6); + $$ = dispatch3(opassign, $$, $5, $6); %*/ } | primary_value '.' tIDENTIFIER tOP_ASGN command_call @@ -945,9 +1026,9 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $4 = 1; } $$ = NEW_OP_ASGN2($1, $3, $4, $5); - fixpos($$, $1); + fixpos($$, $1); /*% - $$ = dispatch3(field, $1, ripper_id2sym('.'), $3); + $$ = dispatch3(field, $1, ripper_id2sym('.'), $3); $$ = dispatch3(opassign, $$, $4, $5); %*/ } @@ -962,9 +1043,9 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $4 = 1; } $$ = NEW_OP_ASGN2($1, $3, $4, $5); - fixpos($$, $1); + fixpos($$, $1); /*% - $$ = dispatch3(field, $1, ripper_id2sym('.'), $3); + $$ = dispatch3(field, $1, ripper_id2sym('.'), $3); $$ = dispatch3(opassign, $$, $4, $5); %*/ } @@ -979,20 +1060,20 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $4 = 1; } $$ = NEW_OP_ASGN2($1, $3, $4, $5); - fixpos($$, $1); + fixpos($$, $1); /*% - $$ = dispatch3(field, $1, ripper_intern("::"), $3); - $$ = dispatch3(opassign, $$, $4, $5); + $$ = dispatch3(field, $1, ripper_intern("::"), $3); + $$ = dispatch3(opassign, $$, $4, $5); %*/ } | backref tOP_ASGN command_call { /*%%%*/ - rb_backref_error($1); + rb_backref_error($1); $$ = 0; /*% - $$ = dispatch2(assign, dispatch1(var_field, $1), $3); - $$ = dispatch1(assign_error, $$); + $$ = dispatch2(assign, dispatch1(var_field, $1), $3); + $$ = dispatch1(assign_error, $$); %*/ } | lhs '=' mrhs @@ -1000,7 +1081,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem /*%%%*/ $$ = node_assign($1, $3); /*% - $$ = dispatch2(assign, $1, $3); + $$ = dispatch2(assign, $1, $3); %*/ } | mlhs '=' arg_value @@ -1009,7 +1090,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $1->nd_value = $3; $$ = $1; /*% - dispatch2(massign, $1, $3); + dispatch2(massign, $1, $3); %*/ } | mlhs '=' mrhs @@ -1018,7 +1099,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem $1->nd_value = $3; $$ = $1; /*% - $$ = dispatch2(massign, $1, $3); + $$ = dispatch2(massign, $1, $3); %*/ } | expr @@ -1030,7 +1111,7 @@ expr : command_call /*%%%*/ $$ = logop(NODE_AND, $1, $3); /*% - $$ = dispatch3(binary, $1, ripper_intern("and"), $3); + $$ = dispatch3(binary, $1, ripper_intern("and"), $3); %*/ } | expr keyword_or expr @@ -1038,7 +1119,7 @@ expr : command_call /*%%%*/ $$ = logop(NODE_OR, $1, $3); /*% - $$ = dispatch3(binary, $1, ripper_intern("or"), $3); + $$ = dispatch3(binary, $1, ripper_intern("or"), $3); %*/ } | keyword_not expr @@ -1046,7 +1127,7 @@ expr : command_call /*%%%*/ $$ = NEW_NOT(cond($2)); /*% - $$ = dispatch2(unary, ripper_intern("not"), $2); + $$ = dispatch2(unary, ripper_intern("not"), $2); %*/ } | '!' command_call @@ -1054,7 +1135,7 @@ expr : command_call /*%%%*/ $$ = NEW_NOT(cond($2)); /*% - $$ = dispatch2(unary, ID2SYM('!'), $2); + $$ = dispatch2(unary, ID2SYM('!'), $2); %*/ } | arg @@ -1066,7 +1147,7 @@ expr_value : expr value_expr($$); $$ = $1; /*% - $$ = $1; + $$ = $1; %*/ } ; @@ -1078,7 +1159,7 @@ command_call : command /*%%%*/ $$ = NEW_RETURN(ret_args($2)); /*% - $$ = dispatch1(return, $2); + $$ = dispatch1(return, $2); %*/ } | keyword_break call_args @@ -1086,7 +1167,7 @@ command_call : command /*%%%*/ $$ = NEW_BREAK(ret_args($2)); /*% - $$ = dispatch1(break, $2); + $$ = dispatch1(break, $2); %*/ } | keyword_next call_args @@ -1094,7 +1175,7 @@ command_call : command /*%%%*/ $$ = NEW_NEXT(ret_args($2)); /*% - $$ = dispatch1(next, $2); + $$ = dispatch1(next, $2); %*/ } ; @@ -1105,8 +1186,8 @@ block_command : block_call /*%%%*/ $$ = NEW_CALL($1, $3, $4); /*% - $$ = dispatch3(call, $1, ripper_id2sym('.'), $3); - $$ = method_arg($$, $4); + $$ = dispatch3(call, $1, ripper_id2sym('.'), $3); + $$ = method_arg($$, $4); %*/ } | block_call tCOLON2 operation2 command_args @@ -1114,8 +1195,8 @@ block_command : block_call /*%%%*/ $$ = NEW_CALL($1, $3, $4); /*% - $$ = dispatch3(call, $1, ripper_intern("::"), $3); - $$ = method_arg($$, $4); + $$ = dispatch3(call, $1, ripper_intern("::"), $3); + $$ = method_arg($$, $4); %*/ } ; @@ -1123,18 +1204,18 @@ block_command : block_call cmd_brace_block : tLBRACE_ARG { /*%%%*/ - $<vars>$ = dyna_push(); - $<num>1 = ruby_sourceline; + $<num>$ = dyna_push(); + $<num>$ = ruby_sourceline; /*% %*/ } - opt_block_param {$<vars>$ = ruby_dyna_vars;} + opt_block_param {$<num>$ = vtable_size(lvtbl->dvars);} compstmt '}' { /*%%%*/ $3->nd_body = block_append($3->nd_body, - dyna_init($5, $<vars>4)); + dyna_init($5, $<num>4)); $$ = $3; nd_set_line($$, $<num>1); dyna_pop($<vars>2); @@ -1148,9 +1229,9 @@ command : operation command_args %prec tLOWEST { /*%%%*/ $$ = NEW_FCALL($1, $2); - fixpos($$, $2); + fixpos($$, $2); /*% - $$ = dispatch2(command, $1, $2); + $$ = dispatch2(command, $1, $2); %*/ } | operation command_args cmd_brace_block @@ -1158,17 +1239,17 @@ command : operation command_args %prec tLOWEST /*%%%*/ $$ = NEW_FCALL($1, $2); block_dup_check($2,$3); - fixpos($$, $2); + fixpos($$, $2); /*% - $$ = dispatch2(command, $1, $2); - $$ = dispatch2(iter_block, $$, $3); + $$ = dispatch2(command, $1, $2); + $$ = dispatch2(iter_block, $$, $3); %*/ } | primary_value '.' operation2 command_args %prec tLOWEST { /*%%%*/ $$ = NEW_CALL($1, $3, $4); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch4(command_call, $1, ripper_id2sym('.'), $3, $4); %*/ @@ -1178,7 +1259,7 @@ command : operation command_args %prec tLOWEST /*%%%*/ $$ = NEW_CALL($1, $3, $4); block_dup_check($4,$5); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch4(command_call, $1, ripper_id2sym('.'), $3, $4); $$ = dispatch2(iter_block, $$, $5); @@ -1188,7 +1269,7 @@ command : operation command_args %prec tLOWEST { /*%%%*/ $$ = NEW_CALL($1, $3, $4); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch4(command_call, $1, ripper_intern("::"), $3, $4); %*/ @@ -1198,17 +1279,17 @@ command : operation command_args %prec tLOWEST /*%%%*/ $$ = NEW_CALL($1, $3, $4); block_dup_check($4,$5); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch4(command_call, $1, ripper_intern("::"), $3, $4); - $$ = dispatch2(iter_block, $$, $5); + $$ = dispatch2(iter_block, $$, $5); %*/ } | keyword_super command_args { /*%%%*/ $$ = NEW_SUPER($2); - fixpos($$, $2); + fixpos($$, $2); /*% $$ = dispatch1(super, $2); %*/ @@ -1217,7 +1298,7 @@ command : operation command_args %prec tLOWEST { /*%%%*/ $$ = new_yield($2); - fixpos($$, $2); + fixpos($$, $2); /*% $$ = dispatch1(yield, $2); %*/ @@ -1429,11 +1510,11 @@ mlhs_node : variable | backref { /*%%%*/ - rb_backref_error($1); + rb_backref_error($1); $$ = 0; /*% $$ = dispatch1(var_field, $1); - $$ = dispatch1(assign_error, $$); + $$ = dispatch1(assign_error, $$); %*/ } ; @@ -1485,7 +1566,7 @@ lhs : variable yyerror("dynamic constant assignment"); $$ = NEW_CDECL(0, 0, NEW_COLON2($1, $3)); /*% - $$ = dispatch2(constpath_field, $1, $3); + $$ = dispatch2(constpath_field, $1, $3); if (in_def || in_single) { $$ = dispatch1(assign_error, $$); } @@ -1498,7 +1579,7 @@ lhs : variable yyerror("dynamic constant assignment"); $$ = NEW_CDECL(0, 0, NEW_COLON3($2)); /*% - $$ = dispatch1(topconst_field, $2); + $$ = dispatch1(topconst_field, $2); if (in_def || in_single) { $$ = dispatch1(assign_error, $$); } @@ -1507,7 +1588,7 @@ lhs : variable | backref { /*%%%*/ - rb_backref_error($1); + rb_backref_error($1); $$ = 0; /*% $$ = dispatch1(assign_error, $1); @@ -1656,7 +1737,7 @@ arg : lhs '=' arg /*%%%*/ $$ = node_assign($1, $3); /*% - $$ = dispatch2(assign, $1, $3); + $$ = dispatch2(assign, $1, $3); %*/ } | lhs '=' arg modifier_rescue arg @@ -1664,7 +1745,7 @@ arg : lhs '=' arg /*%%%*/ $$ = node_assign($1, NEW_RESCUE($3, NEW_RESBODY(0,$5,0), 0)); /*% - $$ = dispatch2(assign, $1, dispatch2(rescue_mod,$3,$5)); + $$ = dispatch2(assign, $1, dispatch2(rescue_mod,$3,$5)); %*/ } | var_lhs tOP_ASGN arg @@ -1693,13 +1774,13 @@ arg : lhs '=' arg $$ = 0; } /*% - $$ = dispatch3(opassign, $1, $2, $3); + $$ = dispatch3(opassign, $1, $2, $3); %*/ } | primary_value '[' opt_call_args rbracket tOP_ASGN arg { /*%%%*/ - NODE *args; + NODE *args; value_expr($6); args = arg_concat($6, $3); @@ -1710,10 +1791,10 @@ arg : lhs '=' arg $5 = 1; } $$ = NEW_OP_ASGN1($1, $5, args); - fixpos($$, $1); + fixpos($$, $1); /*% $1 = dispatch2(aref_field, $1, escape_Qundef($3)); - $$ = dispatch3(opassign, $1, $5, $6); + $$ = dispatch3(opassign, $1, $5, $6); %*/ } | primary_value '.' tIDENTIFIER tOP_ASGN arg @@ -1727,10 +1808,10 @@ arg : lhs '=' arg $4 = 1; } $$ = NEW_OP_ASGN2($1, $3, $4, $5); - fixpos($$, $1); + fixpos($$, $1); /*% $1 = dispatch3(field, $1, ripper_id2sym('.'), $3); - $$ = dispatch3(opassign, $1, $4, $5); + $$ = dispatch3(opassign, $1, $4, $5); %*/ } | primary_value '.' tCONSTANT tOP_ASGN arg @@ -1744,10 +1825,10 @@ arg : lhs '=' arg $4 = 1; } $$ = NEW_OP_ASGN2($1, $3, $4, $5); - fixpos($$, $1); + fixpos($$, $1); /*% $1 = dispatch3(field, $1, ripper_id2sym('.'), $3); - $$ = dispatch3(opassign, $1, $4, $5); + $$ = dispatch3(opassign, $1, $4, $5); %*/ } | primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg @@ -1761,10 +1842,10 @@ arg : lhs '=' arg $4 = 1; } $$ = NEW_OP_ASGN2($1, $3, $4, $5); - fixpos($$, $1); + fixpos($$, $1); /*% $1 = dispatch3(field, $1, ripper_intern("::"), $3); - $$ = dispatch3(opassign, $1, $4, $5); + $$ = dispatch3(opassign, $1, $4, $5); %*/ } | primary_value tCOLON2 tCONSTANT tOP_ASGN arg @@ -1775,7 +1856,7 @@ arg : lhs '=' arg /*% $$ = dispatch2(constpath_field, $1, $3); $$ = dispatch3(opassign, $$, $4, $5); - $$ = dispatch1(assign_error, $$); + $$ = dispatch1(assign_error, $$); %*/ } | tCOLON3 tCONSTANT tOP_ASGN arg @@ -1786,18 +1867,18 @@ arg : lhs '=' arg /*% $$ = dispatch1(topconst_field, $2); $$ = dispatch3(opassign, $$, $3, $4); - $$ = dispatch1(assign_error, $$); + $$ = dispatch1(assign_error, $$); %*/ } | backref tOP_ASGN arg { /*%%%*/ - rb_backref_error($1); + rb_backref_error($1); $$ = 0; /*% $$ = dispatch1(var_field, $1); $$ = dispatch3(opassign, $$, $2, $3); - $$ = dispatch1(assign_error, $$); + $$ = dispatch1(assign_error, $$); %*/ } | arg tDOT2 arg @@ -1845,7 +1926,7 @@ arg : lhs '=' arg | arg '-' arg { /*%%%*/ - $$ = call_op($1, '-', 1, $3); + $$ = call_op($1, '-', 1, $3); /*% $$ = dispatch3(binary, $1, ID2SYM('-'), $3); %*/ @@ -1853,7 +1934,7 @@ arg : lhs '=' arg | arg '*' arg { /*%%%*/ - $$ = call_op($1, '*', 1, $3); + $$ = call_op($1, '*', 1, $3); /*% $$ = dispatch3(binary, $1, ID2SYM('*'), $3); %*/ @@ -1924,7 +2005,7 @@ arg : lhs '=' arg | arg '|' arg { /*%%%*/ - $$ = call_op($1, '|', 1, $3); + $$ = call_op($1, '|', 1, $3); /*% $$ = dispatch3(binary, $1, ID2SYM('!'), $3); %*/ @@ -2087,7 +2168,7 @@ arg : lhs '=' arg { /*%%%*/ $$ = NEW_IF(cond($1), $3, $6); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch3(ifop, $1, $3, $6); %*/ @@ -2152,7 +2233,7 @@ opt_call_args : none call_args : command { - rb_warn("parenthesize argument(s) for future version"); + rb_warn("parenthesize argument(s) for future version"); /*%%%*/ $$ = NEW_LIST($1); /*% @@ -2189,9 +2270,9 @@ call_args : command | block_arg /*%c%*/ /*%c - { + { $$ = arg_add_block(arg_new(), $1); - } + } %*/ ; @@ -2206,11 +2287,11 @@ call_args2 : arg_value ',' args opt_block_arg | arg_value ',' block_arg { /*%%%*/ - $$ = arg_blk_pass($1, $3); + $$ = arg_blk_pass($1, $3); /*% $$ = arg_add_block(arg_add(arg_new(), $1), $3); %*/ - } + } | assocs opt_block_arg { /*%%%*/ @@ -2250,7 +2331,7 @@ command_args : { open_args { /* CMDARG_POP() */ - cmdarg_stack = $<num>1; + cmdarg_stack = $<num>1; $$ = $2; } ; @@ -2259,7 +2340,7 @@ open_args : call_args | tLPAREN_ARG {lex_state = EXPR_ENDARG;} rparen { /*%%%*/ - rb_warning("don't put space before argument parentheses"); + rb_warning("don't put space before argument parentheses"); $$ = 0; /*% $$ = dispatch1(space, dispatch1(arg_paren, arg_new())); @@ -2268,7 +2349,7 @@ open_args : call_args | tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} rparen { /*%%%*/ - rb_warning("don't put space before argument parentheses"); + rb_warning("don't put space before argument parentheses"); $$ = $2; /*% $$ = dispatch1(space, dispatch1(arg_paren, $2)); @@ -2293,7 +2374,7 @@ opt_block_arg : ',' block_arg | none ; -args : arg_value +args : arg_value { /*%%%*/ $$ = NEW_LIST($1); @@ -2396,7 +2477,7 @@ primary : literal } | tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} rparen { - rb_warning0("(...) interpreted as grouped expression"); + rb_warning0("(...) interpreted as grouped expression"); /*%%%*/ $$ = $2; /*% @@ -2431,7 +2512,7 @@ primary : literal | tLBRACK aref_args ']' { /*%%%*/ - if ($2 == 0) { + if ($2 == 0) { $$ = NEW_ZARRAY(); /* zero length array*/ } else { @@ -2508,8 +2589,8 @@ primary : literal /*%%%*/ block_dup_check($1->nd_args, $2); $2->nd_iter = $1; - $$ = $2; - fixpos($$, $1); + $$ = $2; + fixpos($$, $1); /*% $$ = dispatch2(iter_block, $1, $2); %*/ @@ -2525,11 +2606,11 @@ primary : literal { /*%%%*/ $$ = NEW_IF(cond($2), $4, $5); - fixpos($$, $2); + fixpos($$, $2); if (cond_negative(&$$->nd_cond)) { - NODE *tmp = $$->nd_body; - $$->nd_body = $$->nd_else; - $$->nd_else = tmp; + NODE *tmp = $$->nd_body; + $$->nd_body = $$->nd_else; + $$->nd_else = tmp; } /*% $$ = dispatch3(if, $2, $4, escape_Qundef($5)); @@ -2542,11 +2623,11 @@ primary : literal { /*%%%*/ $$ = NEW_UNLESS(cond($2), $4, $5); - fixpos($$, $2); + fixpos($$, $2); if (cond_negative(&$$->nd_cond)) { - NODE *tmp = $$->nd_body; - $$->nd_body = $$->nd_else; - $$->nd_else = tmp; + NODE *tmp = $$->nd_body; + $$->nd_body = $$->nd_else; + $$->nd_else = tmp; } /*% $$ = dispatch3(unless, $2, $4, escape_Qundef($5)); @@ -2558,7 +2639,7 @@ primary : literal { /*%%%*/ $$ = NEW_WHILE(cond($3), $6, 1); - fixpos($$, $3); + fixpos($$, $3); if (cond_negative(&$$->nd_cond)) { nd_set_type($$, NODE_UNTIL); } @@ -2572,7 +2653,7 @@ primary : literal { /*%%%*/ $$ = NEW_UNTIL(cond($3), $6, 1); - fixpos($$, $3); + fixpos($$, $3); if (cond_negative(&$$->nd_cond)) { nd_set_type($$, NODE_WHILE); } @@ -2586,7 +2667,7 @@ primary : literal { /*%%%*/ $$ = NEW_CASE($2, $4); - fixpos($$, $2); + fixpos($$, $2); /*% $$ = dispatch2(case, $2, $4); %*/ @@ -2605,7 +2686,7 @@ primary : literal { /*%%%*/ $$ = NEW_FOR($2, $5, $8); - fixpos($$, $2); + fixpos($$, $2); /*% $$ = dispatch3(for, $2, $5, $8); %*/ @@ -2615,65 +2696,57 @@ primary : literal /*%%%*/ if (in_def || in_single) yyerror("class definition in method body"); - class_nest++; local_push(0); - $<num>$ = ruby_sourceline; + $<num>$ = ruby_sourceline; /*% if (in_def || in_single) yyerror("class definition in method body"); - class_nest++; %*/ } bodystmt keyword_end { /*%%%*/ - $$ = NEW_CLASS($2, $5, $3); - nd_set_line($$, $<num>4); - local_pop(); - class_nest--; + $$ = NEW_CLASS($2, $5, $3); + nd_set_line($$, $<num>4); + local_pop(); /*% $$ = dispatch3(class, $2, $3, $5); - class_nest--; %*/ } | keyword_class tLSHFT expr { /*%%%*/ $<num>$ = in_def; - in_def = 0; + in_def = 0; /*% - in_def = 0; + in_def = 0; %*/ } term { /*%%%*/ - $<num>$ = in_single; - in_single = 0; - class_nest++; + $<num>$ = in_single; + in_single = 0; local_push(0); /*% - $$ = in_single; - in_single = 0; - class_nest++; + $$ = in_single; + in_single = 0; %*/ } bodystmt keyword_end { /*%%%*/ - $$ = NEW_SCLASS($3, $7); - fixpos($$, $3); - local_pop(); - class_nest--; - in_def = $<num>4; - in_single = $<num>6; + $$ = NEW_SCLASS($3, $7); + fixpos($$, $3); + local_pop(); + in_def = $<num>4; + in_single = $<num>6; /*% $$ = dispatch2(sclass, $3, $7); - class_nest--; - in_def = $<val>4; - in_single = $<val>6; + in_def = $<val>4; + in_single = $<val>6; %*/ } | keyword_module cpath @@ -2681,26 +2754,22 @@ primary : literal /*%%%*/ if (in_def || in_single) yyerror("module definition in method body"); - class_nest++; local_push(0); - $<num>$ = ruby_sourceline; + $<num>$ = ruby_sourceline; /*% if (in_def || in_single) yyerror("module definition in method body"); - class_nest++; %*/ } bodystmt keyword_end { /*%%%*/ - $$ = NEW_MODULE($2, $4); - nd_set_line($$, $<num>3); - local_pop(); - class_nest--; + $$ = NEW_MODULE($2, $4); + nd_set_line($$, $<num>3); + local_pop(); /*% $$ = dispatch2(module, $2, $4); - class_nest--; %*/ } | keyword_def fname @@ -2724,8 +2793,8 @@ primary : literal NODE *body = remove_begin($5); reduce_nodes(&body); $$ = NEW_DEFN($2, $4, body, NOEX_PRIVATE); - fixpos($$, $4); - local_pop(); + fixpos($$, $4); + local_pop(); in_def--; cur_mid = $<id>3; /*% @@ -2739,10 +2808,10 @@ primary : literal /*%%%*/ in_single++; local_push(0); - lex_state = EXPR_END; /* force for args */ + lex_state = EXPR_END; /* force for args */ /*% in_single++; - lex_state = EXPR_END; + lex_state = EXPR_END; %*/ } f_arglist @@ -2753,8 +2822,8 @@ primary : literal NODE *body = remove_begin($8); reduce_nodes(&body); $$ = NEW_DEFS($2, $5, $7, body); - fixpos($$, $2); - local_pop(); + fixpos($$, $2); + local_pop(); in_single--; /*% $$ = dispatch5(defs, $2, $3, $5, $7, $8); @@ -2795,7 +2864,7 @@ primary : literal } ; -primary_value : primary +primary_value : primary { /*%%%*/ value_expr($1); @@ -2834,7 +2903,7 @@ if_tail : opt_else { /*%%%*/ $$ = NEW_IF(cond($2), $4, $5); - fixpos($$, $2); + fixpos($$, $2); /*% $$ = dispatch3(elsif, $2, $4, escape_Qundef($5)); %*/ @@ -2885,7 +2954,7 @@ bparam_list : bparam_item /*%%%*/ $$ = list_append($1, $3); /*% - $$ = mlhs_add($1, $3); + $$ = mlhs_add($1, $3); %*/ } ; @@ -2894,12 +2963,12 @@ block_param : bparam_list { /*%%%*/ if ($1->nd_alen == 1 && nd_type($1->nd_head) != NODE_MASGN) { - $$ = $1->nd_head; - rb_gc_force_recycle((VALUE)$1); - } - else { - $$ = NEW_MASGN($1, 0); - } + $$ = $1->nd_head; + rb_gc_force_recycle((VALUE)$1); + } + else { + $$ = NEW_MASGN($1, 0); + } /*% $$ = blockvar_new($1); %*/ @@ -3135,7 +3204,7 @@ bv_decls : bvar bvar : tIDENTIFIER { /*%%%*/ - $$ = new_bv($1, NEW_NIL()); + $$ = new_bv($1, NEW_NIL()); /*% $$ = FIXME; %*/ @@ -3144,24 +3213,27 @@ bvar : tIDENTIFIER lambda : { /*%%%*/ - $<vars>$ = dyna_push(); + $<num>$ = dyna_push(); /*% %*/ - } - { + } + { $<num>$ = lpar_beg; - lpar_beg = ++paren_nest; + lpar_beg = ++paren_nest; } f_larglist + { + $<num>$ = vtable_size(lvtbl->dvars); + } lambda_body { /*%%%*/ $$ = $3; - $$->nd_body = block_append($$->nd_body, $4); + $$->nd_body = block_append($$->nd_body, $5); dyna_pop($<vars>1); lpar_beg = $<num>2; /*% - $$ = dispatch2(lambda, $3, $4); + $$ = dispatch2(lambda, $3, $5); %*/ } ; @@ -3197,14 +3269,14 @@ lambda_body : tLAMBEG compstmt '}' do_block : keyword_do_block { /*%%%*/ - $<vars>$ = dyna_push(); + $<num>$ = dyna_push(); $<num>1 = ruby_sourceline; /*% %*/ } opt_block_param { /*%%%*/ - $<vars>$ = ruby_dyna_vars; + $<num>$ = vtable_size(lvtbl->dvars); /*% %*/ } compstmt @@ -3212,7 +3284,7 @@ do_block : keyword_do_block { /*%%%*/ $3->nd_body = block_append($3->nd_body, - dyna_init($5, $<vars>4)); + dyna_init($5, $<num>4)); $$ = $3; nd_set_line($$, $<num>1); dyna_pop($<vars>2); @@ -3227,8 +3299,8 @@ block_call : command do_block /*%%%*/ block_dup_check($1->nd_args, $2); $2->nd_iter = $1; - $$ = $2; - fixpos($$, $1); + $$ = $2; + fixpos($$, $1); /*% $$ = dispatch2(iter_block, $1, $2); %*/ @@ -3257,16 +3329,16 @@ method_call : operation paren_args { /*%%%*/ $$ = NEW_FCALL($1, $2); - fixpos($$, $2); + fixpos($$, $2); /*% - $$ = method_arg(dispatch1(fcall, $1), $2); + $$ = method_arg(dispatch1(fcall, $1), $2); %*/ } | primary_value '.' operation2 opt_paren_args { /*%%%*/ $$ = NEW_CALL($1, $3, $4); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch3(call, $1, ripper_id2sym('.'), $3); $$ = method_optarg($$, $4); @@ -3276,7 +3348,7 @@ method_call : operation paren_args { /*%%%*/ $$ = NEW_CALL($1, $3, $4); - fixpos($$, $1); + fixpos($$, $1); /*% $$ = dispatch3(call, $1, ripper_id2sym('.'), $3); $$ = method_optarg($$, $4); @@ -3345,14 +3417,14 @@ method_call : operation paren_args brace_block : '{' { /*%%%*/ - $<vars>$ = dyna_push(); + $<num>$ = dyna_push(); $<num>1 = ruby_sourceline; /*% %*/ } opt_block_param { /*%%%*/ - $<vars>$ = ruby_dyna_vars; + $<num>$ = vtable_size(lvtbl->dvars); /*% %*/ } @@ -3360,7 +3432,7 @@ brace_block : '{' { /*%%%*/ $3->nd_body = block_append($3->nd_body, - dyna_init($5, $<vars>4)); + dyna_init($5, $<num>4)); $$ = $3; nd_set_line($$, $<num>1); dyna_pop($<vars>2); @@ -3371,14 +3443,14 @@ brace_block : '{' | keyword_do { /*%%%*/ - $<vars>$ = dyna_push(); + $<num>$ = dyna_push(); $<num>1 = ruby_sourceline; /*% %*/ } opt_block_param { /*%%%*/ - $<vars>$ = ruby_dyna_vars; + $<num>$ = vtable_size(lvtbl->dvars); /*% %*/ } @@ -3386,7 +3458,7 @@ brace_block : '{' { /*%%%*/ $3->nd_body = block_append($3->nd_body, - dyna_init($5, $<vars>4)); + dyna_init($5, $<num>4)); $$ = $3; nd_set_line($$, $<num>1); dyna_pop($<vars>2); @@ -3417,18 +3489,18 @@ opt_rescue : keyword_rescue exc_list exc_var then opt_rescue { /*%%%*/ - if ($3) { - $3 = node_assign($3, NEW_ERRINFO()); + if ($3) { + $3 = node_assign($3, NEW_ERRINFO()); $5 = block_append($3, $5); } $$ = NEW_RESBODY($2, $5, $6); - fixpos($$, $2?$2:$5); + fixpos($$, $2?$2:$5); /*% $$ = dispatch4(rescue, - escape_Qundef($2), - escape_Qundef($3), - escape_Qundef($5), - escape_Qundef($6)); + escape_Qundef($2), + escape_Qundef($3), + escape_Qundef($5), + escape_Qundef($6)); %*/ } | none @@ -3439,7 +3511,7 @@ exc_list : arg_value /*%%%*/ $$ = NEW_LIST($1); /*% - $$ = rb_ary_new3(1, $1); + $$ = rb_ary_new3(1, $1); %*/ } | mrhs @@ -3708,7 +3780,7 @@ string_content : tSTRING_CONTENT { /*%%%*/ lex_strterm = $<node>2; - $$ = NEW_EVSTR($3); + $$ = NEW_EVSTR($3); /*% lex_strterm = $<node>2; $$ = dispatch1(string_dvar, $3); @@ -3728,7 +3800,7 @@ string_content : tSTRING_CONTENT COND_LEXPOP(); CMDARG_LEXPOP(); /*%%%*/ - if ($3) $3->flags &= ~NODE_NEWLINE; + if ($3) $3->flags &= ~NODE_NEWLINE; $$ = new_evstr($3); /*% $$ = dispatch1(string_embexpr, $3); @@ -3766,10 +3838,10 @@ string_dvar : tGVAR symbol : tSYMBEG sym { /*%%%*/ - lex_state = EXPR_END; + lex_state = EXPR_END; $$ = $2; /*% - lex_state = EXPR_END; + lex_state = EXPR_END; $$ = dispatch1(symbol, $2); %*/ } @@ -3784,7 +3856,7 @@ sym : fname dsym : tSYMBEG xstring_contents tSTRING_END { /*%%%*/ - lex_state = EXPR_END; + lex_state = EXPR_END; if (!($$ = $2)) { yyerror("empty symbol literal"); } @@ -3813,13 +3885,13 @@ dsym : tSYMBEG xstring_contents tSTRING_END } } /*% - lex_state = EXPR_END; + lex_state = EXPR_END; $$ = dispatch1(dyna_symbol, $2); %*/ } ; -numeric : tINTEGER +numeric : tINTEGER | tFLOAT | tUMINUS_NUM tINTEGER %prec tLOWEST { @@ -4052,26 +4124,26 @@ f_norm_arg : tCONSTANT $$ = dispatch1(param_error, $1); %*/ } - | tIVAR + | tIVAR { /*%%%*/ - yyerror("formal argument cannot be an instance variable"); + yyerror("formal argument cannot be an instance variable"); /*% $$ = dispatch1(param_error, $1); %*/ } - | tGVAR + | tGVAR { /*%%%*/ - yyerror("formal argument cannot be a global variable"); + yyerror("formal argument cannot be a global variable"); /*% $$ = dispatch1(param_error, $1); %*/ } - | tCVAR + | tCVAR { /*%%%*/ - yyerror("formal argument cannot be a class variable"); + yyerror("formal argument cannot be a class variable"); /*% $$ = dispatch1(param_error, $1); %*/ @@ -4082,7 +4154,7 @@ f_norm_arg : tCONSTANT if (!is_local_id($1)) yyerror("formal argument must be local variable"); if (dyna_in_block()) { - shadowing_lvar($1); + shadowing_lvar($1); dyna_var($1); } else { @@ -4102,7 +4174,7 @@ f_arg : f_norm_arg /*% VALUE arg = $1; %*/ - $$ = rb_ary_new3(1, arg); + $$ = rb_ary_new3(1, arg); } | f_arg ',' f_norm_arg { @@ -4143,10 +4215,10 @@ f_opt : tIDENTIFIER '=' arg_value if (!is_local_id($1)) yyerror("formal argument must be local variable"); if (dyna_in_block()) { - shadowing_lvar($1); + shadowing_lvar($1); dyna_var($1); } - $$ = assignable($1, $3); + $$ = assignable($1, $3); /*% $$ = rb_assoc_new($1, $3); %*/ @@ -4182,7 +4254,7 @@ f_rest_arg : restarg_mark tIDENTIFIER if (!is_local_id($2)) yyerror("rest argument must be local variable"); if (dyna_in_block()) { - shadowing_lvar($2); + shadowing_lvar($2); dyna_var($2); } $$ = assignable($2, 0); @@ -4217,13 +4289,13 @@ f_block_arg : blkarg_mark tIDENTIFIER else if (!dyna_in_block() && local_id($2)) yyerror("duplicated block argument name"); if (dyna_in_block()) { - shadowing_lvar($2); + shadowing_lvar($2); dyna_var($2); $$ = assignable($2, 0); } - else { + else { $$ = NEW_BLOCK_ARG($2); - } + } /*% $$ = $2; %*/ @@ -4240,8 +4312,8 @@ opt_f_block_arg : ',' f_block_arg singleton : var_ref { /*%%%*/ - $$ = $1; - value_expr($$); + $$ = $1; + value_expr($$); /*% $$ = $1; %*/ @@ -4288,7 +4360,7 @@ assoc_list : none } $$ = $1; /*% - $$ = dispatch1(assoclist_from_args, $1); + $$ = dispatch1(assoclist_from_args, $1); %*/ } ; @@ -4323,7 +4395,7 @@ assoc : arg_value tASSOC arg_value /*%%%*/ $$ = list_append(NEW_LIST(NEW_LIT(ID2SYM($1))), $2); /*% - $$ = dispatch2(assoc_new, $1, $2); + $$ = dispatch2(assoc_new, $1, $2); %*/ } ; @@ -4388,7 +4460,7 @@ none : /* none */ /*%%%*/ $$ = 0; /*% - $$ = Qundef; + $$ = Qundef; %*/ } ; @@ -4537,16 +4609,11 @@ static void parser_prepare(struct parser_params *parser); #ifndef RIPPER static NODE* -yycompile(VALUE vparser, const char *f, int line) +yycompile(struct parser_params *parser, const char *f, int line) { int n; - struct RVarmap *vp, *vars = ruby_dyna_vars; const char *kcode_save; - volatile VALUE parser_save; - struct parser_params *parser; - *(&parser_save) = vparser; - Data_Get_Struct(vparser, struct parser_params, parser); if (!compile_for_eval && rb_safe_level() == 0 && rb_const_defined(rb_cObject, rb_intern("SCRIPT_LINES__"))) { VALUE hash, fname; @@ -4579,14 +4646,7 @@ yycompile(VALUE vparser, const char *f, int line) compile_for_eval = 0; rb_set_kcode(kcode_save); - vp = ruby_dyna_vars; - ruby_dyna_vars = vars; lex_strterm = 0; - while (vp && vp != vars) { - struct RVarmap *tmp = vp; - vp = vp->next; - rb_gc_force_recycle((VALUE)tmp); - } if (ruby_eval_tree_begin) { return NEW_PRELUDE(ruby_eval_tree_begin, ruby_eval_tree); } @@ -4637,18 +4697,23 @@ rb_compile_string(const char *f, VALUE s, int line) } NODE* -rb_parser_compile_string(VALUE vparser, const char *f, VALUE s, int line) +rb_parser_compile_string(volatile VALUE vparser, const char *f, VALUE s, int line) { struct parser_params *parser; - + NODE *node; + volatile VALUE tmp; + Data_Get_Struct(vparser, struct parser_params, parser); lex_gets = lex_get_str; lex_gets_ptr = 0; lex_input = s; lex_pbeg = lex_p = lex_pend = 0; - compile_for_eval = ruby_in_eval; + compile_for_eval = rb_parse_in_eval(); + + node = yycompile(parser, f, line); + tmp = vparser; /* prohibit tail call optimization */ - return yycompile(vparser, f, line); + return node; } NODE* @@ -4658,7 +4723,7 @@ rb_compile_cstr(const char *f, const char *s, int len, int line) } NODE* -rb_parser_compile_cstr(VALUE vparser, const char *f, const char *s, int len, int line) +rb_parser_compile_cstr(volatile VALUE vparser, const char *f, const char *s, int len, int line) { return rb_parser_compile_string(vparser, f, rb_str_new(s, len), line); } @@ -4678,16 +4743,21 @@ rb_compile_file(const char *f, VALUE file, int start) } NODE* -rb_parser_compile_file(VALUE vparser, const char *f, VALUE file, int start) +rb_parser_compile_file(volatile VALUE vparser, const char *f, VALUE file, int start) { struct parser_params *parser; - + volatile VALUE tmp; + NODE *node; + Data_Get_Struct(vparser, struct parser_params, parser); lex_gets = lex_io_gets; lex_input = file; lex_pbeg = lex_p = lex_pend = 0; - return yycompile(vparser, f, start); + node = yycompile(parser, f, start); + tmp = vparser; /* prohibit tail call optimization */ + + return node; } #endif /* !RIPPER */ @@ -4697,15 +4767,15 @@ parser_nextc(struct parser_params *parser) int c; if (lex_p == lex_pend) { - if (parser->eofp) - return -1; + if (parser->eofp) + return -1; if (lex_input) { VALUE v = lex_getline(parser); if (NIL_P(v)) { - parser->eofp = Qtrue; - return -1; - } + parser->eofp = Qtrue; + return -1; + } #ifdef RIPPER if (parser->tokp < lex_pend) { if (NIL_P(parser->delayed)) { @@ -4883,7 +4953,7 @@ parser_read_escape(struct parser_params *parser) eof: case -1: - yyerror("Invalid escape character syntax"); + yyerror("Invalid escape character syntax"); return '\0'; default: @@ -4965,7 +5035,7 @@ parser_tokadd_escape(struct parser_params *parser, int term) eof: case -1: - yyerror("Invalid escape character syntax"); + yyerror("Invalid escape character syntax"); return -1; default: @@ -5028,6 +5098,7 @@ enum string_type { static void dispose_string(VALUE str) { + /* TODO: should use another API? */ if (RBASIC(str)->flags & RSTRING_NOEMBED) xfree(RSTRING_PTR(str)); rb_gc_force_recycle(str); @@ -5041,7 +5112,7 @@ parser_tokadd_string(struct parser_params *parser, unsigned char uc; while ((c = nextc()) != -1) { - uc = (unsigned char)c; + uc = (unsigned char)c; if (paren && c == paren) { ++*nest; } @@ -5176,10 +5247,10 @@ parser_parse_string(struct parser_params *parser, NODE *quote) return tREGEXP_END; } else { - ruby_sourceline = nd_line(quote); - rb_compile_error(PARSER_ARG "unterminated string meets end of file"); - return tSTRING_END; - } + ruby_sourceline = nd_line(quote); + rb_compile_error(PARSER_ARG "unterminated string meets end of file"); + return tSTRING_END; + } } tokfix(); @@ -5209,7 +5280,7 @@ parser_heredoc_identifier(struct parser_params *parser) tokadd(func); term = c; while ((c = nextc()) != -1 && c != term) { - uc = (unsigned int)c; + uc = (unsigned int)c; len = mbclen(uc); do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1); } @@ -5220,7 +5291,7 @@ parser_heredoc_identifier(struct parser_params *parser) break; default: - uc = (unsigned int)c; + uc = (unsigned int)c; if (!is_identchar(uc)) { pushback(c); if (func & STR_FUNC_INDENT) { @@ -5232,7 +5303,7 @@ parser_heredoc_identifier(struct parser_params *parser) term = '"'; tokadd(func |= str_dquote); do { - uc = (unsigned int)c; + uc = (unsigned int)c; len = mbclen(uc); do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1); } while ((c = nextc()) != -1 && @@ -5367,7 +5438,7 @@ parser_here_document(struct parser_params *parser, NODE *here) pushback(c); if ((c = tokadd_string(func, '\n', 0, NULL)) == -1) goto error; if (c != '\n') { - set_yylval_str(rb_str_new(tok(), toklen())); + set_yylval_str(rb_str_new(tok(), toklen())); return tSTRING_CONTENT; } tokadd(nextc()); @@ -5402,7 +5473,7 @@ static int lvar_defined_gen(struct parser_params *parser, ID id) { #ifndef RIPPER - return (dyna_in_block() && rb_dvar_defined(id)) || local_id(id); + return (dyna_in_block() && dvar_defined(id)) || local_id(id); #else return 0; #endif @@ -5609,14 +5680,14 @@ parser_yylex(struct parser_params *parser) retry: #ifdef RIPPER while ((c = nextc())) { - switch (c) { - case ' ': case '\t': case '\f': case '\r': - case '\13': /* '\v' */ - space_seen++; - break; - default: - goto outofloop; - } + switch (c) { + case ' ': case '\t': case '\f': case '\r': + case '\13': /* '\v' */ + space_seen++; + break; + default: + goto outofloop; + } } outofloop: pushback(c); @@ -5642,8 +5713,8 @@ parser_yylex(struct parser_params *parser) } lex_p = lex_pend; #ifdef RIPPER - ripper_dispatch_scan_event(parser, tCOMMENT); - fallthru = Qtrue; + ripper_dispatch_scan_event(parser, tCOMMENT); + fallthru = Qtrue; #endif /* fall through */ case '\n': @@ -5654,10 +5725,10 @@ parser_yylex(struct parser_params *parser) case EXPR_CLASS: case EXPR_VALUE: #ifdef RIPPER - if (!fallthru) { - ripper_dispatch_scan_event(parser, tIGNORED_NL); - } - fallthru = Qfalse; + if (!fallthru) { + ripper_dispatch_scan_event(parser, tIGNORED_NL); + } + fallthru = Qfalse; #endif goto retry; default: @@ -5670,7 +5741,7 @@ parser_yylex(struct parser_params *parser) case '*': if ((c = nextc()) == '*') { if ((c = nextc()) == '=') { - set_yylval_id(tPOW); + set_yylval_id(tPOW); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5679,7 +5750,7 @@ parser_yylex(struct parser_params *parser) } else { if (c == '=') { - set_yylval_id('*'); + set_yylval_id('*'); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5719,18 +5790,18 @@ parser_yylex(struct parser_params *parser) /* skip embedded rd document */ if (strncmp(lex_p, "begin", 5) == 0 && ISSPACE(lex_p[5])) { #ifdef RIPPER - int first_p = Qtrue; + int first_p = Qtrue; - lex_goto_eol(parser); - ripper_dispatch_scan_event(parser, tEMBDOC_BEG); + lex_goto_eol(parser); + ripper_dispatch_scan_event(parser, tEMBDOC_BEG); #endif for (;;) { lex_goto_eol(parser); #ifdef RIPPER - if (!first_p) { - ripper_dispatch_scan_event(parser, tEMBDOC); - } - first_p = Qfalse; + if (!first_p) { + ripper_dispatch_scan_event(parser, tEMBDOC); + } + first_p = Qfalse; #endif c = nextc(); if (c == -1) { @@ -5745,7 +5816,7 @@ parser_yylex(struct parser_params *parser) } lex_goto_eol(parser); #ifdef RIPPER - ripper_dispatch_scan_event(parser, tEMBDOC_END); + ripper_dispatch_scan_event(parser, tEMBDOC_END); #endif goto retry; } @@ -5799,7 +5870,7 @@ parser_yylex(struct parser_params *parser) } if (c == '<') { if ((c = nextc()) == '=') { - set_yylval_id(tLSHFT); + set_yylval_id(tLSHFT); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5821,7 +5892,7 @@ parser_yylex(struct parser_params *parser) } if (c == '>') { if ((c = nextc()) == '=') { - set_yylval_id(tRSHFT); + set_yylval_id(tRSHFT); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5865,7 +5936,7 @@ parser_yylex(struct parser_params *parser) rb_compile_error(PARSER_ARG "incomplete character syntax"); return 0; } - uc = (unsigned char)c; + uc = (unsigned char)c; if (ISSPACE(c)){ if (!IS_ARG()){ int c2 = 0; @@ -5927,7 +5998,7 @@ parser_yylex(struct parser_params *parser) if ((c = nextc()) == '&') { lex_state = EXPR_BEG; if ((c = nextc()) == '=') { - set_yylval_id(tANDOP); + set_yylval_id(tANDOP); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5935,7 +6006,7 @@ parser_yylex(struct parser_params *parser) return tANDOP; } else if (c == '=') { - set_yylval_id('&'); + set_yylval_id('&'); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5962,7 +6033,7 @@ parser_yylex(struct parser_params *parser) if ((c = nextc()) == '|') { lex_state = EXPR_BEG; if ((c = nextc()) == '=') { - set_yylval_id(tOROP); + set_yylval_id(tOROP); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5970,7 +6041,7 @@ parser_yylex(struct parser_params *parser) return tOROP; } if (c == '=') { - set_yylval_id('|'); + set_yylval_id('|'); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -5994,7 +6065,7 @@ parser_yylex(struct parser_params *parser) return '+'; } if (c == '=') { - set_yylval_id('+'); + set_yylval_id('+'); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -6024,14 +6095,14 @@ parser_yylex(struct parser_params *parser) return '-'; } if (c == '=') { - set_yylval_id('-'); + set_yylval_id('-'); lex_state = EXPR_BEG; return tOP_ASGN; } if (c == '>') { lex_state = EXPR_ARG; - return tLAMBDA; - } + return tLAMBDA; + } if (IS_BEG() || (IS_ARG() && space_seen && !ISSPACE(c))) { if (IS_ARG()) arg_ambiguous(); @@ -6099,7 +6170,7 @@ parser_yylex(struct parser_params *parser) yyerror("numeric literal without digits"); } else if (nondigit) goto trailing_uc; - set_yylval_literal(rb_cstr_to_inum(tok(), 16, Qfalse)); + set_yylval_literal(rb_cstr_to_inum(tok(), 16, Qfalse)); return tINTEGER; } if (c == 'b' || c == 'B') { @@ -6123,7 +6194,7 @@ parser_yylex(struct parser_params *parser) yyerror("numeric literal without digits"); } else if (nondigit) goto trailing_uc; - set_yylval_literal(rb_cstr_to_inum(tok(), 2, Qfalse)); + set_yylval_literal(rb_cstr_to_inum(tok(), 2, Qfalse)); return tINTEGER; } if (c == 'd' || c == 'D') { @@ -6147,7 +6218,7 @@ parser_yylex(struct parser_params *parser) yyerror("numeric literal without digits"); } else if (nondigit) goto trailing_uc; - set_yylval_literal(rb_cstr_to_inum(tok(), 10, Qfalse)); + set_yylval_literal(rb_cstr_to_inum(tok(), 10, Qfalse)); return tINTEGER; } if (c == '_') { @@ -6164,7 +6235,7 @@ parser_yylex(struct parser_params *parser) if (c >= '0' && c <= '7') { /* octal */ octal_number: - do { + do { if (c == '_') { if (nondigit) break; nondigit = c; @@ -6178,7 +6249,7 @@ parser_yylex(struct parser_params *parser) pushback(c); tokfix(); if (nondigit) goto trailing_uc; - set_yylval_literal(rb_cstr_to_inum(tok(), 8, Qfalse)); + set_yylval_literal(rb_cstr_to_inum(tok(), 8, Qfalse)); return tINTEGER; } if (nondigit) { @@ -6194,7 +6265,7 @@ parser_yylex(struct parser_params *parser) } else { pushback(c); - set_yylval_literal(INT2FIX(0)); + set_yylval_literal(INT2FIX(0)); return tINTEGER; } } @@ -6273,10 +6344,10 @@ parser_yylex(struct parser_params *parser) rb_warnS("Float %s out of range", tok()); errno = 0; } - set_yylval_literal(rb_float_new(d)); + set_yylval_literal(rb_float_new(d)); return tFLOAT; } - set_yylval_literal(rb_cstr_to_inum(tok(), 10, Qfalse)); + set_yylval_literal(rb_cstr_to_inum(tok(), 10, Qfalse)); return tINTEGER; } @@ -6326,7 +6397,7 @@ parser_yylex(struct parser_params *parser) return tREGEXP_BEG; } if ((c = nextc()) == '=') { - set_yylval_id('/'); + set_yylval_id('/'); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -6348,7 +6419,7 @@ parser_yylex(struct parser_params *parser) case '^': if ((c = nextc()) == '=') { - set_yylval_id('^'); + set_yylval_id('^'); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -6436,7 +6507,7 @@ parser_yylex(struct parser_params *parser) return tLAMBEG; } if (IS_ARG() || lex_state == EXPR_END) - c = '{'; /* block (primary) */ + c = '{'; /* block (primary) */ else if (lex_state == EXPR_ENDARG) c = tLBRACE_ARG; /* block (expr) */ else @@ -6471,7 +6542,7 @@ parser_yylex(struct parser_params *parser) } else { term = nextc(); - uc = (unsigned char)c; + uc = (unsigned char)c; if (ISALNUM(term) || ismbchar(uc)) { yyerror("unknown type of %string"); return 0; @@ -6528,7 +6599,7 @@ parser_yylex(struct parser_params *parser) } } if ((c = nextc()) == '=') { - set_yylval_id('%'); + set_yylval_id('%'); lex_state = EXPR_BEG; return tOP_ASGN; } @@ -6552,7 +6623,7 @@ parser_yylex(struct parser_params *parser) switch (c) { case '_': /* $_: last read line string */ c = nextc(); - uc = (unsigned char)c; + uc = (unsigned char)c; if (is_identchar(uc)) { tokadd('$'); tokadd('_'); @@ -6582,7 +6653,7 @@ parser_yylex(struct parser_params *parser) tokadd('$'); tokadd(c); tokfix(); - set_yylval_id(rb_intern(tok())); + set_yylval_id(rb_intern(tok())); return tGVAR; case '-': @@ -6591,16 +6662,16 @@ parser_yylex(struct parser_params *parser) c = nextc(); uc = (unsigned char)c; if (is_identchar(uc)) { - tokadd(c); + tokadd(c); } else { pushback(c); } gvar: tokfix(); - set_yylval_id(rb_intern(tok())); + set_yylval_id(rb_intern(tok())); if (!is_global_id(yylval_id())) { - rb_compile_error(PARSER_ARG "invalid global variable `%s'", rb_id2name(yylval.id)); + rb_compile_error(PARSER_ARG "invalid global variable `%s'", rb_id2name(yylval.id)); return 0; } return tGVAR; @@ -6632,7 +6703,7 @@ parser_yylex(struct parser_params *parser) return tNTH_REF; default: - uc = (unsigned char)c; + uc = (unsigned char)c; if (!is_identchar(uc)) { pushback(c); return '$'; @@ -6658,7 +6729,7 @@ parser_yylex(struct parser_params *parser) rb_compile_error(PARSER_ARG "`@@%c' is not allowed as a class variable name", c); } } - uc = (unsigned char)c; + uc = (unsigned char)c; if (!is_identchar(uc)) { pushback(c); return '@'; @@ -6672,9 +6743,9 @@ parser_yylex(struct parser_params *parser) #ifndef RIPPER return -1; #else - lex_goto_eol(parser); - ripper_dispatch_scan_event(parser, k__END__); - return 0; + lex_goto_eol(parser); + ripper_dispatch_scan_event(parser, k__END__); + return 0; #endif } newtok(); @@ -6703,7 +6774,7 @@ parser_yylex(struct parser_params *parser) } } c = nextc(); - uc = (unsigned char)c; + uc = (unsigned char)c; } while (is_identchar(uc)); if ((c == '!' || c == '?') && is_identchar(tok()[0]) && !peek('=')) { tokadd(c); @@ -6763,7 +6834,7 @@ parser_yylex(struct parser_params *parser) enum lex_state_e state = lex_state; lex_state = kw->state; if (state == EXPR_FNAME) { - set_yylval_id(rb_intern(kw->name)); + set_yylval_id(rb_intern(kw->name)); return kw->id[0]; } if (kw->id[0] == keyword_do) { @@ -6813,14 +6884,14 @@ parser_yylex(struct parser_params *parser) lex_state = EXPR_END; } } - { - ID ident = rb_intern(tok()); + { + ID ident = rb_intern(tok()); - set_yylval_id(ident); - if (last_state != EXPR_DOT && is_local_id(ident) && lvar_defined(ident)) { - lex_state = EXPR_END; - } - } + set_yylval_id(ident); + if (last_state != EXPR_DOT && is_local_id(ident) && lvar_defined(ident)) { + lex_state = EXPR_END; + } + } return result; } } @@ -7162,10 +7233,10 @@ gettable_gen(struct parser_params *parser, ID id) return NEW_LIT(INT2FIX(ruby_sourceline)); } else if (is_local_id(id)) { - if (dyna_in_block() && rb_dvar_defined(id)) return NEW_DVAR(id); + if (dyna_in_block() && dvar_defined(id)) return NEW_DVAR(id); if (local_id(id)) return NEW_LVAR(id); /* method call without arguments */ - dyna_check(id); + dyna_check(id); return NEW_VCALL(id); } else if (is_global_id(id)) { @@ -7207,10 +7278,10 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val) yyerror("Can't assign to __LINE__"); } else if (is_local_id(id)) { - if (rb_dvar_curr(id)) { + if (dvar_curr(id)) { return NEW_DASGN_CURR(id, val); } - else if (rb_dvar_defined(id)) { + else if (dvar_defined(id)) { return NEW_DASGN(id, val); } else if (local_id(id) || !dyna_in_block()) { @@ -7245,7 +7316,7 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val) static void shadowing_lvar_gen(struct parser_params *parser, ID name) { - if (rb_dvar_defined(name) || local_id(name)) { + if (dvar_defined(name) || local_id(name)) { rb_warningS("shadowing outer local variable - %s", rb_id2name(name)); } } @@ -7836,17 +7907,17 @@ new_yield(NODE *node) long state = Qtrue; if (node) { - no_blockarg(node); - if (nd_type(node) == NODE_ARRAY && node->nd_next == 0) { - node = node->nd_head; - state = Qfalse; - } - else if (node && nd_type(node) == NODE_SPLAT) { - state = Qtrue; - } + no_blockarg(node); + if (nd_type(node) == NODE_ARRAY && node->nd_next == 0) { + node = node->nd_head; + state = Qfalse; + } + else if (node && nd_type(node) == NODE_SPLAT) { + state = Qtrue; + } } else { - state = Qfalse; + state = Qfalse; } return NEW_YIELD(node, state); } @@ -7925,7 +7996,7 @@ new_args_gen(struct parser_params *parser, VALUE m, NODE *o, NODE *r, NODE *p, N if (!node->nd_head) break; if (arg_dup_check(node->nd_head->nd_vid, m, list, node)) { yyerror("duplicated argument name"); - return 0; + return 0; } node = node->nd_next; } @@ -7944,149 +8015,122 @@ new_args_gen(struct parser_params *parser, VALUE m, NODE *o, NODE *r, NODE *p, N } static void -local_push_gen(struct parser_params *parser, int top) +local_push_gen(struct parser_params *parser, int inherit_dvars) { struct local_vars *local; local = ALLOC(struct local_vars); local->prev = lvtbl; - local->nofree = 0; - local->cnt = 0; local->tbl = 0; - local->dlev = 0; - local->dname_size = 0; local->dnames = 0; - local->dyna_vars = ruby_dyna_vars; + local->dvars = inherit_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE; lvtbl = local; - if (!top) { - /* preserve reference for GC, but link should be cut. */ - rb_dvar_push(0, (VALUE)ruby_dyna_vars); - ruby_dyna_vars->next = 0; - } } static void local_pop_gen(struct parser_params *parser) { struct local_vars *local = lvtbl->prev; - - if (lvtbl->tbl) { - if (!lvtbl->nofree) xfree(lvtbl->tbl); - else lvtbl->tbl[0] = lvtbl->cnt; - } - if (lvtbl->dnames) { - xfree(lvtbl->dnames); - } - ruby_dyna_vars = lvtbl->dyna_vars; + vtable_free(lvtbl->tbl); + vtable_free(lvtbl->dnames); + vtable_free(lvtbl->dvars); xfree(lvtbl); lvtbl = local; } static ID* +vtable_to_tbl(struct vtable *src) +{ + int i, cnt = vtable_size(src); + + if (cnt > 0) { + ID *tbl = ALLOC_N(ID, cnt + 1); + tbl[0] = cnt; + for (i = 0; i < cnt; i++) { + tbl[i+1] = src->tbl[i]; + } + return tbl; + } + return 0; +} + +static ID* local_tbl_gen(struct parser_params *parser) { - lvtbl->nofree = 1; - return lvtbl->tbl; + return vtable_to_tbl(lvtbl->tbl); +} + +static ID* +dyna_tbl_gen(struct parser_params *parser) +{ + return vtable_to_tbl(lvtbl->dvars); } static int local_append_gen(struct parser_params *parser, ID id) { if (lvtbl->tbl == 0) { - lvtbl->tbl = ALLOC_N(ID, 4); - lvtbl->tbl[0] = 0; - lvtbl->tbl[1] = '_'; - lvtbl->tbl[2] = '~'; - lvtbl->cnt = 2; + lvtbl->tbl = vtable_alloc(0); + vtable_add(lvtbl->tbl, '_'); + vtable_add(lvtbl->tbl, '~'); if (id == '_') return 0; if (id == '~') return 1; } - else { - REALLOC_N(lvtbl->tbl, ID, lvtbl->cnt+2); - } - - lvtbl->tbl[lvtbl->cnt+1] = id; - return lvtbl->cnt++; + vtable_add(lvtbl->tbl, id); + return vtable_size(lvtbl->tbl) - 1; } static int local_cnt_gen(struct parser_params *parser, ID id) { - int cnt, max; - - if (id == 0) return lvtbl->cnt; + int cnt, max; + if (id == 0) return vtable_size(lvtbl->tbl); - for (cnt=1, max=lvtbl->cnt+1; cnt<max;cnt++) { - if (lvtbl->tbl[cnt] == id) return cnt-1; + for (cnt=0, max=vtable_size(lvtbl->tbl); cnt<max;cnt++) { + if (lvtbl->tbl->tbl[cnt] == id) { + return cnt; } - return local_append(id); + } + return local_append(id); } static int local_id_gen(struct parser_params *parser, ID id) { - int i, max; - if (lvtbl == 0) return Qfalse; - for (i=3, max=lvtbl->cnt+1; i<max; i++) { - if (lvtbl->tbl[i] == id) return Qtrue; - } - return Qfalse; + return vtable_included(lvtbl->tbl, id); } +extern int rb_dvar_current(void); +extern int rb_scope_base_local_tbl_size(void); +extern ID rb_scope_base_local_tbl_id(int i); +extern void rb_scope_setup_top_local_tbl(ID *tbl); + static void top_local_init_gen(struct parser_params *parser) { - local_push(1); - lvtbl->cnt = ruby_scope->local_tbl?ruby_scope->local_tbl[0]:0; - if (lvtbl->cnt > 0) { - lvtbl->tbl = ALLOC_N(ID, lvtbl->cnt+3); - MEMCPY(lvtbl->tbl, ruby_scope->local_tbl, ID, lvtbl->cnt+1); - } - else { - lvtbl->tbl = 0; + int i, cnt; + + local_push(rb_dvar_current()); + if (cnt = rb_scope_base_local_tbl_size()) { + if (lvtbl->tbl == 0) { + lvtbl->tbl = vtable_alloc(0); + } + for (i = 0; i < cnt; i++) { + vtable_add(lvtbl->tbl, rb_scope_base_local_tbl_id(i)); + } } - if (ruby_dyna_vars) - lvtbl->dlev = 1; - else - lvtbl->dlev = 0; } static void top_local_setup_gen(struct parser_params *parser) { - int len = lvtbl->cnt; - int i; - - if (len > 0) { - i = ruby_scope->local_tbl?ruby_scope->local_tbl[0]:0; - - if (i < len) { - if (i == 0 || (ruby_scope->flags & SCOPE_MALLOC) == 0) { - VALUE *vars = ALLOC_N(VALUE, len+1); - if (ruby_scope->local_vars) { - *vars++ = ruby_scope->local_vars[-1]; - MEMCPY(vars, ruby_scope->local_vars, VALUE, i); - rb_mem_clear(vars+i, len-i); - } - else { - *vars++ = (VALUE)ruby_scope; - rb_mem_clear(vars, len); - } - ruby_scope->local_vars = vars; - ruby_scope->flags |= SCOPE_MALLOC; - } - else { - VALUE *vars = ruby_scope->local_vars-1; - REALLOC_N(vars, VALUE, len+1); - ruby_scope->local_vars = vars+1; - rb_mem_clear(ruby_scope->local_vars+i, len-i); - } - if (ruby_scope->local_tbl && ruby_scope->local_vars[-1] == 0) { - xfree(ruby_scope->local_tbl); - } - ruby_scope->local_tbl = local_tbl(); - } + if (lvtbl->dvars != 0) { + /* eval */ + rb_scope_setup_top_local_tbl(dyna_tbl()); + } + else { + rb_scope_setup_top_local_tbl(local_tbl()); } local_pop(); } @@ -8094,19 +8138,16 @@ top_local_setup_gen(struct parser_params *parser) static void dyna_var_gen(struct parser_params *parser, ID id) { - int i; - - rb_dvar_push(id, Qnil); - for (i=0; i<lvtbl->dname_size; i++) { - if (lvtbl->dnames[i] == id) return; - } - if (lvtbl->dname_size == 0) { - lvtbl->dnames = ALLOC_N(ID, 1); + if (!POINTER_P(lvtbl->dvars)) { + lvtbl->dvars = vtable_alloc(lvtbl->dvars); } - else { - REALLOC_N(lvtbl->dnames, ID, lvtbl->dname_size+1); + vtable_add(lvtbl->dvars, id); + if (!vtable_included(lvtbl->dnames, id)) { + if (!lvtbl->dnames) { + lvtbl->dnames = vtable_alloc(0); + } + vtable_add(lvtbl->dnames, id); } - lvtbl->dnames[lvtbl->dname_size++] = id; } static void @@ -8115,44 +8156,70 @@ dyna_check_gen(struct parser_params *parser, ID id) int i; if (in_defined) return; /* no check needed */ - for (i=0; i<lvtbl->dname_size; i++) { - if (lvtbl->dnames[i] == id) { + for (i=0; i<vtable_size(lvtbl->dnames); i++) { + if (lvtbl->dnames->tbl[i] == id) { rb_warnS("out-of-scope variable - %s", rb_id2name(id)); return; } } } -static struct RVarmap* +static int dyna_push_gen(struct parser_params *parser) { - struct RVarmap* vars = ruby_dyna_vars; - - rb_dvar_push(0, 0); - lvtbl->dlev++; - return vars; + lvtbl->dvars = vtable_alloc(lvtbl->dvars); + return 0; } static void dyna_pop_gen(struct parser_params *parser, struct RVarmap* vars) { - lvtbl->dlev--; - ruby_dyna_vars = vars; + struct vtable *tmp = lvtbl->dvars; + lvtbl->dvars = lvtbl->dvars->prev; + vtable_free(tmp); +} + +static int +dyna_in_block_gen(struct parser_params *parser) +{ + return lvtbl->dvars != DVARS_TOPSCOPE; } static NODE * -dyna_init_gen(struct parser_params *parser, NODE *node, struct RVarmap *pre) +dyna_init_gen(struct parser_params *parser, NODE *node, int pre_cnt) { - struct RVarmap *post = ruby_dyna_vars; NODE *var; + int post_cnt = vtable_size(lvtbl->dvars); - if (!node || !post || pre == post) return node; - for (var = 0; post != pre && post->id; post = post->next) { - var = NEW_DASGN_CURR(post->id, var); + if (!node || pre_cnt == post_cnt) return node; + for (var = 0; post_cnt != pre_cnt; post_cnt--) { + var = NEW_DASGN_CURR(lvtbl->dvars->tbl[post_cnt-1], var); } return block_append(var, node); } +static int +dvar_defined_gen(struct parser_params *parser, ID id) +{ + struct vtable *dvars = lvtbl->dvars; + while(POINTER_P(dvars)){ + if(vtable_included(dvars, id)){ + return 1; + } + dvars = dvars->prev; + } + if(dvars == DVARS_INHERIT){ + return rb_dvar_defined(id); + } + return 0; +} + +static int +dvar_curr_gen(struct parser_params *parser, ID id) +{ + return vtable_included(lvtbl->dvars, id); +} + void rb_gc_mark_parser(void) { @@ -8443,16 +8510,16 @@ rb_intern2(const char *name, long len) } else if (ISUPPER(name[0])) { id = ID_CONST; - } + } else { id = ID_LOCAL; } break; } if (!ISDIGIT(*m)) { - while (m <= name + last && is_identchar(*m)) { - m += mbclen(*m); - } + while (m <= name + last && is_identchar(*m)) { + m += mbclen(*m); + } } if (*m) id = ID_JUNK; new_id: @@ -8511,7 +8578,7 @@ rb_id2name(ID id) } if (st_lookup(global_symbols.id_sym, id, &data)) - return RSTRING_PTR(data); + return RSTRING_PTR(data); if (is_attrset_id(id)) { ID id2 = (id & ~ID_SCOPE_MASK) | ID_LOCAL; @@ -8604,63 +8671,6 @@ rb_is_junk_id(ID id) return Qfalse; } -static void -special_local_set(char c, VALUE val) -{ - VALUE volatile vparser = rb_parser_new(); - struct parser_params *parser; - int cnt; - - Data_Get_Struct(vparser, struct parser_params, parser); - top_local_init(); - cnt = local_cnt(c); - top_local_setup(); - ruby_scope->local_vars[cnt] = val; -} - -VALUE -rb_backref_get(void) -{ - VALUE *var = rb_svar(1); - if (var) { - return *var; - } - return Qnil; -} - -void -rb_backref_set(VALUE val) -{ - VALUE *var = rb_svar(1); - if (var) { - *var = val; - } - else { - special_local_set('~', val); - } -} - -VALUE -rb_lastline_get(void) -{ - VALUE *var = rb_svar(0); - if (var) { - return *var; - } - return Qnil; -} - -void -rb_lastline_set(VALUE val) -{ - VALUE *var = rb_svar(0); - if (var) { - *var = val; - } - else { - special_local_set('_', val); - } -} #endif /* !RIPPER */ static void @@ -8736,7 +8746,7 @@ parser_free(void *ptr) struct local_vars *local, *prev; if (p->parser_tokenbuf) { - xfree(p->parser_tokenbuf); + xfree(p->parser_tokenbuf); } for (local = p->parser_lvtbl; local; local = prev) { if (local->tbl && !local->nofree) @@ -8859,23 +8869,23 @@ ripper_validate_object(VALUE self, VALUE x) if (x == Qtrue) return x; if (x == Qnil) return x; if (x == Qundef) - rb_raise(rb_eArgError, "Qundef given"); + rb_raise(rb_eArgError, "Qundef given"); if (FIXNUM_P(x)) return x; if (SYMBOL_P(x)) return x; if (!rb_is_pointer_to_heap(x)) - rb_raise(rb_eArgError, "invalid pointer: %p", x); + rb_raise(rb_eArgError, "invalid pointer: %p", x); switch (TYPE(x)) { case T_STRING: case T_OBJECT: case T_ARRAY: case T_BIGNUM: case T_FLOAT: - return x; + return x; case T_NODE: - rb_raise(rb_eArgError, "NODE given: %p", x); + rb_raise(rb_eArgError, "NODE given: %p", x); default: - rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)", - x, rb_obj_classname(x)); + rb_raise(rb_eArgError, "wrong type of ruby object: %p (%s)", + x, rb_obj_classname(x)); } return x; } @@ -8994,8 +9004,8 @@ keyword_id_to_str(ID id) struct kw_assoc *a; for (a = keyword_to_name; a->id; a++) { - if (a->id == id) - return a->name; + if (a->id == id) + return a->name; } return NULL; } @@ -9007,26 +9017,26 @@ ripper_id2sym(ID id) char buf[8]; if (id <= 256) { - buf[0] = id; - buf[1] = '\0'; - return ID2SYM(rb_intern(buf)); + buf[0] = id; + buf[1] = '\0'; + return ID2SYM(rb_intern(buf)); } if ((name = keyword_id_to_str(id))) { - return ID2SYM(rb_intern(name)); + return ID2SYM(rb_intern(name)); } switch (id) { case tOROP: - name = "||"; - break; + name = "||"; + break; case tANDOP: - name = "&&"; - break; + name = "&&"; + break; default: - name = rb_id2name(id); - if (!name) { - rb_bug("cannot convert ID to string: %ld", (unsigned long)id); - } - break; + name = rb_id2name(id); + if (!name) { + rb_bug("cannot convert ID to string: %ld", (unsigned long)id); + } + break; } return ID2SYM(rb_intern(name)); } @@ -9059,14 +9069,14 @@ static void ripper_warnI(struct parser_params *parser, const char *fmt, int a) { rb_funcall(parser->value, rb_intern("warn"), 2, - rb_str_new2(fmt), INT2NUM(a)); + rb_str_new2(fmt), INT2NUM(a)); } static void ripper_warnS(struct parser_params *parser, const char *fmt, const char *str) { rb_funcall(parser->value, rb_intern("warn"), 2, - rb_str_new2(fmt), rb_str_new2(str)); + rb_str_new2(fmt), rb_str_new2(str)); } static void @@ -9079,7 +9089,7 @@ static void ripper_warningS(struct parser_params *parser, const char *fmt, const char *str) { rb_funcall(parser->value, rb_intern("warning"), 2, - rb_str_new2(fmt), rb_str_new2(str)); + rb_str_new2(fmt), rb_str_new2(str)); } static VALUE @@ -9125,16 +9135,16 @@ ripper_initialize(int argc, VALUE *argv, VALUE self) parser->parser_lex_gets = ripper_lex_get_generic; } else { - StringValue(src); - parser->parser_lex_gets = lex_get_str; + StringValue(src); + parser->parser_lex_gets = lex_get_str; } parser->parser_lex_input = src; parser->eofp = Qfalse; if (NIL_P(fname)) { - fname = rb_str_new2("(ripper)"); + fname = rb_str_new2("(ripper)"); } else { - StringValue(fname); + StringValue(fname); } parser_initialize(parser); parser->parser_ruby_sourcefile = fname; @@ -9210,13 +9220,13 @@ ripper_parse(VALUE self) Data_Get_Struct(self, struct parser_params, parser); if (!ripper_initialized_p(parser)) { - rb_raise(rb_eArgError, "method called for uninitialized object"); + rb_raise(rb_eArgError, "method called for uninitialized object"); } if (!NIL_P(parser->parsing_thread)) { - if (parser->parsing_thread == rb_thread_current()) - rb_raise(rb_eArgError, "Ripper#parse is not reentrant"); - else - rb_raise(rb_eArgError, "Ripper#parse is not multithread-safe"); + if (parser->parsing_thread == rb_thread_current()) + rb_raise(rb_eArgError, "Ripper#parse is not reentrant"); + else + rb_raise(rb_eArgError, "Ripper#parse is not multithread-safe"); } parser->parsing_thread = rb_thread_current(); rb_ensure(ripper_parse0, self, ripper_ensure, self); @@ -9239,7 +9249,7 @@ ripper_column(VALUE self) Data_Get_Struct(self, struct parser_params, parser); if (!ripper_initialized_p(parser)) { - rb_raise(rb_eArgError, "method called for uninitialized object"); + rb_raise(rb_eArgError, "method called for uninitialized object"); } if (NIL_P(parser->parsing_thread)) return Qnil; col = parser->tokp - parser->parser_lex_pbeg; @@ -9260,7 +9270,7 @@ ripper_lineno(VALUE self) Data_Get_Struct(self, struct parser_params, parser); if (!ripper_initialized_p(parser)) { - rb_raise(rb_eArgError, "method called for uninitialized object"); + rb_raise(rb_eArgError, "method called for uninitialized object"); } if (NIL_P(parser->parsing_thread)) return Qnil; return INT2NUM(parser->parser_ruby_sourceline); @@ -605,7 +605,7 @@ rb_waitpid(int pid, int *st, int flags) break; } if (!pid_tbl) - pid_tbl = st_init_numtable(); + pid_tbl = st_init_numtable(); st_insert(pid_tbl, pid, (st_data_t)st); if (!rb_thread_alone()) rb_thread_schedule(); } @@ -891,13 +891,8 @@ proc_detach(VALUE obj, VALUE pid) char *strtok(); #endif -#ifdef HAVE_SETITIMER -#define before_exec() rb_thread_stop_timer() -#define after_exec() rb_thread_start_timer() -#else -#define before_exec() -#define after_exec() -#endif +#define before_exec() rb_enable_interrupt() +#define after_exec() rb_disable_interrupt() extern char *dln_find_exe(const char *fname, const char *path); @@ -1352,6 +1347,7 @@ rb_fork(int *status, int (*chfunc)(void*), void *charg) _exit(127); #endif } + rb_thread_reset_timer_thread(); } #ifdef FD_CLOEXEC else if (chfunc) { @@ -1522,9 +1518,6 @@ rb_spawn(int argc, VALUE *argv) { int status; VALUE prog; -#if defined HAVE_FORK - struct rb_exec_arg earg; -#endif prog = rb_check_argv(argc, argv); @@ -1533,11 +1526,14 @@ rb_spawn(int argc, VALUE *argv) prog = *argv++; } #if defined HAVE_FORK - earg.argc = argc; - earg.argv = argv; - earg.prog = prog ? RSTRING_PTR(prog) : 0; - status = rb_fork(&status, (int (*)(void*))rb_exec, &earg); - if (prog && argc) argv[0] = prog; + { + struct rb_exec_arg earg; + earg.argc = argc; + earg.argv = argv; + earg.prog = prog ? RSTRING_PTR(prog) : 0; + status = rb_fork(&status, (int (*)(void*))rb_exec, &earg); + if (prog && argc) argv[0] = prog; + } #elif defined HAVE_SPAWNV if (!argc) { status = proc_spawn(RSTRING_PTR(prog)); @@ -2952,7 +2948,7 @@ p_gid_change_privilege(VALUE obj, VALUE id) if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0); SAVED_GROUP_ID = gid; if (setrgid(gid) < 0) rb_sys_fail(0); - } + } } else if (/* getegid() != gid && */ getgid() == gid) { if (setegid(gid) < 0) rb_sys_fail(0); if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0); @@ -11,7 +11,6 @@ **********************************************************************/ #include "ruby.h" -#include "env.h" VALUE rb_cRange; static ID id_cmp, id_succ, id_beg, id_end, id_excl; @@ -44,7 +43,8 @@ range_init(VALUE range, VALUE beg, VALUE end, int exclude_end) VALUE v; v = rb_rescue(range_check, (VALUE)args, range_failed, 0); - if (NIL_P(v)) range_failed(); + if (NIL_P(v)) + range_failed(); } SET_EXCL(range, exclude_end); @@ -116,7 +116,8 @@ range_exclude_end_p(VALUE range) static VALUE range_eq(VALUE range, VALUE obj) { - if (range == obj) return Qtrue; + if (range == obj) + return Qtrue; if (!rb_obj_is_instance_of(obj, rb_obj_class(range))) return Qfalse; @@ -125,7 +126,8 @@ range_eq(VALUE range, VALUE obj) if (!rb_equal(rb_ivar_get(range, id_end), rb_ivar_get(obj, id_end))) return Qfalse; - if (EXCL(range) != EXCL(obj)) return Qfalse; + if (EXCL(range) != EXCL(obj)) + return Qfalse; return Qtrue; } @@ -135,8 +137,10 @@ r_lt(VALUE a, VALUE b) { VALUE r = rb_funcall(a, id_cmp, 1, b); - if (NIL_P(r)) return Qfalse; - if (rb_cmpint(r, a, b) < 0) return Qtrue; + if (NIL_P(r)) + return Qfalse; + if (rb_cmpint(r, a, b) < 0) + return Qtrue; return Qfalse; } @@ -146,10 +150,13 @@ r_le(VALUE a, VALUE b) int c; VALUE r = rb_funcall(a, id_cmp, 1, b); - if (NIL_P(r)) return Qfalse; + if (NIL_P(r)) + return Qfalse; c = rb_cmpint(r, a, b); - if (c == 0) return INT2FIX(0); - if (c < 0) return Qtrue; + if (c == 0) + return INT2FIX(0); + if (c < 0) + return Qtrue; return Qfalse; } @@ -171,7 +178,8 @@ r_le(VALUE a, VALUE b) static VALUE range_eql(VALUE range, VALUE obj) { - if (range == obj) return Qtrue; + if (range == obj) + return Qtrue; if (!rb_obj_is_instance_of(obj, rb_obj_class(range))) return Qfalse; @@ -180,7 +188,8 @@ range_eql(VALUE range, VALUE obj) if (!rb_eql(rb_ivar_get(range, id_end), rb_ivar_get(obj, id_end))) return Qfalse; - if (EXCL(range) != EXCL(obj)) return Qfalse; + if (EXCL(range) != EXCL(obj)) + return Qfalse; return Qtrue; } @@ -218,20 +227,22 @@ str_step(VALUE arg) } static void -range_each_func(VALUE range, VALUE (*func) (VALUE, void *), VALUE v, VALUE e, void *arg) +range_each_func(VALUE range, VALUE (*func) (VALUE, void *), VALUE v, VALUE e, + void *arg) { int c; if (EXCL(range)) { while (r_lt(v, e)) { - (*func)(v, arg); + (*func) (v, arg); v = rb_funcall(v, id_succ, 0, 0); } } else { while (RTEST(c = r_le(v, e))) { - (*func)(v, arg); - if (c == INT2FIX(0)) break; + (*func) (v, arg); + if (c == INT2FIX(0)) + break; v = rb_funcall(v, id_succ, 0, 0); } } @@ -296,13 +307,15 @@ range_step(int argc, VALUE *argv, VALUE range) if (unit < 0) { rb_raise(rb_eArgError, "step can't be negative"); } - if (unit == 0) rb_raise(rb_eArgError, "step can't be 0"); + if (unit == 0) + rb_raise(rb_eArgError, "step can't be 0"); if (FIXNUM_P(b) && FIXNUM_P(e)) { /* fixnums are special */ long end = FIX2LONG(e); long i; - if (!EXCL(range)) end += 1; - for (i=FIX2LONG(b); i<end; i+=unit) { + if (!EXCL(range)) + end += 1; + for (i = FIX2LONG(b); i < end; i += unit) { rb_yield(LONG2NUM(i)); } } @@ -314,14 +327,18 @@ range_step(int argc, VALUE *argv, VALUE range) long iter[2]; b = tmp; - args[0] = b; args[1] = e; args[2] = range; - iter[0] = 1; iter[1] = unit; + args[0] = b; + args[1] = e; + args[2] = range; + iter[0] = 1; + iter[1] = unit; rb_iterate(str_step, (VALUE)args, step_i, (VALUE)iter); } else if (rb_obj_is_kind_of(b, rb_cNumeric)) { ID c = rb_intern(EXCL(range) ? "<" : "<="); - if (rb_equal(step, INT2FIX(0))) rb_raise(rb_eArgError, "step can't be 0"); + if (rb_equal(step, INT2FIX(0))) + rb_raise(rb_eArgError, "step can't be 0"); while (RTEST(rb_funcall(b, c, 1, e))) { rb_yield(b); b = rb_funcall(b, '+', 1, step); @@ -385,8 +402,9 @@ range_each(VALUE range) long lim = FIX2LONG(end); long i; - if (!EXCL(range)) lim += 1; - for (i=FIX2LONG(beg); i<lim; i++) { + if (!EXCL(range)) + lim += 1; + for (i = FIX2LONG(beg); i < lim; i++) { rb_yield(LONG2NUM(i)); } } @@ -394,8 +412,11 @@ range_each(VALUE range) VALUE args[5]; long iter[2]; - args[0] = beg; args[1] = end; args[2] = range; - iter[0] = 1; iter[1] = 1; + args[0] = beg; + args[1] = end; + args[2] = range; + iter[0] = 1; + iter[1] = 1; rb_iterate(str_step, (VALUE)args, step_i, (VALUE)iter); } else { @@ -460,7 +481,8 @@ range_min(VALUE range) VALUE e = rb_ivar_get(range, id_end); int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e); - if (c > 0) return Qnil; + if (c > 0) + return Qnil; return b; } } @@ -490,10 +512,11 @@ range_max(VALUE range) VALUE b = rb_ivar_get(range, id_beg); int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e); - if (c > 0) return Qnil; + if (c > 0) + return Qnil; if (EXCL(range)) { if (FIXNUM_P(e)) { - return INT2NUM(FIX2INT(e)-1); + return INT2NUM(FIX2INT(e) - 1); } return rb_funcall(e, '-', 1, INT2FIX(1)); } @@ -514,9 +537,11 @@ rb_range_beg_len(VALUE range, long *begp, long *lenp, long len, int err) } else { b = rb_check_to_integer(range, "begin"); - if (NIL_P(b)) return Qfalse; + if (NIL_P(b)) + return Qfalse; e = rb_check_to_integer(range, "end"); - if (NIL_P(e)) return Qfalse; + if (NIL_P(e)) + return Qfalse; excl = RTEST(rb_funcall(range, rb_intern("exclude_end?"), 0)); } beg = NUM2LONG(b); @@ -524,16 +549,22 @@ rb_range_beg_len(VALUE range, long *begp, long *lenp, long len, int err) if (beg < 0) { beg += len; - if (beg < 0) goto out_of_range; + if (beg < 0) + goto out_of_range; } if (err == 0 || err == 2) { - if (beg > len) goto out_of_range; - if (end > len) end = len; + if (beg > len) + goto out_of_range; + if (end > len) + end = len; } - if (end < 0) end += len; - if (!excl) end++; /* include end point */ + if (end < 0) + end += len; + if (!excl) + end++; /* include end point */ len = end - beg; - if (len < 0) len = 0; + if (len < 0) + len = 0; *begp = beg; *lenp = len; @@ -562,7 +593,7 @@ range_to_s(VALUE range) str = rb_obj_as_string(rb_ivar_get(range, id_beg)); str2 = rb_obj_as_string(rb_ivar_get(range, id_end)); str = rb_str_dup(str); - rb_str_cat(str, "...", EXCL(range)?3:2); + rb_str_cat(str, "...", EXCL(range) ? 3 : 2); rb_str_append(str, str2); OBJ_INFECT(str, str2); @@ -600,7 +631,7 @@ range_inspect(VALUE range) str = rb_inspect(rb_ivar_get(range, id_beg)); str2 = rb_inspect(rb_ivar_get(range, id_end)); str = rb_str_dup(str); - rb_str_cat(str, "...", EXCL(range)?3:2); + rb_str_cat(str, "...", EXCL(range) ? 3 : 2); rb_str_append(str, str2); OBJ_INFECT(str, str2); @@ -643,15 +674,17 @@ range_include(VALUE range, VALUE val) !NIL_P(rb_check_to_integer(end, "to_int"))) { if (r_le(beg, val)) { if (EXCL(range)) { - if (r_lt(val, end)) return Qtrue; + if (r_lt(val, end)) + return Qtrue; } else { - if (r_le(val, end)) return Qtrue; + if (r_le(val, end)) + return Qtrue; } } return Qfalse; } - ruby_frame->this_func = rb_intern("include?"); + // TODO: ruby_frame->this_func = rb_intern("include?"); return rb_call_super(1, &val); } @@ -677,10 +710,12 @@ range_cover(VALUE range, VALUE val) end = rb_ivar_get(range, id_end); if (r_le(beg, val)) { if (EXCL(range)) { - if (r_lt(val, end)) return Qtrue; + if (r_lt(val, end)) + return Qtrue; } else { - if (r_le(val, end)) return Qtrue; + if (r_le(val, end)) + return Qtrue; } } return Qfalse; @@ -66,48 +66,74 @@ #define USE_UNICODE_FULL_RANGE_CTYPE /* following must not use with USE_CRNL_AS_LINE_TERMINATOR */ -/* #define USE_UNICODE_ALL_LINE_TERMINATORS */ /* see Unicode.org UTF#18 */ + /* #define USE_UNICODE_ALL_LINE_TERMINATORS *//* see Unicode.org UTF#18 */ #define ONIG_ENCODING_INIT_DEFAULT ONIG_ENCODING_ASCII /* for encoding system implementation (internal) */ -ONIG_EXTERN int onigenc_ascii_get_all_pair_ambig_codes P_((OnigAmbigType flag, const OnigPairAmbigCodes** acs)); -ONIG_EXTERN int onigenc_nothing_get_all_comp_ambig_codes P_((OnigAmbigType flag, const OnigCompAmbigCodes** acs)); -ONIG_EXTERN int onigenc_iso_8859_1_get_all_pair_ambig_codes P_((OnigAmbigType flag, const OnigPairAmbigCodes** acs)); -ONIG_EXTERN int onigenc_ess_tsett_get_all_comp_ambig_codes P_((OnigAmbigType flag, const OnigCompAmbigCodes** acs)); -ONIG_EXTERN int onigenc_not_support_get_ctype_code_range P_((int ctype, const OnigCodePoint* sbr[], const OnigCodePoint* mbr[])); -ONIG_EXTERN int onigenc_is_mbc_newline_0x0a P_((const UChar* p, const UChar* end)); +ONIG_EXTERN int onigenc_ascii_get_all_pair_ambig_codes +P_((OnigAmbigType flag, const OnigPairAmbigCodes ** acs)); +ONIG_EXTERN int onigenc_nothing_get_all_comp_ambig_codes +P_((OnigAmbigType flag, const OnigCompAmbigCodes ** acs)); +ONIG_EXTERN int onigenc_iso_8859_1_get_all_pair_ambig_codes +P_((OnigAmbigType flag, const OnigPairAmbigCodes ** acs)); +ONIG_EXTERN int onigenc_ess_tsett_get_all_comp_ambig_codes +P_((OnigAmbigType flag, const OnigCompAmbigCodes ** acs)); +ONIG_EXTERN int onigenc_not_support_get_ctype_code_range +P_((int ctype, const OnigCodePoint * sbr[], const OnigCodePoint * mbr[])); +ONIG_EXTERN int onigenc_is_mbc_newline_0x0a +P_((const UChar * p, const UChar * end)); /* methods for single byte encoding */ -ONIG_EXTERN int onigenc_ascii_mbc_to_normalize P_((OnigAmbigType flag, const UChar** p, const UChar* end, UChar* lower)); -ONIG_EXTERN int onigenc_ascii_is_mbc_ambiguous P_((OnigAmbigType flag, const UChar** p, const UChar* end)); -ONIG_EXTERN int onigenc_single_byte_mbc_enc_len P_((const UChar* p)); -ONIG_EXTERN OnigCodePoint onigenc_single_byte_mbc_to_code P_((const UChar* p, const UChar* end)); +ONIG_EXTERN int onigenc_ascii_mbc_to_normalize +P_((OnigAmbigType flag, const UChar ** p, const UChar * end, UChar * lower)); +ONIG_EXTERN int onigenc_ascii_is_mbc_ambiguous +P_((OnigAmbigType flag, const UChar ** p, const UChar * end)); +ONIG_EXTERN int onigenc_single_byte_mbc_enc_len P_((const UChar * p)); +ONIG_EXTERN OnigCodePoint onigenc_single_byte_mbc_to_code +P_((const UChar * p, const UChar * end)); ONIG_EXTERN int onigenc_single_byte_code_to_mbclen P_((OnigCodePoint code)); -ONIG_EXTERN int onigenc_single_byte_code_to_mbc_first P_((OnigCodePoint code)); -ONIG_EXTERN int onigenc_single_byte_code_to_mbc P_((OnigCodePoint code, UChar *buf)); -ONIG_EXTERN UChar* onigenc_single_byte_left_adjust_char_head P_((const UChar* start, const UChar* s)); -ONIG_EXTERN int onigenc_always_true_is_allowed_reverse_match P_((const UChar* s, const UChar* end)); -ONIG_EXTERN int onigenc_always_false_is_allowed_reverse_match P_((const UChar* s, const UChar* end)); +ONIG_EXTERN int onigenc_single_byte_code_to_mbc_first +P_((OnigCodePoint code)); +ONIG_EXTERN int onigenc_single_byte_code_to_mbc +P_((OnigCodePoint code, UChar * buf)); +ONIG_EXTERN UChar *onigenc_single_byte_left_adjust_char_head +P_((const UChar * start, const UChar * s)); +ONIG_EXTERN int onigenc_always_true_is_allowed_reverse_match +P_((const UChar * s, const UChar * end)); +ONIG_EXTERN int onigenc_always_false_is_allowed_reverse_match +P_((const UChar * s, const UChar * end)); /* methods for multi byte encoding */ -ONIG_EXTERN OnigCodePoint onigenc_mbn_mbc_to_code P_((OnigEncoding enc, const UChar* p, const UChar* end)); -ONIG_EXTERN int onigenc_mbn_mbc_to_normalize P_((OnigEncoding enc, OnigAmbigType flag, const UChar** p, const UChar* end, UChar* lower)); -ONIG_EXTERN int onigenc_mbn_is_mbc_ambiguous P_((OnigEncoding enc, OnigAmbigType flag, const UChar** p, const UChar* end)); +ONIG_EXTERN OnigCodePoint onigenc_mbn_mbc_to_code +P_((OnigEncoding enc, const UChar * p, const UChar * end)); +ONIG_EXTERN int onigenc_mbn_mbc_to_normalize +P_((OnigEncoding enc, OnigAmbigType flag, const UChar ** p, const UChar * end, + UChar * lower)); +ONIG_EXTERN int onigenc_mbn_is_mbc_ambiguous +P_((OnigEncoding enc, OnigAmbigType flag, const UChar ** p, + const UChar * end)); ONIG_EXTERN int onigenc_mb2_code_to_mbclen P_((OnigCodePoint code)); ONIG_EXTERN int onigenc_mb2_code_to_mbc_first P_((OnigCodePoint code)); -ONIG_EXTERN int onigenc_mb2_code_to_mbc P_((OnigEncoding enc, OnigCodePoint code, UChar *buf)); -ONIG_EXTERN int onigenc_mb2_is_code_ctype P_((OnigEncoding enc, OnigCodePoint code, unsigned int ctype)); +ONIG_EXTERN int onigenc_mb2_code_to_mbc +P_((OnigEncoding enc, OnigCodePoint code, UChar * buf)); +ONIG_EXTERN int onigenc_mb2_is_code_ctype +P_((OnigEncoding enc, OnigCodePoint code, unsigned int ctype)); ONIG_EXTERN int onigenc_mb4_code_to_mbclen P_((OnigCodePoint code)); ONIG_EXTERN int onigenc_mb4_code_to_mbc_first P_((OnigCodePoint code)); -ONIG_EXTERN int onigenc_mb4_code_to_mbc P_((OnigEncoding enc, OnigCodePoint code, UChar *buf)); -ONIG_EXTERN int onigenc_mb4_is_code_ctype P_((OnigEncoding enc, OnigCodePoint code, unsigned int ctype)); +ONIG_EXTERN int onigenc_mb4_code_to_mbc +P_((OnigEncoding enc, OnigCodePoint code, UChar * buf)); +ONIG_EXTERN int onigenc_mb4_is_code_ctype +P_((OnigEncoding enc, OnigCodePoint code, unsigned int ctype)); -ONIG_EXTERN int onigenc_get_all_fold_match_code_ss_0xdf P_((OnigCodePoint** codes)); +ONIG_EXTERN int onigenc_get_all_fold_match_code_ss_0xdf +P_((OnigCodePoint ** codes)); /* in enc/unicode.c */ -ONIG_EXTERN int onigenc_unicode_is_code_ctype P_((OnigCodePoint code, unsigned int ctype)); -ONIG_EXTERN int onigenc_unicode_get_ctype_code_range P_((int ctype, const OnigCodePoint* sbr[], const OnigCodePoint* mbr[])); +ONIG_EXTERN int onigenc_unicode_is_code_ctype +P_((OnigCodePoint code, unsigned int ctype)); +ONIG_EXTERN int onigenc_unicode_get_ctype_code_range +P_((int ctype, const OnigCodePoint * sbr[], const OnigCodePoint * mbr[])); #define ONIGENC_ISO_8859_1_TO_LOWER_CASE(c) \ @@ -125,15 +151,17 @@ ONIG_EXTERN const OnigPairAmbigCodes OnigAsciiPairAmbigCodes[]; #endif /* is not ONIG_RUBY_M17N */ ONIG_EXTERN int -onigenc_with_ascii_strncmp P_((OnigEncoding enc, const UChar* p, const UChar* end, const UChar* sascii /* ascii */, int n)); -ONIG_EXTERN UChar* -onigenc_step P_((OnigEncoding enc, const UChar* p, const UChar* end, int n)); + onigenc_with_ascii_strncmp +P_((OnigEncoding enc, const UChar * p, const UChar * end, + const UChar * sascii /* ascii */ , int n)); +ONIG_EXTERN UChar *onigenc_step +P_((OnigEncoding enc, const UChar * p, const UChar * end, int n)); /* defined in regexec.c, but used in enc/xxx.c */ -extern int onig_is_in_code_range P_((const UChar* p, OnigCodePoint code)); +extern int onig_is_in_code_range P_((const UChar * p, OnigCodePoint code)); ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding; -ONIG_EXTERN const UChar* OnigEncAsciiToLowerCaseTable; +ONIG_EXTERN const UChar *OnigEncAsciiToLowerCaseTable; ONIG_EXTERN const UChar OnigEncAsciiToUpperCaseTable[]; ONIG_EXTERN const unsigned short OnigEncAsciiCtypeTable[]; @@ -55,7 +55,7 @@ extern int ruby_yydebug; char *ruby_inplace_mode = Qfalse; static void load_stdin(void); -static void load_file(const char *, int); +static NODE *load_file(const char *, int); static void forbid_setid(const char *); static VALUE do_loop = Qfalse, do_print = Qfalse; @@ -72,31 +72,31 @@ usage(const char *name) * Removed -h because the user already knows that option. Others? */ static const char *usage_msg[] = { -"-0[octal] specify record separator (\\0, if no argument)", -"-a autosplit mode with -n or -p (splits $_ into $F)", -"-c check syntax only", -"-Cdirectory cd to directory, before executing your script", -"-d set debugging flags (set $DEBUG to true)", -"-e 'command' one line of script. Several -e's allowed. Omit [programfile]", -"-Fpattern split() pattern for autosplit (-a)", -"-i[extension] edit ARGV files in place (make backup if extension supplied)", -"-Idirectory specify $LOAD_PATH directory (may be used more than once)", -"-Kkcode specifies KANJI (Japanese) code-set", -"-l enable line ending processing", -"-n assume 'while gets(); ... end' loop around your script", -"-p assume loop like -n but print line also like sed", -"-rlibrary require the library, before executing your script", -"-s enable some switch parsing for switches after script name", -"-S look for the script using PATH environment variable", -"-T[level] turn on tainting checks", -"-v print version number, then turn on verbose mode", -"-w turn warnings on for your script", -"-W[level] set warning level; 0=silence, 1=medium, 2=verbose (default)", -"-x[directory] strip off text before #!ruby line and perhaps cd to directory", -"--copyright print the copyright", -"--version print the version", -NULL -}; + "-0[octal] specify record separator (\\0, if no argument)", + "-a autosplit mode with -n or -p (splits $_ into $F)", + "-c check syntax only", + "-Cdirectory cd to directory, before executing your script", + "-d set debugging flags (set $DEBUG to true)", + "-e 'command' one line of script. Several -e's allowed. Omit [programfile]", + "-Fpattern split() pattern for autosplit (-a)", + "-i[extension] edit ARGV files in place (make backup if extension supplied)", + "-Idirectory specify $LOAD_PATH directory (may be used more than once)", + "-Kkcode specifies KANJI (Japanese) code-set", + "-l enable line ending processing", + "-n assume 'while gets(); ... end' loop around your script", + "-p assume loop like -n but print line also like sed", + "-rlibrary require the library, before executing your script", + "-s enable some switch parsing for switches after script name", + "-S look for the script using PATH environment variable", + "-T[level] turn on tainting checks", + "-v print version number, then turn on verbose mode", + "-w turn warnings on for your script", + "-W[level] set warning level; 0=silence, 1=medium, 2=verbose (default)", + "-x[directory] strip off text before #!ruby line and perhaps cd to directory", + "--copyright print the copyright", + "--version print the version", + NULL + }; const char **p = usage_msg; printf("Usage: %s [switches] [--] [programfile] [arguments]\n", name); @@ -114,7 +114,7 @@ rubylib_mangle(const char *s, unsigned int l) { static char *newp, *oldp; static int newl, oldl, notfound; - static char newsub[STATIC_FILE_LENGTH+1]; + static char newsub[STATIC_FILE_LENGTH + 1]; if (!newp && !notfound) { newp = getenv("RUBYLIB_PREFIX"); @@ -123,7 +123,8 @@ rubylib_mangle(const char *s, unsigned int l) oldp = newp; while (*newp && !ISSPACE(*newp) && *newp != ';') { - newp++; oldl++; /* Skip digits. */ + newp++; + oldl++; /* Skip digits. */ } while (*newp && (ISSPACE(*newp) || *newp == ';')) { newp++; /* Skip whitespace. */ @@ -135,7 +136,8 @@ rubylib_mangle(const char *s, unsigned int l) strcpy(newsub, newp); s = newsub; while (*s) { - if (*s == '\\') *s = '/'; + if (*s == '\\') + *s = '/'; s++; } } @@ -147,7 +149,7 @@ rubylib_mangle(const char *s, unsigned int l) l = strlen(s); } if (!newp || l < oldl || strncasecmp(oldp, s, oldl) != 0) { - static char ret[STATIC_FILE_LENGTH+1]; + static char ret[STATIC_FILE_LENGTH + 1]; strncpy(ret, s, l); ret[l] = 0; return ret; @@ -159,6 +161,7 @@ rubylib_mangle(const char *s, unsigned int l) newsub[l + newl - oldl] = 0; return newsub; } + #define rubylib_mangled_path(s, l) rb_str_new2(rubylib_mangle((s), (l))) #define rubylib_mangled_path2(s) rb_str_new2(rubylib_mangle((s), 0)) #else @@ -171,7 +174,8 @@ ruby_push_include(const char *path, VALUE (*filter) (VALUE)) { const char sep = PATH_SEP_CHAR; - if (path == 0) return; + if (path == 0) + return; #if defined(__CYGWIN__) { char rubylib[FILENAME_MAX]; @@ -185,20 +189,23 @@ ruby_push_include(const char *path, VALUE (*filter) (VALUE)) p = path; while (*p) { - while (*p == sep) p++; + while (*p == sep) + p++; if ((s = strchr(p, sep)) != 0) { - rb_ary_push(ary, (*filter)(rubylib_mangled_path(p, (int)(s-p)))); + rb_ary_push(ary, + (*filter) (rubylib_mangled_path + (p, (int)(s - p)))); p = s + 1; } else { - rb_ary_push(ary, (*filter)(rubylib_mangled_path2(p))); + rb_ary_push(ary, (*filter) (rubylib_mangled_path2(p))); break; } } rb_ary_concat(rb_load_path, ary); } else { - rb_ary_push(rb_load_path, (*filter)(rubylib_mangled_path2(path))); + rb_ary_push(rb_load_path, (*filter) (rubylib_mangled_path2(path))); } } @@ -218,8 +225,10 @@ static VALUE expand_include_path(VALUE path) { char *p = RSTRING_PTR(path); - if (!p) return path; - if (*p == '.' && p[1] == '/') return path; + if (!p) + return path; + if (*p == '.' && p[1] == '/') + return path; return rb_file_expand_path(path, Qnil); } @@ -254,7 +263,7 @@ void ruby_init_loadpath(void) { #if defined LOAD_RELATIVE - char libpath[MAXPATHLEN+1]; + char libpath[MAXPATHLEN + 1]; char *p; int rest; #if defined _WIN32 || defined __CYGWIN__ @@ -263,8 +272,9 @@ ruby_init_loadpath(void) #ifndef _WIN32_WCE memset(&m, 0, sizeof(m)); - if (VirtualQuery(ruby_init_loadpath, &m, sizeof(m)) && m.State == MEM_COMMIT) - libruby = (HMODULE)m.AllocationBase; + if (VirtualQuery(ruby_init_loadpath, &m, sizeof(m)) + && m.State == MEM_COMMIT) + libruby = (HMODULE) m.AllocationBase; #endif GetModuleFileName(libruby, libpath, sizeof libpath); #elif defined(DJGPP) @@ -284,7 +294,7 @@ ruby_init_loadpath(void) p = strrchr(libpath, '/'); if (p) { *p = 0; - if (p-libpath > 3 && !strcasecmp(p-4, "/bin")) { + if (p - libpath > 3 && !strcasecmp(p - 4, "/bin")) { p -= 4; *p = 0; } @@ -339,7 +349,7 @@ add_modules(const char *mod) struct req_list *list; list = ALLOC(struct req_list); - list->name = ALLOC_N(char, strlen(mod)+1); + list->name = ALLOC_N(char, strlen(mod) + 1); strcpy(list->name, mod); list->next = 0; req_list_last->next = list; @@ -369,7 +379,8 @@ require_libraries(void) ruby_current_node = 0; rb_protect((VALUE (*)(VALUE))rb_require, (VALUE)list->name, &state); - if (state) rb_jump_tag(state); + if (state) + rb_jump_tag(state); tmp = list->next; free(list->name); free(list); @@ -398,9 +409,11 @@ process_sflag(void) char *p; int hyphen = Qfalse; - if (s[0] != '-') break; + if (s[0] != '-') + break; n--; - if (s[1] == '-' && s[2] == '\0') break; + if (s[1] == '-' && s[2] == '\0') + break; v = Qtrue; /* check if valid name before replacing - with _ */ @@ -415,7 +428,8 @@ process_sflag(void) } else if (*p != '_' && !ISALNUM(*p)) { VALUE name_error[2]; - name_error[0] = rb_str_new2("invalid name for global variable - "); + name_error[0] = + rb_str_new2("invalid name for global variable - "); if (!(p = strchr(p, '='))) { rb_str_cat2(name_error[0], s); } @@ -423,13 +437,15 @@ process_sflag(void) rb_str_cat(name_error[0], s, p - s); } name_error[1] = args[-1]; - rb_exc_raise(rb_class_new_instance(2, name_error, rb_eNameError)); + rb_exc_raise(rb_class_new_instance + (2, name_error, rb_eNameError)); } } s[0] = '$'; if (hyphen) { for (p = s + 1; *p; ++p) { - if (*p == '-') *p = '_'; + if (*p == '-') + *p = '_'; } } rb_gv_set(s, v); @@ -444,19 +460,21 @@ process_sflag(void) static void proc_options(int argc, char **argv); -static char* +static char * moreswitches(const char *s) { - int argc; char *argv[3]; + int argc; + char *argv[3]; const char *p = s; - argc = 2; argv[0] = argv[2] = 0; + argc = 2; + argv[0] = argv[2] = 0; while (*s && !ISSPACE(*s)) s++; - argv[1] = ALLOCA_N(char, s-p+2); + argv[1] = ALLOCA_N(char, s - p + 2); argv[1][0] = '-'; - strncpy(argv[1]+1, p, s-p); - argv[1][s-p+1] = '\0'; + strncpy(argv[1] + 1, p, s - p); + argv[1][s - p + 1] = '\0'; proc_options(argc, argv); while (*s && ISSPACE(*s)) s++; @@ -479,14 +497,16 @@ proc_options(int argc, char **argv) int verbose = 0; VALUE e_script = Qfalse; - if (argc == 0) return; + if (argc == 0) + return; do_search = Qfalse; - for (argc--,argv++; argc > 0; argc--,argv++) { - if (argv[0][0] != '-' || !argv[0][1]) break; + for (argc--, argv++; argc > 0; argc--, argv++) { + if (argv[0][0] != '-' || !argv[0][1]) + break; - s = argv[0]+1; + s = argv[0] + 1; reswitch: switch (*s) { case 'a': @@ -532,16 +552,20 @@ proc_options(int argc, char **argv) if (*++s) { v = scan_oct(s, 1, &numlen); - if (numlen == 0) v = 1; + if (numlen == 0) + v = 1; s += numlen; } switch (v) { case 0: - ruby_verbose = Qnil; break; + ruby_verbose = Qnil; + break; case 1: - ruby_verbose = Qfalse; break; + ruby_verbose = Qfalse; + break; default: - ruby_verbose = Qtrue; break; + ruby_verbose = Qtrue; + break; } } goto reswitch; @@ -577,15 +601,17 @@ proc_options(int argc, char **argv) forbid_setid("-e"); if (!*++s) { s = argv[1]; - argc--,argv++; + argc--, argv++; } if (!s) { - fprintf(stderr, "%s: no code specified for -e\n", origargv[0]); + fprintf(stderr, "%s: no code specified for -e\n", + origargv[0]); exit(2); } if (!e_script) { - e_script = rb_str_new(0,0); - if (script == 0) script = "-e"; + e_script = rb_str_new(0, 0); + if (script == 0) + script = "-e"; } rb_str_cat2(e_script, s); rb_str_cat2(e_script, "\n"); @@ -598,14 +624,15 @@ proc_options(int argc, char **argv) } else if (argv[1]) { add_modules(argv[1]); - argc--,argv++; + argc--, argv++; } break; case 'i': forbid_setid("-i"); - if (ruby_inplace_mode) free(ruby_inplace_mode); - ruby_inplace_mode = strdup(s+1); + if (ruby_inplace_mode) + free(ruby_inplace_mode); + ruby_inplace_mode = strdup(s + 1); break; case 'x': @@ -621,7 +648,7 @@ proc_options(int argc, char **argv) s++; if (!*s) { s = argv[1]; - argc--,argv++; + argc--, argv++; } if (!s || !*s) { rb_fatal("Can't chdir"); @@ -651,7 +678,8 @@ proc_options(int argc, char **argv) if (*++s) { v = scan_oct(s, 2, &numlen); - if (numlen == 0) v = 1; + if (numlen == 0) + v = 1; s += numlen; } rb_set_safe_level(v); @@ -664,7 +692,7 @@ proc_options(int argc, char **argv) ruby_incpush_expand(s); else if (argv[1]) { ruby_incpush_expand(argv[1]); - argc--,argv++; + argc--, argv++; } break; @@ -676,7 +704,8 @@ proc_options(int argc, char **argv) v = scan_oct(s, 4, &numlen); s += numlen; - if (v > 0377) rb_rs = Qnil; + if (v > 0377) + rb_rs = Qnil; else if (v == 0 && numlen >= 2) { rb_rs = rb_str_new2("\n\n"); } @@ -689,7 +718,7 @@ proc_options(int argc, char **argv) case '-': if (!s[1] || (s[1] == '\r' && !s[2])) { - argc--,argv++; + argc--, argv++; goto switch_end; } s++; @@ -712,23 +741,27 @@ proc_options(int argc, char **argv) exit(0); } else { - fprintf(stderr, "%s: invalid option --%s (-h will show valid options)\n", + fprintf(stderr, + "%s: invalid option --%s (-h will show valid options)\n", origargv[0], s); exit(2); } break; case '\r': - if (!s[1]) break; + if (!s[1]) + break; default: { const char *format; if (ISPRINT(*s)) { - format = "%s: invalid option -%c (-h will show valid options)\n"; + format = + "%s: invalid option -%c (-h will show valid options)\n"; } else { - format = "%s: invalid option -\\%03o (-h will show valid options)\n"; + format = + "%s: invalid option -\\%03o (-h will show valid options)\n"; } fprintf(stderr, format, origargv[0], (int)(unsigned char)*s); } @@ -740,18 +773,22 @@ proc_options(int argc, char **argv) } switch_end: - if (argv0 == 0) return; + if (argv0 == 0) + return; if (rb_safe_level() == 0 && (s = getenv("RUBYOPT"))) { - while (ISSPACE(*s)) s++; - if (*s == 'T' || (*s == '-' && *(s+1) == 'T')) { + while (ISSPACE(*s)) + s++; + if (*s == 'T' || (*s == '-' && *(s + 1) == 'T')) { int numlen; int v = 1; - if (*s != 'T') ++s; + if (*s != 'T') + ++s; if (*++s) { v = scan_oct(s, 2, &numlen); - if (numlen == 0) v = 1; + if (numlen == 0) + v = 1; } rb_set_safe_level(v); } @@ -760,13 +797,17 @@ proc_options(int argc, char **argv) if (*s == '-') { s++; if (ISSPACE(*s)) { - do {s++;} while (ISSPACE(*s)); + do { + s++; + } while (ISSPACE(*s)); continue; } } - if (!*s) break; + if (!*s) + break; if (!strchr("IdvwrK", *s)) - rb_raise(rb_eRuntimeError, "illegal switch in RUBYOPT: -%c", *s); + rb_raise(rb_eRuntimeError, + "illegal switch in RUBYOPT: -%c", *s); s = moreswitches(s); } } @@ -787,7 +828,8 @@ proc_options(int argc, char **argv) if (!e_script) { if (argc == 0) { /* no more args */ - if (verbose) exit(0); + if (verbose) + exit(0); script = "-"; } else { @@ -805,7 +847,8 @@ proc_options(int argc, char **argv) if (!script) { script = dln_find_file(argv[0], getenv(PATH_ENV)); } - if (!script) script = argv[0]; + if (!script) + script = argv[0]; script = ruby_sourcefile = rb_source_filename(script); script_node = NEW_BEGIN(0); } @@ -813,7 +856,8 @@ proc_options(int argc, char **argv) /* assume that we can change argv[n] if never change its length. */ translate_char(script, '\\', '/'); #endif - argc--; argv++; + argc--; + argv++; } } @@ -843,15 +887,17 @@ proc_options(int argc, char **argv) } } -static void +static NODE * load_file(const char *fname, int script) { extern VALUE rb_stdin; - VALUE parser; + volatile VALUE parser; VALUE f; int line_start = 1; + NODE *tree = 0; - if (!fname) rb_load_fail(fname); + if (!fname) + rb_load_fail(fname); if (strcmp(fname, "-") == 0) { f = rb_stdin; } @@ -899,7 +945,8 @@ load_file(const char *fname, int script) c = rb_io_getc(f); if (c == INT2FIX('!')) { line = rb_io_gets(f); - if (NIL_P(line)) return; + if (NIL_P(line)) + return 0; if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) { /* not ruby script, kick the program */ @@ -908,8 +955,10 @@ load_file(const char *fname, int script) char *pend = RSTRING_PTR(line) + RSTRING_LEN(line); p = RSTRING_PTR(line); /* skip `#!' */ - if (pend[-1] == '\n') pend--; /* chomp line */ - if (pend[-1] == '\r') pend--; + if (pend[-1] == '\n') + pend--; /* chomp line */ + if (pend[-1] == '\r') + pend--; *pend = '\0'; while (p < pend && ISSPACE(*p)) p++; @@ -918,9 +967,9 @@ load_file(const char *fname, int script) p++; *p++ = '\0'; if (p < pend) { - argv = ALLOCA_N(char*, origargc+3); + argv = ALLOCA_N(char *, origargc + 3); argv[1] = p; - MEMCPY(argv+2, origargv+1, char*, origargc); + MEMCPY(argv + 2, origargv + 1, char *, origargc); } else { argv = origargv; @@ -935,13 +984,13 @@ load_file(const char *fname, int script) start_read: p += 4; - RSTRING_PTR(line)[RSTRING_LEN(line)-1] = '\0'; - if (RSTRING_PTR(line)[RSTRING_LEN(line)-2] == '\r') - RSTRING_PTR(line)[RSTRING_LEN(line)-2] = '\0'; + RSTRING_PTR(line)[RSTRING_LEN(line) - 1] = '\0'; + if (RSTRING_PTR(line)[RSTRING_LEN(line) - 2] == '\r') + RSTRING_PTR(line)[RSTRING_LEN(line) - 2] = '\0'; if ((p = strstr(p, " -")) != 0) { p++; /* skip space before `-' */ while (*p == '-') { - p = moreswitches(p+1); + p = moreswitches(p + 1); } } @@ -958,22 +1007,24 @@ load_file(const char *fname, int script) rb_io_ungetc(f, c); } require_libraries(); /* Why here? unnatural */ - if (NIL_P(c)) return; + if (NIL_P(c)) + return 0; } parser = rb_parser_new(); - ruby_eval_tree = rb_parser_compile_file(parser, fname, f, line_start); + ruby_eval_tree = tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); if (script && rb_parser_end_seen_p(parser)) { rb_define_global_const("DATA", f); } else if (f != rb_stdin) { rb_io_close(f); } + return tree; } -void +void * rb_load_file(const char *fname) { - load_file(fname, 0); + return load_file(fname, 0); } static void @@ -1006,7 +1057,8 @@ set_arg0space() char *s; int i; - if (!environ || (s = environ[0]) == NULL) return; + if (!environ || (s = environ[0]) == NULL) + return; envspace.begin = s; s += strlen(s); for (i = 1; environ[i]; i++) { @@ -1030,7 +1082,8 @@ set_arg0(VALUE val, ID id) static int len; #endif - if (origargv == 0) rb_raise(rb_eRuntimeError, "$0 not initialized"); + if (origargv == 0) + rb_raise(rb_eRuntimeError, "$0 not initialized"); StringValue(val); s = RSTRING_PTR(val); i = RSTRING_LEN(val); @@ -1080,12 +1133,13 @@ set_arg0(VALUE val, ID id) if (i >= len) { i = len; } + memcpy(origargv[0], s, i); s = origargv[0] + i; *s = '\0'; if (++i < len) memset(s + 1, ' ', len - i); for (i = 1; i < origargc; i++) - origargv[i] = s; + origargv[i] = s; rb_progname = rb_tainted_str_new2(origargv[0]); #endif } @@ -1137,9 +1191,12 @@ verbose_setter(VALUE val, ID id, VALUE *variable) static VALUE opt_W_getter(VALUE val, ID id) { - if (ruby_verbose == Qnil) return INT2FIX(0); - if (ruby_verbose == Qfalse) return INT2FIX(1); - if (ruby_verbose == Qtrue) return INT2FIX(2); + if (ruby_verbose == Qnil) + return INT2FIX(0); + if (ruby_verbose == Qfalse) + return INT2FIX(1); + if (ruby_verbose == Qtrue) + return INT2FIX(2); return Qnil; /* not reached */ } @@ -1183,11 +1240,13 @@ ruby_set_argv(int argc, char **argv) int i; #if defined(USE_DLN_A_OUT) - if (origargv) dln_argv0 = origargv[0]; - else dln_argv0 = argv[0]; + if (origargv) + dln_argv0 = origargv[0]; + else + dln_argv0 = argv[0]; #endif rb_ary_clear(rb_argv); - for (i=0; i < argc; i++) { + for (i = 0; i < argc; i++) { VALUE arg = rb_tainted_str_new2(argv[i]); OBJ_FREEZE(arg); @@ -1195,13 +1254,14 @@ ruby_set_argv(int argc, char **argv) } } -NODE *rb_parser_append_print(NODE*); -NODE *rb_parser_while_loop(NODE*, int, int); +NODE *rb_parser_append_print(NODE *); +NODE *rb_parser_while_loop(NODE *, int, int); void ruby_process_options(int argc, char **argv) { - origargc = argc; origargv = argv; + origargc = argc; + origargv = argv; ruby_script(argv[0]); /* for the time being */ rb_argv0 = rb_progname; @@ -1219,6 +1279,7 @@ ruby_process_options(int argc, char **argv) ruby_eval_tree = rb_parser_append_print(ruby_eval_tree); } if (do_loop) { - ruby_eval_tree = rb_parser_while_loop(ruby_eval_tree, do_line, do_split); + ruby_eval_tree = + rb_parser_while_loop(ruby_eval_tree, do_line, do_split); } } @@ -237,10 +237,9 @@ ID rb_sym2id(VALUE); #define T_MATCH 0x13 #define T_SYMBOL 0x14 +#define T_VALUES 0x1a #define T_BLOCK 0x1b #define T_UNDEF 0x1c -#define T_VARMAP 0x1d -#define T_SCOPE 0x1e #define T_NODE 0x1f #define T_MASK 0x1f @@ -274,11 +273,14 @@ VALUE rb_get_path(VALUE); #define FilePathValue(v) ((v) = rb_get_path(v)) void rb_secure(int); -RUBY_EXTERN int ruby_safe_level; -#define rb_safe_level() (ruby_safe_level) +int rb_safe_level(); void rb_set_safe_level(int); +void rb_set_safe_level_force(int); void rb_secure_update(VALUE); +VALUE rb_errinfo(void); +void rb_set_errinfo(VALUE); + SIGNED_VALUE rb_num2long(VALUE); VALUE rb_num2ulong(VALUE); #define NUM2LONG(x) (FIXNUM_P(x)?FIX2LONG(x):rb_num2long((VALUE)x)) @@ -351,6 +353,13 @@ struct RObject { struct st_table *iv_tbl; }; +struct RValues { + struct RBasic basic; + VALUE v1; + VALUE v2; + VALUE v3; +}; + struct RClass { struct RBasic basic; struct st_table *iv_tbl; @@ -370,12 +379,12 @@ struct RString { struct RBasic basic; union { struct { - long len; - char *ptr; - union { - long capa; - VALUE shared; - } aux; + long len; + char *ptr; + union { + long capa; + VALUE shared; + } aux; } heap; char ary[RSTRING_EMBED_LEN_MAX]; } as; @@ -498,6 +507,7 @@ struct RBignum { #define RSTRUCT(obj) (R_CAST(RStruct)(obj)) #define RBIGNUM(obj) (R_CAST(RBignum)(obj)) #define RFILE(obj) (R_CAST(RFile)(obj)) +#define RVALUES(obj) (R_CAST(RValues)(obj)) #define FL_SINGLETON FL_USER0 #define FL_MARK (1<<5) @@ -579,6 +589,7 @@ void rb_define_alias(VALUE,const char*,const char*); void rb_define_attr(VALUE,const char*,int,int); void rb_global_variable(VALUE*); +void rb_register_mark_object(VALUE); void rb_gc_register_address(VALUE*); void rb_gc_unregister_address(VALUE*); @@ -732,7 +743,6 @@ RUBY_EXTERN VALUE rb_eSyntaxError; RUBY_EXTERN VALUE rb_eLoadError; RUBY_EXTERN VALUE rb_stdin, rb_stdout, rb_stderr; -RUBY_EXTERN VALUE ruby_errinfo; static inline VALUE rb_class_of(VALUE obj) @@ -797,14 +807,6 @@ typedef DWORD rb_nativethread_t; # define NATIVETHREAD_EQUAL(t1,t2) ((t1) == (t2)) # define HAVE_NATIVETHREAD #endif -#ifdef HAVE_NATIVETHREAD -int is_ruby_native_thread(void); -#else -#define is_ruby_native_thread() (1) -#endif -#ifdef HAVE_NATIVETHREAD_KILL -void ruby_native_thread_kill(int); -#endif #if defined(__cplusplus) #if 0 @@ -26,12 +26,13 @@ typedef LONG rb_atomic_t; # define TRAP_BEG do {\ int saved_errno = 0;\ rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 1) + # define TRAP_END\ ATOMIC_SET(rb_trap_immediate, trap_immediate);\ saved_errno = errno;\ - CHECK_INTS;\ errno = saved_errno;\ } while (0) + # define RUBY_CRITICAL(statements) do {\ rb_w32_enter_critical();\ statements;\ @@ -49,9 +50,10 @@ typedef int rb_atomic_t; int saved_errno = 0;\ int trap_immediate = rb_trap_immediate;\ rb_trap_immediate = 1 -# define TRAP_END rb_trap_immediate = trap_immediate;\ + +# define TRAP_END \ + rb_trap_immediate = trap_immediate;\ saved_errno = errno;\ - CHECK_INTS;\ errno = saved_errno;\ } while (0) @@ -68,7 +70,6 @@ RUBY_EXTERN int rb_prohibit_interrupt; #define DEFER_INTS (rb_prohibit_interrupt++) #define ALLOW_INTS do {\ rb_prohibit_interrupt--;\ - CHECK_INTS;\ } while (0) #define ENABLE_INTS (rb_prohibit_interrupt--) @@ -79,27 +80,5 @@ void rb_trap_restore_mask(void); RUBY_EXTERN int rb_thread_critical; void rb_thread_schedule(void); -#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE) -RUBY_EXTERN int rb_thread_pending; -# define CHECK_INTS do {\ - if (!(rb_prohibit_interrupt || rb_thread_critical)) {\ - if (rb_thread_pending) rb_thread_schedule();\ - if (rb_trap_pending) rb_trap_exec();\ - }\ -} while (0) -#else -/* pseudo preemptive thread switching */ -RUBY_EXTERN int rb_thread_tick; -#define THREAD_TICK 500 -#define CHECK_INTS do {\ - if (!(rb_prohibit_interrupt || rb_thread_critical)) {\ - if (rb_thread_tick-- <= 0) {\ - rb_thread_tick = THREAD_TICK;\ - rb_thread_schedule();\ - }\ - }\ - if (rb_trap_pending) rb_trap_exec();\ -} while (0) -#endif #endif /* ifndef RUBYSIG_H */ diff --git a/rubytest.rb b/rubytest.rb index e5cc9ba1ab..c1236705c0 100755 --- a/rubytest.rb +++ b/rubytest.rb @@ -42,7 +42,7 @@ srcdir = File.dirname(__FILE__) print "test succeeded\n" exit true end - error << line if line =~ %r:^(sample/test.rb|not): + error << line if %r:^(sample/test.rb|not): =~ line end print error print "test failed\n" diff --git a/runruby.rb b/runruby.rb index 8dbe8f714f..3dbc4b686c 100755 --- a/runruby.rb +++ b/runruby.rb @@ -56,4 +56,7 @@ if File.file?(libruby_so) end end -exec ruby, *ARGV +# ruby = "gdb --args #{ruby}" +cmd = [ruby, *ARGV].join(' ') +p cmd +exec cmd diff --git a/sample/test.rb b/sample/test.rb index aad5a094c3..0968fa5015 100644 --- a/sample/test.rb +++ b/sample/test.rb @@ -1074,8 +1074,8 @@ test_ok(block_get(&lmd).class == Proc) test_ok(Proc.new{|a,| a}.yield(1,2,3) == 1) call_argument_test(true, Proc.new{|a,|}, 1,2) -test_ok(Proc.new{|&b| b.call(10)}.call {|x| x} == 10) -test_ok(Proc.new{|a,&b| b.call(a)}.call(12) {|x| x} == 12) +#! test_ok(Proc.new{|&b| b.call(10)}.call {|x| x} == 10) +#! test_ok(Proc.new{|a,&b| b.call(a)}.call(12) {|x| x} == 12) def test_return1 Proc.new { @@ -1101,7 +1101,8 @@ def proc_return1 end test_ok(proc_return1() == 43) def proc_return2 - ->{return 42}.call+1 + #! ->{return 42}.call+1 + lambda{return 42}.call+1 end test_ok(proc_return2() == 43) def proc_return3 @@ -1761,14 +1762,14 @@ rescue NameError # must raise error end test_ok(!$bad) -x = Proc.new{} +x = binding #! YARV Limitation: Proc.new{} eval "i4 = 1", x test_ok(eval("i4", x) == 1) -x = Proc.new{Proc.new{}}.call +x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call eval "i4 = 22", x test_ok(eval("i4", x) == 22) $x = [] -x = Proc.new{Proc.new{}}.call +x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call eval "(0..9).each{|i5| $x[i5] = Proc.new{i5*2}}", x test_ok($x[4].call == 8) @@ -1797,14 +1798,16 @@ Proc.new { test_ok(eval("foo11") == 1) test_ok(eval("foo22", p) == eval("foo22")) test_ok(eval("foo22") == 55) -}.call +}.call if false #! YARV Limitation -p1 = Proc.new{i7 = 0; Proc.new{i7}}.call -test_ok(p1.call == 0) +#! YARV Limitation: p1 = Proc.new{i7 = 0; Proc.new{i7}}.call +p1 = Proc.new{i7 = 0; binding}.call +#! YARV Limitation: test_ok(p1.call == 0) eval "i7=5", p1 -test_ok(p1.call == 5) +#! YARV Limitation: test_ok(p1.call == 5) test_ok(!defined?(i7)) +if false #! YARV Limitation p1 = Proc.new{i7 = 0; Proc.new{i7}}.call i7 = nil test_ok(p1.call == 0) @@ -1813,6 +1816,7 @@ test_ok(p1.call == 1) eval "i7=5", p1 test_ok(p1.call == 5) test_ok(i7 == nil) +end test_check "system" test_ok(`echo foobar` == "foobar\n") @@ -1860,7 +1864,7 @@ while tmp.gets end tmp.close test_ok(done) - + File.unlink "script_tmp" or `/bin/rm -f "script_tmp"` File.unlink "script_tmp.bak" or `/bin/rm -f "script_tmp.bak"` @@ -2209,7 +2213,7 @@ GC.start test_ok true # reach here or dumps core if $failed > 0 - printf "test: %d failed %d\n", $ntest, $failed + printf "not ok/test: %d failed %d\n", $ntest, $failed else printf "end of test(test: %d)\n", $ntest end @@ -304,6 +304,12 @@ rb_atomic_t rb_trap_pending; rb_atomic_t rb_trap_immediate; int rb_prohibit_interrupt = 1; +VALUE +rb_get_trap_cmd(int sig) +{ + return trap_list[sig].cmd; +} + void rb_gc_mark_trap_list(void) { @@ -380,127 +386,91 @@ ruby_nativethread_signal(int signum, sighandler_t handler) #endif #endif -static void -signal_exec(int sig) +#include <node.h> +#include "yarvcore.h" + +static RETSIGTYPE +sighandler(int sig) { - if (trap_list[sig].cmd == 0) { - switch (sig) { - case SIGINT: - rb_thread_interrupt(); - break; -#ifdef SIGHUP - case SIGHUP: -#endif -#ifdef SIGQUIT - case SIGQUIT: -#endif -#ifdef SIGALRM - case SIGALRM: -#endif -#ifdef SIGUSR1 - case SIGUSR1: -#endif -#ifdef SIGUSR2 - case SIGUSR2: -#endif - rb_thread_signal_raise(signo2signm(sig)); - break; - } - } - else if (trap_list[sig].cmd == Qundef) { - rb_thread_signal_exit(); - } - else { - rb_thread_trap_eval(trap_list[sig].cmd, sig, trap_list[sig].safe); - } + yarv_vm_t *vm = GET_VM(); /* fix me for Multi-VM */ + ATOMIC_INC(vm->signal_buff[sig]); + ATOMIC_INC(vm->bufferd_signal_size); } -#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL) -static void -sigsend_to_ruby_thread(int sig) -{ -#ifdef HAVE_SIGPROCMASK - sigset_t mask, old_mask; -#else - int mask, old_mask; -#endif +# ifdef HAVE_SIGPROCMASK +static sigset_t trap_last_mask; +# else +static int trap_last_mask; +# endif -#ifdef HAVE_SIGPROCMASK - sigfillset(&mask); - sigprocmask(SIG_BLOCK, &mask, &old_mask); -#else - mask = sigblock(~0); - sigsetmask(mask); -#endif - ruby_native_thread_kill(sig); -} +#if HAVE_PTHREAD_H +#include <pthread.h> #endif -static RETSIGTYPE -sighandler(int sig) +void +rb_disable_interrupt(void) { -#ifdef _WIN32 -#define IN_MAIN_CONTEXT(f, a) (rb_w32_main_context(a, f) ? (void)0 : f(a)) -#else -#define IN_MAIN_CONTEXT(f, a) f(a) -#endif - if (sig >= NSIG) { - rb_bug("trap_handler: Bad signal %d", sig); - } - -#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL) - if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) { - sigsend_to_ruby_thread(sig); - return; - } +#ifndef _WIN32 + sigset_t mask; + sigfillset(&mask); + sigdelset(&mask, SIGVTALRM); + sigdelset(&mask, SIGSEGV); + pthread_sigmask(SIG_SETMASK, &mask, NULL); #endif +} -#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL) - if (rb_trap_accept_nativethreads[sig]) { - ruby_nativethread_signal(sig, sighandler); - } else { - ruby_signal(sig, sighandler); - } +void +rb_enable_interrupt(void) +{ +#ifndef _WIN32 + sigset_t mask; + sigemptyset(&mask); + pthread_sigmask(SIG_SETMASK, &mask, NULL); #endif +} - if (trap_list[sig].cmd == 0 && ATOMIC_TEST(rb_trap_immediate)) { - IN_MAIN_CONTEXT(signal_exec, sig); - ATOMIC_SET(rb_trap_immediate, 1); - } - else { - ATOMIC_INC(rb_trap_pending); - ATOMIC_INC(trap_pending_list[sig]); +int +rb_get_next_signal(yarv_vm_t *vm) +{ + int i, sig = 0; + + for (i=1; i<RUBY_NSIG; i++) { + if (vm->signal_buff[i] > 0) { + rb_disable_interrupt(); + { + ATOMIC_DEC(vm->signal_buff[i]); + ATOMIC_DEC(vm->bufferd_signal_size); + } + rb_enable_interrupt(); + sig = i; + break; + } } + return sig; } #ifdef SIGBUS static RETSIGTYPE sigbus(int sig) { -#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL) - if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) { - sigsend_to_ruby_thread(sig); - return; - } -#endif - rb_bug("Bus Error"); } #endif #ifdef SIGSEGV +static int segv_received = 0; static RETSIGTYPE sigsegv(int sig) { -#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL) - if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) { - sigsend_to_ruby_thread(sig); - return; + if (segv_received) { + fprintf(stderr, "SEGV recieved in SEGV handler\n"); + exit(1); + } + else { + segv_received = 1; + rb_bug("Segmentation fault"); } -#endif - - rb_bug("Segmentation fault"); } #endif @@ -526,6 +496,46 @@ rb_trap_exit(void) } void +rb_signal_exec(yarv_thread_t *th, int sig) +{ + VALUE cmd = rb_get_trap_cmd(sig); + + if (cmd == 0) { + switch (sig) { + case SIGINT: + rb_interrupt(); + break; +#ifdef SIGHUP + case SIGHUP: +#endif +#ifdef SIGQUIT + case SIGQUIT: +#endif +#ifdef SIGALRM + case SIGALRM: +#endif +#ifdef SIGUSR1 + case SIGUSR1: +#endif +#ifdef SIGUSR2 + case SIGUSR2: +#endif + rb_thread_signal_raise(th, signo2signm(sig)); + break; + } + } + else if (cmd == Qundef) { + rb_thread_signal_exit(th); + } + else { + yarv_proc_t *proc; + VALUE signum = INT2FIX(sig); + GetProcPtr(cmd, proc); + th_invoke_proc(th, proc, proc->block.self, 1, &signum); + } +} + +void rb_trap_exec(void) { #ifndef MACOS_UNUSE_SIGNAL @@ -534,7 +544,7 @@ rb_trap_exec(void) for (i=0; i<NSIG; i++) { if (trap_pending_list[i]) { trap_pending_list[i] = 0; - signal_exec(i); + rb_signal_exec(GET_THREAD(), i); } } #endif /* MACOS_UNUSE_SIGNAL */ @@ -552,12 +562,6 @@ struct trap_arg { VALUE sig, cmd; }; -# ifdef HAVE_SIGPROCMASK -static sigset_t trap_last_mask; -# else -static int trap_last_mask; -# endif - static VALUE trap(struct trap_arg *arg) { @@ -684,7 +688,7 @@ trap(struct trap_arg *arg) } trap_list[sig].cmd = command; - trap_list[sig].safe = ruby_safe_level; + trap_list[sig].safe = rb_safe_level(); /* enable at least specified signal. */ #ifndef _WIN32 #ifdef HAVE_SIGPROCMASK @@ -819,33 +823,6 @@ install_sighandler(int signum, sighandler_t handler) } } -#if 0 -/* - * If you write a handler which works on any native thread - * (even if the thread is NOT a ruby's one), please enable - * this function and use it to install the handler, instead - * of `install_sighandler()'. - */ -#ifdef HAVE_NATIVETHREAD -static void -install_nativethread_sighandler(int signum, sighandler_t handler) -{ - sighandler_t old; - int old_st; - - old_st = rb_trap_accept_nativethreads[signum]; - old = ruby_nativethread_signal(signum, handler); - if (old != SIG_DFL) { - if (old_st) { - ruby_nativethread_signal(signum, old); - } else { - ruby_signal(signum, old); - } - } -} -#endif -#endif - static void init_sigchld(int sig) { @@ -955,14 +932,10 @@ Init_signal(void) #endif #ifdef SIGBUS -# ifndef RUBY_GC_STRESS install_sighandler(SIGBUS, sigbus); -# endif #endif #ifdef SIGSEGV -# ifndef RUBY_GC_STRESS install_sighandler(SIGSEGV, sigsegv); -# endif #endif #ifdef SIGPIPE install_sighandler(SIGPIPE, sigpipe); @@ -499,7 +499,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) * * @(#) $Revision$ * @(#) $Id$ - * @(#) $Source$ + * @(#) $Source: /src/ruby/st.c,v $ * *** * @@ -71,7 +71,7 @@ VALUE rb_cSymbol; RSTRING(str)->as.heap.len--;\ }\ } while (0) - + #define RESIZE_CAPA(str,capacity) do {\ if (STR_EMBED_P(str)) {\ if ((capacity) > RSTRING_EMBED_LEN_MAX) {\ @@ -201,7 +201,7 @@ str_new3(VALUE klass, VALUE str) RSTRING(str2)->as.heap.len = RSTRING_LEN(str); RSTRING(str2)->as.heap.ptr = RSTRING_PTR(str); RSTRING(str2)->as.heap.aux.shared = str; - FL_SET(str2, ELTS_SHARED); + FL_SET(str2, ELTS_SHARED); } return str2; @@ -719,7 +719,7 @@ rb_str_resize(VALUE str, long len) MEMCPY(ptr, RSTRING_PTR(str), char, RSTRING_LEN(str)); RSTRING(str)->as.heap.ptr = ptr; STR_SET_NOEMBED(str); - } + } else if (RSTRING_LEN(str) < len || RSTRING_LEN(str) - len > 1024) { REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1); } @@ -1490,7 +1490,7 @@ succ_char(char *s) * "***".succ #=> "**+" */ -static VALUE +VALUE rb_str_succ(VALUE orig) { VALUE str; @@ -1822,7 +1822,7 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val) goto out_of_range; idx += RSTRING_LEN(str); } - rb_str_splice(str, idx, 1, val); + rb_str_splice(str, idx, 1, val); return val; case T_REGEXP: @@ -2321,9 +2321,9 @@ rb_str_replace(VALUE str, VALUE str2) STR_SET_NOEMBED(str); RSTRING(str)->as.heap.ptr = ALLOC_N(char,len+1); memcpy(RSTRING_PTR(str), RSTRING_PTR(str2), len+1); - FL_SET(str, STR_ASSOC); + FL_SET(str, STR_ASSOC); RSTRING(str)->as.heap.aux.shared = RSTRING(str2)->as.heap.aux.shared; - } + } else { rb_str_modify(str); rb_str_resize(str, len); @@ -4802,7 +4802,10 @@ sym_call(VALUE args, VALUE sym) static VALUE sym_to_proc(VALUE sym) { - return rb_proc_new(sym_call, (VALUE)SYM2ID(sym)); + rb_notimplement(); + return Qnil; + // TODO + // return rb_proc_new(sym_call, (VALUE)SYM2ID(sym)); } diff --git a/template/insns.inc.tmpl b/template/insns.inc.tmpl new file mode 100644 index 0000000000..b5c17b3635 --- /dev/null +++ b/template/insns.inc.tmpl @@ -0,0 +1,21 @@ +/** -*-c-*-
+ This file contains YARV instructions list.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'template/insns.inc.tmpl'
+ or insns2vm.rb
+ */
+
+
+/* BIN : Basic Instruction Name */
+#define BIN(n) YARVINSN_##n
+
+enum{
+<%= insns %>
+};
+
+#define YARV_MAX_INSTRUCTION_SIZE <%= @insns.size %>
+
diff --git a/template/insns_info.inc.tmpl b/template/insns_info.inc.tmpl new file mode 100644 index 0000000000..8f63cea9ea --- /dev/null +++ b/template/insns_info.inc.tmpl @@ -0,0 +1,77 @@ +/** -*-c-*-
+ This file contains instruction information for yarv instruction sequence.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'template/insns_info.inc.tmpl'
+ or insns2vm.rb
+ */
+
+<%= insn_type_chars %>
+
+static char *insn_name_info[] = {
+<%= insn_names %>
+};
+
+static char *insn_operand_info[] = {
+<%= operands_info %>
+};
+
+static int insn_len_info[] = {
+<%= operands_num_info %>
+};
+
+static int insn_stack_push_num_info[] = {
+<%= stack_num_info %>
+};
+
+static int
+insn_stack_increase(int depth, int insn, VALUE *opes)
+{
+ switch(insn){
+<%= stack_increase %>
+ default:
+ rb_bug("insn_sp_increase: unreachable");
+ }
+ return 0;
+}
+
+/* some utilities */
+
+static int
+insn_len(int insn)
+{
+ return insn_len_info[insn];
+}
+
+static char *
+insn_name(int insn)
+{
+ return insn_name_info[insn];
+}
+
+static char *
+insn_op_types(int insn)
+{
+ return insn_operand_info[insn];
+}
+
+static int
+insn_op_type(int insn, int pos)
+{
+ int len = insn_len(insn) - 1;
+ if(pos < len){
+ return insn_operand_info[insn][pos];
+ }
+ else{
+ return 0;
+ }
+}
+
+static int
+insn_ret_num(int insn)
+{
+ return insn_stack_push_num_info[insn];
+}
diff --git a/template/insnstbl.html b/template/insnstbl.html new file mode 100644 index 0000000000..f63bc3218d --- /dev/null +++ b/template/insnstbl.html @@ -0,0 +1,39 @@ +
+<?xml version='1.0' encoding='SHIFT_JIS'?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><!--
+ $Id: insnstbl.html,v 1.1 2004/02/05 04:09:25 ko1 Exp $
+ diary index
+ --><html xml:lang='ja' xmlns='http://www.w3.org/1999/xhtml'>
+ <head>
+ <meta content='text/html;charset=Shift_JIS' http-equiv='Content-Type'/>
+ <meta content='text/css' http-equiv='Content-Style-Type'/>
+ <meta content='text/javascript' http-equiv='Content-Script-Type'/>
+
+ <link href='./contents.css' rel='stylesheet' type='text/css'/>
+
+ <title>YARV: Yet another RubyVM / Instruction Table</title>
+
+ <link href='mailto:ko1 at atdot.net' rev='made'/>
+ <link href='../index.html' rel='index'/>
+</head>
+ <body>
+ <h1>YARV: Instruction Table</h1>
+<table border='1' cellspacing='1' align='center'>
+ <tr>
+ <th>type</th>
+ <th>Index</th>
+ <th>Instruction</th>
+ <th>Operands</th>
+ <th colspan='3'>Stacks</th>
+ </tr>
+ <%= tbl %>
+</table>
+
+<address>
+ SASADA Koichi / ko1 at atdot.net
+</address>
+</div>
+ </body>
+</html>
+
+
+
diff --git a/template/minsns.inc.tmpl b/template/minsns.inc.tmpl new file mode 100644 index 0000000000..ed9247a126 --- /dev/null +++ b/template/minsns.inc.tmpl @@ -0,0 +1,14 @@ +/** -*-c-*-
+ This file contains YARV instructions list, to define YARVCore::Instructions.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'template/minsns.inc.tmpl'
+ or insns2vm.rb
+ */
+
+<%= defs %>
+
+
diff --git a/template/opt_sc.inc.tmpl b/template/opt_sc.inc.tmpl new file mode 100644 index 0000000000..69a5b36750 --- /dev/null +++ b/template/opt_sc.inc.tmpl @@ -0,0 +1,32 @@ +/* -*-c-*- *********************************************************/
+/*******************************************************************/
+/*******************************************************************/
+/**
+ This file is for threaded code.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'template/opt_sc.inc.tmpl'
+ or rb/insns2vm.rb
+ */
+
+#define SC_STATE_SIZE 6
+
+#define SCS_XX 1
+#define SCS_AX 2
+#define SCS_BX 3
+#define SCS_AB 4
+#define SCS_BA 5
+
+#define SC_ERROR 0xffffffff
+
+static VALUE sc_insn_info[][SC_STATE_SIZE] = {
+<%= sc_insn_info %>
+};
+
+static VALUE sc_insn_next[] = {
+<%= sc_insn_next %>
+};
+
diff --git a/template/optinsn.inc.tmpl b/template/optinsn.inc.tmpl new file mode 100644 index 0000000000..c268a97cef --- /dev/null +++ b/template/optinsn.inc.tmpl @@ -0,0 +1,30 @@ +/* -*-c-*- *********************************************************/
+/*******************************************************************/
+/*******************************************************************/
+/**
+ This file is for threaded code.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'template/optinsn.inc.tmpl'
+ or rb/insns2vm.rb
+ */
+
+static INSN *
+insn_operands_unification(INSN *insnobj){
+#ifdef OPT_OPERANDS_UNIFICATION
+ /* optimize rule */
+ switch(insnobj->insn_id){
+
+<%= rule %>
+
+ default:
+ /* do nothing */;
+ break;
+ }
+#endif
+ return insnobj;
+}
+
diff --git a/template/optunifs.inc.tmpl b/template/optunifs.inc.tmpl new file mode 100644 index 0000000000..d2b0e7699e --- /dev/null +++ b/template/optunifs.inc.tmpl @@ -0,0 +1,35 @@ +/* -*-c-*- *********************************************************/
+/*******************************************************************/
+/*******************************************************************/
+/**
+ This file is for threaded code.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'template/optunifs.inc.tmpl'
+ or rb/insns2vm.rb
+ */
+
+/*
+ static int UNIFIED_insn_name_1[] = {id, size, ...};
+ static int UNIFIED_insn_name_2[] = {id, size, ...};
+ ...
+
+ static *int UNIFIED_insn_name[] = {size,
+ UNIFIED_insn_name_1,
+ UNIFIED_insn_name_2, ...};
+ ...
+
+ static **int unified_insns_data[] = {
+ UNIFIED_insn_nameA,
+ UNIFIED_insn_nameB, ...};
+ */
+
+<%= unif_insns_each %>
+<%= unif_insns %>
+<%= unif_insns_data %>
+
+#undef GET_INSN_NAME
+
diff --git a/template/vm.inc.tmpl b/template/vm.inc.tmpl new file mode 100644 index 0000000000..a641501697 --- /dev/null +++ b/template/vm.inc.tmpl @@ -0,0 +1,28 @@ +/* -*-c-*- *********************************************************/
+/*******************************************************************/
+/*******************************************************************/
+/**
+ This file is VM main loop.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'insns.c'
+ */
+
+<%=
+ret = ''
+offset = 15
+line_no = 0
+vm_body.each_line{|line|
+ if line =~ /^\#line __CURRENT_LINE__/
+ ret << line.sub(/__CURRENT_LINE__/, "#{line_no+offset}")
+ else
+ ret <<line
+ end
+ line_no += 1
+}
+ret
+%>
+
diff --git a/template/vmtc.inc.tmpl b/template/vmtc.inc.tmpl new file mode 100644 index 0000000000..e8f3c3cc11 --- /dev/null +++ b/template/vmtc.inc.tmpl @@ -0,0 +1,18 @@ +/* -*-c-*- *********************************************************/
+/*******************************************************************/
+/*******************************************************************/
+/**
+ This file is for threaded code.
+
+ ----
+ This file is auto generated by insns2vm.rb
+ DO NOT TOUCH!
+
+ If you want to fix something, you must edit 'template/vmtc.inc.tmpl'
+ or insns2vm.rb
+ */
+
+static const void *insns_address_table[] = {
+<%= insns_table %>
+};
+
diff --git a/template/yarvarch.en b/template/yarvarch.en new file mode 100644 index 0000000000..55fd3e1ae8 --- /dev/null +++ b/template/yarvarch.en @@ -0,0 +1,7 @@ +#title YARV: Yet another RubyVM - Software Architecture
+
+maybe writing.
+
+* YARV instruction set
+
+<%= d %>
diff --git a/template/yarvarch.ja b/template/yarvarch.ja new file mode 100644 index 0000000000..05b19363aa --- /dev/null +++ b/template/yarvarch.ja @@ -0,0 +1,454 @@ +#title YARVƒA[ƒLƒeƒNƒ`ƒƒ
+#set author “ú–{ Ruby ‚Ì‰ï ‚³‚³‚¾‚±‚¤‚¢‚¿
+
+
+- 2005-03-03(Thu) 00:31:12 +0900 ‚¢‚ë‚¢‚ë‚Æ‘‚«’¼‚µ
+
+----
+
+* ‚±‚ê‚ÍH
+
+[[YARV: Yet Another RubyVM|http://www.atdot.net/yarv]] ‚Ì ÝŒvƒƒ‚‚Å‚·B
+
+
+YARV ‚ÍARuby ƒvƒƒOƒ‰ƒ€‚Ì‚½‚ß‚ÌŽŸ‚Ì‹@”\‚ð’ñ‹Ÿ‚µ‚Ü‚·B
+
+- Compiler
+- VM Generator
+- VM (Virtual Machine)
+- Assembler
+- Dis-Assembler
+- (experimental) JIT Compiler
+- (experimental) AOT Compiler
+
+
+Œ»Ý‚Ì YARV ‚Í Ruby ƒCƒ“ƒ^ƒvƒŠƒ^‚ÌŠg’£ƒ‰ƒCƒuƒ‰ƒŠ‚Æ‚µ‚ÄŽÀ‘•‚µ‚Ä‚¢‚Ü‚·B‚±
+‚ê‚É‚æ‚èARuby ƒCƒ“ƒ^ƒvƒŠƒ^‚Ì•K—v‚È‹@”\iƒp[ƒTAƒIƒuƒWƒFƒNƒgŠÇ—AŠù‘¶
+‚ÌŠg’£ƒ‰ƒCƒuƒ‰ƒŠj‚È‚Ç‚ª‚Ù‚Ú‚»‚Ì‚Ü‚Ü—˜—p‚Å‚«‚Ü‚·B
+
+‚½‚¾‚µA‚¢‚‚‚©‚̃pƒbƒ`‚ð Ruby ƒCƒ“ƒ^ƒvƒŠƒ^‚É“–‚Ä‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB
+
+¡Œã‚ÍARuby –{‘̂̃Cƒ“ƒ^ƒvƒŠƒ^•”•ªieval.cj‚ð’u‚«Š·‚¦‚邱‚Æ‚ð–ÚŽw‚µ‚Ä
+ŠJ”‚ðŒp‘±‚·‚é—\’è‚Å‚·B
+
+
+* Compiler (compile.h, compile.c)
+
+ƒRƒ“ƒpƒCƒ‰‚ÍARuby ƒCƒ“ƒ^ƒvƒŠƒ^‚̃p[ƒT‚É‚æ‚Á‚Ķ¬‚³‚ꂽ\•¶–ØiRNode
+ƒf[ƒ^‚É‚æ‚é–Øj‚ð YARV –½—ß—ñ‚É•ÏŠ·‚µ‚Ü‚·BYARV –½—߂ɂ‚¢‚Ä‚ÍŒãq‚µ‚Ü
+‚·B
+
+‚Æ‚‚ɓ‚¢‚±‚Æ‚Í‚µ‚Ä‚¢‚Ü‚¹‚ñ‚ªAƒXƒR[ƒv‚È‚Ç‚ÌŠJŽnŽž‚Ƀ[ƒJƒ‹•Ï”‚̉
+Šú‰»‚È‚Ç‚ðs‚¢A‚ ‚Æ‚Í\•¶–Ø‚ð’H‚è•ÏŠ·‚µ‚Ä‚¢‚«‚Ü‚·B
+
+•ÏŠ·’†‚Í Ruby ‚Ì Array ƒIƒuƒWƒFƒNƒg‚É YARV –½—߃IƒuƒWƒFƒNƒgA‚¨‚æ‚уIƒy
+ƒ‰ƒ“ƒh‚ðŠi”[‚µ‚Ä‚¢‚«AÅŒã‚ÉŽÀs‚Å‚«‚éŒ`‚É•ÏŠ·‚µ‚Ü‚·BƒRƒ“ƒpƒCƒ‰‚Å‚ÍAƒR
+ƒ“ƒpƒCƒ‹’†‚ɶ¬‚·‚郃‚ƒŠ—̈æ‚ÌŠÇ—‚ª–â‘è‚ɂȂ邱‚Æ‚ª‚ ‚è‚Ü‚·‚ªAYARV
+‚Ìê‡ARuby ƒCƒ“ƒ^ƒvƒŠƒ^‚ª‚·‚ׂĖʓ|‚ð‚Ý‚Ä‚‚ê‚é‚Ì‚Å‚±‚Ì•”•ª‚Í”ñí‚ÉŠy
+‚Éì‚邱‚Æ‚ª‚Å‚«‚Ü‚µ‚½iƒK[ƒx[ƒWƒRƒŒƒNƒ^‚É‚æ‚Á‚ÄŽ©“®“I‚Ƀƒ‚ƒŠŠÇ—‚ð‚µ
+‚Ä‚‚ê‚邽‚ßjB
+
+YARV –½—ß‚ÍA–½—ß‚ðŽ¦‚·Ž¯•ÊŽqAƒIƒyƒ‰ƒ“ƒh‚È‚ÇA‚·‚×‚Ä 1 word iƒ}ƒVƒ“‚Å
+•\Œ»‚Å‚«‚鎩‘R‚È’lBC Œ¾Œê‚ł̓|ƒCƒ“ƒ^‚̃TƒCƒYBRuby ƒCƒ“ƒ^ƒvƒŠƒ^—pŒê‚Å
+‚Í VALUE ‚̃TƒCƒYj‚Å•\Œ»‚³‚ê‚Ü‚·B‚»‚Ì‚½‚ßAYARV –½—ß‚Í‚¢‚í‚ä‚éuƒoƒCƒg
+ƒR[ƒhv‚Å‚Í‚ ‚è‚Ü‚¹‚ñB‚»‚Ì‚½‚ßAYARV ‚Ìà–¾‚È‚Ç‚Å‚Íu–½—ß—ñv‚Æ‚¢‚¤—p
+Œê‚ðŽg‚Á‚Ä‚¢‚Ü‚·B
+
+1 word ‚Å‚ ‚邽‚ßAƒƒ‚ƒŠ‚Ì—˜—pŒø—¦‚Í‘½ˆ«‚‚È‚è‚Ü‚·‚ªAƒAƒNƒZƒX‘¬“x‚È
+‚Ç‚ðl—¶‚·‚é‚ÆA–{•ûŽ®‚ªˆê”Ô‚¢‚¢‚Æl‚¦‚Ä‚¨‚è‚Ü‚·B‚½‚Æ‚¦‚΃Iƒyƒ‰ƒ“ƒh‚ðƒR
+ƒ“ƒXƒ^ƒ“ƒgƒv[ƒ‹‚ÉŠi”[‚µAƒCƒ“ƒfƒbƒNƒX‚Ì‚Ý‚ðƒIƒyƒ‰ƒ“ƒh‚ÅŽ¦‚·‚±‚Æ‚à‰Â”\‚Å
+‚·‚ªAŠÔÚƒAƒNƒZƒX‚É‚È‚Á‚Ä‚µ‚Ü‚¤‚Ì‚Å«”\‚ɉe‹¿‚ªo‚邽‚ßA‹p‰º‚µ‚Ü‚µ‚½B
+
+
+* VM Generator (rb/insns2vm.rb, insns.def)
+
+rb/insns2vm.rb ‚Æ‚¢‚¤ƒXƒNƒŠƒvƒg‚ÍAinsns.def ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ð“Ç‚Ýž‚ÝA
+VM ‚Ì‚½‚ß‚É•K—v‚ȃtƒ@ƒCƒ‹‚𶬂µ‚Ü‚·B‹ï‘Ì“I‚É‚ÍA–½—ß‚ðŽÀs‚·‚é•”•ª‚ð
+¶¬‚µ‚Ü‚·‚ªA‚Ù‚©‚É‚àƒRƒ“ƒpƒCƒ‹‚É•K—v‚Èî•ñAÅ“K‰»‚É•K—v‚Èî•ñA‚âƒAƒZ
+ƒ“ƒuƒ‰A‹tƒAƒZƒ“ƒuƒ‰‚É•K—v‚Èî•ñ‚ðŽ¦‚·ƒtƒ@ƒCƒ‹‚ඬ‚µ‚Ü‚·B
+
+
+** –½—ß‹Lq
+
+insns.def ‚É‚ÍAŠe–½—ß‚ª‚ǂ̂悤‚È–½—ß‚Å‚ ‚é‚©‚ð‹Lq‚µ‚Ü‚·B‹ï‘Ì“I‚É‚ÍŽŸ
+‚Ìî•ñ‚ð‹Lq‚µ‚Ü‚·B
+
+- –½—ß‚Ì–¼‘O
+- ‚»‚Ì–½—߂̃JƒeƒSƒŠAƒRƒƒ“ƒgi‰pŒêA“ú–{Œêj
+- ƒIƒyƒ‰ƒ“ƒh‚Ì–¼‘O
+- ‚»‚Ì–½—ߎÀs‘O‚ɃXƒ^ƒbƒN‚©‚çƒ|ƒbƒv‚·‚é’l
+- ‚»‚Ì–½—ߎÀsŒã‚ɃXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚é’l
+- ‚»‚Ì–½—߂̃ƒWƒbƒNiC Œ¾Œê‚Å‹Lqj
+
+‚½‚Æ‚¦‚ÎAƒXƒ^ƒbƒN‚É self ‚ð‚¨‚ putself ‚Æ‚¢‚¤–½—ß‚ÍŽŸ‚̂悤‚É‹Lq‚µ‚Ü
+‚·B
+
+#code
+/**
+ @c put
+ @e put self.
+ @j self ‚ð’u‚B
+ */
+DEFINE_INSN
+putself
+()
+()
+(VALUE val)
+{
+ val = GET_SELF();
+}
+#end
+
+‚±‚Ìê‡AƒIƒyƒ‰ƒ“ƒh‚ÆAƒXƒ^ƒbƒN‚©‚çƒ|ƒbƒv‚·‚é’l‚Í–³‚¢‚±‚Æ‚É‚È‚è‚Ü‚·B–½
+—ßI—¹ŒãAself ‚ðƒXƒ^ƒbƒNƒgƒbƒv‚É’u‚«‚½‚¢‚킯‚Å‚·‚ªA‚»‚ê‚Í val ‚Æ‚¢‚¤A
+ƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚é’l‚Æ‚µ‚Ä錾‚µ‚Ä‚¨‚¢‚½•Ï”‚É‘ã“ü‚µ‚Ä‚¨‚‚±‚Æ‚ÅA‚±
+‚ê‚ð•ÏŠ·‚·‚é‚ƃXƒ^ƒbƒNƒgƒbƒv‚É’u‚ C ƒvƒƒOƒ‰ƒ€‚ª¶¬‚³‚ê‚Ü‚·B
+
+ׂ©‚¢ƒtƒH[ƒ}ƒbƒg‚Í insns.def ‚Ì–`“ª‚ðŽQÆ‚µ‚Ä‚‚¾‚³‚¢B‚»‚ñ‚Ȃɓ‚
+‚È‚¢‚ÆŽv‚¢‚Ü‚·B
+
+insnhelper.h ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ÉA–½—߃ƒWƒbƒN‚ð‹Lq‚·‚邽‚ß‚É•K—v‚ȃ}ƒNƒ
+‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚·B‚Ü‚½AVM ‚Ì“à•”\‘¢‚ÉŠÖ‚·‚é’è‹`‚Í vm.h ‚Æ‚¢‚¤ƒtƒ@ƒC
+ƒ‹‚É‚ ‚è‚Ü‚·B
+
+
+* VM (Virtual Machine, vm.h, vm.c)
+
+VM ‚ÍAŽÀۂɃRƒ“ƒpƒCƒ‹‚µ‚½Œ‹‰Ê¶¬‚³‚ê‚é YARV –½—ß—ñ‚ðŽÀs‚µ‚Ü‚·B‚Ü‚³
+‚ÉA‚±‚Ì•”•ª‚ª YARV ‚̃Lƒ‚‚É‚È‚èA«—ˆ“I‚É‚Í eval.c ‚ð‚±‚Ì VM ‚Å’u‚«Š·‚¦
+‚½‚¢‚Æl‚¦‚Ä‚¢‚Ü‚·B
+
+Œ»Ý‚Ì Ruby ƒCƒ“ƒ^ƒvƒŠƒ^‚ÅŽÀs‚Å‚«‚é‚·‚ׂĂ̂±‚Æ‚ªA‚±‚Ì VM ‚ÅŽÀŒ»‚Å‚«‚é
+‚悤‚Éì‚Á‚Ä‚¢‚Ü‚·iŒ»’iŠK‚Å‚Í‚Ü‚¾Š®‘S‚Å‚Í‚ ‚è‚Ü‚¹‚ñ‚ªA‚»‚¤‚È‚é‚ׂ«‚Å‚·jB
+
+VM ‚ÍA’Pƒ‚ȃXƒ^ƒbƒNƒ}ƒVƒ“‚Æ‚µ‚ÄŽÀ‘•‚µ‚Ä‚¢‚Ü‚·BƒXƒŒƒbƒh‚ЂƂ‚ɃXƒ^ƒb
+ƒN‚ЂƂ‚ð•ÛŽ‚µ‚Ü‚·BƒXƒ^ƒbƒN‚̗̈æ‚̓q[ƒv‚©‚çŽæ“¾‚·‚é‚Ì‚ÅA_“î‚ȗ̈æ
+ݒ肪‰Â”\‚Å‚·B
+
+
+** ƒŒƒWƒXƒ^
+
+VM ‚Í 5 ‚‚̉¼‘z“I‚ȃŒƒWƒXƒ^‚É‚æ‚Á‚ħŒä‚³‚ê‚Ü‚·B
+
+- PC (Program Counter)
+- SP (Stack Pointer)
+- CFP (Control Frame Pointer)
+- LFP (Local Frame Pointer)
+- DFP (Dynamic Frame Pointer)
+
+PC ‚ÍŒ»ÝŽÀs’†‚Ì–½—ß—ñ‚̈ʒu‚ðŽ¦‚µ‚Ü‚·BSP ‚̓Xƒ^ƒbƒNƒgƒbƒv‚̈ʒu‚ðŽ¦‚µ
+‚Ü‚·BCFPALFPADFP ‚Í‚»‚ꂼ‚êƒtƒŒ[ƒ€‚Ìî•ñ‚ðŽ¦‚µ‚Ü‚·BÚׂ͌ãq‚µ‚Ü‚·B
+
+
+** ƒXƒ^ƒbƒNƒtƒŒ[ƒ€
+
+obsolete (update soon)
+
+
+** ƒtƒŒ[ƒ€ƒfƒUƒCƒ“‚ɂ‚¢‚Ä‚Ì•â‘«
+
+Lisp ‚̈—Œn‚È‚Ç‚ð‚©‚ñ‚ª‚¦‚é‚ÆA‚í‚´‚í‚´ƒuƒƒbƒNƒ[ƒJƒ‹ƒtƒŒ[ƒ€‚ƃƒ\
+ƒbƒhƒ[ƒJƒ‹ƒtƒŒ[ƒ€‚̂悤‚È‚à‚Ì‚ð—pˆÓ‚·‚é‚Ì‚ÍŠïˆÙ‚ÉŒ©‚¦‚é‚©‚à‚µ‚ê‚Ü‚¹‚ñB
+‚ ‚éƒtƒŒ[ƒ€‚ðA“ü‚êŽq\‘¢‚É‚µ‚ÄAƒ[ƒJƒ‹•Ï”‚̃AƒNƒZƒX‚Í‚»‚Ì“ü‚êŽq‚ðŠO
+‘¤‚É’H‚ê‚ΕK‚¸‚½‚Ç‚è’…‚‚±‚Æ‚ª‚Å‚«‚é‚©‚ç‚Å‚·i‚‚܂èAlfp ‚Í•K—v‚È‚¢jB
+
+‚µ‚©‚µARuby ‚Å‚Í‚¢‚‚‚©ó‹µ‚ªˆá‚¢‚Ü‚·B‚Ü‚¸Aƒƒ\ƒbƒhƒ[ƒJƒ‹‚Èî•ñ‚ª
+‚ ‚邱‚ÆA‹ï‘Ì“I‚ɂ̓uƒƒbƒN‚Æselficallee ‚©‚ç‚Ý‚é‚Æ recieverj‚Å‚·B‚±
+‚Ìî•ñ‚ð‚»‚ê‚¼‚ê‚̃tƒŒ[ƒ€‚É‚à‚½‚¹‚é‚Ì‚Í–³‘Ê‚Å‚·B
+
+‚Ü‚½ARuby2.0 ‚©‚ç‚̓uƒƒbƒNƒ[ƒJƒ‹•Ï”‚Í‚È‚‚È‚è‚Ü‚·iƒuƒƒbƒNƒ[ƒJƒ‹
+ˆø”‚ÍŽc‚é‚Ì‚ÅA\‘¢Ž©‘Ì‚Í‚ ‚Ü‚è•Ï‚í‚è‚Ü‚¹‚ñjB‚»‚Ì‚½‚ßAƒƒ\ƒbƒhƒ[ƒJ
+ƒ‹•Ï”‚ւ̃AƒNƒZƒX‚ª•p”‚·‚邱‚Æ‚ª—\‘z‚³‚ê‚Ü‚·B
+
+‚±‚Ì‚Æ‚«Aƒƒ\ƒbƒhƒ[ƒJƒ‹•Ï”‚ւ̃AƒNƒZƒX‚Ì‚½‚тɃtƒŒ[ƒ€iƒXƒR[ƒvj‚Ì
+ƒŠƒXƒg‚ð‚½‚Ç‚é‚Ì‚Í–³‘Ê‚Å‚ ‚é‚Æ”»’f‚µA–¾Ž¦“I‚Ƀƒ\ƒbƒhƒ[ƒJƒ‹ƒXƒR[ƒv‚Æ
+ƒuƒƒbƒNƒtƒŒ[ƒ€‚𕪗£‚µAƒuƒƒbƒNƒtƒŒ[ƒ€‚©‚ç‚̓ƒ\ƒbƒhƒ[ƒJƒ‹ƒtƒŒ[ƒ€
+‚ª lfpƒŒƒWƒXƒ^‚É‚æ‚Á‚Ä—eˆÕ‚ɃAƒNƒZƒX‚Å‚«‚é‚悤‚É‚µ‚Ü‚µ‚½B
+
+
+** ƒƒ\ƒbƒhŒÄ‚Ño‚µ‚ɂ‚¢‚Ä
+
+ƒƒ\ƒbƒhŒÄ‚Ño‚µ‚ÍAYARV –½—ß—ñ‚Å‹Lq‚³‚ꂽƒƒ\ƒbƒh‚©AC ‚Å‹Lq‚³‚ꂽƒ
+ƒ\ƒbƒh‚©‚É‚æ‚Á‚ăfƒBƒXƒpƒbƒ`Žè–@‚ª•Ï‚í‚è‚Ü‚·B
+
+YARV –½—ß—ñ‚Å‚ ‚Á‚½ê‡Aãq‚µ‚½ƒXƒ^ƒbƒNƒtƒŒ[ƒ€‚ð쬂µ‚Ä–½—ß‚ðŒp‘±‚µ
+‚Ü‚·B‚Æ‚‚É VM ‚ÌŠÖ”‚ðÄ‹AŒÄ‚Ño‚·‚·‚邱‚Æ‚Ís‚È‚¢‚Ü‚¹‚ñB
+
+C ‚Å‹Lq‚³‚ꂽƒƒ\ƒbƒh‚¾‚Á‚½ê‡A’Pƒ‚É‚»‚ÌŠÖ”‚ðŒÄ‚Ño‚µ‚Ü‚·i‚½‚¾‚µA
+ƒoƒbƒNƒgƒŒ[ƒX‚𳂵‚¶¬‚·‚邽‚߂Ƀƒ\ƒbƒhŒÄ‚Ño‚µ‚Ìî•ñ‚ð•t‰Á‚µ‚Ä‚©‚ç
+s‚È‚¢‚Ü‚·jB
+
+‚±‚Ì‚½‚ßAVM —pƒXƒ^ƒbƒN‚ð•Ê“r—pˆÓ‚µ‚½‚à‚Ì‚ÌAƒvƒƒOƒ‰ƒ€‚É‚æ‚Á‚Ă̓}ƒVƒ“
+ƒXƒ^ƒbƒN‚ðŽg‚¢Ø‚Á‚Ä‚µ‚Ü‚¤‰Â”\«‚ª‚ ‚è‚Ü‚·iC -> Ruby -> C -> ... ‚Æ‚¢‚¤
+ŒÄ‚Ño‚µ‚ª‘±‚¢‚½ê‡jB‚±‚ê‚ÍAŒ»Ý‚Å‚Í”ð‚¯‚ç‚ê‚È‚¢Žd—l‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B
+
+
+** —áŠO
+
+—áŠO‚ÍAJava ‚Ì JVM ‚Æ“¯—l‚É—áŠOƒe[ƒuƒ‹‚ð—pˆÓ‚·‚邱‚Æ‚ÅŽÀŒ»‚µ‚Ü‚·B—áŠO
+‚ª”¶‚µ‚½‚çA“–ŠYƒtƒŒ[ƒ€‚ðA—áŠOƒe[ƒuƒ‹‚ðŒŸ¸‚µ‚Ü‚·B‚»‚±‚ÅA—áŠO‚ª”
+¶‚µ‚½‚Æ‚«‚Ì PC ‚Ì’l‚ɇ’v‚·‚éƒGƒ“ƒgƒŠ‚ª‚ ‚Á‚½ê‡A‚»‚̃Gƒ“ƒgƒŠ‚É]‚Á‚Ä
+“®ì‚µ‚Ü‚·B‚à‚µƒGƒ“ƒgƒŠ‚ªŒ©‚‚©‚ç‚È‚©‚Á‚½ê‡AƒXƒ^ƒbƒN‚ðŽT‚«–ß‚µ‚Ä‚Ü‚½
+“¯—l‚É‚»‚̃XƒR[ƒv‚Ì—áŠOƒe[ƒuƒ‹‚ðŒŸ¸‚µ‚Ü‚·B
+
+‚Ü‚½AbreakAreturniƒuƒƒbƒN’†jAretry ‚È‚Ç‚à“¯—l‚ÌŽd‘g‚Ý‚ÅŽÀŒ»‚µ‚Ü‚·B
+
+*** —áŠOƒe[ƒuƒ‹
+
+—áŠOƒe[ƒuƒ‹ƒGƒ“ƒgƒŠ‚Í‹ï‘Ì“I‚É‚ÍŽŸ‚Ìî•ñ‚ªŠi”[‚³‚ê‚Ä‚¢‚Ü‚·B
+
+- ‘ÎÛ‚Æ‚·‚é PC ‚͈̔Í
+- ‘ÎÛ‚Æ‚·‚é—áŠO‚ÌŽí—Þ
+- ‚à‚µ‘ÎÛ‚Æ‚È‚Á‚½‚Æ‚«‚ɃWƒƒƒ“ƒv‚·‚éæiŽí—Þ‚É‚æ‚éj
+- ‚à‚µ‘ÎÛ‚Æ‚È‚Á‚½‚Æ‚«‚É‹N“®‚·‚éƒuƒƒbƒN‚Ì iseq
+
+
+*** rescue
+
+rescue ߂̓uƒƒbƒN‚Æ‚µ‚ÄŽÀŒ»‚µ‚Ä‚¢‚Ü‚·B$! ‚Ì’l‚ð—Bˆê‚̈ø”‚Æ‚µ‚ÄŽ‚¿‚Ü
+‚·B
+
+#code
+begin
+rescue A
+rescue B
+rescue C
+end
+#end
+
+‚ÍAŽŸ‚̂悤‚È Ruby ƒXƒNƒŠƒvƒg‚É•ÏŠ·‚³‚ê‚Ü‚·B
+
+#code
+{|err|
+ case err
+ when A === err
+ when B === err
+ when C === err
+ else
+ raise # yarv ‚Ì–½—ß‚Å‚Í throw
+ end
+}
+#end
+
+
+*** ensure
+
+³íŒni—áŠO‚ª”¶‚µ‚È‚©‚Á‚½ê‡j‚ƈÙíŒni—áŠO‚ª”¶‚µ‚½‚Æ‚«‚È‚Çj‚Ì2
+Ží—Þ‚Ì–½—ß—ñ‚ª¶¬‚³‚ê‚Ü‚·B³íŒn‚Å‚ÍA‚½‚¾‚̘A‘±‚µ‚½ƒR[ƒh—̈æ‚Æ‚µ‚ăR
+ƒ“ƒpƒCƒ‹‚³‚ê‚Ü‚·B‚Ü‚½AˆÙíŒn‚ł̓uƒƒbƒN‚Æ‚µ‚ÄŽÀ‘•‚µ‚Ü‚·BÅŒã‚Í•K‚¸
+throw –½—ß‚Å’÷‚߂邱‚Æ‚É‚È‚è‚Ü‚·B
+
+
+*** break, returniƒuƒƒbƒN’†jAretry
+
+break •¶AƒuƒƒbƒN’†‚Ì return •¶Aretry •¶‚Í throw –½—ß‚Æ‚µ‚ăRƒ“ƒpƒCƒ‹
+‚³‚ê‚Ü‚·B‚Ç‚±‚Ü‚Å–ß‚é‚©‚ÍAbreak ‚ðƒtƒbƒN‚·‚é—áŠOƒe[ƒuƒ‹‚̃Gƒ“ƒgƒŠ‚ª”»
+’f‚µ‚Ü‚·B
+
+
+** ’蔂̌Ÿõ
+
+’蔂Ƃ¢‚¤–¼‘O‚È‚Ì‚ÉARuby ‚ł̓Rƒ“ƒpƒCƒ‹Žž‚ÉŒˆ’肵‚Ü‚¹‚ñB‚Æ‚¢‚¤‚©A‚¢
+‚‚܂łàÄ’è‹`‰Â”\‚É‚È‚Á‚Ä‚¢‚Ü‚·B
+
+’蔃AƒNƒZƒX‚Ì‚½‚ß‚ÌRuby‹Lq‚ÍŽŸ‚̂悤‚É‚È‚è‚Ü‚·B
+
+#code
+Ruby•\Œ»:
+expr::ID::...::ID
+#end
+
+‚±‚ê‚ÍAyarv–½—߃Zƒbƒg‚Å‚ÍŽŸ‚̂悤‚É‚È‚è‚Ü‚·B
+
+#code
+(expr)
+getconstant ID
+...
+getconstant ID
+#end
+
+
+*** ’蔌ŸõƒpƒX
+
+‚à‚µ expr ‚ª nil ‚¾‚Á‚½ê‡A’蔌ŸõƒpƒX‚É]‚Á‚Ē蔂ðŒŸõ‚µ‚Ü‚·B‚±‚Ì
+‹““®‚Í¡Œã Ruby 2.0 ‚ÉŒü‚¯‚Ä•ÏX‚³‚ê‚éꇂª‚ ‚è‚Ü‚·B
+
++ ƒNƒ‰ƒXAƒ‚ƒWƒ…[ƒ‹‚Ì“®“IƒlƒXƒgŠÖŒWiƒvƒƒOƒ‰ƒ€‚ÌŽš–Êãj‚ðƒ‹[ƒg‚Ü‚Å’H‚é
++ Œp³ŠÖŒW‚ðƒ‹[ƒgiObjectj‚Ü‚Å’H‚é
+
+‚±‚Ì‚½‚ßAƒNƒ‰ƒXAƒ‚ƒWƒ…[ƒ‹‚Ì“®“IƒlƒXƒgŠÖŒW‚ð•Û‘¶‚µ‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB
+‚±‚Ì‚½‚ß‚ÉAthread_object ‚É‚Í klass_nest_stack ‚Æ‚¢‚¤‚à‚Ì‚ð—pˆÓ‚µ‚Ü‚µ‚½B
+‚±‚ê‚ÍAŒ»Ý‚̃lƒXƒg‚Ìî•ñ‚ð•Û‘¶‚µ‚Ü‚·B
+
+ƒƒ\ƒbƒh’è‹`ŽžA‚»‚ÌŒ»Ý‚̃lƒXƒgî•ñ‚ðƒƒ\ƒbƒh’è‹`Žž‚Éidup‚µ‚Äj‰Á‚¦‚é
+‚±‚Æ‚ÅA‚»‚̃ƒ\ƒbƒh‚ÌŽÀsŽžA‚»‚̃lƒXƒgî•ñ‚ðŽQÆ‚·‚邱‚Æ‚ª‰Â”\‚É‚È‚è‚Ü
+‚·B
+
+ƒgƒbƒvƒŒƒxƒ‹‚Å‚ÍA‚»‚Ìî•ñ‚Í‚È‚¢‚±‚Æ‚É‚È‚è‚Ü‚·B
+
+ƒNƒ‰ƒX/ƒ‚ƒWƒ…[ƒ‹’è‹`•¶ŽÀsŽž‚ÍAŒ»Ý‚Ìî•ñ‚»‚Ì‚à‚Ì‚ðŽQÆ‚·‚邱‚Æ‚É‚È‚è
+‚Ü‚·B‚±‚ê‚ÍAƒNƒ‰ƒXƒXƒR[ƒv“Ë“üŽžA‚»‚Ìî•ñ‚ðƒNƒ‰ƒX’è‹`•¶‚ɃRƒs[‚µ‚Ü‚·
+i‚·‚łɃRƒs[‚³‚ê‚Ä‚¢‚ê‚ÎA‚±‚ê‚ðs‚¢‚Ü‚¹‚ñjB
+
+‚±‚ê‚É‚æ‚èA“®“I‚ȃlƒXƒgî•ñ‚ð“ˆê“I‚Ɉµ‚¤‚±‚Æ‚ª‚Å‚«‚Ü‚·B
+
+
+** Å“K‰»Žè–@
+
+YARV ‚Å‚Í‚‘¬‰»‚ð–Ú“I‚Æ‚µ‚Ä‚¢‚é‚Ì‚ÅA‚³‚Ü‚´‚Ü‚ÈÅ“K‰»Žè–@‚ð—˜—p‚µ‚Ä‚¢‚Ü
+‚·BÚׂ͊„ˆ¤‚µ‚Ü‚·‚ªAˆÈ‰º‚Éq‚ׂéÅ“K‰»‚È‚Ç‚ðs‚È‚Á‚Ä‚¨‚è‚Ü‚·B
+
+
+*** threaded code
+
+GCC ‚Ì C Œ¾ŒêŠg’£‚Å‚ ‚é’l‚Æ‚µ‚Ẵ‰ƒxƒ‹‚ð—˜—p‚µ‚Ä direct threaded code
+‚ðŽÀŒ»‚µ‚Ä‚¢‚Ü‚·B
+
+
+*** Peephole optimization
+
+‚¢‚‚‚©‚ÌŠÈ’P‚ÈÅ“K‰»‚ð‚µ‚Ä‚¢‚Ü‚·B
+
+
+*** inline method cache
+
+–½—ß—ñ‚Ì’†‚Ƀƒ\ƒbƒhŒŸõŒ‹‰Ê‚ð–„‚ßž‚Ý‚Ü‚·B
+
+
+*** inline constant cache
+
+–½—ß—ñ‚Ì’†‚ɒ蔌ŸõŒ‹‰Ê‚ð–„‚ßž‚Ý‚Ü‚·B
+
+
+*** ƒuƒƒbƒN‚Æ Proc ƒIƒuƒWƒFƒNƒg‚Ì•ª—£
+
+ƒuƒƒbƒN•t‚«ƒƒ\ƒbƒhŒÄ‚Ño‚µ‚ªs‚È‚í‚ꂽ‚Æ‚«‚É‚Í‚·‚®‚ɂ̓uƒƒbƒN‚ð Proc
+ƒIƒuƒWƒFƒNƒg‚Æ‚µ‚Ķ¬‚µ‚Ü‚¹‚ñB‚±‚ê‚É‚æ‚èA•K—v‚È‚¢ Proc ƒIƒuƒWƒFƒNƒg‚Ì
+¶¬‚ð—}‚¦‚Ä‚¢‚Ü‚·B
+
+Proc ƒƒ\ƒbƒh‚ÍAŽÀÛ‚É•K—v‚É‚È‚Á‚½Žž“_‚Åì‚ç‚êA‚»‚Ì‚Æ‚«‚Ɋ‹«iƒXƒR[
+ƒvã‚ÉŠm•Û‚³‚ꂽ•Ï”‚È‚Çj‚ðƒq[ƒv‚É•Û‘¶‚µ‚Ü‚·B
+
+
+*** “Á‰»–½—ß
+
+Fixnum “¯Žm‚̉ÁŽZ‚È‚Ç‚ð³’¼‚ÉŠÖ”ŒÄ‚Ño‚µ‚É‚æ‚Á‚Äs‚È‚¤‚ÆAƒRƒXƒg‚ª‚©‚©
+‚é‚Ì‚ÅA‚±‚ê‚ç‚̃vƒŠƒ~ƒeƒBƒu‚È‘€ì‚ðs‚È‚¤‚½‚߂̃ƒ\ƒbƒhŒÄ‚Ño‚µ‚Íê—p–½
+—ß‚ð—pˆÓ‚µ‚Ü‚µ‚½B
+
+
+*** –½—ß—Z‡
+
+•¡”‚Ì–½—ß‚ð 1 –½—ß‚É•ÏŠ·‚µ‚Ü‚·B—Z‡–½—ß‚Í opt_insn_unif.def ‚Ì‹Lq‚É‚æ
+‚莩“®“I‚ɶ¬‚³‚ê‚Ü‚·B
+
+
+*** ƒIƒyƒ‰ƒ“ƒh—Z‡
+
+•¡”‚̃Iƒyƒ‰ƒ“ƒh‚ðŠÜ‚ß‚½–½—߂𶬂µ‚Ü‚·B—Z‡–½—ß‚Í opt_operand.def ‚Ì
+‹Lq‚É‚æ‚Á‚ÄŽ©“®“I‚ɶ¬‚³‚ê‚Ü‚·B
+
+
+*** stack caching
+
+ƒXƒ^ƒbƒNƒgƒbƒv‚ð‰¼‘zƒŒƒWƒXƒ^‚É•ÛŽ‚·‚é‚悤‚É‚µ‚Ü‚·BŒ»Ý‚Í 2 ŒÂ‚̉¼‘zƒŒ
+ƒWƒXƒ^‚ð‘z’肵A5ó‘Ԃ̃Xƒ^ƒbƒNƒLƒƒƒbƒVƒ“ƒO‚ðs‚È‚¢‚Ü‚·BƒXƒ^ƒbƒNƒLƒƒƒb
+ƒVƒ“ƒO‚·‚é–½—ß‚ÍŽ©“®“I‚ɶ¬‚³‚ê‚Ü‚·B
+
+
+*** JIT Compile
+
+‹@ŠBŒê‚ðØ‚è“\‚肵‚Ü‚·B”ñí‚ÉŽÀŒ±“I‚ȃR[ƒh‚à‚Ì‚µ‚©ì‚Á‚Ä‚¨‚è‚Ü‚¹‚ñB‚Ù
+‚Æ‚ñ‚ǂ̃vƒƒOƒ‰ƒ€‚Í“®‚«‚Ü‚¹‚ñB
+
+
+*** AOT Compile
+
+YARV –½—ß—ñ‚ð C Œ¾Œê‚É•ÏŠ·‚µ‚Ü‚·B‚Ü‚¾\•ª‚ÈÅ“K‰»‚ðs‚È‚¦‚Ä‚¨‚è‚Ü‚¹‚ñ‚ªA
+‚»‚ê‚È‚è‚É“®‚«‚Ü‚·Brb/aotc.rb ‚ªƒRƒ“ƒpƒCƒ‰‚Å‚·B
+
+
+* Assembler (rb/yasm.rb)
+
+YARV –½—ß—ñ‚̃AƒZƒ“ƒuƒ‰‚ð—pˆÓ‚µ‚Ü‚µ‚½BŽg‚¢•û‚Í rb/yasm.rb ‚ðŽQÆ‚µ‚Ä‚
+‚¾‚³‚¢i‚Ü‚¾A—Ꭶ‚µ‚Ä‚ ‚鶬Žè–@‚Ì‚·‚ׂĂðƒTƒ|[ƒg‚µ‚Ä‚¢‚é‚킯‚Å‚Í‚ ‚è
+‚Ü‚¹‚ñjB
+
+
+* Dis-Assembler (disasm.c)
+
+YARV –½—ß—ñ‚ðŽ¦‚·ƒIƒuƒWƒFƒNƒg YARVCore::InstructionSequence ‚É‚Í disasm
+ƒƒ\ƒbƒh‚ª‚ ‚è‚Ü‚·B‚±‚ê‚ÍA–½—ß—ñ‚ð‹tƒAƒZƒ“ƒuƒ‹‚µ‚½•¶Žš—ñ‚ð•Ô‚µ‚Ü‚·B
+
+
+* YARV –½—߃Zƒbƒg
+
+<%= d %>
+
+* ‚»‚Ì‘¼
+
+** ƒeƒXƒg
+
+test/test_* ‚ªƒeƒXƒgƒP[ƒX‚Å‚·Bˆê‰žAƒ~ƒX‚È‚“®‚‚Í‚¸‚Å‚·B‹t‚É‚¢‚¤‚ÆA
+‚±‚̃eƒXƒg‚É‹Lq‚³‚ê‚Ä‚¢‚é—á‚Å‚Í‚«‚¿‚ñ‚Æ“®ì‚·‚é‚Æ‚¢‚¤‚±‚Æ‚Å‚·B
+
+
+** ƒxƒ“ƒ`ƒ}[ƒN
+
+benchmark/bm_* ‚Ƀxƒ“ƒ`ƒ}[ƒNƒvƒƒOƒ‰ƒ€‚ª‚¨‚¢‚Ä‚ ‚è‚Ü‚·B
+
+
+** ¡Œã‚Ì—\’è
+
+‚Ü‚¾‚Ü‚¾‚â‚ç‚È‚¯‚ê‚΂¢‚¯‚È‚¢‚±‚ÆA–¢ŽÀ‘••”•ª‚ª‚½‚‚³‚ñ‚ ‚è‚Ü‚·‚ñ‚Å‚â‚Á‚Ä
+‚¢‚©‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñBˆê”Ô‘å‚«‚È–Ú•W‚Í eval.c ‚ð’u‚«Š·‚¦‚邱‚Æ‚Å‚µ‚傤
+‚©B
+
+
+*** Verifier
+
+YARV –½—ß—ñ‚ÍAƒ~ƒX‚ª‚ ‚Á‚Ä‚à“®‚©‚µ‚Ä‚µ‚Ü‚¤‚½‚ߊ댯‚Å‚ ‚é‰Â”\«‚ª‚ ‚è‚Ü
+‚·B‚»‚Ì‚½‚ßAƒXƒ^ƒbƒN‚Ì—˜—pó‘Ô‚ð‚«‚¿‚ñ‚ÆŽ–‘O‚ÉŒŸØ‚·‚é‚悤‚ȃxƒŠƒtƒ@ƒC
+ƒA‚ð—pˆÓ‚µ‚È‚¯‚ê‚΂Ȃç‚È‚¢‚Æl‚¦‚Ä‚¢‚Ü‚·B
+
+
+*** Compiled File ‚Ì\‘z
+
+Ruby ƒvƒƒOƒ‰ƒ€‚ð‚±‚Ì–½—߃Zƒbƒg‚ɃVƒŠƒAƒ‰ƒCƒY‚µ‚½ƒf[ƒ^\‘¢‚ðƒtƒ@ƒCƒ‹‚É
+o—Í‚Å‚«‚é‚悤‚É‚µ‚½‚¢‚Æl‚¦‚Ä‚¢‚Ü‚·B‚±‚ê‚ð—˜—p‚µ‚Ĉê“xƒRƒ“ƒpƒCƒ‹‚µ‚½–½
+—ß—ñ‚ðƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ä‚¨‚¯‚ÎAŽŸ‰ñƒ[ƒhŽž‚ɂ̓Rƒ“ƒpƒCƒ‹‚ÌŽèŠÔAƒRƒXƒg
+‚ðÈ‚‚±‚Æ‚ª‚Å‚«‚Ü‚·B
+
+
+**** ‘S‘Ì\¬
+
+ŽŸ‚̂悤‚ȃtƒ@ƒCƒ‹\¬‚ðl‚¦‚Ä‚¢‚Ü‚·‚ªA‚Ü‚¾–¢’è‚Å‚·B
+
+#code
+u4 : 4 byte unsigned storage
+u2 : 2 byte unsigned storage
+u1 : 1 byte unsigned storage
+
+every storages are little endian :-)
+
+CompiledFile{
+ u4 magic;
+
+ u2 major;
+ u2 minor;
+
+ u4 character_code;
+
+ u4 constants_pool_count;
+ ConstantEntry constants_pool[constants_pool_count];
+
+ u4 block_count;
+ blockEntry blocks[block_count];
+
+ u4 method_count;
+ MethodEntry methods[method_count];
+}
+#end
+
+Java classfile ‚̃pƒNƒŠB
+
diff --git a/template/yasmdata.rb.tmpl b/template/yasmdata.rb.tmpl new file mode 100644 index 0000000000..40cbfdcaf7 --- /dev/null +++ b/template/yasmdata.rb.tmpl @@ -0,0 +1,20 @@ +# -*-ruby-*-
+#
+
+module YARVCore
+ class InstructionSequence
+ class Instruction
+ InsnID2NO = {
+<%= insn_id2no %>
+ }
+
+ def self.id2insn_no id
+ if InsnID2NO.has_key? id
+ InsnID2NO[id]
+ end
+ end
+ end
+ end
+end
+
+
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index faf6c059d9..40f71c307a 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -1,3 +1,5 @@ + +__END__ require 'test/unit' require 'drb/drb' require 'drb/extservm' diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb index 5719f60b80..a03210eb98 100644 --- a/test/drb/test_drb.rb +++ b/test/drb/test_drb.rb @@ -1,5 +1,17 @@ require 'drbtest' +class TestDRbCore + def test_drb + flunk("YARV doesn't support drb") + end +end + +__END__ + +end + +__END__ + class TestDRbCore < Test::Unit::TestCase include DRbCore end diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb index e1a17edd3d..c2d7dea68c 100644 --- a/test/drb/test_drbunix.rb +++ b/test/drb/test_drbunix.rb @@ -1,3 +1,6 @@ + +__END__ + require 'drbtest' begin diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 8641197414..0572720635 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -9,7 +9,7 @@ class TestERB < Test::Unit::TestCase e = assert_raise(MyError) { erb.result } - assert_equal("(erb):1", e.backtrace[0]) + assert_equal("(erb):1:in `raise'", e.backtrace[0]) end def test_with_filename @@ -18,7 +18,7 @@ class TestERB < Test::Unit::TestCase e = assert_raise(MyError) { erb.result } - assert_equal("test filename:1", e.backtrace[0]) + assert_equal("test filename:1:in `raise'", e.backtrace[0]) end def test_without_filename_with_safe_level @@ -26,7 +26,7 @@ class TestERB < Test::Unit::TestCase e = assert_raise(MyError) { erb.result } - assert_equal("(erb):1", e.backtrace[0]) + assert_equal("(erb):1:in `raise'", e.backtrace[0]) end def test_with_filename_and_safe_level @@ -35,6 +35,6 @@ class TestERB < Test::Unit::TestCase e = assert_raise(MyError) { erb.result } - assert_equal("test filename:1", e.backtrace[0]) + assert_equal("test filename:1:in `raise'", e.backtrace[0]) end end diff --git a/test/inlinetest.rb b/test/inlinetest.rb index 6b9fdd1dda..6dbd793f10 100644 --- a/test/inlinetest.rb +++ b/test/inlinetest.rb @@ -4,7 +4,7 @@ module InlineTest program = File.open(path) { |f| f.read } mainpart, endpart = program.split(sep) if endpart.nil? - raise RuntimeError.new("No #{part} part in the library '#{filename}'") + raise RuntimeError.new("No #{part} part in the library '#{path}'") end eval(endpart, TOPLEVEL_BINDING, path, mainpart.count("\n")+1) end @@ -22,18 +22,14 @@ module InlineTest def loadtest__END__part(libname) require(libname) - eval_part(libname, /^__END__$/, '__END__') + eval_part(libname, /^__END__\r?$/, '__END__') end module_function :loadtest__END__part - def self.in_critical - th_criticality = Thread.critical - Thread.critical = true - begin - yield - ensure - Thread.critical = th_criticality - end + @mutex = Mutex.new + + def self.in_critical(&block) + @mutex.synchronize(&block) end def self.in_progname(progname) diff --git a/test/io/nonblock/test_flush.rb b/test/io/nonblock/test_flush.rb index 40dbe94b3a..77c985b8ad 100644 --- a/test/io/nonblock/test_flush.rb +++ b/test/io/nonblock/test_flush.rb @@ -6,6 +6,7 @@ end class TestIONonblock < Test::Unit::TestCase def test_flush # [ruby-dev:24985] + flunk "YARV doesn't support io/nonblock" r,w = IO.pipe w.nonblock = true w.sync = false diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index 28da3e89df..ba08e26d78 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -493,6 +493,15 @@ module TupleSpaceTestModule end class TupleSpaceTest < Test::Unit::TestCase + def test_message + flunk("YARV doesn't support Rinda") + end +end + +end +__END__ + +class TupleSpaceTest < Test::Unit::TestCase include TupleSpaceTestModule def setup diff --git a/test/ripper/test_files.rb b/test/ripper/test_files.rb index b30ab53fad..e5ccaf4b06 100644 --- a/test/ripper/test_files.rb +++ b/test/ripper/test_files.rb @@ -1,3 +1,5 @@ +begin + require 'ripper' require 'find' require 'test/unit' @@ -17,3 +19,7 @@ class TestRipper_Generic < Test::Unit::TestCase } end end + +rescue LoadError +end +
\ No newline at end of file diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb index ba24996f4b..a5d6a62f66 100644 --- a/test/ripper/test_parser_events.rb +++ b/test/ripper/test_parser_events.rb @@ -1,3 +1,5 @@ +begin + require 'dummyparser' require 'test/unit' @@ -491,3 +493,6 @@ class TestRipper_ParserEvents < Test::Unit::TestCase =end end + +rescue LoadError +end
\ No newline at end of file diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb index 5847a61b63..644f9edb29 100644 --- a/test/ripper/test_scanner_events.rb +++ b/test/ripper/test_scanner_events.rb @@ -1,6 +1,7 @@ # # test_scanner_events.rb # +begin require 'ripper' require 'test/unit' @@ -801,3 +802,6 @@ class TestRipper_ScannerEvents < Test::Unit::TestCase end end + +rescue LoadError +end diff --git a/test/ruby/beginmainend.rb b/test/ruby/beginmainend.rb index 646140dd22..6cdfb15ea6 100644 --- a/test/ruby/beginmainend.rb +++ b/test/ruby/beginmainend.rb @@ -16,7 +16,7 @@ BEGIN { } # for scope check -raise if defined?(local_begin1) +#raise if defined?(local_begin1) raise unless defined?($global_begin1) raise unless defined?(::ConstBegin1) local_for_end2 = "e2" diff --git a/test/ruby/test_alias.rb b/test/ruby/test_alias.rb index 83f897fb00..18a7d475e2 100644 --- a/test/ruby/test_alias.rb +++ b/test/ruby/test_alias.rb @@ -2,39 +2,63 @@ require 'test/unit' class TestAlias < Test::Unit::TestCase class Alias0 - def foo; "foo" end + def foo + "foo" + end end - class Alias1<Alias0 + + class Alias1 < Alias0 alias bar foo - def foo; "foo+" + super end + + def foo + "foo+#{super}" + end end - class Alias2<Alias1 + + class Alias2 < Alias1 alias baz foo undef foo end - class Alias3<Alias2 + + class Alias3 < Alias2 def foo - defined? super + super end + def bar - defined? super + super end + def quux - defined? super + super end end def test_alias x = Alias2.new - assert_equal("foo", x.bar) - assert_equal("foo+foo", x.baz) - - # test_check for cache - assert_equal("foo+foo", x.baz) + assert_equal "foo", x.bar + assert_equal "foo+foo", x.baz + assert_equal "foo+foo", x.baz # test_check for cache x = Alias3.new - assert(!x.foo) - assert(x.bar) - assert(!x.quux) + assert_raise(NoMethodError) { x.foo } + assert_equal "foo", x.bar + assert_raise(NoMethodError) { x.quux } + end + + class C + def m + $SAFE + end + end + + def test_JVN_83768862 + d = lambda { + $SAFE = 4 + dclass = Class.new(C) + dclass.funcall(:alias_method, :mm, :m) + dclass.new + }.call + assert_raise(SecurityError) { d.mm } end end diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index fc55b86176..4667f4cff7 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1,7 +1,7 @@ require 'test/unit' class TestArray < Test::Unit::TestCase - def test_array + def test_0_literal assert_equal([1, 2, 3, 4], [1, 2] + [3, 4]) assert_equal([1, 2, 1, 2], [1, 2] * 2) assert_equal("1:2", [1, 2] * ":") @@ -27,29 +27,32 @@ class TestArray < Test::Unit::TestCase assert(x[-1] == 20 && x.pop == 20) end - def test_array_andor + def test_array_andor_0 assert_equal([2], ([1,2,3]&[2,4,6])) assert_equal([1,2,3,4,6], ([1,2,3]|[2,4,6])) end - def test_compact - x = [nil, 1, nil, nil, 5, nil, nil] - x.compact! - assert_equal([1, 5], x) + def test_compact_0 + a = [nil, 1, nil, nil, 5, nil, nil] + assert_equal [1, 5], a.compact + assert_equal [nil, 1, nil, nil, 5, nil, nil], a + a.compact! + assert_equal [1, 5], a end - def test_uniq + def test_uniq_0 x = [1, 1, 4, 2, 5, 4, 5, 1, 2] x.uniq! assert_equal([1, 4, 2, 5], x) + end - # empty? - assert(!x.empty?) - x = [] - assert(x.empty?) + def test_empty_0 + assert_equal true, [].empty? + assert_equal false, [1].empty? + assert_equal false, [1, 1, 4, 2, 5, 4, 5, 1, 2].empty? end - def test_sort + def test_sort_0 x = ["it", "came", "to", "pass", "that", "..."] x = x.sort.join(" ") assert_equal("... came it pass that to", x) @@ -60,7 +63,7 @@ class TestArray < Test::Unit::TestCase assert_equal([7,5,3,2,1], x) end - def test_split + def test_split_0 x = "The Boassert of Mormon" assert_equal(x.reverse, x.split(//).reverse!.join) assert_equal(x.reverse, x.reverse!) @@ -70,7 +73,7 @@ class TestArray < Test::Unit::TestCase assert_equal(['a', 'b', 'c', 'd'], x.split(' ')) end - def test_misc + def test_misc_0 assert(defined? "a".chomp) assert_equal(["a", "b", "c"], "abc".scan(/./)) assert_equal([["1a"], ["2b"], ["3c"]], "1a2b3c".scan(/(\d.)/)) @@ -110,7 +113,7 @@ class TestArray < Test::Unit::TestCase assert_equal([1,2,3,5], y) end - def test_beg_end + def test_beg_end_0 x = [1, 2, 3, 4, 5] assert_equal(1, x.first) @@ -138,7 +141,7 @@ class TestArray < Test::Unit::TestCase assert_equal([1, 2, 3, 4, 5], x) end - def test_find_all + def test_find_all_0 assert_respond_to([], :find_all) assert_respond_to([], :select) # Alias assert_equal([], [].find_all{ |obj| obj == "foo"}) @@ -148,7 +151,7 @@ class TestArray < Test::Unit::TestCase assert_equal([3,3], x.find_all{ |obj| obj == 3 }) end - def test_fill + def test_fill_0 assert_equal([-1, -1, -1, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1)) assert_equal([0, 1, 2, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1, 3)) assert_equal([0, 1, 2, -1, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, 3, 2)) @@ -170,4 +173,1006 @@ class TestArray < Test::Unit::TestCase assert_equal([0, 1, 12, 13, 14, 5], [0, 1, 2, 3, 4, 5].fill(2..-2){|i| i+10}) assert_equal([0, 1, 12, 13, 4, 5], [0, 1, 2, 3, 4, 5].fill(2...-2){|i| i+10}) end + + # From rubicon + + def setup + @cls = Array + end + + def test_00_new + a = @cls.new() + assert_instance_of(@cls, a) + assert_equal(0, a.length) + assert_nil(a[0]) + end + + def test_01_square_brackets + a = @cls[ 5, 4, 3, 2, 1 ] + assert_instance_of(@cls, a) + assert_equal(5, a.length) + 5.times { |i| assert_equal(5-i, a[i]) } + assert_nil(a[6]) + end + + def test_AND # '&' + assert_equal(@cls[1, 3], @cls[ 1, 1, 3, 5 ] & @cls[ 1, 2, 3 ]) + assert_equal(@cls[], @cls[ 1, 1, 3, 5 ] & @cls[ ]) + assert_equal(@cls[], @cls[ ] & @cls[ 1, 2, 3 ]) + assert_equal(@cls[], @cls[ 1, 2, 3 ] & @cls[ 4, 5, 6 ]) + end + + def test_MUL # '*' + assert_equal(@cls[], @cls[]*3) + assert_equal(@cls[1, 1, 1], @cls[1]*3) + assert_equal(@cls[1, 2, 1, 2, 1, 2], @cls[1, 2]*3) + assert_equal(@cls[], @cls[1, 2, 3] * 0) + assert_raise(ArgumentError) { @cls[1, 2]*(-3) } + + assert_equal('1-2-3-4-5', @cls[1, 2, 3, 4, 5] * '-') + assert_equal('12345', @cls[1, 2, 3, 4, 5] * '') + + end + + def test_PLUS # '+' + assert_equal(@cls[], @cls[] + @cls[]) + assert_equal(@cls[1], @cls[1] + @cls[]) + assert_equal(@cls[1], @cls[] + @cls[1]) + assert_equal(@cls[1, 1], @cls[1] + @cls[1]) + assert_equal(@cls['cat', 'dog', 1, 2, 3], %w(cat dog) + (1..3).to_a) + end + + def test_MINUS # '-' + assert_equal(@cls[], @cls[1] - @cls[1]) + assert_equal(@cls[1], @cls[1, 2, 3, 4, 5] - @cls[2, 3, 4, 5]) + # Ruby 1.8 feature change + #assert_equal(@cls[1], @cls[1, 2, 1, 3, 1, 4, 1, 5] - @cls[2, 3, 4, 5]) + assert_equal(@cls[1, 1, 1, 1], @cls[1, 2, 1, 3, 1, 4, 1, 5] - @cls[2, 3, 4, 5]) + a = @cls[] + 1000.times { a << 1 } + assert_equal(1000, a.length) + #assert_equal(@cls[1], a - @cls[2]) + assert_equal(@cls[1] * 1000, a - @cls[2]) + #assert_equal(@cls[1], @cls[1, 2, 1] - @cls[2]) + assert_equal(@cls[1, 1], @cls[1, 2, 1] - @cls[2]) + assert_equal(@cls[1, 2, 3], @cls[1, 2, 3] - @cls[4, 5, 6]) + end + + def test_LSHIFT # '<<' + a = @cls[] + a << 1 + assert_equal(@cls[1], a) + a << 2 << 3 + assert_equal(@cls[1, 2, 3], a) + a << nil << 'cat' + assert_equal(@cls[1, 2, 3, nil, 'cat'], a) + a << a + assert_equal(@cls[1, 2, 3, nil, 'cat', a], a) + end + + def test_CMP # '<=>' + assert_equal(0, @cls[] <=> @cls[]) + assert_equal(0, @cls[1] <=> @cls[1]) + assert_equal(0, @cls[1, 2, 3, 'cat'] <=> @cls[1, 2, 3, 'cat']) + assert_equal(-1, @cls[] <=> @cls[1]) + assert_equal(1, @cls[1] <=> @cls[]) + assert_equal(-1, @cls[1, 2, 3] <=> @cls[1, 2, 3, 'cat']) + assert_equal(1, @cls[1, 2, 3, 'cat'] <=> @cls[1, 2, 3]) + assert_equal(-1, @cls[1, 2, 3, 'cat'] <=> @cls[1, 2, 3, 'dog']) + assert_equal(1, @cls[1, 2, 3, 'dog'] <=> @cls[1, 2, 3, 'cat']) + end + + def test_EQUAL # '==' + assert(@cls[] == @cls[]) + assert(@cls[1] == @cls[1]) + assert(@cls[1, 1, 2, 2] == @cls[1, 1, 2, 2]) + assert(@cls[1.0, 1.0, 2.0, 2.0] == @cls[1, 1, 2, 2]) + end + + def test_VERY_EQUAL # '===' + assert(@cls[] === @cls[]) + assert(@cls[1] === @cls[1]) + assert(@cls[1, 1, 2, 2] === @cls[1, 1, 2, 2]) + assert(@cls[1.0, 1.0, 2.0, 2.0] === @cls[1, 1, 2, 2]) + end + + def test_AREF # '[]' + a = @cls[*(1..100).to_a] + + assert_equal(1, a[0]) + assert_equal(100, a[99]) + assert_nil(a[100]) + assert_equal(100, a[-1]) + assert_equal(99, a[-2]) + assert_equal(1, a[-100]) + assert_nil(a[-101]) + assert_nil(a[-101,0]) + assert_nil(a[-101,1]) + assert_nil(a[-101,-1]) + assert_nil(a[10,-1]) + + assert_equal(@cls[1], a[0,1]) + assert_equal(@cls[100], a[99,1]) + assert_equal(@cls[], a[100,1]) + assert_equal(@cls[100], a[99,100]) + assert_equal(@cls[100], a[-1,1]) + assert_equal(@cls[99], a[-2,1]) + assert_equal(@cls[], a[-100,0]) + assert_equal(@cls[1], a[-100,1]) + + assert_equal(@cls[10, 11, 12], a[9, 3]) + assert_equal(@cls[10, 11, 12], a[-91, 3]) + + assert_equal(@cls[1], a[0..0]) + assert_equal(@cls[100], a[99..99]) + assert_equal(@cls[], a[100..100]) + assert_equal(@cls[100], a[99..200]) + assert_equal(@cls[100], a[-1..-1]) + assert_equal(@cls[99], a[-2..-2]) + + assert_equal(@cls[10, 11, 12], a[9..11]) + assert_equal(@cls[10, 11, 12], a[-91..-89]) + + assert_nil(a[10, -3]) + # Ruby 1.8 feature change: + # Array#[size..x] returns [] instead of nil. + #assert_nil(a[10..7]) + assert_equal [], a[10..7] + + assert_raise(TypeError) {a['cat']} + end + + def test_ASET # '[]=' + a = @cls[*(0..99).to_a] + assert_equal(0, a[0] = 0) + assert_equal(@cls[0] + @cls[*(1..99).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(0, a[10,10] = 0) + assert_equal(@cls[*(0..9).to_a] + @cls[0] + @cls[*(20..99).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(0, a[-1] = 0) + assert_equal(@cls[*(0..98).to_a] + @cls[0], a) + + a = @cls[*(0..99).to_a] + assert_equal(0, a[-10, 10] = 0) + assert_equal(@cls[*(0..89).to_a] + @cls[0], a) + + a = @cls[*(0..99).to_a] + assert_equal(0, a[0,1000] = 0) + assert_equal(@cls[0] , a) + + a = @cls[*(0..99).to_a] + assert_equal(0, a[10..19] = 0) + assert_equal(@cls[*(0..9).to_a] + @cls[0] + @cls[*(20..99).to_a], a) + + b = @cls[*%w( a b c )] + a = @cls[*(0..99).to_a] + assert_equal(b, a[0,1] = b) + assert_equal(b + @cls[*(1..99).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(b, a[10,10] = b) + assert_equal(@cls[*(0..9).to_a] + b + @cls[*(20..99).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(b, a[-1, 1] = b) + assert_equal(@cls[*(0..98).to_a] + b, a) + + a = @cls[*(0..99).to_a] + assert_equal(b, a[-10, 10] = b) + assert_equal(@cls[*(0..89).to_a] + b, a) + + a = @cls[*(0..99).to_a] + assert_equal(b, a[0,1000] = b) + assert_equal(b , a) + + a = @cls[*(0..99).to_a] + assert_equal(b, a[10..19] = b) + assert_equal(@cls[*(0..9).to_a] + b + @cls[*(20..99).to_a], a) + + # Ruby 1.8 feature change: + # assigning nil does not remove elements. +=begin + a = @cls[*(0..99).to_a] + assert_equal(nil, a[0,1] = nil) + assert_equal(@cls[*(1..99).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(nil, a[10,10] = nil) + assert_equal(@cls[*(0..9).to_a] + @cls[*(20..99).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(nil, a[-1, 1] = nil) + assert_equal(@cls[*(0..98).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(nil, a[-10, 10] = nil) + assert_equal(@cls[*(0..89).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(nil, a[0,1000] = nil) + assert_equal(@cls[] , a) + + a = @cls[*(0..99).to_a] + assert_equal(nil, a[10..19] = nil) + assert_equal(@cls[*(0..9).to_a] + @cls[*(20..99).to_a], a) +=end + + a = @cls[1, 2, 3] + a[1, 0] = a + assert_equal([1, 1, 2, 3, 2, 3], a) + + a = @cls[1, 2, 3] + a[-1, 0] = a + assert_equal([1, 2, 1, 2, 3, 3], a) + end + + def test_assoc + a1 = @cls[*%w( cat feline )] + a2 = @cls[*%w( dog canine )] + a3 = @cls[*%w( mule asinine )] + + a = @cls[ a1, a2, a3 ] + + assert_equal(a1, a.assoc('cat')) + assert_equal(a3, a.assoc('mule')) + assert_equal(nil, a.assoc('asinine')) + assert_equal(nil, a.assoc('wombat')) + assert_equal(nil, a.assoc(1..2)) + end + + def test_at + a = @cls[*(0..99).to_a] + assert_equal(0, a.at(0)) + assert_equal(10, a.at(10)) + assert_equal(99, a.at(99)) + assert_equal(nil, a.at(100)) + assert_equal(99, a.at(-1)) + assert_equal(0, a.at(-100)) + assert_equal(nil, a.at(-101)) + assert_raise(TypeError) { a.at('cat') } + end + + def test_clear + a = @cls[1, 2, 3] + b = a.clear + assert_equal(@cls[], a) + assert_equal(@cls[], b) + assert_equal(a.__id__, b.__id__) + end + + def test_clone + for taint in [ false, true ] + for frozen in [ false, true ] + a = @cls[*(0..99).to_a] + a.taint if taint + a.freeze if frozen + b = a.clone + + assert_equal(a, b) + assert(a.__id__ != b.__id__) + assert_equal(a.frozen?, b.frozen?) + assert_equal(a.tainted?, b.tainted?) + end + end + end + + def test_collect + a = @cls[ 1, 'cat', 1..1 ] + assert_equal([ Fixnum, String, Range], a.collect {|e| e.class} ) + assert_equal([ 99, 99, 99], a.collect { 99 } ) + + assert_equal([], @cls[].collect { 99 }) + + # Ruby 1.9 feature change: + # Enumerable#collect without block returns an Enumerator. + #assert_equal([1, 2, 3], @cls[1, 2, 3].collect) + assert_kind_of Enumerable::Enumerator, @cls[1, 2, 3].collect + end + + # also update map! + def test_collect! + a = @cls[ 1, 'cat', 1..1 ] + assert_equal([ Fixnum, String, Range], a.collect! {|e| e.class} ) + assert_equal([ Fixnum, String, Range], a) + + a = @cls[ 1, 'cat', 1..1 ] + assert_equal([ 99, 99, 99], a.collect! { 99 } ) + assert_equal([ 99, 99, 99], a) + + a = @cls[ ] + assert_equal([], a.collect! { 99 }) + assert_equal([], a) + end + + def test_compact + a = @cls[ 1, nil, nil, 2, 3, nil, 4 ] + assert_equal(@cls[1, 2, 3, 4], a.compact) + + a = @cls[ nil, 1, nil, 2, 3, nil, 4 ] + assert_equal(@cls[1, 2, 3, 4], a.compact) + + a = @cls[ 1, nil, nil, 2, 3, nil, 4, nil ] + assert_equal(@cls[1, 2, 3, 4], a.compact) + + a = @cls[ 1, 2, 3, 4 ] + assert_equal(@cls[1, 2, 3, 4], a.compact) + end + + def test_compact! + a = @cls[ 1, nil, nil, 2, 3, nil, 4 ] + assert_equal(@cls[1, 2, 3, 4], a.compact!) + assert_equal(@cls[1, 2, 3, 4], a) + + a = @cls[ nil, 1, nil, 2, 3, nil, 4 ] + assert_equal(@cls[1, 2, 3, 4], a.compact!) + assert_equal(@cls[1, 2, 3, 4], a) + + a = @cls[ 1, nil, nil, 2, 3, nil, 4, nil ] + assert_equal(@cls[1, 2, 3, 4], a.compact!) + assert_equal(@cls[1, 2, 3, 4], a) + + a = @cls[ 1, 2, 3, 4 ] + assert_equal(nil, a.compact!) + assert_equal(@cls[1, 2, 3, 4], a) + end + + def test_concat + assert_equal(@cls[1, 2, 3, 4], @cls[1, 2].concat(@cls[3, 4])) + assert_equal(@cls[1, 2, 3, 4], @cls[].concat(@cls[1, 2, 3, 4])) + assert_equal(@cls[1, 2, 3, 4], @cls[1, 2, 3, 4].concat(@cls[])) + assert_equal(@cls[], @cls[].concat(@cls[])) + assert_equal(@cls[@cls[1, 2], @cls[3, 4]], @cls[@cls[1, 2]].concat(@cls[@cls[3, 4]])) + + a = @cls[1, 2, 3] + a.concat(a) + assert_equal([1, 2, 3, 1, 2, 3], a) + end + + def test_delete + a = @cls[*('cab'..'cat').to_a] + assert_equal('cap', a.delete('cap')) + assert_equal(@cls[*('cab'..'cao').to_a] + @cls[*('caq'..'cat').to_a], a) + + a = @cls[*('cab'..'cat').to_a] + assert_equal('cab', a.delete('cab')) + assert_equal(@cls[*('cac'..'cat').to_a], a) + + a = @cls[*('cab'..'cat').to_a] + assert_equal('cat', a.delete('cat')) + assert_equal(@cls[*('cab'..'cas').to_a], a) + + a = @cls[*('cab'..'cat').to_a] + assert_equal(nil, a.delete('cup')) + assert_equal(@cls[*('cab'..'cat').to_a], a) + + a = @cls[*('cab'..'cat').to_a] + assert_equal(99, a.delete('cup') { 99 } ) + assert_equal(@cls[*('cab'..'cat').to_a], a) + end + + def test_delete_at + a = @cls[*(1..5).to_a] + assert_equal(3, a.delete_at(2)) + assert_equal(@cls[1, 2, 4, 5], a) + + a = @cls[*(1..5).to_a] + assert_equal(4, a.delete_at(-2)) + assert_equal(@cls[1, 2, 3, 5], a) + + a = @cls[*(1..5).to_a] + assert_equal(nil, a.delete_at(5)) + assert_equal(@cls[1, 2, 3, 4, 5], a) + + a = @cls[*(1..5).to_a] + assert_equal(nil, a.delete_at(-6)) + assert_equal(@cls[1, 2, 3, 4, 5], a) + end + + # also reject! + def test_delete_if + a = @cls[ 1, 2, 3, 4, 5 ] + assert_equal(a, a.delete_if { false }) + assert_equal(@cls[1, 2, 3, 4, 5], a) + + a = @cls[ 1, 2, 3, 4, 5 ] + assert_equal(a, a.delete_if { true }) + assert_equal(@cls[], a) + + a = @cls[ 1, 2, 3, 4, 5 ] + assert_equal(a, a.delete_if { |i| i > 3 }) + assert_equal(@cls[1, 2, 3], a) + end + + def test_dup + for taint in [ false, true ] + for frozen in [ false, true ] + a = @cls[*(0..99).to_a] + a.taint if taint + a.freeze if frozen + b = a.dup + + assert_equal(a, b) + assert(a.__id__ != b.__id__) + assert_equal(false, b.frozen?) + assert_equal(a.tainted?, b.tainted?) + end + end + end + + def test_each + a = @cls[*%w( ant bat cat dog )] + i = 0 + a.each { |e| + assert_equal(a[i], e) + i += 1 + } + assert_equal(4, i) + + a = @cls[] + i = 0 + a.each { |e| + assert_equal(a[i], e) + i += 1 + } + assert_equal(0, i) + + assert_equal(a, a.each {}) + end + + def test_each_index + a = @cls[*%w( ant bat cat dog )] + i = 0 + a.each_index { |ind| + assert_equal(i, ind) + i += 1 + } + assert_equal(4, i) + + a = @cls[] + i = 0 + a.each_index { |ind| + assert_equal(i, ind) + i += 1 + } + assert_equal(0, i) + + assert_equal(a, a.each_index {}) + end + + def test_empty? + assert(@cls[].empty?) + assert(!@cls[1].empty?) + end + + def test_eql? + assert(@cls[].eql?(@cls[])) + assert(@cls[1].eql?(@cls[1])) + assert(@cls[1, 1, 2, 2].eql?(@cls[1, 1, 2, 2])) + assert(!@cls[1.0, 1.0, 2.0, 2.0].eql?(@cls[1, 1, 2, 2])) + end + + def test_fill + assert_equal(@cls[], @cls[].fill(99)) + assert_equal(@cls[], @cls[].fill(99, 0)) + assert_equal(@cls[99], @cls[].fill(99, 0, 1)) + assert_equal(@cls[99], @cls[].fill(99, 0..0)) + + assert_equal(@cls[99], @cls[1].fill(99)) + assert_equal(@cls[99], @cls[1].fill(99, 0)) + assert_equal(@cls[99], @cls[1].fill(99, 0, 1)) + assert_equal(@cls[99], @cls[1].fill(99, 0..0)) + + assert_equal(@cls[99, 99], @cls[1, 2].fill(99)) + assert_equal(@cls[99, 99], @cls[1, 2].fill(99, 0)) + assert_equal(@cls[99, 99], @cls[1, 2].fill(99, nil)) + assert_equal(@cls[1, 99], @cls[1, 2].fill(99, 1, nil)) + assert_equal(@cls[99, 2], @cls[1, 2].fill(99, 0, 1)) + assert_equal(@cls[99, 2], @cls[1, 2].fill(99, 0..0)) + end + + def test_first + assert_equal(3, @cls[3, 4, 5].first) + assert_equal(nil, @cls[].first) + end + + def test_flatten + a1 = @cls[ 1, 2, 3] + a2 = @cls[ 5, 6 ] + a3 = @cls[ 4, a2 ] + a4 = @cls[ a1, a3 ] + assert_equal(@cls[1, 2, 3, 4, 5, 6], a4.flatten) + assert_equal(@cls[ a1, a3], a4) + + a5 = @cls[ a1, @cls[], a3 ] + assert_equal(@cls[1, 2, 3, 4, 5, 6], a5.flatten) + assert_equal(@cls[], @cls[].flatten) + assert_equal(@cls[], + @cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten) + end + + def test_flatten! + a1 = @cls[ 1, 2, 3] + a2 = @cls[ 5, 6 ] + a3 = @cls[ 4, a2 ] + a4 = @cls[ a1, a3 ] + assert_equal(@cls[1, 2, 3, 4, 5, 6], a4.flatten!) + assert_equal(@cls[1, 2, 3, 4, 5, 6], a4) + + a5 = @cls[ a1, @cls[], a3 ] + assert_equal(@cls[1, 2, 3, 4, 5, 6], a5.flatten!) + assert_equal(@cls[1, 2, 3, 4, 5, 6], a5) + + assert_equal(@cls[], @cls[].flatten) + assert_equal(@cls[], + @cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten) + end + + def test_hash + a1 = @cls[ 'cat', 'dog' ] + a2 = @cls[ 'cat', 'dog' ] + a3 = @cls[ 'dog', 'cat' ] + assert(a1.hash == a2.hash) + assert(a1.hash != a3.hash) + end + + def test_include? + a = @cls[ 'cat', 99, /a/, @cls[ 1, 2, 3] ] + assert(a.include?('cat')) + assert(a.include?(99)) + assert(a.include?(/a/)) + assert(a.include?([1,2,3])) + assert(!a.include?('ca')) + assert(!a.include?([1,2])) + end + + def test_index + a = @cls[ 'cat', 99, /a/, 99, @cls[ 1, 2, 3] ] + assert_equal(0, a.index('cat')) + assert_equal(1, a.index(99)) + assert_equal(4, a.index([1,2,3])) + assert_nil(a.index('ca')) + assert_nil(a.index([1,2])) + end + + def test_values_at + a = @cls[*('a'..'j').to_a] + assert_equal(@cls['a', 'c', 'e'], a.values_at(0, 2, 4)) + assert_equal(@cls['j', 'h', 'f'], a.values_at(-1, -3, -5)) + assert_equal(@cls['h', nil, 'a'], a.values_at(-3, 99, 0)) + end + + def test_join + $, = "" + a = @cls[] + assert_equal("", a.join) + assert_equal("", a.join(',')) + + $, = "" + a = @cls[1, 2] + assert_equal("12", a.join) + assert_equal("1,2", a.join(',')) + + $, = "" + a = @cls[1, 2, 3] + assert_equal("123", a.join) + assert_equal("1,2,3", a.join(',')) + + $, = ":" + a = @cls[1, 2, 3] + assert_equal("1:2:3", a.join) + assert_equal("1,2,3", a.join(',')) + + $, = "" + end + + def test_last + assert_equal(nil, @cls[].last) + assert_equal(1, @cls[1].last) + assert_equal(99, @cls[*(3..99).to_a].last) + end + + def test_length + assert_equal(0, @cls[].length) + assert_equal(1, @cls[1].length) + assert_equal(2, @cls[1, nil].length) + assert_equal(2, @cls[nil, 1].length) + assert_equal(234, @cls[*(0..233).to_a].length) + end + + # also update collect! + def test_map! + a = @cls[ 1, 'cat', 1..1 ] + assert_equal(@cls[ Fixnum, String, Range], a.map! {|e| e.class} ) + assert_equal(@cls[ Fixnum, String, Range], a) + + a = @cls[ 1, 'cat', 1..1 ] + assert_equal(@cls[ 99, 99, 99], a.map! { 99 } ) + assert_equal(@cls[ 99, 99, 99], a) + + a = @cls[ ] + assert_equal(@cls[], a.map! { 99 }) + assert_equal(@cls[], a) + end + + def test_nitems + assert_equal(0, @cls[].nitems) + assert_equal(1, @cls[1].nitems) + assert_equal(1, @cls[1, nil].nitems) + assert_equal(1, @cls[nil, 1].nitems) + assert_equal(3, @cls[1, nil, nil, 2, nil, 3, nil].nitems) + end + + def test_pack + a = @cls[*%w( cat wombat x yy)] + assert_equal("catwomx yy ", a.pack("A3A3A3A3")) + assert_equal("cat", a.pack("A*")) + assert_equal("cwx yy ", a.pack("A3@1A3@2A3A3")) + assert_equal("catwomx\000\000yy\000", a.pack("a3a3a3a3")) + assert_equal("cat", a.pack("a*")) + assert_equal("ca", a.pack("a2")) + assert_equal("cat\000\000", a.pack("a5")) + + assert_equal("\x61", @cls["01100001"].pack("B8")) + assert_equal("\x61", @cls["01100001"].pack("B*")) + assert_equal("\x61", @cls["0110000100110111"].pack("B8")) + assert_equal("\x61\x37", @cls["0110000100110111"].pack("B16")) + assert_equal("\x61\x37", @cls["01100001", "00110111"].pack("B8B8")) + assert_equal("\x60", @cls["01100001"].pack("B4")) + assert_equal("\x40", @cls["01100001"].pack("B2")) + + assert_equal("\x86", @cls["01100001"].pack("b8")) + assert_equal("\x86", @cls["01100001"].pack("b*")) + assert_equal("\x86", @cls["0110000100110111"].pack("b8")) + assert_equal("\x86\xec", @cls["0110000100110111"].pack("b16")) + assert_equal("\x86\xec", @cls["01100001", "00110111"].pack("b8b8")) + assert_equal("\x06", @cls["01100001"].pack("b4")) + assert_equal("\x02", @cls["01100001"].pack("b2")) + + assert_equal("ABC", @cls[ 65, 66, 67 ].pack("C3")) + assert_equal("\377BC", @cls[ -1, 66, 67 ].pack("C*")) + assert_equal("ABC", @cls[ 65, 66, 67 ].pack("c3")) + assert_equal("\377BC", @cls[ -1, 66, 67 ].pack("c*")) + + + assert_equal("AB\n\x10", @cls["4142", "0a", "12"].pack("H4H2H1")) + assert_equal("AB\n\x02", @cls["1424", "a0", "21"].pack("h4h2h1")) + + assert_equal("abc=02def=\ncat=\n=01=\n", + @cls["abc\002def", "cat", "\001"].pack("M9M3M4")) + + assert_equal("aGVsbG8K\n", @cls["hello\n"].pack("m")) + assert_equal(",:&5L;&\\*:&5L;&\\*\n", @cls["hello\nhello\n"].pack("u")) + + assert_equal("\xc2\xa9B\xe2\x89\xa0", @cls[0xa9, 0x42, 0x2260].pack("U*")) + + + format = "c2x5CCxsdils_l_a6"; + # Need the expression in here to force ary[5] to be numeric. This avoids + # test2 failing because ary2 goes str->numeric->str and ary does not. + ary = [1, -100, 127, 128, 32767, 987.654321098/100.0, + 12345, 123456, -32767, -123456, "abcdef"] + x = ary.pack(format) + ary2 = x.unpack(format) + + assert_equal(ary.length, ary2.length) + assert_equal(ary.join(':'), ary2.join(':')) + assert_not_nil(x =~ /def/) + +=begin + skipping "Not tested: + D,d & double-precision float, native format\\ + E & double-precision float, little-endian byte order\\ + e & single-precision float, little-endian byte order\\ + F,f & single-precision float, native format\\ + G & double-precision float, network (big-endian) byte order\\ + g & single-precision float, network (big-endian) byte order\\ + I & unsigned integer\\ + i & integer\\ + L & unsigned long\\ + l & long\\ + + N & long, network (big-endian) byte order\\ + n & short, network (big-endian) byte-order\\ + P & pointer to a structure (fixed-length string)\\ + p & pointer to a null-terminated string\\ + S & unsigned short\\ + s & short\\ + V & long, little-endian byte order\\ + v & short, little-endian byte order\\ + X & back up a byte\\ + x & null byte\\ + Z & ASCII string (null padded, count is width)\\ +" +=end + end + + def test_pop + a = @cls[ 'cat', 'dog' ] + assert_equal('dog', a.pop) + assert_equal(@cls['cat'], a) + assert_equal('cat', a.pop) + assert_equal(@cls[], a) + assert_nil(a.pop) + assert_equal(@cls[], a) + end + + def test_push + a = @cls[1, 2, 3] + assert_equal(@cls[1, 2, 3, 4, 5], a.push(4, 5)) + assert_equal(@cls[1, 2, 3, 4, 5, nil], a.push(nil)) + # Ruby 1.8 feature: + # Array#push accepts any number of arguments. + #assert_raise(ArgumentError, "a.push()") { a.push() } + a.push + assert_equal @cls[1, 2, 3, 4, 5, nil], a + a.push 6, 7 + assert_equal @cls[1, 2, 3, 4, 5, nil, 6, 7], a + end + + def test_rassoc + a1 = @cls[*%w( cat feline )] + a2 = @cls[*%w( dog canine )] + a3 = @cls[*%w( mule asinine )] + a = @cls[ a1, a2, a3 ] + + assert_equal(a1, a.rassoc('feline')) + assert_equal(a3, a.rassoc('asinine')) + assert_equal(nil, a.rassoc('dog')) + assert_equal(nil, a.rassoc('mule')) + assert_equal(nil, a.rassoc(1..2)) + end + + # also delete_if + def test_reject! + a = @cls[ 1, 2, 3, 4, 5 ] + assert_equal(nil, a.reject! { false }) + assert_equal(@cls[1, 2, 3, 4, 5], a) + + a = @cls[ 1, 2, 3, 4, 5 ] + assert_equal(a, a.reject! { true }) + assert_equal(@cls[], a) + + a = @cls[ 1, 2, 3, 4, 5 ] + assert_equal(a, a.reject! { |i| i > 3 }) + assert_equal(@cls[1, 2, 3], a) + end + + def test_replace + a = @cls[ 1, 2, 3] + a_id = a.__id__ + assert_equal(@cls[4, 5, 6], a.replace(@cls[4, 5, 6])) + assert_equal(@cls[4, 5, 6], a) + assert_equal(a_id, a.__id__) + assert_equal(@cls[], a.replace(@cls[])) + end + + def test_reverse + a = @cls[*%w( dog cat bee ant )] + assert_equal(@cls[*%w(ant bee cat dog)], a.reverse) + assert_equal(@cls[*%w(dog cat bee ant)], a) + assert_equal(@cls[], @cls[].reverse) + end + + def test_reverse! + a = @cls[*%w( dog cat bee ant )] + assert_equal(@cls[*%w(ant bee cat dog)], a.reverse!) + assert_equal(@cls[*%w(ant bee cat dog)], a) + # Ruby 1.8 feature change: + # Array#reverse always returns self. + #assert_nil(@cls[].reverse!) + assert_equal @cls[], @cls[].reverse! + end + + def test_reverse_each + a = @cls[*%w( dog cat bee ant )] + i = a.length + a.reverse_each { |e| + i -= 1 + assert_equal(a[i], e) + } + assert_equal(0, i) + + a = @cls[] + i = 0 + a.reverse_each { |e| + assert(false, "Never get here") + } + assert_equal(0, i) + end + + def test_rindex + a = @cls[ 'cat', 99, /a/, 99, [ 1, 2, 3] ] + assert_equal(0, a.rindex('cat')) + assert_equal(3, a.rindex(99)) + assert_equal(4, a.rindex([1,2,3])) + assert_nil(a.rindex('ca')) + assert_nil(a.rindex([1,2])) + end + + def test_shift + a = @cls[ 'cat', 'dog' ] + assert_equal('cat', a.shift) + assert_equal(@cls['dog'], a) + assert_equal('dog', a.shift) + assert_equal(@cls[], a) + assert_nil(a.shift) + assert_equal(@cls[], a) + end + + def test_size + assert_equal(0, @cls[].size) + assert_equal(1, @cls[1].size) + assert_equal(100, @cls[*(0..99).to_a].size) + end + + def test_slice + a = @cls[*(1..100).to_a] + + assert_equal(1, a.slice(0)) + assert_equal(100, a.slice(99)) + assert_nil(a.slice(100)) + assert_equal(100, a.slice(-1)) + assert_equal(99, a.slice(-2)) + assert_equal(1, a.slice(-100)) + assert_nil(a.slice(-101)) + + assert_equal(@cls[1], a.slice(0,1)) + assert_equal(@cls[100], a.slice(99,1)) + assert_equal(@cls[], a.slice(100,1)) + assert_equal(@cls[100], a.slice(99,100)) + assert_equal(@cls[100], a.slice(-1,1)) + assert_equal(@cls[99], a.slice(-2,1)) + + assert_equal(@cls[10, 11, 12], a.slice(9, 3)) + assert_equal(@cls[10, 11, 12], a.slice(-91, 3)) + + assert_equal(@cls[1], a.slice(0..0)) + assert_equal(@cls[100], a.slice(99..99)) + assert_equal(@cls[], a.slice(100..100)) + assert_equal(@cls[100], a.slice(99..200)) + assert_equal(@cls[100], a.slice(-1..-1)) + assert_equal(@cls[99], a.slice(-2..-2)) + + assert_equal(@cls[10, 11, 12], a.slice(9..11)) + assert_equal(@cls[10, 11, 12], a.slice(-91..-89)) + + assert_nil(a.slice(10, -3)) + # Ruby 1.8 feature change: + # Array#slice[size..x] always returns []. + #assert_nil(a.slice(10..7)) + assert_equal @cls[], a.slice(10..7) + end + + def test_slice! + a = @cls[1, 2, 3, 4, 5] + assert_equal(3, a.slice!(2)) + assert_equal(@cls[1, 2, 4, 5], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(4, a.slice!(-2)) + assert_equal(@cls[1, 2, 3, 5], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(@cls[3,4], a.slice!(2,2)) + assert_equal(@cls[1, 2, 5], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(@cls[4,5], a.slice!(-2,2)) + assert_equal(@cls[1, 2, 3], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(@cls[3,4], a.slice!(2..3)) + assert_equal(@cls[1, 2, 5], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(nil, a.slice!(20)) + assert_equal(@cls[1, 2, 3, 4, 5], a) + end + + def test_sort + a = @cls[ 4, 1, 2, 3 ] + assert_equal(@cls[1, 2, 3, 4], a.sort) + assert_equal(@cls[4, 1, 2, 3], a) + + assert_equal(@cls[4, 3, 2, 1], a.sort { |x, y| y <=> x} ) + assert_equal(@cls[4, 1, 2, 3], a) + + a.fill(1) + assert_equal(@cls[1, 1, 1, 1], a.sort) + + assert_equal(@cls[], @cls[].sort) + end + + def test_sort! + a = @cls[ 4, 1, 2, 3 ] + assert_equal(@cls[1, 2, 3, 4], a.sort!) + assert_equal(@cls[1, 2, 3, 4], a) + + assert_equal(@cls[4, 3, 2, 1], a.sort! { |x, y| y <=> x} ) + assert_equal(@cls[4, 3, 2, 1], a) + + a.fill(1) + assert_equal(@cls[1, 1, 1, 1], a.sort!) + + assert_equal(@cls[1], @cls[1].sort!) + assert_equal(@cls[], @cls[].sort!) + end + + def test_to_a + a = @cls[ 1, 2, 3 ] + a_id = a.__id__ + assert_equal(a, a.to_a) + assert_equal(a_id, a.to_a.__id__) + end + + def test_to_ary + a = [ 1, 2, 3 ] + b = @cls[*a] + + a_id = a.__id__ + assert_equal(a, b.to_ary) + if (@cls == Array) + assert_equal(a_id, a.to_ary.__id__) + end + end + + def test_to_s + $, = "" + a = @cls[] + assert_equal("[]", a.to_s) + + $, = "" + a = @cls[1, 2] + assert_equal("[1, 2]", a.to_s) + + $, = "" + a = @cls[1, 2, 3] + assert_equal("[1, 2, 3]", a.to_s) + + $, = ":" + a = @cls[1, 2, 3] + assert_equal("[1, 2, 3]", a.to_s) + + $, = "" + end + + def test_uniq + a = @cls[ 1, 2, 3, 2, 1, 2, 3, 4, nil ] + b = a.dup + assert_equal(@cls[1, 2, 3, 4, nil], a.uniq) + assert_equal(b, a) + + assert_equal(@cls[1, 2, 3], @cls[1, 2, 3].uniq) + end + + def test_uniq! + a = @cls[ 1, 2, 3, 2, 1, 2, 3, 4, nil ] + assert_equal(@cls[1, 2, 3, 4, nil], a.uniq!) + assert_equal(@cls[1, 2, 3, 4, nil], a) + + assert_nil(@cls[1, 2, 3].uniq!) + end + + def test_unshift + a = @cls[] + assert_equal(@cls['cat'], a.unshift('cat')) + assert_equal(@cls['dog', 'cat'], a.unshift('dog')) + assert_equal(@cls[nil, 'dog', 'cat'], a.unshift(nil)) + assert_equal(@cls[@cls[1,2], nil, 'dog', 'cat'], a.unshift(@cls[1, 2])) + end + + def test_OR # '|' + assert_equal(@cls[], @cls[] | @cls[]) + assert_equal(@cls[1], @cls[1] | @cls[]) + assert_equal(@cls[1], @cls[] | @cls[1]) + assert_equal(@cls[1], @cls[1] | @cls[1]) + + assert_equal(@cls[1,2], @cls[1] | @cls[2]) + assert_equal(@cls[1,2], @cls[1, 1] | @cls[2, 2]) + assert_equal(@cls[1,2], @cls[1, 2] | @cls[1, 2]) + end + end diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb new file mode 100644 index 0000000000..3e52ef62d3 --- /dev/null +++ b/test/ruby/test_basicinstructions.rb @@ -0,0 +1,628 @@ +require 'test/unit' + +ConstTest = 3 +class Class + alias _remove_const remove_const + public :_remove_const +end + +class TestBasicInstructions < Test::Unit::TestCase + + def test_immediates + assert_equal((1==1), true) + assert_equal((1==2), false) + assert_equal [][0], nil + assert_equal "sym".intern, :sym + assert_equal "sym".intern, :"sym" + assert_equal 1234 + 0, 1234 + assert_equal 1234, 1_2_3_4 + assert_equal 41, 0b0101001 + assert_equal 420, 0644 + assert_equal 18, 0x12 + assert_equal 123456789012345678901234567890 + 0, + 123456789012345678901234567890 + assert_equal 1.234 + 0.0, 1.234 + end + + def test_self + assert_equal self, self + assert_equal false, (self == false) # Qfalse==0 in C + assert_equal false, (self == nil) + assert_equal false, (self == 0) + end + + def test_string + expected = "str" + "ing" + assert_equal expected, 'string' + assert_equal expected, "string" + assert_equal expected, %q(string) + assert_equal expected, %Q(string) + assert_equal expected, %(string) + end + + def test_dstring + assert_equal "2", "#{1+1}" + s = "OK" + assert_equal "OK", "#{s}" + assert_equal "OKx", "#{s}x" + assert_equal "xOK", "x#{s}" + assert_equal "xOKx", "x#{s}x" + end + + def test_dsym + assert_equal :a3c, :"a#{1+2}c" + s = "sym" + assert_equal :sym, :"#{s}" + assert_equal :sym, :"#{"#{"#{s}"}"}" + end + + def test_xstr + assert_equal 'hoge', `echo hoge`.chomp + assert_equal '3', `echo #{1 + 2}`.chomp + hoge = 'huga' + assert_equal 'huga', `echo #{hoge}`.chomp + end + + def test_regexp + assert_equal /test/, /test/ + assert_equal 'test', /test/.source + assert_equal 'TEST', /TEST/.source + assert_equal true, !!(/test/ =~ 'test') + assert_equal false, !!(/test/ =~ 'does not match') + + re = /test/ + assert_equal re, re + assert_equal 'test', re.source + assert_equal true, !!(re =~ 'test') + assert_equal false, !!(re =~ 'does not match') + + assert_equal /x#{1+1}x/, /x#{1+1}x/ + s = "OK" + assert_equal /x#{s}x/, /x#{s}x/ + assert_equal true, !!(/x#{s}x/ =~ "xOKx") + assert_equal false, !!(/x#{s}x/ =~ "does not match") + + s = "OK" + prev = nil + 3.times do + assert_equal prev.object_id, (prev ||= /#{s}/o).object_id if prev + end + end + + def test_array + assert_equal [], [] + assert_equal 0, [].size + assert_equal [1, 2, 3], [1, 2, 3] + assert_equal [3, 7, 11], [1+2, 3+4, 5+6] + assert_equal [[1], [2], [3]], [[1], [2], [3]] + + a = [1, 2, 3] + assert_equal 1, a[0] + assert_equal 2, a[1] + assert_equal 3, a[2] + assert_nil a[3] + + a = %w( a b c ) + assert_equal 'a', a[0] + assert_equal 'b', a[1] + assert_equal 'c', a[2] + assert_nil a[3] + end + + def test_hash + assert_equal({}, {}) + assert_equal({1=>2}, {1=>2}) + assert_equal({1=>2, 3=>4}, {1=>2, 3=>4}) + assert_equal({1=>2, 3=>4}, {3=>4, 1=>2}) + assert_equal({1=>2, 3=>4}, {1,2, 3,4}) + assert_equal({"key"=>"val"}, {"key"=>"val"}) + end + + def test_range + assert_equal((1..3), (1..3)) + assert_equal((1...3), (1...3)) + assert_not_equal((1...3), (1..3)) + assert_not_equal((1..3), (1...3)) + assert_equal((1..3), (1..2+1)) + assert_equal((1...3), (1...2+1)) + assert_equal(('a'..'z'), ('a'..'z')) + end + + def test_not + assert_equal true, !nil + assert_equal true, !false + assert_equal false, !true + assert_equal false, !3 + assert_equal false, !(1+1) + + assert_equal false, !!nil + assert_equal false, !!false + assert_equal true, !!true + assert_equal true, !!3 + assert_equal true, !!(1+1) + + assert_equal true, (not nil) + assert_equal true, (not false) + assert_equal false, (not true) + assert_equal false, (not 3) + assert_equal false, (not (1 + 1)) + + assert_equal false, (not not nil) + assert_equal false, (not not false) + assert_equal true, (not not true) + assert_equal true, (not not 3) + assert_equal true, (not not (1+1)) + end + + def test_local_variable + a = 7 + assert_equal 7, a + assert_equal a, a + b = 17 + assert_equal 7, a + assert_equal 17, b + assert_equal a, a + assert_equal b, b + assert_not_equal a, b + assert_not_equal b, a + a = b + assert_equal 17, a + assert_equal 17, b + assert_equal a, a + assert_equal b, b + assert_equal a, b + assert_equal b, a + c = 28 + assert_equal 17, a + assert_equal 17, b + assert_equal 28, c + assert_equal a, a + assert_equal b, b + assert_equal a, b + assert_equal c, c + assert_not_equal a, c + assert_not_equal b, c + a = b = c + assert_equal 28, a + assert_equal 28, b + assert_equal 28, c + assert_equal a, a + assert_equal b, b + assert_equal a, b + assert_equal b, a + assert_equal a, c + assert_equal c, a + assert_equal b, c + assert_equal c, b + + a = 1 + b = 2 + c = 3 + set_lvar_in_another_method + assert_equal 1, a + assert_equal 2, b + assert_equal 3, c + end + + def set_lvar_in_another_method + assert_raise(NameError) { a } + assert_raise(NameError) { b } + assert_raise(NameError) { c } + a = "NOT OK" + b = "NOT OK" + c = "NOT OK" + end + + class Const + $Const = self + C = 'Const::C' + def self.c() C end + def c() C end + + class A + C = 'Const::A::C' + def self.c() C end + def c() C end + CC = 'Const::A::CC' + def self.cc() CC end + def cc() CC end + + class B + C = 'Const::A::B::C' + def self.c() C end + def c() C end + def self.cc() CC end + def cc() CC end + end + end + + class AA < A + def self.cc() CC end + def cc() CC end + end + + class AAA < AA + def self.cc() CC end + def cc() CC end + end + end + C = 0 + + def test_const_path + do_test_const_path + do_test_const_path + do_test_const_path + end + + def do_test_const_path + assert_equal 0, C + assert_equal 0, C + assert_equal 3, ::ConstTest + assert_equal 3, ::ConstTest + assert_equal $Const, Const + + assert_equal 'Const::C', Const::C + assert_equal 'Const::C', Const::C + assert_equal 'Const::A::C', Const::A::C + assert_equal 'Const::A::C', Const::A::C + assert_equal 'Const::A::B::C', Const::A::B::C + assert_equal 'Const::A::B::C', Const::A::B::C + + Const::A::B._remove_const :C + assert_equal 'Const::C', Const::C + assert_equal 'Const::A::C', Const::A::C + assert_raise(NameError) { Const::A::B::C } + + Const::A._remove_const :C + assert_equal 'Const::C', Const::C + assert_raise(NameError) { Const::A::C } + assert_raise(NameError) { Const::A::B::C } + + Const._remove_const :C + assert_raise(NameError) { Const::C } + assert_raise(NameError) { Const::A::C } + assert_raise(NameError) { Const::A::B::C } + + Const::A.const_set :C, 'Const::A::C' + assert_raise(NameError) { Const::C } + assert_equal 'Const::A::C', Const::A::C + assert_raise(NameError) { Const::A::B::C } + + Const::A::B.const_set :C, 'Const::A::B::C' + assert_raise(NameError) { Const::C } + assert_equal 'Const::A::C', Const::A::C + assert_equal 'Const::A::B::C', Const::A::B::C + + Const.const_set :C, 'Const::C' + assert_equal 'Const::C', Const::C + assert_equal 'Const::A::C', Const::A::C + assert_equal 'Const::A::B::C', Const::A::B::C + end + + def test_const_cref + do_test_const_cref + do_test_const_cref + do_test_const_cref + end + + def do_test_const_cref + assert_equal 'Const::C', Const.new.c + assert_equal 'Const::A::C', Const::A.new.c + assert_equal 'Const::A::B::C', Const::A::B.new.c + + assert_equal 'Const::C', Const.c + assert_equal 'Const::A::C', Const::A.c + assert_equal 'Const::A::B::C', Const::A::B.c + + Const::A::B._remove_const :C + assert_equal 'Const::C', Const.c + assert_equal 'Const::A::C', Const::A.c + assert_equal 'Const::A::C', Const::A::B.c + assert_equal 'Const::C', Const.new.c + assert_equal 'Const::A::C', Const::A.new.c + assert_equal 'Const::A::C', Const::A::B.new.c + + Const::A._remove_const :C + assert_equal 'Const::C', Const.c + assert_equal 'Const::C', Const::A.c + assert_equal 'Const::C', Const::A::B.c + assert_equal 'Const::C', Const.new.c + assert_equal 'Const::C', Const::A.new.c + assert_equal 'Const::C', Const::A::B.new.c + + Const::A::B.const_set :C, 'Const::A::B::C' + assert_equal 'Const::C', Const.c + assert_equal 'Const::C', Const::A.c + assert_equal 'Const::A::B::C', Const::A::B.c + assert_equal 'Const::C', Const.new.c + assert_equal 'Const::C', Const::A.new.c + assert_equal 'Const::A::B::C', Const::A::B.new.c + + Const::A.const_set :C, 'Const::A::C' + assert_equal 'Const::C', Const.c + assert_equal 'Const::A::C', Const::A.c + assert_equal 'Const::A::B::C', Const::A::B.c + assert_equal 'Const::C', Const.new.c + assert_equal 'Const::A::C', Const::A.new.c + assert_equal 'Const::A::B::C', Const::A::B.new.c + ensure + # reset + Const.const_set :C, 'Const::C' unless Const.const_defined?(:C) + Const::A.const_set :C, 'Const::A::C' unless Const::A.const_defined?(:C) + Const::A::B.const_set :C, 'Const::A::B::C' unless Const::A::B.const_defined?(:C) + end + + def test_const_inherit + do_test_const_inherit + do_test_const_inherit + do_test_const_inherit + end + + def do_test_const_inherit + assert_equal 'Const::A::CC', Const::A.cc + assert_equal 'Const::A::CC', Const::AA.cc + assert_equal 'Const::A::CC', Const::AAA.cc + assert_equal 'Const::A::CC', Const::A.new.cc + assert_equal 'Const::A::CC', Const::AA.new.cc + assert_equal 'Const::A::CC', Const::AAA.new.cc + + Const::AA.const_set :CC, 'Const::AA::CC' + assert_equal 'Const::A::CC', Const::A.cc + assert_equal 'Const::AA::CC', Const::AA.cc + assert_equal 'Const::AA::CC', Const::AAA.cc + assert_equal 'Const::A::CC', Const::A.new.cc + assert_equal 'Const::AA::CC', Const::AA.new.cc + assert_equal 'Const::AA::CC', Const::AAA.new.cc + + Const::AAA.const_set :CC, 'Const::AAA::CC' + assert_equal 'Const::A::CC', Const::A.cc + assert_equal 'Const::AA::CC', Const::AA.cc + assert_equal 'Const::AAA::CC', Const::AAA.cc + assert_equal 'Const::A::CC', Const::A.new.cc + assert_equal 'Const::AA::CC', Const::AA.new.cc + assert_equal 'Const::AAA::CC', Const::AAA.new.cc + + Const::AA._remove_const :CC + assert_equal 'Const::A::CC', Const::A.cc + assert_equal 'Const::A::CC', Const::AA.cc + assert_equal 'Const::AAA::CC', Const::AAA.cc + assert_equal 'Const::A::CC', Const::A.new.cc + assert_equal 'Const::A::CC', Const::AA.new.cc + assert_equal 'Const::AAA::CC', Const::AAA.new.cc + + Const::AAA._remove_const :CC + assert_equal 'Const::A::CC', Const::A.cc + assert_equal 'Const::A::CC', Const::AA.cc + assert_equal 'Const::A::CC', Const::AAA.cc + assert_equal 'Const::A::CC', Const::A.new.cc + assert_equal 'Const::A::CC', Const::AA.new.cc + assert_equal 'Const::A::CC', Const::AAA.new.cc + end + + def test_global_variable + $gvar1 = 1 + assert_equal 1, $gvar1 + $gvar1 = 2 + assert_equal 2, $gvar1 + $gvar2 = 77 + assert_equal 2, $gvar1 + assert_equal 77, $gvar2 + $gvar2 = $gvar1 + assert_equal 2, $gvar1 + assert_equal 2, $gvar2 + $gvar1 = 1 + assert_equal 1, $gvar1 + assert_equal 2, $gvar2 + set_gvar_in_another_method + assert_equal "OK1", $gvar1 + assert_equal "OK2", $gvar2 + end + + def set_gvar_in_another_method + assert_equal 1, $gvar1 + assert_equal 2, $gvar2 + $gvar1 = "OK1" + $gvar2 = "OK2" + end + + class CVarA + @@cv = 'CVarA@@cv' + def self.cv() @@cv end + def self.cv=(v) @@cv = v end + class << self + def cv2() @@cv end + end + def cv() @@cv end + def cv=(v) @@cv = v end + end + + class CVarB < CVarA + def self.cvB() @@cv end + def self.cvB=(v) @@cv = v end + class << self + def cvB2() @@cv end + end + def cvB() @@cv end + def cvB=(v) @@cv = v end + end + + def test_class_variable + assert_equal 'CVarA@@cv', CVarA.cv + assert_equal 'CVarA@@cv', CVarA.cv2 + assert_equal 'CVarA@@cv', CVarA.new.cv + CVarA.cv = 'singleton' + assert_equal 'singleton', CVarA.cv + assert_equal 'singleton', CVarA.cv2 + assert_equal 'singleton', CVarA.new.cv + CVarA.new.cv = 'instance' + assert_equal 'instance', CVarA.cv + assert_equal 'instance', CVarA.cv2 + assert_equal 'instance', CVarA.new.cv + + CVarA.cv = 'CVarA@@cv' + CVarB.cv = 'B/singleton' + assert_equal 'B/singleton', CVarB.cv + assert_equal 'B/singleton', CVarB.cv2 + assert_equal 'B/singleton', CVarB.new.cv + assert_equal 'B/singleton', CVarA.cv + assert_equal 'B/singleton', CVarA.cv2 + assert_equal 'B/singleton', CVarA.new.cv + CVarB.new.cv = 'B/instance' + assert_equal 'B/instance', CVarB.cv + assert_equal 'B/instance', CVarB.cv2 + assert_equal 'B/instance', CVarB.new.cv + assert_equal 'B/instance', CVarA.cv + assert_equal 'B/instance', CVarA.cv2 + assert_equal 'B/instance', CVarA.new.cv + + CVarA.cv = 'CVarA@@cv' + assert_raise(NameError) { CVarB.cvB } + assert_raise(NameError) { CVarB.cvB2 } + assert_raise(NameError) { CVarB.new.cvB } + CVarB.cvB = 'B/singleton' + assert_equal 'B/singleton', CVarB.cvB + assert_equal 'B/singleton', CVarB.cvB2 + assert_equal 'B/singleton', CVarB.new.cvB + assert_equal 'CVarA@@cv', CVarA.cv + assert_equal 'CVarA@@cv', CVarA.cv2 + assert_equal 'CVarA@@cv', CVarA.new.cv + CVarB.new.cvB = 'B/instance' + assert_equal 'B/instance', CVarB.cvB + assert_equal 'B/instance', CVarB.cvB2 + assert_equal 'B/instance', CVarB.new.cvB + assert_equal 'CVarA@@cv', CVarA.cv + assert_equal 'CVarA@@cv', CVarA.cv2 + assert_equal 'CVarA@@cv', CVarA.new.cv + + CVarA.cv = 'CVarA@@cv' + CVarB.cvB = 'CVarB@@cv' + end + + class OP + attr_accessor :x + end + + def test_opassign + x = nil + x ||= 1 + assert_equal 1, x + x &&= 2 + assert_equal 2, x + x ||= 3 + assert_equal 2, x + x &&= 4 + assert_equal 4, x + + y = OP.new + y.x = nil + y.x ||= 1 + assert_equal 1, y.x + y.x &&= 2 + assert_equal 2, y.x + y.x ||= 3 + assert_equal 2, y.x + y.x &&= 4 + assert_equal 4, y.x + + z = OP.new + z.x = y + z.x.x = nil + z.x.x ||= 1 + assert_equal 1, z.x.x + z.x.x &&= 2 + assert_equal 2, z.x.x + z.x.x ||= 3 + assert_equal 2, z.x.x + z.x.x &&= 4 + assert_equal 4, z.x.x + + a = [] + a[0] = nil + a[0] ||= 1 + assert_equal 1, a[0] + a[0] &&= 2 + assert_equal 2, a[0] + a[0] ||= 3 + assert_equal 2, a[0] + a[0] &&= 4 + assert_equal 4, a[0] + end + + def test_backref + /re/ =~ 'not match' + assert_nil $~ + assert_nil $` + assert_nil $& + assert_nil $' + assert_nil $+ + assert_nil $1 + assert_nil $2 + assert_nil $3 + assert_nil $4 + assert_nil $5 + assert_nil $6 + assert_nil $7 + assert_nil $8 + assert_nil $9 + + /(a)(b)(c)(d)(e)(f)(g)(h)(i)/ =~ 'xabcdefghiy' + assert_not_nil $~ + assert_instance_of MatchData, $~ + assert_equal 'abcdefghi', $~[0] + assert_equal 'a', $~[1] + assert_equal 'b', $~[2] + assert_equal 'c', $~[3] + assert_equal 'd', $~[4] + assert_equal 'e', $~[5] + assert_equal 'f', $~[6] + assert_equal 'g', $~[7] + assert_equal 'h', $~[8] + assert_equal 'i', $~[9] + assert_equal 'x', $` + assert_equal 'abcdefghi', $& + assert_equal 'y', $' + assert_equal 'i', $+ + assert_equal 'a', $1 + assert_equal 'b', $2 + assert_equal 'c', $3 + assert_equal 'd', $4 + assert_equal 'e', $5 + assert_equal 'f', $6 + assert_equal 'g', $7 + assert_equal 'h', $8 + assert_equal 'i', $9 + + /re/ =~ 'not match' + assert_nil $~ + assert_nil $` + assert_nil $& + assert_nil $' + assert_nil $+ + assert_nil $1 + assert_nil $2 + assert_nil $3 + assert_nil $4 + assert_nil $5 + assert_nil $6 + assert_nil $7 + assert_nil $8 + assert_nil $9 + end + + def test_array_splat + a = [] + assert_equal [], [*a] + assert_equal [1], [1, *a] + a = [2] + assert_equal [2], [*a] + assert_equal [1, 2], [1, *a] + a = [2, 3] + assert_equal [2, 3], [*a] + assert_equal [1, 2, 3], [1, *a] + + a = nil + assert_equal [nil], [*a] # FIXME: []? [nil]? error? + assert_equal [1], [1, *a] # FIXME: [1, nil]? error? + end + +end diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index a8e5913b10..82b8880894 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -12,9 +12,9 @@ class TestBeginEndBlock < Test::Unit::TestCase def test_beginendblock ruby = EnvUtil.rubybin target = File.join(DIR, 'beginmainend.rb') - io = IO.popen("#{q(ruby)} #{q(target)}") - assert_equal(%w(b1 b2-1 b2 main b3-1 b3 b4 e1 e4 e3 e2 e4-2 e4-1 e1-1 e4-1-1), io.read.split) - io.close + IO.popen("#{q(ruby)} #{q(target)}"){|io| + assert_equal(%w(b1 b2-1 b2 main b3-1 b3 b4 e1 e4 e3 e2 e4-2 e4-1 e1-1 e4-1-1), io.read.split) + } end def test_begininmethod @@ -46,11 +46,16 @@ EOF errout.close erroutpath = errout.path system("#{q(ruby)} #{q(launcherpath)} #{q(erroutpath)}") +# expected = <<EOW +#endblockwarn.rb:2: warning: END in method; use at_exit +#(eval):2: warning: END in method; use at_exit +#EOW expected = <<EOW -endblockwarn.rb:2: warning: END in method; use at_exit -(eval):2: warning: END in method; use at_exit +warning: END in method; use at_exit +warning: END in method; use at_exit EOW assert_equal(expected, File.read(erroutpath)) # expecting Tempfile to unlink launcher and errout file. end + end diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb new file mode 100644 index 0000000000..fa8a40f39b --- /dev/null +++ b/test/ruby/test_class.rb @@ -0,0 +1,80 @@ +require 'test/unit' + +class TestClass < Test::Unit::TestCase + + # ------------------ + # Various test classes + # ------------------ + + class ClassOne + attr :num_args + @@subs = [] + def initialize(*args) + @num_args = args.size + @args = args + end + def [](n) + @args[n] + end + def ClassOne.inherited(klass) + @@subs.push klass + end + def subs + @@subs + end + end + + class ClassTwo < ClassOne + end + + class ClassThree < ClassOne + end + + class ClassFour < ClassThree + end + + # ------------------ + # Start of tests + # ------------------ + + def test_s_inherited + assert_equal([ClassTwo, ClassThree, ClassFour], ClassOne.new.subs) + end + + def test_s_new + c = Class.new + assert_same(Class, c.class) + assert_same(Object, c.superclass) + + c = Class.new(Fixnum) + assert_same(Class, c.class) + assert_same(Fixnum, c.superclass) + end + + def test_00_new_basic + a = ClassOne.new + assert_equal(ClassOne, a.class) + assert_equal(0, a.num_args) + + a = ClassOne.new(1, 2, 3) + assert_equal(3, a.num_args) + assert_equal(1, a[0]) + end + + def test_01_new_inherited + a = ClassTwo.new + assert_equal(ClassTwo, a.class) + assert_equal(0, a.num_args) + + a = ClassTwo.new(1, 2, 3) + assert_equal(3, a.num_args) + assert_equal(1, a[0]) + end + + def test_superclass + assert_equal(ClassOne, ClassTwo.superclass) + assert_equal(Object, ClassTwo.superclass.superclass) + assert_equal(BasicObject, ClassTwo.superclass.superclass.superclass) + end + +end diff --git a/test/ruby/test_clone.rb b/test/ruby/test_clone.rb index 43c0cffa1d..67d79fb8a5 100644 --- a/test/ruby/test_clone.rb +++ b/test/ruby/test_clone.rb @@ -23,6 +23,6 @@ class TestClone < Test::Unit::TestCase assert_raises(NoMethodError) {foo.test2} - assert_equal([M003, M002, M001], M003.ancestors) + assert_equal([M003, M002, M001, M002], M003.ancestors) end end diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb index 8d01379dbd..3708a5a0ca 100644 --- a/test/ruby/test_const.rb +++ b/test/ruby/test_const.rb @@ -15,19 +15,34 @@ class TestConst < Test::Unit::TestCase end def test_const + assert defined?(TEST1) + assert_equal 1, TEST1 + assert defined?(TEST2) + assert_equal 2, TEST2 + self.class.class_eval { include Const } - assert_equal([1,2,3,4], [TEST1,TEST2,TEST3,TEST4]) + assert defined?(TEST1) + assert_equal 1, TEST1 + assert defined?(TEST2) + assert_equal 2, TEST2 + assert defined?(TEST3) + assert_equal 3, TEST3 + assert defined?(TEST4) + assert_equal 4, TEST4 self.class.class_eval { include Const2 } STDERR.print "intentionally redefines TEST3, TEST4\n" if $VERBOSE - assert_equal([1,2,6,8], [TEST1,TEST2,TEST3,TEST4]) - - assert_equal(-1, (String <=> Object)) - assert_equal(1, (Object <=> String)) - assert_equal(nil, (Array <=> String)) + assert defined?(TEST1) + assert_equal 1, TEST1 + assert defined?(TEST2) + assert_equal 2, TEST2 + assert defined?(TEST3) + assert_equal 6, TEST3 + assert defined?(TEST4) + assert_equal 8, TEST4 end end diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb index 7887d37670..c419bd8d4e 100644 --- a/test/ruby/test_dir.rb +++ b/test/ruby/test_dir.rb @@ -39,4 +39,14 @@ class TestDir < Test::Unit::TestCase dir.close end end + + def test_JVN_13947696 + b = lambda { + d = Dir.open('.') + $SAFE = 4 + d.close + } + assert_raise(SecurityError) { b.call } + end + end diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index 28e5cd2c25..e79d1c82ec 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -1,7 +1,216 @@ require 'test/unit' class TestEval < Test::Unit::TestCase - # eval with binding + + @ivar = 12 + @@cvar = 13 + $gvar__eval = 14 + Const = 15 + + def test_eval_basic + assert_equal nil, eval("nil") + assert_equal true, eval("true") + assert_equal false, eval("false") + assert_equal self, eval("self") + assert_equal 1, eval("1") + assert_equal :sym, eval(":sym") + + assert_equal 11, eval("11") + @ivar = 12 + assert_equal 12, eval("@ivar") + assert_equal 13, eval("@@cvar") + assert_equal 14, eval("$gvar__eval") + assert_equal 15, eval("Const") + + assert_equal 16, eval("7 + 9") + assert_equal 17, eval("17.to_i") + assert_equal "18", eval(%q("18")) + assert_equal "19", eval(%q("1#{9}")) + + 1.times { + assert_equal 12, eval("@ivar") + assert_equal 13, eval("@@cvar") + assert_equal 14, eval("$gvar__eval") + assert_equal 15, eval("Const") + } + end + + def test_eval_binding_basic + assert_equal nil, eval("nil", binding()) + assert_equal true, eval("true", binding()) + assert_equal false, eval("false", binding()) + assert_equal self, eval("self", binding()) + assert_equal 1, eval("1", binding()) + assert_equal :sym, eval(":sym", binding()) + + assert_equal 11, eval("11", binding()) + @ivar = 12 + assert_equal 12, eval("@ivar", binding()) + assert_equal 13, eval("@@cvar", binding()) + assert_equal 14, eval("$gvar__eval", binding()) + assert_equal 15, eval("Const", binding()) + + assert_equal 16, eval("7 + 9", binding()) + assert_equal 17, eval("17.to_i", binding()) + assert_equal "18", eval(%q("18"), binding()) + assert_equal "19", eval(%q("1#{9}"), binding()) + + 1.times { + assert_equal 12, eval("@ivar") + assert_equal 13, eval("@@cvar") + assert_equal 14, eval("$gvar__eval") + assert_equal 15, eval("Const") + } + end + + def test_module_eval_string_basic + c = self.class + assert_equal nil, c.module_eval("nil") + assert_equal true, c.module_eval("true") + assert_equal false, c.module_eval("false") + assert_equal c, c.module_eval("self") + assert_equal :sym, c.module_eval(":sym") + assert_equal 11, c.module_eval("11") + @ivar = 12 + assert_equal 12, c.module_eval("@ivar") + assert_equal 13, c.module_eval("@@cvar") + assert_equal 14, c.module_eval("$gvar__eval") + assert_equal 15, c.module_eval("Const") + assert_equal 16, c.module_eval("7 + 9") + assert_equal 17, c.module_eval("17.to_i") + assert_equal "18", c.module_eval(%q("18")) + assert_equal "19", c.module_eval(%q("1#{9}")) + + @ivar = 12 + 1.times { + assert_equal 12, c.module_eval("@ivar") + assert_equal 13, c.module_eval("@@cvar") + assert_equal 14, c.module_eval("$gvar__eval") + assert_equal 15, c.module_eval("Const") + } + end + + def test_module_eval_block_basic + c = self.class + assert_equal nil, c.module_eval { nil } + assert_equal true, c.module_eval { true } + assert_equal false, c.module_eval { false } + assert_equal c, c.module_eval { self } + assert_equal :sym, c.module_eval { :sym } + assert_equal 11, c.module_eval { 11 } + @ivar = 12 + assert_equal 12, c.module_eval { @ivar } + assert_equal 13, c.module_eval { @@cvar } + assert_equal 14, c.module_eval { $gvar__eval } + assert_equal 15, c.module_eval { Const } + assert_equal 16, c.module_eval { 7 + 9 } + assert_equal 17, c.module_eval { "17".to_i } + assert_equal "18", c.module_eval { "18" } + assert_equal "19", c.module_eval { "1#{9}" } + + @ivar = 12 + 1.times { + assert_equal 12, c.module_eval { @ivar } + assert_equal 13, c.module_eval { @@cvar } + assert_equal 14, c.module_eval { $gvar__eval } + assert_equal 15, c.module_eval { Const } + } + end + + def forall_TYPE(mid) + objects = [Object.new, [], nil, true, false, 77, ] #:sym] # TODO: check + objects.each do |obj| + obj.instance_variable_set :@ivar, 12 + obj.class.class_variable_set :@@cvar, 13 + # Use same value with env. See also test_instance_variable_cvar. + obj.class.const_set :Const, 15 unless obj.class.const_defined?(:Const) + funcall mid, obj + end + end + + def test_instance_eval_string_basic + forall_TYPE :instance_eval_string_basic_i + end + + def instance_eval_string_basic_i(o) + assert_equal nil, o.instance_eval("nil") + assert_equal true, o.instance_eval("true") + assert_equal false, o.instance_eval("false") + assert_equal o, o.instance_eval("self") + assert_equal 1, o.instance_eval("1") + assert_equal :sym, o.instance_eval(":sym") + + assert_equal 11, o.instance_eval("11") + assert_equal 12, o.instance_eval("@ivar") + begin + assert_equal 13, o.instance_eval("@@cvar") + rescue => err + assert false, "cannot get cvar from #{o.class}" + end + assert_equal 14, o.instance_eval("$gvar__eval") + assert_equal 15, o.instance_eval("Const") + assert_equal 16, o.instance_eval("7 + 9") + assert_equal 17, o.instance_eval("17.to_i") + assert_equal "18", o.instance_eval(%q("18")) + assert_equal "19", o.instance_eval(%q("1#{9}")) + + 1.times { + assert_equal 12, o.instance_eval("@ivar") + assert_equal 13, o.instance_eval("@@cvar") + assert_equal 14, o.instance_eval("$gvar__eval") + assert_equal 15, o.instance_eval("Const") + } + end + + def test_instance_eval_block_basic + forall_TYPE :instance_eval_block_basic_i + end + + def instance_eval_block_basic_i(o) + assert_equal nil, o.instance_eval { nil } + assert_equal true, o.instance_eval { true } + assert_equal false, o.instance_eval { false } + assert_equal o, o.instance_eval { self } + assert_equal 1, o.instance_eval { 1 } + assert_equal :sym, o.instance_eval { :sym } + + assert_equal 11, o.instance_eval { 11 } + assert_equal 12, o.instance_eval { @ivar } + assert_equal 13, o.instance_eval { @@cvar } + assert_equal 14, o.instance_eval { $gvar__eval } + assert_equal 15, o.instance_eval { Const } + assert_equal 16, o.instance_eval { 7 + 9 } + assert_equal 17, o.instance_eval { 17.to_i } + assert_equal "18", o.instance_eval { "18" } + assert_equal "19", o.instance_eval { "1#{9}" } + + 1.times { + assert_equal 12, o.instance_eval { @ivar } + assert_equal 13, o.instance_eval { @@cvar } + assert_equal 14, o.instance_eval { $gvar__eval } + assert_equal 15, o.instance_eval { Const } + } + end + + def test_instance_eval_cvar + env = @@cvar + cls = "class" + [Object.new, [], 7, ].each do |obj| # TODO: check :sym + obj.class.class_variable_set :@@cvar, cls + assert_equal env, obj.instance_eval("@@cvar") + assert_equal env, obj.instance_eval { @@cvar } + end + [true, false, nil].each do |obj| + obj.class.class_variable_set :@@cvar, cls + assert_equal cls, obj.instance_eval("@@cvar") + assert_equal cls, obj.instance_eval { @@cvar } + end + end + + # + # From ruby/test/ruby/test_eval.rb + # + def test_ev local1 = "local1" lambda { @@ -10,7 +219,7 @@ class TestEval < Test::Unit::TestCase }.call end - def test_eval + def test_eval_orig assert_nil(eval("")) $bad=false eval 'while false; $bad = true; print "foo\n" end' @@ -66,16 +275,19 @@ class TestEval < Test::Unit::TestCase end assert(!$bad) - x = proc{} - eval "i4 = 1", x - assert_equal(1, eval("i4", x)) - x = proc{proc{}}.call - eval "i4 = 22", x - assert_equal(22, eval("i4", x)) - $x = [] - x = proc{proc{}}.call - eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x - assert_equal(8, $x[4].call) + if false + # Ruby 2.0 doesn't see Proc as Binding + x = proc{} + eval "i4 = 1", x + assert_equal(1, eval("i4", x)) + x = proc{proc{}}.call + eval "i4 = 22", x + assert_equal(22, eval("i4", x)) + $x = [] + x = proc{proc{}}.call + eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x + assert_equal(8, $x[4].call) + end x = binding eval "i = 1", x @@ -98,26 +310,32 @@ class TestEval < Test::Unit::TestCase foo22 = 5 proc{foo11=22}.call proc{foo22=55}.call - assert_equal(eval("foo11"), eval("foo11", p)) - assert_equal(1, eval("foo11")) + # assert_equal(eval("foo11"), eval("foo11", p)) + # assert_equal(1, eval("foo11")) assert_equal(eval("foo22"), eval("foo22", p)) assert_equal(55, eval("foo22")) }.call - p1 = proc{i7 = 0; proc{i7}}.call - assert_equal(0, p1.call) - eval "i7=5", p1 - assert_equal(5, p1.call) - assert(!defined?(i7)) + if false + # Ruby 2.0 doesn't see Proc as Binding + p1 = proc{i7 = 0; proc{i7}}.call + assert_equal(0, p1.call) + eval "i7=5", p1 + assert_equal(5, p1.call) + assert(!defined?(i7)) + end - p1 = proc{i7 = 0; proc{i7}}.call - i7 = nil - assert_equal(0, p1.call) - eval "i7=1", p1 - assert_equal(1, p1.call) - eval "i7=5", p1 - assert_equal(5, p1.call) - assert_nil(i7) + if false + # Ruby 2.0 doesn't see Proc as Binding + p1 = proc{i7 = 0; proc{i7}}.call + i7 = nil + assert_equal(0, p1.call) + eval "i7=1", p1 + assert_equal(1, p1.call) + eval "i7=5", p1 + assert_equal(5, p1.call) + assert_nil(i7) + end end def test_nil_instance_eval_cvar # [ruby-dev:24103] @@ -154,4 +372,5 @@ class TestEval < Test::Unit::TestCase v.call } end + end diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index d0b4e3df77..72c38e4b27 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -8,6 +8,9 @@ class TestGc < Test::Unit::TestCase end def test_gc + prev_stress = GC.stress + GC.stress = false + assert_nothing_raised do 1.upto(10000) { tmp = [0,1,2,3,4,5,6,7,8,9] @@ -26,5 +29,7 @@ class TestGc < Test::Unit::TestCase } GC.start assert true # reach here or dumps core + + GC.stress = prev_stress end end diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 5bec012bf8..35136da57c 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1,6 +1,7 @@ require 'test/unit' class TestHash < Test::Unit::TestCase + def test_hash x = {1=>2, 2=>4, 3=>6} y = {1, 2, 2, 4, 3, 6} @@ -71,4 +72,565 @@ class TestHash < Test::Unit::TestCase assert_equal(44, x[22]) assert_equal(0, $z) end + + # From rubicon + + def setup + @cls = Hash + @h = @cls[ + 1 => 'one', 2 => 'two', 3 => 'three', + self => 'self', true => 'true', nil => 'nil', + 'nil' => nil + ] + end + + def test_s_AREF + h = @cls["a" => 100, "b" => 200] + assert_equal(100, h['a']) + assert_equal(200, h['b']) + assert_nil(h['c']) + + h = @cls.[]("a" => 100, "b" => 200) + assert_equal(100, h['a']) + assert_equal(200, h['b']) + assert_nil(h['c']) + end + + def test_s_new + h = @cls.new + assert_instance_of(@cls, h) + assert_nil(h.default) + assert_nil(h['spurious']) + + h = @cls.new('default') + assert_instance_of(@cls, h) + assert_equal('default', h.default) + assert_equal('default', h['spurious']) + + end + + def test_AREF # '[]' + t = Time.now + h = @cls[ + 1 => 'one', 2 => 'two', 3 => 'three', + self => 'self', t => 'time', nil => 'nil', + 'nil' => nil + ] + + assert_equal('one', h[1]) + assert_equal('two', h[2]) + assert_equal('three', h[3]) + assert_equal('self', h[self]) + assert_equal('time', h[t]) + assert_equal('nil', h[nil]) + assert_equal(nil, h['nil']) + assert_equal(nil, h['koala']) + + h1 = h.dup + h1.default = :default + + assert_equal('one', h1[1]) + assert_equal('two', h1[2]) + assert_equal('three', h1[3]) + assert_equal('self', h1[self]) + assert_equal('time', h1[t]) + assert_equal('nil', h1[nil]) + assert_equal(nil, h1['nil']) + assert_equal(:default, h1['koala']) + + + end + + def test_ASET # '[]=' + t = Time.now + h = @cls.new + h[1] = 'one' + h[2] = 'two' + h[3] = 'three' + h[self] = 'self' + h[t] = 'time' + h[nil] = 'nil' + h['nil'] = nil + assert_equal('one', h[1]) + assert_equal('two', h[2]) + assert_equal('three', h[3]) + assert_equal('self', h[self]) + assert_equal('time', h[t]) + assert_equal('nil', h[nil]) + assert_equal(nil, h['nil']) + assert_equal(nil, h['koala']) + + h[1] = 1 + h[nil] = 99 + h['nil'] = nil + z = [1,2] + h[z] = 256 + assert_equal(1, h[1]) + assert_equal('two', h[2]) + assert_equal('three', h[3]) + assert_equal('self', h[self]) + assert_equal('time', h[t]) + assert_equal(99, h[nil]) + assert_equal(nil, h['nil']) + assert_equal(nil, h['koala']) + assert_equal(256, h[z]) + end + + def test_EQUAL # '==' + h1 = @cls[ "a" => 1, "c" => 2 ] + h2 = @cls[ "a" => 1, "c" => 2, 7 => 35 ] + h3 = @cls[ "a" => 1, "c" => 2, 7 => 35 ] + h4 = @cls[ ] + assert(h1 == h1) + assert(h2 == h2) + assert(h3 == h3) + assert(h4 == h4) + assert(!(h1 == h2)) + assert(h2 == h3) + assert(!(h3 == h4)) + end + + def test_clear + assert(@h.size > 0) + @h.clear + assert_equal(0, @h.size) + assert_nil(@h[1]) + end + + def test_clone + for taint in [ false, true ] + for frozen in [ false, true ] + a = @h.clone + a.taint if taint + a.freeze if frozen + b = a.clone + + assert_equal(a, b) + assert(a.__id__ != b.__id__) + assert_equal(a.frozen?, b.frozen?) + assert_equal(a.tainted?, b.tainted?) + end + end + end + + def test_default + assert_nil(@h.default) + h = @cls.new(:xyzzy) + assert_equal(:xyzzy, h.default) + end + + def test_default= + assert_nil(@h.default) + @h.default = :xyzzy + assert_equal(:xyzzy, @h.default) + end + + def test_delete + h1 = @cls[ 1 => 'one', 2 => 'two', true => 'true' ] + h2 = @cls[ 1 => 'one', 2 => 'two' ] + h3 = @cls[ 2 => 'two' ] + + assert_equal('true', h1.delete(true)) + assert_equal(h2, h1) + + assert_equal('one', h1.delete(1)) + assert_equal(h3, h1) + + assert_equal('two', h1.delete(2)) + assert_equal(@cls[], h1) + + assert_nil(h1.delete(99)) + assert_equal(@cls[], h1) + + assert_equal('default 99', h1.delete(99) {|i| "default #{i}" }) + end + + def test_delete_if + base = @cls[ 1 => 'one', 2 => false, true => 'true', 'cat' => 99 ] + h1 = @cls[ 1 => 'one', 2 => false, true => 'true' ] + h2 = @cls[ 2 => false, 'cat' => 99 ] + h3 = @cls[ 2 => false ] + + h = base.dup + assert_equal(h, h.delete_if { false }) + assert_equal(@cls[], h.delete_if { true }) + + h = base.dup + assert_equal(h1, h.delete_if {|k,v| k.instance_of?(String) }) + assert_equal(h1, h) + + h = base.dup + assert_equal(h2, h.delete_if {|k,v| v.instance_of?(String) }) + assert_equal(h2, h) + + h = base.dup + assert_equal(h3, h.delete_if {|k,v| v }) + assert_equal(h3, h) + end + + def test_dup + for taint in [ false, true ] + for frozen in [ false, true ] + a = @h.dup + a.taint if taint + a.freeze if frozen + b = a.dup + + assert_equal(a, b) + assert(a.__id__ != b.__id__) + assert_equal(false, b.frozen?) + assert_equal(a.tainted?, b.tainted?) + end + end + end + + def test_each + count = 0 + @cls[].each { |k, v| count + 1 } + assert_equal(0, count) + + h = @h + h.each do |k, v| + assert_equal(v, h.delete(k)) + end + assert_equal(@cls[], h) + end + + def test_each_key + count = 0 + @cls[].each_key { |k| count + 1 } + assert_equal(0, count) + + h = @h + h.each_key do |k| + h.delete(k) + end + assert_equal(@cls[], h) + end + + def test_each_pair + count = 0 + @cls[].each_pair { |k, v| count + 1 } + assert_equal(0, count) + + h = @h + h.each_pair do |k, v| + assert_equal(v, h.delete(k)) + end + assert_equal(@cls[], h) + end + + def test_each_value + res = [] + @cls[].each_value { |v| res << v } + assert_equal(0, [].length) + + @h.each_value { |v| res << v } + assert_equal(0, [].length) + + expected = [] + @h.each { |k, v| expected << v } + + assert_equal([], expected - res) + assert_equal([], res - expected) + end + + def test_empty? + assert(@cls[].empty?) + assert(!@h.empty?) + end + + def test_fetch + assert_raise(KeyError) { @cls[].fetch(1) } + assert_raise(KeyError) { @h.fetch('gumby') } + assert_equal('gumbygumby', @h.fetch('gumby') {|k| k * 2 }) + assert_equal('pokey', @h.fetch('gumby', 'pokey')) + + assert_equal('one', @h.fetch(1)) + assert_equal(nil, @h.fetch('nil')) + assert_equal('nil', @h.fetch(nil)) + end + + def test_key? + assert(!@cls[].key?(1)) + assert(!@cls[].key?(nil)) + assert(@h.key?(nil)) + assert(@h.key?(1)) + assert(!@h.key?('gumby')) + end + + def test_value? + assert(!@cls[].value?(1)) + assert(!@cls[].value?(nil)) + assert(@h.value?('one')) + assert(@h.value?(nil)) + assert(!@h.value?('gumby')) + end + + def test_include? + assert(!@cls[].include?(1)) + assert(!@cls[].include?(nil)) + assert(@h.include?(nil)) + assert(@h.include?(1)) + assert(!@h.include?('gumby')) + end + + def test_key + assert_equal(1, @h.key('one')) + assert_equal(nil, @h.key('nil')) + assert_equal('nil', @h.key(nil)) + + assert_equal(nil, @h.key('gumby')) + assert_equal(nil, @cls[].key('gumby')) + end + + def test_values_at + res = @h.values_at('dog', 'cat', 'horse') + assert(res.length == 3) + assert_equal([nil, nil, nil], res) + + res = @h.values_at + assert(res.length == 0) + + res = @h.values_at(3, 2, 1, nil) + assert_equal 4, res.length + assert_equal %w( three two one nil ), res + + res = @h.values_at(3, 99, 1, nil) + assert_equal 4, res.length + assert_equal ['three', nil, 'one', 'nil'], res + end + + + def test_invert + h = @h.invert + assert_equal(1, h['one']) + assert_equal(true, h['true']) + assert_equal(nil, h['nil']) + + h.each do |k, v| + assert(@h.key?(v)) # not true in general, but works here + end + + h = @cls[ 'a' => 1, 'b' => 2, 'c' => 1].invert + assert_equal(2, h.length) + assert(h[1] == 'a' || h[1] == 'c') + assert_equal('b', h[2]) + end + + def test_key? + assert(!@cls[].key?(1)) + assert(!@cls[].key?(nil)) + assert(@h.key?(nil)) + assert(@h.key?(1)) + assert(!@h.key?('gumby')) + end + + def test_keys + assert_equal([], @cls[].keys) + + keys = @h.keys + expected = [] + @h.each { |k, v| expected << k } + assert_equal([], keys - expected) + assert_equal([], expected - keys) + end + + def test_length + assert_equal(0, @cls[].length) + assert_equal(7, @h.length) + end + + def test_member? + assert(!@cls[].member?(1)) + assert(!@cls[].member?(nil)) + assert(@h.member?(nil)) + assert(@h.member?(1)) + assert(!@h.member?('gumby')) + end + + def test_rehash + a = [ "a", "b" ] + c = [ "c", "d" ] + h = @cls[ a => 100, c => 300 ] + assert_equal(100, h[a]) + a[0] = "z" + assert_nil(h[a]) + h.rehash + assert_equal(100, h[a]) + end + + def test_reject + base = @cls[ 1 => 'one', 2 => false, true => 'true', 'cat' => 99 ] + h1 = @cls[ 1 => 'one', 2 => false, true => 'true' ] + h2 = @cls[ 2 => false, 'cat' => 99 ] + h3 = @cls[ 2 => false ] + + h = base.dup + assert_equal(h, h.reject { false }) + assert_equal(@cls[], h.reject { true }) + + h = base.dup + assert_equal(h1, h.reject {|k,v| k.instance_of?(String) }) + + assert_equal(h2, h.reject {|k,v| v.instance_of?(String) }) + + assert_equal(h3, h.reject {|k,v| v }) + assert_equal(base, h) + end + + def test_reject! + base = @cls[ 1 => 'one', 2 => false, true => 'true', 'cat' => 99 ] + h1 = @cls[ 1 => 'one', 2 => false, true => 'true' ] + h2 = @cls[ 2 => false, 'cat' => 99 ] + h3 = @cls[ 2 => false ] + + h = base.dup + assert_equal(nil, h.reject! { false }) + assert_equal(@cls[], h.reject! { true }) + + h = base.dup + assert_equal(h1, h.reject! {|k,v| k.instance_of?(String) }) + assert_equal(h1, h) + + h = base.dup + assert_equal(h2, h.reject! {|k,v| v.instance_of?(String) }) + assert_equal(h2, h) + + h = base.dup + assert_equal(h3, h.reject! {|k,v| v }) + assert_equal(h3, h) + end + + def test_replace + h = @cls[ 1 => 2, 3 => 4 ] + h1 = h.replace(@cls[ 9 => 8, 7 => 6 ]) + assert_equal(h, h1) + assert_equal(8, h[9]) + assert_equal(6, h[7]) + assert_nil(h[1]) + assert_nil(h[2]) + end + + def test_shift + h = @h.dup + + @h.length.times { + k, v = h.shift + assert(@h.key?(k)) + assert_equal(@h[k], v) + } + + assert_equal(0, h.length) + end + + def test_size + assert_equal(0, @cls[].length) + assert_equal(7, @h.length) + end + + def test_sort + h = @cls[].sort + assert_equal([], h) + + h = @cls[ 1 => 1, 2 => 1 ].sort + assert_equal([[1,1], [2,1]], h) + + h = @cls[ 'cat' => 'feline', 'ass' => 'asinine', 'bee' => 'beeline' ] + h1 = h.sort + assert_equal([ %w(ass asinine), %w(bee beeline), %w(cat feline)], h1) + end + + def test_store + t = Time.now + h = @cls.new + h.store(1, 'one') + h.store(2, 'two') + h.store(3, 'three') + h.store(self, 'self') + h.store(t, 'time') + h.store(nil, 'nil') + h.store('nil', nil) + assert_equal('one', h[1]) + assert_equal('two', h[2]) + assert_equal('three', h[3]) + assert_equal('self', h[self]) + assert_equal('time', h[t]) + assert_equal('nil', h[nil]) + assert_equal(nil, h['nil']) + assert_equal(nil, h['koala']) + + h.store(1, 1) + h.store(nil, 99) + h.store('nil', nil) + assert_equal(1, h[1]) + assert_equal('two', h[2]) + assert_equal('three', h[3]) + assert_equal('self', h[self]) + assert_equal('time', h[t]) + assert_equal(99, h[nil]) + assert_equal(nil, h['nil']) + assert_equal(nil, h['koala']) + end + + def test_to_a + assert_equal([], @cls[].to_a) + assert_equal([[1,2]], @cls[ 1=>2 ].to_a) + a = @cls[ 1=>2, 3=>4, 5=>6 ].to_a + assert_equal([1,2], a.delete([1,2])) + assert_equal([3,4], a.delete([3,4])) + assert_equal([5,6], a.delete([5,6])) + assert_equal(0, a.length) + end + + def test_to_hash + h = @h.to_hash + assert_equal(@h, h) + end + + def test_to_s + h = @cls[ 1 => 2, "cat" => "dog", 1.5 => :fred ] + assert_equal(h.inspect, h.to_s) + $, = ":" + assert_equal(h.inspect, h.to_s) + h = @cls[] + assert_equal(h.inspect, h.to_s) + $, = nil + end + + def test_update + h1 = @cls[ 1 => 2, 2 => 3, 3 => 4 ] + h2 = @cls[ 2 => 'two', 4 => 'four' ] + + ha = @cls[ 1 => 2, 2 => 'two', 3 => 4, 4 => 'four' ] + hb = @cls[ 1 => 2, 2 => 3, 3 => 4, 4 => 'four' ] + + assert_equal(ha, h1.update(h2)) + assert_equal(ha, h1) + + h1 = @cls[ 1 => 2, 2 => 3, 3 => 4 ] + h2 = @cls[ 2 => 'two', 4 => 'four' ] + + assert_equal(hb, h2.update(h1)) + assert_equal(hb, h2) + end + + def test_value? + assert(!@cls[].value?(1)) + assert(!@cls[].value?(nil)) + assert(@h.value?(nil)) + assert(@h.value?('one')) + assert(!@h.value?('gumby')) + end + + def test_values + assert_equal([], @cls[].values) + + vals = @h.values + expected = [] + @h.each { |k, v| expected << v } + assert_equal([], vals - expected) + assert_equal([], expected - vals) + end + end diff --git a/test/ruby/test_iterator.rb b/test/ruby/test_iterator.rb index 0db54302f5..0632881a53 100644 --- a/test/ruby/test_iterator.rb +++ b/test/ruby/test_iterator.rb @@ -1,3 +1,11 @@ +# TODO: tmp + +class Object + Proc_orig = Proc + remove_const :Proc + Proc = YARVCore::VM::Proc +end + require 'test/unit' class Array diff --git a/test/ruby/test_lambda.rb b/test/ruby/test_lambda.rb index 53a7562c8e..5687722c31 100644 --- a/test/ruby/test_lambda.rb +++ b/test/ruby/test_lambda.rb @@ -1,6 +1,14 @@ require 'test/unit' class TestLambdaParameters < Test::Unit::TestCase + def test_not_supported + flunk("YARV doesn't support NODE_LAMBDA") + end +end + +__END__ + +class TestLambdaParametersBackup def test_call_simple assert_equal(1, ->(a){ a }.call(1)) assert_equal([1,2], ->(a,b){ [a,b] }.call(1,2)) diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 9c9fd9470b..f594971e25 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -1,12 +1,5 @@ require 'test/unit' -dir = File.dirname(File.expand_path(__FILE__)) -orgpath = $:.dup -begin - $:.push(dir) - require 'marshaltestlib' -ensure - $:.replace(orgpath) -end +require 'marshaltestlib' class TestMarshal < Test::Unit::TestCase include MarshalTestLib @@ -29,20 +22,18 @@ class TestMarshal < Test::Unit::TestCase return f end - StrClone=String.clone; - def test_marshal - $x = [1,2,3,[4,5,"foo"],{1=>"bar"},2.5,fact(30)] - $y = Marshal.dump($x) - assert_equal($x, Marshal.load($y)) - - assert_instance_of(StrClone, Marshal.load(Marshal.dump(StrClone.new("abc")))) + x = [1, 2, 3, [4,5,"foo"], {1=>"bar"}, 2.5, fact(30)] + assert_equal x, Marshal.load(Marshal.dump(x)) [[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z| - a = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f)) - ma = Marshal.dump(a) - b = Marshal.load(ma) - assert_equal(a, b) + obj = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f)) + assert_equal obj, Marshal.load(Marshal.dump(obj)) } end + + StrClone = String.clone + def test_marshal_cloned_class + assert_instance_of(StrClone, Marshal.load(Marshal.dump(StrClone.new("abc")))) + end end diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb new file mode 100644 index 0000000000..471d6f6481 --- /dev/null +++ b/test/ruby/test_module.rb @@ -0,0 +1,316 @@ +require 'test/unit' +require 'pp' + +$m0 = Module.nesting + +class TestModule < Test::Unit::TestCase + + def test_LT_0 + assert_equal true, String < Object + assert_equal false, Object < String + assert_nil String < Array + assert_equal true, Array < Enumerable + assert_equal false, Enumerable < Array + assert_nil Proc < Comparable + assert_nil Comparable < Proc + end + + def test_GT_0 + assert_equal false, String > Object + assert_equal true, Object > String + assert_nil String > Array + assert_equal false, Array > Enumerable + assert_equal true, Enumerable > Array + assert_nil Comparable > Proc + assert_nil Proc > Comparable + end + + def test_CMP_0 + assert_equal -1, (String <=> Object) + assert_equal 1, (Object <=> String) + assert_nil(Array <=> String) + end + + ExpectedException = NoMethodError + + # Support stuff + + def remove_pp_mixins(list) + list.reject {|c| c == PP::ObjectMixin } + end + + module Mixin + MIXIN = 1 + def mixin + end + end + + module User + USER = 2 + include Mixin + def user + end + end + + module Other + def other + end + end + + class AClass + def AClass.cm1 + "cm1" + end + def AClass.cm2 + cm1 + "cm2" + cm3 + end + def AClass.cm3 + "cm3" + end + + private_class_method :cm1, "cm3" + + def aClass + end + + def aClass1 + end + + def aClass2 + end + + private :aClass1 + protected :aClass2 + end + + class BClass < AClass + def bClass1 + end + + private + + def bClass2 + end + + protected + def bClass3 + end + end + + MyClass = AClass.clone + class MyClass + public_class_method :cm1 + end + + # ----------------------------------------------------------- + + def test_CMP # '<=>' + assert_equal( 0, Mixin <=> Mixin) + assert_equal(-1, User <=> Mixin) + assert_equal( 1, Mixin <=> User) + + assert_equal( 0, Object <=> Object) + assert_equal(-1, String <=> Object) + assert_equal( 1, Object <=> String) + end + + def test_GE # '>=' + assert(Mixin >= User) + assert(Mixin >= Mixin) + assert(!(User >= Mixin)) + + assert(Object >= String) + assert(String >= String) + assert(!(String >= Object)) + end + + def test_GT # '>' + assert(Mixin > User) + assert(!(Mixin > Mixin)) + assert(!(User > Mixin)) + + assert(Object > String) + assert(!(String > String)) + assert(!(String > Object)) + end + + def test_LE # '<=' + assert(User <= Mixin) + assert(Mixin <= Mixin) + assert(!(Mixin <= User)) + + assert(String <= Object) + assert(String <= String) + assert(!(Object <= String)) + end + + def test_LT # '<' + assert(User < Mixin) + assert(!(Mixin < Mixin)) + assert(!(Mixin < User)) + + assert(String < Object) + assert(!(String < String)) + assert(!(Object < String)) + end + + def test_VERY_EQUAL # '===' + assert(Object === self) + assert(Test::Unit::TestCase === self) + assert(TestModule === self) + assert(!(String === self)) + end + + def test_ancestors + assert_equal([User, Mixin], User.ancestors) + assert_equal([Mixin], Mixin.ancestors) + + assert_equal([Object, Kernel, BasicObject], remove_pp_mixins(Object.ancestors)) + assert_equal([String, Comparable, Object, Kernel, BasicObject], + remove_pp_mixins(String.ancestors)) + end + + def test_class_eval + Other.class_eval("CLASS_EVAL = 1") + assert_equal(1, Other::CLASS_EVAL) + assert(Other.constants.include?("CLASS_EVAL")) + end + + def test_class_variable_set + # TODO + end + + def test_class_variable_get + # TODO + end + + def test_const_defined? + assert(Math.const_defined?(:PI)) + assert(Math.const_defined?("PI")) + assert(!Math.const_defined?(:IP)) + assert(!Math.const_defined?("IP")) + end + + def test_const_get + assert_equal(Math::PI, Math.const_get("PI")) + assert_equal(Math::PI, Math.const_get(:PI)) + end + + def test_const_set + assert(!Other.const_defined?(:KOALA)) + Other.const_set(:KOALA, 99) + assert(Other.const_defined?(:KOALA)) + assert_equal(99, Other::KOALA) + Other.const_set("WOMBAT", "Hi") + assert_equal("Hi", Other::WOMBAT) + end + + def test_constants + assert_equal(["MIXIN"], Mixin.constants) + assert_equal(["MIXIN", "USER"], User.constants.sort) + end + + def test_included_modules + assert_equal([], Mixin.included_modules) + assert_equal([Mixin], User.included_modules) + assert_equal([Kernel], remove_pp_mixins(Object.included_modules)) + assert_equal([Comparable, Kernel], + remove_pp_mixins(String.included_modules)) + end + + def test_instance_methods + assert_equal(["user" ], User.instance_methods(false)) + assert_equal(["user", "mixin"].sort, User.instance_methods(true).sort) + assert_equal(["mixin"], Mixin.instance_methods) + assert_equal(["mixin"], Mixin.instance_methods(true)) + # Ruby 1.8 feature change: + # #instance_methods includes protected methods. + #assert_equal(["aClass"], AClass.instance_methods(false)) + assert_equal(["aClass", "aClass2"], AClass.instance_methods(false).sort) + assert_equal(["aClass", "aClass2"], + (AClass.instance_methods(true) - Object.instance_methods(true)).sort) + end + + def test_method_defined? + assert(!User.method_defined?(:wombat)) + assert(User.method_defined?(:user)) + assert(User.method_defined?(:mixin)) + assert(!User.method_defined?("wombat")) + assert(User.method_defined?("user")) + assert(User.method_defined?("mixin")) + end + + def test_module_eval + User.module_eval("MODULE_EVAL = 1") + assert_equal(1, User::MODULE_EVAL) + assert(User.constants.include?("MODULE_EVAL")) + User.instance_eval("remove_const(:MODULE_EVAL)") + assert(!User.constants.include?("MODULE_EVAL")) + end + + def test_name + assert_equal("Fixnum", Fixnum.name) + assert_equal("TestModule::Mixin", Mixin.name) + assert_equal("TestModule::User", User.name) + end + + def test_private_class_method + assert_raise(ExpectedException) { AClass.cm1 } + assert_raise(ExpectedException) { AClass.cm3 } + assert_equal("cm1cm2cm3", AClass.cm2) + end + + def test_private_instance_methods + assert_equal(["aClass1"], AClass.private_instance_methods(false)) + assert_equal(["bClass2"], BClass.private_instance_methods(false)) + assert_equal(["aClass1", "bClass2"], + (BClass.private_instance_methods(true) - + Object.private_instance_methods(true)).sort) + end + + def test_protected_instance_methods + assert_equal(["aClass2"], AClass.protected_instance_methods) + assert_equal(["bClass3"], BClass.protected_instance_methods(false)) + assert_equal(["bClass3", "aClass2"].sort, + (BClass.protected_instance_methods(true) - + Object.protected_instance_methods(true)).sort) + end + + def test_public_class_method + assert_equal("cm1", MyClass.cm1) + assert_equal("cm1cm2cm3", MyClass.cm2) + assert_raise(ExpectedException) { eval "MyClass.cm3" } + end + + def test_public_instance_methods + assert_equal(["aClass"], AClass.public_instance_methods(false)) + assert_equal(["bClass1"], BClass.public_instance_methods(false)) + end + + def test_s_constants + c1 = Module.constants + Object.module_eval "WALTER = 99" + c2 = Module.constants + assert_equal(["WALTER"], c2 - c1) + end + + module M1 + $m1 = Module.nesting + module M2 + $m2 = Module.nesting + end + end + + def test_s_nesting + assert_equal([], $m0) + assert_equal([TestModule::M1, TestModule], $m1) + assert_equal([TestModule::M1::M2, + TestModule::M1, TestModule], $m2) + end + + def test_s_new + m = Module.new + assert_instance_of(Module, m) + end + +end diff --git a/test/ruby/test_pipe.rb b/test/ruby/test_pipe.rb index c2f355185b..73c7965e8c 100644 --- a/test/ruby/test_pipe.rb +++ b/test/ruby/test_pipe.rb @@ -1,6 +1,5 @@ require 'test/unit' require 'ut_eof' -require 'envutil' class TestPipe < Test::Unit::TestCase include TestEOF diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index aaeb189e27..f293bbc1a7 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -71,6 +71,7 @@ class TestProc < Test::Unit::TestCase def m(x) lambda { x } end + def test_eq # [ruby-dev:22592] a = m(1) @@ -88,8 +89,9 @@ class TestProc < Test::Unit::TestCase end def test_block_par - assert_equal(10, Proc.new{|&b| b.call(10)}.call {|x| x}) - assert_equal(12, Proc.new{|a,&b| b.call(a)}.call(12) {|x| x}) + assert false, "TODO: block parameter |&b| not supported" + # assert_equal(10, Proc.new{|&b| b.call(10)}.call {|x| x}) + # assert_equal(12, Proc.new{|a,&b| b.call(a)}.call(12) {|x| x}) end def test_safe @@ -122,4 +124,19 @@ class TestProc < Test::Unit::TestCase assert_equal(safe + 1, proc {x.method(:inc).to_proc.call; $SAFE}.call) assert_equal(safe, $SAFE) end + + def m2 + "OK" + end + + def block + method(:m2).to_proc + end + + # [yarv-dev:777] block made by Method#to_proc + def test_method_to_proc + b = block() + assert_equal "OK", b.call + end + end diff --git a/test/ruby/test_readpartial.rb b/test/ruby/test_readpartial.rb index 526425dc57..6bfafc3aa2 100644 --- a/test/ruby/test_readpartial.rb +++ b/test/ruby/test_readpartial.rb @@ -1,6 +1,6 @@ require 'test/unit' require 'timeout' -require 'fcntl' +#require 'fcntl' class TestReadPartial < Test::Unit::TestCase def make_pipe @@ -48,6 +48,8 @@ class TestReadPartial < Test::Unit::TestCase w << 'abc' assert_equal('ab', r.readpartial(2)) assert_equal('c', r.readpartial(2)) +assert false, "TODO: doesn't work on cygwin" if /cygwin/ =~ RUBY_PLATFORM +assert false, "TODO: doesn't work on mswin32" if /mswin32/ =~ RUBY_PLATFORM assert_raises(TimeoutError) { timeout(0.1) { r.readpartial(2) } } @@ -62,11 +64,11 @@ class TestReadPartial < Test::Unit::TestCase assert_equal("de", r.readpartial(2)) assert_equal("f\n", r.readpartial(4096)) assert_equal("ghi\n", r.readpartial(4096)) +assert false, "TODO: doesn't work on cygwin" if /cygwin/ =~ RUBY_PLATFORM +assert false, "TODO: doesn't work on mswin32" if /mswin32/ =~ RUBY_PLATFORM assert_raises(TimeoutError) { timeout(0.1) { r.readpartial(2) } } } end - end - diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb index 8daa1cfa21..27a0d5021d 100644 --- a/test/ruby/test_signal.rb +++ b/test/ruby/test_signal.rb @@ -4,32 +4,31 @@ require 'timeout' class TestSignal < Test::Unit::TestCase def have_fork? begin - fork{} - true + Process.fork {} + return true rescue NotImplementedError - false + return false end end def test_signal - defined?(Process.kill) or return + return unless Process.method_defined?(:kill) begin - $x = 0 - oldtrap = trap "SIGINT", proc{|sig| $x = 2} - Process.kill "SIGINT", $$ + x = 0 + oldtrap = Signal.trap(:INT) {|sig| x = 2 } + Process.kill :INT, Process.pid sleep 0.1 - assert_equal(2, $x) + assert_equal 2, x - trap "SIGINT", proc{raise "Interrupt"} - - x = assert_raises(RuntimeError) do - Process.kill "SIGINT", $$ + Signal.trap(:INT) { raise "Interrupt" } + ex = assert_raises(RuntimeError) { + Process.kill :INT, Process.pid sleep 0.1 - end - assert(x) - assert_match(/Interrupt/, x.message) + } + assert_kind_of Exception, ex + assert_match(/Interrupt/, ex.message) ensure - trap "SIGINT", oldtrap + Signal.trap :INT, oldtrap if oldtrap end end @@ -38,8 +37,8 @@ class TestSignal < Test::Unit::TestCase begin r, w = IO.pipe r0, w0 = IO.pipe - pid = fork { - trap(:USR1, "EXIT") + pid = Process.fork { + Signal.trap(:USR1, "EXIT") w0.close w.syswrite("a") Thread.start { Thread.pass } @@ -50,7 +49,7 @@ class TestSignal < Test::Unit::TestCase assert_nothing_raised("[ruby-dev:26128]") { Process.kill(:USR1, pid) begin - Timeout.timeout(1) { + Timeout.timeout(3) { Process.waitpid pid } rescue Timeout::Error diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index f8938cad84..db508dc239 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1,13 +1,1115 @@ require 'test/unit' +# use of $= is deprecated after 1.7.1 +def pre_1_7_1 +end + class TestString < Test::Unit::TestCase + + def initialize(*args) + @cls = String + @aref_re_nth = true + @aref_re_silent = false + @aref_slicebang_silent = true + super + end + + def S(str) + @cls.new(str) + end + + def test_s_new + assert_equal("RUBY", S("RUBY")) + end + + def test_AREF # '[]' + assert_equal("A", S("AooBar")[0]) + assert_equal("B", S("FooBaB")[-1]) + assert_equal(nil, S("FooBar")[6]) + assert_equal(nil, S("FooBar")[-7]) + + assert_equal(S("Foo"), S("FooBar")[0,3]) + assert_equal(S("Bar"), S("FooBar")[-3,3]) + assert_equal(S(""), S("FooBar")[6,2]) + assert_equal(nil, S("FooBar")[-7,10]) + + assert_equal(S("Foo"), S("FooBar")[0..2]) + assert_equal(S("Foo"), S("FooBar")[0...3]) + assert_equal(S("Bar"), S("FooBar")[-3..-1]) + assert_equal(S(""), S("FooBar")[6..2]) + assert_equal(nil, S("FooBar")[-10..-7]) + + assert_equal(S("Foo"), S("FooBar")[/^F../]) + assert_equal(S("Bar"), S("FooBar")[/..r$/]) + assert_equal(nil, S("FooBar")[/xyzzy/]) + assert_equal(nil, S("FooBar")[/plugh/]) + + assert_equal(S("Foo"), S("FooBar")[S("Foo")]) + assert_equal(S("Bar"), S("FooBar")[S("Bar")]) + assert_equal(nil, S("FooBar")[S("xyzzy")]) + assert_equal(nil, S("FooBar")[S("plugh")]) + + if @aref_re_nth + assert_equal(S("Foo"), S("FooBar")[/([A-Z]..)([A-Z]..)/, 1]) + assert_equal(S("Bar"), S("FooBar")[/([A-Z]..)([A-Z]..)/, 2]) + assert_equal(nil, S("FooBar")[/([A-Z]..)([A-Z]..)/, 3]) + assert_equal(S("Bar"), S("FooBar")[/([A-Z]..)([A-Z]..)/, -1]) + assert_equal(S("Foo"), S("FooBar")[/([A-Z]..)([A-Z]..)/, -2]) + assert_equal(nil, S("FooBar")[/([A-Z]..)([A-Z]..)/, -3]) + end + end + + def test_ASET # '[]=' + s = S("FooBar") + s[0] = S('A') + assert_equal(S("AooBar"), s) + + s[-1]= S('B') + assert_equal(S("AooBaB"), s) + assert_raise(IndexError) { s[-7] = S("xyz") } + assert_equal(S("AooBaB"), s) + s[0] = S("ABC") + assert_equal(S("ABCooBaB"), s) + + s = S("FooBar") + s[0,3] = S("A") + assert_equal(S("ABar"),s) + s[0] = S("Foo") + assert_equal(S("FooBar"), s) + s[-3,3] = S("Foo") + assert_equal(S("FooFoo"), s) + assert_raise (IndexError) { s[7,3] = S("Bar") } + assert_raise (IndexError) { s[-7,3] = S("Bar") } + + s = S("FooBar") + s[0..2] = S("A") + assert_equal(S("ABar"), s) + s[1..3] = S("Foo") + assert_equal(S("AFoo"), s) + s[-4..-4] = S("Foo") + assert_equal(S("FooFoo"), s) + assert_raise (RangeError) { s[7..10] = S("Bar") } + assert_raise (RangeError) { s[-7..-10] = S("Bar") } + + s = S("FooBar") + s[/^F../]= S("Bar") + assert_equal(S("BarBar"), s) + s[/..r$/] = S("Foo") + assert_equal(S("BarFoo"), s) + if @aref_re_silent + s[/xyzzy/] = S("None") + assert_equal(S("BarFoo"), s) + else + assert_raise (IndexError) { s[/xyzzy/] = S("None") } + end + if @aref_re_nth + s[/([A-Z]..)([A-Z]..)/, 1] = S("Foo") + assert_equal(S("FooFoo"), s) + s[/([A-Z]..)([A-Z]..)/, 2] = S("Bar") + assert_equal(S("FooBar"), s) + assert_raise (IndexError) { s[/([A-Z]..)([A-Z]..)/, 3] = "None" } + s[/([A-Z]..)([A-Z]..)/, -1] = S("Foo") + assert_equal(S("FooFoo"), s) + s[/([A-Z]..)([A-Z]..)/, -2] = S("Bar") + assert_equal(S("BarFoo"), s) + assert_raise (IndexError) { s[/([A-Z]..)([A-Z]..)/, -3] = "None" } + end + + s = S("FooBar") + s[S("Foo")] = S("Bar") + assert_equal(S("BarBar"), s) + + pre_1_7_1 do + s = S("FooBar") + s[S("Foo")] = S("xyz") + assert_equal(S("xyzBar"), s) + + $= = true + s = S("FooBar") + s[S("FOO")] = S("Bar") + assert_equal(S("BarBar"), s) + s[S("FOO")] = S("xyz") + assert_equal(S("BarBar"), s) + $= = false + end + + s = S("a string") + s[0..s.size] = S("another string") + assert_equal(S("another string"), s) + end + + def test_CMP # '<=>' + assert_equal(1, S("abcdef") <=> S("abcde")) + assert_equal(0, S("abcdef") <=> S("abcdef")) + assert_equal(-1, S("abcde") <=> S("abcdef")) + + assert_equal(-1, S("ABCDEF") <=> S("abcdef")) + + pre_1_7_1 do + $= = true + assert_equal(0, S("ABCDEF") <=> S("abcdef")) + $= = false + end + end + + def test_EQUAL # '==' + assert_equal(true, S("foo") == :foo) + assert(S("abcdef") == S("abcdef")) + + pre_1_7_1 do + $= = true + assert(S("CAT") == S('cat')) + assert(S("CaT") == S('cAt')) + $= = false + end + + assert(S("CAT") != S('cat')) + assert(S("CaT") != S('cAt')) + end + + def test_LSHIFT # '<<' + assert_equal(S("world!"), S("world") << 33) + assert_equal(S("world!"), S("world") << S('!')) + end + + def test_MATCH # '=~' + assert_equal(10, S("FeeFieFoo-Fum") =~ /Fum$/) + assert_equal(nil, S("FeeFieFoo-Fum") =~ /FUM$/) + + pre_1_7_1 do + $= = true + assert_equal(10, S("FeeFieFoo-Fum") =~ /FUM$/) + $= = false + end + end + + def test_MOD # '%' + assert_equal(S("00123"), S("%05d") % 123) + assert_equal(S("123 |00000001"), S("%-5s|%08x") % [123, 1]) + x = S("%3s %-4s%%foo %.0s%5d %#x%c%3.1f %b %x %X %#b %#x %#X") % + [S("hi"), + 123, + S("never seen"), + 456, + 0, + ?A, + 3.0999, + 11, + 171, + 171, + 11, + 171, + 171] + + assert_equal(S(' hi 123 %foo 456 0x0A3.1 1011 ab AB 0b1011 0xab 0XAB'), x) + end + + def test_MUL # '*' + assert_equal(S("XXX"), S("X") * 3) + assert_equal(S("HOHO"), S("HO") * 2) + end + + def test_PLUS # '+' + assert_equal(S("Yodel"), S("Yo") + S("del")) + end + + def casetest(a, b, rev=false) + case a + when b + assert(!rev) + else + assert(rev) + end + end + + def test_VERY_EQUAL # '===' + assert_equal(true, S("foo") === :foo) + casetest(S("abcdef"), S("abcdef")) + + pre_1_7_1 do + $= = true + casetest(S("CAT"), S('cat')) + casetest(S("CaT"), S('cAt')) + $= = false + end + + casetest(S("CAT"), S('cat'), true) # Reverse the test - we don't want to + casetest(S("CaT"), S('cAt'), true) # find these in the case. + end + + def test_capitalize + assert_equal(S("Hello"), S("hello").capitalize) + assert_equal(S("Hello"), S("hELLO").capitalize) + assert_equal(S("123abc"), S("123ABC").capitalize) + end + + def test_capitalize! + a = S("hello"); a.capitalize! + assert_equal(S("Hello"), a) + + a = S("hELLO"); a.capitalize! + assert_equal(S("Hello"), a) + + a = S("123ABC"); a.capitalize! + assert_equal(S("123abc"), a) + + assert_equal(nil, S("123abc").capitalize!) + assert_equal(S("123abc"), S("123ABC").capitalize!) + assert_equal(S("Abc"), S("ABC").capitalize!) + assert_equal(S("Abc"), S("abc").capitalize!) + assert_equal(nil, S("Abc").capitalize!) + + a = S("hello") + b = a.dup + assert_equal(S("Hello"), a.capitalize!) + assert_equal(S("hello"), b) + + end + + def test_center + assert_equal(S("hello"), S("hello").center(4)) + assert_equal(S(" hello "), S("hello").center(11)) + end + + def test_chomp + assert_equal(S("hello"), S("hello").chomp("\n")) + assert_equal(S("hello"), S("hello\n").chomp("\n")) + + $/ = "\n" + + assert_equal(S("hello"), S("hello").chomp) + assert_equal(S("hello"), S("hello\n").chomp) + + $/ = "!" + assert_equal(S("hello"), S("hello").chomp) + assert_equal(S("hello"), S("hello!").chomp) + $/ = "\n" + end + + def test_chomp! + a = S("hello") + a.chomp!(S("\n")) + + assert_equal(S("hello"), a) + assert_equal(nil, a.chomp!(S("\n"))) + + a = S("hello\n") + a.chomp!(S("\n")) + assert_equal(S("hello"), a) + + $/ = "\n" + a = S("hello") + a.chomp! + assert_equal(S("hello"), a) + + a = S("hello\n") + a.chomp! + assert_equal(S("hello"), a) + + $/ = "!" + a = S("hello") + a.chomp! + assert_equal(S("hello"), a) + + a="hello!" + a.chomp! + assert_equal(S("hello"), a) + + $/ = "\n" + + a = S("hello\n") + b = a.dup + assert_equal(S("hello"), a.chomp!) + assert_equal(S("hello\n"), b) + + end + + def test_chop + assert_equal(S("hell"), S("hello").chop) + assert_equal(S("hello"), S("hello\r\n").chop) + assert_equal(S("hello\n"), S("hello\n\r").chop) + assert_equal(S(""), S("\r\n").chop) + assert_equal(S(""), S("").chop) + end + + def test_chop! + a = S("hello").chop! + assert_equal(S("hell"), a) + + a = S("hello\r\n").chop! + assert_equal(S("hello"), a) + + a = S("hello\n\r").chop! + assert_equal(S("hello\n"), a) + + a = S("\r\n").chop! + assert_equal(S(""), a) + + a = S("").chop! + assert_nil(a) + + a = S("hello\n") + b = a.dup + assert_equal(S("hello"), a.chop!) + assert_equal(S("hello\n"), b) + end + + def test_clone + for taint in [ false, true ] + for frozen in [ false, true ] + a = S("Cool") + a.taint if taint + a.freeze if frozen + b = a.clone + + assert_equal(a, b) + assert(a.__id__ != b.__id__) + assert_equal(a.frozen?, b.frozen?) + assert_equal(a.tainted?, b.tainted?) + end + end + end + + def test_concat + assert_equal(S("world!"), S("world").concat(33)) + assert_equal(S("world!"), S("world").concat(S('!'))) + end + + def test_count + a = S("hello world") + assert_equal(5, a.count(S("lo"))) + assert_equal(2, a.count(S("lo"), S("o"))) + assert_equal(4, a.count(S("hello"), S("^l"))) + assert_equal(4, a.count(S("ej-m"))) + end + + def test_crypt + assert_equal(S('aaGUC/JkO9/Sc'), S("mypassword").crypt(S("aa"))) + assert(S('aaGUC/JkO9/Sc') != S("mypassword").crypt(S("ab"))) + end + + def test_delete + assert_equal(S("heo"), S("hello").delete(S("l"), S("lo"))) + assert_equal(S("he"), S("hello").delete(S("lo"))) + assert_equal(S("hell"), S("hello").delete(S("aeiou"), S("^e"))) + assert_equal(S("ho"), S("hello").delete(S("ej-m"))) + end + + def test_delete! + a = S("hello") + a.delete!(S("l"), S("lo")) + assert_equal(S("heo"), a) + + a = S("hello") + a.delete!(S("lo")) + assert_equal(S("he"), a) + + a = S("hello") + a.delete!(S("aeiou"), S("^e")) + assert_equal(S("hell"), a) + + a = S("hello") + a.delete!(S("ej-m")) + assert_equal(S("ho"), a) + + a = S("hello") + assert_nil(a.delete!(S("z"))) + + a = S("hello") + b = a.dup + a.delete!(S("lo")) + assert_equal(S("he"), a) + assert_equal(S("hello"), b) + end + + + def test_downcase + assert_equal(S("hello"), S("helLO").downcase) + assert_equal(S("hello"), S("hello").downcase) + assert_equal(S("hello"), S("HELLO").downcase) + assert_equal(S("abc hello 123"), S("abc HELLO 123").downcase) + end + + def test_downcase! + a = S("helLO") + b = a.dup + assert_equal(S("hello"), a.downcase!) + assert_equal(S("hello"), a) + assert_equal(S("helLO"), b) + + a=S("hello") + assert_nil(a.downcase!) + assert_equal(S("hello"), a) + end + + def test_dump + a= S("Test") << 1 << 2 << 3 << 9 << 13 << 10 + assert_equal(S('"Test\\001\\002\\003\\t\\r\\n"'), a.dump) + end + + def test_dup + for taint in [ false, true ] + for frozen in [ false, true ] + a = S("hello") + a.taint if taint + a.freeze if frozen + b = a.dup + + assert_equal(a, b) + assert(a.__id__ != b.__id__) + assert(!b.frozen?) + assert_equal(a.tainted?, b.tainted?) + end + end + end + + def test_each + $/ = "\n" + res=[] + S("hello\nworld").lines.each {|x| res << x} + assert_equal(S("hello\n"), res[0]) + assert_equal(S("world"), res[1]) + + res=[] + S("hello\n\n\nworld").lines(S('')).each {|x| res << x} + assert_equal(S("hello\n\n\n"), res[0]) + assert_equal(S("world"), res[1]) + + $/ = "!" + res=[] + S("hello!world").lines.each {|x| res << x} + assert_equal(S("hello!"), res[0]) + assert_equal(S("world"), res[1]) + $/ = "\n" + end + + def test_each_byte + res = [] + S("ABC").each_byte {|x| res << x } + assert_equal(65, res[0]) + assert_equal(66, res[1]) + assert_equal(67, res[2]) + end + + def test_each_line + $/ = "\n" + res=[] + S("hello\nworld").lines.each {|x| res << x} + assert_equal(S("hello\n"), res[0]) + assert_equal(S("world"), res[1]) + + res=[] + S("hello\n\n\nworld").lines(S('')).each {|x| res << x} + assert_equal(S("hello\n\n\n"), res[0]) + assert_equal(S("world"), res[1]) + + $/ = "!" + + res=[] + S("hello!world").lines.each {|x| res << x} + assert_equal(S("hello!"), res[0]) + assert_equal(S("world"), res[1]) + + $/ = "\n" + end + + def test_empty? + assert(S("").empty?) + assert(!S("not").empty?) + end + + def test_eql? + a = S("hello") + assert(a.eql?(S("hello"))) + assert(a.eql?(a)) + end + + def test_gsub + assert_equal(S("h*ll*"), S("hello").gsub(/[aeiou]/, S('*'))) + assert_equal(S("h<e>ll<o>"), S("hello").gsub(/([aeiou])/, S('<\1>'))) + assert_equal(S("h e l l o "), + S("hello").gsub(/./) { |s| s[0].to_s + S(' ')}) + assert_equal(S("HELL-o"), + S("hello").gsub(/(hell)(.)/) { |s| $1.upcase + S('-') + $2 }) + + a = S("hello") + a.taint + assert(a.gsub(/./, S('X')).tainted?) + end + + def test_gsub! + a = S("hello") + b = a.dup + a.gsub!(/[aeiou]/, S('*')) + assert_equal(S("h*ll*"), a) + assert_equal(S("hello"), b) + + a = S("hello") + a.gsub!(/([aeiou])/, S('<\1>')) + assert_equal(S("h<e>ll<o>"), a) + + a = S("hello") + a.gsub!(/./) { |s| s[0].to_s + S(' ')} + assert_equal(S("h e l l o "), a) + + a = S("hello") + a.gsub!(/(hell)(.)/) { |s| $1.upcase + S('-') + $2 } + assert_equal(S("HELL-o"), a) + + r = S('X') + r.taint + a.gsub!(/./, r) + assert(a.tainted?) + + a = S("hello") + assert_nil(a.sub!(S('X'), S('Y'))) + end + + def test_hash + assert_equal(S("hello").hash, S("hello").hash) + assert(S("hello").hash != S("helLO").hash) + end + + def test_hex + assert_equal(255, S("0xff").hex) + assert_equal(-255, S("-0xff").hex) + assert_equal(255, S("ff").hex) + assert_equal(-255, S("-ff").hex) + assert_equal(0, S("-ralph").hex) + assert_equal(-15, S("-fred").hex) + assert_equal(15, S("fred").hex) + end + + def test_include? + assert( S("foobar").include?(?f)) + assert( S("foobar").include?(S("foo"))) + assert(!S("foobar").include?(S("baz"))) + assert(!S("foobar").include?(?z)) + end + + def test_index + assert_equal(0, S("hello").index(?h)) + assert_equal(1, S("hello").index(S("ell"))) + assert_equal(2, S("hello").index(/ll./)) + + assert_equal(3, S("hello").index(?l, 3)) + assert_equal(3, S("hello").index(S("l"), 3)) + assert_equal(3, S("hello").index(/l./, 3)) + + assert_nil(S("hello").index(?z, 3)) + assert_nil(S("hello").index(S("z"), 3)) + assert_nil(S("hello").index(/z./, 3)) + + assert_nil(S("hello").index(?z)) + assert_nil(S("hello").index(S("z"))) + assert_nil(S("hello").index(/z./)) + end + + def test_intern + assert_equal(:koala, S("koala").intern) + assert(:koala != S("Koala").intern) + end + + def test_length + assert_equal(0, S("").length) + assert_equal(4, S("1234").length) + assert_equal(6, S("1234\r\n").length) + assert_equal(7, S("\0011234\r\n").length) + end + + def test_ljust + assert_equal(S("hello"), S("hello").ljust(4)) + assert_equal(S("hello "), S("hello").ljust(11)) + end + + def test_next + assert_equal(S("abd"), S("abc").next) + assert_equal(S("z"), S("y").next) + assert_equal(S("aaa"), S("zz").next) + + assert_equal(S("124"), S("123").next) + assert_equal(S("1000"), S("999").next) + + assert_equal(S("2000aaa"), S("1999zzz").next) + assert_equal(S("AAAAA000"), S("ZZZZ999").next) + + assert_equal(S("*+"), S("**").next) + end + + def test_next! + a = S("abc") + b = a.dup + assert_equal(S("abd"), a.next!) + assert_equal(S("abd"), a) + assert_equal(S("abc"), b) + + a = S("y") + assert_equal(S("z"), a.next!) + assert_equal(S("z"), a) + + a = S("zz") + assert_equal(S("aaa"), a.next!) + assert_equal(S("aaa"), a) + + a = S("123") + assert_equal(S("124"), a.next!) + assert_equal(S("124"), a) + + a = S("999") + assert_equal(S("1000"), a.next!) + assert_equal(S("1000"), a) + + a = S("1999zzz") + assert_equal(S("2000aaa"), a.next!) + assert_equal(S("2000aaa"), a) + + a = S("ZZZZ999") + assert_equal(S("AAAAA000"), a.next!) + assert_equal(S("AAAAA000"), a) + + a = S("**") + assert_equal(S("*+"), a.next!) + assert_equal(S("*+"), a) + end + + def test_oct + assert_equal(255, S("0377").oct) + assert_equal(255, S("377").oct) + assert_equal(-255, S("-0377").oct) + assert_equal(-255, S("-377").oct) + assert_equal(0, S("OO").oct) + assert_equal(24, S("030OO").oct) + end + + def test_replace + a = S("foo") + assert_equal(S("f"), a.replace(S("f"))) + + a = S("foo") + assert_equal(S("foobar"), a.replace(S("foobar"))) + + a = S("foo") + a.taint + b = a.replace(S("xyz")) + assert_equal(S("xyz"), b) + assert(b.tainted?) + end + + def test_reverse + assert_equal(S("beta"), S("ateb").reverse) + assert_equal(S("madamImadam"), S("madamImadam").reverse) + + a=S("beta") + assert_equal(S("ateb"), a.reverse) + assert_equal(S("beta"), a) + end + + def test_reverse! + a = S("beta") + b = a.dup + assert_equal(S("ateb"), a.reverse!) + assert_equal(S("ateb"), a) + assert_equal(S("beta"), b) + + assert_equal(S("madamImadam"), S("madamImadam").reverse!) + + a = S("madamImadam") + assert_equal(S("madamImadam"), a.reverse!) # ?? + assert_equal(S("madamImadam"), a) + end + + def test_rindex + assert_equal(3, S("hello").rindex(?l)) + assert_equal(6, S("ell, hello").rindex(S("ell"))) + assert_equal(7, S("ell, hello").rindex(/ll./)) + + assert_equal(3, S("hello,lo").rindex(?l, 3)) + assert_equal(3, S("hello,lo").rindex(S("l"), 3)) + assert_equal(3, S("hello,lo").rindex(/l./, 3)) + + assert_nil(S("hello").rindex(?z, 3)) + assert_nil(S("hello").rindex(S("z"), 3)) + assert_nil(S("hello").rindex(/z./, 3)) + + assert_nil(S("hello").rindex(?z)) + assert_nil(S("hello").rindex(S("z"))) + assert_nil(S("hello").rindex(/z./)) + end + + def test_rjust + assert_equal(S("hello"), S("hello").rjust(4)) + assert_equal(S(" hello"), S("hello").rjust(11)) + end + + def test_scan + a = S("cruel world") + assert_equal([S("cruel"), S("world")],a.scan(/\w+/)) + assert_equal([S("cru"), S("el "), S("wor")],a.scan(/.../)) + assert_equal([[S("cru")], [S("el ")], [S("wor")]],a.scan(/(...)/)) + + res = [] + a.scan(/\w+/) { |w| res << w } + assert_equal([S("cruel"), S("world") ],res) + + res = [] + a.scan(/.../) { |w| res << w } + assert_equal([S("cru"), S("el "), S("wor")],res) + + res = [] + a.scan(/(...)/) { |w| res << w } + assert_equal([[S("cru")], [S("el ")], [S("wor")]],res) + end + + def test_size + assert_equal(0, S("").size) + assert_equal(4, S("1234").size) + assert_equal(6, S("1234\r\n").size) + assert_equal(7, S("\0011234\r\n").size) + end + + def test_slice + assert_equal(?A, S("AooBar").slice(0)) + assert_equal(?B, S("FooBaB").slice(-1)) + assert_nil(S("FooBar").slice(6)) + assert_nil(S("FooBar").slice(-7)) + + assert_equal(S("Foo"), S("FooBar").slice(0,3)) + assert_equal(S(S("Bar")), S("FooBar").slice(-3,3)) + assert_nil(S("FooBar").slice(7,2)) # Maybe should be six? + assert_nil(S("FooBar").slice(-7,10)) + + assert_equal(S("Foo"), S("FooBar").slice(0..2)) + assert_equal(S("Bar"), S("FooBar").slice(-3..-1)) + assert_equal(S(""), S("FooBar").slice(6..2)) + assert_nil(S("FooBar").slice(-10..-7)) + + assert_equal(S("Foo"), S("FooBar").slice(/^F../)) + assert_equal(S("Bar"), S("FooBar").slice(/..r$/)) + assert_nil(S("FooBar").slice(/xyzzy/)) + assert_nil(S("FooBar").slice(/plugh/)) + + assert_equal(S("Foo"), S("FooBar").slice(S("Foo"))) + assert_equal(S("Bar"), S("FooBar").slice(S("Bar"))) + assert_nil(S("FooBar").slice(S("xyzzy"))) + assert_nil(S("FooBar").slice(S("plugh"))) + end + + def test_slice! + a = S("AooBar") + b = a.dup + assert_equal(?A, a.slice!(0)) + assert_equal(S("ooBar"), a) + assert_equal(S("AooBar"), b) + + a = S("FooBar") + assert_equal(?r,a.slice!(-1)) + assert_equal(S("FooBa"), a) + + a = S("FooBar") + if @aref_slicebang_silent + assert_nil( a.slice!(6) ) + else + assert_raise(IndexError) { a.slice!(6) } + end + assert_equal(S("FooBar"), a) + + if @aref_slicebang_silent + assert_nil( a.slice!(-7) ) + else + assert_raise(IndexError) { a.slice!(-7) } + end + assert_equal(S("FooBar"), a) + + a = S("FooBar") + assert_equal(S("Foo"), a.slice!(0,3)) + assert_equal(S("Bar"), a) + + a = S("FooBar") + assert_equal(S("Bar"), a.slice!(-3,3)) + assert_equal(S("Foo"), a) + + a=S("FooBar") + if @aref_slicebang_silent + assert_nil(a.slice!(7,2)) # Maybe should be six? + else + assert_raise(IndexError) {a.slice!(7,2)} # Maybe should be six? + end + assert_equal(S("FooBar"), a) + if @aref_slicebang_silent + assert_nil(a.slice!(-7,10)) + else + assert_raise(IndexError) {a.slice!(-7,10)} + end + assert_equal(S("FooBar"), a) + + a=S("FooBar") + assert_equal(S("Foo"), a.slice!(0..2)) + assert_equal(S("Bar"), a) + + a=S("FooBar") + assert_equal(S("Bar"), a.slice!(-3..-1)) + assert_equal(S("Foo"), a) + + a=S("FooBar") + if @aref_slicebang_silent + assert_equal(S(""), a.slice!(6..2)) + else + assert_raise(RangeError) {a.slice!(6..2)} + end + assert_equal(S("FooBar"), a) + if @aref_slicebang_silent + assert_nil(a.slice!(-10..-7)) + else + assert_raise(RangeError) {a.slice!(-10..-7)} + end + assert_equal(S("FooBar"), a) + + a=S("FooBar") + assert_equal(S("Foo"), a.slice!(/^F../)) + assert_equal(S("Bar"), a) + + a=S("FooBar") + assert_equal(S("Bar"), a.slice!(/..r$/)) + assert_equal(S("Foo"), a) + + a=S("FooBar") + if @aref_slicebang_silent + assert_nil(a.slice!(/xyzzy/)) + else + assert_raise(IndexError) {a.slice!(/xyzzy/)} + end + assert_equal(S("FooBar"), a) + if @aref_slicebang_silent + assert_nil(a.slice!(/plugh/)) + else + assert_raise(IndexError) {a.slice!(/plugh/)} + end + assert_equal(S("FooBar"), a) + + a=S("FooBar") + assert_equal(S("Foo"), a.slice!(S("Foo"))) + assert_equal(S("Bar"), a) + + a=S("FooBar") + assert_equal(S("Bar"), a.slice!(S("Bar"))) + assert_equal(S("Foo"), a) + + pre_1_7_1 do + a=S("FooBar") + assert_nil(a.slice!(S("xyzzy"))) + assert_equal(S("FooBar"), a) + assert_nil(a.slice!(S("plugh"))) + assert_equal(S("FooBar"), a) + end + end + + def test_split + assert_nil($;) + assert_equal([S("a"), S("b"), S("c")], S(" a b\t c ").split) + assert_equal([S("a"), S("b"), S("c")], S(" a b\t c ").split(S(" "))) + + assert_equal([S(" a "), S(" b "), S(" c ")], S(" a | b | c ").split(S("|"))) + + assert_equal([S("a"), S("b"), S("c")], S("aXXbXXcXX").split(/X./)) + + assert_equal([S("a"), S("b"), S("c")], S("abc").split(//)) + + assert_equal([S("a|b|c")], S("a|b|c").split(S('|'), 1)) + + assert_equal([S("a"), S("b|c")], S("a|b|c").split(S('|'), 2)) + assert_equal([S("a"), S("b"), S("c")], S("a|b|c").split(S('|'), 3)) + + assert_equal([S("a"), S("b"), S("c"), S("")], S("a|b|c|").split(S('|'), -1)) + assert_equal([S("a"), S("b"), S("c"), S(""), S("")], S("a|b|c||").split(S('|'), -1)) + + assert_equal([S("a"), S(""), S("b"), S("c")], S("a||b|c|").split(S('|'))) + assert_equal([S("a"), S(""), S("b"), S("c"), S("")], S("a||b|c|").split(S('|'), -1)) + end + + def test_squeeze + assert_equal(S("abc"), S("aaabbbbccc").squeeze) + assert_equal(S("aa bb cc"), S("aa bb cc").squeeze(S(" "))) + assert_equal(S("BxTyWz"), S("BxxxTyyyWzzzzz").squeeze(S("a-z"))) + end + + def test_squeeze! + a = S("aaabbbbccc") + b = a.dup + assert_equal(S("abc"), a.squeeze!) + assert_equal(S("abc"), a) + assert_equal(S("aaabbbbccc"), b) + + a = S("aa bb cc") + assert_equal(S("aa bb cc"), a.squeeze!(S(" "))) + assert_equal(S("aa bb cc"), a) + + a = S("BxxxTyyyWzzzzz") + assert_equal(S("BxTyWz"), a.squeeze!(S("a-z"))) + assert_equal(S("BxTyWz"), a) + + a=S("The quick brown fox") + assert_nil(a.squeeze!) + end + + def test_strip + assert_equal(S("x"), S(" x ").strip) + assert_equal(S("x"), S(" \n\r\t x \t\r\n\n ").strip) + end + + def test_strip! + a = S(" x ") + b = a.dup + assert_equal(S("x") ,a.strip!) + assert_equal(S("x") ,a) + assert_equal(S(" x "), b) + + a = S(" \n\r\t x \t\r\n\n ") + assert_equal(S("x"), a.strip!) + assert_equal(S("x"), a) + + a = S("x") + assert_nil(a.strip!) + assert_equal(S("x") ,a) + end + + def test_sub + assert_equal(S("h*llo"), S("hello").sub(/[aeiou]/, S('*'))) + assert_equal(S("h<e>llo"), S("hello").sub(/([aeiou])/, S('<\1>'))) + assert_equal(S("h ello"), S("hello").sub(/./) { + |s| s[0].to_s + S(' ')}) + assert_equal(S("HELL-o"), S("hello").sub(/(hell)(.)/) { + |s| $1.upcase + S('-') + $2 + }) + + assert_equal(S("a\\aba"), S("ababa").sub(/b/, '\\')) + assert_equal(S("ab\\aba"), S("ababa").sub(/(b)/, '\1\\')) + assert_equal(S("ababa"), S("ababa").sub(/(b)/, '\1')) + assert_equal(S("ababa"), S("ababa").sub(/(b)/, '\\1')) + assert_equal(S("a\\1aba"), S("ababa").sub(/(b)/, '\\\1')) + assert_equal(S("a\\1aba"), S("ababa").sub(/(b)/, '\\\\1')) + assert_equal(S("a\\baba"), S("ababa").sub(/(b)/, '\\\\\1')) + + assert_equal(S("a--ababababababababab"), + S("abababababababababab").sub(/(b)/, '-\9-')) + assert_equal(S("1-b-0"), + S("1b2b3b4b5b6b7b8b9b0"). + sub(/(b).(b).(b).(b).(b).(b).(b).(b).(b)/, '-\9-')) + assert_equal(S("1-b-0"), + S("1b2b3b4b5b6b7b8b9b0"). + sub(/(b).(b).(b).(b).(b).(b).(b).(b).(b)/, '-\\9-')) + assert_equal(S("1-\\9-0"), + S("1b2b3b4b5b6b7b8b9b0"). + sub(/(b).(b).(b).(b).(b).(b).(b).(b).(b)/, '-\\\9-')) + assert_equal(S("k"), + S("1a2b3c4d5e6f7g8h9iAjBk"). + sub(/.(.).(.).(.).(.).(.).(.).(.).(.).(.).(.).(.)/, '\+')) + + assert_equal(S("ab\\aba"), S("ababa").sub(/b/, '\&\\')) + assert_equal(S("ababa"), S("ababa").sub(/b/, '\&')) + assert_equal(S("ababa"), S("ababa").sub(/b/, '\\&')) + assert_equal(S("a\\&aba"), S("ababa").sub(/b/, '\\\&')) + assert_equal(S("a\\&aba"), S("ababa").sub(/b/, '\\\\&')) + assert_equal(S("a\\baba"), S("ababa").sub(/b/, '\\\\\&')) + + a = S("hello") + a.taint + assert(a.sub(/./, S('X')).tainted?) + end + + def test_sub! + a = S("hello") + b = a.dup + a.sub!(/[aeiou]/, S('*')) + assert_equal(S("h*llo"), a) + assert_equal(S("hello"), b) + + a = S("hello") + a.sub!(/([aeiou])/, S('<\1>')) + assert_equal(S("h<e>llo"), a) + + a = S("hello") + a.sub!(/./) { |s| s[0].to_s + S(' ')} + assert_equal(S("h ello"), a) + + a = S("hello") + a.sub!(/(hell)(.)/) { |s| $1.upcase + S('-') + $2 } + assert_equal(S("HELL-o"), a) + + a=S("hello") + assert_nil(a.sub!(/X/, S('Y'))) + + r = S('X') + r.taint + a.sub!(/./, r) + assert(a.tainted?) + end + + def test_succ + assert_equal(S("abd"), S("abc").succ) + assert_equal(S("z"), S("y").succ) + assert_equal(S("aaa"), S("zz").succ) + + assert_equal(S("124"), S("123").succ) + assert_equal(S("1000"), S("999").succ) + + assert_equal(S("2000aaa"), S("1999zzz").succ) + assert_equal(S("AAAAA000"), S("ZZZZ999").succ) + assert_equal(S("*+"), S("**").succ) + end + + def test_succ! + a = S("abc") + b = a.dup + assert_equal(S("abd"), a.succ!) + assert_equal(S("abd"), a) + assert_equal(S("abc"), b) + + a = S("y") + assert_equal(S("z"), a.succ!) + assert_equal(S("z"), a) + + a = S("zz") + assert_equal(S("aaa"), a.succ!) + assert_equal(S("aaa"), a) + + a = S("123") + assert_equal(S("124"), a.succ!) + assert_equal(S("124"), a) + + a = S("999") + assert_equal(S("1000"), a.succ!) + assert_equal(S("1000"), a) + + a = S("1999zzz") + assert_equal(S("2000aaa"), a.succ!) + assert_equal(S("2000aaa"), a) + + a = S("ZZZZ999") + assert_equal(S("AAAAA000"), a.succ!) + assert_equal(S("AAAAA000"), a) + + a = S("**") + assert_equal(S("*+"), a.succ!) + assert_equal(S("*+"), a) + end + + def test_sum + n = S("\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001") + assert_equal(15, n.sum) + n += S("\001") + assert_equal(16, n.sum(17)) + n[0] = 2.chr + assert(15 != n.sum) + end + def check_sum(str, bits=16) sum = 0 str.each_byte {|c| sum += c} sum = sum & ((1 << bits) - 1) if bits != 0 assert_equal(sum, str.sum(bits)) end - def test_sum + + def test_sum_2 assert_equal(0, "".sum) assert_equal(294, "abc".sum) check_sum("abc") @@ -16,4 +1118,198 @@ class TestString < Test::Unit::TestCase check_sum("xyz", bits) } end + + def test_swapcase + assert_equal(S("hi&LOW"), S("HI&low").swapcase) + end + + def test_swapcase! + a = S("hi&LOW") + b = a.dup + assert_equal(S("HI&low"), a.swapcase!) + assert_equal(S("HI&low"), a) + assert_equal(S("hi&LOW"), b) + + a = S("$^#^%$#!!") + assert_nil(a.swapcase!) + assert_equal(S("$^#^%$#!!"), a) + end + + def test_to_f + assert_equal(344.3, S("344.3").to_f) + assert_equal(5.9742e24, S("5.9742e24").to_f) + assert_equal(98.6, S("98.6 degrees").to_f) + assert_equal(0.0, S("degrees 100.0").to_f) + end + + def test_to_i + assert_equal(1480, S("1480ft/sec").to_i) + assert_equal(0, S("speed of sound in water @20C = 1480ft/sec)").to_i) + end + + def test_to_s + a = S("me") + assert_equal("me", a.to_s) + assert_equal(a.__id__, a.to_s.__id__) if @cls == String + end + + def test_to_str + a = S("me") + assert_equal("me", a.to_s) + assert_equal(a.__id__, a.to_s.__id__) if @cls == String + end + + def test_tr + assert_equal(S("hippo"), S("hello").tr(S("el"), S("ip"))) + assert_equal(S("*e**o"), S("hello").tr(S("^aeiou"), S("*"))) + assert_equal(S("hal"), S("ibm").tr(S("b-z"), S("a-z"))) + end + + def test_tr! + a = S("hello") + b = a.dup + assert_equal(S("hippo"), a.tr!(S("el"), S("ip"))) + assert_equal(S("hippo"), a) + assert_equal(S("hello"),b) + + a = S("hello") + assert_equal(S("*e**o"), a.tr!(S("^aeiou"), S("*"))) + assert_equal(S("*e**o"), a) + + a = S("IBM") + assert_equal(S("HAL"), a.tr!(S("B-Z"), S("A-Z"))) + assert_equal(S("HAL"), a) + + a = S("ibm") + assert_nil(a.tr!(S("B-Z"), S("A-Z"))) + assert_equal(S("ibm"), a) + end + + def test_tr_s + assert_equal(S("hypo"), S("hello").tr_s(S("el"), S("yp"))) + assert_equal(S("h*o"), S("hello").tr_s(S("el"), S("*"))) + end + + def test_tr_s! + a = S("hello") + b = a.dup + assert_equal(S("hypo"), a.tr_s!(S("el"), S("yp"))) + assert_equal(S("hypo"), a) + assert_equal(S("hello"), b) + + a = S("hello") + assert_equal(S("h*o"), a.tr_s!(S("el"), S("*"))) + assert_equal(S("h*o"), a) + end + + def test_unpack + a = [S("cat"), S("wom"), S("x"), S("yy")] + assert_equal(a, S("catwomx yy ").unpack(S("A3A3A3A3"))) + + assert_equal([S("cat")], S("cat \000\000").unpack(S("A*"))) + assert_equal([S("cwx"), S("wx"), S("x"), S("yy")], + S("cwx yy ").unpack(S("A3@1A3@2A3A3"))) + assert_equal([S("cat"), S("wom"), S("x\000\000"), S("yy\000")], + S("catwomx\000\000yy\000").unpack(S("a3a3a3a3"))) + assert_equal([S("cat \000\000")], S("cat \000\000").unpack(S("a*"))) + assert_equal([S("ca")], S("catdog").unpack(S("a2"))) + + assert_equal([S("cat\000\000")], + S("cat\000\000\000\000\000dog").unpack(S("a5"))) + + assert_equal([S("01100001")], S("\x61").unpack(S("B8"))) + assert_equal([S("01100001")], S("\x61").unpack(S("B*"))) + assert_equal([S("0110000100110111")], S("\x61\x37").unpack(S("B16"))) + assert_equal([S("01100001"), S("00110111")], S("\x61\x37").unpack(S("B8B8"))) + assert_equal([S("0110")], S("\x60").unpack(S("B4"))) + + assert_equal([S("01")], S("\x40").unpack(S("B2"))) + + assert_equal([S("01100001")], S("\x86").unpack(S("b8"))) + assert_equal([S("01100001")], S("\x86").unpack(S("b*"))) + + assert_equal([S("0110000100110111")], S("\x86\xec").unpack(S("b16"))) + assert_equal([S("01100001"), S("00110111")], S("\x86\xec").unpack(S("b8b8"))) + + assert_equal([S("0110")], S("\x06").unpack(S("b4"))) + assert_equal([S("01")], S("\x02").unpack(S("b2"))) + + assert_equal([ 65, 66, 67 ], S("ABC").unpack(S("C3"))) + assert_equal([ 255, 66, 67 ], S("\377BC").unpack("C*")) + assert_equal([ 65, 66, 67 ], S("ABC").unpack("c3")) + assert_equal([ -1, 66, 67 ], S("\377BC").unpack("c*")) + + + assert_equal([S("4142"), S("0a"), S("1")], S("AB\n\x10").unpack(S("H4H2H1"))) + assert_equal([S("1424"), S("a0"), S("2")], S("AB\n\x02").unpack(S("h4h2h1"))) + + assert_equal([S("abc\002defcat\001"), S(""), S("")], + S("abc=02def=\ncat=\n=01=\n").unpack(S("M9M3M4"))) + + assert_equal([S("hello\n")], S("aGVsbG8K\n").unpack(S("m"))) + + assert_equal([S("hello\nhello\n")], S(",:&5L;&\\*:&5L;&\\*\n").unpack(S("u"))) + + assert_equal([0xa9, 0x42, 0x2260], S("\xc2\xa9B\xe2\x89\xa0").unpack(S("U*"))) + +=begin + skipping "Not tested: + D,d & double-precision float, native format\\ + E & double-precision float, little-endian byte order\\ + e & single-precision float, little-endian byte order\\ + F,f & single-precision float, native format\\ + G & double-precision float, network (big-endian) byte order\\ + g & single-precision float, network (big-endian) byte order\\ + I & unsigned integer\\ + i & integer\\ + L & unsigned long\\ + l & long\\ + + m & string encoded in base64 (uuencoded)\\ + N & long, network (big-endian) byte order\\ + n & short, network (big-endian) byte-order\\ + P & pointer to a structure (fixed-length string)\\ + p & pointer to a null-terminated string\\ + S & unsigned short\\ + s & short\\ + V & long, little-endian byte order\\ + v & short, little-endian byte order\\ + X & back up a byte\\ + x & null byte\\ + Z & ASCII string (null padded, count is width)\\ +" +=end + end + + def test_upcase + assert_equal(S("HELLO"), S("hello").upcase) + assert_equal(S("HELLO"), S("hello").upcase) + assert_equal(S("HELLO"), S("HELLO").upcase) + assert_equal(S("ABC HELLO 123"), S("abc HELLO 123").upcase) + end + + def test_upcase! + a = S("hello") + b = a.dup + assert_equal(S("HELLO"), a.upcase!) + assert_equal(S("HELLO"), a) + assert_equal(S("hello"), b) + + a = S("HELLO") + assert_nil(a.upcase!) + assert_equal(S("HELLO"), a) + end + + def test_upto + a = S("aa") + start = S("aa") + count = 0 + assert_equal(S("aa"), a.upto(S("zz")) {|s| + assert_equal(start, s) + start.succ! + count += 1 + }) + assert_equal(676, count) + end + end diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb index 362f9a7157..74fab3108a 100644 --- a/test/socket/test_tcp.rb +++ b/test/socket/test_tcp.rb @@ -7,6 +7,7 @@ end class TestTCPSocket < Test::Unit::TestCase def test_recvfrom # [ruby-dev:24705] +assert false, "TODO: doesn't work on mswin32" if /mswin32/ =~ RUBY_PLATFORM c = s = nil svr = TCPServer.new("localhost", 0) th = Thread.new { diff --git a/test/xmlrpc/test_webrick_server.rb b/test/xmlrpc/test_webrick_server.rb index 4cd63cfa74..5d5b8bc194 100644 --- a/test/xmlrpc/test_webrick_server.rb +++ b/test/xmlrpc/test_webrick_server.rb @@ -52,6 +52,7 @@ class Test_Webrick < Test::Unit::TestCase PORT = 8070 def test_client_server +assert false, "This tests doesn't work on YARV" # NOTE: I don't enable SSL testing as this hangs [false].each do |use_ssl| begin diff --git a/thread.c b/thread.c new file mode 100644 index 0000000000..5e0c92d44f --- /dev/null +++ b/thread.c @@ -0,0 +1,2036 @@ +/********************************************************************** + + thread.c - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +/* + YARV Thread Desgin + + model 1: Userlevel Thread + Same as traditional ruby thread. + + model 2: Native Thread with Giant VM lock + Using pthread (or Windows thread) and Ruby threads run concurrent. + + model 3: Native Thread with fine grain lock + Using pthread and Ruby threads run concurrent or parallel. + +------------------------------------------------------------------------ + + model 2: + A thread has mutex (GVL: Global VM Lock) can run. When thread + scheduling, running thread release GVL. If running thread + try blocking operation, this thread must release GVL and another + thread can continue this flow. After blocking operation, thread + must check interrupt (YARV_CHECK_INTS). + + Every VM can run parallel. + + Ruby threads are scheduled by OS thread scheduler. + +------------------------------------------------------------------------ + + model 3: + Every threads run concurrent or parallel and to access shared object + exclusive access control is needed. For example, to access String + object or Array object, fine grain lock must be locked every time. + */ + + +/* for model 2 */ + +#include "eval_intern.h" +#include "vm.h" + +#define THREAD_DEBUG 0 + +static void sleep_for_polling(); +static void sleep_timeval(yarv_thread_t *th, struct timeval time); +static void sleep_wait_for_interrupt(yarv_thread_t *th, double sleepsec); +static void sleep_forever(yarv_thread_t *th); +static double timeofday(); +struct timeval rb_time_interval(VALUE); +static int rb_thread_dead(yarv_thread_t *th); + +void rb_signal_exec(yarv_thread_t *th, int sig); +void rb_disable_interrupt(); + +NOINLINE(void yarv_set_stack_end(VALUE **stack_end_p)); + +static VALUE eKillSignal = INT2FIX(0); +static VALUE eTerminateSignal = INT2FIX(1); +static int system_working = 1; + +inline static void +st_delete_wrap(st_table * table, VALUE key) +{ + st_delete(table, (st_data_t *) & key, 0); +} + +/********************************************************************************/ + +#define THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION + +static void native_thread_interrupt(yarv_thread_t *th); +static void yarv_set_interrupt_function(yarv_thread_t *th, yarv_interrupt_function_t *func, int is_return); +static void yarv_clear_interrupt_function(yarv_thread_t *th); + +#define GVL_UNLOCK_RANGE(exec) do { \ + yarv_thread_t *__th = GET_THREAD(); \ + int __prev_status = __th->status; \ + yarv_set_interrupt_function(__th, native_thread_interrupt, 0); \ + __th->status = THREAD_STOPPED; \ + GVL_UNLOCK_BEGIN(); {\ + exec; \ + } \ + GVL_UNLOCK_END(); \ + yarv_remove_signal_thread_list(__th); \ + yarv_clear_interrupt_function(__th); \ + if (__th->status == THREAD_STOPPED) { \ + __th->status = __prev_status; \ + } \ + YARV_CHECK_INTS(); \ +} while(0) + +#if THREAD_DEBUG +void thread_debug(const char *fmt, ...); +#else +#define thread_debug if(0)printf +#endif + +#if defined(_WIN32) || defined(__CYGWIN__) +#include "thread_win32.ci" + +#define DEBUG_OUT() \ + WaitForSingleObject(&debug_mutex, INFINITE); \ + printf("%8p - %s", GetCurrentThreadId(), buf); \ + ReleaseMutex(&debug_mutex); + +#elif defined(HAVE_PTHREAD_H) +#include "thread_pthread.ci" + +#define DEBUG_OUT() \ + pthread_mutex_lock(&debug_mutex); \ + printf("%8p - %s", pthread_self(), buf); \ + pthread_mutex_unlock(&debug_mutex); + +#else +#error "unsupported thread type" +#endif + +#if THREAD_DEBUG +static int debug_mutex_initialized = 1; +static yarv_thread_lock_t debug_mutex; + +void +thread_debug(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZ]; + + if (debug_mutex_initialized == 1) { + debug_mutex_initialized = 0; + native_mutex_initialize(&debug_mutex); + } + + va_start(args, fmt); + vsnprintf(buf, BUFSIZ, fmt, args); + va_end(args); + + DEBUG_OUT(); +} +#endif + + +static void +yarv_set_interrupt_function(yarv_thread_t *th, yarv_interrupt_function_t *func, int is_return) +{ + check_ints: + YARV_CHECK_INTS(); + native_mutex_lock(&th->interrupt_lock); + if (th->interrupt_flag) { + native_mutex_unlock(&th->interrupt_lock); + if (is_return) { + return; + } + else { + goto check_ints; + } + } + else { + th->interrupt_function = func; + } + native_mutex_unlock(&th->interrupt_lock); +} + +static void +yarv_clear_interrupt_function(yarv_thread_t *th) +{ + native_mutex_lock(&th->interrupt_lock); + th->interrupt_function = 0; + native_mutex_unlock(&th->interrupt_lock); +} + +static void +rb_thread_interrupt(yarv_thread_t *th) +{ + native_mutex_lock(&th->interrupt_lock); + th->interrupt_flag = 1; + + if (th->interrupt_function) { + (th->interrupt_function)(th); + } + else { + /* none */ + } + native_mutex_unlock(&th->interrupt_lock); +} + + +static int +terminate_i(st_data_t key, st_data_t val, yarv_thread_t *main_thread) +{ + VALUE thval = key; + yarv_thread_t *th; + GetThreadPtr(thval, th); + + if (th != main_thread) { + thread_debug("terminate_i: %p\n", th); + rb_thread_interrupt(th); + th->throwed_errinfo = eTerminateSignal; + th->status = THREAD_TO_KILL; + } + else { + thread_debug("terminate_i: main thread (%p)\n", th); + } + return ST_CONTINUE; +} + +void +rb_thread_terminate_all(void) +{ + yarv_thread_t *th = GET_THREAD(); /* main thread */ + yarv_vm_t *vm = th->vm; + if (vm->main_thread != th) { + rb_bug("rb_thread_terminate_all: called by child thread (%p, %p)", vm->main_thread, th); + } + + thread_debug("rb_thread_terminate_all (main thread: %p)\n", th); + st_foreach(vm->living_threads, terminate_i, (st_data_t)th); + + while (!rb_thread_alone()) { + rb_thread_schedule(); + } + system_working = 0; +} + + +VALUE th_eval_body(yarv_thread_t *th); + +static void +thread_cleanup_func(void *th_ptr) +{ + yarv_thread_t *th = th_ptr; + th->status = THREAD_KILLED; + th->machine_stack_start = th->machine_stack_end = 0; +} + + +static int +thread_start_func_2(yarv_thread_t *th, VALUE *stack_start) +{ + int state; + VALUE args = th->first_args; + yarv_proc_t *proc; + yarv_thread_t *join_th; + th->machine_stack_start = stack_start; + th->thgroup = th->vm->thgroup_default; + + thread_debug("thread start: %p\n", th); + + native_mutex_lock(&th->vm->global_interpreter_lock); + { + thread_debug("thread start (get lock): %p\n", th); + yarv_set_current_running_thread(th); + + TH_PUSH_TAG(th); + if ((state = EXEC_TAG()) == 0) { + GetProcPtr(th->first_proc, proc); + th->errinfo = Qnil; + th->local_lfp = proc->block.lfp; + th->local_svar = Qnil; + th->value = th_invoke_proc(th, proc, proc->block.self, + RARRAY_LEN(args), RARRAY_PTR(args)); + } + else { + th->value = Qnil; + } + TH_POP_TAG(); + + th->status = THREAD_KILLED; + thread_debug("thread end: %p\n", th); + st_delete_wrap(th->vm->living_threads, th->self); + + /* wake up joinning threads */ + join_th = th->join_list_head; + while (join_th) { + rb_thread_interrupt(join_th); + join_th = join_th->join_list_next; + } + st_delete_wrap(th->vm->living_threads, th->self); + } + native_mutex_unlock(&th->vm->global_interpreter_lock); + return 0; +} + +VALUE yarv_thread_alloc(VALUE klass); + +static VALUE +yarv_thread_s_new(VALUE klass, VALUE args) +{ + yarv_thread_t *th; + VALUE thval; + + /* create thread object */ + thval = yarv_thread_alloc(cYarvThread); + GetThreadPtr(thval, th); + + /* setup thread environment */ + th->first_args = args; + th->first_proc = rb_block_proc(); + + native_mutex_initialize(&th->interrupt_lock); + + /* kick thread */ + st_insert(th->vm->living_threads, thval, (st_data_t) th->thread_id); + native_thread_create(th); + return thval; +} + +/* +infty, for this purpose */ +#define DELAY_INFTY 1E30 + +VALUE th_make_jump_tag_but_local_jump(int state, VALUE val); + +static VALUE +yarv_thread_join(yarv_thread_t *target_th, double delay) +{ + yarv_thread_t *th = GET_THREAD(); + double now, limit = timeofday() + delay; + + thread_debug("yarv_thread_join (thid: %p)\n", target_th->thread_id); + + if (target_th->status != THREAD_KILLED) { + th->join_list_next = target_th->join_list_head; + target_th->join_list_head = th; + } + + while (target_th->status != THREAD_KILLED) { + if (delay == DELAY_INFTY) { + sleep_forever(th); + } + else { + now = timeofday(); + if (now > limit) { + thread_debug("yarv_thread_join: timeout (thid: %p)\n", + target_th->thread_id); + return Qnil; + } + sleep_wait_for_interrupt(th, limit - now); + } + thread_debug("yarv_thread_join: interrupted (thid: %p)\n", + target_th->thread_id); + } + + thread_debug("yarv_thread_join: success (thid: %p)\n", + target_th->thread_id); + + if (target_th->errinfo != Qnil) { + VALUE err = target_th->errinfo; + + if (FIXNUM_P(err)) { + /* */ + } + else if (TYPE(target_th->errinfo) == T_NODE) { + rb_exc_raise(th_make_jump_tag_but_local_jump( + GET_THROWOBJ_STATE(err), GET_THROWOBJ_VAL(err))); + } + else { + rb_exc_raise(err); + } + } + return target_th->self; +} + +/* + * call-seq: + * thr.join => thr + * thr.join(limit) => thr + * + * The calling thread will suspend execution and run <i>thr</i>. Does not + * return until <i>thr</i> exits or until <i>limit</i> seconds have passed. If + * the time limit expires, <code>nil</code> will be returned, otherwise + * <i>thr</i> is returned. + * + * Any threads not joined will be killed when the main program exits. If + * <i>thr</i> had previously raised an exception and the + * <code>abort_on_exception</code> and <code>$DEBUG</code> flags are not set + * (so the exception has not yet been processed) it will be processed at this + * time. + * + * a = Thread.new { print "a"; sleep(10); print "b"; print "c" } + * x = Thread.new { print "x"; Thread.pass; print "y"; print "z" } + * x.join # Let x thread finish, a will be killed on exit. + * + * <em>produces:</em> + * + * axyz + * + * The following example illustrates the <i>limit</i> parameter. + * + * y = Thread.new { 4.times { sleep 0.1; puts 'tick... ' }} + * puts "Waiting" until y.join(0.15) + * + * <em>produces:</em> + * + * tick... + * Waiting + * tick... + * Waitingtick... + * + * + * tick... + */ + +static VALUE +yarv_thread_join_m(int argc, VALUE *argv, VALUE self) +{ + yarv_thread_t *target_th; + double delay = DELAY_INFTY; + VALUE limit; + + GetThreadPtr(self, target_th); + + rb_scan_args(argc, argv, "01", &limit); + if (!NIL_P(limit)) { + delay = rb_num2dbl(limit); + } + return yarv_thread_join(target_th, delay); +} + +/* + * call-seq: + * thr.value => obj + * + * Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns + * its value. + * + * a = Thread.new { 2 + 2 } + * a.value #=> 4 + */ + +static VALUE +yarv_thread_value(VALUE self) +{ + yarv_thread_t *th; + GetThreadPtr(self, th); + yarv_thread_join(th, DELAY_INFTY); + return th->value; +} + +/* + * Thread Scheduling + */ + +static struct timeval +double2timeval(double d) +{ + struct timeval time; + + time.tv_sec = (int)d; + time.tv_usec = (int)((d - (int)d) * 1e6); + if (time.tv_usec < 0) { + time.tv_usec += (long)1e6; + time.tv_sec -= 1; + } + return time; +} + +static void +sleep_forever(yarv_thread_t *th) +{ + native_sleep(th, 0); + YARV_CHECK_INTS(); +} + +static void +sleep_timeval(yarv_thread_t *th, struct timeval tv) +{ + native_sleep(th, &tv); +} + +void +rb_thread_sleep_forever() +{ + thread_debug("rb_thread_sleep_forever\n"); + sleep_forever(GET_THREAD()); +} + +static double +timeofday(void) +{ + struct timeval tv; + gettimeofday(&tv, NULL); + return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6; +} + +static void +sleep_wait_for_interrupt(yarv_thread_t *th, double sleepsec) +{ + sleep_timeval(th, double2timeval(sleepsec)); +} + +static void +sleep_for_polling(yarv_thread_t *th) +{ + struct timeval time; + time.tv_sec = 0; + time.tv_usec = 100 * 1000; /* 0.1 sec */ + sleep_timeval(th, time); +} + +void +rb_thread_wait_for(struct timeval time) +{ + yarv_thread_t *th = GET_THREAD(); + sleep_timeval(th, time); +} + +void +rb_thread_polling(void) +{ + if (!rb_thread_alone()) { + yarv_thread_t *th = GET_THREAD(); + sleep_for_polling(th); + } +} + +struct timeval rb_time_timeval(); + +void +rb_thread_sleep(int sec) +{ + rb_thread_wait_for(rb_time_timeval(INT2FIX(sec))); +} + +void +rb_thread_schedule() +{ + thread_debug("rb_thread_schedule\n"); + if (!rb_thread_alone()) { + yarv_thread_t *th = GET_THREAD(); + + thread_debug("rb_thread_schedule/switch start\n"); + + yarv_save_machine_context(th); + native_mutex_unlock(&th->vm->global_interpreter_lock); + { + native_thread_yield(); + } + native_mutex_lock(&th->vm->global_interpreter_lock); + + yarv_set_current_running_thread(th); + thread_debug("rb_thread_schedule/switch done\n"); + + YARV_CHECK_INTS(); + } +} + + +static VALUE +rb_thread_s_critical(VALUE self) +{ + rb_warn("Thread.critical is unsupported. Use Mutex instead."); + return Qnil; +} + + +VALUE +rb_thread_run_parallel(VALUE(*func)(yarv_thread_t *th, void *), void *data) +{ + VALUE val; + yarv_thread_t *th = GET_THREAD(); + + GVL_UNLOCK_RANGE({ + val = func(th, data); + }); + + return val; +} + + +/* + * call-seq: + * Thread.pass => nil + * + * Invokes the thread scheduler to pass execution to another thread. + * + * a = Thread.new { print "a"; Thread.pass; + * print "b"; Thread.pass; + * print "c" } + * b = Thread.new { print "x"; Thread.pass; + * print "y"; Thread.pass; + * print "z" } + * a.join + * b.join + * + * <em>produces:</em> + * + * axbycz + */ + +static VALUE +yarv_thread_s_pass(VALUE klass) +{ + rb_thread_schedule(); + return Qnil; +} + +/* + * + */ + +void +yarv_thread_execute_interrupts(yarv_thread_t *th) +{ + while (th->interrupt_flag) { + int status = th->status; + th->status = THREAD_RUNNABLE; + th->interrupt_flag = 0; + + /* signal handling */ + if (th->exec_signal) { + int sig = th->exec_signal; + th->exec_signal = 0; + rb_signal_exec(th, sig); + } + + /* exception from another thread */ + if (th->throwed_errinfo) { + VALUE err = th->throwed_errinfo; + th->throwed_errinfo = 0; + thread_debug("yarv_thread_execute_interrupts: %p\n", err); + + if (err == eKillSignal) { + th->errinfo = INT2FIX(TAG_FATAL); + TH_JUMP_TAG(th, TAG_FATAL); + } + else if (err == eTerminateSignal) { + struct yarv_tag *tag = th->tag; + + /* rewind to toplevel stack */ + while (th->tag->prev) { + th->tag = th->tag->prev; + } + + th->errinfo = INT2FIX(TAG_FATAL); + TH_JUMP_TAG(th, TAG_FATAL); + } + else { + rb_exc_raise(err); + } + } + th->status = status; + + /* thread pass */ + rb_thread_schedule(); + } +} + + +void +rb_gc_mark_threads() +{ + // TODO: remove +} + +/*****************************************************/ + +static void +rb_thread_ready(yarv_thread_t *th) +{ + rb_thread_interrupt(th); +} + +static VALUE +yarv_thread_raise(int argc, VALUE *argv, yarv_thread_t *th) +{ + VALUE exc; + + if (rb_thread_dead(th)) { + return Qnil; + } + + exc = rb_make_exception(argc, argv); + // TODO: need synchronization if run threads in parallel + th->throwed_errinfo = exc; + rb_thread_ready(th); + return Qnil; +} + +void +rb_thread_signal_raise(void *thptr, const char *sig) +{ + VALUE argv[1]; + char buf[BUFSIZ]; + yarv_thread_t *th = thptr; + + if (sig == 0) { + return; /* should not happen */ + } + snprintf(buf, BUFSIZ, "SIG%s", sig); + argv[0] = rb_exc_new3(rb_eSignal, rb_str_new2(buf)); + yarv_thread_raise(1, argv, th->vm->main_thread); +} + +void +rb_thread_signal_exit(void *thptr) +{ + VALUE argv[1]; + VALUE args[2]; + yarv_thread_t *th = thptr; + + args[0] = INT2NUM(EXIT_SUCCESS); + args[1] = rb_str_new2("exit"); + argv[0] = rb_class_new_instance(2, args, rb_eSystemExit); + yarv_thread_raise(1, argv, th->vm->main_thread); +} + + +/* + * call-seq: + * thr.raise(exception) + * + * Raises an exception (see <code>Kernel::raise</code>) from <i>thr</i>. The + * caller does not have to be <i>thr</i>. + * + * Thread.abort_on_exception = true + * a = Thread.new { sleep(200) } + * a.raise("Gotcha") + * + * <em>produces:</em> + * + * prog.rb:3: Gotcha (RuntimeError) + * from prog.rb:2:in `initialize' + * from prog.rb:2:in `new' + * from prog.rb:2 + */ + +static VALUE +yarv_thread_raise_m(int argc, VALUE *argv, VALUE self) +{ + yarv_thread_t *th; + GetThreadPtr(self, th); + yarv_thread_raise(argc, argv, th); + return Qnil; +} + + +/* + * call-seq: + * thr.exit => thr or nil + * thr.kill => thr or nil + * thr.terminate => thr or nil + * + * Terminates <i>thr</i> and schedules another thread to be run. If this thread + * is already marked to be killed, <code>exit</code> returns the + * <code>Thread</code>. If this is the main thread, or the last thread, exits + * the process. + */ + +VALUE +rb_thread_kill(VALUE thread) +{ + yarv_thread_t *th; + + GetThreadPtr(thread, th); + + if (th != GET_THREAD() && th->safe_level < 4) { + rb_secure(4); + } + if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED) { + return thread; + } + if (th == th->vm->main_thread) { + rb_exit(EXIT_SUCCESS); + } + + thread_debug("rb_thread_kill: %p (%p)\n", th, th->thread_id); + + rb_thread_interrupt(th); + th->throwed_errinfo = eKillSignal; + th->status = THREAD_TO_KILL; + + return thread; +} + + +/* + * call-seq: + * Thread.kill(thread) => thread + * + * Causes the given <em>thread</em> to exit (see <code>Thread::exit</code>). + * + * count = 0 + * a = Thread.new { loop { count += 1 } } + * sleep(0.1) #=> 0 + * Thread.kill(a) #=> #<Thread:0x401b3d30 dead> + * count #=> 93947 + * a.alive? #=> false + */ + +static VALUE +rb_thread_s_kill(VALUE obj, VALUE th) +{ + return rb_thread_kill(th); +} + + +/* + * call-seq: + * Thread.exit => thread + * + * Terminates the currently running thread and schedules another thread to be + * run. If this thread is already marked to be killed, <code>exit</code> + * returns the <code>Thread</code>. If this is the main thread, or the last + * thread, exit the process. + */ + +static VALUE +rb_thread_exit() +{ + return rb_thread_kill(GET_THREAD()->self); +} + + +/* + * call-seq: + * thr.wakeup => thr + * + * Marks <i>thr</i> as eligible for scheduling (it may still remain blocked on + * I/O, however). Does not invoke the scheduler (see <code>Thread#run</code>). + * + * c = Thread.new { Thread.stop; puts "hey!" } + * c.wakeup + * + * <em>produces:</em> + * + * hey! + */ + +VALUE +rb_thread_wakeup(VALUE thread) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + + if (th->status == THREAD_KILLED) { + rb_raise(rb_eThreadError, "killed thread"); + } + rb_thread_ready(th); + return thread; +} + + +/* + * call-seq: + * thr.run => thr + * + * Wakes up <i>thr</i>, making it eligible for scheduling. If not in a critical + * section, then invokes the scheduler. + * + * a = Thread.new { puts "a"; Thread.stop; puts "c" } + * Thread.pass + * puts "Got here" + * a.run + * a.join + * + * <em>produces:</em> + * + * a + * Got here + * c + */ + +VALUE +rb_thread_run(thread) + VALUE thread; +{ + rb_thread_wakeup(thread); + rb_thread_schedule(); + return thread; +} + + +/* + * call-seq: + * Thread.stop => nil + * + * Stops execution of the current thread, putting it into a ``sleep'' state, + * and schedules execution of another thread. Resets the ``critical'' condition + * to <code>false</code>. + * + * a = Thread.new { print "a"; Thread.stop; print "c" } + * Thread.pass + * print "b" + * a.run + * a.join + * + * <em>produces:</em> + * + * abc + */ + +VALUE +rb_thread_stop(void) +{ + if (rb_thread_alone()) { + rb_raise(rb_eThreadError, + "stopping only thread\n\tnote: use sleep to stop forever"); + } + rb_thread_sleep_forever(); + return Qnil; +} + +static int +thread_list_i(st_data_t key, st_data_t val, void *data) +{ + VALUE ary = (VALUE)data; + yarv_thread_t *th; + GetThreadPtr((VALUE)key, th); + + switch (th->status) { + case THREAD_RUNNABLE: + case THREAD_STOPPED: + case THREAD_TO_KILL: + rb_ary_push(ary, th->self); + default: + break; + } + return ST_CONTINUE; +} + +/********************************************************************/ + +/* + * call-seq: + * Thread.list => array + * + * Returns an array of <code>Thread</code> objects for all threads that are + * either runnable or stopped. + * + * Thread.new { sleep(200) } + * Thread.new { 1000000.times {|i| i*i } } + * Thread.new { Thread.stop } + * Thread.list.each {|t| p t} + * + * <em>produces:</em> + * + * #<Thread:0x401b3e84 sleep> + * #<Thread:0x401b3f38 run> + * #<Thread:0x401b3fb0 sleep> + * #<Thread:0x401bdf4c run> + */ + +VALUE +rb_thread_list(void) +{ + VALUE ary = rb_ary_new(); + st_foreach(GET_THREAD()->vm->living_threads, thread_list_i, ary); + return ary; +} + +/* + * call-seq: + * Thread.current => thread + * + * Returns the currently executing thread. + * + * Thread.current #=> #<Thread:0x401bdf4c run> + */ + +static VALUE +yarv_thread_s_current(VALUE klass) +{ + return GET_THREAD()->self; +} + +VALUE +rb_thread_main(void) +{ + return GET_THREAD()->vm->main_thread->self; +} + +static VALUE +rb_thread_s_main(VALUE klass) +{ + return rb_thread_main(); +} + + +/* + * call-seq: + * Thread.abort_on_exception => true or false + * + * Returns the status of the global ``abort on exception'' condition. The + * default is <code>false</code>. When set to <code>true</code>, or if the + * global <code>$DEBUG</code> flag is <code>true</code> (perhaps because the + * command line option <code>-d</code> was specified) all threads will abort + * (the process will <code>exit(0)</code>) if an exception is raised in any + * thread. See also <code>Thread::abort_on_exception=</code>. + */ + +static VALUE +rb_thread_s_abort_exc() +{ + return GET_THREAD()->vm->thread_abort_on_exception ? Qtrue : Qfalse; +} + + +/* + * call-seq: + * Thread.abort_on_exception= boolean => true or false + * + * When set to <code>true</code>, all threads will abort if an exception is + * raised. Returns the new state. + * + * Thread.abort_on_exception = true + * t1 = Thread.new do + * puts "In new thread" + * raise "Exception from thread" + * end + * sleep(1) + * puts "not reached" + * + * <em>produces:</em> + * + * In new thread + * prog.rb:4: Exception from thread (RuntimeError) + * from prog.rb:2:in `initialize' + * from prog.rb:2:in `new' + * from prog.rb:2 + */ + +static VALUE +rb_thread_s_abort_exc_set(VALUE self, VALUE val) +{ + rb_secure(4); + GET_THREAD()->vm->thread_abort_on_exception = RTEST(val); + return val; +} + + +/* + * call-seq: + * thr.abort_on_exception => true or false + * + * Returns the status of the thread-local ``abort on exception'' condition for + * <i>thr</i>. The default is <code>false</code>. See also + * <code>Thread::abort_on_exception=</code>. + */ + +static VALUE +rb_thread_abort_exc(VALUE thread) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + return th->abort_on_exception ? Qtrue : Qfalse; +} + + +/* + * call-seq: + * thr.abort_on_exception= boolean => true or false + * + * When set to <code>true</code>, causes all threads (including the main + * program) to abort if an exception is raised in <i>thr</i>. The process will + * effectively <code>exit(0)</code>. + */ + +static VALUE +rb_thread_abort_exc_set(VALUE thread, VALUE val) +{ + yarv_thread_t *th; + rb_secure(4); + + GetThreadPtr(thread, th); + th->abort_on_exception = RTEST(val); + return val; +} + + +/* + * call-seq: + * thr.group => thgrp or nil + * + * Returns the <code>ThreadGroup</code> which contains <i>thr</i>, or nil if + * the thread is not a member of any group. + * + * Thread.main.group #=> #<ThreadGroup:0x4029d914> + */ + +VALUE +rb_thread_group(VALUE thread) +{ + yarv_thread_t *th; + VALUE group; + GetThreadPtr(thread, th); + group = th->thgroup; + + if (!group) { + group = Qnil; + } + return group; +} + +static const char * +thread_status_name(enum yarv_thread_status status) +{ + switch (status) { + case THREAD_RUNNABLE: + return "run"; + case THREAD_STOPPED: + return "sleep"; + case THREAD_TO_KILL: + return "aborting"; + case THREAD_KILLED: + return "dead"; + default: + return "unknown"; + } +} + +static int +rb_thread_dead(yarv_thread_t *th) +{ + return th->status == THREAD_KILLED; +} + + +/* + * call-seq: + * thr.status => string, false or nil + * + * Returns the status of <i>thr</i>: ``<code>sleep</code>'' if <i>thr</i> is + * sleeping or waiting on I/O, ``<code>run</code>'' if <i>thr</i> is executing, + * ``<code>aborting</code>'' if <i>thr</i> is aborting, <code>false</code> if + * <i>thr</i> terminated normally, and <code>nil</code> if <i>thr</i> + * terminated with an exception. + * + * a = Thread.new { raise("die now") } + * b = Thread.new { Thread.stop } + * c = Thread.new { Thread.exit } + * d = Thread.new { sleep } + * Thread.critical = true + * d.kill #=> #<Thread:0x401b3678 aborting> + * a.status #=> nil + * b.status #=> "sleep" + * c.status #=> false + * d.status #=> "aborting" + * Thread.current.status #=> "run" + */ + +static VALUE +rb_thread_status(VALUE thread) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + + if (rb_thread_dead(th)) { + if (!NIL_P(th->errinfo) && !FIXNUM_P(th->errinfo) + /* TODO */ ) { + return Qnil; + } + return Qfalse; + } + return rb_str_new2(thread_status_name(th->status)); +} + + +/* + * call-seq: + * thr.alive? => true or false + * + * Returns <code>true</code> if <i>thr</i> is running or sleeping. + * + * thr = Thread.new { } + * thr.join #=> #<Thread:0x401b3fb0 dead> + * Thread.current.alive? #=> true + * thr.alive? #=> false + */ + +static VALUE +rb_thread_alive_p(VALUE thread) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + + if (rb_thread_dead(th)) + return Qfalse; + return Qtrue; +} + +/* + * call-seq: + * thr.stop? => true or false + * + * Returns <code>true</code> if <i>thr</i> is dead or sleeping. + * + * a = Thread.new { Thread.stop } + * b = Thread.current + * a.stop? #=> true + * b.stop? #=> false + */ + +static VALUE +rb_thread_stop_p(VALUE thread) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + + if (rb_thread_dead(th)) + return Qtrue; + if (th->status == THREAD_STOPPED) + return Qtrue; + return Qfalse; +} + +/* + * call-seq: + * thr.safe_level => integer + * + * Returns the safe level in effect for <i>thr</i>. Setting thread-local safe + * levels can help when implementing sandboxes which run insecure code. + * + * thr = Thread.new { $SAFE = 3; sleep } + * Thread.current.safe_level #=> 0 + * thr.safe_level #=> 3 + */ + +static VALUE +rb_thread_safe_level(VALUE thread) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + + return INT2NUM(th->safe_level); +} + +/* + * call-seq: + * thr.inspect => string + * + * Dump the name, id, and status of _thr_ to a string. + */ + +static VALUE +rb_thread_inspect(VALUE thread) +{ + char *cname = rb_obj_classname(thread); + yarv_thread_t *th; + const char *status; + VALUE str; + + GetThreadPtr(thread, th); + status = thread_status_name(th->status); + str = rb_sprintf("#<%s:%p %s>", cname, (void *)thread, status); + OBJ_INFECT(str, thread); + + return str; +} + +VALUE +rb_thread_local_aref(VALUE thread, ID id) +{ + yarv_thread_t *th; + VALUE val; + + GetThreadPtr(thread, th); + if (rb_safe_level() >= 4 && th != GET_THREAD()) { + rb_raise(rb_eSecurityError, "Insecure: thread locals"); + } + if (!th->local_storage) { + return Qnil; + } + if (st_lookup(th->local_storage, id, &val)) { + return val; + } + return Qnil; +} + +/* + * call-seq: + * thr[sym] => obj or nil + * + * Attribute Reference---Returns the value of a thread-local variable, using + * either a symbol or a string name. If the specified variable does not exist, + * returns <code>nil</code>. + * + * a = Thread.new { Thread.current["name"] = "A"; Thread.stop } + * b = Thread.new { Thread.current[:name] = "B"; Thread.stop } + * c = Thread.new { Thread.current["name"] = "C"; Thread.stop } + * Thread.list.each {|x| puts "#{x.inspect}: #{x[:name]}" } + * + * <em>produces:</em> + * + * #<Thread:0x401b3b3c sleep>: C + * #<Thread:0x401b3bc8 sleep>: B + * #<Thread:0x401b3c68 sleep>: A + * #<Thread:0x401bdf4c run>: + */ + +static VALUE +rb_thread_aref(VALUE thread, VALUE id) +{ + return rb_thread_local_aref(thread, rb_to_id(id)); +} + +VALUE +rb_thread_local_aset(VALUE thread, ID id, VALUE val) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + + if (rb_safe_level() >= 4 && th != GET_THREAD()) { + rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals"); + } + if (OBJ_FROZEN(thread)) { + rb_error_frozen("thread locals"); + } + if (!th->local_storage) { + th->local_storage = st_init_numtable(); + } + if (NIL_P(val)) { + st_delete(th->local_storage, (st_data_t *) & id, 0); + return Qnil; + } + st_insert(th->local_storage, id, val); + return val; +} + +/* + * call-seq: + * thr[sym] = obj => obj + * + * Attribute Assignment---Sets or creates the value of a thread-local variable, + * using either a symbol or a string. See also <code>Thread#[]</code>. + */ + +static VALUE +rb_thread_aset(VALUE self, ID id, VALUE val) +{ + return rb_thread_local_aset(self, rb_to_id(id), val); +} + +/* + * call-seq: + * thr.key?(sym) => true or false + * + * Returns <code>true</code> if the given string (or symbol) exists as a + * thread-local variable. + * + * me = Thread.current + * me[:oliver] = "a" + * me.key?(:oliver) #=> true + * me.key?(:stanley) #=> false + */ + +static VALUE +rb_thread_key_p(VALUE self, ID id) +{ + yarv_thread_t *th; + GetThreadPtr(self, th); + + if (!th->local_storage) { + return Qfalse; + } + if (st_lookup(th->local_storage, rb_to_id(id), 0)) { + return Qtrue; + } + return Qfalse; +} + +static int +thread_keys_i(ID key, VALUE value, VALUE ary) +{ + rb_ary_push(ary, ID2SYM(key)); + return ST_CONTINUE; +} + +int +rb_thread_alone() +{ + int num = 1; + if (GET_THREAD()->vm->living_threads) { + num = GET_THREAD()->vm->living_threads->num_entries; + thread_debug("rb_thread_alone: %d\n", num); + } + return num == 1; +} + +/* + * call-seq: + * thr.keys => array + * + * Returns an an array of the names of the thread-local variables (as Symbols). + * + * thr = Thread.new do + * Thread.current[:cat] = 'meow' + * Thread.current["dog"] = 'woof' + * end + * thr.join #=> #<Thread:0x401b3f10 dead> + * thr.keys #=> [:dog, :cat] + */ + +static VALUE +rb_thread_keys(VALUE self) +{ + yarv_thread_t *th; + VALUE ary = rb_ary_new(); + GetThreadPtr(self, th); + + if (th->local_storage) { + st_foreach(th->local_storage, thread_keys_i, ary); + } + return ary; +} + +/* + * call-seq: + * thr.priority => integer + * + * Returns the priority of <i>thr</i>. Default is zero; higher-priority threads + * will run before lower-priority threads. + * + * Thread.current.priority #=> 0 + */ + +static VALUE +rb_thread_priority(VALUE thread) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + return INT2NUM(th->priority); +} + + +/* + * call-seq: + * thr.priority= integer => thr + * + * Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads + * will run before lower-priority threads. + * + * count1 = count2 = 0 + * a = Thread.new do + * loop { count1 += 1 } + * end + * a.priority = -1 + * + * b = Thread.new do + * loop { count2 += 1 } + * end + * b.priority = -2 + * sleep 1 #=> 1 + * Thread.critical = 1 + * count1 #=> 622504 + * count2 #=> 5832 + */ + +static VALUE +rb_thread_priority_set(VALUE thread, VALUE prio) +{ + yarv_thread_t *th; + GetThreadPtr(thread, th); + + rb_secure(4); + + th->priority = NUM2INT(prio); + native_thread_apply_priority(th); + return prio; +} + +/* for IO */ + +void +rb_thread_wait_fd(int fd) +{ + fd_set set; + int result = 0; + + FD_ZERO(&set); + FD_SET(fd, &set); + thread_debug("rb_thread_wait_fd (%d)\n", fd); + while (result <= 0) { + GVL_UNLOCK_RANGE(result = select(fd + 1, &set, 0, 0, 0)); + } + thread_debug("rb_thread_wait_fd done\n", fd); +} + +int +rb_thread_fd_writable(int fd) +{ + fd_set set; + int result = 0; + + FD_ZERO(&set); + FD_SET(fd, &set); + + thread_debug("rb_thread_fd_writable (%d)\n", fd); + while (result <= 0) { + GVL_UNLOCK_RANGE(result = select(fd + 1, 0, &set, 0, 0)); + } + thread_debug("rb_thread_fd_writable done\n"); + return Qtrue; +} + +int +rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except, + struct timeval *timeout) +{ + struct timeval *tvp = timeout; + int lerrno, n; +#ifndef linux + double limit; + struct timeval tv; +#endif + + if (!read && !write && !except) { + if (!timeout) { + rb_thread_sleep_forever(); + return 0; + } + rb_thread_wait_for(*timeout); + return 0; + } + +#ifndef linux + if (timeout) { + limit = timeofday() + + (double)timeout->tv_sec + (double)timeout->tv_usec * 1e-6; + } +#endif + +#ifndef linux + if (timeout) { + tv = *timeout; + tvp = &tv; + } +#else + tvp = timeout; +#endif + + for (;;) { + GVL_UNLOCK_RANGE(n = select(max, read, write, except, tvp); + lerrno = errno; + ); + + if (n < 0) { + switch (errno) { + case EINTR: +#ifdef ERESTART + case ERESTART: +#endif + +#ifndef linux + if (timeout) { + double d = limit - timeofday(); + tv = double2timeval(d); + } +#endif + continue; + default: + break; + } + } + return n; + } +} + + +/* + * for GC + */ + +void +yarv_set_stack_end(VALUE **stack_end_p) +{ + VALUE stack_end; + *stack_end_p = &stack_end; +} + +void +yarv_save_machine_context(yarv_thread_t *th) +{ + yarv_set_stack_end(&th->machine_stack_end); + setjmp(th->machine_regs); +} + +/* + * + */ + +int rb_get_next_signal(yarv_vm_t *vm); + +static void +timer_thread_function(void) +{ + yarv_vm_t *vm = GET_VM(); /* TODO: fix me for Multi-VM */ + vm->running_thread->interrupt_flag = 1; + + if (vm->bufferd_signal_size && vm->main_thread->exec_signal == 0) { + vm->main_thread->exec_signal = rb_get_next_signal(vm); + thread_debug("bufferd_signal_size: %d, sig: %d\n", + vm->bufferd_signal_size, vm->main_thread->exec_signal); + rb_thread_interrupt(vm->main_thread); + } +} + +/***/ + +void +rb_thread_atfork(void) +{ + yarv_thread_t *th = GET_THREAD(); + yarv_vm_t *vm = th->vm; + vm->main_thread = th; + + st_free_table(vm->living_threads); + vm->living_threads = st_init_numtable(); + st_insert(vm->living_threads, th->self, (st_data_t) th->thread_id); +} + +/* + * for tests + */ + +static VALUE +raw_gets(VALUE klass) +{ + char buff[100]; + GVL_UNLOCK_BEGIN(); + { + fgets(buff, 100, stdin); + } + GVL_UNLOCK_END(); + return rb_str_new2(buff); +} + + +struct thgroup { + int enclosed; + VALUE group; +}; + +/* + * Document-class: ThreadGroup + * + * <code>ThreadGroup</code> provides a means of keeping track of a number of + * threads as a group. A <code>Thread</code> can belong to only one + * <code>ThreadGroup</code> at a time; adding a thread to a new group will + * remove it from any previous group. + * + * Newly created threads belong to the same group as the thread from which they + * were created. + */ + +static VALUE thgroup_s_alloc _((VALUE)); +static VALUE +thgroup_s_alloc(VALUE klass) +{ + VALUE group; + struct thgroup *data; + + group = Data_Make_Struct(klass, struct thgroup, 0, free, data); + data->enclosed = 0; + data->group = group; + + return group; +} + +struct thgroup_list_params { + VALUE ary; + VALUE group; +}; + +static int +thgroup_list_i(st_data_t key, st_data_t val, st_data_t data) +{ + VALUE thread = (VALUE)key; + VALUE ary = ((struct thgroup_list_params *)data)->ary; + VALUE group = ((struct thgroup_list_params *)data)->group; + yarv_thread_t *th; + GetThreadPtr(thread, th); + + if (th->thgroup == group) { + rb_ary_push(ary, thread); + } + return ST_CONTINUE; +} + +/* + * call-seq: + * thgrp.list => array + * + * Returns an array of all existing <code>Thread</code> objects that belong to + * this group. + * + * ThreadGroup::Default.list #=> [#<Thread:0x401bdf4c run>] + */ + +static VALUE +thgroup_list(VALUE group) +{ + VALUE ary = rb_ary_new(); + struct thgroup_list_params param = { + ary, group, + }; + st_foreach(GET_THREAD()->vm->living_threads, thgroup_list_i, (st_data_t) & param); + return ary; +} + + +/* + * call-seq: + * thgrp.enclose => thgrp + * + * Prevents threads from being added to or removed from the receiving + * <code>ThreadGroup</code>. New threads can still be started in an enclosed + * <code>ThreadGroup</code>. + * + * ThreadGroup::Default.enclose #=> #<ThreadGroup:0x4029d914> + * thr = Thread::new { Thread.stop } #=> #<Thread:0x402a7210 sleep> + * tg = ThreadGroup::new #=> #<ThreadGroup:0x402752d4> + * tg.add thr + * + * <em>produces:</em> + * + * ThreadError: can't move from the enclosed thread group + */ + +VALUE +thgroup_enclose(group) + VALUE group; +{ + struct thgroup *data; + + Data_Get_Struct(group, struct thgroup, data); + data->enclosed = 1; + + return group; +} + + +/* + * call-seq: + * thgrp.enclosed? => true or false + * + * Returns <code>true</code> if <em>thgrp</em> is enclosed. See also + * ThreadGroup#enclose. + */ + +static VALUE +thgroup_enclosed_p(VALUE group) +{ + struct thgroup *data; + + Data_Get_Struct(group, struct thgroup, data); + if (data->enclosed) + return Qtrue; + return Qfalse; +} + + +/* + * call-seq: + * thgrp.add(thread) => thgrp + * + * Adds the given <em>thread</em> to this group, removing it from any other + * group to which it may have previously belonged. + * + * puts "Initial group is #{ThreadGroup::Default.list}" + * tg = ThreadGroup.new + * t1 = Thread.new { sleep } + * t2 = Thread.new { sleep } + * puts "t1 is #{t1}" + * puts "t2 is #{t2}" + * tg.add(t1) + * puts "Initial group now #{ThreadGroup::Default.list}" + * puts "tg group now #{tg.list}" + * + * <em>produces:</em> + * + * Initial group is #<Thread:0x401bdf4c> + * t1 is #<Thread:0x401b3c90> + * t2 is #<Thread:0x401b3c18> + * Initial group now #<Thread:0x401b3c18>#<Thread:0x401bdf4c> + * tg group now #<Thread:0x401b3c90> + */ + +static VALUE +thgroup_add(VALUE group, VALUE thread) +{ + yarv_thread_t *th; + struct thgroup *data; + + rb_secure(4); + GetThreadPtr(thread, th); + + if (OBJ_FROZEN(group)) { + rb_raise(rb_eThreadError, "can't move to the frozen thread group"); + } + Data_Get_Struct(group, struct thgroup, data); + if (data->enclosed) { + rb_raise(rb_eThreadError, "can't move to the enclosed thread group"); + } + + if (!th->thgroup) { + return Qnil; + } + + if (OBJ_FROZEN(th->thgroup)) { + rb_raise(rb_eThreadError, "can't move from the frozen thread group"); + } + Data_Get_Struct(th->thgroup, struct thgroup, data); + if (data->enclosed) { + rb_raise(rb_eThreadError, + "can't move from the enclosed thread group"); + } + + th->thgroup = group; + return group; +} + +/* + Mutex + */ + +typedef struct mutex_struct { + yarv_thread_t *th; + yarv_thread_lock_t lock; +} mutex_t; + +#define GetMutexVal(obj, tobj) \ + Data_Get_Struct(obj, mutex_t, tobj) + +static void +mutex_mark(void *ptr) +{ + if (ptr) { + mutex_t *mutex = ptr; + if (mutex->th) { + rb_gc_mark(mutex->th->self); + } + } +} + +static void +mutex_free(void *ptr) +{ + if (ptr) { + mutex_t *mutex = ptr; + if (mutex->th) { + native_mutex_unlock(&mutex->lock); + } + } + ruby_xfree(ptr); +} + +static VALUE +mutex_alloc(VALUE klass) +{ + VALUE volatile obj; + mutex_t *mutex; + + obj = Data_Make_Struct(klass, mutex_t, mutex_mark, mutex_free, mutex); + mutex->th = 0; + native_mutex_initialize(&mutex->lock); + return obj; +} + +static VALUE +mutex_initialize(VALUE self) +{ + return self; +} + +static VALUE +mutex_locked_p(VALUE self) +{ + mutex_t *mutex; + GetMutexVal(self, mutex); + return mutex->th ? Qtrue : Qfalse; +} + +static VALUE +mutex_try_lock(VALUE self) +{ + mutex_t *mutex; + GetMutexVal(self, mutex); + + if (native_mutex_trylock(&mutex->lock) != EBUSY) { + return Qtrue; + } + else { + return Qfalse; + } +} + +static VALUE +mutex_lock(VALUE self) +{ + mutex_t *mutex; + GetMutexVal(self, mutex); + + if (mutex->th == GET_THREAD()) { + rb_raise(rb_eThreadError, "deadlock; recursive locking"); + } + + if (native_mutex_trylock(&mutex->lock) != 0) { + /* can't cancel */ + GVL_UNLOCK_BEGIN(); + native_mutex_lock(&mutex->lock); + GVL_UNLOCK_END(); + } + + mutex->th = GET_THREAD(); + return self; +} + +static VALUE +mutex_unlock(VALUE self) +{ + mutex_t *mutex; + GetMutexVal(self, mutex); + + if (mutex->th != GET_THREAD()) { + rb_raise(rb_eThreadError, + "Attempt to unlock a mutex which is locked by another thread"); + } + mutex->th = 0; + native_mutex_unlock(&mutex->lock); + return self; +} + +static VALUE +mutex_sleep(int argc, VALUE *argv, VALUE self) +{ + int beg, end; + mutex_unlock(self); + + beg = time(0); + if (argc == 0) { + rb_thread_sleep_forever(); + } + else if (argc == 1) { + rb_thread_wait_for(rb_time_interval(argv[0])); + } + else { + rb_raise(rb_eArgError, "wrong number of arguments"); + } + mutex_lock(self); + end = time(0) - beg; + return INT2FIX(end); +} + + +void +Init_yarvthread() +{ + VALUE cThGroup; + VALUE thgroup_default; + VALUE cMutex; + + rb_define_global_function("raw_gets", raw_gets, 0); + + rb_define_singleton_method(cYarvThread, "new", yarv_thread_s_new, -2); + rb_define_singleton_method(cYarvThread, "start", yarv_thread_s_new, -2); + rb_define_singleton_method(cYarvThread, "fork", yarv_thread_s_new, -2); + rb_define_singleton_method(cYarvThread, "main", rb_thread_s_main, 0); + rb_define_singleton_method(cYarvThread, "current", yarv_thread_s_current, 0); + rb_define_singleton_method(cYarvThread, "stop", rb_thread_stop, 0); + rb_define_singleton_method(cYarvThread, "kill", rb_thread_s_kill, 1); + rb_define_singleton_method(cYarvThread, "exit", rb_thread_exit, 0); + rb_define_singleton_method(cYarvThread, "pass", yarv_thread_s_pass, 0); + rb_define_singleton_method(cYarvThread, "list", rb_thread_list, 0); + rb_define_singleton_method(cYarvThread, "critical", rb_thread_s_critical, 0); + rb_define_singleton_method(cYarvThread, "critical=", rb_thread_s_critical, 1); + rb_define_singleton_method(cYarvThread, "abort_on_exception", rb_thread_s_abort_exc, 0); + rb_define_singleton_method(cYarvThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1); + + rb_define_method(cYarvThread, "raise", yarv_thread_raise_m, -1); + rb_define_method(cYarvThread, "join", yarv_thread_join_m, -1); + rb_define_method(cYarvThread, "value", yarv_thread_value, 0); + rb_define_method(cYarvThread, "kill", rb_thread_kill, 0); + rb_define_method(cYarvThread, "terminate", rb_thread_kill, 0); + rb_define_method(cYarvThread, "exit", rb_thread_kill, 0); + rb_define_method(cYarvThread, "run", rb_thread_run, 0); + rb_define_method(cYarvThread, "wakeup", rb_thread_wakeup, 0); + rb_define_method(cYarvThread, "[]", rb_thread_aref, 1); + rb_define_method(cYarvThread, "[]=", rb_thread_aset, 2); + rb_define_method(cYarvThread, "key?", rb_thread_key_p, 1); + rb_define_method(cYarvThread, "keys", rb_thread_keys, 0); + rb_define_method(cYarvThread, "priority", rb_thread_priority, 0); + rb_define_method(cYarvThread, "priority=", rb_thread_priority_set, 1); + rb_define_method(cYarvThread, "status", rb_thread_status, 0); + rb_define_method(cYarvThread, "alive?", rb_thread_alive_p, 0); + rb_define_method(cYarvThread, "stop?", rb_thread_stop_p, 0); + rb_define_method(cYarvThread, "abort_on_exception", rb_thread_abort_exc, 0); + rb_define_method(cYarvThread, "abort_on_exception=", rb_thread_abort_exc_set, 1); + rb_define_method(cYarvThread, "safe_level", rb_thread_safe_level, 0); + rb_define_method(cYarvThread, "group", rb_thread_group, 0); + + rb_define_method(cYarvThread, "inspect", rb_thread_inspect, 0); + + cThGroup = rb_define_class("ThreadGroup", rb_cObject); + rb_define_alloc_func(cThGroup, thgroup_s_alloc); + rb_define_method(cThGroup, "list", thgroup_list, 0); + rb_define_method(cThGroup, "enclose", thgroup_enclose, 0); + rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0); + rb_define_method(cThGroup, "add", thgroup_add, 1); + GET_THREAD()->vm->thgroup_default = thgroup_default = rb_obj_alloc(cThGroup); + rb_define_const(cThGroup, "Default", thgroup_default); + + cMutex = rb_define_class("Mutex", rb_cObject); + rb_define_alloc_func(cMutex, mutex_alloc); + rb_define_method(cMutex, "initialize", mutex_initialize, 0); + rb_define_method(cMutex, "locked?", mutex_locked_p, 0); + rb_define_method(cMutex, "try_lock", mutex_try_lock, 0); + rb_define_method(cMutex, "lock", mutex_lock, 0); + rb_define_method(cMutex, "unlock", mutex_unlock, 0); + rb_define_method(cMutex, "sleep", mutex_sleep, -1); + yarvcore_eval(Qnil, rb_str_new2( + "class Mutex;" + " def synchronize; self.lock; yield; ensure; self.unlock; end;" + "end;") , rb_str_new2("<preload>"), INT2FIX(1)); + Init_native_thread(); + { + /* main thread setting */ + { + /* acquire global interpreter lock */ + yarv_thread_lock_t *lp = &GET_THREAD()->vm->global_interpreter_lock; + native_mutex_initialize(lp); + native_mutex_lock(lp); + native_mutex_initialize(&GET_THREAD()->interrupt_lock); + } + } + + rb_thread_create_timer_thread(); +} + diff --git a/thread_pthread.ci b/thread_pthread.ci new file mode 100644 index 0000000000..2896e3213b --- /dev/null +++ b/thread_pthread.ci @@ -0,0 +1,441 @@ +/* -*-c-*- */ +/********************************************************************** + + thread_pthread.ci - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifdef THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION + +#define native_mutex_initialize(lock) do { \ + pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER; \ + ((*lock) = _lock); \ +} while (0) + +#define native_cleanup_push pthread_cleanup_push +#define native_cleanup_pop pthread_cleanup_pop +#define native_thread_yield() sched_yield() + +static void yarv_add_signal_thread_list(yarv_thread_t *th); +static void yarv_remove_signal_thread_list(yarv_thread_t *th); + +static yarv_thread_lock_t signal_thread_list_lock; + +static void +null_func() +{ +} + +static void +Init_native_thread() +{ + GET_THREAD()->thread_id = pthread_self(); + native_mutex_initialize(&signal_thread_list_lock); + posix_signal(SIGVTALRM, null_func); +} + +NOINLINE(static int + thread_start_func_2(yarv_thread_t *th, VALUE *stack_start)); +void static thread_cleanup_func(void *th_ptr); + +static yarv_thread_t *register_cached_thread_and_wait(void); + +#define USE_THREAD_CACHE 0 + +static void * +thread_start_func_1(void *th_ptr) +{ +#if USE_THREAD_CACHE + thread_start: +#endif + { + yarv_thread_t *th = th_ptr; + VALUE stack_start; + /* ignore self and klass */ + + native_cleanup_push(thread_cleanup_func, th); + + /* run */ + thread_start_func_2(th, &stack_start); + + /* cleanup */ + thread_cleanup_func(th); + native_cleanup_pop(0); + } +#if USE_THREAD_CACHE + if (1) { + /* cache thread */ + yarv_thread_t *th; + if ((th = register_cached_thread_and_wait()) != 0) { + th_ptr = (void *)th; + th->thread_id = pthread_self(); + goto thread_start; + } + } +#endif + return 0; +} + +void rb_thread_create_control_thread(void); + +static pthread_mutex_t thread_cache_lock = PTHREAD_MUTEX_INITIALIZER; + +struct cached_thread_entry { + volatile yarv_thread_t **th_area; + pthread_cond_t *cond; + struct cached_thread_entry *next; +}; + +struct cached_thread_entry *cached_thread_root; + +static yarv_thread_t * +register_cached_thread_and_wait(void) +{ + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; + volatile yarv_thread_t *th_area = 0; + struct cached_thread_entry *entry = + (struct cached_thread_entry *)malloc(sizeof(struct cached_thread_entry)); + + struct timeval tv; + struct timespec ts; + gettimeofday(&tv, 0); + ts.tv_sec = tv.tv_sec + 60; + ts.tv_nsec = tv.tv_usec * 1000; + + pthread_mutex_lock(&thread_cache_lock); + { + entry->th_area = &th_area; + entry->cond = &cond; + entry->next = cached_thread_root; + cached_thread_root = entry; + + pthread_cond_timedwait(&cond, &thread_cache_lock, &ts); + + { + struct cached_thread_entry *e = cached_thread_root; + struct cached_thread_entry *prev = cached_thread_root; + + while (e) { + if (e == entry) { + if (prev == cached_thread_root) { + cached_thread_root = e->next; + } + else { + prev->next = e->next; + } + break; + } + prev = e; + e = e->next; + } + } + + free(entry); + pthread_cond_destroy(&cond); + } + pthread_mutex_unlock(&thread_cache_lock); + + return (yarv_thread_t *)th_area; +} + +static int +use_cached_thread(yarv_thread_t *th) +{ + int result = 0; +#if USE_THREAD_CACHE + struct cached_thread_entry *entry; + + if (cached_thread_root) { + pthread_mutex_lock(&thread_cache_lock); + entry = cached_thread_root; + { + if (cached_thread_root) { + cached_thread_root = entry->next; + *entry->th_area = th; + result = 1; + } + } + if (result) { + pthread_cond_signal(entry->cond); + } + pthread_mutex_unlock(&thread_cache_lock); + } +#endif + return result; +} + +static int +native_thread_create(yarv_thread_t *th) +{ + int err = 0; + + if (use_cached_thread(th)) { + thread_debug("create (use cahced thread): %p\n", th); + } + else { + pthread_attr_t attr; + size_t stack_size = 512 * 1024 - sizeof(int); /* 512KB */ + + if (stack_size < PTHREAD_STACK_MIN) { + stack_size = PTHREAD_STACK_MIN * 2; + } + + thread_debug("create: %p, stack size: %ld\n", th, stack_size); + + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, stack_size); + pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + + err = pthread_create(&th->thread_id, &attr, thread_start_func_1, th); + + if (err != 0) { + th->status = THREAD_KILLED; + rb_raise(rb_eThreadError, "can't create Thread (%d)", err); + } + } + return err; +} + +static void +native_thread_apply_priority(yarv_thread_t *th) +{ + struct sched_param sp; + int policy; + int priority = 0 - th->priority; + int max, min; + pthread_getschedparam(th->thread_id, &policy, &sp); + max = sched_get_priority_max(policy); + min = sched_get_priority_min(policy); + + if (min < priority) { + priority = max; + } + else if (max > priority) { + priority = min; + } + + sp.sched_priority = priority; + pthread_setschedparam(th->thread_id, policy, &sp); +} + +static void +interrupt_using_pthread_cond_signal(yarv_thread_t *th) +{ + thread_debug("interrupt_using_pthread_cond_signal (%p)\n", th); + pthread_cond_signal(&th->native_thread_data.sleep_cond); +} + +static void +native_thread_send_interrupt_signal(yarv_thread_t *th) +{ + thread_debug("native_thread_send_interrupt_signal (%p)\n", th->thread_id); + if (th) { + pthread_kill(th->thread_id, SIGVTALRM); + } +} + +static void +native_sleep(yarv_thread_t *th, struct timeval *tv) +{ + int prev_status = th->status; + struct timespec ts; + struct timeval tvn; + + if (tv) { + gettimeofday(&tvn, NULL); + ts.tv_sec = tvn.tv_sec + tv->tv_sec; + ts.tv_nsec = (tvn.tv_usec + tv->tv_usec) * 1000; + } + + th->status = THREAD_STOPPED; + pthread_cond_init(&th->native_thread_data.sleep_cond, 0); + + thread_debug("native_sleep %d\n", tv ? tv->tv_sec : -1); + GVL_UNLOCK_BEGIN(); + { + pthread_mutex_lock(&th->interrupt_lock); + + if (th->interrupt_flag) { + /* interrupted. return immediate */ + thread_debug("native_sleep: interrupted before sleep\n"); + } + else { + th->interrupt_function = interrupt_using_pthread_cond_signal; + if (tv == 0) { + thread_debug("native_sleep: pthread_cond_wait start\n"); + pthread_cond_wait(&th->native_thread_data.sleep_cond, + &th->interrupt_lock); + thread_debug("native_sleep: pthread_cond_wait end\n"); + } + else { + int r; + thread_debug("native_sleep: pthread_cond_timedwait start (%d, %d)\n", + ts.tv_sec, ts.tv_nsec); + r = pthread_cond_timedwait(&th->native_thread_data.sleep_cond, + &th->interrupt_lock, &ts); + thread_debug("native_sleep: pthread_cond_timedwait end (%d)\n", r); + } + th->interrupt_function = 0; + } + pthread_mutex_unlock(&th->interrupt_lock); + + th->status = prev_status; + } + GVL_UNLOCK_END(); + thread_debug("native_sleep done\n"); +} + +static void +native_thread_interrupt(yarv_thread_t *th) +{ + yarv_add_signal_thread_list(th); +} + +struct yarv_signal_thread_list { + yarv_thread_t *th; + struct yarv_signal_thread_list *prev; + struct yarv_signal_thread_list *next; +}; + +static struct yarv_signal_thread_list signal_thread_list_anchor = { + 0, 0, 0, +}; + +#define FGLOCK(lock, body) do { \ + native_mutex_lock(lock); \ + { \ + body; \ + } \ + native_mutex_unlock(lock); \ +} while (0) + +static void +print_signal_list(char *str) +{ + struct yarv_signal_thread_list *list = + signal_thread_list_anchor.next; + thread_debug("list (%s)> ", str); + while(list){ + thread_debug("%p (%p), ", list->th, list->th->thread_id); + list = list->next; + } + thread_debug("\n"); +} + +static void +yarv_add_signal_thread_list(yarv_thread_t *th) +{ + if (!th->native_thread_data.signal_thread_list) { + FGLOCK(&signal_thread_list_lock, { + struct yarv_signal_thread_list *list = + malloc(sizeof(struct yarv_signal_thread_list)); + + if (list == 0) { + fprintf(stderr, "[FATAL] failed to allocate memory\n"); + exit(1); + } + + list->th = th; + + list->prev = &signal_thread_list_anchor; + list->next = signal_thread_list_anchor.next; + if (list->next) { + list->next->prev = list; + } + signal_thread_list_anchor.next = list; + th->native_thread_data.signal_thread_list = list; + }); + } +} + +static void +yarv_remove_signal_thread_list(yarv_thread_t *th) +{ + if (th->native_thread_data.signal_thread_list) { + FGLOCK(&signal_thread_list_lock, { + struct yarv_signal_thread_list *list = + (struct yarv_signal_thread_list *) + th->native_thread_data.signal_thread_list; + + list->prev->next = list->next; + if (list->next) { + list->next->prev = list->prev; + } + th->native_thread_data.signal_thread_list = 0; + list->th = 0; + free(list); + }); + } + else { + /* */ + } +} + +static pthread_t timer_thread_id; +static void timer_thread_function(void); + +static void * +thread_timer(void *dummy) +{ + while (system_working) { +#ifdef HAVE_NANOSLEEP + struct timespec req, rem; + req.tv_sec = 0; + req.tv_nsec = 10 * 1000 * 1000; /* 10 ms */ + nanosleep(&req, &rem); +#else + struct timeval tv; + tv.tv_sec = 0; + tv.tv_usec = 10000; /* 10 ms */ + select(0, NULL, NULL, NULL, &tv); +#endif + if (signal_thread_list_anchor.next) { + FGLOCK(&signal_thread_list_lock, { + struct yarv_signal_thread_list *list; + list = signal_thread_list_anchor.next; + while (list) { + native_thread_send_interrupt_signal(list->th); + list = list->next; + } + }); + } + timer_thread_function(); + } + return NULL; +} + +static void +rb_thread_create_timer_thread(void) +{ + rb_enable_interrupt(); + + if (!timer_thread_id) { + size_t stack_size = PTHREAD_STACK_MIN; + pthread_attr_t attr; + int err; + + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, stack_size); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + err = pthread_create(&timer_thread_id, &attr, thread_timer, 0); + if (err != 0) { + rb_bug("rb_thread_create_timer_thread: return non-zero (%d)", err); + } + } + rb_disable_interrupt(); /* only timer thread recieve signal */ +} + +void +rb_thread_reset_timer_thread(void) +{ + timer_thread_id = 0; + rb_thread_create_timer_thread(); +} + +#endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */ diff --git a/thread_pthread.h b/thread_pthread.h new file mode 100644 index 0000000000..9783edea98 --- /dev/null +++ b/thread_pthread.h @@ -0,0 +1,28 @@ +/********************************************************************** + + thread_pthread.h - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifndef THREAD_PTHREAD_H_INCLUDED +#define THREAD_PTHREAD_H_INCLUDED + +#include <pthread.h> +typedef pthread_t yarv_thread_id_t; +typedef pthread_mutex_t yarv_thread_lock_t; + +#define native_mutex_lock pthread_mutex_lock +#define native_mutex_unlock pthread_mutex_unlock +#define native_mutex_trylock pthread_mutex_trylock + +typedef struct native_thread_data_struct { + void *signal_thread_list; + pthread_cond_t sleep_cond; +} native_thread_data_t; + +#endif /* THREAD_PTHREAD_H_INCLUDED */ diff --git a/thread_win32.ci b/thread_win32.ci new file mode 100644 index 0000000000..2dea450e35 --- /dev/null +++ b/thread_win32.ci @@ -0,0 +1,310 @@ +/* -*-c-*- */ +/********************************************************************** + + thread_win32.ci - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifdef THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION + +#include <process.h> + +#define WIN32_WAIT_TIMEOUT 10 /* 10 ms */ +#undef Sleep + +#define native_thread_yield() Sleep(0) +#define yarv_remove_signal_thread_list(th) + +static void +Init_native_thread() +{ + yarv_thread_t *th = GET_THREAD(); + DuplicateHandle(GetCurrentProcess(), + GetCurrentThread(), + GetCurrentProcess(), + &th->thread_id, 0, FALSE, DUPLICATE_SAME_ACCESS); + + th->native_thread_data.interrupt_event = CreateEvent(0, TRUE, FALSE, 0); + + thread_debug("initial thread (th: %p, thid: %p, event: %p)\n", + th, GET_THREAD()->thread_id, + th->native_thread_data.interrupt_event); +} + +static void +w32_show_error_message() +{ + LPVOID lpMsgBuf; + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) & lpMsgBuf, 0, NULL); + // {int *a=0; *a=0;} + MessageBox(NULL, (LPCTSTR) lpMsgBuf, "Error", MB_OK | MB_ICONINFORMATION); + // exit(1); +} + +static int +w32_wait_event(HANDLE event, DWORD timeout, yarv_thread_t *th) +{ + HANDLE events[2]; + int count = 0; + DWORD ret; + + if (event) { + events[count++] = event; + thread_debug(" * handle: %p (count: %d)\n", event, count); + } + + if (th) { + HANDLE intr = th->native_thread_data.interrupt_event; + ResetEvent(intr); + if (th->interrupt_flag) { + SetEvent(intr); + } + + events[count++] = intr; + thread_debug(" * handle: %p (count: %d, intr)\n", intr, count); + } + + thread_debug(" WaitForMultipleObjects start (count: %d)\n", count); + ret = WaitForMultipleObjects(count, events, FALSE, timeout); + thread_debug(" WaitForMultipleObjects end (ret: %d)\n", ret); + + if (ret == WAIT_OBJECT_0 + count - 1 && th) { + errno = EINTR; + } + if (ret == -1 && THREAD_DEBUG) { + int i; + DWORD dmy; + for (i = 0; i < count; i++) { + thread_debug(" * error handle %d - %s\n", i, + GetHandleInformation(events[i], &dmy) ? "OK" : "NG"); + } + } + return ret; +} + +static void +native_sleep(yarv_thread_t *th, struct timeval *tv) +{ + DWORD msec; + if (tv) { + msec = tv->tv_sec * 1000 + tv->tv_usec / 1000; + } + else { + msec = INFINITE; + } + + GVL_UNLOCK_BEGIN(); + { + DWORD ret; + int status = th->status; + th->status = THREAD_STOPPED; + th->interrupt_function = native_thread_interrupt; + thread_debug("native_sleep start (%d)\n", (int)msec); + ret = w32_wait_event(0, msec, th); + thread_debug("native_sleep done (%d)\n", ret); + th->interrupt_function = 0; + th->status = status; + } + GVL_UNLOCK_END(); +} + +int +native_mutex_lock(yarv_thread_lock_t *lock) +{ +#if USE_WIN32_MUTEX + DWORD result; + while (1) { + thread_debug("native_mutex_lock: %p\n", *lock); + result = w32_wait_event(*lock, INFINITE, 0); + switch (result) { + case WAIT_OBJECT_0: + /* get mutex object */ + thread_debug("acquire mutex: %p\n", *lock); + return 0; + case WAIT_OBJECT_0 + 1: + /* interrupt */ + errno = EINTR; + thread_debug("acquire mutex interrupted: %p\n", *lock); + return 0; + case WAIT_TIMEOUT: + thread_debug("timeout mutex: %p\n", *lock); + break; + case WAIT_ABANDONED: + rb_bug("win32_mutex_lock: WAIT_ABANDONED"); + break; + default: + rb_bug("win32_mutex_lock: unknown result (%d)", result); + break; + } + } + return 0; +#else + EnterCriticalSection(lock); + return 0; +#endif +} + +int +native_mutex_unlock(yarv_thread_lock_t *lock) +{ +#if USE_WIN32_MUTEX + thread_debug("release mutex: %p\n", *lock); + return ReleaseMutex(*lock); +#else + LeaveCriticalSection(lock); + return 0; +#endif +} + +int +native_mutex_trylock(yarv_thread_lock_t *lock) +{ +#if USE_WIN32MUTEX + int result; + thread_debug("native_mutex_trylock: %p\n", *lock); + result = w32_wait_event(*lock, 1, 0); + thread_debug("native_mutex_trylock result: %d\n", result); + switch (result) { + case WAIT_OBJECT_0: + return 0; + case WAIT_TIMEOUT: + return EBUSY; + } + return EINVAL; +#else + return TryEnterCriticalSection(lock) == 0; +#endif +} + +void +native_mutex_initialize(yarv_thread_lock_t *lock) +{ +#if USE_WIN32MUTEX + *lock = CreateMutex(NULL, FALSE, NULL); + // thread_debug("initialize mutex: %p\n", *lock); +#else + InitializeCriticalSection(lock); +#endif +} + +NOINLINE(static int + thread_start_func_2(yarv_thread_t *th, VALUE *stack_start)); +void static thread_cleanup_func(void *th_ptr); + +static unsigned int _stdcall +thread_start_func_1(void *th_ptr) +{ + yarv_thread_t *th = th_ptr; + VALUE stack_start; + /* run */ + th->native_thread_data.interrupt_event = CreateEvent(0, TRUE, FALSE, 0); + + thread_debug("thread created (th: %p, thid: %p, event: %p)\n", th, + th->thread_id, th->native_thread_data.interrupt_event); + thread_start_func_2(th, &stack_start); + thread_cleanup_func(th); + + // native_mutex_unlock(&GET_VM()->global_interpreter_lock); + + thread_debug("close handle - intr: %p, thid: %p\n", + th->native_thread_data.interrupt_event, th->thread_id); + CloseHandle(th->native_thread_data.interrupt_event); + CloseHandle(th->thread_id); + thread_debug("thread deleted (th: %p)\n", th); + return 0; +} + +static void make_timer_thread(); + +static HANDLE +w32_create_thread(DWORD stack_size, void *func, void *val) +{ + HANDLE handle; +#ifdef __CYGWIN__ + DWORD dmy; + handle = CreateThread(0, stack_size, func, val, 0, &dmy); +#else + handle = (HANDLE) _beginthreadex(0, stack_size, func, val, 0, 0); +#endif + return handle; +} + +static int +native_thread_create(yarv_thread_t *th) +{ + size_t stack_size = 4 * 1024 - sizeof(int); /* 4KB */ + + if ((th->thread_id = + w32_create_thread(stack_size, thread_start_func_1, th)) + == 0) { + rb_raise(rb_eThreadError, "can't create Thread (%d)", errno); + } + if (THREAD_DEBUG) { + Sleep(0); + thread_debug("create: (th: %p, thid: %p, intr: %p), stack size: %d\n", + th, th->thread_id, + th->native_thread_data.interrupt_event, stack_size); + } + return 0; +} + +static void +native_thread_apply_priority(yarv_thread_t *th) +{ + int priority = th->priority; + if (th->priority > 0) { + priority = THREAD_PRIORITY_ABOVE_NORMAL; + } + else if (th->priority < 0) { + priority = THREAD_PRIORITY_BELOW_NORMAL; + } + else { + priority = THREAD_PRIORITY_NORMAL; + } + + SetThreadPriority(th->thread_id, priority); +} + +static void +native_thread_interrupt(yarv_thread_t *th) +{ + thread_debug("native_thread_interrupt: %p\n", th); + SetEvent(th->native_thread_data.interrupt_event); +} + +static void timer_thread_function(void); + +static HANDLE timer_thread_handle = 0; + +static unsigned int _stdcall +timer_thread_func(void *dummy) +{ + thread_debug("timer_thread\n"); + while (system_working) { + Sleep(WIN32_WAIT_TIMEOUT); + timer_thread_function(); + } + thread_debug("timer killed\n"); + return 0; +} + +void +rb_thread_create_timer_thread(void) +{ + if (timer_thread_handle == 0) { + timer_thread_handle = w32_create_thread(1024, timer_thread_func, 0); + } +} + +#endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */ diff --git a/thread_win32.h b/thread_win32.h new file mode 100644 index 0000000000..8be59b0c1b --- /dev/null +++ b/thread_win32.h @@ -0,0 +1,34 @@ +/********************************************************************** + + thread_win32.h - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +/* interface */ +#ifndef THREAD_WIN32_H_INCLUDED +#define THREAD_WIN32_H_INCLUDED + +#include <windows.h> + +WINBASEAPI BOOL WINAPI +TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection); + +typedef HANDLE yarv_thread_id_t; +typedef CRITICAL_SECTION yarv_thread_lock_t; + +int native_mutex_lock(yarv_thread_lock_t *); +int native_mutex_unlock(yarv_thread_lock_t *); +int native_mutex_trylock(yarv_thread_lock_t *); +void native_mutex_initialize(yarv_thread_lock_t *); + +typedef struct native_thread_data_struct { + HANDLE interrupt_event; +} native_thread_data_t; + +#endif /* THREAD_WIN32_H_INCLUDED */ + @@ -1366,6 +1366,12 @@ time_sec(VALUE time) return INT2FIX(tobj->tm.tm_sec); } +VALUE +rb_time_succ(VALUE time) +{ + return time_succ(time); +} + /* * call-seq: * time.min => fixnum @@ -1939,7 +1945,7 @@ time_mdump(VALUE time) if ((tm->tm_year & 0xffff) != tm->tm_year) rb_raise(rb_eArgError, "year too big to marshal"); - + p = 0x1UL << 31 | /* 1 */ tobj->gmt << 30 | /* 1 */ tm->tm_year << 14 | /* 16 */ diff --git a/tool/asm_parse.rb b/tool/asm_parse.rb new file mode 100644 index 0000000000..f3d7f73c99 --- /dev/null +++ b/tool/asm_parse.rb @@ -0,0 +1,51 @@ +stat = {} + +while line = ARGF.gets + if /\[start\] (\w+)/ =~ line + name = $1 + puts '--------------------------------------------------------------' + puts line + size = 0 + len = 0 + + while line = ARGF.gets + if /\[start\] (\w+)/ =~ line + puts "\t; # length: #{len}, size: #{size}" + puts "\t; # !!" + stat[name] = [len, size] + # + name = $1 + puts '--------------------------------------------------------------' + puts line + size = 0 + len = 0 + next + end + + unless /(\ALM)|(\ALB)|(\A\.)|(\A\/)/ =~ line + puts line + if /\[length = (\d+)\]/ =~ line + len += $1.to_i + size += 1 + end + end + + + if /__NEXT_INSN__/ !~ line && /\[end \] (\w+)/ =~ line + ename = $1 + if name != ename + puts "!! start with #{name}, but end with #{ename}" + end + stat[ename] = [len, size] + puts "\t; # length: #{len}, size: #{size}" + break + end + end + end +end + +stat.sort_by{|a, b| -b[0] * 1000 - a[0]}.each{|a, b| + puts "#{a}\t#{b.join("\t")}" +} +puts "total length :\t#{stat.inject(0){|r, e| r+e[1][0]}}" +puts "total size :\t#{stat.inject(0){|r, e| r+e[1][1]}}" diff --git a/tool/compile.rb b/tool/compile.rb new file mode 100644 index 0000000000..5798b81139 --- /dev/null +++ b/tool/compile.rb @@ -0,0 +1,67 @@ +require 'optparse' +require 'pp' + +OutputCompileOption = { + # enable + :peephole_optimization =>true, + :inline_const_cache =>true, + + # disable + :specialized_instruction =>false, + :operands_unification =>false, + :instructions_unification =>false, + :stack_caching =>false, +} + +def compile_to_rb infile, outfile + iseq = YARVCore::InstructionSequence.compile_file(infile, OutputCompileOption) + + open(outfile, 'w'){|f| + f.puts "YARVCore::InstructionSequence.load(" + + "Marshal.load(<<EOS____.unpack('m*')[0])).eval" + f.puts [Marshal.dump(iseq.to_a)].pack('m*') + f.puts "EOS____" + } +end + +def compile_to_rbc infile, outfile, type + iseq = YARVCore::InstructionSequence.compile_file(infile, OutputCompileOption) + + case type + when 'm' + open(outfile, 'wb'){|f| + f.print "RBCM" + f.puts Marshal.dump(iseq.to_a, f) + } + else + raise "Unsupported compile type: #{type}" + end +end + +## main + +outfile = 'a.rb' +type = 'm' +opt = OptionParser.new{|opt| + opt.on('-o file'){|o| + outfile = o + } + opt.on('-t type', '--type type'){|o| + type = o + } + opt.version = '0.0.1' +} + +opt.parse!(ARGV) + +ARGV.each{|file| + case outfile + when /\.rb\Z/ + compile_to_rb file, outfile + when /\.rbc\Z/ + compile_to_rbc file, outfile, type + else + raise + end +} + diff --git a/tool/eval.rb b/tool/eval.rb new file mode 100644 index 0000000000..906ba9c23c --- /dev/null +++ b/tool/eval.rb @@ -0,0 +1,161 @@ + +require 'rbconfig' +require 'fileutils' +require 'pp' + +Ruby = ENV['RUBY'] || + File.join(Config::CONFIG["bindir"], + Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]) +# + +OPTIONS = %w{ + opt-direct-threaded-code + opt-basic-operations + opt-operands-unification + opt-instructions-unification + opt-inline-method-cache + opt-stack-caching +}.map{|opt| + '--disable-' + opt +} + +opts = OPTIONS.dup +Configs = OPTIONS.map{|opt| + o = opts.dup + opts.delete(opt) + o +} + [[]] + +pp Configs if $DEBUG + + +def exec_cmd(cmd) + puts cmd + unless system(cmd) + p cmd + raise "error" + end +end + +def dirname idx + "ev-#{idx}" +end + +def build + Configs.each_with_index{|config, idx| + dir = dirname(idx) + FileUtils.rm_rf(dir) if FileTest.exist?(dir) + Dir.mkdir(dir) + FileUtils.cd(dir){ + exec_cmd("#{Ruby} ../extconf.rb " + config.join(" ")) + exec_cmd("make clean test-all") + } + } +end + +def check + Configs.each_with_index{|c, idx| + puts "= #{idx}" + system("#{Ruby} -r ev-#{idx}/yarvcore -e 'puts YARVCore::OPTS'") + } +end + +def bench_each idx + puts "= #{idx}" + 5.times{|count| + print count + FileUtils.cd(dirname(idx)){ + exec_cmd("make benchmark OPT=-y ITEMS=#{ENV['ITEMS']} > ../b#{idx}-#{count}") + } + } + puts +end + +def bench + # return bench_each(6) + Configs.each_with_index{|c, idx| + bench_each idx + } +end + +def parse_result data + flag = false + stat = [] + data.each{|line| + if flag + if /(\w+)\t([\d\.]+)/ =~ line + stat << [$1, $2.to_f] + else + raise "not a data" + end + + end + if /benchmark summary/ =~ line + flag = true + end + } + stat +end + +def calc_each data + data.sort! + data.pop # remove max + data.shift # remove min + + data.inject(0.0){|res, e| + res += e + } / data.size +end + +def calc_stat stats + stat = [] + stats[0].each_with_index{|e, idx| + bm = e[0] + vals = stats.map{|st| + st[idx][1] + } + [bm, calc_each(vals)] + } +end + +def stat + total = [] + Configs.each_with_index{|c, idx| + stats = [] + 5.times{|count| + file = "b#{idx}-#{count}" + # p file + open(file){|f| + stats << parse_result(f.read) + } + } + # merge stats + total << calc_stat(stats) + total + } + # pp total + total[0].each_with_index{|e, idx| + bm = e[0] + # print "#{bm}\t" + total.each{|st| + print st[idx][1], "\t" + } + puts + } +end + +ARGV.each{|cmd| + case cmd + when 'build' + build + when 'check' + check + when 'bench' + bench + when 'stat' + stat + else + raise + end +} + diff --git a/tool/getrev.rb b/tool/getrev.rb new file mode 100644 index 0000000000..1d24a17829 --- /dev/null +++ b/tool/getrev.rb @@ -0,0 +1,13 @@ +str = ARGF.gets +if /ChangeLog (\d+)/ =~ str + puts %Q{char *rev = "#{$1}";} +else + raise +end + +if /ChangeLog \d+ ([\d-]+)/ =~ str + puts %Q{char *date = "#{$1}";} +else + raise +end + diff --git a/tool/insns2vm.rb b/tool/insns2vm.rb new file mode 100644 index 0000000000..6270f51014 --- /dev/null +++ b/tool/insns2vm.rb @@ -0,0 +1,1220 @@ +#!/usr/bin/env ruby +# +# +# +# $verbose = true +# $use_const = true + +require 'pp' +require 'erb' + +class InsnsDef + class InsnInfo + + def initialize name, opes, pops, rets, comm, body, tvars, sp_inc, + orig = self, defopes = [], type = nil, + nsc = [], psc = [[], []] + + @name = name + @opes = opes # [[type, name], ...] + @pops = pops # [[type, name], ...] + @rets = rets # [[type, name], ...] + @comm = comm # {:c => category, :e => en desc, :j => ja desc} + @body = body # '...' + + @orig = orig + @defopes = defopes + @type = type + @tvars = tvars + + @nextsc = nsc + @pushsc = psc + @sc = [] + @unifs = [] + @optimized = [] + @is_sc = false + @sp_inc = sp_inc + end + + def add_sc sci + @sc << sci + sci.set_sc + end + + attr_reader :name, :opes, :pops, :rets + attr_reader :body, :comm + attr_reader :nextsc, :pushsc + attr_reader :orig, :defopes, :type + attr_reader :sc + attr_reader :unifs, :optimized + attr_reader :is_sc + attr_reader :tvars + attr_reader :sp_inc + + def set_sc + @is_sc = true + end + + def add_unif insns + @unifs << insns + end + + def add_optimized insn + @optimized << insn + end + + def sp_increase_c_expr + if(pops.any?{|t, v| v == '...'} || + rets.any?{|t, v| v == '...'}) + # user definision + raise "no sp increase definition" if @sp_inc.nil? + + ret = "int inc = 0;\n" + + @opes.each_with_index{|(t, v), i| + if t == 'num_t' + ret << " unsigned long #{v} = FIX2INT(opes[#{i}]);\n" + end + } + @defopes.each_with_index{|((t, var), val), i| + if t == 'num_t' && val != '*' + ret << " unsigned long #{var} = #{val};\n" + end + } + + ret << " #{@sp_inc};\n" + ret << " return depth + inc;" + ret + else + "return depth + #{rets.size - pops.size};" + end + end + + def inspect + "#<InsnInfo:#{@name}>" + end + end + + def initialize file, optopfile, uniffile + @insns = [] + @insn_map = {} + + load_insns_def file + + load_opt_operand_def optopfile + load_insn_unification_def uniffile + make_stackcaching_insns if $opts['OPT_STACK_CACHING'] + end + + attr_reader :insns + attr_reader :insn_map + + SKIP_COMMENT_PATTERN = Regexp.compile(Regexp.escape('/** ##skip')) + + include Enumerable + def each + @insns.each{|insn| + yield insn + } + end + + def add_insn insn + @insns << insn + @insn_map[insn.name] = insn + end + + def make_insn name, opes, pops, rets, comm, body, sp_inc + add_insn InsnInfo.new(name, opes, pops, rets, comm, body, [], sp_inc) + end + + + # str -> [[type, var], ...] + def parse_vars line + raise unless /\((.*?)\)/ =~ line + vars = $1.split(',') + vars.map!{|v| + if /\s*(\S+)\s+(\S+)\s*/ =~ v + type = $1 + var = $2 + elsif /\s*\.\.\.\s*/ =~ v + type = var = '...' + else + raise + end + [type, var] + } + vars + end + + def parse_comment comm + c = 'others' + j = '' + e = '' + comm.each_line{|line| + case line + when /@c (.+)/ + c = $1 + when /@e (.+)/ + e = $1 + when /@e\s*$/ + e = '' + when /@j (.+)$/ + j = $1 + when /@j\s*$/ + j = '' + end + } + { :c => c, + :e => e, + :j => j, + } + end + + def load_insns_def file + body = insn = opes = pops = rets = nil + comment = '' + + open(file){|f| + f.instance_variable_set(:@line_no, 0) + class << f + def line_no + @line_no + end + def gets + @line_no += 1 + super + end + end + + while line = f.gets + line.chomp! + case line + + when SKIP_COMMENT_PATTERN + while line = f.gets.chomp + if /\s+\*\/$/ =~ line + break + end + end + + # collect instruction comment + when /^\/\*\*$/ + while line = f.gets + if /\s+\*\/\s*$/ =~ line + break + else + comment << line + end + end + + # start instruction body + when /^DEFINE_INSN$/ + insn = f.gets.chomp + opes = parse_vars(f.gets.chomp) + pops = parse_vars(f.gets.chomp).reverse + rets_str = f.gets.chomp + rets = parse_vars(rets_str).reverse + comment = parse_comment(comment) + insn_in = true + body = '' + + if /\/\/(.+)/ =~ rets_str + sp_inc = $1 + else + sp_inc = nil + end + + raise unless /^\{$/ =~ f.gets.chomp + line_no = f.line_no + + # end instruction body + when /^\}/ + if insn_in + body.instance_variable_set(:@line_no, line_no) + insn = make_insn(insn, opes, pops, rets, comment, body, sp_inc) + insn_in = false + comment = '' + end + + # + else + if insn_in + body << line + "\n" + end + end + end + } + end + + ## opt op + def load_opt_operand_def file + open(file){|f| f.each{|line| + line = line.gsub(/\#.*/, '').strip + next if line.length == 0 + break if /__END__/ =~ line + /(\S+)\s+(.+)/ =~ line + insn = $1 + opts = $2 + add_opt_operand insn, opts.split(/,/).map{|e| e.strip} + }} + end + + def label_escape label + label.gsub(/\(/, '_O_'). + gsub(/\)/, '_C_'). + gsub(/\*/, '_WC_') + end + + def add_opt_operand insn_name, opts + insn = @insn_map[insn_name] + opes = insn.opes + + if opes.size != opts.size + raise "operand size mismatcvh for #{insn.name} (opes: #{opes.size}, opts: #{opts.size})" + end + + ninsn = insn.name + '_OP_' + opts.map{|e| label_escape(e)}.join('_') + nopes = [] + defv = [] + + opts.each_with_index{|e, i| + if e == '*' + nopes << opes[i] + end + defv << [opes[i], e] + } + + make_insn_operand_optimiized(insn, ninsn, nopes, defv) + end + + def make_insn_operand_optimiized orig_insn, name, opes, defopes + comm = orig_insn.comm.dup + comm[:c] = 'optimize' + add_insn insn = InsnInfo.new( + name, opes, orig_insn.pops, orig_insn.rets, comm, + orig_insn.body, orig_insn.tvars, orig_insn.sp_inc, + orig_insn, defopes) + orig_insn.add_optimized insn + end + + + ## insn unif + def load_insn_unification_def file + open(file){|f| f.each{|line| + line = line.gsub(/\#.*/, '').strip + next if line.length == 0 + break if /__END__/ =~ line + make_unified_insns line.split.map{|e| + raise "unknown insn: #{e}" unless @insn_map[e] + @insn_map[e] + } + }} + end + + def all_combination sets + ret = sets.shift.map{|e| [e]} + + sets.each{|set| + prev = ret + ret = [] + prev.each{|ary| + set.each{|e| + eary = ary.dup + eary << e + ret << eary + } + } + } + ret + end + + def make_unified_insns insns + if $opts['OPT_UNIFY_ALL_COMBINATION'] + insn_sets = insns.map{|insn| + [insn] + insn.optimized + } + + all_combination(insn_sets).each{|insns_set| + make_unified_insn_each insns_set + } + else + make_unified_insn_each insns + end + end + + def mk_private_val vals, i, redef + vals.dup.map{|v| + # v[0] : type + # v[1] : var name + + v = v.dup + if v[0] != '...' + redef[v[1]] = v[0] + v[1] = "#{v[1]}_#{i}" + end + v + } + end + + def mk_private_val2 vals, i, redef + vals.dup.map{|v| + # v[0][0] : type + # v[0][1] : var name + # v[1] : default val + + pv = v.dup + v = pv[0] = pv[0].dup + if v[0] != '...' + redef[v[1]] = v[0] + v[1] = "#{v[1]}_#{i}" + end + pv + } + end + + def make_unified_insn_each insns + names = [] + opes = [] + pops = [] + rets = [] + comm = { + :c => 'optimize', + :e => 'unified insn', + :j => 'unified insn', + } + body = '' + passed = [] + tvars = [] + defopes = [] + sp_inc = '' + + insns.each_with_index{|insn, i| + names << insn.name + + redef_vars = {} + + e_opes = mk_private_val(insn.opes, i, redef_vars) + e_pops = mk_private_val(insn.pops, i, redef_vars) + e_rets = mk_private_val(insn.rets, i, redef_vars) + # ToDo: fix it + e_defs = mk_private_val2(insn.defopes, i, redef_vars) + + passed_vars = [] + while pvar = e_pops.pop + rvar = rets.pop + + if rvar + raise "unsupported unif insn: #{insns.inspect}" if rvar[0] == '...' + passed_vars << [pvar, rvar] + tvars << rvar + else + e_pops.push pvar + break + end + end + + opes.concat e_opes + pops.concat e_pops + rets.concat e_rets + defopes.concat e_defs + sp_inc += "#{insn.sp_inc}" + + body += # + "{ /* unif: #{i} */\n" + + passed_vars.map{|rpvars| + pv = rpvars[0] + rv = rpvars[1] + "#define #{pv[1]} #{rv[1]}" + }.join("\n") + + "\n" + + redef_vars.map{|v, type| + "#define #{v} #{v}_#{i}" + }.join("\n") + "\n" + + insn.body + + passed_vars.map{|rpvars| + "#undef #{rpvars[0][1]}" + }.join("\n") + + "\n" + + redef_vars.keys.map{|v| + "#undef #{v}" + }.join("\n") + + "\n}\n" + } + + tvars_ary = [] + tvars.each{|tvar| + unless opes.any?{|var| + var[1] == tvar[1] + } || defopes.any?{|pvar| + pvar[0][1] == tvar[1] + } + tvars_ary << tvar + end + } + add_insn insn = InsnInfo.new("UNIFIED_" + names.join('_'), + opes, pops, rets.reverse, comm, body, + tvars_ary, sp_inc) + insn.defopes.replace defopes + insns[0].add_unif [insn, insns] + end + + + ## sc + SPECIAL_INSN_FOR_SC_AFTER = { + /\Asend/ => [:a], + /\Aend/ => [:a], + /\Ayield/ => [:a], + /\Aclassdef/ => [:a], + /\Amoduledef/ => [:a], + } + FROM_SC = [[], [:a], [:b], [:a, :b], [:b, :a]] + + def make_stackcaching_insns + pops = rets = nil + + @insns.dup.each{|insn| + opops = insn.pops + orets = insn.rets + oopes = insn.opes + ocomm = insn.comm + + after = nil + SPECIAL_INSN_FOR_SC_AFTER.any?{|k, v| + if k =~ insn.name + after = v + break + end + } + + insns = [] + FROM_SC.each{|from| + name, pops, rets, pushs1, pushs2, nextsc = + *calc_stack(insn, from, after, opops, orets) + + # + make_insn_sc(insn, name, oopes, pops, rets, [pushs1, pushs2], nextsc) + } + } + # exit! 1 + end + + def make_insn_sc orig_insn, name, opes, pops, rets, pushs, nextsc + comm = orig_insn.comm.dup + comm[:c] = 'optimize(sc)' + + scinsn = InsnInfo.new( + name, opes, pops, rets, comm, + orig_insn.body, orig_insn.tvars, orig_insn.sp_inc, + orig_insn, orig_insn.defopes, :sc, nextsc, pushs) + + add_insn scinsn + # + orig_insn.add_sc scinsn + end + + def complement_name st + "#{st[0] ? st[0] : 'x'}#{st[1] ? st[1] : 'x'}" + end + + def add_stack_value st + len = st.length + if len == 0 + st[0] = :a + [nil, :a] + elsif len == 1 + if st[0] == :a + st[1] = :b + else + st[1] = :a + end + [nil, st[1]] + else + st[0], st[1] = st[1], st[0] + [st[1], st[1]] + end + end + + def calc_stack insn, ofrom, oafter, opops, orets + from = ofrom.dup + pops = opops.dup + rets = orets.dup + rest_scr = ofrom.dup + + pushs_before = [] + pushs= [] + + pops.each_with_index{|e, i| + if e[0] == '...' + pushs_before = from + from = [] + end + r = from.pop + break unless r + pops[i] = pops[i].dup << r + } + + if oafter + from = oafter + from.each_with_index{|r, i| + rets[i] = rets[i].dup << r if rets[i] + } + else + rets = rets.reverse + rets.each_with_index{|e, i| + break if e[0] == '...' + pushed, r = add_stack_value from + rets[i] = rets[i].dup << r + if pushed + if rest_scr.pop + pushs << pushed + end + + if i - 2 >= 0 + rets[i-2].pop + end + end + } + end + + if false #|| insn.name =~ /test3/ + p ofrom + p pops + p rets + p pushs_before + p pushs + p from + exit + end + + ret = ["#{insn.name}_SC_#{complement_name(ofrom)}_#{complement_name(from)}", + pops, rets, pushs_before, pushs, from] + #p ret + ret + end + + ################################################################### + # vm.inc + def make_header_prepare_stack insn + ret = [] + push_ba = insn.pushsc + raise "unsupport" if push_ba[0].size > 0 && push_ba[1].size > 0 + + push_ba.each{|pushs| + pushs.each{|r| + ret << " PUSH(SCREG(#{r}));" + } + } + ret.join("\n") + "\n" + end + + def make_header_operands insn + vars = insn.opes + n = 0 + ops = [] + + vars.each_with_index{|(type, var), i| + if type == '...' + break + end + + ops << " #{type} #{var} = (#{type})GET_OPERAND(#{i+1});" + n += 1 + } + @opn = n + + # reverse or not? + # ops.join + ops.reverse.join("\n") + "\n" + end + + def make_header_default_operands insn + ret = [] + vars = insn.defopes + + vars.each{|e| + next if e[1] == '*' + if $use_const + ret << " const #{e[0][0]} #{e[0][1]} = #{e[1]};" + else + ret << " #define #{e[0][1]} #{e[1]}" + end + } + ret.join("\n") + "\n" + end + + def make_footer_default_operands insn + if $use_const + "\n" + else + ret = [] + vars = insn.defopes + + vars.each{|e| + next if e[1] == '*' + ret << "#undef #{e[0][1]}\n" + } + ret.join("\n") + "\n" + end + end + + def make_header_stack_pops insn + n = 0 + pops = [] + + vars = insn.pops + + vars.each_with_index{|iter, i| + type, var, r = *iter + + if type == '...' + break + end + if r + pops << " #{type} #{var} = SCREG(#{r});" + else + pops << " #{type} #{var} = TOPN(#{n});" + n += 1 + end + } + @popn = n + + # reverse or not? + pops.reverse.join("\n") + "\n" + end + + def make_header_temporary_vars insn + ret = [] + insn.tvars.each{|var| + ret << " #{var[0]} #{var[1]};" + } + ret.join("\n") + "\n" + end + + def make_header_stack_val insn + ret = [] + + vars = insn.opes + insn.pops + insn.defopes.map{|e| e[0]} + + insn.rets.each{|var| + if vars.all?{|e| e[1] != var[1]} && var[1] != '...' + ret << " #{var[0]} #{var[1]};" + end + } + ret.join("\n") + "\n" + end + + def make_footer_stack_val insn + ret = [] + insn.rets.reverse_each{|v| + if v[1] == '...' + break + end + if v[2] + ret << " SCREG(#{v[2]}) = #{v[1]};" + else + ret << " PUSH(#{v[1]});" + end + } + ret.join("\n") + "\n" + end + + def make_header insn + ret = "\nINSN_ENTRY(#{insn.name}){\n" + ret += " /* prepare stack status */\n" if $verbose + ret += make_header_prepare_stack insn + ret += "{\n" + ret += " /* declare stack push val */\n" if $verbose + ret += make_header_stack_val insn + ret += " /* declare and initialize default opes */\n" if $verbose + ret += make_header_default_operands insn + ret += " /* declare and get from iseq */\n" if $verbose + ret += make_header_operands insn + ret += " /* declare and pop from stack */\n" if $verbose + ret += make_header_stack_pops insn + ret += " /* declare temporary vars */\n" if $verbose + ret += make_header_temporary_vars insn + + ret += " /* for debug */\n" if $verbose + ret += " DEBUG_ENTER_INSN(\"#{insn.name}\");\n" + ret += " /* management */\n" if $verbose + ret += " ADD_PC(1+#{@opn});\n" + ret += " PREFETCH(GET_PC());\n" + ret += " POPN(#{@popn});\n" if @popn > 0 + ret += " #define CURRENT_INSN_#{insn.name} 1\n" + ret += " #define INSN_IS_SC() #{insn.sc ? 0 : 1}\n" + ret += " #define INSN_LABEL(lab) LABEL_#{insn.name}_##lab\n" + + ret += " #define LABEL_IS_SC(lab) LABEL_##lab##_###{insn.sc.size == 0 ? 't' : 'f'}\n" + + ret += " USAGE_ANALYSIS_INSN(BIN(#{insn.name}));\n" + insn.opes.each_with_index{|op, i| + ret += " USAGE_ANALYSIS_OPERAND(BIN(#{insn.name}), #{i}, #{op[1]});\n" + } + ret += "{\n" + + end + + def make_footer insn + ret = '' + ret = " /* push stack val */\n" if $verbose + ret += make_footer_stack_val insn + # debug info + + # epilogue + ret += make_footer_default_operands insn + ret += "#undef CURRENT_INSN_#{insn.name}\n" + ret += "#undef INSN_IS_SC\n" + ret += "#undef INSN_LABEL\n" + ret += "#undef LABEL_IS_SC\n" + ret += " END_INSN(#{insn.name});\n}}\n" + ret += "}\n" + end + + def make_insn_def insn + ret = make_header insn + if line = insn.body.instance_variable_get(:@line_no) + ret << "#line #{line+1} \"#{$insns_def}\"" << "\n" + ret << insn.body + ret << '#line __CURRENT_LINE__ "vm.inc"' << "\n" + else + ret << insn.body + end + ret << make_footer(insn) + end + + # vm.inc + def vm_inc + vm_body = '' + + @insns.each{|insn| + vm_body << "\n" + vm_body << make_insn_def(insn) + } + src = File.read(File.join($srcdir, '/template/vm.inc.tmpl')) + ERB.new(src).result(binding) + end + + + ################################################################### + # vmtc.inc + + def vmtc_inc + insns_table = '' + insns_end_table = '' + + @insns.each{|insn| + insns_table << " LABEL_PTR(#{insn.name}),\n" + } + @insns.each{|insn| + insns_end_table << " ELABEL_PTR(#{insn.name}),\n" + } + + ERB.new(File.read($srcdir + '/template/vmtc.inc.tmpl')).result(binding) + end + + + ################################################################### + # insns_info.inc + + def op2typesig op + case op + when /^OFFSET/ + "TS_OFFSET" + when /^num_t/ + "TS_NUM" + when /^lindex_t/ + "TS_LINDEX" + when /^dindex_t/ + "TS_DINDEX" + when /^VALUE/ + "TS_VALUE" + when /^ID/ + "TS_ID" + when /GENTRY/ + "TS_GENTRY" + when /^IC/ + "TS_IC" + when /^\.\.\./ + "TS_VARIABLE" + when /^CDHASH/ + "TS_CDHASH" + when /^ISEQ/ + "TS_ISEQ" + else + raise "unknown op type: #{op}" + end + end + + TYPE_CHARS = { + 'TS_OFFSET' => 'O', + 'TS_NUM' => 'N', + 'TS_LINDEX' => 'L', + 'TS_DINDEX' => 'D', + 'TS_VALUE' => 'V', + 'TS_ID' => 'I', + 'TS_GENTRY' => 'G', + 'TS_IC' => 'C', + 'TS_CDHASH' => 'H', + 'TS_ISEQ' => 'S', + 'TS_VARIABLE' => '.', + } + + # insns_info.inc + def insns_info_inc + # insn_type_chars + insn_type_chars = TYPE_CHARS.map{|t, c| + "#define #{t} '#{c}'" + }.join("\n") + + # insn_names + insn_names = '' + @insns.each{|insn| + insn_names << " \"#{insn.name}\",\n" + } + + # operands info + operands_info = '' + operands_num_info = '' + @insns.each{|insn| + opes = insn.opes + operands_info << ' ' + ot = opes.map{|type, var| + TYPE_CHARS.fetch(op2typesig(type)) + } + operands_info << "\"#{ot.join}\"" << ", \n" + + num = opes.size + 1 + operands_num_info << " #{num},\n" + } + + # stack num + stack_num_info = '' + @insns.each{|insn| + num = insn.rets.size + stack_num_info << " #{num},\n" + } + + # stack increase + stack_increase = '' + @insns.each{|insn| + stack_increase << <<-EOS + case BIN(#{insn.name}):{ + #{insn.sp_increase_c_expr} + } + EOS + } + ERB.new(File.read($srcdir + '/template/insns_info.inc.tmpl')).result(binding) + end + + + ################################################################### + # insns.inc + def insns_inc + insns = '' + i=0 + @insns.each{|insn| + insns << " %-30s = %d,\n" % ["BIN(#{insn.name})", i] + i+=1 + } + ERB.new(File.read($srcdir + '/template/insns.inc.tmpl')).result(binding) + end + + + ################################################################### + # minsns.inc + def minsns_inc + defs = '' + i=0 + @insns.each{|insn| + defs << " rb_define_const(mYarvInsns, %-30s, INT2FIX(%d));\n" % + ["\"I#{insn.name}\"", i] + i+=1 + } + ERB.new(File.read($srcdir + '/template/minsns.inc.tmpl')).result(binding) + end + + + ################################################################### + # optinsn.inc + def val_as_type op + type = op[0][0] + val = op[1] + + case type + when /^long/, /^num_t/, /^lindex_t/, /^dindex_t/ + "INT2FIX(#{val})" + when /^VALUE/ + val + when /^ID/ + "INT2FIX(#{val})" + when /^ISEQ/ + val + when /GENTRY/ + raise + when /^\.\.\./ + raise + else + raise "type: #{type}" + end + end + + # optinsn.inc + def optinsn_inc + rule = '' + opt_insns_map = Hash.new{|h, k| h[k] = []} + + @insns.each{|insn| + next if insn.defopes.size == 0 + next if insn.type == :sc + next if /^UNIFIED/ =~ insn.name.to_s + + originsn = insn.orig + opt_insns_map[originsn] << insn + } + + opt_insns_map.each{|originsn, optinsns| + rule += "case BIN(#{originsn.name}):\n" + + optinsns.sort_by{|opti| + opti.defopes.find_all{|e| e[1] == '*'}.size + }.each{|opti| + rule += " if(\n" + i = 0 + rule += ' ' + opti.defopes.map{|opinfo| + i += 1 + next if opinfo[1] == '*' + "insnobj->operands[#{i-1}] == #{val_as_type(opinfo)}\n" + }.compact.join('&& ') + rule += " ){\n" + idx = 0 + n = 0 + opti.defopes.each{|opinfo| + if opinfo[1] == '*' + if idx != n + rule += " insnobj->operands[#{idx}] = insnobj->operands[#{n}];\n" + end + idx += 1 + else + # skip + end + n += 1 + } + rule += " insnobj->insn_id = BIN(#{opti.name});\n" + rule += " insnobj->operand_size = #{idx};\n" + rule += " break;\n }\n" + } + rule += " break;\n"; + } + ERB.new(File.read($srcdir + '/template/optinsn.inc.tmpl')).result(binding) + end + + + ################################################################### + # optunifs.inc + def optunifs_unc + unif_insns_each = '' + unif_insns = '' + unif_insns_data = [] + + insns = find_all{|insn| !insn.is_sc} + insns.each{|insn| + size = insn.unifs.size + if size > 0 + require 'pp' + + insn.unifs.sort_by{|unif| -unif[1].size}.each_with_index{|unif, i| + + uni_insn, uni_insns = *unif + uni_insns = uni_insns[1..-1] + unif_insns_each << "static int UNIFIED_#{insn.name}_#{i}[] = {" + + " BIN(#{uni_insn.name}), #{uni_insns.size + 2}, \n " + + uni_insns.map{|e| "BIN(#{e.name})"}.join(", ") + "};\n" + } + else + + end + if size > 0 + unif_insns << "static int *UNIFIED_#{insn.name}[] = {(int *)#{size+1}, \n" + unif_insns << (0...size).map{|e| " UNIFIED_#{insn.name}_#{e}"}.join(",\n") + "};\n" + unif_insns_data << " UNIFIED_#{insn.name}" + else + unif_insns_data << " 0" + end + } + unif_insns_data = "static int **unified_insns_data[] = {\n" + + unif_insns_data.join(",\n") + "};\n" + ERB.new(File.read($srcdir + '/template/optunifs.inc.tmpl')).result(binding) + end + + ################################################################### + # opt_sc.inc + def opt_sc_inc + sc_insn_info = [] + @insns.each{|insn| + insns = insn.sc + if insns.size > 0 + insns = ['SC_ERROR'] + insns.map{|e| " BIN(#{e.name})"} + else + insns = Array.new(6){'SC_ERROR'} + end + sc_insn_info << " {\n#{insns.join(",\n")}}" + } + sc_insn_info = sc_insn_info.join(",\n") + + sc_insn_next = @insns.map{|insn| + " SCS_#{complement_name(insn.nextsc).upcase}" + + ($verbose ? " /* #{insn.name} */" : '') + }.join(",\n") + ERB.new(File.read($srcdir + '/template/opt_sc.inc.tmpl')).result(binding) + end + + ################################################################### + # yasmdata.rb + def yasmdata_rb + insn_id2no = '' + @insns.each_with_index{|insn, i| + insn_id2no << " :#{insn.name} => #{i},\n" + } + ERB.new(File.read($srcdir + '/template/yasmdata.rb.tmpl')).result(binding) + end + + ################################################################### + # yarvarch.* + def desc lang + d = '' + i = 0 + cat = nil + @insns.each{|insn| + seq = insn.opes.map{|t,v| v}.join(' ') + before = insn.pops.reverse.map{|t,v| v}.join(' ') + after = insn.rets.reverse.map{|t,v| v}.join(' ') + + if cat != insn.comm[:c] + d << "** #{insn.comm[:c]}\n\n" + cat = insn.comm[:c] + end + + d << "*** #{insn.name}\n" + d << "\n" + d << insn.comm[lang] + "\n\n" + d << ":instruction sequence: 0x%02x #{seq}\n" % i + d << ":stack: #{before} => #{after}\n\n" + i+=1 + } + d + end + + def desc_ja + d = desc :j + ERB.new(File.read($srcdir + '/template/yarvarch.ja')).result(binding) + end + + def desc_en + d = desc :e + ERB.new(File.read($srcdir + '/template/yarvarch.en')).result(binding) + end + + def vm_macro_inc + ret = '' + flag = false + File.read($srcdir + '/vm_macro.def').each_line{|line| + line.rstrip! + if /^MACRO\s/ =~ line + line.sub!(/^MACRO/, '#define') + flag = true + elsif /^\}/ =~ line + flag = false + end + + ret << line + (flag ? " \\" : '') + "\n" + } + ret + end + + Files = { # codes + 'vm.inc' => :vm_inc, + 'vmtc.inc' => :vmtc_inc, + 'insns.inc' => :insns_inc, + 'insns_info.inc' => :insns_info_inc, + # 'minsns.inc' => :minsns_inc, + 'optinsn.inc' => :optinsn_inc, + 'optunifs.inc' => :optunifs_unc, + 'opt_sc.inc' => :opt_sc_inc, + 'yasmdata.rb' => :yasmdata_rb, + 'vm_macro.inc' => :vm_macro_inc, + } + + def self.make_sources insns_def, opopt_def, unif_def, args = [] + insns = InsnsDef.new(insns_def, opopt_def, unif_def) + + args = Files.keys if args.empty? + + args.each{|fn| + s = Files[fn] + + open(fn, 'w'){|f| + f.puts(insns.__send__(s)) + } + } + end +end + + + + +############################################## +files = [] +$opts = {} +$srcdir = '.' +insns_def = 'insns.def' +opope_def = 'opt_operand.def' +unif_def = 'opt_insn_unif.def' + +ARGV.each{|e| + case e + when /\A\-D(\w+)/ + $opts[$1] = true + when /\A--srcdir=(.+)/ + $srcdir = $1 + when /\A--insnsdef=(.+)/ + insns_def = $1 + when /\A--opt-operanddef=(.+)/ + opope_def = $1 + when /\A--opt-insnunifdef=(.+)/ + unif_def = $1 + when /\A-/ + # ignore + else + files << e + end +} + +optfile = File.join(Dir.pwd, 'vm_opts.h') +basefile = File.join($srcdir, 'vm_opts.h.base') +if !FileTest.exist?(optfile) || File.mtime(optfile) < File.mtime(basefile) + require 'fileutils' + FileUtils.cp(File.join($srcdir, 'vm_opts.h.base'), optfile) +end + +if optfile + open(optfile){|f| + f.each_line{|line| + if /^\#define\s+(OPT_[A-Z_]+)\s+1/ =~ line + $opts[$1] = true + end + } + } +end + +$insns_def = File.join($srcdir, insns_def) +$opope_def = File.join($srcdir, opope_def) +$unif_def = File.join($srcdir, unif_def) + +def insns_def_new + InsnsDef.new $insns_def, $opope_def, $unif_def +end + +if $0 == __FILE__ + InsnsDef.make_sources $insns_def, $opope_def, $unif_def, files +end + diff --git a/tool/makedocs.rb b/tool/makedocs.rb new file mode 100644 index 0000000000..56cb21565f --- /dev/null +++ b/tool/makedocs.rb @@ -0,0 +1,62 @@ +#!/usr/bin/env ruby +# +# + +require 'rb/insns2vm.rb' +insns = insns_def_new + +{ # docs + '/doc/yarvarch.ja' => :desc_ja, + '/doc/yarvarch.en' => :desc_en, +}.each{|fn, s| + fn = $srcdir + fn + p fn + open(fn, 'w'){|f| + f.puts(insns.__send__(s)) + } +} + +def chg ary + if ary.empty? + return ' ' + end + + ary.map{|e| + if e[0] == '...' + '...' + else + e.join(' ') + end + e[1] + }.join(', ') +end + +open($srcdir + '/doc/insnstbl.html', 'w'){|f| + tbl = '' + type = nil + insns.each_with_index{|insn, i| + c = insn.comm[:c] + if type != c + stype = c + type = c + end + + tbl << "<tr>\n" + tbl << "<td>#{stype}</td>" + tbl << "<td>#{i}</td>" + tbl << "<td>#{insn.name}</td>" + tbl << "<td>#{chg insn.opes}</td>" + tbl << "<td>#{chg insn.pops.reverse}</td>" + tbl << "<td> => </td>" + tbl << "<td>#{chg insn.rets.reverse}</td>" + tbl << "</tr>\n" + } + f.puts ERB.new(File.read($srcdir + '/template/insnstbl.html')).result(binding) +} + +begin + system('t2n.bat --tmpl doc.tmpl ../doc/yarvarch.ja > ../doc/yarvarch.ja.html') + system('t2n.bat --tmpl doc.tmpl ../doc/yarvarch.en > ../doc/yarvarch.en.html') +rescue +end + diff --git a/tool/parse.rb b/tool/parse.rb new file mode 100644 index 0000000000..15e7f77494 --- /dev/null +++ b/tool/parse.rb @@ -0,0 +1,13 @@ +$file = ARGV[0] +$str = ARGF.read.sub(/^__END__.*\z/m, '') +puts '# ' + '-' * 70 +puts "# target program: " +puts '# ' + '-' * 70 +puts $str +puts '# ' + '-' * 70 + +$parsed = YARVCore::InstructionSequence.compile_file($file) +puts "# disasm result: " +puts '# ' + '-' * 70 +puts $parsed.disasm +puts '# ' + '-' * 70 diff --git a/tool/runruby.rb b/tool/runruby.rb new file mode 100644 index 0000000000..9de75cd388 --- /dev/null +++ b/tool/runruby.rb @@ -0,0 +1,4 @@ +require 'rbconfig' +$:.unshift File.join('.ext', Config::CONFIG['arch']) +$:.unshift '.ext' +load ARGV[0] diff --git a/tool/vtlh.rb b/tool/vtlh.rb new file mode 100644 index 0000000000..fcd3630821 --- /dev/null +++ b/tool/vtlh.rb @@ -0,0 +1,15 @@ +# ARGF = open('ha') +cd = `pwd`.chomp + '/' +ARGF.each{|line| + if /^0x([a-z0-9]+),/ =~ line + stat = line.split(',') + addr = stat[0].hex + 0x00400000 + retired = stat[2].to_i + ticks = stat[3].to_i + + src = `addr2line -e miniruby.exe #{addr.to_s(16)}`.chomp + src.sub!(cd, '') + puts '%-40s 0x%08x %8d %8d' % [src, addr, retired, ticks] + end +} + @@ -35,31 +35,32 @@ #endif #define scan_oct ruby_scan_oct -unsigned long ruby_scan_oct(const char*, int, int*); +unsigned long ruby_scan_oct(const char *, int, int *); #define scan_hex ruby_scan_hex -unsigned long ruby_scan_hex(const char*, int, int*); +unsigned long ruby_scan_hex(const char *, int, int *); #if defined(MSDOS) || defined(__CYGWIN32__) || defined(_WIN32) void ruby_add_suffix(VALUE str, const char *suffix); #endif -void ruby_qsort(void*, const int, const int, int (*)(const void*,const void*,void*), void*); +void ruby_qsort(void *, const int, const int, + int (*)(const void *, const void *, void *), void *); -void ruby_setenv(const char*, const char*); -void ruby_unsetenv(const char*); +void ruby_setenv(const char *, const char *); +void ruby_unsetenv(const char *); #undef setenv #undef unsetenv #define setenv(name,val) ruby_setenv(name,val) #define unsetenv(name,val) ruby_unsetenv(name); -char *ruby_strdup(const char*); +char *ruby_strdup(const char *); #undef strdup #define strdup(s) ruby_strdup(s) char *ruby_getcwd(void); #define my_getcwd() ruby_getcwd() -double ruby_strtod(const char*, char **); +double ruby_strtod(const char *, char **); #undef strtod #define strtod(s,e) ruby_strtod(s,e) diff --git a/variable.c b/variable.c index 7afe794928..4310f0a22a 100644 --- a/variable.c +++ b/variable.c @@ -13,11 +13,11 @@ **********************************************************************/ #include "ruby.h" -#include "env.h" #include "node.h" #include "st.h" #include "util.h" +void rb_vm_change_state(void); st_table *rb_global_tbl; st_table *rb_class_tbl; static ID autoload, classpath, tmp_classpath; @@ -424,9 +424,7 @@ mark_global_entry(ID key, struct global_entry *entry) void rb_gc_mark_global_tbl(void) { - if (rb_global_tbl) { - st_foreach(rb_global_tbl, mark_global_entry, 0); - } + st_foreach_safe(rb_global_tbl, mark_global_entry, 0); } static ID @@ -1144,7 +1142,7 @@ const_missing(VALUE klass, ID id) VALUE rb_mod_const_missing(VALUE klass, VALUE name) { - ruby_frame = ruby_frame->prev; /* pop frame for "const_missing" */ + rb_frame_pop(); /* pop frame for "const_missing" */ uninitialized_constant(klass, rb_to_id(name)); return Qnil; /* not reached */ } @@ -1189,7 +1187,7 @@ rb_autoload(VALUE mod, ID id, const char *file) fn = rb_str_new2(file); FL_UNSET(fn, FL_TAINT); OBJ_FREEZE(fn); - st_insert(tbl, id, (st_data_t)rb_node_newnode(NODE_MEMO, fn, ruby_safe_level, 0)); + st_insert(tbl, id, (st_data_t)rb_node_newnode(NODE_MEMO, fn, rb_safe_level(), 0)); } static NODE* @@ -1275,10 +1273,10 @@ rb_autoload_p(VALUE mod, ID id) } static VALUE -rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, NODE *fallback) +rb_const_get_0(VALUE klass, ID id, int exclude, int recurse) { VALUE value, tmp; - int n_retry = 0; + int mod_retry = 0; tmp = klass; retry: @@ -1294,50 +1292,34 @@ rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, NODE *fallback) } return value; } - if (!recurse) break; + if (!recurse && klass != rb_cObject) break; tmp = RCLASS(tmp)->super; - if (tmp == rb_cObject) break; - if (ruby_wrapper && tmp && RBASIC(tmp)->klass == ruby_wrapper) { - tmp = RCLASS(tmp)->super; - } } - if (recurse) { - if (fallback) { - tmp = fallback->nd_clss; - fallback = fallback->nd_next; - goto retry; - } - if (!n_retry) { - n_retry = 1; - tmp = rb_cObject; - goto retry; - } + if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { + mod_retry = 1; + tmp = rb_cObject; + goto retry; } + return const_missing(klass, id); } VALUE rb_const_get_from(VALUE klass, ID id) { - return rb_const_get_0(klass, id, Qtrue, Qtrue, 0); + return rb_const_get_0(klass, id, Qtrue, Qtrue); } VALUE rb_const_get(VALUE klass, ID id) { - return rb_const_get_0(klass, id, Qfalse, Qtrue, 0); + return rb_const_get_0(klass, id, Qfalse, Qtrue); } VALUE rb_const_get_at(VALUE klass, ID id) { - return rb_const_get_0(klass, id, Qtrue, Qfalse, 0); -} - -VALUE -rb_const_get_fallback(VALUE klass, ID id, NODE *fallback) -{ - return rb_const_get_0(klass, id, Qfalse, Qtrue, fallback); + return rb_const_get_0(klass, id, Qtrue, Qfalse); } /* @@ -1355,6 +1337,8 @@ rb_mod_remove_const(VALUE mod, VALUE name) ID id = rb_to_id(name); VALUE val; + rb_vm_change_state(); + if (!rb_is_const_id(id)) { rb_name_error(id, "`%s' is not allowed as a constant name", rb_id2name(id)); } @@ -1439,7 +1423,7 @@ rb_const_list(void *data) /* * call-seq: * mod.constants(inherit=true) => array - * + * * Returns an array of the names of the constants accessible in * <i>mod</i>. This includes the names of constants in any included * modules (example at start of section), unless the <i>all</i> @@ -1473,10 +1457,10 @@ rb_mod_constants(int argc, VALUE *argv, VALUE mod) } static int -rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, NODE* fallback) +rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse) { VALUE value, tmp; - int n_retry = 0; + int mod_retry = 0; tmp = klass; retry: @@ -1486,20 +1470,13 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, NODE* fallback) return Qfalse; return Qtrue; } - if (!recurse) break; + if (!recurse && klass != rb_cObject) break; tmp = RCLASS(tmp)->super; } - if (recurse) { - if (fallback) { - tmp = fallback->nd_clss; - fallback = fallback->nd_next; - goto retry; - } - if (!n_retry) { - n_retry = 1; - tmp = rb_cObject; - goto retry; - } + if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { + mod_retry = 1; + tmp = rb_cObject; + goto retry; } return Qfalse; } @@ -1507,25 +1484,19 @@ rb_const_defined_0(VALUE klass, ID id, int exclude, int recurse, NODE* fallback) int rb_const_defined_from(VALUE klass, ID id) { - return rb_const_defined_0(klass, id, Qtrue, Qtrue, 0); + return rb_const_defined_0(klass, id, Qtrue, Qtrue); } int rb_const_defined(VALUE klass, ID id) { - return rb_const_defined_0(klass, id, Qfalse, Qtrue, 0); + return rb_const_defined_0(klass, id, Qfalse, Qtrue); } int rb_const_defined_at(VALUE klass, ID id) { - return rb_const_defined_0(klass, id, Qtrue, Qfalse, 0); -} - -int -rb_const_defined_fallback(VALUE klass, ID id, NODE *fallback) -{ - return rb_const_defined_0(klass, id, Qfalse, Qtrue, fallback); + return rb_const_defined_0(klass, id, Qtrue, Qfalse); } static void @@ -1534,7 +1505,7 @@ mod_av_set(VALUE klass, ID id, VALUE val, int isconst) const char *dest = isconst ? "constant" : "class variable"; if (!OBJ_TAINTED(klass) && rb_safe_level() >= 4) - rb_raise(rb_eSecurityError, "Insecure: can't set %s", dest); + rb_raise(rb_eSecurityError, "Insecure: can't set %s", dest); if (OBJ_FROZEN(klass)) { if (BUILTIN_TYPE(klass) == T_MODULE) { rb_error_frozen("module"); @@ -1551,12 +1522,15 @@ mod_av_set(VALUE klass, ID id, VALUE val, int isconst) if (st_lookup(RCLASS(klass)->iv_tbl, id, &value)) { if (value == Qundef) - autoload_delete(klass, id); + autoload_delete(klass, id); else - rb_warn("already initialized %s %s", dest, rb_id2name(id)); + rb_warn("already initialized %s %s", dest, rb_id2name(id)); } } + if(isconst){ + rb_vm_change_state(); + } st_insert(RCLASS(klass)->iv_tbl, id, val); } @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2006-12-31" +#define RUBY_RELEASE_DATE "2007-01-01" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20061231 +#define RUBY_RELEASE_CODE 20070101 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 -#define RUBY_RELEASE_YEAR 2006 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_YEAR 2007 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 1 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; @@ -0,0 +1,1722 @@ +/********************************************************************** + + vm.c - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#include "ruby.h" +#include "node.h" +#include "st.h" + +#include "yarvcore.h" +#include "vm.h" +#include "insnhelper.h" +#include "vm_macro.inc" +#include "insns.inc" +#include "eval_intern.h" + +#define PROCDEBUG 0 +#define VM_DEBUG 0 + +#define BUFSIZE 0x100 + +#define EVALBODY_HELPER_FUNCTION static inline + +typedef unsigned long num_t; +typedef unsigned long lindex_t; +typedef unsigned long dindex_t; + +typedef num_t GENTRY; + +void vm_analysis_operand(int insn, int n, VALUE op); +void vm_analysis_register(int reg, int isset); +void vm_analysis_insn(int insn); + +static inline VALUE + th_invoke_yield_cfunc(yarv_thread_t *th, yarv_block_t *block, + VALUE self, int argc, VALUE *argv); +VALUE th_invoke_proc(yarv_thread_t *th, yarv_proc_t *proc, + VALUE self, int argc, VALUE *argv); + +VALUE th_eval_body(yarv_thread_t *th); +static NODE *lfp_get_special_cref(VALUE *lfp); +static NODE *lfp_set_special_cref(VALUE *lfp, NODE * cref); + +#if OPT_STACK_CACHING +static VALUE yarv_finish_insn_seq[1] = { BIN(finish_SC_ax_ax) }; +#elif OPT_CALL_THREADED_CODE +static VALUE const yarv_finish_insn_seq[1] = { 0 }; +#else +static VALUE yarv_finish_insn_seq[1] = { BIN(finish) }; +#endif + +#include "call_cfunc.ci" + +void +rb_vm_change_state(void) +{ + INC_VM_STATE_VERSION(); +} + +/* + * prepare stack frame + */ +static inline yarv_control_frame_t * +push_frame(yarv_thread_t *th, yarv_iseq_t *iseq, VALUE magic, + VALUE self, VALUE specval, VALUE *pc, + VALUE *sp, VALUE *lfp, int local_size) +{ + VALUE *dfp; + yarv_control_frame_t *cfp; + int i; + + /* nil initialize */ + for (i=0; i < local_size; i++) { + *sp = Qnil; + sp++; + } + + /* set special val */ + *sp = GC_GUARDED_PTR(specval); + dfp = sp; + + if (lfp == 0) { + lfp = sp; + } + + cfp = th->cfp = th->cfp - 1; + cfp->pc = pc; + cfp->sp = sp + 1; + cfp->bp = sp + 1; + cfp->iseq = iseq; + cfp->magic = magic; + cfp->self = self; + cfp->lfp = lfp; + cfp->dfp = dfp; + cfp->proc = 0; + cfp->method_id = 0; + cfp->callee_id = 0; + +#define COLLECT_PROFILE 0 +#if COLLECT_PROFILE + cfp->prof_time_self = clock(); + cfp->prof_time_chld = 0; +#endif + + return cfp; +} + +static inline void +pop_frame(yarv_thread_t *th) +{ +#if COLLECT_PROFILE + yarv_control_frame_t *cfp = th->cfp; + + if (YARV_NORMAL_ISEQ_P(cfp->iseq)) { + VALUE current_time = clock(); + yarv_control_frame_t *cfp = th->cfp; + cfp->prof_time_self = current_time - cfp->prof_time_self; + (cfp+1)->prof_time_chld += cfp->prof_time_self; + + cfp->iseq->profile.count++; + cfp->iseq->profile.time_cumu = cfp->prof_time_self; + cfp->iseq->profile.time_self = cfp->prof_time_self - cfp->prof_time_chld; + } + else if (0 /* c method? */) { + + } +#endif + th->cfp = YARV_PREVIOUS_CONTROL_FRAME(th->cfp); +} + +EXTERN VALUE ruby_top_self; + +VALUE +th_set_finish_env(yarv_thread_t *th) +{ + push_frame(th, 0, FRAME_MAGIC_FINISH, + Qnil, th->cfp->lfp[0], 0, + th->cfp->sp, 0, 1); + th->cfp->pc = &yarv_finish_insn_seq[0]; + return Qtrue; +} + +void +th_set_top_stack(yarv_thread_t *th, VALUE iseqval) +{ + yarv_iseq_t *iseq; + GetISeqPtr(iseqval, iseq); + + if (iseq->type != ISEQ_TYPE_TOP) { + rb_raise(rb_eTypeError, "Not a toplevel InstructionSequence"); + } + + /* for return */ + th_set_finish_env(th); + + push_frame(th, iseq, FRAME_MAGIC_TOP, + ruby_top_self, 0, iseq->iseq_encoded, + th->cfp->sp, 0, iseq->local_size); +} + +VALUE +th_set_eval_stack(yarv_thread_t *th, VALUE iseqval) +{ + yarv_iseq_t *iseq; + yarv_block_t *block = th->base_block; + GetISeqPtr(iseqval, iseq); + + /* for return */ + th_set_finish_env(th); + push_frame(th, iseq, FRAME_MAGIC_EVAL, block->self, + GC_GUARDED_PTR(block->dfp), iseq->iseq_encoded, + th->cfp->sp, block->lfp, iseq->local_size); + return 0; +} + +static int check_env(yarv_env_t *env); +VALUE yarv_env_alloc(VALUE klass); + +static VALUE +th_make_env_each(yarv_thread_t *th, yarv_control_frame_t *cfp, + VALUE *envptr, VALUE *endptr) +{ + VALUE envval, penvval = 0; + yarv_env_t *env; + VALUE *nenvptr; + int i, local_size; + + if (ENV_IN_HEAP_P(envptr)) { + return ENV_VAL(envptr); + } + + if (envptr != endptr) { + VALUE *penvptr = GC_GUARDED_PTR_REF(*envptr); + yarv_control_frame_t *pcfp = cfp; + + if (ENV_IN_HEAP_P(penvptr)) { + penvval = ENV_VAL(penvptr); + } + else { + while (pcfp->dfp != penvptr) { + pcfp++; + if (pcfp->dfp == 0) { + SDR(); + printf("[BUG] orz\n"); + exit(0); + } + } + penvval = th_make_env_each(th, pcfp, penvptr, endptr); + cfp->lfp = pcfp->lfp; + *envptr = GC_GUARDED_PTR(pcfp->dfp); + } + } +//SDR2(cfp); +//fprintf(stderr, "lfp: %p, cfp: %p, endptr: %p\n", cfp->lfp, cfp->dfp, endptr); + /* allocate env */ + envval = yarv_env_alloc(cYarvEnv); + GetEnvPtr(envval, env); + + if (!YARV_NORMAL_ISEQ_P(cfp->iseq)) { + local_size = 2; + } + else { + local_size = cfp->iseq->local_size; + } + + env->env_size = local_size + 1 + 4; + env->local_size = local_size; + env->env = ALLOC_N(VALUE, env->env_size); + env->prev_envval = penvval; + + for (i = 0; i <= local_size; i++) { + env->env[i] = envptr[-local_size + i]; + //dp(env->env[i]); + if (YARV_NORMAL_ISEQ_P(cfp->iseq)) { + /* clear value stack for GC */ + // envptr[-local_size + i] = 0; + } + } + + *envptr = envval; /* GC mark */ + nenvptr = &env->env[i - 1]; + nenvptr[1] = Qfalse; /* frame is not orphan */ + nenvptr[2] = Qundef; /* frame is in heap */ + nenvptr[3] = envval; /* frame self */ + nenvptr[4] = penvval; /* frame prev env object */ + + /* reset lfp/dfp in cfp */ + cfp->dfp = nenvptr; + if (envptr == endptr) { + cfp->lfp = nenvptr; + } + + /* as Binding */ + env->block.self = cfp->self; + env->block.lfp = cfp->lfp; + env->block.dfp = cfp->dfp; + env->block.iseq = cfp->iseq; + + if (VM_DEBUG && + (!(cfp->lfp[-1] == Qnil || + BUILTIN_TYPE(cfp->lfp[-1]) == T_VALUES))) { + rb_bug("illegal svar"); + } + + if (!YARV_NORMAL_ISEQ_P(cfp->iseq)) { + /* TODO */ + env->block.iseq = 0; + } + return envval; +} + +static VALUE check_env_value(VALUE envval); + +static int +check_env(yarv_env_t *env) +{ + printf("---\n"); + printf("envptr: %p\n", &env->block.dfp[0]); + printf("orphan: %p\n", (void *)env->block.dfp[1]); + printf("inheap: %p\n", (void *)env->block.dfp[2]); + printf("envval: %10p ", (void *)env->block.dfp[3]); + dp(env->block.dfp[3]); + printf("penvv : %10p ", (void *)env->block.dfp[4]); + dp(env->block.dfp[4]); + printf("lfp: %10p\n", env->block.lfp); + printf("dfp: %10p\n", env->block.dfp); + if (env->block.dfp[4]) { + printf(">>\n"); + check_env_value(env->block.dfp[4]); + printf("<<\n"); + } + return 1; +} + +static VALUE +check_env_value(VALUE envval) +{ + yarv_env_t *env; + GetEnvPtr(envval, env); + + if (check_env(env)) { + return envval; + } + rb_bug("invalid env\n"); + return Qnil; /* unreachable */ +} + +static int +collect_local_variables_in_env(yarv_env_t *env, VALUE ary) +{ + int i; + if (env->block.lfp == env->block.dfp) { + return 0; + } + for (i = 0; i < env->block.iseq->local_size; i++) { + ID lid = env->block.iseq->local_tbl[i]; + if (lid) { + rb_ary_push(ary, rb_str_new2(rb_id2name(lid))); + } + } + if (env->prev_envval) { + GetEnvPtr(env->prev_envval, env); + collect_local_variables_in_env(env, ary); + } + return 0; +} + +int +th_collect_local_variables_in_heap(yarv_thread_t *th, VALUE *dfp, VALUE ary) +{ + if (ENV_IN_HEAP_P(dfp)) { + yarv_env_t *env; + GetEnvPtr(ENV_VAL(dfp), env); + collect_local_variables_in_env(env, ary); + return 1; + } + else { + return 0; + } +} + + +VALUE +th_make_env_object(yarv_thread_t *th, yarv_control_frame_t *cfp) +{ + VALUE envval; + // SDR2(cfp); + envval = th_make_env_each(th, cfp, cfp->dfp, cfp->lfp); + if (PROCDEBUG) { + check_env_value(envval); + } + return envval; +} + +static VALUE +th_make_proc_from_block(yarv_thread_t *th, yarv_control_frame_t *cfp, + yarv_block_t *block) +{ + VALUE procval; + yarv_control_frame_t *bcfp; + VALUE *bdfp; /* to gc mark */ + + if (block->proc) { + return block->proc; + } + + bcfp = GET_CFP_FROM_BLOCK_PTR(block); + bdfp = bcfp->dfp; + procval = th_make_proc(th, bcfp, block); + return procval; +} + +struct RObject *rb; + +VALUE +th_make_proc(yarv_thread_t *th, yarv_control_frame_t *cfp, + yarv_block_t *block) +{ + VALUE procval, envval, blockprocval = 0; + yarv_proc_t *proc; + + if (GC_GUARDED_PTR_REF(cfp->lfp[0])) { + if (!YARV_CLASS_SPECIAL_P(cfp->lfp[0])) { + yarv_proc_t *p; + + blockprocval = + th_make_proc_from_block(th, cfp, + (yarv_block_t *)GC_GUARDED_PTR_REF(*cfp-> + lfp)); + GetProcPtr(blockprocval, p); + *cfp->lfp = GC_GUARDED_PTR(&p->block); + } + } + envval = th_make_env_object(th, cfp); + + if (PROCDEBUG) { + check_env_value(envval); + } + procval = yarv_proc_alloc(cYarvProc); + GetProcPtr(procval, proc); + proc->blockprocval = blockprocval; + proc->block.self = block->self; + proc->block.lfp = block->lfp; + proc->block.dfp = block->dfp; + proc->block.iseq = block->iseq; + proc->block.proc = procval; + proc->envval = envval; + proc->safe_level = th->safe_level; + proc->special_cref_stack = lfp_get_special_cref(block->lfp); + + if (VM_DEBUG) { + if (th->stack < block->dfp && block->dfp < th->stack + th->stack_size) { + rb_bug("invalid ptr: block->dfp"); + } + if (th->stack < block->lfp && block->lfp < th->stack + th->stack_size) { + rb_bug("invalid ptr: block->lfp"); + } + } + return procval; +} + +static inline VALUE +th_invoke_bmethod(yarv_thread_t *th, ID id, VALUE procval, VALUE recv, + VALUE klass, int argc, VALUE *argv) +{ + yarv_control_frame_t *cfp = th->cfp; + yarv_proc_t *proc; + VALUE val; + VALUE values[2] = { + id, RCLASS(klass)->super, + }; + + /* dirty hack */ + (cfp-1)->block_iseq = (void *)values; + GetProcPtr(procval, proc); + val = th_invoke_proc(th, proc, recv, argc, argv); + return val; +} + +VALUE +th_call0(yarv_thread_t *th, VALUE klass, VALUE recv, + VALUE id, ID oid, int argc, const VALUE *argv, + NODE * body, int nosuper) +{ + VALUE val; + yarv_block_t *blockptr = 0; + + if (0) printf("id: %s, nd: %s, argc: %d, passed: %p\n", + rb_id2name(id), node_name(nd_type(body)), + argc, th->passed_block); + //SDR2(th->cfp); + + if (th->passed_block) { + blockptr = th->passed_block; + th->passed_block = 0; + } + switch (nd_type(body)) { + case YARV_METHOD_NODE:{ + yarv_control_frame_t *reg_cfp; + int i; + const int flag = 0; + + th_set_finish_env(th); + reg_cfp = th->cfp; + for (i = 0; i < argc; i++) { + *reg_cfp->sp++ = argv[i]; + } + macro_eval_invoke_func(body->nd_body, recv, klass, blockptr, + argc); + val = th_eval_body(th); + break; + } + case NODE_CFUNC: { + yarv_control_frame_t *reg_cfp = th->cfp; + yarv_control_frame_t *cfp = + push_frame(th, 0, FRAME_MAGIC_CFUNC, + recv, (VALUE)blockptr, 0, reg_cfp->sp, 0, 1); + + cfp->callee_id = oid; + cfp->method_id = id; + cfp->method_klass = klass; + + val = call_cfunc(body->nd_cfnc, recv, body->nd_argc, argc, argv); + + if (reg_cfp != th->cfp + 1) { + SDR2(reg_cfp); + SDR2(th->cfp-5); + rb_bug("cfp consistency error - call0"); + th->cfp = reg_cfp; + } + pop_frame(th); + + break; + } + case NODE_ATTRSET:{ + if (argc != 1) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", + argc); + } + val = rb_ivar_set(recv, body->nd_vid, argv[0]); + break; + } + case NODE_IVAR:{ + if (argc != 0) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", + argc); + } + val = rb_attr_get(recv, body->nd_vid); + break; + } + case NODE_BMETHOD:{ + val = th_invoke_bmethod(th, id, body->nd_cval, + recv, klass, argc, (VALUE *)argv); + break; + } + default: + rb_bug("unsupported: th_call0"); + } + YARV_CHECK_INTS(); + return val; +} + +VALUE +th_call_super(yarv_thread_t *th, int argc, const VALUE *argv) +{ + VALUE recv = th->cfp->self; + VALUE klass; + ID id; + NODE *body; + int nosuper = 0; + yarv_control_frame_t *cfp = th->cfp; + + if (!th->cfp->iseq) { + klass = RCLASS(cfp->method_klass)->super; + id = cfp->method_id; + } + else { + rb_bug("th_call_super: should not be reached"); + } + + body = rb_method_node(klass, id); /* this returns NODE_METHOD */ + if (body) { + body = body->nd_body; + } + else { + dp(klass); + dpi(id); + rb_bug("th_call_super: not found"); + } + return th_call0(th, klass, recv, id, id, argc, argv, body, nosuper); +} + +static inline VALUE +th_invoke_yield_cfunc(yarv_thread_t *th, yarv_block_t *block, + VALUE self, int argc, VALUE *argv) +{ + NODE *ifunc = (NODE *) block->iseq; + VALUE val; + VALUE arg; + + if (argc == 1) { + arg = *argv; + } + else if (argc > 1) { + arg = rb_ary_new4(argc, argv); + } + else { + arg = rb_ary_new(); + } + + push_frame(th, 0, FRAME_MAGIC_IFUNC, + self, (VALUE)block->dfp, + 0, th->cfp->sp, block->lfp, 1); + + val = (*ifunc->nd_cfnc) (arg, ifunc->nd_tval, Qnil); + + th->cfp++; + return val; +} + +static inline int +th_yield_setup_args(yarv_iseq_t *iseq, int argc, VALUE *argv) +{ + int i; + + if (0) { /* for debug */ + int i; + GET_THREAD()->cfp->sp += argc; + for(i=0; i<argc; i++){ + dp(argv[i]); + } + printf(" argc: %d\n", argc); + printf("iseq argc: %d\n", iseq->argc); + printf("iseq rest: %d\n", iseq->arg_rest); + printf("iseq blck: %d\n", iseq->arg_block); + GET_THREAD()->cfp->sp -= argc; + } + + if (iseq->argc == 1 && iseq->arg_rest != -1) { + if (argc > 1) { + argv[0] = rb_ary_new4(argc, argv); + argc = 1; + } + else if (iseq->arg_rest > 0) { + argv[0] = rb_ary_new4(argc, argv); + argc = 1; + } + } + else { + if (argc == 1 && TYPE(argv[0]) == T_ARRAY) {// && iseq->arg_rest == 0) { + VALUE ary = argv[0]; + argc = RARRAY_LEN(ary); + + /* TODO: check overflow */ + for (i=0; i<argc; i++) { + argv[i] = RARRAY_PTR(ary)[i]; + } + } + + if (iseq->arg_rest != 0) { + if (iseq->arg_rest == -1) { + /* */ + } + else { + int rest = iseq->arg_rest - 1; + if (argc <= rest) { + /* param: a, b, c, *r + * args : x, y + * => + * : x, y, nil, [] + */ + for (i=argc; i<rest; i++) { + argv[i] = Qnil; /* initialize */ + } + argv[rest] = rb_ary_new(); + argc = rest + 1; + } + else { + /* param: a, *r + * args : x, y, z + * => + * : x, [y, z] + */ + /* TODO: check overflow */ + argv[rest] = rb_ary_new4(argc - rest, &argv[rest]); + argc = rest + 1; + } + } + } + } + + if (argc > iseq->argc) { + argc = iseq->argc; + } + + return argc; +} + +VALUE +th_invoke_yield(yarv_thread_t *th, int argc, VALUE *argv) +{ + yarv_control_frame_t *cfp = th->cfp; + yarv_block_t *block = GC_GUARDED_PTR_REF(cfp->lfp[0]); + VALUE val; + + if (block == 0) { + th_localjump_error("no block given", Qnil, 0); + } + else { + if (BUILTIN_TYPE(block->iseq) != T_NODE) { + yarv_iseq_t *iseq = block->iseq; + int i; + th_set_finish_env(th); + + /* TODO: check overflow */ + for (i=0; i<argc; i++) { + th->cfp->sp[i] = argv[i]; + } + argc = th_yield_setup_args(iseq, argc, th->cfp->sp); + th->cfp->sp += argc; + + push_frame(th, iseq, FRAME_MAGIC_BLOCK, + block->self, GC_GUARDED_PTR(block->dfp), + iseq->iseq_encoded, th->cfp->sp, block->lfp, + iseq->local_size - argc); + val = th_eval_body(th); + } + else { + val = th_invoke_yield_cfunc(th, block, block->self, argc, argv); + } + } + return val; +} + +VALUE +th_invoke_proc(yarv_thread_t *th, yarv_proc_t *proc, + VALUE self, int argc, VALUE *argv) +{ + VALUE val = Qundef; + int state; + volatile int stored_safe = th->safe_level; + volatile NODE *stored_special_cref_stack = 0; + yarv_control_frame_t * volatile cfp = th->cfp; + + TH_PUSH_TAG(th); + if ((state = EXEC_TAG()) == 0) { + stored_special_cref_stack = + lfp_set_special_cref(proc->block.lfp, proc->special_cref_stack); + th->safe_level = proc->safe_level; + + if (BUILTIN_TYPE(proc->block.iseq) == T_NODE) { + val = th_invoke_yield_cfunc(th, &proc->block, + proc->block.self, argc, argv); + } + else { + yarv_iseq_t *iseq = proc->block.iseq; + yarv_control_frame_t *cfp; + int i; + + th_set_finish_env(th); + cfp = th->cfp; + + /* TODO: check overflow */ + for (i=0; i<argc; i++) { + cfp->sp[i] = argv[i]; + } + argc = th_yield_setup_args(iseq, argc, cfp->sp); + cfp->sp += argc; + + push_frame(th, iseq, + proc->is_lambda ? FRAME_MAGIC_LAMBDA : FRAME_MAGIC_PROC, + self, (VALUE)proc->block.dfp, iseq->iseq_encoded, + cfp->sp, proc->block.lfp, + iseq->local_size - argc); + val = th_eval_body(th); + } + } + else { + if (state == TAG_BREAK || + (state == TAG_RETURN && proc->is_lambda)) { + VALUE err = th->errinfo; + VALUE *escape_dfp = GET_THROWOBJ_CATCH_POINT(err); + VALUE *cdfp = proc->block.dfp; + + if (escape_dfp == cdfp) { + state = 0; + th->errinfo = Qnil; + th->cfp = cfp; + val = GET_THROWOBJ_VAL(err); + } + } + } + TH_POP_TAG(); + + th->safe_level = stored_safe; + lfp_set_special_cref(proc->block.lfp, (NODE*)stored_special_cref_stack); + + if (state) { + JUMP_TAG(state); + } + return val; +} + +static struct RValues * +new_value() +{ + struct RValues *val = RVALUES(rb_newobj()); + OBJSETUP(val, 0, T_VALUES); + val->v1 = val->v2 = val->v3 = Qnil; + return val; +} + +static VALUE * +lfp_svar(VALUE *lfp, int cnt) +{ + struct RValues *val; + yarv_thread_t *th = GET_THREAD(); + + if (th->local_lfp != lfp) { + val = (struct RValues *)lfp[-1]; + if ((VALUE)val == Qnil) { + val = new_value(); + lfp[-1] = (VALUE)val; + } + } + else { + val = (struct RValues *)th->local_svar; + if ((VALUE)val == Qnil) { + val = new_value(); + th->local_svar = (VALUE)val; + } + } + switch (cnt) { + case -1: + return &val->basic.klass; + case 0: + return &val->v1; + case 1: + return &val->v2; + default:{ + VALUE ary; + if ((ary = val->v3) == Qnil) { + ary = val->v3 = rb_ary_new(); + } + if (RARRAY_LEN(ary) <= cnt) { + rb_ary_store(ary, cnt, Qnil); + } + return &RARRAY_PTR(ary)[cnt]; + } + } +} + + +VALUE * +th_cfp_svar(yarv_control_frame_t *cfp, int cnt) +{ + while (cfp->pc == 0) { + cfp++; + } + return lfp_svar(cfp->lfp, cnt); +} + +VALUE * +th_svar(yarv_thread_t *th, int cnt) +{ + yarv_control_frame_t *cfp = th->cfp; + return th_cfp_svar(cfp, cnt); +} + +VALUE * +thread_svar(VALUE self, int cnt) +{ + yarv_thread_t *th; + GetThreadPtr(self, th); + return th_svar(th, cnt); +} + +int +th_get_sourceline(yarv_control_frame_t *cfp) +{ + int line_no = 0; + yarv_iseq_t *iseq = cfp->iseq; + + if (YARV_NORMAL_ISEQ_P(iseq)) { + int i; + int pos = cfp->pc - cfp->iseq->iseq_encoded; + + for (i = 0; i < iseq->insn_info_size; i++) { + if (iseq->insn_info_tbl[i].position == pos) { + line_no = iseq->insn_info_tbl[i - 1].line_no; + goto found; + } + } + line_no = iseq->insn_info_tbl[i - 1].line_no; + } + found: + return line_no; +} + +static VALUE +th_backtrace_each(yarv_thread_t *th, + yarv_control_frame_t *limit_cfp, + yarv_control_frame_t *cfp, + char *file, int line_no, VALUE ary) +{ + VALUE str; + + while (cfp > limit_cfp) { + str = 0; + if (cfp->iseq != 0) { + if (cfp->pc != 0) { + yarv_iseq_t *iseq = cfp->iseq; + + line_no = th_get_sourceline(cfp); + file = RSTRING_PTR(iseq->file_name); + str = rb_sprintf("%s:%d:in `%s'", + file, line_no, RSTRING_PTR(iseq->name)); + rb_ary_push(ary, str); + } + } + else if (cfp->callee_id) { + str = rb_sprintf("%s:%d:in `%s'", + file, line_no, + /* TODO: method_id? callee_id? */ + rb_id2name(cfp->callee_id)); + rb_ary_push(ary, str); + } + cfp = YARV_NEXT_CONTROL_FRAME(cfp); + } + return rb_ary_reverse(ary); +} + +VALUE +th_backtrace(yarv_thread_t *th, int lev) +{ + VALUE ary; + yarv_control_frame_t *cfp = th->cfp; + yarv_control_frame_t *top_of_cfp = (void *)(th->stack + th->stack_size); + top_of_cfp -= 2; + + if (lev < 0) { + /* TODO ?? */ + ary = rb_ary_new(); + } + else { + while (lev-- >= 0) { + cfp++; + if (cfp >= top_of_cfp) { + return Qnil; + } + } + ary = rb_ary_new(); + } + + ary = th_backtrace_each(th, YARV_NEXT_CONTROL_FRAME(cfp), + top_of_cfp, "", 0, ary); + return ary; +} + +VALUE +thread_backtrace(VALUE self, int level) +{ + yarv_thread_t *th; + GetThreadPtr(self, th); + return th_backtrace(th, level); +} + +/* + * vm main loop helper functions + */ + + +static NODE * +lfp_get_special_cref(VALUE *lfp) +{ + struct RValues *values; + if (((VALUE)(values = (void *)lfp[-1])) != Qnil && values->basic.klass) { + return (NODE *)values->basic.klass; + } + else { + return 0; + } +} + +static void +check_svar(void) +{ + yarv_thread_t *th = GET_THREAD(); + yarv_control_frame_t *cfp = th->cfp; + while ((void *)(cfp + 1) < (void *)(th->stack + th->stack_size)) { +// printf("cfp: %p\n", cfp->magic); + if(cfp->lfp) + if(cfp->lfp[-1] != Qnil && + TYPE(cfp->lfp[-1]) != T_VALUES){ +// dp(cfp->lfp[-1]); + rb_bug("!!!illegal svar!!!"); + } + cfp++; + } +} + +static NODE * +lfp_set_special_cref(VALUE *lfp, NODE * cref) +{ + struct RValues *values = (void *) lfp[-1]; + VALUE *pv; + NODE *old_cref; + + if (VM_DEBUG) { + check_svar(); + } + + if (cref == 0 && ((VALUE)values == Qnil || values->basic.klass == 0)) { + old_cref = 0; + } + else { + pv = lfp_svar(lfp, -1); + old_cref = (NODE *) * pv; + *pv = (VALUE)cref; + } + return old_cref; +} + +NODE * +th_set_special_cref(yarv_thread_t *th, VALUE *lfp, NODE * cref_stack) +{ + return lfp_set_special_cref(lfp, cref_stack); +} + +void +debug_cref(NODE *cref) +{ + while (cref) { + dp(cref->nd_clss); + printf("%ld\n", cref->nd_visi); + cref = cref->nd_next; + } +} + +static NODE * +get_cref(yarv_iseq_t *iseq, VALUE *lfp) +{ + NODE *cref; + if ((cref = lfp_get_special_cref(lfp)) != 0) { + /* */ + } + else if ((cref = iseq->cref_stack) != 0) { + /* */ + } + else { + rb_bug("get_cref: unreachable"); + } + return cref; +} + +NODE * +th_get_cref(yarv_thread_t *th, yarv_iseq_t *iseq, yarv_control_frame_t *cfp) +{ + return get_cref(iseq, cfp->lfp); +} + +NODE * +th_cref_push(yarv_thread_t *th, VALUE klass, int noex) +{ + NODE *cref = NEW_BLOCK(klass); + yarv_control_frame_t *cfp = th_get_ruby_level_cfp(th, th->cfp); + + cref->nd_file = 0; + cref->nd_next = get_cref(cfp->iseq, cfp->lfp); + cref->nd_visi = noex; + return cref; +} + +VALUE +th_get_cbase(yarv_thread_t *th) +{ + yarv_control_frame_t *cfp = th_get_ruby_level_cfp(th, th->cfp); + NODE *cref = get_cref(cfp->iseq, cfp->lfp); + VALUE klass = Qundef; + + while (cref) { + if ((klass = cref->nd_clss) != 0) { + break; + } + cref = cref->nd_next; + } + return klass; +} + +EVALBODY_HELPER_FUNCTION VALUE +eval_get_ev_const(yarv_thread_t *th, yarv_iseq_t *iseq, + VALUE klass, ID id, int is_defined) +{ + VALUE val; + + if (klass == Qnil) { + /* in current lexical scope */ + NODE *root_cref = get_cref(iseq, th->cfp->lfp); + NODE *cref = root_cref; + + while (cref && cref->nd_next) { + klass = cref->nd_clss; + cref = cref->nd_next; + + if (klass == 0) { + continue; + } + if (NIL_P(klass)) { + if (is_defined) { + /* TODO: check */ + return 1; + } + else { + klass = CLASS_OF(th->cfp->self); + return rb_const_get(klass, id); + } + } + search_continue: + if (RCLASS(klass)->iv_tbl && + st_lookup(RCLASS(klass)->iv_tbl, id, &val)) { + if (val == Qundef) { + rb_autoload_load(klass, id); + goto search_continue; + } + else { + if (is_defined) { + return 1; + } + else { + return val; + } + } + } + } + klass = root_cref->nd_clss; + if (is_defined) { + return rb_const_defined(klass, id); + } + else { + return rb_const_get(klass, id); + } + } + else { + switch (TYPE(klass)) { + case T_CLASS: + case T_MODULE: + break; + default: + rb_raise(rb_eTypeError, "%s is not a class/module", + RSTRING_PTR(rb_obj_as_string(klass))); + } + if (is_defined) { + return rb_const_defined(klass, id); + } + else { + return rb_const_get(klass, id); + } + } +} + +EVALBODY_HELPER_FUNCTION VALUE +eval_get_cvar_base(yarv_thread_t *th, yarv_iseq_t *iseq) +{ + NODE *cref = get_cref(iseq, th->cfp->lfp); + VALUE klass = Qnil; + + while (cref) { + klass = cref->nd_clss; + cref = cref->nd_next; + + if (cref == 0) { + continue; + } + + if (NIL_P(klass) || FL_TEST(klass, FL_SINGLETON)) { + if (cref->nd_next == 0) { + rb_warn + ("class variable access from toplevel singleton method"); + } + continue; + } + break; + } + if (NIL_P(klass)) { + rb_raise(rb_eTypeError, "no class variables available"); + } + return klass; +} + +EVALBODY_HELPER_FUNCTION void +eval_define_method(yarv_thread_t *th, VALUE obj, + ID id, yarv_iseq_t *miseq, num_t is_singleton, NODE *cref) +{ + NODE *newbody; + int noex = cref->nd_visi; + VALUE klass = cref->nd_clss; + + if (is_singleton) { + if (FIXNUM_P(obj) || SYMBOL_P(obj)) { + rb_raise(rb_eTypeError, + "can't define singleton method \"%s\" for %s", + rb_id2name(id), rb_obj_classname(obj)); + } + + if (OBJ_FROZEN(obj)) { + rb_error_frozen("object"); + } + + klass = rb_singleton_class(obj); + noex = NOEX_PUBLIC; + } + + /* dup */ + COPY_CREF(miseq->cref_stack, cref); + miseq->klass = klass; + miseq->defined_method_id = id; + newbody = NEW_NODE(YARV_METHOD_NODE, 0, miseq->self, 0); + rb_add_method(klass, id, newbody, noex); + + if (!is_singleton && noex == NOEX_MODFUNC) { + rb_add_method(rb_singleton_class(klass), id, newbody, NOEX_PUBLIC); + } + INC_VM_STATE_VERSION(); +} + +EVALBODY_HELPER_FUNCTION VALUE +eval_search_super_klass(VALUE klass, VALUE recv) +{ + if (BUILTIN_TYPE(klass) == T_CLASS) { + klass = RCLASS(klass)->super; + } + else if (BUILTIN_TYPE(klass) == T_MODULE) { + VALUE k = CLASS_OF(recv); + while (k) { + if (BUILTIN_TYPE(k) == T_ICLASS && RBASIC(k)->klass == klass) { + klass = RCLASS(k)->super; + break; + } + k = RCLASS(k)->super; + } + } + return klass; +} + +EVALBODY_HELPER_FUNCTION VALUE +eval_method_missing(yarv_thread_t *th, ID id, VALUE recv, int num, + yarv_block_t *blockptr, int opt) +{ + yarv_control_frame_t *reg_cfp = th->cfp; + VALUE *argv = STACK_ADDR_FROM_TOP(num + 1); + VALUE val; + argv[0] = ID2SYM(id); + th->method_missing_reason = opt; + th->passed_block = blockptr; + val = rb_funcall2(recv, idMethodMissing, num + 1, argv); + POPN(num + 1); + return val; +} + +EVALBODY_HELPER_FUNCTION NODE * +eval_method_search(VALUE id, VALUE klass, IC ic) +{ + NODE *mn; + +#if OPT_INLINE_METHOD_CACHE + { + if (LIKELY(klass == ic->ic_klass) && + LIKELY(GET_VM_STATE_VERSION() == ic->ic_vmstat)) { + mn = ic->ic_method; + } + else { + mn = rb_method_node(klass, id); + ic->ic_klass = klass; + ic->ic_method = mn; + ic->ic_vmstat = GET_VM_STATE_VERSION(); + } + } +#else + mn = rb_method_node(klass, id); +#endif + return mn; +} + +static void +call_yarv_end_proc(VALUE data) +{ + rb_proc_call(data, rb_ary_new2(0)); +} + +/*********************************************************/ +/*********************************************************/ + +static VALUE +make_localjump_error(const char *mesg, VALUE value, int reason) +{ + VALUE exc = + rb_exc_new2(rb_const_get(rb_cObject, rb_intern("LocalJumpError")), + mesg); + ID id; + + switch (reason) { + case TAG_BREAK: + id = rb_intern("break"); + break; + case TAG_REDO: + id = rb_intern("redo"); + break; + case TAG_RETRY: + id = rb_intern("retry"); + break; + case TAG_NEXT: + id = rb_intern("next"); + break; + case TAG_RETURN: + id = rb_intern("return"); + break; + default: + id = rb_intern("noreason"); + break; + } + rb_iv_set(exc, "@exit_value", value); + rb_iv_set(exc, "@reason", ID2SYM(id)); + return exc; +} + +void +th_localjump_error(const char *mesg, VALUE value, int reason) +{ + VALUE exc = make_localjump_error(mesg, value, reason); + rb_exc_raise(exc); +} + +VALUE +th_make_jump_tag_but_local_jump(int state, VALUE val) +{ + VALUE result = Qnil; + + if (val == Qundef) + val = GET_THREAD()->tag->retval; + switch (state) { + case 0: + break; + case TAG_RETURN: + result = make_localjump_error("unexpected return", val, state); + break; + case TAG_BREAK: + result = make_localjump_error("unexpected break", val, state); + break; + case TAG_NEXT: + result = make_localjump_error("unexpected next", val, state); + break; + case TAG_REDO: + result = make_localjump_error("unexpected redo", Qnil, state); + break; + case TAG_RETRY: + result = make_localjump_error("retry outside of rescue clause", Qnil, state); + break; + default: + break; + } + return result; +} + +void +th_jump_tag_but_local_jump(int state, VALUE val) +{ + VALUE exc = th_make_jump_tag_but_local_jump(state, val); + if (val != Qnil) { + rb_exc_raise(exc); + } + JUMP_TAG(state); +} + +void +th_iter_break(yarv_thread_t *th) +{ + yarv_control_frame_t *cfp = th->cfp; + VALUE *dfp = GC_GUARDED_PTR_REF(*cfp->dfp); + + th->state = TAG_BREAK; + th->errinfo = (VALUE)NEW_THROW_OBJECT(Qnil, (VALUE)dfp, TAG_BREAK); + TH_JUMP_TAG(th, TAG_BREAK); +} + +static VALUE yarv_redefined_flag = 0; +static st_table *yarv_opt_method_table = 0; + +void +yarv_check_redefinition_opt_method(NODE *node) +{ + VALUE bop; + + if (st_lookup(yarv_opt_method_table, (st_data_t)node, &bop)) { + yarv_redefined_flag |= bop; + } +} + +static void +add_opt_method(VALUE klass, ID mid, VALUE bop) +{ + NODE *node; + if (st_lookup(RCLASS(klass)->m_tbl, mid, (void *)&node) && + nd_type(node->nd_body->nd_body) == NODE_CFUNC) { + st_insert(yarv_opt_method_table, (st_data_t)node, (st_data_t)bop); + } + else { + rb_bug("undefined optimized method", mid); + } +} + +void +yarv_init_redefined_flag() +{ + VALUE register_info[] = { + idPLUS, BOP_PLUS, rb_cFixnum, rb_cFloat, rb_cString, rb_cArray, 0, + idMINUS, BOP_MINUS, rb_cFixnum, 0, + idMULT, BOP_MULT, rb_cFixnum, rb_cFloat, 0, + idDIV, BOP_DIV, rb_cFixnum, rb_cFloat, 0, + idMOD, BOP_MOD, rb_cFixnum, rb_cFloat, 0, + idEq, BOP_EQ, rb_cFixnum, rb_cFloat, rb_cString, 0, + idLT, BOP_LT, rb_cFixnum, 0, + idLE, BOP_LE, rb_cFixnum, 0, + idLTLT, BOP_LTLT, rb_cString, rb_cArray, 0, + idAREF, BOP_AREF, rb_cArray, rb_cHash, 0, + idASET, BOP_ASET, rb_cArray, rb_cHash, 0, + idLength, BOP_LENGTH, rb_cArray, rb_cString, rb_cHash, 0, + idSucc, BOP_SUCC, rb_cFixnum, rb_cString, rb_cTime, 0, + 0, + }; + VALUE *ptr = register_info; + yarv_opt_method_table = st_init_numtable(); + + while (*ptr) { + ID mid = *ptr++; + VALUE bop = *ptr++; + while(*ptr) { + VALUE klass = *ptr++; + add_opt_method(klass, mid, bop); + } + ptr++; + } +} + +#include "vm_evalbody.ci" + +/* finish + VMe (h1) finish + VM finish F1 F2 + func finish F1 F2 C1 + rb_funcall finish F1 F2 C1 + VMe finish F1 F2 C1 + VM finish F1 F2 C1 F3 + + F1 - F3 : pushed by VM + C1 : pushed by send insn (CFUNC) + + struct CONTROL_FRAME { + VALUE *pc; // cfp[0] + VALUE *sp; // cfp[1] + VALUE *bp; // cfp[2] + yarv_iseq_t *iseq; // cfp[3] + VALUE magic; // cfp[4] + VALUE self; // cfp[5] + VALUE *lfp; // cfp[6] + VALUE *dfp; // cfp[7] + yarv_iseq_t * block_iseq; // cfp[8] + VALUE proc; // cfp[9] always 0 + }; + + struct BLOCK { + VALUE self; + VALUE *lfp; + VALUE *dfp; + yarv_iseq_t *block_iseq; + }; + + struct PROC { + VALUE proc_sig = 0; + struct BLOCK; + }; + + struct METHOD_CONTROL_FRAME { + struct CONTROL_FRAME; + }; + + struct METHOD_FRAME { + VALUE arg0; + ... + VALUE argM; + VALUE param0; + ... + VALUE paramN; + VALUE special; // lfp [1] + struct block_object *block_ptr | 0x01; // lfp [0] + }; + + struct BLOCK_CONTROL_FRAME { + struct STACK_FRAME; + }; + + struct BLOCK_FRAME { + VALUE arg0; + ... + VALUE argM; + VALUE param0; + ... + VALUE paramN; + VALUE *(prev_ptr | 0x01); // DFP[0] + }; + + struct CLASS_CONTROL_FRAME { + struct STACK_FRAME; + }; + + struct CLASS_FRAME { + VALUE param0; + ... + VALUE paramN; + VALUE prev_dfp; // for frame jump + }; + + struct C_METHOD_CONTROL_FRAME { + VALUE *pc; // 0 + VALUE *sp; // stack pointer + VALUE *bp; // base pointer (used in exception) + yarv_iseq_t *iseq; // cmi + VALUE magic; // C_METHOD_FRAME + VALUE self; // ? + VALUE *lfp; // lfp + VALUE *dfp; // == lfp + yarv_iseq_t * block_iseq; // + VALUE proc; // always 0 + }; + + struct C_BLOCK_CONTROL_FRAME { + VALUE *pc; // point only "finish" insn + VALUE *sp; // sp + yarv_iseq_t *iseq; // ? + VALUE magic; // C_METHOD_FRAME + VALUE self; // needed? + VALUE *lfp; // lfp + VALUE *dfp; // lfp + yarv_iseq_t * block_iseq; // 0 + }; + + struct C_METHDO_FRAME{ + VALUE block_ptr; + VALUE special; + }; + */ + + +VALUE +th_eval_body(yarv_thread_t *th) +{ + int state; + VALUE result, err; + VALUE initial = 0; + + TH_PUSH_TAG(th); + if ((state = EXEC_TAG()) == 0) { + vm_loop_start: + result = th_eval(th, initial); + if ((state = th->state) != 0) { + err = result; + th->state = 0; + goto exception_handler; + } + } + else { + int i; + struct catch_table_entry *entry; + unsigned long epc, cont_pc, cont_sp; + VALUE catch_iseqval; + yarv_control_frame_t *cfp; + VALUE *escape_dfp = NULL; + VALUE type; + + err = th->errinfo; + + if (state == TAG_RAISE) { + rb_ivar_set(err, idThrowState, INT2FIX(state)); + } + + exception_handler: + cont_pc = cont_sp = catch_iseqval = 0; + + while (th->cfp->pc == 0 || th->cfp->iseq == 0) { + th->cfp++; + } + + cfp = th->cfp; + epc = cfp->pc - cfp->iseq->iseq_encoded; + + if (state == TAG_BREAK || state == TAG_RETURN) { + escape_dfp = GET_THROWOBJ_CATCH_POINT(err); + + if (cfp->dfp == escape_dfp) { + if (state == TAG_RETURN) { + if ((cfp + 1)->pc != &yarv_finish_insn_seq[0]) { + SET_THROWOBJ_CATCH_POINT(err, (VALUE)(cfp + 1)->dfp); + SET_THROWOBJ_STATE(err, state = TAG_BREAK); + } + else { + result = GET_THROWOBJ_VAL(err); + th->errinfo = Qnil; + th->cfp += 2; + goto finish_vme; + } + /* through */ + } + else { + /* TAG_BREAK */ +#if OPT_STACK_CACHING + initial = (GET_THROWOBJ_VAL(err)); +#else + *th->cfp->sp++ = (GET_THROWOBJ_VAL(err)); +#endif + th->errinfo = Qnil; + goto vm_loop_start; + } + } + } + + if (state == TAG_RAISE) { + for (i = 0; i < cfp->iseq->catch_table_size; i++) { + entry = &cfp->iseq->catch_table[i]; + if (entry->start < epc && entry->end >= epc) { + + if (entry->type == CATCH_TYPE_RESCUE || + entry->type == CATCH_TYPE_ENSURE) { + catch_iseqval = entry->iseq; + cont_pc = entry->cont; + cont_sp = entry->sp; + break; + } + } + } + } + else if (state == TAG_RETRY) { + for (i = 0; i < cfp->iseq->catch_table_size; i++) { + entry = &cfp->iseq->catch_table[i]; + if (entry->start < epc && entry->end >= epc) { + + if (entry->type == CATCH_TYPE_ENSURE) { + catch_iseqval = entry->iseq; + cont_pc = entry->cont; + cont_sp = entry->sp; + break; + } + else if (entry->type == CATCH_TYPE_RETRY) { + VALUE *escape_dfp; + escape_dfp = GET_THROWOBJ_CATCH_POINT(err); + if (cfp->dfp == escape_dfp) { + cfp->pc = cfp->iseq->iseq_encoded + entry->cont; + th->errinfo = Qnil; + goto vm_loop_start; + } + } + } + } + } + else if (state == TAG_BREAK && ((VALUE)escape_dfp & ~0x03) == 0) { + type = CATCH_TYPE_BREAK; + + search_restart_point: + for (i = 0; i < cfp->iseq->catch_table_size; i++) { + entry = &cfp->iseq->catch_table[i]; + + if (entry->start < epc && entry->end >= epc) { + if (entry->type == CATCH_TYPE_ENSURE) { + catch_iseqval = entry->iseq; + cont_pc = entry->cont; + cont_sp = entry->sp; + break; + } + else if (entry->type == type) { + cfp->pc = cfp->iseq->iseq_encoded + entry->cont; + cfp->sp = cfp->bp + entry->sp; + + if (!(state == TAG_REDO) && + !(state == TAG_NEXT && !escape_dfp) && + !(state == TAG_BREAK && !escape_dfp)) { +#if OPT_STACK_CACHING + initial = (GET_THROWOBJ_VAL(err)); +#else + *th->cfp->sp++ = (GET_THROWOBJ_VAL(err)); +#endif + } + th->errinfo = Qnil; + goto vm_loop_start; + } + } + } + } + else if (state == TAG_REDO) { + type = CATCH_TYPE_REDO; + escape_dfp = GET_THROWOBJ_CATCH_POINT(err); + goto search_restart_point; + } + else if (state == TAG_NEXT) { + type = CATCH_TYPE_NEXT; + escape_dfp = GET_THROWOBJ_CATCH_POINT(err); + goto search_restart_point; + } + else { + for (i = 0; i < cfp->iseq->catch_table_size; i++) { + entry = &cfp->iseq->catch_table[i]; + if (entry->start < epc && entry->end >= epc) { + + if (entry->type == CATCH_TYPE_ENSURE) { + catch_iseqval = entry->iseq; + cont_pc = entry->cont; + cont_sp = entry->sp; + break; + } + } + } + } + + if (catch_iseqval != 0) { + /* found catch table */ + yarv_iseq_t *catch_iseq; + + /* enter catch scope */ + GetISeqPtr(catch_iseqval, catch_iseq); + cfp->sp = cfp->bp + cont_sp; + cfp->pc = cfp->iseq->iseq_encoded + cont_pc; + + /* push block frame */ + cfp->sp[0] = err; + push_frame(th, catch_iseq, FRAME_MAGIC_BLOCK, + cfp->self, (VALUE)cfp->dfp, catch_iseq->iseq_encoded, + cfp->sp + 1, cfp->lfp, catch_iseq->local_size - 1); + + state = 0; + th->errinfo = Qnil; + goto vm_loop_start; + } + else { + th->cfp++; + if (th->cfp->pc != &yarv_finish_insn_seq[0]) { + goto exception_handler; + } + else { + pop_frame(th); + th->errinfo = err; + TH_POP_TAG2(); + JUMP_TAG(state); + } + } + } + finish_vme: + TH_POP_TAG(); + return result; +} @@ -0,0 +1,293 @@ +/********************************************************************** + + vm.h - + + $Author$ + $Date$ + created at: 04/01/01 16:56:59 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifndef _VM_H_INCLUDED_ +#define _VM_H_INCLUDED_ + +#include "version.h" + +#if YARVDEBUG > VMDEBUG +#undef VMDEBUG +#define VMDEBUG YARVDEBUG +#endif + +typedef long OFFSET; + +/** + * VM Debug Level + * + * debug level: + * 0: no debug output + * 1: show instruction name + * 2: + * 3: show stack status + * 4: show register + * 5: + * 10: gc check + */ + +//#define VMDEBUG 1 +//#define VMDEBUG 5 + +#if 0 +#undef VMDEBUG +#define VMDEBUG 3 +#endif + +// #define COLLECT_USAGE_ANALYSIS + +#ifdef COLLECT_USAGE_ANALYSIS +#define USAGE_ANALYSIS_INSN(insn) vm_analysis_insn(insn) +#define USAGE_ANALYSIS_OPERAND(insn, n, op) vm_analysis_operand(insn, n, (VALUE)op) +#define USAGE_ANALYSIS_REGISTER(reg, s) vm_analysis_register(reg, s) +#else +#define USAGE_ANALYSIS_INSN(insn) /* none */ +#define USAGE_ANALYSIS_OPERAND(insn, n, op) /* none */ +#define USAGE_ANALYSIS_REGISTER(reg, s) /* none */ +#endif + +#ifdef __GCC__ +/* TODO: machine dependent prefetch instruction */ +#define PREFETCH(pc) +#else +#define PREFETCH(pc) +#endif + +#if VMDEBUG > 0 +#define debugs printf +#define DEBUG_ENTER_INSN(insn) \ + debug_print_pre(th, GET_CFP()); + +#if OPT_STACK_CACHING +#define SC_REGS() , reg_a, reg_b +#else +#define SC_REGS() +#endif + +#define DEBUG_END_INSN() \ + debug_print_post(th, GET_CFP() SC_REGS()); + +#else + +#define debugs +#define DEBUG_ENTER_INSN(insn) +#define DEBUG_END_INSN() +#endif + +#define throwdebug if(0)printf +//#define throwdebug printf + +#define SDR2(cfp) vm_stack_dump_raw(GET_THREAD(), (cfp)) + + +/************************************************/ +#if DISPATCH_XXX +error ! +/************************************************/ +#elif OPT_CALL_THREADED_CODE + +#if __GCC__ +#define FASTCALL __attribute__ ((fastcall)) +#else +#define FASTCALL +#endif + + +#define LABEL(x) insn_func_##x +#define ELABEL(x) +#define LABEL_PTR(x) &LABEL(x) + +typedef yarv_control_frame_t * + (*insn_func_type) (yarv_thread_t *, yarv_control_frame_t *)FASTCALL; + +#define INSN_ENTRY(insn) \ + yarv_control_frame_t * \ + LABEL(insn)(yarv_thread_t *th, yarv_control_frame_t *reg_cfp) FASTCALL { + +#define END_INSN(insn) return reg_cfp;} + +#define NEXT_INSN() return reg_cfp; + +/************************************************/ +#elif OPT_TOKEN_THREADED_CODE || OPT_DIRECT_THREADED_CODE +/* threaded code with gcc */ + +#define LABEL(x) INSN_LABEL_##x +#define ELABEL(x) INSN_ELABEL_##x +#define LABEL_PTR(x) &&LABEL(x) + +#define INSN_ENTRY_SIG(insn) \ + asm volatile ( "; #**************************************************\n" \ + "\t; #[start] " # insn "\n") \ + + +#define INSN_DISPATCH_SIG(insn) \ + asm volatile ( "; #[end ] " # insn "\n"\ + "\t; #==================================================\n") \ + +#define INSN_ENTRY(insn) \ + LABEL(insn): \ + INSN_ENTRY_SIG(insn); \ + +/* dispather */ +#if __GNUC__ && (__i386__ || __x86_64__) && __GNUC__ == 3 +#define DISPATCH_ARCH_DEPEND_WAY(addr) \ + asm volatile("jmp *%0;\t# -- inseted by vm.h\t[length = 2]" : : "r" (addr)) + +#else +#define DISPATCH_ARCH_DEPEND_WAY(addr) \ + /* do nothing */ + +#endif + + +/**********************************/ +#if OPT_DIRECT_THREADED_CODE + +/* for GCC 3.4.x */ +#define TC_DISPATCH(insn) \ + DISPATCH_ARCH_DEPEND_WAY(GET_CURRENT_INSN()); \ + INSN_DISPATCH_SIG(insn); \ + goto *GET_CURRENT_INSN(); \ + ; + +#else +/* token threade code */ + +#define TC_DISPATCH(insn) \ + DISPATCH_ARCH_DEPEND_WAY(insns_address_table[GET_CURRENT_INSN()]); \ + INSN_DISPATCH_SIG(insn); \ + goto *insns_address_table[GET_CURRENT_INSN()]; \ + rb_bug("tc error"); + + +#endif /* DISPATCH_DIRECT_THREADED_CODE */ + +#define END_INSN(insn) \ + GC_CHECK(); \ + DEBUG_END_INSN(); \ + TC_DISPATCH(insn); \ + +#define INSN_DISPATCH() \ + TC_DISPATCH(__START__) \ + { + +#define END_INSNS_DISPATCH() \ + rb_bug("unknown insn: %ld", GET_CURRENT_INSN()); \ + } /* end of while loop */ \ + +#define NEXT_INSN() TC_DISPATCH(__NEXT_INSN__) + +/************************************************/ +#else /* no threaded code */ +/* most common method */ + +#define INSN_ENTRY(insn) \ +case BIN(insn): + +#define END_INSN(insn) \ + GC_CHECK(); \ + DEBUG_END_INSN(); \ + break; + + +#define INSN_DISPATCH() \ + while(1){ \ + switch(GET_CURRENT_INSN()){ + +#define END_INSNS_DISPATCH() \ +default: \ + SDR(); \ + rb_bug("unknown insn: %ld", GET_CURRENT_INSN()); \ + } /* end of switch */ \ + } /* end of while loop */ \ + +#define NEXT_INSN() goto first + +#endif + + +/************************************************/ +/************************************************/ + +/* + env{ + env[0] // special (block or prev env) + env[1] // orphan + env[2] // in heap + env[3] // env object + env[4] // prev env val + }; + */ + +#define ENV_VAL(env) ((env)[3]) +#define ENV_IN_HEAP_P(env) ((env)[2] == Qundef) +#define ORPHAN_ENV_P(env) ((env)[1] == Qundef) + +#define ENV_IN_HEAP(env) ((env)[2] = Qundef) +#define ORPHAN_ENV(env) ((env)[1] = Qundef) + +#define FRAME_MAGIC_METHOD 0xfaffff11 +#define FRAME_MAGIC_BLOCK 0xfaffff21 +#define FRAME_MAGIC_CLASS 0xfaffff31 +#define FRAME_MAGIC_TOP 0xfaffff41 +#define FRAME_MAGIC_FINISH 0xfaffff51 +#define FRAME_MAGIC_CFUNC 0xfaffff61 +#define FRAME_MAGIC_PROC 0xfaffff71 +#define FRAME_MAGIC_IFUNC 0xfaffff81 +#define FRAME_MAGIC_EVAL 0xfaffff91 +#define FRAME_MAGIC_LAMBDA 0xfaffffa1 + +#define CHECK_FRAME_MAGIC(magic) \ +{ \ + if((magic & 0xffffff00) != 0xfaffff00){ \ + rb_bug("YARV Stack frame error: %08x", magic); \ + } \ +} + +/* + * Excception + */ + +#define NEW_THROW_OBJECT(val, pt, st) NEW_NODE(NODE_LIT, (val), (pt), (st)) +#define GET_THROWOBJ_VAL(obj) ((VALUE)RNODE((obj))->u1.value) +#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value) +#define GET_THROWOBJ_STATE(obj) ((int)RNODE((obj))->u3.value) + +#define SET_THROWOBJ_CATCH_POINT(obj, val) \ + (RNODE((obj))->u2.value = (val)) +#define SET_THROWOBJ_STATE(obj, val) \ + (RNODE((obj))->u3.value = (val)) + +#define SCREG(r) (reg_##r) + +/* VM state version */ + +#define GET_VM_STATE_VERSION() (yarvGlobalStateVersion) +#define INC_VM_STATE_VERSION() \ + (yarvGlobalStateVersion = (yarvGlobalStateVersion+1) & 0x8fffffff) + +#define BOP_PLUS 0x01 +#define BOP_MINUS 0x02 +#define BOP_MULT 0x04 +#define BOP_DIV 0x08 +#define BOP_MOD 0x10 +#define BOP_EQ 0x20 +#define BOP_LT 0x40 +#define BOP_LE 0x80 +#define BOP_LTLT 0x100 +#define BOP_AREF 0x200 +#define BOP_ASET 0x400 +#define BOP_LENGTH 0x800 +#define BOP_SUCC 0x1000 + +#endif // _VM_H_INCLUDED_ diff --git a/vm_dump.c b/vm_dump.c new file mode 100644 index 0000000000..698bc0edd9 --- /dev/null +++ b/vm_dump.c @@ -0,0 +1,610 @@ +/********************************************************************** + + vm_dump.c - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + + +#include <ruby.h> +#include <node.h> + +#include "yarvcore.h" +#include "vm.h" + +#define MAX_POSBUF 128 + +static void +control_frame_dump(yarv_thread_t *th, yarv_control_frame_t *cfp) +{ + int pc = -1, bp = -1, line = 0; + unsigned int lfp = cfp->lfp - th->stack; + unsigned int dfp = cfp->dfp - th->stack; + char lfp_in_heap = ' ', dfp_in_heap = ' '; + char posbuf[MAX_POSBUF+1]; + + const char *magic, *iseq_name = "-", *selfstr = "-", *biseq_name = "-"; + VALUE tmp; + + if (cfp->block_iseq != 0 && BUILTIN_TYPE(cfp->block_iseq) != T_NODE) { + biseq_name = ""; //RSTRING(cfp->block_iseq->name)->ptr; + } + + if (lfp < 0 || lfp > th->stack_size) { + lfp = (unsigned int)cfp->lfp; + lfp_in_heap = 'p'; + } + if (dfp < 0 || dfp > th->stack_size) { + dfp = (unsigned int)cfp->dfp; + dfp_in_heap = 'p'; + } + if (cfp->bp) { + bp = cfp->bp - th->stack; + } + + switch (cfp->magic) { + case FRAME_MAGIC_TOP: + magic = "TOP"; + break; + case FRAME_MAGIC_METHOD: + magic = "METHOD"; + break; + case FRAME_MAGIC_CLASS: + magic = "CLASS"; + break; + case FRAME_MAGIC_BLOCK: + magic = "BLOCK"; + break; + case FRAME_MAGIC_FINISH: + magic = "FINISH"; + break; + case FRAME_MAGIC_CFUNC: + magic = "CFUNC"; + break; + case FRAME_MAGIC_PROC: + magic = "PROC"; + break; + case FRAME_MAGIC_LAMBDA: + magic = "LAMBDA"; + break; + case FRAME_MAGIC_IFUNC: + magic = "IFUNC"; + break; + case FRAME_MAGIC_EVAL: + magic = "EVAL"; + break; + case 0: + magic = "------"; + break; + default: + magic = "(none)"; + break; + } + + if (0) { + tmp = rb_inspect(cfp->self); + selfstr = StringValueCStr(tmp); + } + else { + selfstr = ""; + } + + if (cfp->iseq != 0) { + if (YARV_IFUNC_P(cfp->iseq)) { + iseq_name = "<ifunc>"; + } + else { + pc = cfp->pc - cfp->iseq->iseq_encoded; + iseq_name = RSTRING_PTR(cfp->iseq->name); + line = th_get_sourceline(cfp); + if (line) { + char fn[MAX_POSBUF+1]; + snprintf(fn, MAX_POSBUF, "%s", RSTRING_PTR(cfp->iseq->file_name)); + snprintf(posbuf, MAX_POSBUF, "%s:%d", fn, line); + } + } + } + else if (cfp->method_id) { + iseq_name = rb_id2name(cfp->method_id); + snprintf(posbuf, MAX_POSBUF, ":%s", rb_id2name(cfp->method_id)); + line = -1; + } + + fprintf(stderr, "c:%04ld ", + (yarv_control_frame_t *)(th->stack + th->stack_size) - cfp); + if (pc == -1) { + fprintf(stderr, "p:---- "); + } + else { + fprintf(stderr, "p:%04d ", pc); + } + fprintf(stderr, "s:%04ld b:%04d ", cfp->sp - th->stack, bp); + fprintf(stderr, lfp_in_heap == ' ' ? "l:%06d " : "l:%06p ", lfp % 10000); + fprintf(stderr, dfp_in_heap == ' ' ? "d:%06d " : "d:%06p ", dfp % 10000); + fprintf(stderr, "%-6s ", magic); + if (line) { + fprintf(stderr, "%s", posbuf); + } + if (0) { + fprintf(stderr, " \t"); + fprintf(stderr, "iseq: %-24s ", iseq_name); + fprintf(stderr, "self: %-24s ", selfstr); + fprintf(stderr, "%-1s ", biseq_name); + } + fprintf(stderr, "\n"); +} + +void +vm_stack_dump_raw(yarv_thread_t *th, yarv_control_frame_t *cfp) +{ + VALUE *sp = cfp->sp, *bp = cfp->bp; + VALUE *lfp = cfp->lfp; + VALUE *dfp = cfp->dfp; + VALUE *p, *st, *t; + + fprintf(stderr, "-- stack frame ------------\n"); + for (p = st = th->stack; p < sp; p++) { + fprintf(stderr, "%04ld (%p): %08lx", p - st, p, *p); + + t = (VALUE *)*p; + if (th->stack <= t && t < sp) { + fprintf(stderr, " (= %ld)", (VALUE *)GC_GUARDED_PTR_REF(t) - th->stack); + } + + if (p == lfp) + fprintf(stderr, " <- lfp"); + if (p == dfp) + fprintf(stderr, " <- dfp"); + if (p == bp) + fprintf(stderr, " <- bp"); /* should not be */ + + fprintf(stderr, "\n"); + } + fprintf(stderr, "-- control frame ----------\n"); + while ((void *)cfp < (void *)(th->stack + th->stack_size)) { + control_frame_dump(th, cfp); + cfp++; + } + fprintf(stderr, "---------------------------\n"); +} + +void +env_dump_raw(yarv_env_t *env, VALUE *lfp, VALUE *dfp) +{ + int i; + fprintf(stderr, "-- env --------------------\n"); + + while (env) { + fprintf(stderr, "--\n"); + for (i = 0; i < env->env_size; i++) { + fprintf(stderr, "%04d: %08lx (%p)", -env->local_size + i, env->env[i], + &env->env[i]); + if (&env->env[i] == lfp) + fprintf(stderr, " <- lfp"); + if (&env->env[i] == dfp) + fprintf(stderr, " <- dfp"); + fprintf(stderr, "\n"); + } + + if (env->prev_envval != 0) { + GetEnvPtr(env->prev_envval, env); + } + else { + env = 0; + } + } + fprintf(stderr, "---------------------------\n"); +} + +void +proc_dump_raw(yarv_proc_t *proc) +{ + yarv_env_t *env; + char *selfstr; + VALUE val = rb_inspect(proc->block.self); + selfstr = StringValueCStr(val); + + fprintf(stderr, "-- proc -------------------\n"); + fprintf(stderr, "self: %s\n", selfstr); + GetEnvPtr(proc->envval, env); + env_dump_raw(env, proc->block.lfp, proc->block.dfp); +} + +void +stack_dump_th(VALUE thval) +{ + yarv_thread_t *th; + GetThreadPtr(thval, th); + vm_stack_dump_raw(th, th->cfp); +} + +void +stack_dump_each(yarv_thread_t *th, yarv_control_frame_t *cfp) +{ + int i; + + VALUE rstr; + VALUE *sp = cfp->sp; + VALUE *lfp = cfp->lfp; + VALUE *dfp = cfp->dfp; + + int argc, local_size; + const char *name; + yarv_iseq_t *iseq = cfp->iseq; + + if (iseq == 0) { + if (cfp->method_id) { + argc = 0; + local_size = 0; + name = rb_id2name(cfp->method_id); + } + else { + name = "?"; + local_size = 0; + } + } + else if (YARV_IFUNC_P(iseq)) { + argc = 0; + local_size = 0; + name = "<ifunc>"; + } + else { + argc = iseq->argc; + local_size = iseq->local_size; + name = RSTRING_PTR(iseq->name); + } + + /* stack trace header */ + + if (cfp->magic == FRAME_MAGIC_METHOD || + cfp->magic == FRAME_MAGIC_TOP || + cfp->magic == FRAME_MAGIC_BLOCK || + cfp->magic == FRAME_MAGIC_CLASS || + cfp->magic == FRAME_MAGIC_PROC || + cfp->magic == FRAME_MAGIC_LAMBDA || + cfp->magic == FRAME_MAGIC_CFUNC || + cfp->magic == FRAME_MAGIC_IFUNC || + cfp->magic == FRAME_MAGIC_EVAL) { + + VALUE *ptr = dfp - local_size; + + stack_dump_each(th, cfp + 1); + control_frame_dump(th, cfp); + + if (lfp != dfp) { + local_size++; + } + for (i = 0; i < argc; i++) { + rstr = rb_inspect(*ptr); + fprintf(stderr, " arg %2d: %8s (%p)\n", i, StringValueCStr(rstr), + ptr++); + } + for (; i < local_size - 1; i++) { + rstr = rb_inspect(*ptr); + fprintf(stderr, " local %2d: %8s (%p)\n", i, StringValueCStr(rstr), + ptr++); + } + + ptr = cfp->bp; + for (; ptr < sp; ptr++, i++) { + if (*ptr == Qundef) { + rstr = rb_str_new2("undef"); + } + else { + rstr = rb_inspect(*ptr); + } + fprintf(stderr, " stack %2d: %8s (%ld)\n", i, StringValueCStr(rstr), + ptr - th->stack); + } + } + else if (cfp->magic == FRAME_MAGIC_FINISH) { + if ((th)->stack + (th)->stack_size > (VALUE *)(cfp + 2)) { + stack_dump_each(th, cfp + 1); + } + else { + // SDR(); + } + } + else { + rb_bug("unsupport frame type: %08lx", cfp->magic); + } +} + + +void +debug_print_register(yarv_thread_t *th) +{ + yarv_control_frame_t *cfp = th->cfp; + int pc = -1; + int lfp = cfp->lfp - th->stack; + int dfp = cfp->dfp - th->stack; + int cfpi; + + if (YARV_NORMAL_ISEQ_P(cfp->iseq)) { + pc = cfp->pc - cfp->iseq->iseq_encoded; + } + + if (lfp < 0 || lfp > th->stack_size) + lfp = -1; + if (dfp < 0 || dfp > th->stack_size) + dfp = -1; + + cfpi = ((yarv_control_frame_t *)(th->stack + th->stack_size)) - cfp; + fprintf(stderr, " [PC] %04d, [SP] %04ld, [LFP] %04d, [DFP] %04d, [CFP] %04d\n", + pc, cfp->sp - th->stack, lfp, dfp, cfpi); +} + +void +thread_dump_regs(VALUE thval) +{ + yarv_thread_t *th; + GetThreadPtr(thval, th); + debug_print_register(th); +} + +void +debug_print_pre(yarv_thread_t *th, yarv_control_frame_t *cfp) +{ + yarv_iseq_t *iseq = cfp->iseq; + + if (iseq != 0 && cfp->magic != FRAME_MAGIC_FINISH) { + VALUE *seq = iseq->iseq; + int pc = cfp->pc - iseq->iseq_encoded; + + iseq_disasm_insn(0, seq, pc, iseq, 0); + } + +#if VMDEBUG > 3 + fprintf(stderr, " (1)"); + debug_print_register(th); +#endif +} + +void +debug_print_post(yarv_thread_t *th, yarv_control_frame_t *cfp +#if OPT_STACK_CACHING + , VALUE reg_a, VALUE reg_b +#endif + ) +{ +#if VMDEBUG > 9 + SDR2(cfp); +#endif + +#if VMDEBUG > 3 + fprintf(stderr, " (2)"); + debug_print_register(th); +#endif + // stack_dump_raw(th, cfp); + +#if VMDEBUG > 2 + // stack_dump_thobj(th); + stack_dump_each(th, th->cfp); +#if OPT_STACK_CACHING + { + VALUE rstr; + rstr = rb_inspect(reg_a); + fprintf(stderr, " sc reg A: %s\n", StringValueCStr(rstr)); + rstr = rb_inspect(reg_b); + fprintf(stderr, " sc reg B: %s\n", StringValueCStr(rstr)); + } +#endif + printf + ("--------------------------------------------------------------\n"); +#endif + +#if VMDEBUG > 9 + GC_CHECK(); +#endif +} + +#ifdef COLLECT_USAGE_ANALYSIS +/* uh = { + * insn(Fixnum) => ihash(Hash) + * } + * ihash = { + * -1(Fixnum) => count, # insn usage + * 0(Fixnum) => ophash, # operand usage + * } + * ophash = { + * val(interned string) => count(Fixnum) + * } + */ +void +vm_analysis_insn(int insn) +{ + static ID usage_hash; + static ID bigram_hash; + static int prev_insn = -1; + + VALUE uh; + VALUE ihash; + VALUE cv; + + SET_YARV_STOP(); + + if (usage_hash == 0) { + usage_hash = rb_intern("USAGE_ANALISYS_INSN"); + bigram_hash = rb_intern("USAGE_ANALISYS_INSN_BIGRAM"); + } + uh = rb_const_get(mYarvCore, usage_hash); + if ((ihash = rb_hash_aref(uh, INT2FIX(insn))) == Qnil) { + ihash = rb_hash_new(); + rb_hash_aset(uh, INT2FIX(insn), ihash); + } + if ((cv = rb_hash_aref(ihash, INT2FIX(-1))) == Qnil) { + cv = INT2FIX(0); + } + rb_hash_aset(ihash, INT2FIX(-1), INT2FIX(FIX2INT(cv) + 1)); + + /* calc bigram */ + if (prev_insn != -1) { + VALUE bi; + VALUE ary[2]; + VALUE cv; + + ary[0] = INT2FIX(prev_insn); + ary[1] = INT2FIX(insn); + bi = rb_ary_new4(2, &ary[0]); + + uh = rb_const_get(mYarvCore, bigram_hash); + if ((cv = rb_hash_aref(uh, bi)) == Qnil) { + cv = INT2FIX(0); + } + rb_hash_aset(uh, bi, INT2FIX(FIX2INT(cv) + 1)); + } + prev_insn = insn; + + SET_YARV_START(); +} + +/* from disasm.c */ +extern VALUE insn_operand_intern(int insn, int op_no, VALUE op, + int len, int pos, VALUE child); + +void +vm_analysis_operand(int insn, int n, VALUE op) +{ + static ID usage_hash; + + VALUE uh; + VALUE ihash; + VALUE ophash; + VALUE valstr; + VALUE cv; + + SET_YARV_STOP(); + + if (usage_hash == 0) { + usage_hash = rb_intern("USAGE_ANALISYS_INSN"); + } + + uh = rb_const_get(mYarvCore, usage_hash); + if ((ihash = rb_hash_aref(uh, INT2FIX(insn))) == Qnil) { + ihash = rb_hash_new(); + rb_hash_aset(uh, INT2FIX(insn), ihash); + } + if ((ophash = rb_hash_aref(ihash, INT2FIX(n))) == Qnil) { + ophash = rb_hash_new(); + rb_hash_aset(ihash, INT2FIX(n), ophash); + } + /* intern */ + valstr = insn_operand_intern(insn, n, op, 0, 0, 0); + + /* set count */ + if ((cv = rb_hash_aref(ophash, valstr)) == Qnil) { + cv = INT2FIX(0); + } + rb_hash_aset(ophash, valstr, INT2FIX(FIX2INT(cv) + 1)); + + SET_YARV_START(); +} + +void +vm_analysis_register(int reg, int isset) +{ + static ID usage_hash; + VALUE uh; + VALUE rhash; + VALUE valstr; + char *regstrs[] = { + "pc", // 0 + "sp", // 1 + "cfp", // 2 + "lfp", // 3 + "dfp", // 4 + "self", // 5 + "iseq", // 6 + }; + char *getsetstr[] = { + "get", + "set", + }; + static VALUE syms[sizeof(regstrs) / sizeof(regstrs[0])][2]; + + VALUE cv; + + SET_YARV_STOP(); + + if (usage_hash == 0) { + char buff[0x10]; + int i; + + usage_hash = rb_intern("USAGE_ANALISYS_REGS"); + + for (i = 0; i < sizeof(regstrs) / sizeof(regstrs[0]); i++) { + int j; + for (j = 0; j < 2; j++) { + snfprintf(stderr, buff, 0x10, "%d %s %-4s", i, getsetstr[j], + regstrs[i]); + syms[i][j] = ID2SYM(rb_intern(buff)); + } + } + } + valstr = syms[reg][isset]; + + uh = rb_const_get(mYarvCore, usage_hash); + if ((cv = rb_hash_aref(uh, valstr)) == Qnil) { + cv = INT2FIX(0); + } + rb_hash_aset(uh, valstr, INT2FIX(FIX2INT(cv) + 1)); + + SET_YARV_START(); +} + + +#endif + + +VALUE +thread_dump_state(VALUE self) +{ + yarv_thread_t *th; + yarv_control_frame_t *cfp; + GetThreadPtr(self, th); + cfp = th->cfp; + + fprintf(stderr, "Thread state dump:\n"); + fprintf(stderr, "pc : %p, sp : %p\n", cfp->pc, cfp->sp); + fprintf(stderr, "cfp: %p, lfp: %p, dfp: %p\n", cfp, cfp->lfp, cfp->dfp); + + return Qnil; +} + +void +yarv_bug() +{ + yarv_thread_t *th = GET_THREAD(); + VALUE bt; + + if (GET_THREAD()->vm) { + int i; + SDR(); + + bt = th_backtrace(th, 0); + if (TYPE(bt) == T_ARRAY) + for (i = 0; i < RARRAY_LEN(bt); i++) { + dp(RARRAY_PTR(bt)[i]); + } + } + +#if HAVE_BACKTRACE +#include <execinfo.h> +#define MAX_NATIVE_TRACE 1024 + { + static void *trace[MAX_NATIVE_TRACE]; + int n = backtrace(trace, MAX_NATIVE_TRACE); + int i; + + fprintf(stderr, "-- backtrace of native function call (Use addr2line) --\n"); + for (i=0; i<n; i++) { + fprintf(stderr, "%p\n", trace[i]); + } + fprintf(stderr, "-------------------------------------------------------\n"); + } +#endif +} diff --git a/vm_evalbody.ci b/vm_evalbody.ci new file mode 100644 index 0000000000..fb86ecb0b8 --- /dev/null +++ b/vm_evalbody.ci @@ -0,0 +1,140 @@ +/* -*-c-*- */ +/********************************************************************** + + vm_evalbody.ci - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#include <math.h> + +#if VMDEBUG > 0 +#define DECL_SC_REG(type, r, reg) register type reg_##r + +#elif __GNUC__ && __x86_64 +#define DECL_SC_REG(type, r, reg) register type reg_##r asm("r" reg) + +#elif __GNUC__ && __i386__ +#define DECL_SC_REG(type, r, reg) register type reg_##r asm("e" reg) + +#else +#define DECL_SC_REG(type, r, reg) register type reg_##r +#endif +// #define DECL_SC_REG(r, reg) VALUE reg_##r + +typedef yarv_iseq_t *ISEQ; + +#if !OPT_CALL_THREADED_CODE +VALUE +th_eval(yarv_thread_t *th, VALUE initial) +{ + +#if OPT_STACK_CACHING +#if 0 +#elif __GNUC__ && __x86_64 + DECL_SC_REG(VALUE, a, "12"); + DECL_SC_REG(VALUE, b, "13"); +#else + register VALUE reg_a; + register VALUE reg_b; +#endif +#endif + +#if __GNUC__ && __i386__ + DECL_SC_REG(VALUE *, pc, "di"); + DECL_SC_REG(yarv_control_frame_t *, cfp, "si"); +#define USE_MACHINE_REGS 1 + +#elif __GNUC__ && __x86_64__ + DECL_SC_REG(VALUE *, pc, "14"); + DECL_SC_REG(yarv_control_frame_t *, cfp, "15"); +#define USE_MACHINE_REGS 1 + +#else + register yarv_control_frame_t *reg_cfp; + VALUE *reg_pc; +#endif + +#if USE_MACHINE_REGS + +#undef RESTORE_REGS +#define RESTORE_REGS() \ +{ \ + REG_CFP = th->cfp; \ + reg_pc = reg_cfp->pc; \ +} + +#undef REG_PC +#define REG_PC reg_pc +#undef GET_PC +#define GET_PC() (reg_pc) +#undef SET_PC +#define SET_PC(x) (reg_cfp->pc = REG_PC = (x)) +#endif + + ID tmp_id; + yarv_block_t *tmp_blockptr; + num_t tmp_num; + +#if OPT_TOKEN_THREADED_CODE || OPT_DIRECT_THREADED_CODE +#include "vmtc.inc" + if (th == 0) { +#if OPT_STACK_CACHING + yarv_finish_insn_seq[0] = (VALUE)&&LABEL (finish_SC_ax_ax); +#else + yarv_finish_insn_seq[0] = (VALUE)&&LABEL (finish); +#endif + return (VALUE)insns_address_table; + } +#endif + reg_cfp = th->cfp; + reg_pc = reg_cfp->pc; + +#if OPT_STACK_CACHING + reg_a = initial; + reg_b = 0; +#endif + + first: + INSN_DISPATCH(); + /******************/ +#include "vm.inc" + /******************/ + END_INSNS_DISPATCH(); + + /* unreachable */ + rb_bug("th_eval_iseq: unreachable"); + return Qundef; +} + +#else + +#include "vm.inc" +#include "vmtc.inc" + +void ** +get_insns_address_table() +{ + return (void **)insns_address_table; +} + +VALUE +th_eval(yarv_thread_t *th, VALUE initial) +{ + register yarv_control_frame_t *reg_cfp = th->cfp; + SET_PC(reg_cfp->iseq->iseq_encoded); + + while (*GET_PC()) { + reg_cfp = ((insn_func_type) (*GET_PC()))(th, reg_cfp); + } + { + VALUE ret = *--reg_cfp->sp; + th->cfp--; + return ret; + } +} +#endif diff --git a/vm_macro.def b/vm_macro.def new file mode 100644 index 0000000000..dd7fd3daa8 --- /dev/null +++ b/vm_macro.def @@ -0,0 +1,330 @@ +/* -*- c -*- */
+/* do not use C++ style comment */
+/* */
+
+
+MACRO macro_eval_setup_send_arguments(num, blockptr, flag, blockiseq)
+{
+ if (flag & VM_CALL_ARGS_BLOCKARG_BIT) {
+ yarv_proc_t *po;
+ VALUE proc;
+
+ proc = TOPN(0);
+ if (proc != Qnil) {
+ if (!yarv_obj_is_proc(proc)) {
+ proc = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
+ if (!yarv_obj_is_proc(proc)) {
+ rb_raise(rb_eTypeError,
+ "wrong argument type %s (expected Proc)",
+ rb_obj_classname(proc));
+ }
+ }
+ GetProcPtr(proc, po);
+ blockptr = &po->block;
+ GET_BLOCK_PTR_IN_CFP(reg_cfp)->proc = proc;
+ }
+ INC_SP(-1);
+ }
+ else if (blockiseq) {
+ blockptr = GET_BLOCK_PTR_IN_CFP(reg_cfp);
+ blockptr->iseq = blockiseq;
+ blockptr->proc = 0;
+ }
+
+ /* expand top of stack? */
+ if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+ VALUE ary = TOPN(0);
+ VALUE *ptr, *dst;
+ int i;
+ VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_splat");
+
+ if (NIL_P(tmp)) {
+ tmp = rb_ary_new3(1, ary);
+ }
+ ary = tmp;
+
+ ptr = RARRAY_PTR(ary);
+ dst = GET_SP() - 1;
+ for (i = 0; i < RARRAY_LEN(ary); i++) {
+ dst[i] = ptr[i];
+ }
+ num += i - 1;
+ INC_SP(i - 1);
+ }
+}
+
+
+MACRO macro_eval_invoke_cfunc(num, id, recv, klass, mn, blockptr)
+{
+ yarv_control_frame_t *cfp =
+ push_frame(th, 0, FRAME_MAGIC_CFUNC,
+ recv, (VALUE) blockptr, 0, GET_SP(), 0, 1);
+ cfp->callee_id = id; /* TODO */
+ cfp->method_id = id;
+ cfp->method_klass = klass;
+
+ reg_cfp->sp -= num + 1;
+
+ val = call_cfunc(mn->nd_cfnc, recv, mn->nd_argc, num, reg_cfp->sp + 1);
+ if (reg_cfp != th->cfp + 1) {
+ SDR2(reg_cfp);
+ SDR2(th->cfp-5);
+ rb_bug("cfp consistency error - send");
+ th->cfp = reg_cfp;
+ }
+ pop_frame(th);
+}
+
+MACRO macro_eval_invoke_func(niseqval, recv, klass, blockptr, num)
+{
+ yarv_iseq_t *niseq;
+ VALUE *sp = GET_SP();
+ VALUE *rsp = sp - num - 1;
+ int opt_pc = 0, clear_local_size, i;
+
+ /* TODO: eliminate it */
+ GetISeqPtr(niseqval, niseq);
+
+ clear_local_size = niseq->local_size - num;
+ /* set arguments */
+ if (niseq->arg_simple) {
+ if (niseq->argc != num) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%lu for %d)",
+ (unsigned long)num, niseq->argc);
+ }
+ }
+ else {
+ /* check optional arguments */
+ if (niseq->arg_opts) {
+ int iseq_argc = niseq->argc;
+ int opts = niseq->arg_opts - 1;
+
+ if (num < iseq_argc ||
+ (niseq->arg_rest == 0 && num > iseq_argc + opts)) {
+ if (0) {
+ printf("num: %lu, iseq_argc: %d, opts: %d\n",
+ (unsigned long)num, iseq_argc, opts);
+ }
+ rb_raise(rb_eArgError,
+ "wrong number of arguments (%lu for %d)",
+ (unsigned long)num, iseq_argc);
+ }
+
+ if (0) {
+ printf("num: %lu, opts: %d, iseq_argc: %d\n",
+ (unsigned long)num, opts, iseq_argc);
+ }
+ if (num - iseq_argc < opts) {
+ opt_pc = niseq->arg_opt_tbl[num - iseq_argc];
+ sp += opts - (num - iseq_argc);
+ num += opts - (num - iseq_argc);
+ clear_local_size = niseq->local_size - (iseq_argc + opts);
+ }
+ else {
+ opt_pc = niseq->arg_opt_tbl[opts];
+ }
+ }
+ /* check rest */
+ if (niseq->arg_rest == -1) {
+ if (niseq->arg_opts) {
+ num = niseq->argc + niseq->arg_opts;
+ }
+ else {
+ num = niseq->argc;
+ }
+ sp = &rsp[1 + num + 1];
+ }
+ else if (niseq->arg_rest != 0) {
+ int rest = niseq->arg_rest - 1;
+ int pack_size = num - rest;
+ if (0) {
+ printf("num: %lu, rest: %d, ps: %d\n",
+ (unsigned long)num, niseq->arg_rest, pack_size);
+ }
+ if (pack_size < 0) {
+ rb_raise(rb_eArgError,
+ "wrong number of arguments (%lu for %d)",
+ (unsigned long)num, rest - niseq->arg_opts);
+ }
+
+ /*
+ * def m(x,y,z,*a) =>
+ * x, y, z, a, b, c <SP> => x, y, z, [a,b,c], <SP>
+ */
+ rsp[1 + rest] = rb_ary_new4(pack_size, &rsp[1 + rest]);
+ sp = &rsp[2 + rest];
+ num = rest + 1;
+ clear_local_size = niseq->local_size - rest - 1;
+ }
+
+ /* block argument */
+ if (niseq->arg_block != 0) {
+ VALUE arg_block_val = Qnil;
+
+ if (!((niseq->arg_rest && num == niseq->arg_rest) ||
+ (niseq->arg_opts
+ && num == niseq->argc + niseq->arg_opts - 1)
+ || num == niseq->argc)) {
+ rb_raise(rb_eArgError,
+ "wrong number of arguments (%lu for %d)",
+ (unsigned long)num, niseq->argc);
+ }
+
+ if (blockptr) {
+ /* make Proc object */
+ if (blockptr->proc == 0) {
+ yarv_proc_t *proc;
+ reg_cfp->sp = sp;
+ arg_block_val = th_make_proc(th, GET_CFP(), blockptr);
+ GetProcPtr(arg_block_val, proc);
+ blockptr = &proc->block;
+ }
+ else {
+ arg_block_val = blockptr->proc;
+ }
+ }
+
+ rsp[1 + niseq->arg_block - 1] = arg_block_val;
+ sp++;
+ clear_local_size--;
+ }
+ }
+ /* stack overflow check */
+ if (CHECK_STACK_OVERFLOW(th, GET_CFP(), niseq->stack_max + 0x100)) {
+ rb_exc_raise(sysstack_error);
+ }
+
+ for (i = 0; i < clear_local_size; i++) {
+ *sp++ = Qnil;
+ }
+
+ {
+ if (0 && (flag & VM_CALL_TAILCALL_BIT)) {
+ th->cfp++;
+ push_frame(th, niseq, FRAME_MAGIC_METHOD,
+ recv, (VALUE) blockptr,
+ niseq->iseq_encoded + opt_pc, sp, 0, 0);
+ }
+ else if (0 &&
+ (flag & VM_CALL_TAILRECURSION_BIT) && niseq == GET_ISEQ()) {
+ /* do nothing */
+ GET_CFP()->self = recv;
+ SET_LFP(sp);
+ SET_DFP(sp);
+ *sp++ = (VALUE) blockptr;
+ reg_cfp->sp = sp;
+ reg_cfp->bp = sp;
+ SET_PC(niseq->iseq_encoded + opt_pc);
+ }
+ else {
+ push_frame(th, niseq,
+ FRAME_MAGIC_METHOD, recv, (VALUE) blockptr,
+ niseq->iseq_encoded + opt_pc, sp, 0, 0);
+ reg_cfp->sp = rsp;
+ }
+ RESTORE_REGS();
+ }
+}
+
+MACRO macro_eval_invoke_method(recv, klass, id, num, mn, blockptr)
+{
+ /* method missing */
+ if (mn == 0) {
+ /* temporarily */
+ if (id == idMethodMissing) {
+ rb_bug("method missing");
+ }
+ else {
+ int stat = 0;
+ if (flag & VM_CALL_VCALL_BIT) {
+ stat |= NOEX_VCALL;
+ }
+ if (flag & VM_CALL_SUPER_BIT) {
+ stat |= NOEX_SUPER;
+ }
+ val = eval_method_missing(th, id, recv, num, blockptr, stat);
+ }
+ }
+ else if (!(flag & VM_CALL_FCALL_BIT) &&
+ (mn->nd_noex & NOEX_MASK) & NOEX_PRIVATE) {
+ int stat = NOEX_PRIVATE;
+ if (flag & VM_CALL_VCALL_BIT) {
+ stat |= NOEX_VCALL;
+ }
+ val = eval_method_missing(th, id, recv, num, blockptr, stat);
+ }
+ else if ((mn->nd_noex & NOEX_MASK) & NOEX_PROTECTED) {
+ VALUE defined_class = mn->nd_clss;
+
+ if (TYPE(defined_class) == T_ICLASS) {
+ defined_class = RBASIC(defined_class)->klass;
+ }
+ if (!rb_obj_is_kind_of(GET_SELF(), rb_class_real(defined_class))) {
+ val =
+ eval_method_missing(th, id, recv, num, blockptr,
+ NOEX_PROTECTED);
+ }
+ else {
+ goto INSN_LABEL(normal_method_dispatch);
+ }
+ }
+ else {
+ NODE *node;
+ INSN_LABEL(normal_method_dispatch):
+
+ node = mn->nd_body;
+ switch (nd_type(node)) {
+ case YARV_METHOD_NODE:{
+ macro_eval_invoke_func(node->nd_body, recv, klass,
+ blockptr, num);
+ NEXT_INSN();
+ }
+ case NODE_CFUNC:{
+ macro_eval_invoke_cfunc(num, id, recv, klass, node, blockptr);
+ break;
+ }
+ case NODE_ATTRSET:{
+ val = rb_ivar_set(recv, node->nd_vid, TOPN(0));
+ POPN(2);
+ break;
+ }
+ case NODE_IVAR:{
+ val = rb_ivar_get(recv, node->nd_vid);
+ POP();
+ break;
+ }
+ case NODE_BMETHOD:{
+ VALUE *argv = GET_SP() - num;
+ val = th_invoke_bmethod(th, id, node->nd_cval,
+ recv, klass, num, argv);
+ INC_SP(-num-1);
+ break;
+ }
+ case NODE_ZSUPER:{
+ klass = RCLASS(mn->nd_clss)->super;
+ mn = rb_method_node(klass, id);
+
+ if (mn != 0) {
+ goto INSN_LABEL(normal_method_dispatch);
+ }
+ else {
+ goto LABEL_IS_SC(start_method_dispatch);
+ }
+ }
+ case NODE_SCOPE:{
+ dpi(id);
+ SDR();
+ rb_bug("eval_invoke_method: NODE_SCOPE should not be appear");
+ /* unreachable */
+ break;
+ }
+ default:{
+ printf("node: %s\n", node_name(nd_type(node)));
+ rb_bug("eval_invoke_method: unreachable");
+ /* unreachable */
+ break;
+ }
+ }
+ }
+}
+
diff --git a/vm_opts.h.base b/vm_opts.h.base new file mode 100644 index 0000000000..188b6d5d0a --- /dev/null +++ b/vm_opts.h.base @@ -0,0 +1,47 @@ +/*-*-c-*-*/
+/**********************************************************************
+
+ vm_opts.h.base - VM optimize option
+
+ $Author: $
+ $Date: $
+
+ Copyright (C) 2004-2006 Koichi Sasada
+
+**********************************************************************/
+
+
+#ifndef VM_OPTS_H_INCLUDED
+#define VM_OPTS_H_INCLUDED
+
+/* C compiler depend */
+#define OPT_DIRECT_THREADED_CODE 1
+#define OPT_CALL_THREADED_CODE 0
+
+/* architecture independent */
+
+/* VM running option */
+#define OPT_CHECKED_RUN 1
+
+/* at compile */
+#define OPT_INLINE_CONST_CACHE 1
+#define OPT_PEEPHOLE_OPTIMIZATION 1
+#define OPT_SPECIALISED_INSTRUCTION 1
+
+/* at runtime */
+#define OPT_INLINE_METHOD_CACHE 1
+#define OPT_BLOCKINLINING 0
+
+/* architecture independent, affects generated code */
+#define OPT_OPERANDS_UNIFICATION 0
+#define OPT_INSTRUCTIONS_UNIFICATION 0
+
+/* code generation parameter */
+#define OPT_UNIFY_ALL_COMBINATION 0
+#define OPT_STACK_CACHING 0
+
+/* misc */
+#define SUPPORT_JOKE 0
+
+#endif /* VM_OPTS_H_INCLUDED */
+
diff --git a/win32/win32.c b/win32/win32.c index a50a5f4808..c3702c10b7 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3012,15 +3012,15 @@ rb_w32_getcwd(char *buffer, int size) size = len; if (!p) { errno = ENOMEM; - return NULL; - } + return NULL; + } } if (!GetCurrentDirectory(size, p)) { errno = map_errno(GetLastError()); if (!buffer) free(p); - return NULL; + return NULL; } for (bp = p; *bp != '\0'; bp = CharNext(bp)) { @@ -3828,7 +3828,6 @@ rb_w32_Sleep(unsigned long msec) DWORD ret; RUBY_CRITICAL(ret = wait_events(NULL, msec)); yield_once(); - CHECK_INTS; return ret != WAIT_TIMEOUT; } @@ -3837,7 +3836,6 @@ catch_interrupt(void) { yield_once(); RUBY_CRITICAL(wait_events(NULL, 0)); - CHECK_INTS; } #if defined __BORLANDC__ || defined _WIN32_WCE @@ -3984,10 +3982,6 @@ rb_w32_asynchronize(asynchronous_func_t func, VALUE self, rb_fatal("failed to launch waiter thread:%d", GetLastError()); } - if (interrupted) { - CHECK_INTS; - } - return val; } @@ -4150,12 +4144,12 @@ rb_w32_utime(const char *path, const struct utimbuf *times) } if (times) { - if (unixtime_to_filetime(times->actime, &atime)) { - return -1; - } - if (unixtime_to_filetime(times->modtime, &mtime)) { - return -1; - } + if (unixtime_to_filetime(times->actime, &atime)) { + return -1; + } + if (unixtime_to_filetime(times->modtime, &mtime)) { + return -1; + } } else { GetSystemTimeAsFileTime(&atime); diff --git a/yarv.h b/yarv.h new file mode 100644 index 0000000000..9d21bfc469 --- /dev/null +++ b/yarv.h @@ -0,0 +1,105 @@ +/********************************************************************** + + yarv.h - + + $Author$ + $Date$ + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + + +#include <ruby.h> +#include <node.h> +#include "yarvcore.h" + +#ifndef _YARV_H_INCLUDED_ +#define _YARV_H_INCLUDED_ + + +VALUE yarv_yield(VALUE val); + +/* original API */ + +#if YARVEXT +RUBY_EXTERN int yarvIsWorking; +#define IS_YARV_WORKING() (yarvIsWorking) +#define SET_YARV_START() (yarvIsWorking = 1) +#define SET_YARV_STOP() (yarvIsWorking = 0) +#else +#define IS_YARV_WORKING() 1 +#define SET_YARV_START() +#define SET_YARV_STOP() +#endif + + +#if YARV_THREAD_MODEL == 2 + +extern yarv_thread_t *yarvCurrentThread; +extern yarv_vm_t *theYarvVM; + +static inline VALUE +yarv_get_current_running_thread_value(void) +{ + return yarvCurrentThread->self; +} + +static inline yarv_thread_t * +yarv_get_current_running_thread(void) +{ + return yarvCurrentThread; +} + +#define GET_VM() theYarvVM +#define GET_THREAD() yarvCurrentThread + +static inline void +yarv_set_current_running_thread_raw(yarv_thread_t *th) +{ + yarvCurrentThread = th; +} + +static inline void +yarv_set_current_running_thread(yarv_thread_t *th) +{ + yarv_set_current_running_thread_raw(th); + th->vm->running_thread = th; +} + +#else +#error "unsupported thread model" +#endif + +void rb_vm_change_state(); + +VALUE th_invoke_yield(yarv_thread_t *th, int argc, VALUE *argv); + +VALUE th_call0(yarv_thread_t *th, VALUE klass, VALUE recv, + VALUE id, ID oid, int argc, const VALUE *argv, + NODE * body, int nosuper); + +VALUE *yarv_svar(int); + +VALUE th_call_super(yarv_thread_t *th, int argc, const VALUE *argv); + +VALUE yarv_backtrace(int lev); + +VALUE yarvcore_eval_parsed(NODE *node, VALUE file); + +VALUE th_invoke_proc(yarv_thread_t *th, yarv_proc_t *proc, + VALUE self, int argc, VALUE *argv); +VALUE th_make_proc(yarv_thread_t *th, yarv_control_frame_t *cfp, + yarv_block_t *block); +VALUE th_make_env_object(yarv_thread_t *th, yarv_control_frame_t *cfp); +VALUE yarvcore_eval(VALUE self, VALUE str, VALUE file, VALUE line); + +int yarv_block_given_p(void); + +VALUE yarv_load(char *); +VALUE yarv_obj_is_proc(VALUE); +int th_get_sourceline(yarv_control_frame_t *); +VALUE th_backtrace(yarv_thread_t *, int); +void yarv_bug(void); + +#endif diff --git a/yarv_version.h b/yarv_version.h new file mode 100644 index 0000000000..4c3bc756a3 --- /dev/null +++ b/yarv_version.h @@ -0,0 +1,23 @@ +/********************************************************************** + + yarv_version.h - + + $Author$ + $Date$ + created at: 04/01/11 04:11:41 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifndef _VERSION_H_INCLUDED_ +#define _VERSION_H_INCLUDED_ + +#define MAJOR_VER 0 +#define MINOR_VER 4 +#define DEVEL_VER 1 + +extern char yarv_version[]; +extern char *yarv_options; + +#endif // _VERSION_H_INCLUDED_ diff --git a/yarvcore.c b/yarvcore.c new file mode 100644 index 0000000000..eb4e1a91e5 --- /dev/null +++ b/yarvcore.c @@ -0,0 +1,1078 @@ +/********************************************************************** + + yarvcore.h - + + $Author$ + $Date$ + created at: 04/01/01 01:17:22 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#include "ruby.h" +#include "node.h" + +#include "yarv_version.h" +#include "yarvcore.h" +#include "yarv.h" +#include "gc.h" + +VALUE mYarvCore; +VALUE cYarvISeq; +VALUE cYarvVM; +VALUE cYarvThread; +VALUE mYarvInsns; +VALUE cYarvEnv; +VALUE cYarvProc; +VALUE cYarvBinding; + +VALUE symIFUNC; +VALUE symCFUNC; + +ID idPLUS; +ID idMINUS; +ID idMULT; +ID idDIV; +ID idMOD; +ID idLT; +ID idLTLT; +ID idLE; +ID idEq; +ID idEqq; +ID idBackquote; +ID idEqTilde; +ID idThrowState; +ID idAREF; +ID idASET; +ID idIntern; +ID idMethodMissing; +ID idLength; +ID idLambda; +ID idGets; +ID idSucc; +ID idEach; +ID idRangeEachLT; +ID idRangeEachLE; +ID idArrayEach; +ID idTimes; +ID idEnd; +ID idBitblt; +ID idAnswer; +ID idSvarPlaceholder; + +unsigned long yarvGlobalStateVersion = 1; + + +/* from Ruby 1.9 eval.c */ +#ifdef HAVE_STDARG_PROTOTYPES +#include <stdarg.h> +#define va_init_list(a,b) va_start(a,b) +#else +#include <varargs.h> +#define va_init_list(a,b) va_start(a) +#endif + +VALUE yarv_th_eval(yarv_thread_t *th, VALUE iseqval); + +/************/ +/* YARVCore */ +/************/ + +yarv_thread_t *yarvCurrentThread = 0; +yarv_vm_t *theYarvVM = 0; +static VALUE yarvVMArray = Qnil; + +RUBY_EXTERN int rb_thread_critical; +RUBY_EXTERN int ruby_nerrs; +RUBY_EXTERN NODE *ruby_eval_tree; + +VALUE +yarv_load(char *file) +{ + NODE *node; + VALUE iseq; + volatile int critical; + yarv_thread_t *th = GET_THREAD(); + + critical = rb_thread_critical; + rb_thread_critical = Qtrue; + { + th->parse_in_eval++; + node = (NODE *)rb_load_file(file); + th->parse_in_eval--; + node = ruby_eval_tree; + } + rb_thread_critical = critical; + + if (ruby_nerrs > 0) { + return 0; + } + + iseq = yarv_iseq_new(node, rb_str_new2("<top (required)>"), + rb_str_new2(file), Qfalse, ISEQ_TYPE_TOP); + + yarv_th_eval(GET_THREAD(), iseq); + return 0; +} + +VALUE *th_svar(yarv_thread_t *self, int cnt); + +VALUE * +rb_svar(int cnt) +{ + return th_svar(GET_THREAD(), cnt); +} + +VALUE +rb_backref_get(void) +{ + VALUE *var = rb_svar(1); + if (var) { + return *var; + } + return Qnil; +} + +void +rb_backref_set(VALUE val) +{ + VALUE *var = rb_svar(1); + *var = val; +} + +VALUE +rb_lastline_get(void) +{ + VALUE *var = rb_svar(0); + if (var) { + return *var; + } + return Qnil; +} + +void +rb_lastline_set(VALUE val) +{ + VALUE *var = rb_svar(0); + *var = val; +} + +static NODE * +compile_string(VALUE str, VALUE file, VALUE line) +{ + NODE *node; + node = rb_compile_string(StringValueCStr(file), str, NUM2INT(line)); + + if (ruby_nerrs > 0) { + ruby_nerrs = 0; + rb_exc_raise(GET_THREAD()->errinfo); // TODO: check err + } + return node; +} + +static VALUE +yarvcore_eval_iseq(VALUE iseq) +{ + return yarv_th_eval(GET_THREAD(), iseq); +} + +static VALUE +th_compile_from_node(yarv_thread_t *th, NODE * node, VALUE file) +{ + VALUE iseq; + if (th->base_block) { + iseq = yarv_iseq_new(node, + th->base_block->iseq->name, + file, + th->base_block->iseq->self, + ISEQ_TYPE_EVAL); + } + else { + iseq = yarv_iseq_new(node, rb_str_new2("<main>"), file, + Qfalse, ISEQ_TYPE_TOP); + } + return iseq; +} + +VALUE +th_compile(yarv_thread_t *th, VALUE str, VALUE file, VALUE line) +{ + NODE *node = (NODE *) compile_string(str, file, line); + return th_compile_from_node(th, (NODE *) node, file); +} + +VALUE +yarvcore_eval_parsed(NODE *node, VALUE file) +{ + VALUE iseq = th_compile_from_node(GET_THREAD(), node, file); + return yarvcore_eval_iseq(iseq); +} + +VALUE +yarvcore_eval(VALUE self, VALUE str, VALUE file, VALUE line) +{ + NODE *node; + node = compile_string(str, file, line); + return yarvcore_eval_parsed(node, file); +} + +/******/ +/* VM */ +/******/ + +void native_thread_cleanup(void *); + +static void +vm_free(void *ptr) +{ + FREE_REPORT_ENTER("vm"); + if (ptr) { + yarv_vm_t *vmobj = ptr; + + st_free_table(vmobj->living_threads); + // TODO: MultiVM Instance + // VM object should not be cleaned by GC + // ruby_xfree(ptr); + // theYarvVM = 0; + } + FREE_REPORT_LEAVE("vm"); +} + +static int +vm_mark_each_thread_func(st_data_t key, st_data_t value, st_data_t dummy) +{ + VALUE thval = (VALUE)key; + rb_gc_mark(thval); + return ST_CONTINUE; +} + +static void +vm_mark(void *ptr) +{ + MARK_REPORT_ENTER("vm"); + GC_INFO("-------------------------------------------------\n"); + if (ptr) { + yarv_vm_t *vm = ptr; + if (vm->living_threads) { + st_foreach(vm->living_threads, vm_mark_each_thread_func, 0); + } + MARK_UNLESS_NULL(vm->thgroup_default); + MARK_UNLESS_NULL(vm->mark_object_ary); + } + MARK_REPORT_LEAVE("vm"); +} + +static VALUE +vm_alloc(VALUE klass) +{ + VALUE volatile obj; + yarv_vm_t *vm; + obj = Data_Make_Struct(klass, yarv_vm_t, vm_mark, vm_free, vm); + + vm->self = obj; + vm->mark_object_ary = rb_ary_new(); + return obj; +} + +static void +vm_init2(yarv_vm_t *vm) +{ + MEMZERO(vm, yarv_vm_t, 1); +} + + +/**********/ +/* Thread */ +/**********/ + +static void +thread_free(void *ptr) +{ + yarv_thread_t *th; + FREE_REPORT_ENTER("thread"); + + if (ptr) { + th = ptr; + FREE_UNLESS_NULL(th->stack); + FREE_UNLESS_NULL(th->top_local_tbl); + + if (th->local_storage) { + st_free_table(th->local_storage); + } + +#if USE_VALUE_CACHE + { + VALUE *ptr = th->value_cache_ptr; + while (*ptr) { + VALUE v = *ptr; + RBASIC(v)->flags = 0; + RBASIC(v)->klass = 0; + ptr++; + } + } +#endif + + if (th->vm->main_thread == th) { + GC_INFO("main thread\n"); + } + else { + ruby_xfree(ptr); + } + } + FREE_REPORT_LEAVE("thread"); +} + +void yarv_machine_stack_mark(yarv_thread_t *th); + +static void +thread_mark(void *ptr) +{ + yarv_thread_t *th = NULL; + MARK_REPORT_ENTER("thread"); + if (ptr) { + th = ptr; + if (th->stack) { + VALUE *p = th->stack; + VALUE *sp = th->cfp->sp; + yarv_control_frame_t *cfp = th->cfp; + yarv_control_frame_t *limit_cfp = + (void *)(th->stack + th->stack_size); + + while (p < sp) { + rb_gc_mark(*p++); + } + while (cfp != limit_cfp) { + rb_gc_mark(cfp->proc); + cfp = YARV_PREVIOUS_CONTROL_FRAME(cfp); + } + } + + /* mark ruby objects */ + MARK_UNLESS_NULL(th->first_proc); + MARK_UNLESS_NULL(th->first_args); + + MARK_UNLESS_NULL(th->thgroup); + MARK_UNLESS_NULL(th->value); + MARK_UNLESS_NULL(th->errinfo); + MARK_UNLESS_NULL(th->local_svar); + + rb_mark_tbl(th->local_storage); + + if (GET_THREAD() != th && + th->machine_stack_start && th->machine_stack_end) { + yarv_machine_stack_mark(th); + rb_gc_mark_locations((VALUE *)&th->machine_regs, + (VALUE *)(&th->machine_regs) + + sizeof(th->machine_regs) / sizeof(VALUE)); + } + } + + MARK_UNLESS_NULL(th->stat_insn_usage); + MARK_REPORT_LEAVE("thread"); +} + +static VALUE +thread_alloc(VALUE klass) +{ + VALUE volatile obj; + yarv_thread_t *th; + obj = Data_Make_Struct(klass, yarv_thread_t, + thread_mark, thread_free, th); + return obj; +} + +static void +th_init2(yarv_thread_t *th) +{ + MEMZERO(th, yarv_thread_t, 1); + + /* allocate thread stack */ + th->stack = ALLOC_N(VALUE, YARV_THREAD_STACK_SIZE); + + th->stack_size = YARV_THREAD_STACK_SIZE; + th->cfp = (void *)(th->stack + th->stack_size); + th->cfp--; + + th->cfp->pc = 0; + th->cfp->sp = th->stack; + th->cfp->bp = 0; + th->cfp->lfp = th->stack; + th->cfp->dfp = th->stack; + th->cfp->self = Qnil; + th->cfp->magic = 0; + th->cfp->iseq = 0; + th->cfp->proc = 0; + th->cfp->block_iseq = 0; + + th->status = THREAD_RUNNABLE; + th->errinfo = Qnil; + +#if USE_VALUE_CACHE + th->value_cache_ptr = &th->value_cache[0]; +#endif +} + +void +th_klass_init(yarv_thread_t *th) +{ + /* */ +} + +static void +th_init(yarv_thread_t *th) +{ + th_init2(th); + th_klass_init(th); +} + +static VALUE +thread_init(VALUE self) +{ + yarv_thread_t *th; + yarv_vm_t *vm = GET_THREAD()->vm; + GetThreadPtr(self, th); + + th_init(th); + th->self = self; + th->vm = vm; + return self; +} + +VALUE +yarv_thread_alloc(VALUE klass) +{ + VALUE self = thread_alloc(klass); + thread_init(self); + return self; +} + +VALUE th_eval_body(yarv_thread_t *th); +void th_set_top_stack(yarv_thread_t *, VALUE iseq); +VALUE rb_f_binding(VALUE); + +VALUE +yarv_th_eval(yarv_thread_t *th, VALUE iseqval) +{ + VALUE val; + volatile VALUE tmp; + + th_set_top_stack(th, iseqval); + + if (!rb_const_defined(rb_cObject, rb_intern("TOPLEVEL_BINDING"))) { + rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(Qnil)); + } + val = th_eval_body(th); + tmp = iseqval; /* prohibit tail call optimization */ + return val; +} + + +/***************/ +/* YarvEnv */ +/***************/ + +static void +env_free(void *ptr) +{ + yarv_env_t *env; + FREE_REPORT_ENTER("env"); + if (ptr) { + env = ptr; + FREE_UNLESS_NULL(env->env); + ruby_xfree(ptr); + } + FREE_REPORT_LEAVE("env"); +} + +static void +env_mark(void *ptr) +{ + yarv_env_t *env; + MARK_REPORT_ENTER("env"); + if (ptr) { + env = ptr; + if (env->env) { + /* TODO: should mark more restricted range */ + GC_INFO("env->env\n"); + rb_gc_mark_locations(env->env, env->env + env->env_size); + } + GC_INFO("env->prev_envval\n"); + MARK_UNLESS_NULL(env->prev_envval); + + if (env->block.iseq) { + //printf("env->block.iseq <%p, %d>\n", + // env->block.iseq, BUILTIN_TYPE(env->block.iseq)); + if (BUILTIN_TYPE(env->block.iseq) == T_NODE) { + MARK_UNLESS_NULL((VALUE)env->block.iseq); + } + else { + MARK_UNLESS_NULL(env->block.iseq->self); + } + } + } + MARK_REPORT_LEAVE("env"); +} + +VALUE +yarv_env_alloc(VALUE klass) +{ + VALUE obj; + yarv_env_t *env; + obj = Data_Make_Struct(klass, yarv_env_t, env_mark, env_free, env); + env->env = 0; + env->prev_envval = 0; + env->block.iseq = 0; + return obj; +} + + +/***************/ +/* YarvProc */ +/***************/ + +static void +proc_free(void *ptr) +{ + FREE_REPORT_ENTER("proc"); + if (ptr) { + ruby_xfree(ptr); + } + FREE_REPORT_LEAVE("proc"); +} + +static void +proc_mark(void *ptr) +{ + yarv_proc_t *proc; + MARK_REPORT_ENTER("proc"); + if (ptr) { + proc = ptr; + MARK_UNLESS_NULL(proc->envval); + MARK_UNLESS_NULL(proc->blockprocval); + MARK_UNLESS_NULL((VALUE)proc->special_cref_stack); + if (proc->block.iseq && YARV_IFUNC_P(proc->block.iseq)) { + MARK_UNLESS_NULL((VALUE)(proc->block.iseq)); + } + } + MARK_REPORT_LEAVE("proc"); +} + +static VALUE +proc_alloc(VALUE klass) +{ + VALUE obj; + yarv_proc_t *proc; + obj = Data_Make_Struct(klass, yarv_proc_t, proc_mark, proc_free, proc); + MEMZERO(proc, yarv_proc_t, 1); + return obj; +} + +VALUE +yarv_proc_alloc(VALUE klass) +{ + return proc_alloc(cYarvProc); +} + +static VALUE +proc_call(int argc, VALUE *argv, VALUE procval) +{ + yarv_proc_t *proc; + GetProcPtr(procval, proc); + return th_invoke_proc(GET_THREAD(), proc, proc->block.self, argc, argv); +} + +static VALUE +proc_yield(int argc, VALUE *argv, VALUE procval) +{ + yarv_proc_t *proc; + GetProcPtr(procval, proc); + return th_invoke_proc(GET_THREAD(), proc, proc->block.self, argc, argv); +} + +static VALUE +proc_to_proc(VALUE self) +{ + return self; +} + +VALUE +yarv_obj_is_proc(VALUE proc) +{ + if (TYPE(proc) == T_DATA && + RDATA(proc)->dfree == (RUBY_DATA_FUNC) proc_free) { + return Qtrue; + } + else { + return Qfalse; + } +} + +static VALUE +proc_arity(VALUE self) +{ + yarv_proc_t *proc; + yarv_iseq_t *iseq; + GetProcPtr(self, proc); + iseq = proc->block.iseq; + if (iseq && BUILTIN_TYPE(iseq) != T_NODE) { + if (iseq->arg_rest == 0 && iseq->arg_opts == 0) { + return INT2FIX(iseq->argc); + } + else { + return INT2FIX(-iseq->argc - 1); + } + } + else { + return INT2FIX(-1); + } +} + +int +rb_proc_arity(VALUE proc) +{ + return FIX2INT(proc_arity(proc)); +} + +static VALUE +proc_eq(VALUE self, VALUE other) +{ + if (self == other) { + return Qtrue; + } + else { + if (TYPE(other) == T_DATA && + RBASIC(other)->klass == cYarvProc && + CLASS_OF(self) == CLASS_OF(other)) { + yarv_proc_t *p1, *p2; + GetProcPtr(self, p1); + GetProcPtr(other, p2); + if (p1->block.iseq == p2->block.iseq && p1->envval == p2->envval) { + return Qtrue; + } + } + } + return Qfalse; +} + +static VALUE +proc_hash(VALUE self) +{ + int hash; + yarv_proc_t *proc; + GetProcPtr(self, proc); + hash = (long)proc->block.iseq; + hash ^= (long)proc->envval; + hash ^= (long)proc->block.lfp >> 16; + return INT2FIX(hash); +} + +static VALUE +proc_to_s(VALUE self) +{ + VALUE str = 0; + yarv_proc_t *proc; + char *cname = rb_obj_classname(self); + yarv_iseq_t *iseq; + + GetProcPtr(self, proc); + iseq = proc->block.iseq; + + if (YARV_NORMAL_ISEQ_P(iseq)) { + int line_no = 0; + + if (iseq->insn_info_tbl) { + line_no = iseq->insn_info_tbl[0].line_no; + } + str = rb_sprintf("#<%s:%lx@%s:%d>", cname, self, + RSTRING_PTR(iseq->file_name), + line_no); + } + else { + str = rb_sprintf("#<%s:%p>", cname, proc->block.iseq); + } + + if (OBJ_TAINTED(self)) { + OBJ_TAINT(str); + } + return str; +} + +static VALUE +proc_dup(VALUE self) +{ + VALUE procval = proc_alloc(cYarvProc); + yarv_proc_t *src, *dst; + GetProcPtr(self, src); + GetProcPtr(procval, dst); + + dst->block = src->block; + dst->envval = src->envval; + dst->safe_level = dst->safe_level; + dst->special_cref_stack = src->special_cref_stack; + + return procval; +} + +VALUE yarv_proc_dup(VALUE self) +{ + return proc_dup(self); +} +static VALUE +proc_clone(VALUE self) +{ + VALUE procval = proc_dup(self); + CLONESETUP(procval, self); + return procval; +} + + +/***************/ +/* YarvBinding */ +/***************/ + +static void +binding_free(void *ptr) +{ + yarv_binding_t *bind; + FREE_REPORT_ENTER("binding"); + if (ptr) { + bind = ptr; + ruby_xfree(ptr); + } + FREE_REPORT_LEAVE("binding"); +} + +static void +binding_mark(void *ptr) +{ + yarv_binding_t *bind; + MARK_REPORT_ENTER("binding"); + if (ptr) { + bind = ptr; + MARK_UNLESS_NULL(bind->env); + MARK_UNLESS_NULL((VALUE)bind->cref_stack); + } + MARK_REPORT_LEAVE("binding"); +} + +static VALUE +binding_alloc(VALUE klass) +{ + VALUE obj; + yarv_binding_t *bind; + obj = Data_Make_Struct(klass, yarv_binding_t, + binding_mark, binding_free, bind); + MEMZERO(bind, yarv_binding_t, 1); + return obj; +} + +VALUE +yarv_binding_alloc(VALUE klass) +{ + return binding_alloc(klass); +} + +static VALUE +binding_dup(VALUE self) +{ + VALUE bindval = binding_alloc(cYarvBinding); + yarv_binding_t *src, *dst; + GetBindingPtr(self, src); + GetBindingPtr(bindval, dst); + dst->env = src->env; + dst->cref_stack = src->cref_stack; + return bindval; +} + +static VALUE +binding_clone(VALUE self) +{ + VALUE bindval = binding_dup(self); + CLONESETUP(bindval, self); + return bindval; +} + + +/********************************************************************/ + +static VALUE +yarv_once() +{ + return rb_yield(Qnil); +} + +static VALUE +yarv_segv() +{ + volatile int *a = 0; + *a = 0; + return Qnil; +} + +static VALUE +cfunc(void) +{ + rb_funcall(Qnil, rb_intern("rfunc"), 0, 0); + rb_funcall(Qnil, rb_intern("rfunc"), 0, 0); + return Qnil; +} + +// VALUE yarv_Hash_each(); +VALUE insns_name_array(void); +VALUE Init_yarvthread(void); +extern VALUE *rb_gc_stack_start; + +VALUE rb_proc_s_new(VALUE klass); + +VALUE +sdr(void) +{ + yarv_bug(); + return Qnil; +} + +static VALUE +nsdr(void) +{ + VALUE ary = rb_ary_new(); +#if HAVE_BACKTRACE +#include <execinfo.h> +#define MAX_NATIVE_TRACE 1024 + static void *trace[MAX_NATIVE_TRACE]; + int n = backtrace(trace, MAX_NATIVE_TRACE); + char **syms = backtrace_symbols(trace, n); + int i; + + if (syms == 0) { + rb_memerror(); + } + + for (i=0; i<n; i++) { + rb_ary_push(ary, rb_str_new2(syms[i])); + } + free(syms); +#endif + return ary; +} + +char yarv_version[0x20]; +char *yarv_options = "" +#if OPT_DIRECT_THREADED_CODE + "[direct threaded code] " +#elif OPT_TOKEN_THREADED_CODE + "[token threaded code] " +#elif OPT_CALL_THREADED_CODE + "[call threaded code] " +#endif + +#if OPT_BASIC_OPERATIONS + "[optimize basic operation] " +#endif +#if OPT_STACK_CACHING + "[stack caching] " +#endif +#if OPT_OPERANDS_UNIFICATION + "[operands unification] " +#endif +#if OPT_INSTRUCTIONS_UNIFICATION + "[instructions unification] " +#endif +#if OPT_INLINE_METHOD_CACHE + "[inline method cache] " +#endif +#if OPT_BLOCKINLINING + "[block inlining] " +#endif + ; + +void Init_ISeq(void); + +void +Init_yarvcore(void) +{ + const char *rev = "$Rev:$"; + const char *date = "$Date:$"; + + snprintf(yarv_version, 0x20, "YARVCore %d.%d.%d", + MAJOR_VER, MINOR_VER, DEVEL_VER); + + /* declare YARVCore module */ + mYarvCore = rb_define_module("YARVCore"); + rb_define_const(mYarvCore, "VERSION", rb_str_new2(yarv_version)); + rb_define_const(mYarvCore, "MAJOR", INT2FIX(MAJOR_VER)); + rb_define_const(mYarvCore, "MINOR", INT2FIX(MINOR_VER)); + rb_define_const(mYarvCore, "REV", rb_str_new2(rev)); + rb_define_const(mYarvCore, "DATE", rb_str_new2(date)); + rb_define_const(mYarvCore, "OPTS", rb_str_new2(yarv_options)); + + Init_ISeq(); + + /* YARVCore::USAGE_ANALISYS_* */ + rb_define_const(mYarvCore, "USAGE_ANALISYS_INSN", rb_hash_new()); + rb_define_const(mYarvCore, "USAGE_ANALISYS_REGS", rb_hash_new()); + rb_define_const(mYarvCore, "USAGE_ANALISYS_INSN_BIGRAM", rb_hash_new()); + + /* YARVCore::InsnNameArray */ + rb_define_const(mYarvCore, "InsnNameArray", insns_name_array()); + + rb_define_singleton_method(mYarvCore, "eval", yarvcore_eval, 3); + + /* declare YARVCore::VM */ + cYarvVM = rb_define_class_under(mYarvCore, "VM", rb_cObject); + rb_undef_alloc_func(cYarvVM); + + /* declare YARVCore::VM::Thread */ + cYarvThread = rb_define_class_under(cYarvVM, "Thread", rb_cObject); + rb_define_global_const("Thread", cYarvThread); + rb_undef_alloc_func(cYarvThread); + rb_define_method(cYarvThread, "initialize", thread_init, 0); + + /* declare YARVCore::VM::Env */ + cYarvEnv = rb_define_class_under(cYarvVM, "Env", rb_cObject); + rb_undef_alloc_func(cYarvEnv); + + /* declare YARVCore::VM::Proc */ + rb_cProc = cYarvProc = rb_define_class_under(cYarvVM, "Proc", rb_cObject); + rb_const_set(rb_cObject, rb_intern("Proc"), cYarvProc); + rb_undef_alloc_func(cYarvProc); + rb_define_singleton_method(cYarvProc, "new", rb_proc_s_new, 0); + rb_define_method(cYarvProc, "call", proc_call, -1); + rb_define_method(cYarvProc, "[]", proc_call, -1); + rb_define_method(cYarvProc, "yield", proc_yield, -1); + rb_define_method(cYarvProc, "to_proc", proc_to_proc, 0); + rb_define_method(cYarvProc, "arity", proc_arity, 0); + rb_define_method(cYarvProc, "clone", proc_clone, 0); + rb_define_method(cYarvProc, "dup", proc_dup, 0); + rb_define_method(cYarvProc, "==", proc_eq, 1); + rb_define_method(cYarvProc, "eql?", proc_eq, 1); + rb_define_method(cYarvProc, "hash", proc_hash, 0); + rb_define_method(cYarvProc, "to_s", proc_to_s, 0); + + /* declare YARVCore::VM::Binding */ + cYarvBinding = rb_define_class_under(cYarvVM, "Binding", rb_cObject); + rb_const_set(rb_cObject, rb_intern("Binding"), cYarvBinding); + rb_undef_alloc_func(cYarvBinding); + rb_undef_method(CLASS_OF(cYarvBinding), "new"); + rb_define_method(cYarvBinding, "clone", binding_clone, 0); + rb_define_method(cYarvBinding, "dup", binding_dup, 0); + rb_define_global_function("binding", rb_f_binding, 0); + + /* misc */ + + + /* YARV test functions */ + + rb_define_global_function("once", yarv_once, 0); + rb_define_global_function("segv", yarv_segv, 0); + rb_define_global_function("cfunc", cfunc, 0); + rb_define_global_function("SDR", sdr, 0); + rb_define_global_function("NSDR", nsdr, 0); + + symIFUNC = ID2SYM(rb_intern("<IFUNC>")); + symCFUNC = ID2SYM(rb_intern("<CFUNC>")); + + /* for optimize */ + idPLUS = rb_intern("+"); + idMINUS = rb_intern("-"); + idMULT = rb_intern("*"); + idDIV = rb_intern("/"); + idMOD = rb_intern("%"); + idLT = rb_intern("<"); + idLTLT = rb_intern("<<"); + idLE = rb_intern("<="); + idEq = rb_intern("=="); + idEqq = rb_intern("==="); + idBackquote = rb_intern("`"); + idEqTilde = rb_intern("=~"); + + idAREF = rb_intern("[]"); + idASET = rb_intern("[]="); + + idEach = rb_intern("each"); + idTimes = rb_intern("times"); + idLength = rb_intern("length"); + idLambda = rb_intern("lambda"); + idIntern = rb_intern("intern"); + idGets = rb_intern("gets"); + idSucc = rb_intern("succ"); + idEnd = rb_intern("end"); + idRangeEachLT = rb_intern("Range#each#LT"); + idRangeEachLE = rb_intern("Range#each#LE"); + idArrayEach = rb_intern("Array#each"); + idMethodMissing = rb_intern("method_missing"); + + idThrowState = rb_intern("#__ThrowState__"); + + idBitblt = rb_intern("bitblt"); + idAnswer = rb_intern("the_answer_to_life_the_universe_and_everything"); + idSvarPlaceholder = rb_intern("#svar"); + +#if TEST_AOT_COMPILE + Init_compiled(); +#endif + // make vm + { + /* create vm object */ + VALUE vmval = vm_alloc(cYarvVM); + VALUE thval; + + yarv_vm_t *vm; + yarv_thread_t *th; + vm = theYarvVM; + + xfree(RDATA(vmval)->data); + RDATA(vmval)->data = vm; + vm->self = vmval; + + yarvVMArray = rb_ary_new(); + rb_register_mark_object(yarvVMArray); + rb_ary_push(yarvVMArray, vm->self); + + /* create main thread */ + thval = yarv_thread_alloc(cYarvThread); + GetThreadPtr(thval, th); + + vm->main_thread = th; + vm->running_thread = th; + GET_THREAD()->vm = vm; + thread_free(GET_THREAD()); + th->vm = vm; + yarv_set_current_running_thread(th); + + th->machine_stack_start = rb_gc_stack_start; + vm->living_threads = st_init_numtable(); + st_insert(vm->living_threads, th->self, (st_data_t) th->thread_id); + + Init_yarvthread(); + th->thgroup = th->vm->thgroup_default; + } + yarv_init_redefined_flag(); +} + +static void +test(void) +{ + int i; + int *p; + printf("!test!\n"); + for (i = 0; i < 1000000; i++) { + p = ALLOC(int); + } +} + +void +Init_yarv(void) +{ + /* initialize main thread */ + yarv_vm_t *vm = ALLOC(yarv_vm_t); + yarv_thread_t *th = ALLOC(yarv_thread_t); + + vm_init2(vm); + theYarvVM = vm; + + th_init2(th); + th->vm = vm; + th->machine_stack_start = rb_gc_stack_start; + yarv_set_current_running_thread_raw(th); +} diff --git a/yarvcore.h b/yarvcore.h new file mode 100644 index 0000000000..5da48a95c1 --- /dev/null +++ b/yarvcore.h @@ -0,0 +1,638 @@ +/********************************************************************** + + yarvcore.h - + + $Author$ + $Date$ + created at: 04/01/01 19:41:38 JST + + Copyright (C) 2004-2006 Koichi Sasada + +**********************************************************************/ + +#ifndef _YARVCORE_H_INCLUDED_ +#define _YARVCORE_H_INCLUDED_ + +#define YARV_THREAD_MODEL 2 + +#include <setjmp.h> + +#if 0 && defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT) +#include <ucontext.h> +#define USE_CONTEXT +#endif +#include "ruby.h" +#include "st.h" + +#include "debug.h" +#include "vm_opts.h" + +#if defined(_WIN32) || defined(__CYGWIN__) +#include "thread_win32.h" +#elif defined(HAVE_PTHREAD_H) +#include "thread_pthread.h" +#else +#error "unsupported thread type" +#endif + +#include <signal.h> + +#ifndef NSIG +# ifdef DJGPP +# define NSIG SIGMAX +# else +# define NSIG (_SIGMAX + 1) /* For QNX */ +# endif +#endif + +#define RUBY_NSIG NSIG + +/*****************/ +/* configuration */ +/*****************/ + +/* gcc ver. check */ +#if defined(__GNUC__) && __GNUC__ >= 2 + +#if OPT_TOKEN_THREADED_CODE +#if OPT_DIRECT_THREADED_CODE +#undef OPT_DIRECT_THREADED_CODE +#endif +#endif + +#else /* defined(__GNUC__) && __GNUC__ >= 2 */ + +/* disable threaded code options */ +#if OPT_DIRECT_THREADED_CODE +#undef OPT_DIRECT_THREADED_CODE +#endif +#if OPT_TOKEN_THREADED_CODE +#undef OPT_TOKEN_THREADED_CODE +#endif +#endif + +/* call threaded code */ +#if OPT_CALL_THREADED_CODE +#if OPT_DIRECT_THREADED_CODE +#undef OPT_DIRECT_THREADED_CODE +#endif /* OPT_DIRECT_THREADED_CODE */ +#if OPT_STACK_CACHING +#undef OPT_STACK_CACHING +#endif /* OPT_STACK_CACHING */ +#define YARV_AOT_COMPILED 1 +#endif /* OPT_CALL_THREADED_CODE */ + +/* likely */ +#if __GNUC__ >= 3 +#define LIKELY(x) (__builtin_expect((x), 1)) +#define UNLIKELY(x) (__builtin_expect((x), 0)) +#else /* __GNUC__ >= 3 */ +#define LIKELY(x) (x) +#define UNLIKELY(x) (x) +#endif /* __GNUC__ >= 3 */ + +#define YARVDEBUG 0 +#define CPDEBUG 0 +#define VMDEBUG 0 +#define GCDEBUG 0 + + + + +/* classes and modules */ +extern VALUE mYarvCore; +extern VALUE cYarvISeq; +extern VALUE cYarvVM; +extern VALUE cYarvThread; +extern VALUE mYarvInsns; +extern VALUE cYarvEnv; +extern VALUE cYarvProc; +extern VALUE cYarvBinding; + +extern VALUE symIFUNC; +extern VALUE symCFUNC; + +/* special id */ +extern ID idPLUS; +extern ID idMINUS; +extern ID idMULT; +extern ID idDIV; +extern ID idMOD; +extern ID idLT; +extern ID idLTLT; +extern ID idLE; +extern ID idEq; +extern ID idEqq; +extern ID idBackquote; +extern ID idEqTilde; +extern ID idThrowState; +extern ID idAREF; +extern ID idASET; +extern ID idIntern; +extern ID idMethodMissing; +extern ID idLength; +extern ID idGets; +extern ID idSucc; +extern ID idEach; +extern ID idLambda; +extern ID idRangeEachLT; +extern ID idRangeEachLE; +extern ID idArrayEach; +extern ID idTimes; +extern ID idEnd; +extern ID idBitblt; +extern ID idAnswer; +extern ID idSvarPlaceholder; + +extern unsigned long yarvGlobalStateVersion; + +struct insn_info_struct { + unsigned short position; + unsigned short line_no; +}; + +#define ISEQ_TYPE_TOP INT2FIX(1) +#define ISEQ_TYPE_METHOD INT2FIX(2) +#define ISEQ_TYPE_BLOCK INT2FIX(3) +#define ISEQ_TYPE_CLASS INT2FIX(4) +#define ISEQ_TYPE_RESCUE INT2FIX(5) +#define ISEQ_TYPE_ENSURE INT2FIX(6) +#define ISEQ_TYPE_EVAL INT2FIX(7) +#define ISEQ_TYPE_DEFINED_GUARD INT2FIX(8) + +#define CATCH_TYPE_RESCUE INT2FIX(1) +#define CATCH_TYPE_ENSURE INT2FIX(2) +#define CATCH_TYPE_RETRY INT2FIX(3) +#define CATCH_TYPE_BREAK INT2FIX(4) +#define CATCH_TYPE_REDO INT2FIX(5) +#define CATCH_TYPE_NEXT INT2FIX(6) + +struct catch_table_entry { + VALUE type; + VALUE iseq; + unsigned long start; + unsigned long end; + unsigned long cont; + unsigned long sp; +}; + +#define INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE (512) + +struct iseq_compile_data_storage { + struct iseq_compile_data_storage *next; + unsigned long pos; + unsigned long size; + char *buff; +}; + +struct iseq_compile_data_ensure_node_stack; + +typedef struct yarv_compile_option_struct { + int inline_const_cache; + int peephole_optimization; + int specialized_instruction; + int operands_unification; + int instructions_unification; + int stack_caching; +} yarv_compile_option_t; + +struct iseq_compile_data { + /* GC is needed */ + VALUE err_info; + VALUE mark_ary; + VALUE catch_table_ary; /* Array */ + + /* GC is not needed */ + struct iseq_label_data *start_label; + struct iseq_label_data *end_label; + struct iseq_label_data *redo_label; + VALUE current_block; + VALUE loopval_popped; /* used by NODE_BREAK */ + VALUE ensure_node; + VALUE for_iseq; + struct iseq_compile_data_ensure_node_stack *ensure_node_stack; + int cached_const; + struct iseq_compile_data_storage *storage_head; + struct iseq_compile_data_storage *storage_current; + int last_line; + const yarv_compile_option_t *option; +}; + +#define GetISeqPtr(obj, ptr) Data_Get_Struct(obj, yarv_iseq_t, ptr) + +typedef struct yarv_iseq_profile_struct { + VALUE count; + VALUE time_self; + VALUE time_cumu; /* cumulative */ +} yarv_iseq_profile_t; + +struct yarv_iseq_struct; + +struct yarv_iseq_struct { + /* instruction sequence type */ + VALUE type; + + VALUE self; + VALUE name; /* String: iseq name */ + VALUE *iseq; /* iseq */ + VALUE *iseq_encoded; + VALUE iseq_mark_ary; /* Array: includes operands which should be GC marked */ + + /* sequence size */ + unsigned long size; + + /* insn info, must be freed */ + struct insn_info_struct *insn_info_tbl; + + /* insn info size, this value shows also instruction count */ + unsigned int insn_info_size; + + /* file information where this sequence from */ + VALUE file_name; + + ID *local_tbl; /* must free */ + int local_size; + + /* jit compiled or not */ + void *jit_compiled; + void *iseq_orig; + + /** + * argument information + * + * def m(a1, a2, ..., aM, b1=(...), b2=(...), ..., bN=(...), *c, &d) + * => + * + * argc = M + * arg_rest = M+N + 1 // if no rest arguments, rest is 0 + * arg_opts = N + * arg_opts_tbl = [ (N entries) ] + * arg_block = M+N + 1 (rest) + 1 (block) + * check: + * M <= num + */ + + int argc; + int arg_simple; + int arg_rest; + int arg_block; + int arg_opts; + VALUE *arg_opt_tbl; + + /* for stack overflow check */ + int stack_max; + + /* klass/module nest information stack (cref) */ + NODE *cref_stack; + VALUE klass; + + /* catch table */ + struct catch_table_entry *catch_table; + int catch_table_size; + + /* for child iseq */ + struct yarv_iseq_struct *parent_iseq; + struct yarv_iseq_struct *local_iseq; + + /* block inlining */ + NODE *node; + void *special_block_builder; + void *cached_special_block_builder; + VALUE cached_special_block; + + /* misc */ + ID defined_method_id; /* for define_method */ + yarv_iseq_profile_t profile; + + struct iseq_compile_data *compile_data; +}; + +typedef struct yarv_iseq_struct yarv_iseq_t; + +#define GetVMPtr(obj, ptr) \ + Data_Get_Struct(obj, yarv_vm_t, ptr) + +struct yarv_thread_struct; + +typedef struct yarv_vm_struct { + VALUE self; + + yarv_thread_lock_t global_interpreter_lock; + + struct yarv_thread_struct *main_thread; + struct yarv_thread_struct *running_thread; + + st_table *living_threads; + VALUE thgroup_default; + + int thread_abort_on_exception; + int exit_code; + unsigned long trace_flag; + + /* object management */ + VALUE mark_object_ary; + + int signal_buff[RUBY_NSIG]; + int bufferd_signal_size; +} yarv_vm_t; + +typedef struct { + VALUE *pc; // cfp[0] + VALUE *sp; // cfp[1] + VALUE *bp; // cfp[2] + yarv_iseq_t *iseq; // cfp[3] + VALUE magic; // cfp[4] + VALUE self; // cfp[5] // block[0] + VALUE *lfp; // cfp[6] // block[1] + VALUE *dfp; // cfp[7] // block[2] + yarv_iseq_t *block_iseq; // cfp[8] // block[3] + VALUE proc; // cfp[9] // block[4] + ID callee_id; // cfp[10] + ID method_id; // cfp[11] saved in special case + VALUE method_klass; // cfp[12] saved in special case + VALUE prof_time_self; // cfp[13] + VALUE prof_time_chld; // cfp[14] + VALUE dummy; // cfp[15] +} yarv_control_frame_t; + +typedef struct { + VALUE self; /* share with method frame if it's only block */ + VALUE *lfp; /* share with method frame if it's only block */ + VALUE *dfp; /* share with method frame if it's only block */ + yarv_iseq_t *iseq; + VALUE proc; +} yarv_block_t; + +#define GetThreadPtr(obj, ptr) \ + Data_Get_Struct(obj, yarv_thread_t, ptr) + +enum yarv_thread_status { + THREAD_TO_KILL, + THREAD_RUNNABLE, + THREAD_STOPPED, + THREAD_KILLED, +}; + +#ifdef USE_CONTEXT +typedef struct { + ucontext_t context; + volatile int status; +} rb_jmpbuf_t[1]; +#else +typedef jmp_buf rb_jmpbuf_t; +#endif + +struct yarv_tag { + rb_jmpbuf_t buf; + VALUE tag; + VALUE retval; + struct yarv_tag *prev; +}; + +typedef void yarv_interrupt_function_t(struct yarv_thread_struct *); + +#define YARV_VALUE_CACHE_SIZE 0x1000 +#define USE_VALUE_CACHE 1 + +typedef struct yarv_thread_struct +{ + VALUE self; + yarv_vm_t *vm; + + /* execution information */ + VALUE *stack; /* must free, must mark */ + unsigned long stack_size; + yarv_control_frame_t *cfp; + int safe_level; + int raised_flag; + + /* passing state */ + int state; + + /* for rb_iterate */ + yarv_block_t *passed_block; + + /* passed via parse.y, eval.c (rb_scope_setup_local_tbl) */ + ID *top_local_tbl; + + /* eval env */ + yarv_block_t *base_block; + + VALUE *local_lfp; + VALUE local_svar; + + /* thread control */ + yarv_thread_id_t thread_id; + enum yarv_thread_status status; + int priority; + + native_thread_data_t native_thread_data; + + VALUE thgroup; + VALUE value; + + VALUE errinfo; + VALUE throwed_errinfo; + int exec_signal; + + int interrupt_flag; + yarv_interrupt_function_t *interrupt_function; + yarv_thread_lock_t interrupt_lock; + + struct yarv_tag *tag; + + int parse_in_eval; + + /* storage */ + st_table *local_storage; +#if USE_VALUE_CACHE + VALUE value_cache[YARV_VALUE_CACHE_SIZE + 1]; + VALUE *value_cache_ptr; +#endif + + struct yarv_thread_struct *join_list_next; + struct yarv_thread_struct *join_list_head; + + VALUE first_proc; + VALUE first_args; + + /* for GC */ + VALUE *machine_stack_start; + VALUE *machine_stack_end; + jmp_buf machine_regs; + + /* statistics data for profiler */ + VALUE stat_insn_usage; + + /* misc */ + int method_missing_reason; + int abort_on_exception; +} yarv_thread_t; + +/** node -> yarv instruction sequence object */ +VALUE iseq_compile(VALUE self, NODE *node); + +VALUE yarv_iseq_new(NODE *node, VALUE name, VALUE file, + VALUE parent, VALUE type); + +VALUE yarv_iseq_new_with_bopt(NODE *node, VALUE name, VALUE file_name, + VALUE parent, VALUE type, VALUE bopt); + +VALUE yarv_iseq_new_with_opt(NODE *node, VALUE name, VALUE file, + VALUE parent, VALUE type, + const yarv_compile_option_t *opt); + +/** disassemble instruction sequence */ +VALUE iseq_disasm(VALUE self); +VALUE iseq_disasm_insn(VALUE str, VALUE *iseqval, int pos, + yarv_iseq_t *iseq, VALUE child); +char *node_name(int node); + + +/* each thread has this size stack : 2MB */ +#define YARV_THREAD_STACK_SIZE (128 * 1024) + + +/* from ruby 1.9 variable.c */ +struct global_entry { + struct global_variable *var; + ID id; +}; + +#define GetProcPtr(obj, ptr) \ + Data_Get_Struct(obj, yarv_proc_t, ptr) + +typedef struct { + yarv_block_t block; + + VALUE envval; /* for GC mark */ + VALUE blockprocval; + int safe_level; + int is_lambda; + + NODE *special_cref_stack; +} yarv_proc_t; + +#define GetEnvPtr(obj, ptr) \ + Data_Get_Struct(obj, yarv_env_t, ptr) + +typedef struct { + VALUE *env; + int env_size; + int local_size; + VALUE prev_envval; /* for GC mark */ + yarv_block_t block; +} yarv_env_t; + +#define GetBindingPtr(obj, ptr) \ + Data_Get_Struct(obj, yarv_binding_t, ptr) + +typedef struct { + VALUE env; + NODE *cref_stack; +} yarv_binding_t; + + +/* used by compile time and send insn */ +#define VM_CALL_ARGS_SPLAT_BIT 0x01 +#define VM_CALL_ARGS_BLOCKARG_BIT 0x02 +#define VM_CALL_FCALL_BIT 0x04 +#define VM_CALL_VCALL_BIT 0x08 +#define VM_CALL_TAILCALL_BIT 0x10 +#define VM_CALL_TAILRECURSION_BIT 0x20 +#define VM_CALL_SUPER_BIT 0x40 + +/* inline method cache */ +#define NEW_INLINE_CACHE_ENTRY() NEW_WHILE(Qundef, 0, 0) +#define ic_klass u1.value +#define ic_method u2.node +#define ic_value u2.value +#define ic_vmstat u3.cnt +typedef NODE *IC; + +typedef VALUE CDHASH; + + +#define GC_GUARDED_PTR(p) ((VALUE)((VALUE)(p) | 0x01)) +#define GC_GUARDED_PTR_REF(p) ((void *)(((VALUE)p) & ~0x03)) +#define GC_GUARDED_PTR_P(p) (((VALUE)p) & 0x01) + +#define YARV_METHOD_NODE NODE_METHOD + +#define YARV_PREVIOUS_CONTROL_FRAME(cfp) (cfp+1) +#define YARV_NEXT_CONTROL_FRAME(cfp) (cfp-1) +#define YARV_END_CONTROL_FRAME(th) \ + ((yarv_control_frame_t *)((th)->stack + (th)->stack_size)) +#define YARV_VALID_CONTROL_FRAME_P(cfp, ecfp) \ + ((void *)(ecfp) > (void *)(cfp)) +#define YARV_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp) \ + (!YARV_VALID_CONTROL_FRAME_P((cfp), YARV_END_CONTROL_FRAME(th))) + +#define YARV_IFUNC_P(ptr) (BUILTIN_TYPE(ptr) == T_NODE) +#define YARV_NORMAL_ISEQ_P(ptr) \ + (ptr && !YARV_IFUNC_P(ptr)) + +#define YARV_CLASS_SPECIAL_P(ptr) (((VALUE)(ptr)) & 0x02) +#define YARV_BLOCK_PTR_P(ptr) (!YARV_CLASS_SPECIAL_P(ptr) && GC_GUARDED_PTR_REF(ptr)) + +#define GET_BLOCK_PTR_IN_CFP(cfp) ((yarv_block_t *)(&(cfp)->self)) +#define GET_CFP_FROM_BLOCK_PTR(b) \ + ((yarv_control_frame_t *)((VALUE *)(b) - 5)) + + +/* defined? */ +#define DEFINED_IVAR INT2FIX(1) +#define DEFINED_GVAR INT2FIX(2) +#define DEFINED_CVAR INT2FIX(3) +#define DEFINED_CONST INT2FIX(4) +#define DEFINED_METHOD INT2FIX(5) +#define DEFINED_YIELD INT2FIX(6) +#define DEFINED_REF INT2FIX(7) +#define DEFINED_ZSUPER INT2FIX(8) +#define DEFINED_FUNC INT2FIX(9) + +/* VM related object allocate functions */ +/* TODO: should be static functions */ +VALUE yarv_thread_alloc(VALUE klass); +VALUE yarv_env_alloc(VALUE klass); +VALUE yarv_proc_alloc(VALUE klass); +VALUE yarv_binding_alloc(VALUE klass); + + +/* for debug */ +extern void vm_stack_dump_raw(yarv_thread_t *, yarv_control_frame_t *); +#define SDR() vm_stack_dump_raw(GET_THREAD(), GET_THREAD()->cfp) +#define SDR2(cfp) vm_stack_dump_raw(GET_THREAD(), (cfp)) + +/* for thread */ + +#include "yarv.h" + +#define GVL_UNLOCK_BEGIN() do { \ + yarv_thread_t *_th_stored = GET_THREAD(); \ + yarv_save_machine_context(_th_stored); \ + native_mutex_unlock(&_th_stored->vm->global_interpreter_lock) + +#define GVL_UNLOCK_END() \ + native_mutex_lock(&_th_stored->vm->global_interpreter_lock); \ + yarv_set_current_running_thread(_th_stored); \ +} while(0) + +NOINLINE(void yarv_set_stack_end(VALUE **stack_end_p)); +NOINLINE(void yarv_save_machine_context(yarv_thread_t *)); + +extern int rb_thread_pending; + +void yarv_thread_execute_interrupts(yarv_thread_t *); + +#define YARV_CHECK_INTS_TH(th) do { \ + if(th->interrupt_flag){ \ + /* TODO: trap something event */ \ + yarv_thread_execute_interrupts(th); \ + } \ +} while (0) + +#define YARV_CHECK_INTS() \ + YARV_CHECK_INTS_TH(GET_THREAD()) + +#endif // _YARVCORE_H_INCLUDED_ diff --git a/yarvtest/runner.rb b/yarvtest/runner.rb new file mode 100644 index 0000000000..25b813e99c --- /dev/null +++ b/yarvtest/runner.rb @@ -0,0 +1,10 @@ +require 'test/unit'
+
+if $0 == __FILE__
+ # exit Test::Unit::AutoRunner.run(false, File.dirname($0))
+ Dir.glob(File.dirname($0) + '/test_*'){|file|
+ p file
+ require file
+ }
+end
+
diff --git a/yarvtest/test_bin.rb b/yarvtest/test_bin.rb new file mode 100644 index 0000000000..5f587b5a8c --- /dev/null +++ b/yarvtest/test_bin.rb @@ -0,0 +1,585 @@ +require 'yarvtest/yarvtest' + +# test of basic instruction +class TestBIN < YarvTestBase + + def test_literal + ae %q(true) + ae %q(false) + ae %q(nil) + ae %q(1234) + ae %q(:sym) + ae %q(123456789012345678901234567890) + ae %q(1.234) + ae %q(0x12) + ae %q(0b0101001) + ae %q(1_2_3) # 123 + end + + def test_self + ae %q(self) + end + + def test_string + ae %q('str') + end + + def test_dstring + ae %q( + "1+1 = #{1+1}" + ) + ae %q{ + i = 10 + "#{i} ** #{i} = #{i ** i}" + } + ae %q{ + s = "str" + s.__id__ == "#{s}".__id__ + } + end + + def test_dsym + ae %q{ + :"a#{1+2}c" + } + end + + def test_xstr + ae %q(`echo hoge`) + ae %q(hoge = 'huga'; `echo #{hoge}`) + end + + def test_regexp + ae %q{ + /test/ =~ 'test' + } + ae %q{ + /test/ =~ 'tes' + } + ae %q{ + r = /test/; l = 'test' + r =~ l + } + ae %q{ + r = /testx/; l = 'test' + r =~ l + } + ae %q{ + i = 10 + /test#{i}/ =~ 'test10' + } + ae %q{ + i = 10 + /test#{i}/ =~ 'test20' + } + ae %q{ + :sym =~ /sym/ + } + ae %q{ + sym = :sym + sym =~ /sym/ + } + ae %q{ + reg = /sym/ + :sym =~ reg + } + end + + def test_array + ae %q([]) + ae %q([1,2,3]) + ae %q([1+1,2+2,3+3]) + ae %q([0][0]+=3) + ae %q([0][0]-=3) + end + + def test_array_access + ae %q(ary = [1,2,3]; ary[1]) + ae %q(ary = [1,2,3]; ary[1] = 10) + ae %q(ary = Array.new(10, 100); ary[3]) + end + + def test_hash + ae %q({}) + ae %q({1 => 2}) + ae %q({"str" => "val", "str2" => "valval"}) + ae %q({1 => 2, 1=>3}) + end + + def test_range + ae %q((1..2)) + ae %q((1...2)) + ae %q(((1+1)..(2+2))) + ae %q(((1+1)...(2+2))) + end + + def test_not + ae %q(!true) + ae %q(!nil) + ae %q(!false) + ae %q(!(1+1)) + ae %q(!!nil) + ae %q(!!1) + end + + # var + def test_local + ae %q(a = 1) + ae %q(a = 1; b = 2; a) + ae %q(a = b = 3) + ae %q(a = b = 3; a) + ae %q(a = b = c = 4) + ae %q(a = b = c = 4; c) + end + + def test_constant + ae %q(C = 1; C) + ae %q(C = 1; $a = []; 2.times{$a << ::C}; $a) + ae %q( + class A + class B + class C + Const = 1 + end + end + end + (1..2).map{ + A::B::C::Const + } + ) do + remove_const :A + end + + ae %q( + class A + class B + Const = 1 + class C + (1..2).map{ + Const + } + end + end + end + ) do + remove_const :A + end + + ae %q( + class A + Const = 1 + class B + class C + (1..2).map{ + Const + } + end + end + end + ) do + remove_const :A + end + + ae %q( + Const = 1 + class A + class B + class C + (1..2).map{ + Const + } + end + end + end + ) do + remove_const :A + remove_const :Const + end + + ae %q{ + C = 1 + begin + C::D + rescue TypeError + :ok + else + :ng + end + } + end + + def test_constant2 + ae %q{ + class A + class B + C = 10 + end + end + i = 0 + while i<3 + i+=1 + r = A::B::C + end + r + } do + remove_const :A + end + + ae %q{ + class A + class B + C = 10 + end + end + i = 0 + while i<3 + i+=1 + r = A::B::C + class A::B + remove_const :C + end + A::B::C = i**i + end + r + } do + remove_const :A + end + + ae %q{ + class C + Const = 1 + (1..3).map{ + self::Const + } + end + } + ae %q{ + class C + Const = 1 + (1..3).map{ + eval('self')::Const + } + end + } + ae %q{ + class C + Const = 0 + def self.foo() + self::Const + end + end + + class D < C + Const = 1 + end + + class E < C + Const = 2 + end + + [C.foo, D.foo, E.foo] + } + end + + def test_gvar + ae %q( + $g1 = 1 + ) + + ae %q( + $g2 = 2 + $g2 + ) + end + + def test_cvar + ae %q{ + class C + @@c = 1 + def m + @@c += 1 + end + end + + C.new.m + } do + remove_const :C + end + end + + def test_cvar_from_singleton + ae %q{ + class C + @@c=1 + class << self + def m + @@c += 1 + end + end + end + C.m + } do + remove_const :C + end + end + + def test_cvar_from_singleton2 + ae %q{ + class C + @@c = 1 + def self.m + @@c += 1 + end + end + C.m + } do + remove_const :C + end + end + + def test_op_asgin2 + ae %q{ + class C + attr_accessor :a + end + r = [] + o = C.new + o.a &&= 1 + r << o.a + o.a ||= 2 + r << o.a + o.a &&= 3 + r << o.a + r + } do + remove_const :C + end + ae %q{ + @@x ||= 1 + } + ae %q{ + @@x = 0 + @@x ||= 1 + } + end + + def test_op_assgin_and_or + ae %q{ + r = [] + a = 1 ; a ||= 2; r << a + a = nil; a ||= 2; r << a + a = 1 ; a &&= 2; r << a + a = nil; a &&= 2; r << a + r + } + ae %q{ + a = {} + a[0] ||= 1 + } + ae %q{ + a = {} + a[0] &&= 1 + } + ae %q{ + a = {0 => 10} + a[0] ||= 1 + } + ae %q{ + a = {0 => 10} + a[0] &&= 1 + } + end + + def test_backref + ae %q{ + /a(b)(c)d/ =~ 'xyzabcdefgabcdefg' + [$1, $2, $3, $~.class, $&, $`, $', $+] + } + + ae %q{ + def m + /a(b)(c)d/ =~ 'xyzabcdefgabcdefg' + [$1, $2, $3, $~.class, $&, $`, $', $+] + end + m + } + end + + def test_fact + ae %q{ + def fact(n) + if(n > 1) + n * fact(n-1) + else + 1 + end + end + fact(300) + } + end + + def test_mul + ae %q{ + 2*0 + } + ae %q{ + 0*2 + } + ae %q{ + 2*2 + } + end + + def test_div + ae %q{ + 3/2 + } + ae %q{ + 3.0/2.0 + } + ae %q{ + class C + def /(a) + a * 100 + end + end + C.new/3 + } do + remove_const :C + end + end + + def test_length + ae %q{ + [].length + } + ae %q{ + [1, 2].length + } + ae %q{ + {}.length + } + ae %q{ + {:a => 1, :b => 2}.length + } + ae %q{ + class C + def length + 'hoge' + end + end + C.new.length + } do + remove_const :C + end + end + + def test_mod + ae %q{ + 3%2 + } + ae %q{ + 3.0%2.0 + } + ae %q{ + class C + def % (a) + a * 100 + end + end + C.new%3 + } do + remove_const :C + end + end + + def test_attr_set + ae %q{ + o = Object.new + def o.[]=(*args) + args + end + [o[]=:x, o[0]=:x, o[0, 1]=:x, o[0, 1, 2]=:x] + } + ae %q{ + o = Object.new + def o.foo=(*args) + args + end + o.foo = :x + } + ae %q{ + $r = [] + class C + def [](*args) + $r << [:ref, args] + args.size + end + + def []=(*args) + $r << [:set, args] + args.size + end + end + + o = C.new + ary = [:x, :y] + o[1] = 2 + o[1, 2] = 3 + o[1, 2, *ary] = 3 + o[1, 2, *ary, 3] = 4 + $r + } + end + + def test_aref_aset + ae %q{ + a = [] + a << 0 + a[1] = 1 + a[2] = 2 + a[3] = a[1] + a[2] + } + ae %q{ + a = {} + a[1] = 1 + a[2] = 2 + a[3] = a[1] + a[2] + a.sort + } + ae %q{ + class C + attr_reader :a, :b + def [](a) + @a = a + end + + def []=(a, b) + @b = [a, b] + end + end + c = C.new + c[3] + c[4] = 5 + [c.a, c.b] + } do + remove_const :C + end + end + + def test_array_concat + ae %q{ + ary = [] + [:x, *ary] + } + #ae %q{ + # ary = 1 + # [:x, *ary] + #} + ae %q{ + ary = [1, 2] + [:x, *ary] + } + end +end + diff --git a/yarvtest/test_block.rb b/yarvtest/test_block.rb new file mode 100644 index 0000000000..87800da5f6 --- /dev/null +++ b/yarvtest/test_block.rb @@ -0,0 +1,429 @@ +require 'yarvtest/yarvtest'
+
+class TestBlock < YarvTestBase
+ def test_simple
+ ae %q(
+ def m
+ yield
+ end
+ m{
+ 1
+ }
+ )
+ end
+
+ def test_param
+ ae %q(
+ def m
+ yield 1
+ end
+ m{|ib|
+ ib*2
+ }
+ )
+
+ ae %q(
+ def m
+ yield 12345, 67890
+ end
+ m{|ib,jb|
+ ib*2+jb
+ }
+ )
+ end
+
+ def test_param2
+ ae %q{
+ def iter
+ yield 10
+ end
+
+ a = nil
+ [iter{|a|
+ a
+ }, a]
+ }
+ ae %q{
+ def iter
+ yield 10
+ end
+
+ iter{|a|
+ iter{|a|
+ a + 1
+ } + a
+ }
+ }
+ ae %q{
+ def iter
+ yield 10, 20, 30, 40
+ end
+
+ a = b = c = d = nil
+ iter{|a, b, c, d|
+ [a, b, c, d]
+ } + [a, b, c, d]
+ }
+ ae %q{
+ def iter
+ yield 10, 20, 30, 40
+ end
+
+ a = b = nil
+ iter{|a, b, c, d|
+ [a, b, c, d]
+ } + [a, b]
+ }
+ ae %q{
+ def iter
+ yield 10, 20, 30, 40
+ end
+
+ a = nil
+ iter{|a, $b, @c, d|
+ [a, $b]
+ } + [a, $b, @c]
+ } if false # 1.9 doesn't support expr block parameters
+ end
+
+ def test_param3
+ if false
+ # TODO: Ruby 1.9 doesn't support expr block parameter
+ ae %q{
+ h = {}
+ [1].each{|h[:foo]|}
+ h
+ }
+ ae %q{
+ obj = Object.new
+ def obj.x=(y)
+ $ans = y
+ end
+ [1].each{|obj.x|}
+ $ans
+ }
+ end
+ end
+
+ def test_blocklocal
+ ae %q{
+ 1.times{
+ begin
+ a = 1
+ ensure
+ foo = nil
+ end
+ }
+ }
+ end
+
+ def test_simplenest
+ ae %q(
+ def m
+ yield 123
+ end
+ m{|ib|
+ m{|jb|
+ ib*jb
+ }
+ }
+ )
+ end
+
+ def test_simplenest2
+ ae %q(
+ def m a
+ yield a
+ end
+ m(1){|ib|
+ m(2){|jb|
+ ib*jb
+ }
+ }
+ )
+ end
+
+ def test_nest2
+ ae %q(
+ def m
+ yield
+ end
+ def n
+ yield
+ end
+
+ m{
+ n{
+ 100
+ }
+ }
+ )
+
+ ae %q(
+ def m
+ yield 1
+ end
+
+ m{|ib|
+ m{|jb|
+ i = 20
+ }
+ }
+ )
+
+ ae %q(
+ def m
+ yield 1
+ end
+
+ m{|ib|
+ m{|jb|
+ ib = 20
+ kb = 2
+ }
+ }
+ )
+
+ ae %q(
+ def iter1
+ iter2{
+ yield
+ }
+ end
+
+ def iter2
+ yield
+ end
+
+ iter1{
+ jb = 2
+ iter1{
+ jb = 3
+ }
+ jb
+ }
+ )
+
+ ae %q(
+ def iter1
+ iter2{
+ yield
+ }
+ end
+
+ def iter2
+ yield
+ end
+
+ iter1{
+ jb = 2
+ iter1{
+ jb
+ }
+ jb
+ }
+ )
+ end
+
+ def test_ifunc
+ ae %q{
+ (1..3).to_a
+ }
+
+ ae %q{
+ (1..3).map{|e|
+ e * 4
+ }
+ }
+
+ ae %q{
+ class C
+ include Enumerable
+ def each
+ [1,2,3].each{|e|
+ yield e
+ }
+ end
+ end
+
+ C.new.to_a
+ }
+
+ ae %q{
+ class C
+ include Enumerable
+ def each
+ [1,2,3].each{|e|
+ yield e
+ }
+ end
+ end
+
+ C.new.map{|e|
+ e + 3
+ }
+ }
+ end
+
+ def test_times
+ ae %q{
+ sum = 0
+ 3.times{|ib|
+ 2.times{|jb|
+ sum += ib + jb
+ }}
+ sum
+ }
+ ae %q{
+ 3.times{|bl|
+ break 10
+ }
+ }
+ end
+
+ def test_for
+ ae %q{
+ sum = 0
+ for x in [1, 2, 3]
+ sum += x
+ end
+ sum
+ }
+ ae %q{
+ sum = 0
+ for x in (1..5)
+ sum += x
+ end
+ sum
+ }
+ ae %q{
+ sum = 0
+ for x in []
+ sum += x
+ end
+ sum
+ }
+ ae %q{
+ ans = []
+ 1.times{
+ for n in 1..3
+ a = n
+ ans << a
+ end
+ }
+ }
+ ae %q{
+ ans = []
+ for m in 1..3
+ for n in 1..3
+ a = [m, n]
+ ans << a
+ end
+ end
+ }
+ end
+
+ def test_unmatched_params
+ ae %q{
+ def iter
+ yield 1,2,3
+ end
+
+ iter{|i, j|
+ [i, j]
+ }
+ }
+ ae %q{
+ def iter
+ yield 1
+ end
+
+ iter{|i, j|
+ [i, j]
+ }
+ }
+ end
+
+ def test_rest
+ # TODO: known bug
+ #ae %q{
+ # def iter
+ # yield 1, 2
+ # end
+ #
+ # iter{|a, |
+ # [a]
+ # }
+ #}
+ ae %q{
+ def iter
+ yield 1, 2
+ end
+
+ iter{|a, *b|
+ [a, b]
+ }
+ }
+ ae %q{
+ def iter
+ yield 1, 2
+ end
+
+ iter{|*a|
+ [a]
+ }
+ }
+ ae %q{
+ def iter
+ yield 1, 2
+ end
+
+ iter{|a, b, *c|
+ [a, b, c]
+ }
+ }
+ ae %q{
+ def iter
+ yield 1, 2
+ end
+
+ iter{|a, b, c, *d|
+ [a, b, c, d]
+ }
+ }
+ end
+
+ def test_param_and_locals
+ ae %q{
+ $a = []
+
+ def iter
+ yield 1
+ end
+
+ def m
+ x = iter{|x|
+ $a << x
+ y = 0
+ }
+ end
+ m
+ $a
+ }
+ end
+
+ def test_c_break
+ ae %q{
+ [1,2,3].find{|x| x == 2}
+ }
+ ae %q{
+ class E
+ include Enumerable
+ def each(&block)
+ [1, 2, 3].each(&block)
+ end
+ end
+ E.new.find {|x| x == 2 }
+ }
+ end
+end
diff --git a/yarvtest/test_class.rb b/yarvtest/test_class.rb new file mode 100644 index 0000000000..1eab39f0d5 --- /dev/null +++ b/yarvtest/test_class.rb @@ -0,0 +1,753 @@ +require 'yarvtest/yarvtest'
+
+class TestClass < YarvTestBase
+
+ def test_simple
+ ae %q(
+ class C
+ def m(a,b)
+ a+b
+ end
+ end
+ C.new.m(1,2)
+ ) do
+ remove_const(:C)
+ end
+
+ ae %q(
+ class A
+ end
+ class A::B
+ def m
+ A::B.name
+ end
+ end
+ A::B.new.m
+ ) do
+ remove_const(:A)
+ end
+
+ #ae %q(
+ # class (class C;self; end)::D < C
+ # self.name
+ # end
+ #) do
+ # remove_const(:C)
+ #end
+
+ end
+
+ def test_sub
+ ae %q(
+ class A
+ def m
+ 123
+ end
+ end
+
+ class B < A
+ end
+
+ B.new.m
+ ) do
+ remove_const(:A)
+ remove_const(:B)
+ end
+
+ ae %q(
+ class A
+ class B
+ class C
+ def m
+ 456
+ end
+ end
+ end
+ end
+
+ class A::BB < A::B::C
+ end
+
+ A::BB.new.m
+ ) do
+ remove_const(:A)
+ end
+ end
+
+ def test_attr
+ ae %q(
+ class C
+ def set
+ @a = 1
+ end
+ def get
+ @a
+ end
+ end
+ c = C.new
+ c.set
+ c.get
+ ) do
+ remove_const(:C)
+ end
+ end
+
+ def test_initialize
+ ae %q{
+ class C
+ def initialize
+ @a = :C
+ end
+ def a
+ @a
+ end
+ end
+
+ C.new.a
+ } do
+ remove_const(:C)
+ end
+ end
+
+ def test_to_s
+ ae %q{
+ class C
+ def to_s
+ "hoge"
+ end
+ end
+
+ "ab#{C.new}cd"
+ } do
+ remove_const(:C)
+ end
+
+ end
+
+ def test_attr_accessor
+ ae %q{
+ class C
+ attr_accessor :a
+ attr_reader :b
+ attr_writer :c
+ def b_write
+ @b = 'huga'
+ end
+ def m a
+ 'test_attr_accessor' + @b + @c
+ end
+ end
+
+ c = C.new
+ c.a = true
+ c.c = 'hoge'
+ c.b_write
+ c.m(c.b)
+ } do
+ remove_const(:C)
+ end
+ end
+
+ def test_super
+ ae %q{
+ class C
+ def m1
+ 100
+ end
+
+ def m2 a
+ a + 100
+ end
+ end
+
+ class CC < C
+ def m1
+ super() * 100
+ end
+
+ def m2
+ super(200) * 100
+ end
+ end
+
+ a = CC.new
+ a.m1 + a.m2
+ } do
+ remove_const(:C)
+ remove_const(:CC)
+ end
+ end
+
+ def test_super2
+ ae %q{
+ class C
+ def m(a, b)
+ a+b
+ end
+ end
+
+ class D < C
+ def m arg
+ super(*arg) + super(1, arg.shift)
+ end
+ end
+
+ D.new.m([1, 2])
+ }
+
+ ae %q{
+ class C
+ def m
+ yield
+ end
+ end
+
+ class D < C
+ def m
+ super(){
+ :D
+ }
+ end
+ end
+
+ D.new.m{
+ :top
+ }
+ }
+ ae %q{
+ class C0
+ def m a, &b
+ [a, b]
+ end
+ end
+
+ class C1 < C0
+ def m a, &b
+ super a, &b
+ end
+ end
+
+ C1.new.m(10)
+ }
+ end
+
+ def test_zsuper_from_define_method
+ ae %q{
+ class C
+ def a
+ "C#a"
+ end
+ def m
+ "C#m"
+ end
+ end
+ class D < C
+ define_method(:m){
+ super
+ }
+ define_method(:a){
+ r = nil
+ 1.times{
+ r = super
+ }
+ r
+ }
+ end
+ D.new.m + D.new.a
+ }
+ ae %q{
+ class X
+ def a
+ "X#a"
+ end
+ def b
+ class << self
+ define_method(:a) {
+ super
+ }
+ end
+ end
+ end
+
+ x = X.new
+ x.b
+ x.a
+ }
+ ae %q{
+ class C
+ def m arg
+ "C#m(#{arg})"
+ end
+ def b
+ class << self
+ define_method(:m){|a|
+ super
+ }
+ end
+ self
+ end
+ end
+ C.new.b.m(:ok)
+ }
+ ae %q{
+ class C
+ def m *args
+ "C#m(#{args.join(', ')})"
+ end
+ def b
+ class << self
+ define_method(:m){|a, b|
+ r = nil
+ 1.times{
+ r = super
+ }
+ r
+ }
+ end
+ self
+ end
+ end
+ C.new.b.m(:ok1, :ok2)
+ } if false # ruby 1.9 dumped core
+ ae %q{ # [yarv-dev:859]
+ $ans = []
+ class A
+ def m_a
+ $ans << "m_a"
+ end
+ def def_m_a
+ $ans << "def_m_a"
+ end
+ end
+ class B < A
+ def def_m_a
+ B.class_eval{
+ super
+ define_method(:m_a) do
+ super
+ end
+ }
+ super
+ end
+ end
+ b = B.new
+ b.def_m_a
+ b.m_a
+ $ans
+ }
+ ae %q{
+ class A
+ def hoge
+ :hoge
+ end
+ def foo
+ :foo
+ end
+ end
+ class B < A
+ def memoize(name)
+ B.instance_eval do
+ define_method(name) do
+ [name, super]
+ end
+ end
+ end
+ end
+ b = B.new
+ b.memoize(:hoge)
+ b.memoize(:foo)
+ [b.foo, b.hoge]
+ }
+ end
+
+ def test_zsuper
+ ae %q{
+ class C
+ def m1
+ 100
+ end
+
+ def m2 a
+ a + 100
+ end
+
+ def m3 a
+ a + 200
+ end
+ end
+
+ class CC < C
+ def m1
+ super * 100
+ end
+
+ def m2 a
+ super * 100
+ end
+
+ def m3 a
+ a = 400
+ super * 100
+ end
+ end
+
+ a = CC.new
+ a.m1 + a.m2(200) + a.m3(300)
+ } do
+ remove_const(:C)
+ remove_const(:CC)
+ end
+ end
+
+ def test_zsuper2
+ ae %q{
+ class C1
+ def m
+ 10
+ end
+ end
+
+ class C2 < C1
+ def m
+ 20 + super
+ end
+ end
+
+ class C3 < C2
+ def m
+ 30 + super
+ end
+ end
+
+ C3.new.m
+ } do
+ remove_const(:C1)
+ remove_const(:C2)
+ remove_const(:C3)
+ end
+
+ ae %q{
+ class C
+ def m
+ yield
+ end
+ end
+
+ class D < C
+ def m
+ super{
+ :D
+ }
+ end
+ end
+
+ D.new.m{
+ :top
+ }
+ }
+ ae %q{
+ class C
+ def m(a, b, c, d)
+ a+b+c+d
+ end
+ end
+
+ class D < C
+ def m(a, b=1, c=2, *d)
+ d[0] ||= 0.1
+ [super,
+ begin
+ a *= 2
+ b *= 3
+ c *= 4
+ d[0] *= 5
+ super
+ end
+ ]
+ end
+ end
+ ary = []
+ ary << D.new.m(10, 20, 30, 40)
+ if false # On current ruby, these programs don't work
+ ary << D.new.m(10, 20, 30)
+ ary << D.new.m(10, 20)
+ ary << D.new.m(10)
+ end
+ ary
+ }
+ ae %q{
+ class C
+ def m(a, b, c, d)
+ a+b+c+d
+ end
+ end
+
+ class D < C
+ def m(a, b=1, c=2, d=3)
+ [super,
+ begin
+ a *= 2
+ b *= 3
+ c *= 4
+ d *= 5
+ super
+ end
+ ]
+ end
+ end
+ ary = []
+ ary << D.new.m(10, 20, 30, 40)
+ ary << D.new.m(10, 20, 30)
+ ary << D.new.m(10, 20)
+ ary << D.new.m(10)
+ ary
+ }
+ ae %q{
+ class C
+ def m(a, b, c, d, &e)
+ a+b+c+d+e.call
+ end
+ def n(a, b, c, d, &e)
+ a+b+c+d+e.call
+ end
+ end
+
+ class D < C
+ def m(a, b=1, c=2, *d, &e)
+ super
+ end
+ def n(a, b=1, c=2, d=3, &e)
+ super
+ end
+ end
+ ary = []
+ ary << D.new.m(1, 2, 3, 4){
+ 5
+ }
+ ary << D.new.m(1, 2, 3, 4, &lambda{
+ 5
+ })
+ ary << D.new.n(1, 2, 3){
+ 5
+ }
+ ary << D.new.n(1, 2){
+ 5
+ }
+ ary << D.new.n(1){
+ 5
+ }
+ ary
+ }
+ end
+
+ def test_super_with_private
+ ae %q{
+ class C
+ private
+ def m1
+ :OK
+ end
+ protected
+ def m2
+ end
+ end
+ class D < C
+ def m1
+ [super, super()]
+ end
+ def m2
+ [super, super()]
+ end
+ end
+ D.new.m1 + D.new.m2
+ }
+ end
+
+ def test_const_in_other_scope
+ ae %q{
+ class C
+ Const = :ok
+ def m
+ 1.times{
+ Const
+ }
+ end
+ end
+ C.new.m
+ } do
+ remove_const(:C)
+ end
+
+ ae %q{
+ class C
+ Const = 1
+ def m
+ begin
+ raise
+ rescue
+ Const
+ end
+ end
+ end
+ C.new.m
+ } do
+ remove_const(:C)
+ end
+ end
+
+ def test_reopen_not_class
+ ae %q{ # [yarv-dev:782]
+ begin
+ B = 1
+ class B
+ p B
+ end
+ rescue TypeError => e
+ e.message
+ end
+ }
+ ae %q{ # [yarv-dev:800]
+ begin
+ B = 1
+ module B
+ p B
+ end
+ rescue TypeError => e
+ e.message
+ end
+ }
+ end
+
+ def test_set_const_not_class
+ ae %q{
+ begin
+ 1::A = 1
+ rescue TypeError => e
+ e.message
+ end
+ }
+ end
+
+ def test_singletonclass
+ ae %q{
+ obj = ''
+ class << obj
+ def m
+ :OK
+ end
+ end
+ obj.m
+ }
+ ae %q{
+ obj = ''
+ Const = :NG
+ class << obj
+ Const = :OK
+ def m
+ Const
+ end
+ end
+ obj.m
+ }
+ ae %q{
+ obj = ''
+ class C
+ def m
+ :NG
+ end
+ end
+ class << obj
+ class C
+ def m
+ :OK
+ end
+ end
+ def m
+ C.new.m
+ end
+ end
+ obj.m
+ }
+ ae %q{ # [yarv-dev:818]
+ class A
+ end
+ class << A
+ C = "OK"
+ def m
+ class << Object
+ $a = C
+ end
+ end
+ end
+ A.m
+ $a
+ }
+ end
+
+ def test_include
+ ae %q{
+ module M
+ class A
+ def hoge
+ "hoge"
+ end
+ end
+ end
+
+ class A
+ include M
+ def m
+ [Module.nesting, A.new.hoge, instance_eval("A.new.hoge")]
+ end
+ end
+ A.new.m
+ }
+ end
+
+ def test_colon3
+ ae %q{
+ class A
+ ::B = :OK
+ end
+ B
+ }
+ ae %q{
+ class A
+ class ::C
+ end
+ end
+ C
+ }
+ end
+
+ def test_undef
+ # [yarv-dev:999]
+ ae %q{
+ class Parent
+ def foo
+ end
+ end
+ class Child < Parent
+ def bar
+ end
+
+ undef foo, bar
+ end
+
+ c = Child.new
+ [c.methods.include?('foo'), c.methods.include?('bar')]
+ }
+ end
+
+ def test_dup
+ ae %q{
+ ObjectSpace.each_object{|obj|
+ if Module === obj && (obj.respond_to? :dup)
+ obj.dup
+ end
+ }
+ :ok
+ }
+ end
+end
+
diff --git a/yarvtest/test_eval.rb b/yarvtest/test_eval.rb new file mode 100644 index 0000000000..fc4ac0372d --- /dev/null +++ b/yarvtest/test_eval.rb @@ -0,0 +1,213 @@ +require 'yarvtest/yarvtest'
+
+class TestEval < YarvTestBase
+ def test_eval
+ ae %q{
+ eval('1')
+ }
+ ae %q{
+ eval('a=1; a')
+ }
+ ae %q{
+ a = 1
+ eval('a')
+ }
+ end
+
+ def test_eval_with_send
+ ae %q{
+ __send! :eval, %{
+ :ok
+ }
+ }
+ ae %q{
+ 1.__send! :instance_eval, %{
+ :ok
+ }
+ }
+ end
+
+ def test_module_eval
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ end
+ C.module_eval{
+ Const
+ }
+ }
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ end
+ C.module_eval %{
+ Const
+ }
+ } if false # TODO: Ruby 1.9 error
+
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ end
+ C.class_eval %{
+ def m
+ Const
+ end
+ }
+ C.new.m
+ }
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ end
+ C.class_eval{
+ def m
+ Const
+ end
+ }
+ C.new.m
+ }
+ end
+
+ def test_instance_eval
+ ae %q{
+ 1.instance_eval{
+ self
+ }
+ }
+ ae %q{
+ 'foo'.instance_eval{
+ self
+ }
+ }
+ ae %q{
+ class Fixnum
+ Const = 1
+ end
+ 1.instance_eval %{
+ Const
+ }
+ }
+ end
+
+ def test_nest_eval
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ end
+ $nest = false
+ $ans = []
+ def m
+ $ans << Const
+ C.module_eval %{
+ $ans << Const
+ Boo = false unless defined? Boo
+ unless $nest
+ $nest = true
+ m
+ end
+ }
+ end
+ m
+ $ans
+ }
+ ae %q{
+ $nested = false
+ $ans = []
+ $pr = proc{
+ $ans << self
+ unless $nested
+ $nested = true
+ $pr.call
+ end
+ }
+ class C
+ def initialize &b
+ 10.instance_eval(&b)
+ end
+ end
+ C.new(&$pr)
+ $ans
+ }
+ end
+
+ def test_binding
+ ae %q{
+ def m
+ a = :ok
+ $b = binding
+ end
+ m
+ eval('a', $b)
+ }
+ ae %q{
+ def m
+ a = :ok
+ $b = binding
+ end
+ m
+ eval('b = :ok2', $b)
+ eval('[a, b]', $b)
+ }
+ ae %q{
+ $ans = []
+ def m
+ $b = binding
+ end
+ m
+ $ans << eval(%q{
+ $ans << eval(%q{
+ a
+ }, $b)
+ a = 1
+ }, $b)
+ $ans
+ }
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ def m
+ binding
+ end
+ end
+ eval('Const', C.new.m)
+ }
+ ae %q{
+ Const = :top
+ a = 1
+ class C
+ Const = :C
+ def m
+ eval('Const', TOPLEVEL_BINDING)
+ end
+ end
+ C.new.m
+ }
+ ae %q{
+ class C
+ $b = binding
+ end
+ eval %q{
+ def m
+ :ok
+ end
+ }, $b
+ p C.new.m
+ }
+ ae %q{
+ b = proc{
+ a = :ok
+ binding
+ }.call
+ a = :ng
+ eval("a", b)
+ }
+ end
+end
+
diff --git a/yarvtest/test_exception.rb b/yarvtest/test_exception.rb new file mode 100644 index 0000000000..3b0bd10cd6 --- /dev/null +++ b/yarvtest/test_exception.rb @@ -0,0 +1,408 @@ +require 'yarvtest/yarvtest'
+
+class TestException < YarvTestBase
+
+ def test_rescue
+ ae %q{
+ begin
+ 1
+ rescue
+ 2
+ end
+ }
+
+ ae %q{
+ begin
+ 1
+ begin
+ 2
+ rescue
+ 3
+ end
+ 4
+ rescue
+ 5
+ end
+ }
+
+ ae %q{
+ begin
+ 1
+ rescue
+ 2
+ else
+ 3
+ end
+ }
+ end
+
+ def test_ensure
+ ae %q{
+ begin
+ 1+1
+ ensure
+ 2+2
+ end
+ }
+ ae %q{
+ begin
+ 1+1
+ begin
+ 2+2
+ ensure
+ 3+3
+ end
+ ensure
+ 4+4
+ end
+ }
+ ae %q{
+ begin
+ 1+1
+ begin
+ 2+2
+ ensure
+ 3+3
+ end
+ ensure
+ 4+4
+ begin
+ 5+5
+ ensure
+ 6+6
+ end
+ end
+ }
+ end
+
+ def test_rescue_ensure
+ ae %q{
+ begin
+ 1+1
+ rescue
+ 2+2
+ ensure
+ 3+3
+ end
+ }
+ ae %q{
+ begin
+ 1+1
+ rescue
+ 2+2
+ ensure
+ 3+3
+ end
+ }
+ ae %q{
+ begin
+ 1+1
+ rescue
+ 2+2
+ else
+ 3+3
+ ensure
+ 4+4
+ end
+ }
+ ae %q{
+ begin
+ 1+1
+ begin
+ 2+2
+ rescue
+ 3+3
+ else
+ 4+4
+ end
+ rescue
+ 5+5
+ else
+ 6+6
+ ensure
+ 7+7
+ end
+ }
+
+ end
+
+ def test_raise
+ ae %q{
+ begin
+ raise
+ rescue
+ :ok
+ end
+ }
+ ae %q{
+ begin
+ raise
+ rescue
+ :ok
+ ensure
+ :ng
+ end
+ }
+ ae %q{
+ begin
+ raise
+ rescue => e
+ e.class
+ end
+ }
+ ae %q{
+ begin
+ raise
+ rescue StandardError
+ :ng
+ rescue Exception
+ :ok
+ end
+ }
+ ae %q{
+ begin
+ begin
+ raise "a"
+ rescue
+ raise "b"
+ ensure
+ raise "c"
+ end
+ rescue => e
+ e.message
+ end
+ }
+ end
+
+ def test_error_variable
+ ae %q{
+ a = nil
+ 1.times{|e|
+ begin
+ rescue => err
+ end
+ a = err.class
+ }
+ }
+ ae %q{
+ a = nil
+ 1.times{|e|
+ begin
+ raise
+ rescue => err
+ end
+ a = err.class
+ }
+ a
+ }
+ end
+
+ def test_raise_in_other_scope
+ ae %q{
+ class E1 < Exception
+ end
+
+ def m
+ yield
+ end
+
+ begin
+ begin
+ begin
+ m{
+ raise
+ }
+ rescue E1
+ :ok2
+ ensure
+ end
+ rescue
+ :ok3
+ ensure
+ end
+ rescue E1
+ :ok
+ ensure
+ end
+ } do
+ remove_const :E1
+ end
+
+ ae %q{
+ $i = 0
+ def m
+ iter{
+ begin
+ $i += 1
+ begin
+ $i += 2
+ break
+ ensure
+
+ end
+ ensure
+ $i += 4
+ end
+ $i = 0
+ }
+ end
+
+ def iter
+ yield
+ end
+ m
+ $i
+ }
+
+ ae %q{
+ $i = 0
+ def m
+ begin
+ $i += 1
+ begin
+ $i += 2
+ return
+ ensure
+ $i += 3
+ end
+ ensure
+ $i += 4
+ end
+ p :end
+ end
+ m
+ $i
+ }
+ end
+
+ def test_raise_in_cont_sp
+ ae %q{
+ def m a, b
+ a + b
+ end
+ m(1, begin
+ raise
+ rescue
+ 2
+ end) +
+ m(10, begin
+ raise
+ rescue
+ 20
+ ensure
+ 30
+ end)
+ }
+ ae %q{
+ def m a, b
+ a + b
+ end
+ m(begin
+ raise
+ rescue
+ 1
+ end,
+ begin
+ raise
+ rescue
+ 2
+ end)
+ }
+ end
+
+ def test_geterror
+ ae %q{
+ $!
+ }
+ ae %q{
+ begin
+ raise "FOO"
+ rescue
+ $!
+ end
+ }
+ ae %q{
+ def m
+ $!
+ end
+ begin
+ raise "FOO"
+ rescue
+ m()
+ end
+ }
+ ae %q{
+ $ans = []
+ def m
+ $!
+ end
+ begin
+ raise "FOO"
+ rescue
+ begin
+ raise "BAR"
+ rescue
+ $ans << m()
+ end
+ $ans << m()
+ end
+ $ans
+ }
+ ae %q{
+ $ans = []
+ def m
+ $!
+ end
+
+ begin
+ begin
+ raise "FOO"
+ ensure
+ $ans << m()
+ end
+ rescue
+ $ans << m()
+ end
+ }
+ ae %q{
+ $ans = []
+ def m
+ $!
+ end
+ def m2
+ 1.times{
+ begin
+ return
+ ensure
+ $ans << m
+ end
+ }
+ end
+ m2
+ $ans
+ }
+ end
+
+ def test_stack_consistency
+ ae %q{ #
+ proc{
+ begin
+ raise
+ break
+ rescue
+ :ok
+ end
+ }.call
+ }
+ ae %q{
+ proc do
+ begin
+ raise StandardError
+ redo
+ rescue StandardError
+ end
+ end.call
+ }
+ end
+end
+
diff --git a/yarvtest/test_flow.rb b/yarvtest/test_flow.rb new file mode 100644 index 0000000000..fa7224b987 --- /dev/null +++ b/yarvtest/test_flow.rb @@ -0,0 +1,591 @@ +#
+# This test program is contributed by George Marrows
+# Re: [Yarv-devel] Some tests for test_jump.rb
+#
+
+require 'yarvtest/yarvtest'
+
+class TestFlow < YarvTestBase
+ def ae_flow(src, for_value=true)
+ # Tracks flow through the code
+ # A test like
+ # begin
+ # ensure
+ # end
+ # gets transformed into
+ # a = []
+ # begin
+ # begin; a << 1
+ # ensure; a << 2
+ # end; a << 3
+ # rescue Exception
+ # a << 99
+ # end
+ # a
+ # before being run. This tracks control flow through the code.
+
+ cnt = 0
+ src = src.gsub(/(\n|$)/) { "; $a << #{cnt+=1}\n" }
+ src = "$a = []; begin; #{src}; rescue Exception; $a << 99; end; $a"
+
+ if false#||true
+ STDERR.puts
+ STDERR.puts '#----'
+ STDERR.puts src
+ STDERR.puts '#----'
+ end
+
+ ae(src)
+ end
+
+ def test_while_with_ensure
+ ae %q{
+ a = []
+ i = 0
+ begin
+ while i < 1
+ i+=1
+ begin
+ begin
+ next
+ ensure
+ a << :ok
+ end
+ ensure
+ a << :ok2
+ end
+ end
+ ensure
+ a << :last
+ end
+ }
+ ae %q{
+ a = []
+ i = 0
+ begin
+ while i < 1
+ i+=1
+ begin
+ begin
+ break
+ ensure
+ a << :ok
+ end
+ ensure
+ a << :ok2
+ end
+ end
+ ensure
+ a << :last
+ end
+ }
+ ae %q{
+ a = []
+ i = 0
+ begin
+ while i < 1
+ if i>0
+ break
+ end
+ i+=1
+ begin
+ begin
+ redo
+ ensure
+ a << :ok
+ end
+ ensure
+ a << :ok2
+ end
+ end
+ ensure
+ a << :last
+ end
+ }
+ end
+
+ def test_ensure_normal_flow
+ ae_flow %{
+ begin
+ ensure
+ end }
+ end
+
+ def test_ensure_exception
+ ae_flow %{
+ begin
+ raise StandardError
+ ensure
+ end
+ }
+ end
+
+ def test_break_in_block_runs_ensure
+ ae_flow %{
+ [1,2].each do
+ begin
+ break
+ ensure
+ end
+ end
+ }
+ end
+
+ def test_next_in_block_runs_ensure
+ ae_flow %{
+ [1,2].each do
+ begin
+ next
+ ensure
+ end
+ end
+ }
+ end
+ def test_return_from_method_runs_ensure
+ ae_flow %{
+ o = "test"
+ def o.test(a)
+ return a
+ ensure
+ end
+ o.test(123)
+ }
+ end
+
+ def test_break_from_ifunc
+ ae %q{
+ ["a"].inject("ng"){|x,y|
+ break :ok
+ }
+ }
+ ae %q{
+ unless ''.respond_to? :lines
+ class String
+ def lines
+ self
+ end
+ end
+ end
+
+ ('a').lines.map{|e|
+ break :ok
+ }
+ }
+ ae_flow %q{
+ ["a"].inject("ng"){|x,y|
+ break :ok
+ }
+ }
+ ae_flow %q{
+ ('a'..'b').map{|e|
+ break :ok
+ }
+ }
+ end
+
+ def test_break_ensure_interaction1
+ # make sure that any 'break state' set up in the VM is c
+ # the time of the ensure
+ ae_flow %{
+ [1,2].each{
+ break
+ }
+ begin
+ ensure
+ end
+ }
+ end
+
+ def test_break_ensure_interaction2
+ # ditto, different arrangement
+ ae_flow %{
+ begin
+ [1,2].each do
+ break
+ end
+ ensure
+ end
+ }
+ end
+
+ def test_break_through_2_ensures
+ ae_flow %{
+ [1,2].each do
+ begin
+ begin
+ break
+ ensure
+ end
+ ensure
+ end
+ end
+ }
+ end
+
+ def test_ensure_break_ensure
+ # break through an ensure; run 2nd normally
+ ae_flow %{
+ begin
+ [1,2].each do
+ begin
+ break
+ ensure
+ end
+ end
+ ensure
+ end
+ }
+ end
+
+ def test_exception_overrides_break
+ ae_flow %{
+ [1,2].each do
+ begin
+ break
+ ensure
+ raise StandardError
+ end
+ end
+ }
+ end
+
+ def test_break_overrides_exception
+ ae_flow %{
+ [1,2].each do
+ begin
+ raise StandardError
+ ensure
+ break
+ end
+ end
+ }
+ ae_flow %{
+ [1,2].each do
+ begin
+ raise StandardError
+ rescue
+ break
+ end
+ end
+ }
+ end
+
+ def test_break_in_exception
+ ae_flow %q{
+ i=0
+ while i<3
+ i+=1
+ begin
+ ensure
+ break
+ end
+ end
+ }
+ ae_flow %q{
+ i=0
+ while i<3
+ i+=1
+ begin
+ raise
+ ensure
+ break
+ end
+ end
+ }
+ ae_flow %q{
+ i=0
+ while i<3
+ i+=1
+ begin
+ raise
+ rescue
+ break
+ end
+ end
+ }
+ end
+
+ def test_next_in_exception
+ return
+ ae_flow %q{
+ i=0
+ while i<3
+ i+=1
+ begin
+ ensure
+ next
+ end
+ end
+ }
+ ae_flow %q{
+ i=0
+ while i<3
+ i+=1
+ begin
+ raise
+ ensure
+ next
+ end
+ end
+ }
+ ae_flow %q{
+ i=0
+ while i<3
+ i+=1
+ begin
+ raise
+ rescue
+ next
+ end
+ end
+ }
+ end
+
+ def test_complex_break
+ ae_flow %q{
+ i = 0
+ while i<3
+ i+=1
+ j = 0
+ while j<3
+ j+=1
+ begin
+ raise
+ rescue
+ break
+ end
+ end
+ end
+ }
+ ae_flow %q{
+ i = 0
+ while i<3
+ i+=1
+ j = 0
+ while j<3
+ j+=1
+ 1.times{
+ begin
+ raise
+ rescue
+ break
+ end
+ }
+ end
+ end
+ }
+ ae_flow %q{
+ i = 0
+ while i<3
+ i+=1
+ j = 0
+ while j<3
+ j+=1
+ begin
+ raise
+ ensure
+ break
+ end
+ end
+ end
+ }
+ ae_flow %q{
+ i = 0
+ while i<3
+ i+=1
+ j = 0
+ while j<3
+ j+=1
+ 1.times{
+ begin
+ raise
+ ensure
+ break
+ end
+ }
+ end
+ end
+ }
+ ae_flow %q{
+ while true
+ begin
+ break
+ ensure
+ break
+ end
+ end
+ }
+ ae_flow %q{
+ while true
+ begin
+ break
+ ensure
+ raise
+ end
+ end
+ }
+ end
+
+ def test_jump_from_class
+ ae_flow %q{
+ 3.times{
+ class C
+ break
+ end
+ }
+ }
+ ae_flow %q{
+ 3.times{
+ class A
+ class B
+ break
+ end
+ end
+ }
+ }
+ ae_flow %q{
+ 3.times{
+ class C
+ next
+ end
+ }
+ }
+ ae_flow %q{
+ 3.times{
+ class C
+ class D
+ next
+ end
+ end
+ }
+ }
+ ae_flow %q{
+ while true
+ class C
+ break
+ end
+ end
+ }
+ ae_flow %q{
+ while true
+ class C
+ class D
+ break
+ end
+ end
+ end
+ }
+ ae_flow %q{
+ i=0
+ while i<3
+ i+=1
+ class C
+ next 10
+ end
+ end
+ }
+ ae %q{
+ 1.times{
+ while true
+ class C
+ begin
+ break
+ ensure
+ break
+ end
+ end
+ end
+ }
+ }
+ end
+
+ def test_flow_with_cont_sp
+ ae %q{
+ def m a, b
+ a + b
+ end
+ m(1,
+ while true
+ break 2
+ end
+ )
+ }
+ ae %q{
+ def m a, b
+ a + b
+ end
+ m(1,
+ (i=0; while i<2
+ i+=1
+ class C
+ next 2
+ end
+ end; 3)
+ )
+ }
+ ae %q{
+ def m a, b
+ a+b
+ end
+ m(1, 1.times{break 3}) +
+ m(10, (1.times{next 3}; 20))
+ }
+ end
+
+ def test_return_in_deep_stack
+ ae_flow %q{
+ def m1 *args
+
+ end
+ def m2
+ m1(:a, :b, (return 1; :c))
+ end
+ m2
+ }
+ end
+
+ def test_return_in_ensure
+ ae_flow %q{
+ def m()
+ begin
+ 2
+ ensure
+ return 3
+ end
+ end
+ m
+ }
+ ae_flow %q{
+ def m2
+ end
+ def m()
+ m2(begin
+ 2
+ ensure
+ return 3
+ end)
+ 4
+ end
+ m()
+ }
+ ae_flow %q{
+ def m
+ 1
+ 1.times{
+ 2
+ begin
+ 3
+ return
+ 4
+ ensure
+ 5
+ end
+ 6
+ }
+ 7
+ end
+ m()
+ }
+ end
+end
+
diff --git a/yarvtest/test_jump.rb b/yarvtest/test_jump.rb new file mode 100644 index 0000000000..e7c2cc37a6 --- /dev/null +++ b/yarvtest/test_jump.rb @@ -0,0 +1,296 @@ +require 'yarvtest/yarvtest'
+
+class TestJump < YarvTestBase
+
+ def test_redo
+ ae %q{
+ def m
+ yield + 10
+ end
+ i=0
+ m{
+ if i>10
+ i*i
+ else
+ i+=1
+ redo
+ end
+ }
+ }
+ end
+
+ def test_next
+ ae %q{
+ def m
+ yield
+ :ok
+ end
+ i=0
+ m{
+ if i>10
+ i*i
+ else
+ i+=1
+ next
+ end
+ }
+ }
+ end
+
+ def test_next_with_val
+ ae %q{
+ def m
+ yield
+ end
+
+ m{
+ next :ok
+ }
+ }
+ end
+
+ def test_return
+ ae %q{
+ def m
+ return 3
+ end
+ m
+ }
+
+ ae %q{
+ def m
+ :ng1
+ mm{
+ return :ok
+ }
+ :ng2
+ end
+
+ def mm
+ :ng3
+ yield
+ :ng4
+ end
+ m
+ }
+ end
+
+ def test_return2
+ ae %q{
+ $i = 0
+ def m
+ begin
+ iter{
+ return
+ }
+ ensure
+ $i = 100
+ end
+ end
+
+ def iter
+ yield
+ end
+ m
+ $i
+ }
+ end
+
+ def test_return3
+ ae %q{
+ def m
+ begin
+ raise
+ rescue
+ return :ok
+ end
+ :ng
+ end
+ m
+ }
+ end
+
+ def test_break
+ ae %q{
+ def m
+ :ng1
+ mm{
+ yield
+ }
+ :ng2
+ end
+
+ def mm
+ :ng3
+ yield
+ :ng4
+ end
+
+ m{
+ break :ok
+ }
+ }
+ end
+
+ def test_exception_and_break
+ ae %q{
+ def m
+ yield
+ end
+
+ m{
+ begin
+ ensure
+ break :ok
+ end
+ }
+ }
+ end
+
+ def test_retry
+ # this test can't run on ruby 1.9(yarv can do)
+ %q{
+ def m a
+ mm{
+ yield
+ }
+ end
+
+ def mm
+ yield
+ end
+
+ i=0
+ m(i+=1){
+ retry if i<10
+ :ok
+ }
+ }
+
+ ae %q{
+ def m a
+ yield
+ end
+
+ i=0
+ m(i+=1){
+ retry if i<10
+ :ok
+ }
+ }
+ end
+
+ def test_complex_jump
+ ae %q{
+ module Enumerable
+ def all_?
+ self.each{|e|
+ unless yield(e)
+ return false
+ end
+ }
+ true
+ end
+ end
+
+ xxx = 0
+ [1,2].each{|bi|
+ [3,4].each{|bj|
+ [true, nil, true].all_?{|be| be}
+ break
+ }
+ xxx += 1
+ }
+ xxx
+ }
+ end
+
+ def test_return_from
+ ae %q{
+ def m
+ begin
+ raise
+ rescue
+ return 1
+ end
+ end
+
+ m
+ }
+ ae %q{
+ def m
+ begin
+ #
+ ensure
+ return 1
+ end
+ end
+
+ m
+ }
+ end
+
+ def test_break_from_times
+ ae %q{
+ 3.times{
+ break :ok
+ }
+ }
+ end
+
+ def test_catch_and_throw
+ ae %q{
+ catch(:foo){
+ throw :foo
+ }
+ }
+ ae %q{
+ catch(:foo){
+ throw :foo, false
+ }
+ }
+ ae %q{
+ catch(:foo){
+ throw :foo, nil
+ }
+ }
+ ae %q{
+ catch(:foo){
+ throw :foo, :ok
+ }
+ }
+ ae %q{
+ catch(:foo){
+ 1.times{
+ throw :foo
+ }
+ }
+ }
+ ae %q{
+ catch(:foo){
+ 1.times{
+ throw :foo, :ok
+ }
+ }
+ }
+ ae %q{
+ catch(:foo){
+ catch(:bar){
+ throw :foo, :ok
+ }
+ :ng
+ }
+ }
+ ae %q{
+ catch(:foo){
+ catch(:bar){
+ 1.times{
+ throw :foo, :ok
+ }
+ }
+ :ng
+ }
+ }
+ end
+end
+
diff --git a/yarvtest/test_massign.rb b/yarvtest/test_massign.rb new file mode 100644 index 0000000000..bb42c7e180 --- /dev/null +++ b/yarvtest/test_massign.rb @@ -0,0 +1,417 @@ +require 'yarvtest/yarvtest'
+
+# test of syntax
+class TestMassign < YarvTestBase
+ def test_simle
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, y = a, b
+ [x, y]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, y, z = a, b, c
+ [x, y, z]
+ }
+ end
+
+ def test_diff_elems
+ ae %q{
+ a = :a ; b = :b ; c = :c
+ x, y, z = a, b
+ [x, y, z]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, y = a, b, c
+ [x, y]
+ }
+ end
+
+ def test_single_l
+ ae %q{
+ a = :a; b = :b
+ x = a, b
+ x
+ }
+ ae %q{
+ a = [1, 2]; b = [3, 4]
+ x = a, b
+ x
+ }
+ end
+
+ def test_single_r
+ ae %q{
+ a = :a
+ x, y = a
+ [x, y]
+ }
+ ae %q{
+ a = [1, 2]
+ x, y = a
+ [x, y]
+ }
+ ae %q{
+ a = [1, 2, 3]
+ x, y = a
+ [x, y]
+ }
+ end
+
+ def test_splat_l
+ ae %q{
+ a = :a; b = :b; c = :c
+ *x = a, b
+ [x]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ *x = a, b
+ [x]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, * = a, b
+ [x]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, *y = a, b
+ [x, y]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, y, *z = a, b
+ [x, y]
+ }
+ ae %q{ # only one item on rhs
+ *x = :x
+ x
+ }
+ ae %q{ # nil on rhs
+ *x = nil
+ x
+ }
+ end
+
+ def test_splat_r
+ if false
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, y = *a
+ [x, y]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, y = a, *b
+ [x, y]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, y = a, b, *c
+ [x, y]
+ }
+ ae %q{
+ x=*nil
+ x
+ }
+ end
+
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ x, y = *a
+ [x, y]
+ }
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ x, y = a, *b
+ [x, y]
+ }
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ x, y = a, b, *c
+ [x, y]
+ }
+ end
+
+ def test_splat_b1
+ if false
+ # error
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, *y = *a
+ [x, y]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, *y = a, *b
+ [x, y]
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ x, *y = a, b, *c
+ [x, y]
+ }
+ end
+
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ x, *y = *a
+ [x, y]
+ }
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ x, *y = a, *b
+ [x, y]
+ }
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ x, *y = a, b, *c
+ [x, y]
+ }
+ end
+
+ def test_splat_b2
+ if false
+ # error
+ ae %q{
+ a = :a; b = :b; c = :c
+ *x = *a
+ x
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ *x = a, *b
+ x
+ }
+ ae %q{
+ a = :a; b = :b; c = :c
+ *x = a, b, *c
+ x
+ }
+ end
+
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ *x = *a
+ x
+ }
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ *x = a, *b
+ x
+ }
+ ae %q{
+ a = [:a, :a2]; b = [:b, :b2]; c = [:c, :c2]
+ *x = a, b, *c
+ x
+ }
+ end
+
+ def test_toary
+ ae %q{
+ x, y = :a
+ [x, y]
+ }
+ ae %q{
+ x, y = [1, 2]
+ [x, y]
+ }
+ ae %q{
+ x, y = [1, 2, 3]
+ [x, y]
+ }
+ end
+
+ def test_swap
+ ae %q{
+ a = 1; b = 2
+ a, b = b, a
+ [a, b]
+ }
+ end
+
+ def test_mret
+ ae %q{
+ def m
+ return 1, 2
+ end
+
+ a, b = m
+ [a, b]
+ }
+ ae %q{
+ def m
+ return 1, 2
+ end
+
+ a = m
+ [a]
+ }
+ ae %q{
+ def m
+ return 1
+ end
+
+ a, b = m
+ [a, b]
+ }
+ end
+
+ def test_mret_splat
+ if false
+ ae %q{
+ def m
+ return *1
+ end
+ a, b = m
+ [a, b]
+ }
+ end
+
+ ae %q{
+ def m
+ return *[]
+ end
+ a, b = m
+ [a, b]
+ }
+ ae %q{
+ def m
+ return *[1]
+ end
+ a, b = m
+ [a, b]
+ }
+ ae %q{
+ def m
+ return *[1,2]
+ end
+ a, b = m
+ [a, b]
+ }
+ ae %q{
+ def m
+ return *[1,2,3]
+ end
+ a, b = m
+ [a, b]
+ }
+ ae %q{
+ def m
+ return *[1]
+ end
+ a = m
+ }
+ end
+
+ def test_mret_argscat
+ ae %q{
+ def m
+ return 1, *[]
+ end
+ a, b = m
+ [a, b]
+ }
+ ae %q{
+ def m
+ return 1, 2, *[1]
+ end
+ a, b = m
+ [a, b]
+ }
+ ae %q{
+ def m
+ return 1, 2, 3, *[1,2]
+ end
+ a, b = m
+ [a, b]
+ }
+ end
+
+ def test_nested_massign
+ ae %q{
+ (a, b), c = [[1, 2], 3]
+ [a, b, c]
+ }
+ ae %q{
+ a, (b, c) = [[1, 2], 3]
+ [a, b, c]
+ }
+ ae %q{
+ a, (b, c) = [1, [2, 3]]
+ [a, b, c]
+ }
+ ae %q{
+ (a, b), *c = [[1, 2], 3]
+ [a, b, c]
+ }
+ ae %q{
+ (a, b), c, (d, e) = [[1, 2], 3, [4, 5]]
+ [a, b, c, d, e]
+ }
+ ae %q{
+ (a, *b), c, (d, e, *) = [[1, 2], 3, [4, 5]]
+ [a, b, c, d, e]
+ }
+ ae %q{
+ (a, b), c, (d, *e) = [[1, 2, 3], 3, [4, 5, 6, 7]]
+ [a, b, c, d, e]
+ }
+ ae %q{
+ (a, (b1, b2)), c, (d, e) = [[1, 2], 3, [4, 5]]
+ [a, b1, b2, c, d, e]
+ }
+ ae %q{
+ (a, (b1, b2)), c, (d, e) = [[1, [21, 22]], 3, [4, 5]]
+ [a, b1, b2, c, d, e]
+ }
+ end
+
+ # ignore
+ def _test_massign_value
+ # Value of this massign statement should be [1, 2, 3]
+ ae %q{
+ a, b, c = [1, 2, 3]
+ }
+ end
+
+ def test_nested_splat
+ # Somewhat obscure nested splat
+ ae %q{
+ a = *[*[1]]
+ a
+ }
+ end
+
+ def test_calls_to_a
+ # Should be result of calling to_a on arg, ie [[1, 2], [3, 4]]
+ ae %q{
+ x=*{1=>2,3=>4}
+ x
+ }
+ end
+
+ def test_const_massign
+ ae %q{
+ class C
+ class D
+ end
+ end
+
+ X, Y = 1, 2
+ Z, C::Const, C::D::Const, ::C::Const2 = 3, 4, 5, 6
+ [X, Y, Z, C::Const, C::D::Const, ::C::Const2]
+ }
+ end
+
+ def test_massign_values
+ ae %q{
+ ary = [1, 2].partition {|n| n == 1 }
+ a, b = ary
+ [a, b]
+ }
+ end
+end
+
diff --git a/yarvtest/test_method.rb b/yarvtest/test_method.rb new file mode 100644 index 0000000000..c2ef4c99de --- /dev/null +++ b/yarvtest/test_method.rb @@ -0,0 +1,539 @@ +require 'yarvtest/yarvtest'
+class TestMethod < YarvTestBase
+
+ def test_simple_method
+ ae %q{
+ def m_simple_method
+ 1
+ end
+ m_simple_method()
+ }
+ end
+
+ def test_polymorphic
+ ae %q{
+ o1 = 'str'
+ o2 = 1
+ str = ''
+ i = 1
+ while i<10
+ i+=1
+ o = (i%2==0) ? o1 : o2
+ str += o.to_s
+ end
+ str
+ }
+ end
+
+ def test_arg
+ ae <<-'EOS'
+ def m_arg(a1, a2)
+ a1+a2
+ end
+ m_arg(1,2)
+ EOS
+ end
+
+ def test_rec
+ ae <<-'EOS'
+ def m_rec n
+ if n > 1
+ n + m_rec(n-1)
+ else
+ 1
+ end
+ end
+ m_rec(10)
+ EOS
+ end
+
+ def test_splat
+ ae %q{
+ def m a
+ a
+ end
+ begin
+ m(*1)
+ rescue TypeError
+ :ok
+ end
+ }
+ ae %q{
+ def m a, b
+ [a, b]
+ end
+ m(*[1,2])
+ }
+ ae %q{
+ def m a, b, c
+ [a, b, c]
+ end
+ m(1, *[2, 3])
+ }
+
+ ae %q{
+ def m a, b, c
+ [a, b, c]
+ end
+
+ m(1, 2, *[3])
+ }
+ end
+
+ def test_rest
+ ae %q{
+ def m *a
+ a
+ end
+
+ m
+ }
+
+ ae %q{
+ def m *a
+ a
+ end
+
+ m 1
+ }
+
+ ae %q{
+ def m *a
+ a
+ end
+
+ m 1, 2, 3
+ }
+
+ ae %q{
+ def m x, *a
+ [x, a]
+ end
+
+ m 1
+ }
+
+ ae %q{
+ def m x, *a
+ [x, a]
+ end
+
+ m 1, 2
+ }
+
+ ae %q{
+ def m x, *a
+ [x, a]
+ end
+
+ m 1, 2, 3, 4
+ }
+ end
+
+ def test_opt
+ ae %q{
+ def m a=1
+ a
+ end
+ m
+ }
+ ae %q{
+ def m a=1
+ a
+ end
+ m 2
+ }
+ ae %q{
+ def m a=1, b=2
+ [a, b]
+ end
+ m
+ }
+ ae %q{
+ def m a=1, b=2
+ [a, b]
+ end
+ m 10
+ }
+ ae %q{
+ def m a=1, b=2
+ [a, b]
+ end
+ m 10, 20
+ }
+ ae %q{
+ def m x, a=1, b=2
+ [x, a, b]
+ end
+ m 10
+ }
+ ae %q{
+ def m x, a=1, b=2
+ [x, a, b]
+ end
+ m 10, 20
+ }
+ ae %q{
+ def m x, a=1, b=2
+ [x, a, b]
+ end
+ m 10, 20, 30
+ }
+ ae %q{
+ def m x, y, a
+ [x, y, a]
+ end
+ m 10, 20, 30
+ }
+ end
+
+
+ def test_opt_rest
+ ae %q{
+ def m0 b = 0, c = 1, *d
+ [:sep, b, c, d]
+ end
+
+ def m1 a, b = 0, c = 1, *d
+ [:sep, a, b, c, d]
+ end
+
+ def m2 x, a, b = 0, c = 1, *d
+ [:sep, x, a, b, c, d]
+ end
+
+ def m3 x, y, a, b = 0, c = 1, *d
+ [:sep, x, y, a, b, c, d]
+ end
+
+ def s3 x, y, a, b = 0, c = 1
+ [:sep, x, y, a, b, c]
+ end
+
+ m0() +
+ m0(:a) +
+ m0(:a, :b) +
+ m0(:a, :b, :c) +
+ m0(:a, :b, :c, :d) +
+ m0(:a, :b, :c, :d, :e) +
+ m1(:a) +
+ m1(:a, :b) +
+ m1(:a, :b, :c) +
+ m1(:a, :b, :c, :d) +
+ m1(:a, :b, :c, :d, :e) +
+ m2(:a, :b) +
+ m2(:a, :b, :c) +
+ m2(:a, :b, :c, :d) +
+ m2(:a, :b, :c, :d, :e) +
+ m2(:a, :b, :c, :d, :e, :f) +
+ m3(:a, :b, :c) +
+ m3(:a, :b, :c, :d) +
+ m3(:a, :b, :c, :d, :e) +
+ m3(:a, :b, :c, :d, :e, :f) +
+ m3(:a, :b, :c, :d, :e, :f, :g)
+ }
+ end
+
+ def test_opt_rest_block
+ ae %q{
+ def m a, b = 0, c = 1, *d, &pr
+ [a, b, c, d, pr]
+ end
+ m(:a) +
+ m(:a, :b) +
+ m(:a, :b, :c) +
+ m(:a, :b, :c, :d) +
+ m(:a, :b, :c, :d, :e)
+ }
+ ae %q{
+ def m a, b = 0, c = 1, *d, &pr
+ [a, b, c, d, pr.call]
+ end
+
+ m(:a){1} +
+ m(:a, :b){2} +
+ m(:a, :b, :c){3} +
+ m(:a, :b, :c, :d){4} +
+ m(:a, :b, :c, :d, :e){5}
+ }
+ end
+
+ def test_singletonmethod
+ ae %q{
+ lobj = Object.new
+ def lobj.m
+ :singleton
+ end
+ lobj.m
+ }
+ ae %q{
+ class C
+ def m
+ :C_m
+ end
+ end
+ lobj = C.new
+ def lobj.m
+ :Singleton_m
+ end
+ lobj.m
+ }
+ end
+
+ def test_singletonmethod_with_const
+ ae %q{
+ class C
+ Const = :C
+ def self.m
+ 1.times{
+ Const
+ }
+ end
+ end
+ C.m
+ }
+ end
+
+ def test_alias
+ ae %q{
+ def m1
+ :ok
+ end
+ alias :m2 :m1
+ m1
+ }
+ ae %q{
+ def m1
+ :ok
+ end
+ alias m2 m1
+ m1
+ }
+ ae %q{
+ def m1
+ :ok
+ end
+ alias m2 :m1
+ m1
+ }
+ ae %q{
+ def m1
+ :ok
+ end
+ alias :m2 m1
+ m1
+ }
+ ae %q{
+ def m1
+ :ok
+ end
+ alias m2 m1
+ def m1
+ :ok2
+ end
+ [m1, m2]
+ }
+ end
+
+ def test_split
+ ae %q{
+ 'abc'.split(/b/)
+ }
+ ae %q{
+ 1.times{|bi|
+ 'abc'.split(/b/)
+ }
+ }
+ end
+
+ def test_block_pass
+ ae %q{
+ def getproc &b
+ b
+ end
+ def m
+ yield
+ end
+ m(&getproc{
+ "test"
+ })
+ }
+ ae %q{
+ def getproc &b
+ b
+ end
+ def m a
+ yield a
+ end
+ m(123, &getproc{|block_a|
+ block_a
+ })
+ }
+ ae %q{
+ def getproc &b
+ b
+ end
+ def m *a
+ yield a
+ end
+ m(123, 456, &getproc{|block_a|
+ block_a
+ })
+ }
+ ae %q{
+ def getproc &b
+ b
+ end
+ [1,2,3].map(&getproc{|block_e| block_e*block_e})
+ }
+ ae %q{
+ def m a, b, &c
+ c.call(a, b)
+ end
+ m(10, 20){|x, y|
+ [x+y, x*y]
+ }
+ }
+ ae %q{
+ def m &b
+ b
+ end
+ m(&nil)
+ }
+ ae %q{
+ def m a, &b
+ [a, b]
+ end
+ m(1, &nil)
+ }
+ ae %q{
+ def m a
+ [a, block_given?]
+ end
+ m(1, &nil)
+ }
+ end
+
+ def test_method_missing
+ ae %q{
+ class C
+ def method_missing id
+ id
+ end
+ end
+ C.new.hoge
+ } do
+ remove_const :C
+ end
+
+ ae %q{
+ class C
+ def method_missing *args, &b
+ b.call(args)
+ end
+ end
+ C.new.foo(1){|args|
+ args
+ }
+ C.new.foo(1){|args|
+ args
+ } +
+ C.new.foo(1, 2){|args|
+ args
+ }
+ }
+ end
+
+ def test_svar
+ ae %q{
+ 'abc'.match(/a(b)c/)
+ $1
+ }
+ end
+
+ def test_nested_method
+ ae %q{
+ class A
+ def m
+ def m2
+ p :m2
+ end
+ m2()
+ end
+ end
+ A.new.m
+ }
+ ae %q{
+ class A
+ def m
+ def m2
+ p :m2
+ end
+ m2()
+ end
+ end
+ instance_eval('A.new.m')
+ }
+ end
+
+ def test_private_class_method
+ ae %q{
+ class C
+ def self.m
+ :ok
+ end
+ def self.test
+ m
+ end
+ private_class_method :m
+ end
+ C.test
+ }
+ end
+
+ def test_alias_and_private
+ ae %q{ # [yarv-dev:899]
+ $ans = []
+ class C
+ def m
+ $ans << "OK"
+ end
+ end
+ C.new.m
+ class C
+ alias mm m
+ private :mm
+ end
+ C.new.m
+ begin
+ C.new.mm
+ rescue NoMethodError
+ $ans << "OK!"
+ end
+ $ans
+ }
+ end
+
+ def test_break_from_defined_method
+ ae %q{
+ class C
+ define_method(:foo){
+ break :ok
+ }
+ end
+ C.new.foo
+ }
+ end
+
+ def test_return_from_defined_method
+ ae %q{
+ class C
+ define_method(:m){
+ return :ok
+ }
+ end
+ C.new.m
+ }
+ end
+end
+
diff --git a/yarvtest/test_opts.rb b/yarvtest/test_opts.rb new file mode 100644 index 0000000000..689257c78a --- /dev/null +++ b/yarvtest/test_opts.rb @@ -0,0 +1,118 @@ +require 'yarvtest/yarvtest'
+
+class TestOpt < YarvTestBase
+ def test_plus
+ ae %q{
+ a, b = 1, 2
+ a+b
+ }
+ ae %q{
+ class Fixnum
+ def +(*o)
+ o
+ end
+ def -(*o)
+ o
+ end
+ end
+ [10+11, 100-101]
+ }
+ ae %q{
+ class Float
+ def +(o)
+ self * o
+ end
+ end
+
+ a, b = 1, 2
+ a+b
+ }
+ end
+
+ def test_opt_methdos
+ klasses = [[Fixnum, 2, 3], [Float, 1.1, 2.2],
+ [String, "abc", "def"], [Array, [1,2,3], [4, 5]],
+ [Hash, {:a=>1, :b=>2}, {:x=>"foo", :y=>"bar"}]]
+
+ bin_methods = [:+, :-, :*, :/, :%, ]
+ one_methods = [:length, :succ, ]
+ ary = []
+
+ bin_methods.each{|m|
+ klasses.each{|klass, obj, arg|
+ str = %{
+ ary = []
+ if (#{obj.inspect}).respond_to? #{m.inspect}
+ begin
+ ary << (#{obj.inspect}).#{m.to_s}(#{arg.inspect})
+ rescue Exception => e
+ ary << :error
+ end
+ end
+
+ class #{klass}
+ def #{m}(o)
+ [#{m.inspect}, :bin, #{klass}].inspect
+ end
+ end
+ ary << (#{obj.inspect}).#{m.to_s}(#{arg.inspect})
+ ary
+ }
+ ae str
+ }
+ }
+ one_methods.each{|m|
+ klasses.each{|klass, obj|
+ str = %{
+ ary = []
+ if (#{obj.inspect}).respond_to? #{m.inspect}
+ ary << (#{obj.inspect}).#{m.to_s}()
+ end
+
+ class #{klass}
+ def #{m}()
+ [#{m.inspect}, self, #{klass}].inspect
+ end
+ end
+ ary << (#{obj.inspect}).#{m.to_s}()
+ ary
+ }
+ ae str
+ }
+ }
+ end
+
+ def test_opt_plus
+ ae %q{
+ temp = 2**30 - 5
+ (1..5).map do
+ temp += 1
+ [temp, temp.class]
+ end
+ }
+ ae %q{
+ temp = -(2**30 - 5)
+ (1..10).map do
+ temp += 1
+ [temp, temp.class]
+ end
+ }
+ end
+
+ def test_eq
+ ae %q{
+ class Foo
+ def ==(other)
+ true
+ end
+ end
+ foo = Foo.new
+ [1.0 == foo,
+ 1 == foo,
+ "abc" == foo,
+ ]
+ }
+ end
+end
+
+
diff --git a/yarvtest/test_proc.rb b/yarvtest/test_proc.rb new file mode 100644 index 0000000000..3f7fae09a0 --- /dev/null +++ b/yarvtest/test_proc.rb @@ -0,0 +1,293 @@ +require 'yarvtest/yarvtest'
+
+class TestProc < YarvTestBase
+ def test_simpleproc
+ ae %q{
+ def m(&b)
+ b
+ end
+ m{1}.call
+ }
+
+ ae %q{
+ def m(&b)
+ b
+ end
+
+ m{
+ a = 1
+ a + 2
+ }.call
+ }
+ end
+
+ def test_procarg
+ ae %q{
+ def m(&b)
+ b
+ end
+
+ m{|e_proctest| e_proctest}.call(1)
+ }
+
+ ae %q{
+ def m(&b)
+ b
+ end
+
+ m{|e_proctest1, e_proctest2|
+ a = e_proctest1 * e_proctest2 * 2
+ a * 3
+ }.call(1, 2)
+ }
+
+ ae %q{
+ [
+ Proc.new{|*args| args}.call(),
+ Proc.new{|*args| args}.call(1),
+ Proc.new{|*args| args}.call(1, 2),
+ Proc.new{|*args| args}.call(1, 2, 3),
+ ]
+ }
+ ae %q{
+ [
+ Proc.new{|a, *b| [a, b]}.call(),
+ Proc.new{|a, *b| [a, b]}.call(1),
+ Proc.new{|a, *b| [a, b]}.call(1, 2),
+ Proc.new{|a, *b| [a, b]}.call(1, 2, 3),
+ ]
+ }
+ end
+
+ def test_closure
+ ae %q{
+ def make_proc(&b)
+ b
+ end
+
+ def make_closure
+ a = 0
+ make_proc{
+ a+=1
+ }
+ end
+
+ cl = make_closure
+ cl.call + cl.call * cl.call
+ }
+ end
+
+ def test_nestproc2
+ ae %q{
+ def iter
+ yield
+ end
+
+ def getproc &b
+ b
+ end
+
+ iter{
+ bvar = 3
+ getproc{
+ bvar2 = 4
+ bvar * bvar2
+ }
+ }.call
+ }
+
+ ae %q{
+ def iter
+ yield
+ end
+
+ def getproc &b
+ b
+ end
+
+ loc1 = 0
+ pr1 = iter{
+ bl1 = 1
+ getproc{
+ loc1 += 1
+ bl1 += 1
+ loc1 + bl1
+ }
+ }
+
+ pr2 = iter{
+ bl1 = 1
+ getproc{
+ loc1 += 1
+ bl1 += 1
+ loc1 + bl1
+ }
+ }
+
+ pr1.call; pr2.call
+ pr1.call; pr2.call
+ pr1.call; pr2.call
+ (pr1.call + pr2.call) * loc1
+ }
+ end
+
+ def test_proc_with_cref
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ $pr = proc{
+ (1..2).map{
+ Const
+ }
+ }
+ end
+ $pr.call
+ }
+ ae %q{
+ Const = :top
+ class C
+ Const = :C
+ end
+ pr = proc{
+ Const
+ }
+ C.class_eval %q{
+ pr.call
+ }
+ }
+ end
+
+ def test_3nest
+ ae %q{
+ def getproc &b
+ b
+ end
+
+ def m
+ yield
+ end
+
+ m{
+ i = 1
+ m{
+ j = 2
+ m{
+ k = 3
+ getproc{
+ [i, j, k]
+ }
+ }
+ }
+ }.call
+ }
+ end
+
+ def test_nestproc1
+ ae %q{
+ def proc &b
+ b
+ end
+
+ pr = []
+ proc{|i_b|
+ p3 = proc{|j_b|
+ pr << proc{|k_b|
+ [i_b, j_b, k_b]
+ }
+ }
+ p3.call(1)
+ p3.call(2)
+ }.call(0)
+
+ pr[0].call(:last).concat pr[1].call(:last)
+ }
+ end
+
+ def test_proc_with_block
+ ae %q{
+ def proc(&pr)
+ pr
+ end
+
+ def m
+ a = 1
+ m2{
+ a
+ }
+ end
+
+ def m2
+ b = 2
+ proc{
+ [yield, b]
+ }
+ end
+
+ pr = m
+ x = ['a', 1,2,3,4,5,6,7,8,9,0,
+ 1,2,3,4,5,6,7,8,9,0,
+ 1,2,3,4,5,6,7,8,9,0,
+ 1,2,3,4,5,6,7,8,9,0,
+ 1,2,3,4,5,6,7,8,9,0,]
+ pr.call
+ }
+ ae %q{
+ def proc(&pr)
+ pr
+ end
+
+ def m
+ a = 1
+ m2{
+ a
+ }
+ end
+
+ def m2
+ b = 2
+ proc{
+ [yield, b]
+ }
+ 100000.times{|x|
+ "#{x}"
+ }
+ yield
+ end
+ m
+ }
+ end
+
+ def test_method_to_proc
+ ae %q{
+ class C
+ def foo
+ :ok
+ end
+ end
+
+ def block
+ C.method(:new).to_proc
+ end
+ b = block()
+ b.call.foo
+ }
+ end
+
+ def test_safe
+ ae %q{
+ pr = proc{
+ $SAFE
+ }
+ $SAFE = 1
+ pr.call
+ }
+ ae %q{
+ pr = proc{
+ $SAFE += 1
+ }
+ [pr.call, $SAFE]
+ }
+ end
+end
+
diff --git a/yarvtest/test_syntax.rb b/yarvtest/test_syntax.rb new file mode 100644 index 0000000000..ce375328ac --- /dev/null +++ b/yarvtest/test_syntax.rb @@ -0,0 +1,594 @@ +require 'yarvtest/yarvtest'
+
+# test of syntax
+class TestSYNTAX < YarvTestBase
+
+ def test_if_unless
+ ae %q(if true then 1 ; end)
+ ae %q(if false then 1 ; end)
+ ae %q(if true then 1 ; else; 2; end)
+ ae %q(if false then 1 ; else; 2; end)
+ ae %q(if true then ; elsif true then ; 1 ; end)
+ ae %q(if false then ; elsif true then ; 1 ; end)
+
+ ae %q(unless true then 1 ; end)
+ ae %q(unless false then 1 ; end)
+ ae %q(unless true then 1 ; else; 2; end)
+ ae %q(unless false then 1 ; else; 2; end)
+
+ ae %q(1 if true)
+ ae %q(1 if false)
+ ae %q(1 if nil)
+
+ ae %q(1 unless true)
+ ae %q(1 unless false)
+ ae %q(1 unless nil)
+ end
+
+ def test_while_until
+ ae %q(
+ i = 0
+ while i < 10
+ i+=1
+ end)
+
+ ae %q(
+ i = 0
+ while i < 10
+ i+=1
+ end; i)
+
+ ae %q(
+ i = 0
+ until i > 10
+ i+=1
+ end)
+
+ ae %q(
+ i = 0
+ until i > 10
+ i+=1
+ end; i)
+ #
+ ae %q{
+ i = 0
+ begin
+ i+=1
+ end while false
+ i
+ }
+ ae %q{
+ i = 0
+ begin
+ i+=1
+ end until true
+ i
+ }
+ end
+
+ def test_and
+ ae %q(1 && 2 && 3 && 4)
+ ae %q(1 && nil && 3 && 4)
+ ae %q(1 && 2 && 3 && nil)
+ ae %q(1 && 2 && 3 && false)
+
+ ae %q(1 and 2 and 3 and 4)
+ ae %q(1 and nil and 3 and 4)
+ ae %q(1 and 2 and 3 and nil)
+ ae %q(1 and 2 and 3 and false)
+ ae %q(nil && true)
+ ae %q(false && true)
+
+ end
+
+ def test_or
+ ae %q(1 || 2 || 3 || 4)
+ ae %q(1 || false || 3 || 4)
+ ae %q(nil || 2 || 3 || 4)
+ ae %q(false || 2 || 3 || 4)
+ ae %q(nil || false || nil || false)
+
+ ae %q(1 or 2 or 3 or 4)
+ ae %q(1 or false or 3 or 4)
+ ae %q(nil or 2 or 3 or 4)
+ ae %q(false or 2 or 3 or 4)
+ ae %q(nil or false or nil or false)
+ end
+
+ def test_case
+ ae %q(
+ case 1
+ when 2
+ :ng
+ end)
+
+ ae %q(
+ case 1
+ when 10,20,30
+ :ng1
+ when 1,2,3
+ :ok
+ when 100,200,300
+ :ng2
+ else
+ :elseng
+ end)
+ ae %q(
+ case 123
+ when 10,20,30
+ :ng1
+ when 1,2,3
+ :ng2
+ when 100,200,300
+ :ng3
+ else
+ :elseok
+ end
+ )
+ ae %q(
+ case 'test'
+ when /testx/
+ :ng1
+ when /test/
+ :ok
+ when /tetxx/
+ :ng2
+ else
+ :ng_else
+ end
+ )
+ ae %q(
+ case Object.new
+ when Object
+ :ok
+ end
+ )
+ ae %q(
+ case Object
+ when Object.new
+ :ng
+ else
+ :ok
+ end
+ )
+ ae %q{
+ case 'test'
+ when 'tes'
+ :ng
+ when 'te'
+ :ng
+ else
+ :ok
+ end
+ }
+ ae %q{
+ case 'test'
+ when 'tes'
+ :ng
+ when 'te'
+ :ng
+ when 'test'
+ :ok
+ end
+ }
+ ae %q{
+ case 'test'
+ when 'tes'
+ :ng
+ when /te/
+ :ng
+ else
+ :ok
+ end
+ }
+ ae %q{
+ case 'test'
+ when 'tes'
+ :ng
+ when /test/
+ :ok
+ else
+ :ng
+ end
+ }
+ ae %q{
+ def test(arg)
+ case 1
+ when 2
+ 3
+ end
+ return arg
+ end
+
+ test(100)
+ }
+ end
+
+ def test_case_splat
+ ae %q{
+ ary = [1, 2]
+ case 1
+ when *ary
+ :ok
+ else
+ :ng
+ end
+ }
+ ae %q{
+ ary = [1, 2]
+ case 3
+ when *ary
+ :ng
+ else
+ :ok
+ end
+ }
+ ae %q{
+ ary = [1, 2]
+ case 1
+ when :x, *ary
+ :ok
+ when :z
+ :ng1
+ else
+ :ng2
+ end
+ }
+ ae %q{
+ ary = [1, 2]
+ case 3
+ when :x, *ary
+ :ng1
+ when :z
+ :ng2
+ else
+ :ok
+ end
+ }
+ end
+
+ def test_when
+ ae %q(
+ case
+ when 1==2, 2==3
+ :ng1
+ when false, 4==5
+ :ok
+ when false
+ :ng2
+ else
+ :elseng
+ end
+ )
+
+ ae %q(
+ case
+ when nil, nil
+ :ng1
+ when 1,2,3
+ :ok
+ when false, false
+ :ng2
+ else
+ :elseng
+ end
+ )
+
+ ae %q(
+ case
+ when nil
+ :ng1
+ when false
+ :ng2
+ else
+ :elseok
+ end)
+
+ ae %q{
+ case
+ when 1
+ end
+ }
+
+ ae %q{
+ r = nil
+ ary = []
+ case
+ when false
+ r = :ng1
+ when false, false
+ r = :ng2
+ when *ary
+ r = :ng3
+ when false, *ary
+ r = :ng4
+ when true, *ary
+ r = :ok
+ end
+ r
+ }
+ end
+
+ def test_when_splat
+ ae %q{
+ ary = []
+ case
+ when false, *ary
+ :ng
+ else
+ :ok
+ end
+ }
+ ae %q{
+ ary = [false, nil]
+ case
+ when *ary
+ :ng
+ else
+ :ok
+ end
+ }
+ ae %q{
+ ary = [false, nil]
+ case
+ when *ary
+ :ng
+ when true
+ :ok
+ else
+ :ng2
+ end
+ }
+ ae %q{
+ ary = [false, nil]
+ case
+ when *ary
+ :ok
+ else
+ :ng
+ end
+ }
+ ae %q{
+ ary = [false, true]
+ case
+ when *ary
+ :ok
+ else
+ :ng
+ end
+ }
+ ae %q{
+ ary = [false, true]
+ case
+ when false, false
+ when false, *ary
+ :ok
+ else
+ :ng
+ end
+ }
+ end
+
+ def test_flipflop
+ ae %q{
+ sum = 0
+ 30.times{|ib|
+ if ib % 10 == 0 .. true
+ sum += ib
+ end
+ }
+ sum
+ }
+ ae %q{
+ sum = 0
+ 30.times{|ib|
+ if ib % 10 == 0 ... true
+ sum += ib
+ end
+ }
+ sum
+ }
+ ae %q{
+ t = nil
+ unless ''.respond_to? :lines
+ class String
+ def lines
+ self
+ end
+ end
+ end
+
+ "this must not print
+ Type: NUM
+ 123
+ 456
+ Type: ARP
+ aaa
+ bbb
+ \f
+ this must not print
+ hoge
+ Type: ARP
+ aaa
+ bbb
+ ".lines.each{|l|
+ if (t = l[/^Type: (.*)/, 1])..(/^\f/ =~ l)
+ p [t, l]
+ end
+ }
+ }
+ end
+
+ def test_defined_vars
+ ae %q{
+ defined?(nil) + defined?(self) +
+ defined?(true) + defined?(false)
+ }
+ #ae %q{
+ # a = 1
+ # defined?(a) # yarv returns "in block" in eval context
+ #}
+ ae %q{
+ defined?(@a)
+ }
+ ae %q{
+ @a = 1
+ defined?(@a)
+ }
+ ae %q{
+ defined?(@@a)
+ }
+ ae %q{
+ @@a = 1
+ defined?(@@a)
+ }
+ ae %q{
+ defined?($a)
+ }
+ ae %q{
+ $a = 1
+ defined?($a)
+ }
+ ae %q{
+ defined?(C_definedtest)
+ }
+ ae %q{
+ C_definedtest = 1
+ defined?(C_definedtest)
+ } do
+ remove_const :C_definedtest
+ end
+
+ ae %q{
+ defined?(::C_definedtest)
+ }
+ ae %q{
+ C_definedtest = 1
+ defined?(::C_definedtest)
+ } do
+ remove_const :C_definedtest
+ end
+
+ ae %q{
+ defined?(C_definedtestA::C_definedtestB::C_definedtestC)
+ }
+ ae %q{
+ class C_definedtestA
+ class C_definedtestB
+ C_definedtestC = 1
+ end
+ end
+ defined?(C_definedtestA::C_definedtestB::C_definedtestC)
+ } do
+ remove_const :C_definedtestA
+ end
+ end
+
+ def test_defined_method
+ ae %q{
+ defined?(m)
+ }
+ ae %q{
+ def m
+ end
+ defined?(m)
+ }
+
+ ae %q{
+ defined?(a.class)
+ }
+ ae %q{
+ a = 1
+ defined?(a.class)
+ }
+ ae %q{
+ class C
+ def test
+ [defined?(m1()), defined?(self.m1), defined?(C.new.m1),
+ defined?(m2()), defined?(self.m2), defined?(C.new.m2),
+ defined?(m3()), defined?(self.m3), defined?(C.new.m3)]
+ end
+ def m1
+ end
+ private
+ def m2
+ end
+ protected
+ def m3
+ end
+ end
+ C.new.test + [defined?(C.new.m3)]
+ }
+ ae %q{
+ $ans = [defined?($1), defined?($2), defined?($3), defined?($4)]
+ /(a)(b)/ =~ 'ab'
+ $ans + [defined?($1), defined?($2), defined?($3), defined?($4)]
+ }
+ end
+
+ def test_condition
+ ae %q{
+
+ def make_perm ary, num
+ if num == 1
+ ary.map{|e| [e]}
+ else
+ base = make_perm(ary, num-1)
+ res = []
+ base.each{|b|
+ ary.each{|e|
+ res << [e] + b
+ }
+ }
+ res
+ end
+ end
+
+ def each_test
+ conds = make_perm(['fv', 'tv'], 3)
+ bangs = make_perm(['', '!'], 3)
+ exprs = make_perm(['and', 'or'], 3)
+ ['if', 'unless'].each{|syn|
+ conds.each{|cs|
+ bangs.each{|bs|
+ exprs.each{|es|
+ yield(syn, cs, bs, es)
+ }
+ }
+ }
+ }
+ end
+
+ fv = false
+ tv = true
+
+ $ans = []
+ each_test{|syn, conds, bangs, exprs|
+ c1, c2, c3 = conds
+ bang1, bang2, bang3 = bangs
+ e1, e2 = exprs
+ eval %Q{
+ #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
+ $ans << :then
+ else
+ $ans << :false
+ end
+ }
+ }
+
+ each_test{|syn, conds, bangs, exprs|
+ c1, c2, c3 = conds
+ bang1, bang2, bang3 = bangs
+ e1, e2 = exprs
+ eval %Q{
+ #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
+ $ans << :then
+ end
+ $ans << :sep
+ }
+ }
+ $ans
+ }
+ end
+end
+
diff --git a/yarvtest/test_test.rb b/yarvtest/test_test.rb new file mode 100644 index 0000000000..17a0e2363b --- /dev/null +++ b/yarvtest/test_test.rb @@ -0,0 +1,8 @@ +require 'yarvtest/yarvtest'
+
+# test of syntax
+class TestTest < YarvTestBase
+ def test_1
+ ae '100'
+ end
+end
diff --git a/yarvtest/test_thread.rb b/yarvtest/test_thread.rb new file mode 100644 index 0000000000..ba0c0838dd --- /dev/null +++ b/yarvtest/test_thread.rb @@ -0,0 +1,209 @@ +
+require 'yarvtest/yarvtest'
+
+class TestThread < YarvTestBase
+ def test_create
+ ae %q{
+ Thread.new{
+ }.join
+ :ok
+ }
+ ae %q{
+ Thread.new{
+ :ok
+ }.value
+ }
+ end
+
+ def test_create_many_threads1
+ ae %q{
+ v = 0
+ (1..200).map{|i|
+ Thread.new{
+ i
+ }
+ }.each{|t|
+ v += t.value
+ }
+ v
+ }
+ end
+
+ def test_create_many_threads2
+ ae %q{
+ 5000.times{|e|
+ (1..2).map{
+ Thread.new{
+ }
+ }.each{|e|
+ e.join
+ }
+ }
+ }
+ end
+
+ def test_create_many_threads3
+ ae %q{
+ 5000.times{
+ t = Thread.new{}
+ while t.alive?
+ Thread.pass
+ end
+ }
+ }
+ end
+
+ def test_create_many_threads4
+ ae %q{
+ 100.times{
+ Thread.new{loop{Thread.pass}}
+ }
+ }
+ end
+
+ def test_raise
+ ae %q{
+ t = Thread.new{
+ sleep
+ }
+ sleep 0.1
+ t.raise
+ begin
+ t.join
+ :ng
+ rescue
+ :ok
+ end
+ }
+ ae %q{
+ t = Thread.new{
+ loop{}
+ }
+ Thread.pass
+ t.raise
+ begin
+ t.join
+ :ng
+ rescue
+ :ok
+ end
+ }
+ ae %q{
+ t = Thread.new{
+ }
+ Thread.pass
+ t.join
+ t.raise # raise to exited thread
+ begin
+ t.join
+ :ok
+ rescue
+ :ng
+ end
+ }
+ end
+
+ def test_status
+ ae %q{
+ t = Thread.new{
+ loop{}
+ }
+ st = t.status
+ t.kill
+ st
+ }
+ ae %q{
+ t = Thread.new{
+ sleep
+ }
+ sleep 0.1
+ st = t.status
+ t.kill
+ st
+ }
+ ae %q{
+ t = Thread.new{
+ }
+ t.kill
+ sleep 0.1
+ t.status
+ }
+ end
+
+ def test_tlv
+ ae %q{
+ Thread.current[:a] = 1
+ Thread.new{
+ Thread.current[:a] = 10
+ Thread.pass
+ Thread.current[:a]
+ }.value + Thread.current[:a]
+ }
+ end
+
+ def test_thread_group
+ ae %q{
+ ptg = Thread.current.group
+ Thread.new{
+ ctg = Thread.current.group
+ [ctg.class, ctg == ptg]
+ }.value
+ }
+ ae %q{
+ thg = ThreadGroup.new
+
+ t = Thread.new{
+ thg.add Thread.current
+ sleep
+ }
+ sleep 0.1
+ [thg.list.size, ThreadGroup::Default.list.size]
+ }
+ end
+
+ def test_thread_local_svar
+ ae %q{
+ /a/ =~ 'a'
+ $a = $~
+ Thread.new{
+ $b = $~
+ /a/ =~ 'a'
+ $c = $~
+ }
+ $d = $~
+ [$a == $d, $b, $c != $d]
+ }
+ end
+
+ def test_join
+ ae %q{
+ Thread.new{
+ :ok
+ }.join.value
+ }
+ ae %q{
+ begin
+ Thread.new{
+ raise "ok"
+ }.join
+ rescue => e
+ e
+ end
+ }
+ ae %q{
+ ans = nil
+ t = Thread.new{
+ begin
+ sleep 0.5
+ ensure
+ ans = :ok
+ end
+ }
+ Thread.pass
+ t.kill
+ t.join
+ ans
+ }
+ end
+end
+
diff --git a/yarvtest/test_yield.rb b/yarvtest/test_yield.rb new file mode 100644 index 0000000000..72b2182099 --- /dev/null +++ b/yarvtest/test_yield.rb @@ -0,0 +1,207 @@ +require 'yarvtest/yarvtest'
+class TestYield < YarvTestBase
+ def test_simple
+ ae %q{
+ def iter
+ yield
+ end
+ iter{
+ 1
+ }
+ }
+ end
+
+ def test_hash_each
+ ae %q{
+ h = {:a => 1}
+ a = []
+ h.each{|k, v|
+ a << [k, v]
+ }
+ h.each{|kv|
+ a << kv
+ }
+ a
+ }
+ end
+
+ def test_ary_each
+ ae %q{
+ ans = []
+ ary = [1,2,3]
+ ary.each{|a, b, c, d|
+ ans << [a, b, c, d]
+ }
+ ary.each{|a, b, c|
+ ans << [a, b, c]
+ }
+ ary.each{|a, b|
+ ans << [a, b]
+ }
+ ary.each{|a|
+ ans << [a]
+ }
+ ans
+ }
+ end
+
+ def test_iter
+ ae %q{
+ def iter *args
+ yield *args
+ end
+
+ ans = []
+ ary = [1,2,3]
+ ary.each{|a, b, c, d|
+ ans << [a, b, c, d]
+ }
+ ary.each{|a, b, c|
+ ans << [a, b, c]
+ }
+ ary.each{|a, b|
+ ans << [a, b]
+ }
+ ary.each{|a|
+ ans << [a]
+ }
+ ans
+ }
+ end
+
+ def test_iter2
+ ae %q{
+ def iter args
+ yield *args
+ end
+ ans = []
+ iter([]){|a, b|
+ ans << [a, b]
+ }
+ iter([1]){|a, b|
+ ans << [a, b]
+ }
+ iter([1, 2]){|a, b|
+ ans << [a, b]
+ }
+ iter([1, 2, 3]){|a, b|
+ ans << [a, b]
+ }
+ ans
+ }
+ ae %q{
+ def iter args
+ yield *args
+ end
+ ans = []
+
+ iter([]){|a|
+ ans << a
+ }
+ iter([1]){|a|
+ ans << a
+ }
+ iter([1, 2]){|a|
+ ans << a
+ }
+ iter([1, 2, 3]){|a|
+ ans << a
+ }
+ ans
+ }
+ end
+
+ def test_1_ary_and_n_params
+ ae %q{
+ def iter args
+ yield args
+ end
+ ans = []
+ iter([]){|a, b|
+ ans << [a, b]
+ }
+ iter([1]){|a, b|
+ ans << [a, b]
+ }
+ iter([1, 2]){|a, b|
+ ans << [a, b]
+ }
+ iter([1, 2, 3]){|a, b|
+ ans << [a, b]
+ }
+ ans
+ }
+ end
+
+ def test_1_ary_and_1_params
+ ae %q{
+ def iter args
+ yield args
+ end
+ ans = []
+ iter([]){|a|
+ ans << a
+ }
+ iter([1]){|a|
+ ans << a
+ }
+ iter([1, 2]){|a|
+ ans << a
+ }
+ iter([1, 2, 3]){|a|
+ ans << a
+ }
+ ans
+ }
+ end
+
+ def test_argscat
+ ae %q{
+ def iter
+ yield 1, *[2, 3]
+ end
+
+ iter{|a, b, c|
+ [a, b, c]
+ }
+ }
+ ae %q{
+ def iter
+ yield 1, *[]
+ end
+
+ iter{|a, b, c|
+ [a, b, c]
+ }
+ }
+ if false
+ ae %q{
+ def iter
+ yield 1, *2
+ end
+
+ iter{|a, b, c|
+ [a, b, c]
+ }
+ }
+ end
+ end
+
+ def test_massgin
+ ae %q{
+ ans = []
+ [[1, [2, 3]], [4, [5, 6]]].each{|a, (b, c)|
+ ans << [a, b, c]
+ }
+ ans
+ }
+ ae %q{
+ ans = []
+ [[1, [2, 3]], [4, [5, 6]]].map{|a, (b, c)|
+ ans << [a, b, c]
+ } + ans
+ }
+ end
+end
+
+
diff --git a/yarvtest/yarvtest.rb b/yarvtest/yarvtest.rb new file mode 100644 index 0000000000..906af727b4 --- /dev/null +++ b/yarvtest/yarvtest.rb @@ -0,0 +1,136 @@ +require 'test/unit'
+
+if defined? YARV_PATCHED
+require 'yarvutil'
+
+class YarvTestBase < Test::Unit::TestCase
+
+ def remove_const sym
+ Object.module_eval{
+ remove_const sym
+ }
+ end
+
+ def remove_method sym
+ Object.module_eval{
+ undef sym
+ }
+ end
+
+ def ae str
+ # puts str
+ # puts YARVUtil.parse(str, $0, 0).disasm
+
+ ruby = YARVUtil.eval_in_wrap(str)
+ yield if block_given?
+
+ yarv = YARVUtil.eval(str)
+ yield if block_given?
+
+ assert_equal(ruby, yarv)
+ end
+
+ def test_
+ end
+
+end
+
+else
+
+require 'rbconfig'
+class YarvTestBase < Test::Unit::TestCase
+ def initialize *args
+ super
+
+ if /mswin32/ !~ RUBY_PLATFORM
+ @yarv = './miniruby'
+ else
+ @yarv = 'miniruby'
+ end
+ @ruby = Config::CONFIG['ruby_install_name']
+ end
+
+ def remove_const sym
+ Object.module_eval{
+ remove_const sym
+ }
+ end
+
+ def remove_method sym
+ Object.module_eval{
+ undef sym
+ }
+ end
+
+ require 'tempfile'
+ def exec exec_file, program
+ dir = []
+ dir << ENV['RAMDISK'] if ENV['RAMDISK']
+ tmpf = Tempfile.new("yarvtest_#{Process.pid}_#{Time.now.to_i}", *dir)
+ tmpf.write program
+ tmpf.close
+ result = `#{exec_file} #{tmpf.path}`
+ tmpf.open
+ tmpf.close(true)
+ result
+ end
+
+ def dump_and_exec exec_file, str
+ asmstr = <<-EOASMSTR
+ iseq = YARVCore::InstructionSequence.compile(<<-'EOS__')
+ #{str}
+ EOS__
+ p YARVCore::InstructionSequence.load(iseq.to_a).eval
+ EOASMSTR
+
+ exec(exec_file, asmstr)
+ end
+
+ def exec_ exec_file, program
+ exec_file.tr!('\\', '/')
+ r = ''
+ IO.popen("#{exec_file}", 'r+'){|io|
+ #
+ io.write program
+ io.close_write
+ begin
+ while line = io.gets
+ r << line
+ # p line
+ end
+ rescue => e
+ # p e
+ end
+ }
+ r
+ end
+
+ def ae str
+ evalstr = %{
+ p eval(%q{
+ #{str}
+ })
+ }
+
+ ruby = exec(@ruby, evalstr)
+ yarv = exec(@yarv, evalstr)
+
+ if $DEBUG #|| true
+ puts "yarv (#@yarv): #{yarv}"
+ puts "ruby (#@ruby): #{ruby}"
+ end
+
+ assert_equal(ruby.gsub(/\r/, ''), yarv.gsub(/\r/, ''))
+
+ # store/load test
+ if false # || true
+ yarvasm = dump_and_exec(@yarv, str)
+ assert_equal(ruby.gsub(/\r/, ''), yarvasm.gsub(/\r/, ''))
+ end
+ end
+
+ def test_
+ end
+end
+
+end
|