borx 0.0.1.alpha2 → 0.0.1.beta1

data/lib/borx.rb

@@ -1,6 +1,19 @@
 module Borx
 
+  def self.Binding(binding = nil)
+    if binding.kind_of? ::Binding
+      return Binding::Adapter.new(binding)
+    elsif binding.kind_of? Binding
+      return binding
+    elsif binding.nil?
+      return Binding::Terminal.new
+    else
+      raise ArgumentError, "Expected a Binding, got #{binding.inspect}"
+    end
+  end
+
 end
 
 require 'borx/environment'
 require 'borx/rewriter'
+require 'borx/binding'

data/lib/borx/binding.rb

@@ -31,6 +31,20 @@ class Borx::Binding
     @variables[name] = value
   end
 
+  alias actual_binding binding
+
+  def cached_actual_binding
+    @actual_binding ||= actual_binding
+  end
+
+  def binding
+    return self
+  end
+
+  def eval(code, *args)
+    Kernel::eval(code, cached_actual_binding, *args)
+  end
+
   def block(*args, &block)
     Block.new(self, args, block)
   end
@@ -54,6 +68,28 @@ class Borx::Binding
 
   end
 
+  class Terminal < self
+
+    def initialize
+      @variables = {}
+    end
+
+    def get_variable(name)
+      return @variables[name]
+    end
+
+    def set_variable(name, value)
+      return @variables[name] = value
+    end
+
+    def variable?(name)
+      return @variables.key?(name)
+    end
+
+    alias set_variable! set_variable
+
+  end
+
   class Adapter < self
 
     def initialize(real_binding)
@@ -73,6 +109,10 @@ class Borx::Binding
       return @binding.eval("local_variables.any?{|v| v.to_s == #{name.inspect}}")
     end
 
+    def eval(*args)
+      @binding.eval(*args)
+    end
+
   end
 
 end

data/lib/borx/environment.rb

@@ -22,6 +22,58 @@ base = Class.new do
     raise Borx::Environment::NotImplemented::SetVariable
   end
 
+  def get_magic(binding, name, actual)
+    raise Borx::Environment::NotImplemented::GetMagic
+  end
+
+  # @!method eval(code, binding = nil, file = 'borx', line = 0)
+  #   @param [String, Borx::Code] code
+  #   @param [Binding, Borx::Binding, nil] binding
+  #   @param [String] file
+  #   @param [Numeric] line
+  #
+  # @!method eval(code, options = {})
+  #   @param [String, Borx::Code] code
+  #   @param [Hash] options
+  #   @option options [Binding, Borx::Binding] :binding
+  #   @option options [Object] :self main object, only used when no binding is given
+  #   @option options [String] :file
+  #   @option options [Numeric] :line
+  #   
+  def eval(code, opts_or_binding = nil, file = 'borx', line = 0)
+    bindink = opts_or_binding
+    case(opts_or_binding)
+    when nil then
+      bindink = proc{}.binding
+    when Hash then
+      opts = opts_or_binding
+      if opts[:binding]
+        bindink = opts[:binding]
+      elsif opts[:self]
+        bindink = opts[:self].instance_eval{ binding }
+      else
+        bindink = proc{}.binding
+      end
+      file = opts[:file] || 'borx'
+      line = opts[:line] || 0
+    when Borx::Binding, ::Binding then
+      bindink = opts_or_binding
+    else
+      raise ArgumentException, "Expected a Hash or a Binding, got #{opts_or_binding.inspect}"
+    end
+    eval_code( Borx::Rewriter.rewrite(code), bindink, file, line)
+  end
+
+private
+
+  def eval_code(code, binding, file, line)
+    old_borx, setter = binding.eval('__borx__ ||= nil ; __borx_binding__ = Borx::Binding(binding) ; [__borx__, lambda{|v| __borx__ = v}]')
+    setter.call(self)
+    binding.eval(code.code, file, line)
+  ensure
+    setter.call(old_borx) if setter
+  end
+
 end
 
 class Borx::Environment < base
@@ -76,9 +128,16 @@ class Borx::Environment < base
     include GetConstant
   end
 
+  module GetMagic
+    def get_magic(_binding, _name, actual)
+      return actual
+    end
+  end
+
   include GetSetVariable
   include GetSetConstant
   include CallMethod
+  include GetMagic
 
   class NotImplemented < StandardError
     class GetConstant < self
@@ -91,20 +150,8 @@ class Borx::Environment < base
     end
     class SetVariable < self
     end
-  end
-
-  def eval(code, bin_ding = nil)
-    bin_ding ||= proc{}.binding
-    eval_code( Borx::Rewriter.rewrite(code), bin_ding)
-  end
-
-private
-  def eval_code(code, binding, file = '(eval)', line = 0)
-    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
-    setter.call(old_borx) if setter
+    class GetMagic < self
+    end
   end
 
 end

data/lib/borx/rewriter.rb

@@ -1,10 +1,4 @@
-begin
-  require 'ripper'
-rescue NotFound
-  # :nocov:
-  raise NotFound, "Ripper extension not found. Please add it to your bundle."
-  # :nocov:
-end
+require 'ripper'
 require 'sorcerer'
 require 'borx/code'
 class Borx::Rewriter < Ripper::SexpBuilder
@@ -69,13 +63,18 @@ private
 
   def on_var_ref(x)
     var = super
+    if var[1][0] == :@kw
+      return call_borx('get_magic', [:args_add,
+                       [:args_add, [:args_new], ident_to_string(var[1])],
+                         var
+                      ])
+    end
     fun = case(var[1][0])
             when :@const then 'get_constant'
             when :@gvar  then 'get_global_variable'
             when :@cvar  then 'get_class_variable'
             when :@ivar  then 'get_instance_variable'
             when :@ident then 'get_variable'
-            when :@kw    then 'get_magic'
             # :nocov:
             else
               raise "Unknown var_ref type in #{var[1]}, this is a bug, please report it"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borx
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha2
+  version: 0.0.1.beta1
   prerelease: 6
 platform: ruby
 authors: