ytl 0.0.2 → 0.0.3

data/lib/ytl.rb

@@ -8,6 +8,8 @@ require 'optparse'
 include YTLJit
 module YTL
   include YTLJit
+
+  VERSION = "0.0.3"
   
   ISEQ_OPTS = {  
     :peephole_optimization    => true,
@@ -37,7 +39,8 @@ module YTL
       ytlopt[:dump_context] = f
     end
 
-    opt.on('--write-code =FILE', 'Write generating code') do |f|
+    opt.on('-o FILE', '--write-code =FILE', 
+            'Write generating naitive code and node objects') do |f|
       ytlopt[:write_code] = f
     end
 
@@ -56,10 +59,79 @@ module YTL
       ytlopt[:execute_before_compile].push f
     end
 
+    opt.on('-c', '--compile-only', 
+           'Stop when compile finished (not execute compiled code)') do |f|
+      ytlopt[:compile_only] = f
+    end
+
+    opt.on('--compile-array-as-unboxed', 
+           'Compile Array as unboxed if nesseary(not excape, not use special methods)') do |f|
+      ytlopt[:compile_array_as_uboxed] = f
+    end
+
     opt.parse!(argv)
     ytlopt
   end
-  
+
+  def self.dump_node(tnode, fn)
+    if defined? yield then
+      yield
+    end
+    File.open(fn, "w") do |fp|
+      ClassClassWrapper.instance_tab.keys.each do |klass|
+        if !klass.is_a?(ClassClassWrapper) then
+          fp.print "class #{klass.name}; end\n"
+        end
+      end
+
+      fp.print "Marshal.load(<<'EOS')\n"
+      fp.print Marshal.dump(tnode)
+      fp.print "\n"
+      fp.print "EOS\n"
+    end
+  end
+
+  def self.reduced_main(prog, options)
+    tr_context = VM::YARVContext.new
+
+    import_ruby_object(tr_context)
+
+    tnode = nil
+    is = RubyVM::InstructionSequence.compile(prog, ARGV[0], 
+                                             "", 0, ISEQ_OPTS).to_a
+    iseq = VMLib::InstSeqTree.new(nil, is)
+    
+    tr = VM::YARVTranslatorCRubyObject.new([iseq])
+    tnode = tr.translate(tr_context)
+
+    ci_context = VM::CollectInfoContext.new(tnode)
+    ci_context.options = options
+    tnode.collect_info(ci_context)
+
+    dmylit = VM::Node::LiteralNode.new(tnode, nil)
+    arg = [dmylit, dmylit, dmylit]
+    sig = []
+    arg.each do |ele|
+      sig.push RubyType::BaseType.from_ruby_class(NilClass)
+    end
+
+    ti_context = VM::TypeInferenceContext.new(tnode)
+    ti_context.options = options
+    begin
+      tnode.collect_candidate_type(ti_context, arg, sig)
+    end until ti_context.convergent
+    ti_context = tnode.collect_candidate_type(ti_context, arg, sig)
+
+    c_context = VM::CompileContext.new(tnode)
+    c_context.current_method_signature.push sig
+    c_context.options = options
+    c_context = tnode.compile(c_context)
+    tnode.make_frame_struct_tab
+
+    tcs = tnode.code_space
+    tcs.call(tcs.base_address)
+  end
+
   def self.main(options)
     tr_context = VM::YARVContext.new
     progs = []
@@ -73,26 +145,42 @@ module YTL
                                              "", 0, ISEQ_OPTS).to_a
       iseq = VMLib::InstSeqTree.new(nil, is)
       tr = VM::YARVTranslatorCRubyObject.new([iseq])
+      tr_context.current_file_name = fn
       tr.translate(tr_context)
     end
 
-    prog = File.read(ARGV[0])
-    is = RubyVM::InstructionSequence.compile(prog, ARGV[0], 
-                                             "", 0, ISEQ_OPTS).to_a
-    iseq = VMLib::InstSeqTree.new(nil, is)
-    if options[:dump_yarv] then
-      pp iseq
-    end
+    tnode = nil
+    case File.extname(ARGV[0])
+    when ".ytl"
+      File.open(ARGV[0]) do |fp|
+        tnode = eval(fp.read, TOPLEVEL_BINDING)
+      end
+      tnode.update_after_restore
+      if tnode.code_space then
+        tnode.code_space.call(tnode.code_space.base_address)
+        return
+      end
+
+    when ".rb"
+      prog = File.read(ARGV[0])
+      is = RubyVM::InstructionSequence.compile(prog, ARGV[0], 
+                                               "", 0, ISEQ_OPTS).to_a
+      iseq = VMLib::InstSeqTree.new(nil, is)
+      if options[:dump_yarv] then
+        pp iseq
+      end
     
-    tr = VM::YARVTranslatorCRubyObject.new([iseq])
-    tnode = tr.translate(tr_context)
+      tr = VM::YARVTranslatorCRubyObject.new([iseq])
+      tr_context.current_file_name = ARGV[0]
+      tnode = tr.translate(tr_context)
+    end
+
     ci_context = VM::CollectInfoContext.new(tnode)
+    ci_context.options = options
     tnode.collect_info(ci_context)
-
+      
     if fn = options[:write_node_before_ti] then
-      File.open(fn, "w") do |fp|
-        fp.print Marshal.dump(tnode)
-      end
+      dump_node(tnode, fn)
     end
 
     dmylit = VM::Node::LiteralNode.new(tnode, nil)
@@ -103,10 +191,15 @@ module YTL
     end
 
     ti_context = VM::TypeInferenceContext.new(tnode)
+    ti_context.options = options
     begin
       tnode.collect_candidate_type(ti_context, arg, sig)
     end until ti_context.convergent
     ti_context = tnode.collect_candidate_type(ti_context, arg, sig)
+
+    if fn = options[:write_node_after_ti] then
+      dump_node(tnode, fn)
+    end
     
     c_context = VM::CompileContext.new(tnode)
     c_context.current_method_signature.push sig
@@ -114,10 +207,10 @@ module YTL
     c_context = tnode.compile(c_context)
     tnode.make_frame_struct_tab
 
-    if fn = options[:write_node_after_ti] then
-      File.open(fn, "w") do |fp|
-        fp.print Marshal.dump(tnode)
-      end
+    if fn = options[:write_code] then
+      dump_node(tnode, fn) {
+        tnode.code_store_hook
+      }
     end
 
     if options[:disasm] then
@@ -129,10 +222,14 @@ module YTL
 
     tcs = tnode.code_space
     STDOUT.flush
-    tcs.call(tcs.base_address)
+    if !options[:compile_only] then
+      tcs.call(tcs.base_address)
+    end
   end
 end
 
+Version = "#{YTL::VERSION} (ytljit #{YTLJit::VERSION})"
+
 if __FILE__ == $0 then
   YTL::main(YTL::parse_opt(ARGV))
 end

data/runtime/prelude.rb

@@ -1,16 +1,18 @@
 # runtime library written in ytl
 <<-'EOS'
 #
-def attr(*x)
-  x.each do |ele|
-    eval "def #{ele}; @#{ele} ; end"
+class Module
+  def attr(*x)
+    x.each do |ele|
+      eval "def #{ele}; @#{ele} ; end"
+    end
   end
-end
 
-def attr_accessor(*x)
-  x.each do |ele|
-    eval "def #{ele}; @#{ele} ; end\n"
-    eval "def #{ele}=(val); @#{ele} = val ; end"
+  def attr_accessor(*x)
+    x.each do |ele|
+      eval "def #{ele}; @#{ele} ; end\n"
+      eval "def #{ele}=(val); @#{ele} = val ; end"
+    end
   end
 end
 
@@ -25,6 +27,10 @@ class Array
 
     self
   end
+
+  def at(idx)
+    self[idx]
+  end
 end
 
 class Range
@@ -41,9 +47,9 @@ class Range
         yield i
         i = i + 1
       end
-   end
+    end
 
-   e
+    e
   end
 end
 
@@ -60,9 +66,16 @@ class Fixnum
 
   def step(max, st)
     i = self
-    while i < max
-      yield i
-      i = i + st
+    if st > 0 then
+      while i <= max
+        yield i
+        i = i + st
+      end
+    else
+      while i >= max
+        yield i
+        i = i + st
+      end
     end
 
     self

data/runtime/test.rb

@@ -0,0 +1 @@
+  

data/test/basictest.rb

@@ -61,11 +61,13 @@ end
 
 p id(blk3 { "abc"})
 p id(blk3 { 1 })
+p blk3 { 1 }
 
 def mul(x, y)
   x * y
 end
 
+p "mul"
 p mul(30, 40)
 p mul(30, -40)
 p mul(-30, 40)
@@ -79,6 +81,7 @@ def div(x, y)
   x / y
 end
 
+p "div"
 p div(30, 4)
 p div(30, -4)
 p div(-30, 4)
@@ -92,6 +95,25 @@ p div(35, -7)
 p div(-35, 7)
 p div(-35, -7)
 
+def rem(x, y)
+  x % y
+end
+p "rem"
+p rem(30, 4)
+p rem(30, -4)
+p rem(-30, 4)
+p rem(-30, -4)
+p rem(35, 7)
+p rem(35, -7)
+p rem(-35, 7)
+p rem(-35, -7)
+
+p "shift"
+p 1 << 2
+p 1 << 0
+p 3 >> 1
+p 1024 >> 3
+
 p 1 < 1
 p 1 > 1
 p 1 <= 1
@@ -133,6 +155,7 @@ def test_while
   i = 10
   j = 0
   k = 10
+
   while i > 0
     while k > 0
       j = j + i
@@ -161,6 +184,21 @@ p a.last
 p a
 p Range.new(i, 2, false)
 p 1...3
+
+def test_poly(a, b, c)
+  if c == 1 then
+    a + b
+  else
+    a * b
+  end
+end
+
+p test_poly(2, 2, 1)
+p test_poly(2.0, 2.0, 1)
+p test_poly(2, 2, 0)
+p test_poly(2.0, 2.0, 0)
+
+
 =begin
 def id(a, *b)
   p a
@@ -177,3 +215,4 @@ for i in 1...2
 end
 
 =end
+ 

data/test/breaktest.rb

@@ -0,0 +1,84 @@
+def test0
+  begin
+    return
+  ensure
+    p "BAR0"
+  end
+end
+
+def test1
+  [1, 2, 3].each do |n|
+    p n
+    next
+  end
+  p "foo1"
+end
+
+def test2
+  [1, 2, 3].each do |n|
+    p n
+    return
+  end
+  p "bar2"
+end
+
+def test3
+  begin
+    [1, 2, 3].each do |n|
+      p n
+      return
+    end
+    p "foo3"
+  ensure
+    p "bar3"
+  end
+end
+
+def test4
+  begin
+    [1, 2, 3].each do |n|
+      p n
+      break
+    end
+    p "foo4"
+  ensure
+    p "bar4"
+  end
+end
+
+
+test0
+
+test1
+test2
+
+test3
+test4
+
+=begin
+# Not support yet
+
+def test5
+  begin
+    [1, 2, 3].each do |n|
+      p n
+      next
+    end
+    p "foo5"
+  ensure
+    p "bar5"
+  end
+end
+
+def test6
+  begin
+    [1, 2, 3].each do |n|
+      p n
+      redo
+    end
+    p "foo"
+  ensure
+    p "bar"
+  end
+end
+=end

data/test/classtest.rb

@@ -42,6 +42,32 @@ end
 p Baz.new
 p Baz.alloc
 
+module Foo0
+  def mess
+    p "from included module Foo0"
+  end
+end
+
+module Foo1
+  def mess
+    p "from included module Foo1"
+  end
+end
+
+class Foo
+  include Foo0
+  include Foo1
+end
+
+Foo.new.mess
+
+class Foo
+  extend Foo0
+  extend Foo1
+end
+
+Foo.mess
+
 #=end
 =begin
 class Asd

data/test/condtest.rb

@@ -0,0 +1,22 @@
+def test(bool1, bool2)
+  if bool1 then
+    p "bool1"
+  elsif bool2
+    p "bool2"
+  else
+    p "nothing"
+  end
+end
+
+a = true
+b = false
+p a ? 1 : 0
+p b ? 1 : 0
+
+p 1 + (a ? 1 : 0)
+p 1 + (b ? 0b1 : 0b0)
+
+test(true, true)
+test(false, true)
+test(false, false)
+

data/test/exceptiontest.rb

@@ -7,8 +7,11 @@ def foo
   end
 
   begin
-    b = 2
-    raise ArgumentError
+    begin
+      b = 2
+      raise ArgumentError
+    rescue ArgumentError
+    end
   rescue IndexError
     p "index2"
   end

data/test/execytl.rb

@@ -0,0 +1,5 @@
+require 'lib/ytl'
+p YTL::reduced_main("1", {})
+p YTL::reduced_main("1 + 1", {})
+p YTL::reduced_main("2 + 2", {})
+p YTL::reduced_main("[[1, 2, 3], 4][0]", {})

data/test/macrotest.rb

@@ -1,11 +1,20 @@
-def myattr(*x)
-  str = ""
-  x.each do |e|
-     eval "def #{e}; @#{e}; end\n"
+class Module
+  def myattr(*x)
+    str = ""
+    x.each do |e|
+      eval "def #{e}; @#{e}; end\n"
+    end
+  end
+end
+
+class Foo
+  def myattr(x)
+    p x
   end
 end
 
 myattr :foo, :bar
+Foo.new.myattr("abc")
 
 # Can't psss this test yet
 =begin

data/test/tmp.rb

@@ -1,7 +1,7 @@
-def array
-  a = [3, 4, 5]
-  a[1] = 1
-  p a
-  [1, 2, 3][0] + [1, 2, 3][1]  
+j = 0
+for i in 1..3
+  j += i
+  p j
 end
-p array
+j
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Hideki Miura
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +09:00
+date: 2011-05-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
+        - 7
+        version: 0.0.7
   type: :runtime
   version_requirements: *id001
 description: 
@@ -46,10 +46,14 @@ files:
 - lib/ytl/importobj.rb
 - lib/ytl/macro.rb
 - runtime/prelude.rb
+- runtime/test.rb
 - runtime/type.rb
 - test/basictest.rb
+- test/breaktest.rb
 - test/classtest.rb
+- test/condtest.rb
 - test/exceptiontest.rb
+- test/execytl.rb
 - test/exttest.rb
 - test/floattest.rb
 - test/ivtest.rb
@@ -92,8 +96,11 @@ specification_version: 3
 summary: Very tiny subset of YARV to native code translator
 test_files: 
 - test/basictest.rb
+- test/breaktest.rb
 - test/classtest.rb
+- test/condtest.rb
 - test/exceptiontest.rb
+- test/execytl.rb
 - test/exttest.rb
 - test/floattest.rb
 - test/ivtest.rb