rbf 0.0.1 → 0.0.2

data/lib/rbf/interpreter.rb

@@ -89,6 +89,15 @@ class Interpreter
       @output = STDOUT
     end
 
+    cycle(tree)
+
+    if options[:catch]
+      @output.rewind
+      @output.read
+    end
+  end
+
+  def cycle (tree)
     tree.each {|token|
       if token.is_a?(Array)
         self.loop(token)
@@ -96,10 +105,11 @@ class Interpreter
         self.send(token)
       end
     }
+  end
 
-    if options[:catch]
-      @output.rewind
-      @output.read
+  def loop (tree)
+    while @storage.get != 0
+      cycle(tree)
     end
   end
 
@@ -128,11 +138,6 @@ class Interpreter
     @storage.set @input.read_char
   end
 
-  define_method :loop do |code|
-    while @storage.get != 0
-      evaluate(code)
-    end
-  end
 end
 
 end

data/lib/rbf.rb

@@ -18,18 +18,18 @@ require 'rbf/interpreter'
 require 'parslet/convenience'
 
 module RBF
-  def self.parse (text, keys=Syntax::Default)
-    Transform.new.apply(Parser.apply(keys).new.parse_with_debug(text)) or
+  def self.parse (text, syntax=nil)
+    Transform.new.apply(Parser.apply(syntax || Syntax::Default).new.parse_with_debug(text)) or
       raise SyntaxError, 'There is a syntax error'
   end
 
-  def self.evaluate (text, keys=Syntax::Default)
-    tree = text.is_a?(Array) ? text : parse(text.to_s, keys)
+  def self.evaluate (text, options={})
+    tree = text.is_a?(Array) ? text : parse(text.to_s, options[:syntax])
 
-    Interpreter.new.evaluate(tree)
+    Interpreter.new.evaluate(tree, options)
   end
 
-  def self.execute (file, keys=Syntax::Default)
-    evaluate(File.read(file), keys)
+  def self.execute (file, options={})
+    evaluate(File.read(file), options)
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rbf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - meh.