@@ -1,3 +1,9 @@ +2009-08-30 Hideki Miura + +* Array#at‚Ȃǂ̃*ƒ\ƒbƒh‚͌ĂÑ*o‚·*ê*Š‚²‚Æ‚ÉŒ^‚ªˆÙ‚Ȃ肤‚é.‚±‚ê‚ð‘S•”“**‡‚µ‚Ĉµ‚¤‚Æ + “®“IŒ^ƒ`ƒFƒbƒN‚ª“ü‚Á‚¿‚Ⴄ‚̂ŌĂÑ*o‚µ–ˆ‚ÉŒ^ƒIƒuƒWƒFƒNƒg‚ð—pˆÓ‚µ‚ÄŒÂ*X‚ÉŒ^*„˜_‚·‚é + ‚±‚Ì—l‚ÈŒ^‚ðŽ*‚ƒ*ƒ\ƒbƒh‚̃tƒ‰ƒO‚ð*ì‚é*B + 2009-07-08 <miura> * typeƒIƒuƒWƒFƒNƒg‚Ìconstant‚Æcontent‚ðŽg‚¢•ª‚¯‚邱‚Æ*Bfunction, structure‚Í MEMO @@ -752,6 +752,12 @@ module SendUtil pppp "RubyMethod called #{mname.inspect}" para = gen_arg_eval(args, receiver, ins, local_vars, info, minfo, mname) + if func == nil then + level = @expstack.size + if @array_alloca_size == nil or @array_alloca_size < 1 + level then + @array_alloca_size = 1 + level + end + end @expstack.push [rettype, lambda {|b, context| recklass = receiver ? receiver[0].klass : nil lib/llvmutil.rb @@ -267,10 +267,30 @@ module MethodDefinition :& => { :inline_proc => lambda {|para| - gen_binary_operator(para, - lambda {|v1, v2, b, context| - b.and(v1, v2) - }) + arg1 = para[:receiver] + argt = arg1[0] + if argt.klass != :TrueClass and argt.klass != :FalseClass then + gen_binary_operator(para, + lambda {|v1, v2, b, context| + b.and(v1, v2) + }) + else + arg2 = para[:args][0] + @expstack.push [RubyType.boolean, + lambda {|b, context| + context = arg1[1].call(b, context) + v1 = context.rc + v1 = arg1[0].type.to_value(v1, b, context) + context = arg2[1].call(b, context) + v2 = context.rc + v2 = arg2[0].type.to_value(v2, b, context) + + vt = b.and(v1, v2) + vt = b.and(vt, (~4).llvm) + context.rc = b.icmp_eq(vt, 0.llvm) + context + }] + end }, }, @@ -493,19 +513,19 @@ module MethodDefinition args = para[:args].reverse nargs = args.size arraycurlevel = 0 - if nargs != 0 then - arraycurlevel = @expstack.size - if @array_alloca_size == nil or - @array_alloca_size < nargs + arraycurlevel then - @array_alloca_size = nargs + arraycurlevel - end - end # This rb_class_new_instance needs stack area as arguments # in spite of with no arguments. if @array_alloca_size == nil then @array_alloca_size = 1 end + if nargs != 0 then + arraycurlevel = @expstack.size + if @array_alloca_size < nargs + arraycurlevel then + @array_alloca_size = nargs + arraycurlevel + end + end + rettype = RubyType.from_sym(rec[0].klass, para[:info][3], rec[0].klass) #=begin recklass = rec[0].klass @@ -650,8 +670,7 @@ module MethodDefinition context}] } }, - - + :at => { :inline_proc => lambda {|para| lib/methoddef.rb @@ -447,7 +447,9 @@ EXTENT_ORDER = { when :Range fst = RubyType.new(nil) lst = RubyType.new(nil) - excl = RubyType.new(nil) + fst.add_same_type(lst) + lst.add_same_type(fst) + excl = RubyType.boolean RubyType.range(fst, lst, excl, lno, name) else lib/type.rb @@ -2328,6 +2328,7 @@ class YarvTranslator<YarvVisitor else # Generic + dispatch else p info + p s[0][0].conflicted_types.keys raise "Unkown Type #{s[0][0].type.llvm}" end @@ -2385,6 +2386,7 @@ class YarvTranslator<YarvVisitor else # Generic + dispatch p info + p s[0][0].conflicted_types.keys raise "Unkown Type #{s[0][0].type.llvm}" end lib/vmtraverse.rb @@ -39,6 +39,83 @@ module YARV2LLVM :rettype => rt, } +=begin + st = RubyType.array + rt = RubyType.new(nil) + rt.add_same_type(st.type.element_type) + st.type.element_type.add_same_type(rt) + MethodDefinition::RubyMethod[:first][:Array] = { + :self => st, + :argtype => [RubyType.new(nil)], + :rettype => rt, + } + + st = RubyType.array + rt = RubyType.array + rt.add_same_type(st) + st.add_same_type(rt) + MethodDefinition::RubyMethod[:reverse][:Array] = { + :self => st, + :argtype => [], + :rettype => rt, + } + + + st = RubyType.array + rt = RubyType.array + rt.add_same_type(st) + st.add_same_type(rt) + MethodDefinition::RubyMethod[:slice!][:Array] = { + :self => st, + :argtype => [RubyType.new(nil), RubyType.new(nil)], + :rettype => rt, + } +=end + + MethodDefinition::RubyMethod[:"!~"][:String] = { + :argtype => [RubyType.new(nil)], + :rettype => RubyType.boolean, + } + + MethodDefinition::RubyMethod[:"=~"][:String] = { + :argtype => [RubyType.new(nil)], + :rettype => RubyType.boolean, + } + + + MethodDefinition::RubyMethod[:"!~"][:Regexp] = { + :argtype => [RubyType.string], + :rettype => RubyType.boolean, + } + + MethodDefinition::RubyMethod[:"=~"][:Regexp] = { + :argtype => [RubyType.string], + :rettype => RubyType.boolean, + } + + fst = RubyType.new(nil) + lst = RubyType.new(nil) + fst.add_same_type(lst) + lst.add_same_type(fst) + excl = RubyType.boolean + rng = RubyType.range(fst, lst, excl) + MethodDefinition::RubyMethod[:first][:Range] = { + :self => rng, + :argtype => [], + :rettype => fst, + } + + fst = RubyType.new(nil) + lst = RubyType.new(nil) + fst.add_same_type(lst) + lst.add_same_type(fst) + excl = RubyType.boolean + rng = RubyType.range(fst, lst, excl) + MethodDefinition::RubyMethod[:last][:Range] = { + :self => rng, + :argtype => [], + :rettype => lst, + } #=end end @@ -125,6 +202,22 @@ class Array end class Range + def step(st) + i = self.first + ed = self.last + if st > 0 then + while i <= ed do + yield i + i = i + st + end + else + while ed <= i do + yield i + i = i + st + end + end + end + def collect res = [] i = 0 runtime/prelude.rb 34c25f808a54dcbb975e2613a29846d774074bed miura1729 hideki@miura.miurakanko http://github.com/miura1729/yarv2llvm/commit/0873fbd923046a222b6616c84afc590d449addaf 0873fbd923046a222b6616c84afc590d449addaf 2009-08-29T20:22:01-07:00 2009-08-29T20:22:01-07:00 Add some methodes 5311b80151c35516e902a8f9d82840ca2c966691 miura1729 hideki@miura.miurakanko