ytl 0.0.4 → 0.0.5

data/test/breaktest.rb

@@ -1,6 +1,6 @@
 def test0
   begin
-    return
+    return false
   ensure
     p "BAR0"
   end
@@ -17,7 +17,7 @@ end
 def test2
   [1, 2, 3].each do |n|
     p n
-    return
+    return false
   end
   p "bar2"
 end
@@ -26,7 +26,7 @@ def test3
   begin
     [1, 2, 3].each do |n|
       p n
-      return
+      return false
     end
     p "foo3"
   ensure
@@ -47,13 +47,13 @@ def test4
 end
 
 
-test0
+p test0
 
-test1
-test2
+p test1
+p test2
 
-test3
-test4
+p test3
+p test4
 
 =begin
 # Not support yet
@@ -82,3 +82,17 @@ def test6
   end
 end
 =end
+
+def test7
+  [1, 2, 3].each do |m|
+    [4, 5, 6].each do |n|
+      p m
+      p n
+      return false if n + m == 7
+    end
+    p "bar7-1"
+  end
+  p "bar7-2"
+end
+
+p test7

data/test/exttest.rb

@@ -1,5 +1,6 @@
 # Please Execute 
 # ruby -I lib lib/ytl.rb -r runtime/type.rb test/exttest.rb
+=begin
 module YTL
   class Memory
   end
@@ -16,6 +17,9 @@ end
 def id(x)
   x
 end
+=end
+include YTLJit
+include YTLJit::AsmType
 
 c = YTLJit::Runtime::Arena.new
 a = YTL::Memory.instance
@@ -23,13 +27,23 @@ a = YTL::Memory.instance
 b = c.address
 p b
 p c
-p YTLJit::AsmType::VALUE
-p YTLJit::AsmType::RBasic[:klass]
-p YTLJit::AsmType::RString[:as][:heap][:len]
-p YTLJit::AsmType::RString[:basic][:flags]
+n = [1.9]
+foo =  (n[0]).__id__ * 2
+p n
+p a[foo, RFloat[:float_value]]
+a[foo, AsmType::RFloat[:float_value]] = 2.0
+p n
+p a[foo, RFloat[:float_value]]
+a[b, RFloat[:float_value]] = 3.14
+p VALUE
+p RBasic[:klass]
+p RString[:as][:heap][:len]
+p RString[:basic][:flags]
+p RFloat[:float_value]
 p a[b, :machine_word]
+#p a[0x106667b8, RString[:as][:heap][:ptr]]
 p a[b, :float]
-#p a[0x106667b8, YTLJit::AsmType::RString[:as][:heap][:ptr]]
-p a[b, YTLJit::AsmType::RString[:basic][:flags]]
-p a[b, YTLJit::AsmType::RString[:as][:heap][:len]]
+p a[b, RString[:basic][:flags]]
+p a[b, RString[:as][:heap][:len]]
+p a[b, RFloat[:float_value]]
 p a[b, :machine_word]

data/test/foo.rb

@@ -0,0 +1,14 @@
+#=begin
+a = (1..3).collect {|rr| rr}
+p a
+b = (1..3).collect {|rr| rr.to_f}
+p b
+a = (1..3).collect {|rr| rr}
+p a
+=begin
+#=end
+a = [1, 2, 3].collect {|rr| rr}
+p a
+a = [1, 2, 3].collect {|rr| rr.to_f}
+p a
+=end

data/test/macrotest.rb

@@ -8,16 +8,18 @@ class Module
 end
 
 class Foo
+  myattr :foo, :bar
+  def initialize
+    @foo = 1
+    @bar = 3
+  end
   def myattr(x)
     p x
   end
 end
 
-myattr :foo, :bar
 Foo.new.myattr("abc")
-
-# Can't psss this test yet
-=begin
+p Foo.new.bar
 
 def fact(x)
   if x == 0 then
@@ -28,8 +30,9 @@ def fact(x)
 end
 
 def fact_inline(x)
-  eval fact(x)
+  eval "\" a = #{fact(x)} \""
 end
 
+y= 5
 p fact_inline(5)
-=end
+

data/test/simple.rb

@@ -0,0 +1,6 @@
+def foo(x)
+ yield x
+end
+
+k = 1
+foo(k) {|a| a}

data/test/th_nested.rb

@@ -0,0 +1,31 @@
+class Foo
+  def initialize
+    @res = 0
+  end
+
+  attr_accessor :res
+
+  def foo
+    th = nil
+    th2 = YTLJit::Runtime::Thread.new do
+      th = YTLJit::Runtime::Thread.new do
+        @res = 2
+      end
+      @res = 1
+    end
+    while th == nil
+    end
+    th.join
+    p @res
+    th2.join
+    p @res
+  end
+
+  def self_merge(cself, pself)
+    pself.res = pself.res + cself.res
+    pself
+  end
+end
+
+Foo.new.foo
+

data/test/threadfib.rb

@@ -0,0 +1,37 @@
+# ytl -r runtime/thread.rb threadtest.rb
+def fib(x)
+  if x < 2 then
+    1
+  else
+    fib(x - 1) + fib(x -2)
+  end
+end
+
+class MultiFib
+  def initialize
+    @res = 32 # 32 is dummy (not 0 to detect bug)
+  end
+  attr_accessor :res
+
+  def compute(n)
+    th = YTLJit::Runtime::Thread.new do
+      @res = fib(n - 1)
+    end
+
+    @res = fib(n - 2)
+
+    th.join
+    @res
+  end
+
+  def self_merge(cself, pself)
+    pself.res = pself.res + cself.res
+    pself
+  end
+end
+
+mfib = MultiFib.new
+print "computing fib 2 threads fib(40) \n"
+p mfib.compute(40)
+print "single fib(40)\n"
+p fib(40)

data/test/threadtest.rb

@@ -0,0 +1,41 @@
+# ytl -r runtime/thread.rb threadtest.rb
+p "start"
+def fib(x)
+  if x < 2 then
+    1
+  else
+    fib(x - 1) + fib(x -2)
+  end
+end
+
+class Foo
+  def initialize
+    @res = 0
+  end
+
+  attr :res
+
+  def foo
+    YTLJit::Runtime::Thread.new do |arg|
+      @res = fib(30)
+    end
+  end
+
+  # Merge method whose return value is self object of joined thread
+#=begin
+  def self_merge(cself, pself)
+    cself
+  end
+#=end
+
+end
+
+p self
+foo = Foo.new
+th = foo.foo
+p "computing fib 2 threads"
+p fib(30)
+p th
+
+th.join
+p foo.res

data/test/varargtest.rb

@@ -0,0 +1,7 @@
+def foo(a, b = 1, *c, &d)
+  p [a, b]
+end
+
+foo(*[1, 2])
+foo(*[1, 2, 4])
+foo(*[1, 2, 4, 8])

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ytl
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Hideki Miura
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +09:00
-default_executable: 
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ytljit
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 7
         version: 0.0.7
   type: :runtime
   version_requirements: *id001
@@ -45,8 +36,11 @@ files:
 - lib/ytl/accmem.rb
 - lib/ytl/importobj.rb
 - lib/ytl/macro.rb
+- lib/ytl/thread.rb
 - runtime/prelude.rb
+- runtime/thread.rb
 - runtime/type.rb
+- test/bar.rb
 - test/basictest.rb
 - test/breaktest.rb
 - test/classtest.rb
@@ -55,14 +49,19 @@ files:
 - test/execytl.rb
 - test/exttest.rb
 - test/floattest.rb
+- test/foo.rb
 - test/hashtest.rb
 - test/ivtest.rb
 - test/looptest.rb
 - test/macrotest.rb
+- test/simple.rb
+- test/threadfib.rb
+- test/threadtest.rb
+- test/th_nested.rb
 - test/tmp.rb
+- test/varargtest.rb
 - bin/ytl
 - README
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -76,25 +75,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Very tiny subset of YARV to native code translator
 test_files: 
+- test/bar.rb
 - test/basictest.rb
 - test/breaktest.rb
 - test/classtest.rb
@@ -103,8 +99,14 @@ test_files:
 - test/execytl.rb
 - test/exttest.rb
 - test/floattest.rb
+- test/foo.rb
 - test/hashtest.rb
 - test/ivtest.rb
 - test/looptest.rb
 - test/macrotest.rb
+- test/simple.rb
+- test/threadfib.rb
+- test/threadtest.rb
+- test/th_nested.rb
 - test/tmp.rb
+- test/varargtest.rb