rVM 0.0.2 → 0.0.3

data/lib/rvm.rb

@@ -8,6 +8,7 @@ module RVM
   @@strict = false
 
   def strict
+    @@strict
   end
 
   def compile language, code

data/lib/rvm/classes.rb

@@ -19,7 +19,6 @@ module RVM
   module Classes
     
     extend PluginHost
-    plugin_path File.dirname(__FILE__), '/classes/'
     default :string
     # The Parent for new classes, meant never to be used alone.
     # It takes care of registering the calss to the PluginHost,
@@ -77,3 +76,7 @@ module RVM
     end
   end
 end
+
+Dir[File.dirname(__FILE__) + '/classes/*.rb'].each do |c|
+  require c
+end

data/lib/rvm/functions.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/interpreter'
 module RVM
   module Functions
     extend PluginHost
-    plugin_path File.dirname(__FILE__), '/functions/*/'
     class Function
       extend Plugin
       plugin_host Functions
@@ -14,10 +13,6 @@ module RVM
         end
 
         alias method_missing_old method_missing         
-        alias respond_to_old respond_to?
-        def respond_to?(symbol,include_private = false)
-          respond_to_old(symbol,include_private)
-        end
         
         def method_missing(m, *args)
           if (RVM::Functions.has? m)

data/lib/rvm/functions/all.rb

@@ -0,0 +1,3 @@
+Dir[File.dirname(__FILE__) + '/*/*.rb'].each do |c|
+  require c
+end

data/lib/rvm/functions/general.rb

@@ -0,0 +1,3 @@
+Dir[File.dirname(__FILE__) + '/general/*.rb'].each do |c|
+  require c
+end

data/lib/rvm/functions/general/cmp.rb

@@ -0,0 +1,19 @@
+module RVM
+  module Functions
+		class Cmp < RVM::Functions::Function
+      class << self
+        def execute params, env
+          if params.length == 2
+					  return RVM::Classes[:number].new(params[0] <=> params[1])
+					else
+					end
+        end
+				
+        def signature
+          [:any] 
+        end
+      end
+      register_for :cmp
+		end
+	end
+end

data/lib/rvm/functions/io.rb

@@ -0,0 +1,3 @@
+Dir[File.dirname(__FILE__) + '/io/*.rb'].each do |c|
+  require c
+end

data/lib/rvm/functions/io/print.rb

@@ -0,0 +1,18 @@
+module RVM
+  module Functions
+		class Print < RVM::Functions::Function
+      class << self
+        def execute params, env
+					params.each do |p|
+						print p
+					end
+        end
+				
+        def signature
+          [:any] 
+        end
+      end
+      register_for :print
+		end
+	end
+end

data/lib/rvm/functions/list.rb

@@ -0,0 +1,3 @@
+Dir[File.dirname(__FILE__) + '/list/*.rb'].each do |c|
+  require c
+end

data/lib/rvm/functions/math.rb

@@ -0,0 +1,3 @@
+Dir[File.dirname(__FILE__) + '/math/*.rb'].each do |c|
+  require c
+end

data/lib/rvm/functions/string.rb

@@ -0,0 +1,3 @@
+Dir[File.dirname(__FILE__) + '/string/*.rb'].each do |c|
+  require c
+end

data/lib/rvm/functions/string/chr.rb

@@ -0,0 +1,16 @@
+module RVM
+  module Functions
+		class Chr < RVM::Functions::Function
+      class << self
+        def execute params, env
+					params[0].chr
+        end
+				
+        def signature
+          [:number] 
+        end
+      end
+      register_for :chr
+		end
+	end
+end

data/lib/rvm/interpreter.rb

@@ -99,6 +99,20 @@ module RVM
       
     end
     
+    class Loop 
+      def initialize(condition, body)
+        @condition = condition
+        @body = body
+      end
+      
+      def execute env
+        while @condition.execute(env).is_true?
+          @body.execute(env)
+        end
+      end
+    end
+    
+    
     # A constant, it evaluates to thevalue given and end the evaluation.
     # Meaning that no further execution is done in this tree branch, so the
     # value isn't evaluated.
@@ -169,7 +183,8 @@ module RVM
       end
       
       def execute env
-        if @value.execute(env).is_true?
+        v =  @value.execute(env)
+        if v and v.is_true?
           RVM::debug "Executing Condition... (true)"
           @true_case.execute env
         elsif @false_case
@@ -218,7 +233,7 @@ module RVM
       def execute env
         RVM::debug "Executing Variable..."
         r = env[@name.execute(env).to_s]
-        @type = r.data_type
+        @type = r.data_type if r
         r
       end
     end

data/lib/rvm/languages.rb

@@ -22,7 +22,6 @@ module RVM
   #   code = RVM::Classes[:math].compile '(1 + 1) * 3^2'
   module Languages
     extend PluginHost
-    plugin_path File.dirname(__FILE__), '/languages'
     
     # The Compiler class, it holds the compiler. As those grow big I suggest
     # to split the actuall code into multiple fils. Have a look at the MUSHCode

data/lib/rvm/languages/brainfuck.rb

@@ -0,0 +1,145 @@
+require 'strscan'
+require 'rvm/functions/math/add'
+require 'rvm/functions/math/sub'
+require 'rvm/functions/io/print'
+module RVM
+  module Languages
+    class Brainfuck < RVM::Languages::Language
+      def make_tree str
+        str.gsub!(/\/\/.*?\n/,'') #delete comments
+        str.gsub!(/[^<>+\[\].,\d-]/,'')
+        s = StringScanner.new(str)
+        tree = []
+        cur = tree
+        stack = []
+        while (!s.eos?)
+          c = s.scan(/./)
+          case (c)
+            when '+'
+            if cur.last and cur.last[0] == :inc
+              cur.last[1] += 1
+            else
+              cur << [:inc, 1]
+            end
+            when '-'
+            if cur.last and cur.last[0] == :dec
+              cur.last[1] += 1
+            else
+              cur << [:dec, 1]
+            end
+            when '<'
+            if cur.last and cur.last[0] == :left
+              cur.last[1] += 1
+            else
+              cur << [:left, 1]
+            end
+            when '>'
+            if cur.last and cur.last[0] == :right
+              cur.last[1] += 1
+            else
+              cur << [:right, 1]
+            end
+            when '['
+            tmp = []
+            cur << [:loop, tmp]
+            stack << cur
+            cur = tmp
+            when '.'
+            cur << [:print]
+            when ','
+            cur << [:read]
+            when ']'
+            cur = stack.pop
+          end
+        end
+        tree
+      end
+      
+      def compile code
+        make_vmcode(make_tree(code))
+      end
+      
+      def make_vmcode tree
+        root = RVM::Interpreter::Sequence.new();
+        ptr = Interpreter::Variable.new(Interpreter.const(:string,'ptr'))
+        val = Interpreter::Variable.new(ptr)
+        tree.each do |item|
+          case item[0]
+            when :inc
+            root << Interpreter::Assignment.new(
+              ptr,
+              Interpreter::FunctionCall.new(
+                :add,
+                [
+                  Interpreter::Condition.new(
+                    val,
+                    val,
+                    Interpreter.const(:number,0)
+                  ),
+                  Interpreter.const(:number,item[1])
+                ]
+              )
+            )
+            when :dec
+            root << Interpreter::Assignment.new(
+              ptr,
+              Interpreter::FunctionCall.new(
+                :sub,
+                [
+                  Interpreter::Condition.new(
+                    val,
+                    val,
+                    Interpreter.const(:number,0)
+                  ),
+                  Interpreter.const(:number,item[1])
+                ]
+              )
+            )
+            when :left
+            root << Interpreter::Assignment.new(
+              Interpreter.const(:string,'ptr'),
+              Interpreter::FunctionCall.new(
+                :sub,
+                [
+                  ptr,
+                  Interpreter.const(:number,item[1])
+                ]
+              )
+            )
+            when :right
+            root << Interpreter::Assignment.new(
+              Interpreter.const(:string,'ptr'),
+              Interpreter::FunctionCall.new(
+                :add,
+                [
+                  ptr,
+                  Interpreter.const(:number,item[1])
+                ]
+              )
+            )
+            when :print
+            root << Interpreter::FunctionCall.new(:print, [Interpreter::FunctionCall.new(:chr,[val])])
+            when :read
+            when :loop
+            body = make_vmcode(item[1])
+            root << Interpreter::Loop.new(val,	body)
+          end
+        end
+        root
+      end
+      
+      register_for :brainfuck
+    end
+  end
+end
+
+def bfpp str
+  str.gsub!(/\/\/.*?\n/,'')
+  
+  str.gsub!(/[^<>+\[\].,\dv-]/,'')
+  str.gsub!('v','[-]')
+  str.gsub!(/(.)(\d+)/) do |s|
+    s[0].chr * s.gsub(/^./,'').to_i
+  end
+  str
+end

data/lib/rvm/languages/math.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/math/tokenizer'
 require File.dirname(__FILE__) + '/math/tree'
 require File.dirname(__FILE__) + '/math/compiler'
+require 'rvm/functions/math'
 module RVM
 	module Languages
 		class MathLanguage < Language

data/lib/rvm/plugin.rb

@@ -36,11 +36,7 @@ module PluginHost
   PLUGIN_HOSTS_BY_ID = {}  # dummy hash
 
   # Loads all plugins using all_plugin_names and load.
-  def load_all
-    for plugin in all_plugin_names
-      load plugin
-    end
-  end
+
 
   # Returns the Plugin for +id+.
   #
@@ -57,11 +53,6 @@ module PluginHost
   # Alias for +[]+.
   alias load []
 
-  def require_helper plugin_id, helper_name
-    path = path_to File.join(plugin_id, helper_name)
-    require path
-  end
-
   class << self
 
     # Adds the module/class to the PLUGIN_HOSTS list.
@@ -90,15 +81,6 @@ module PluginHost
 
   end
 
-  # The path where the plugins can be found.
-  def plugin_path *args
-    unless args.empty?
-      @plugin_path = File.expand_path File.join(*args)
-      load_map
-    end
-    @plugin_path
-  end
-
   # The host's ID.
   #
   # If PLUGIN_HOST_ID is not set, it is simply the class name.
@@ -161,17 +143,7 @@ module PluginHost
   end
 
   def has? id
-    plugin_hash.include? id
-  end
-  # Returns an array of all .rb files in the plugin path.
-  #
-  # The extension .rb is not included.
-  def all_plugin_names
-    Dir[path_to('*')].select do |file|
-      File.basename(file)[/^(?!_)\w+\.rb$/]
-    end.map do |file|
-      File.basename file, '.rb'
-    end
+    plugin_hash.has_key? id
   end
 
   # Makes a map of all loaded plugins.
@@ -188,39 +160,10 @@ protected
   def create_plugin_hash
     @plugin_hash =
       Hash.new do |h, plugin_id|
-        id = validate_id(plugin_id)
-        path = Dir[File.join(plugin_path, "#{plugin_id}.rb")].first || path_to(id)
-        begin
-          require path
-        rescue LoadError => boom
-          if h.has_key? nil  # default plugin
-            h[id] = h[nil]
-          else
-            raise PluginNotFound, 'Could not load plugin %p: %s' % [id, boom]
-          end
-        else
-          # Plugin should have registered by now
-          unless h.has_key? id
-            raise PluginNotFound,
-              "No #{self.name} plugin for #{id.inspect} found in #{path}."
-          end
-        end
-        h[id]
+        raise "Plugin #{plugin_id} not loaded."
       end
   end
 
-  # Loads the map file (see map).
-  #
-  # This is done automatically when plugin_path is called.
-  def load_map
-    mapfile = path_to '_map'
-    if File.exist? mapfile
-      require mapfile
-    elsif $DEBUG
-      warn 'no _map.rb found for %s' % name
-    end
-  end
-
   # Returns the Plugin for +id+.
   # Use it like Hash#fetch.
   #
@@ -230,10 +173,6 @@ protected
     plugin_hash.fetch validate_id(id), *args, &blk
   end
 
-  # Returns the expected path to the plugin file for the given id.
-  def path_to plugin_id
-    File.join(plugin_path, "#{plugin_id}.rb")
-  end
 
   # Converts +id+ to a Symbol if it is a String,
   # or returns +id+ if it already is a Symbol.
@@ -289,7 +228,7 @@ module Plugin
       raise ArgumentError,
         "PluginHost expected, but #{host.class} given."
     end
-    self.const_set :PLUGIN_HOST, host if host
+    self.const_set :PLUGIN_HOST, host if host and not self.const_defined?(:PLUGIN_HOST)
     self::PLUGIN_HOST
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rVM
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Heinz N. Gies
@@ -9,7 +9,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2008-02-28 00:00:00 +01:00
+date: 2008-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,11 +32,19 @@ files:
 - lib/rvm/classes/string.rb
 - lib/rvm/classes.rb
 - lib/rvm/functions
+- lib/rvm/functions/all.rb
+- lib/rvm/functions/general
+- lib/rvm/functions/general/cmp.rb
+- lib/rvm/functions/general.rb
+- lib/rvm/functions/io
+- lib/rvm/functions/io/print.rb
+- lib/rvm/functions/io.rb
 - lib/rvm/functions/list
 - lib/rvm/functions/list/align.rb
 - lib/rvm/functions/list/join.rb
 - lib/rvm/functions/list/map.rb
 - lib/rvm/functions/list/split.rb
+- lib/rvm/functions/list.rb
 - lib/rvm/functions/logic
 - lib/rvm/functions/logic/and.rb
 - lib/rvm/functions/math
@@ -46,16 +54,20 @@ files:
 - lib/rvm/functions/math/neg.rb
 - lib/rvm/functions/math/power.rb
 - lib/rvm/functions/math/sub.rb
+- lib/rvm/functions/math.rb
 - lib/rvm/functions/string
 - lib/rvm/functions/string/ansi.rb
 - lib/rvm/functions/string/capstr.rb
 - lib/rvm/functions/string/center.rb
+- lib/rvm/functions/string/chr.rb
 - lib/rvm/functions/string/ljust.rb
 - lib/rvm/functions/string/regmatch.rb
 - lib/rvm/functions/string/rjust.rb
+- lib/rvm/functions/string.rb
 - lib/rvm/functions.rb
 - lib/rvm/interpreter.rb
 - lib/rvm/languages
+- lib/rvm/languages/brainfuck.rb
 - lib/rvm/languages/math
 - lib/rvm/languages/math/compiler.rb
 - lib/rvm/languages/math/tokenizer.rb