rVM 0.0.8 → 0.0.9

data/README

@@ -18,7 +18,7 @@ The following example implements a pretty easy calculator using the the math lan
   require 'rvm' # This loads the rVM gem
   require 'rvm/languages/math'  #This loads the math plugin as well as the math function library
   s =''
-  compiler = RVM::Languages[:math] #Lets get us the compiler
+  compiler = RVM::Languages[:math].new #Lets get us the compiler
   while s!= 'QUIT'
     s=gets.chomp
     puts compiler.compile(s).execute(RVM::Interpreter.env) # We pass an fresh enviroment as we don't need an environment.
@@ -30,7 +30,7 @@ Here one example that keeps set variables due to using one enviroment for all th
   require 'rvm' # This loads the rVM gem
   require 'rvm/languages/math'  #This loads the math plugin as well as the math function library
   s =''
-  compiler = RVM::Languages[:math] #Lets get us the compiler
+  compiler = RVM::Languages[:math].new #Lets get us the compiler
   env = RVM::Interpreter.env
   while s!= 'QUIT'
     s=gets.chomp

data/lib/rvm.rb

@@ -49,6 +49,7 @@ module RVM
       res
     end
   end
+  
   class << self
     @@strict = false
     

data/lib/rvm/classes.rb

@@ -4,7 +4,9 @@
 #
 # This file is published under the MIT Licenser, see LICENSE for details.
 #
+
 require File.dirname(__FILE__) + '/plugin'
+require File.dirname(__FILE__) + '/functions'
 module RVM
   # This module is the basic class container, classes are supposed to be
   # used by this as in: RVM::Classes[<class id>] this guarnatees that,
@@ -72,13 +74,14 @@ module RVM
         true
       end
 
-      alias method_missing_old_classes method_missing         
+      alias :method_missing_old_class :method_missing         
       
-      def method_missing(m, *args)
-        if (RVM::Functions.has? m)
-          RVM::Functions[m].execute args, @env
+      def method_missing(m, *args, &block)
+        if (RVM::Functions::has? m)
+          RVM::Functions[m].execute args, @env, &block
         else
-          method_missing_old_classes m, *args
+          super(m, *args, &block)
+          #method_missing_old_class m, *args, &block
         end
       end
       

data/lib/rvm/classes/number.rb

@@ -1,4 +1,4 @@
-module RVM 
+module RVM
   module Classes
     class Number < Class
       register_for :number
@@ -14,10 +14,10 @@ module RVM
           @value = value.to_i
         else
           @value = "#{value}".to_f
+          if @value == @value.to_i 
+            @value = @value.to_i
+          end
         end
-        #if @value.to_f == @value.to_i
-        #  @value = @value.to_i
-        #end
       end
       
       def == v
@@ -44,13 +44,14 @@ module RVM
         @value
       end
       
-      def respond_to?(symbol,include_private = false)
-        super(symbol,include_private)
-      end
+      #alias :respond_to_number :respond_to?
+      #def respond_to?(symbol,include_private = false)
+      #  respond_to_number(symbol,include_private)
+      #end
       
+      alias :method_missing_number :method_missing
       
-      alias method_missing_old_number method_missing
-      def method_missing m, *args
+      def method_missing m, *args, &block
         if @value.respond_to? m
           args.map! do |a|
             if a.is_a? Number
@@ -63,7 +64,8 @@ module RVM
           r = Number.new(r) if r.is_a? Numeric
           r
         else
-          method_missing_old_number m, *args
+          #raise "beep!#{m}, #{args}, #{block}" 
+          super(m, *args, &block)
         end
       end
     end

data/lib/rvm/classes/object.rb

@@ -1,4 +1,3 @@
-#TODO: 4
 module RVM
   module Classes
     class Object < RVM::Classes::Class
@@ -23,7 +22,6 @@ module RVM
         m.call(params, env)
       end
       
-      
       def data_type
         :object
       end

data/lib/rvm/functions.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/plugin'
 require File.dirname(__FILE__) + '/interpreter'
 module RVM
+  
   module Functions
     extend RVM::PluginHost
     class Function
@@ -12,13 +13,14 @@ module RVM
           :any
         end
 
-        alias method_missing_old method_missing         
+        alias :method_missing_old_functions :method_missing         
         
-        def method_missing(m, *args)
-          if (RVM::Functions.has? m)
+        def method_missing(m, *args, &block)
+          if (RVM::Functions::has? m)
             RVM::Functions[m].execute args, @env 
           else
-            method_missing_old m, *args
+            raise "ook!"
+            #method_missing_old_functions m, *args, &block
           end
         end
         

data/lib/rvm/interpreter.rb

@@ -56,6 +56,17 @@ module RVM
           :evaldeepth => 0,
           :params => []
         }.merge(init_data)
+        
+        # Make sure that all locals that are passed, are actually in a variable storage.
+        if init_data[:locals]
+          locals = @data[:locals]
+          init_data[:locals].each do |k,v|
+            if not v.is_a?(VariableStorage)
+              locals[k] = VariableStorage.new(v)
+            end
+          end
+        end
+        
         @prev = oldenv || {}
         RVM::debug "data: #{data}\noldenv:#{oldenv}" if $DEBUG
         RVM::debug "Creating new enviroment with: #{@data.inspect} as child of #{@prev}" if $DEBUG
@@ -510,11 +521,11 @@ module RVM
         RVM::debug "Executing FunctionCall..." if $DEBUG
         args = @arguments.dup
         if @function.is_a? RVM::Classes[:block]
-           args.map! do |arg|
+          args.map! do |arg|
             arg.execute env
           end
           @function.call(args, env,  @pos)
-        elsif (fun = env.function(@function))
+        elsif fun = env.function(@function)
           args.map! do |arg|
             arg.execute env
           end

data/lib/rvm/plugin.rb

@@ -1,3 +1,4 @@
+module RVM
 # = PluginHost
 #
 # $Id: plugin.rb 69 2006-07-11 06:00:20Z murphy $
@@ -24,7 +25,6 @@
 #
 #    Thanks a lot to Murphy, this code is borrowed from coderay.
 #
-module RVM
   module PluginHost
     
     # Raised if Encoders::[] fails because:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rVM
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Heinz N. Gies
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-12 00:00:00 +02:00
+date: 2008-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: []