ytl 0.0.1 → 0.0.2

data/lib/ytl/macro.rb

@@ -0,0 +1,419 @@
+module YTLJit
+  module VM
+    class ToRubyContext
+      def initialize
+        @ret_code = [""]
+        @jmp_tab = {}
+        @defined_method = {}
+        @work_prefix = []
+      end
+
+      attr :ret_code
+      attr :jmp_tab
+      attr :defined_method
+      attr :work_prefix
+    end
+
+    module Node
+      class BaseNode
+        def to_ruby(context)
+          context
+        end
+      end
+
+      class DummyNode
+        def to_ruby(context)
+          context
+        end
+      end
+
+      class TopNode
+      end
+
+      class MethodTopNode
+        def to_ruby(context)
+#          context.ret_code.last << "{ #{@name} "
+          context.ret_code.last << "{ "
+          context.ret_code.push ""
+          context = @body.to_ruby(context)
+          args = context.ret_code.pop
+          pre = context.work_prefix.join('_')
+          if args != "" then
+            context.ret_code.last << "|#{args}|"
+          end
+          context.ret_code.last << "#{pre}state = 0\n"
+          context.ret_code.last << "#{pre}value = nil\n"
+          context.ret_code.last << "evalstr = []\n"
+          context.ret_code.last << "[while true\n"
+          #          context.ret_code.last << "p #{pre}state\n"
+          context.ret_code.last << "case #{pre}state\n"
+          context.ret_code.last << "when 0\n"
+          context = @body.body.to_ruby(context)
+          context.ret_code.last << "end\n"
+          context.ret_code.last << "end, evalstr]\n"
+          context.ret_code.last << "}\n"
+          context
+        end
+      end
+
+      class BlockTopNode
+        def to_ruby(context)
+          context.ret_code.last << "{ "
+          context.ret_code.push ""
+          context = @body.to_ruby(context)
+          args = context.ret_code.pop
+          if args != "" then
+            context.ret_code.last << "| #{args} | \n"
+          end
+          pre = context.work_prefix.join('_')
+          context.ret_code.last << "#{pre}state = 0\n"
+          context.ret_code.last << "#{pre}value = nil\n"
+          context.ret_code.last << "while true\n"
+          #          context.ret_code.last << "p #{pre}state\n"
+          context.ret_code.last << "case #{pre}state\n"
+          context.ret_code.last << "when 0\n"
+          context = @body.body.to_ruby(context)
+          context.ret_code.last << "end\n"
+          context.ret_code.last << "end\n"
+          context.ret_code.last << "}\n"
+          context
+        end
+      end
+
+      class ClassTopNode
+      end
+
+      class TopTopNode
+      end
+
+      class LocalFrameInfoNode
+        def to_ruby(context)
+          argpos = 0
+          visitsys = false
+          @frame_layout.each do |vinf|
+            if vinf.is_a?(LocalVarNode) then
+              argpos = argpos + 1
+              if argpos > 3 and visitsys then
+                context = vinf.to_ruby(context)
+                context.ret_code.last << ", "
+              end
+            else
+              visitsys = true
+              argpos = 0
+            end
+          end
+          context.ret_code.last.chop!
+          context.ret_code.last.chop!
+
+          context
+        end
+      end
+
+      class LocalVarNode
+        def to_ruby(context)
+          case kind
+          when :arg, :local_var
+            context.ret_code.last << "_#{@name.to_s}"
+            
+          when :rest_arg
+            context.ret_code.last << "*_#{@name.to_s}"
+            
+          else
+            p kind
+
+          end
+
+          context
+        end
+      end
+      
+      class SystemValueNode
+      end
+
+      class GuardNode
+      end
+
+      class MethodEndNode
+      end
+
+      class BlockEndNode
+      end
+
+      class ClassEndNode
+      end
+
+      class SetResultNode
+        def to_ruby(context)
+          context.ret_code.last << "break "
+          context = @value_node.to_ruby(context)
+          context.ret_code.last << "\n"
+          @body.to_ruby(context)
+        end
+      end
+
+      class PhiNode
+        def to_ruby(context)
+          pre = context.work_prefix.join('_')
+          context.ret_code.last << "#{pre}value"
+          context
+        end
+      end
+
+      class LocalLabel
+        def to_ruby(context)
+          context.ret_code.last << "when #{context.jmp_tab[self]}\n"
+          @body.to_ruby(context)
+        end
+      end
+
+      class BranchCommonNode
+        def to_ruby_common(context, unlessp)
+          nf = false
+          if context.jmp_tab[@jmp_to_node] == nil then
+            context.jmp_tab[@jmp_to_node] = context.jmp_tab.size + 1
+            nf = true
+          end
+          jlab = context.jmp_tab[@jmp_to_node]
+
+          blab  = context.jmp_tab.size + 1
+          context.jmp_tab[@body] = blab
+
+          context.ret_code.push ""
+          context = @cond.to_ruby(context)
+          cc = context.ret_code.pop
+          pre = context.work_prefix.join('_')
+          context.ret_code.last << "if #{cc} then\n"
+          if unlessp then
+            context.ret_code.last << "#{pre}state = #{blab}\n"
+            context.ret_code.last << "else\n"
+            context.ret_code.last << "#{pre}state = #{jlab}\n"
+          else
+            context.ret_code.last << "#{pre}state = #{jlab}\n"
+            context.ret_code.last << "else\n"
+            context.ret_code.last << "#{pre}state = #{blab}\n"
+          end
+          context.ret_code.last << "end\n"
+          
+          if nf then
+            context = @jmp_to_node.to_ruby(context)
+          end
+
+          context.ret_code.last << "when #{context.jmp_tab[@body]}\n"
+          context = @body.to_ruby(context)
+        end
+      end
+
+      class BranchIfNode
+        def to_ruby(context)
+          to_ruby_common(context, false)
+        end
+      end
+
+      class BranchUnlessNode
+        def to_ruby(context)
+          to_ruby_common(context, true)
+        end
+      end
+
+      class JumpNode
+        def to_ruby(context)
+          nf = false
+          if context.jmp_tab[@jmp_to_node] == nil then
+            context.jmp_tab[@jmp_to_node] = context.jmp_tab.size + 1
+            nf = true
+          end
+          pre = context.work_prefix.join('_')
+          nestat = context.jmp_tab[@jmp_to_node]
+          context.ret_code.last << "#{pre}state = #{nestat}\n"
+          valnode = @jmp_to_node.come_from[self]
+          if valnode then
+            context.ret_code.push ""
+            context = valnode.to_ruby(context)
+            val = context.ret_code.pop
+            context.ret_code.last << "#{pre}value = #{val}\n"
+          end
+          if nf then
+            @jmp_to_node.to_ruby(context)
+          else
+            context
+          end
+        end
+      end
+
+      class LetNode
+      end
+
+      class LiteralNode
+        def to_ruby(context)
+          context.ret_code.last << get_constant_value[0].inspect
+          context
+        end
+      end
+
+      class ClassValueNode
+      end
+
+      class SpecialObjectNode
+      end
+
+      class YieldNode
+        def to_ruby(context)
+          arg = @parent.arguments
+          context.ret_code.last << "yield"
+          context.ret_code.last << "("
+          arg[3..-1].each do |ae|
+            context = ae.to_ruby(context)
+            context.ret_code.last << ", "
+          end
+          context.ret_code.last.chop!
+          context.ret_code.last.chop!
+          context.ret_code.last << ")\n"
+          context
+        end
+      end
+
+      class FixArgCApiNode
+        API_TAB = {
+          "rb_str_append" => "+",
+          "rb_obj_as_string" => "to_s",
+        }
+        def to_ruby(context)
+          arg = @parent.arguments
+          context.ret_code.last << "("
+          context = arg[0].to_ruby(context)
+          context.ret_code.last << "."
+          context.ret_code.last << API_TAB[@name]
+          if arg[1] then
+            context.ret_code.last << "("
+            arg[1..-1].each do |ae|
+              context = ae.to_ruby(context)
+              context.ret_code.last << ", "
+            end
+            context.ret_code.last.chop!
+            context.ret_code.last.chop!
+            context.ret_code.last << ")"
+          end
+          context.ret_code.last << ")\n"
+          context
+        end
+      end
+
+      class MethodSelectNode
+        def to_ruby(context)
+          arg = @parent.arguments
+          context.ret_code.last << "("
+          if @parent.is_fcall or @parent.is_vcall then
+            context.ret_code.last << @name.to_s
+          else
+            context = arg[2].to_ruby(context)
+            context.ret_code.last << ".#{@name}"
+          end
+          if arg[3] then
+            context.ret_code.last << "("
+            arg[3..-1].each do |ae|
+              context = ae.to_ruby(context)
+              context.ret_code.last << ", "
+            end
+            context.ret_code.last.chop!
+            context.ret_code.last.chop!
+            context.ret_code.last << ")"
+          end
+          if arg[1].is_a?(BlockTopNode) then
+            context.ret_code.last << " "
+            context.work_prefix.push "bl"
+            context = arg[1].to_ruby(context)
+            context.work_prefix.pop
+          end
+          context.ret_code.last << ")\n"
+          context
+        end
+      end
+
+      class VariableRefCommonNode
+      end
+
+      class LocalVarRefCommonNode
+      end
+
+      class LocalVarRefNode
+        def to_ruby(context)
+          cfi = @current_frame_info
+          off = cfi.real_offset(@offset)
+          lv = cfi.frame_layout[off]
+          context.ret_code.last << " _#{lv.name.to_s} "
+          context
+        end
+      end
+
+      class SelfRefNode
+        def to_ruby(context)
+          context.ret_code.last << " self "
+          context
+        end
+      end
+
+      class LocalAssignNode
+        def to_ruby(context)
+          cfi = @current_frame_info
+          off = cfi.real_offset(@offset)
+          lv = cfi.frame_layout[off]
+          context.ret_code.last << "_#{lv.name.to_s} = "
+          context = @val.to_ruby(context)
+          context.ret_code.last << "\n"
+          @body.to_ruby(context)
+        end
+      end
+
+      class InstanceVarRefCommonNode
+      end
+
+      class InstanceVarRefNode
+        def to_ruby(context)
+          context.ret_code.last << " #{@name.to_s} "
+          context
+        end
+      end
+
+      class InstanceVarAssignNode
+        def to_ruby(context)
+          context.ret_code.last << "#{@name.to_s} = "
+          context = @val.to_ruby(context)
+          context.ret_code.last << "\n"
+          context
+        end
+      end
+
+      class ConstantRefNode
+        def to_ruby(context)
+          context.ret_code.last << @name.to_s
+          context
+        end
+      end
+
+      class ConstantAssignNode
+        def to_ruby(context)
+          context.ret_code.last << "#{@name.to_s} = "
+          context = @val.to_ruby(context)
+          context.ret_code.last << "\n"
+          context
+        end
+      end
+
+      class SendNode
+        def to_ruby(context)
+          context = @func.to_ruby(context)
+          @body.to_ruby(context)
+        end
+      end
+
+      class SendEvalNode
+        def to_ruby(context)
+          context.ret_code.last << "evalstr <<"
+          context = @arguments[3].to_ruby(context)
+          context.ret_code.last << "\n"
+          @body.to_ruby(context)
+        end
+      end
+    end
+  end
+end

data/lib/ytl.rb

@@ -1,5 +1,6 @@
 require 'ytljit'
 require 'ytl/accmem.rb'
+require 'ytl/macro.rb'
 require 'ytl/importobj.rb'
 require 'pp'
 require 'optparse'
@@ -111,6 +112,7 @@ module YTL
     c_context.current_method_signature.push sig
     c_context.options = options
     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|

data/runtime/prelude.rb

@@ -1,6 +1,19 @@
 # runtime library written in ytl
 <<-'EOS'
 #
+def attr(*x)
+  x.each do |ele|
+    eval "def #{ele}; @#{ele} ; end"
+  end
+end
+
+def attr_accessor(*x)
+  x.each do |ele|
+    eval "def #{ele}; @#{ele} ; end\n"
+    eval "def #{ele}=(val); @#{ele} = val ; end"
+  end
+end
+
 class Array
   def each
     i = 0
@@ -14,6 +27,26 @@ class Array
   end
 end
 
+class Range
+  def each
+    i = self.first
+    e = self.last
+    if self.exclude_end? then
+      while i < e
+        yield i
+        i = i + 1
+      end
+    else
+      while i <= e
+        yield i
+        i = i + 1
+      end
+   end
+
+   e
+  end
+end
+
 class Fixnum
   def times
     i = 0
@@ -24,6 +57,25 @@ class Fixnum
 
     self
   end
+
+  def step(max, st)
+    i = self
+    while i < max
+      yield i
+      i = i + st
+    end
+
+    self
+  end
+
+  def **(n)
+    a = 1
+    while n > 0
+      a = a * self
+      n = n - 1
+    end
+    a
+  end
 end
 
 EOS

data/test/basictest.rb

@@ -14,6 +14,16 @@ def array
 end
 p array
 
+def array2
+  b = 3
+  a = [3, b, 6]
+  p a
+  a[1] = 1
+  p a
+  [1, 2, 2 * 3][0] + [1 * 2, 2 * 4, 3][1]  
+end
+p array2
+
 def fib(x)
   if x < 2 then
     1
@@ -144,3 +154,26 @@ end
 
 test_while
 
+i = 5
+a = i..7
+p a.first
+p a.last
+p a
+p Range.new(i, 2, false)
+p 1...3
+=begin
+def id(a, *b)
+  p a
+end
+id(*[1, 2, 3])
+
+=begin
+for i in 1..2
+  p i
+end
+
+for i in 1...2
+  p i
+end
+
+=end

data/test/classtest.rb

@@ -16,6 +16,8 @@ class Foo
 end
 
 class Bar<Foo
+  p self
+  p "foobarbaz"
   def bar
     p "Bar#bar"
   end

data/test/ivtest.rb

@@ -0,0 +1,19 @@
+DAYS_PER_YEAR = 365.24
+
+class Foo
+  def initialize(x)
+    @a = x * DAYS_PER_YEAR
+    @b = 10.0
+  end
+
+  attr_accessor :a, :b
+
+  def mov(bodies)
+#    bodies[0].a += @a
+    p bodies[0].a
+  end
+end
+
+foo = Foo.new(1.4)
+foo.mov([Foo.new(2.8)])
+p [Foo.new(2.8)][0]

data/test/looptest.rb

@@ -6,3 +6,18 @@
     end
   end
 end
+
+a = 5
+for i in a...10
+  for j in a..7
+    p i
+  end
+end
+
+p a..10
+for i in a..10
+#  for j in a..20
+    p i
+#  end
+end
+

data/test/macrotest.rb

@@ -0,0 +1,26 @@
+def myattr(*x)
+  str = ""
+  x.each do |e|
+     eval "def #{e}; @#{e}; end\n"
+  end
+end
+
+myattr :foo, :bar
+
+# Can't psss this test yet
+=begin
+
+def fact(x)
+  if x == 0 then
+    1
+  else
+    x * fact(x - 1)
+  end
+end
+
+def fact_inline(x)
+  eval fact(x)
+end
+
+p fact_inline(5)
+=end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Hideki Miura
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +09:00
+date: 2011-01-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 5
-        version: 0.0.5
+        - 6
+        version: 0.0.6
   type: :runtime
   version_requirements: *id001
 description: 
@@ -44,6 +44,7 @@ files:
 - lib/ytl.rb
 - lib/ytl/accmem.rb
 - lib/ytl/importobj.rb
+- lib/ytl/macro.rb
 - runtime/prelude.rb
 - runtime/type.rb
 - test/basictest.rb
@@ -51,7 +52,9 @@ files:
 - test/exceptiontest.rb
 - test/exttest.rb
 - test/floattest.rb
+- test/ivtest.rb
 - test/looptest.rb
+- test/macrotest.rb
 - test/tmp.rb
 - bin/ytl
 - README
@@ -93,5 +96,7 @@ test_files:
 - test/exceptiontest.rb
 - test/exttest.rb
 - test/floattest.rb
+- test/ivtest.rb
 - test/looptest.rb
+- test/macrotest.rb
 - test/tmp.rb