borx 0.0.1.alpha1 → 0.0.1.alpha2

data/lib/borx/binding.rb

@@ -0,0 +1,78 @@
+
+class Borx::Binding
+
+  def initialize(parent)
+    @variables = {}
+    @parent = parent
+  end
+
+  def get_variable(name)
+    return @variables.fetch(name){ @parent.get_variable(name) }
+  end
+
+  def set_variable(name, value)
+    if variable?(name)
+      if @variables.key?(name)
+        @variables[name] = value
+      else
+        @parent.set_variable(name, value)
+      end
+    else
+      @variables[name] = value
+    end
+    return value
+  end
+
+  def variable?(name)
+    return @variables.key?(name) || @parent.variable?(name)
+  end
+
+  def set_variable!(name, value)
+    @variables[name] = value
+  end
+
+  def block(*args, &block)
+    Block.new(self, args, block)
+  end
+
+  class Block
+    def initialize(parent, names, block)
+      @parent = parent
+      @block = block
+      @names = names
+    end
+
+    def to_proc
+      return method(:call).to_proc
+    end
+
+    def call(*args, &block)
+      b = Borx::Binding.new(@parent)
+      @names.zip(args){|name, value| b.set_variable!(name, value) }
+      @block.call(b)
+    end
+
+  end
+
+  class Adapter < self
+
+    def initialize(real_binding)
+      @binding = real_binding
+    end
+
+    def get_variable(name)
+      return @binding.eval(name)
+    end
+
+    def set_variable(name, value)
+      @binding.eval("#{name} = nil ; lambda{|_v| #{name} = _v}").call(value)
+      return value
+    end
+
+    def variable?(name)
+      return @binding.eval("local_variables.any?{|v| v.to_s == #{name.inspect}}")
+    end
+
+  end
+
+end

data/lib/borx/environment.rb

@@ -1,3 +1,5 @@
+require 'borx/binding'
+
 base = Class.new do
 
   def get_constant(binding, name, house = nil)
@@ -29,7 +31,7 @@ class Borx::Environment < base
   module GetVariable
 
     def get_variable(binding, name)
-      binding.eval(name)
+      binding.get_variable(name)
     end
 
   end
@@ -37,7 +39,7 @@ class Borx::Environment < base
   module SetVariable
 
     def set_variable(binding, name, value)
-      binding.eval("#{name} = nil ; lambda{|_x| #{name} = _x}").call(value)
+      binding.set_variable(name,value)
     end
 
   end
@@ -98,7 +100,7 @@ class Borx::Environment < base
 
 private
   def eval_code(code, binding, file = '(eval)', line = 0)
-    old_borx, setter = binding.eval('__borx__ ||= nil ; [__borx__, lambda{|v| __borx__ = v}]')
+    old_borx, setter = binding.eval('__borx__ ||= nil ; __borx_binding__ = Borx::Binding::Adapter.new(binding) ; [__borx__, lambda{|v| __borx__ = v}]')
     setter.call(self)
     binding.eval(code.code, file, line)
   ensure

data/lib/borx/rewriter.rb

@@ -1,7 +1,9 @@
 begin
   require 'ripper'
 rescue NotFound
+  # :nocov:
   raise NotFound, "Ripper extension not found. Please add it to your bundle."
+  # :nocov:
 end
 require 'sorcerer'
 require 'borx/code'
@@ -33,10 +35,10 @@ private
   end
 
   def on_method_add_arg(*x)
-    name, call, args, block = super
+    name, call, args = super
     inject_binding = true
     if call[0] ==  :fcall
-      args = args[1][1] unless args == ARGS_NEW
+      args = args[1] unless args == ARGS_NEW
       brgs = push_args(args,[:var_ref, [:@kw, "self", [0, 0]]],ident_to_string(call[1]))
       return call_borx('call_private_method', brgs)
     elsif call[0] == :method_add_arg
@@ -135,10 +137,78 @@ private
     return call_borx('execute', [:args_add, [:args_new], xstring_to_string(x)])
   end
 
-  def on_stmts_new
-    return [:stmts_add, [:stmts_new], [:assign,
-            [:var_field, [:@ident, "__borx_binding__", [1, 0]]],
-              [:vcall, [:@ident, "binding", [1, 17]]]]]
+  def on_binary(left, op, right)
+    return call_borx('call_method', [:args_add,
+                                      [:args_add,
+                                        [:args_add,
+                                          [:args_new],
+                                          left],
+                                          [:string_literal,
+      [:string_add,[:string_content],
+        [:@tstring_content, op.to_s, [0,0]]]]],
+                                          right])
+  end
+
+  def on_method_add_block(args, block)
+    name, args, block = super
+    new_vars = [:args_new]
+    if block[1]
+      block[1][1][1].each do |arg|
+        next unless arg
+        new_vars = [:args_add, new_vars, ident_to_string(arg)]
+      end
+    end
+    new_block = [:method_add_block,
+     [:method_add_arg,
+      [:call,
+       [:var_ref, [:@ident, "__borx_binding__", [0, 0]]],
+       :".",
+       [:@ident, "block", [0, 0]]],
+      [:arg_paren,
+       [:args_add_block,
+        new_vars,
+        false]]],
+     [:brace_block,
+      [:block_var,
+        [:params, [[:@ident, "__borx_binding__", [1, 20]]], nil, nil, nil, nil, nil, nil],
+        false],
+      block[2]]
+    ]
+
+    return put_args_add_block(args,new_block)
+  end
+
+  def on_args_add_block(args, block)
+    name, args, block = super
+    new_block = false
+    if block
+     #   new_block = 
+      new_block = [:method_add_arg,
+      [:call,
+       [:var_ref, [:@ident, "__borx_binding__", [0, 0]]],
+       :".",
+       [:@ident, "block", [0, 0]]],
+      [:arg_paren,
+       [:args_add_block,
+        [:args_new],
+        block]]]
+    end
+    return [name, args, new_block]
+  end
+
+  def put_args_add_block(args, block)
+    case(args[0])
+    when :args_add_block
+      return [:args_add_block, args[1], block]
+    when :method_add_arg
+      return [:method_add_arg, args[1], put_args_add_block(args[2],block)]
+    when :arg_paren
+      return [:arg_paren, put_args_add_block(args[1],block)]
+    else
+      # :nocov:
+      raise "Unknown args type #{args[0]}. This is a bug. Please report it"
+      # :nocov:
+    end
   end
 
   def xstring_to_string(x)
@@ -179,14 +249,19 @@ private
   end
 
   def push_args(tree, *args)
-    if tree == [:args_new]
+    case(tree[0])
+    when :args_new then
       if args.any?
         return [:args_add, push_args(tree, *args[0..-2]), args.last]
       else 
         return tree
       end
+    when :args_add_block, :args_add
+      return [tree[0], push_args(tree[1],*args), tree[2]]
     else
-      return [:args_add, push_args(tree[1], *args), tree[2]]
+      # :nocov:
+      raise "Unknown args type #{tree[0]}. This is a bug. Please report it."
+      # :nocov:
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borx
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha1
+  version: 0.0.1.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorcerer
@@ -70,6 +70,7 @@ files:
 - lib/borx/environment.rb
 - lib/borx/code.rb
 - lib/borx/rewriter.rb
+- lib/borx/binding.rb
 - lib/borx.rb
 homepage: https://github.com/hannesg/borx
 licenses: []