ytl 0.0.3 → 0.0.4

data/lib/ytl/accmem.rb

@@ -243,9 +243,9 @@ module YTLJit
         end
 
         def collect_candidate_type_regident(context, slf)
-          if Runtime::Arena.is_a?(slf.ruby_type) then
-            slfcls = @arguments[2].get_constant_value
-            tt = RubyType::BaseType.from_ruby_class(slfcls[0])
+          slfcls = @arguments[2].get_constant_value
+          tt = RubyType::BaseType.from_ruby_class(slfcls[0])
+          if tt.ruby_type == Runtime::Arena then
             add_type(context.to_signature, tt)
               
             if @initmethod.is_a?(SendInitializeNode) then

data/lib/ytl.rb

@@ -9,7 +9,7 @@ include YTLJit
 module YTL
   include YTLJit
 
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   
   ISEQ_OPTS = {  
     :peephole_optimization    => true,
@@ -19,60 +19,68 @@ module YTL
 
   def self.parse_opt(argv)
     ytlopt = {}
-    prelude = File.join(File.dirname(__FILE__), "..", "runtime", "prelude.rb")
-    ytlopt[:execute_before_compile] = [prelude]
+    ytlopt[:execute_before_compile] = []
     opt = OptionParser.new
     
     opt.on('--disasm', 'Disasemble generated code') do |f|
       ytlopt[:disasm] = f
     end
-
+    
     opt.on('--dump-yarv', 'Dump YARV byte code') do |f|
       ytlopt[:dump_yarv] = f
     end
-
+    
     opt.on('--disp-signature', 'Display signature of method') do |f|
       ytlopt[:disp_signature] = f
     end
-
+    
     opt.on('--dump-context', 'Dump context(registor/stack) for debug') do |f|
       ytlopt[:dump_context] = f
     end
-
+    
     opt.on('-o FILE', '--write-code =FILE', 
-            'Write generating naitive code and node objects') do |f|
+           'Write generating naitive code and node objects') do |f|
       ytlopt[:write_code] = f
     end
-
+    
     opt.on('--write-node-before-type-inference =FILE', 
            'Write node of before type inference') do |f|
       ytlopt[:write_node_before_ti] = f
     end
-
+    
     opt.on('--write-node-after-type-inference =FILE', 
            'Write node of after type inference') do |f|
       ytlopt[:write_node_after_ti] = f
     end
-
+    
     opt.on('-r FILE', '--execute-before-compile =FILE', 
            'Execute ruby program (execute by CRuby)') do |f|
       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.prelude_iseq
+    prelude = File.join(File.dirname(__FILE__), "..", "runtime", "prelude.rb")
+    rf = File.read(prelude)
+    prog = eval(rf)
+    is = RubyVM::InstructionSequence.compile(prog, ARGV[0], 
+                                             "", 0, ISEQ_OPTS).to_a
+    VMLib::InstSeqTree.new(nil, is)
+  end
+    
   def self.dump_node(tnode, fn)
     if defined? yield then
       yield
@@ -83,72 +91,73 @@ module YTL
           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)
+    iseqs = [prelude_iseq, iseq]
     
-    tr = VM::YARVTranslatorCRubyObject.new([iseq])
+    tr = VM::YARVTranslatorCRubyObject.new(iseqs)
     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 = []
-
+    
     import_ruby_object(tr_context)
     options[:execute_before_compile].each do |fn|
       rf = File.read(fn)
       prog = eval(rf)
       progs.push prog
       is = RubyVM::InstructionSequence.compile(prog, ARGV[0], 
-                                             "", 0, ISEQ_OPTS).to_a
+                                               "", 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
-
+    
     tnode = nil
     case File.extname(ARGV[0])
     when ".ytl"
@@ -160,7 +169,7 @@ module YTL
         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], 
@@ -169,34 +178,35 @@ module YTL
       if options[:dump_yarv] then
         pp iseq
       end
-    
-      tr = VM::YARVTranslatorCRubyObject.new([iseq])
+      iseqs = [prelude_iseq, iseq]
+      
+      tr = VM::YARVTranslatorCRubyObject.new(iseqs)
       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
       dump_node(tnode, fn)
     end
-
+    
     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)
-
+    
     if fn = options[:write_node_after_ti] then
       dump_node(tnode, fn)
     end
@@ -206,20 +216,20 @@ module YTL
     c_context.options = options
     c_context = tnode.compile(c_context)
     tnode.make_frame_struct_tab
-
+    
     if fn = options[:write_code] then
       dump_node(tnode, fn) {
         tnode.code_store_hook
       }
     end
-
+    
     if options[:disasm] then
       tnode.code_space_tab.each do |cs|
         cs.fill_disasm_cache
       end
       tnode.code_space.disassemble
     end
-
+    
     tcs = tnode.code_space
     STDOUT.flush
     if !options[:compile_only] then

data/runtime/prelude.rb

@@ -24,10 +24,34 @@ class Array
       yield self[i]
       i = i + 1
     end
-
+ 
     self
   end
 
+  def collect
+    res = []
+    i = 0
+    e = self.size
+    while i < e
+      res[i] = yield self[i]
+      i = i + 1
+    end
+
+    res
+  end
+
+  def map
+    res = []
+    i = 0
+    e = self.size
+    while i < e
+      res[i] = yield self[i]
+      i = i + 1
+    end
+
+    res
+  end
+
   def at(idx)
     self[idx]
   end
@@ -49,7 +73,26 @@ class Range
       end
     end
 
-    e
+    self
+  end
+
+  def to_a
+    i = self.first
+    e = self.last
+    res = []
+    if self.exclude_end? then
+      while i < e
+        res.push i
+        i = i + 1
+      end
+    else
+      while i <= e
+        res.push i
+        i = i + 1
+      end
+    end
+
+    res
   end
 end
 

data/test/floattest.rb

@@ -2,3 +2,10 @@ p "2.0".to_f
 p (7).to_f
 p Math.sin(3.14159265)
 p Math.sqrt(2.0)
+p (0.0).to_i
+p 1.to_i
+p 1.5.to_i
+p 1.0.to_i
+p 3.14.to_i
+p -3.00000001.to_i
+p 3.00000001.to_i

data/test/hashtest.rb

@@ -0,0 +1,15 @@
+a = Hash.new
+a[:a] = 1
+a[:b] = 2
+
+p a[:a]
+p a[:b]
+p a[:c]
+
+b = {:a => 1, :b => 3, 1 => :c}
+p b
+p b[:a]
+p b[:b]
+p b[3]
+
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Hideki Miura
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +09:00
+date: 2011-08-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,6 @@ files:
 - lib/ytl/importobj.rb
 - lib/ytl/macro.rb
 - runtime/prelude.rb
-- runtime/test.rb
 - runtime/type.rb
 - test/basictest.rb
 - test/breaktest.rb
@@ -56,6 +55,7 @@ files:
 - test/execytl.rb
 - test/exttest.rb
 - test/floattest.rb
+- test/hashtest.rb
 - test/ivtest.rb
 - test/looptest.rb
 - test/macrotest.rb
@@ -103,6 +103,7 @@ test_files:
 - test/execytl.rb
 - test/exttest.rb
 - test/floattest.rb
+- test/hashtest.rb
 - test/ivtest.rb
 - test/looptest.rb
 - test/macrotest.rb

data/runtime/test.rb

@@ -1 +0,0 @@
-