rbf 0.0.6.1 → 0.0.7

data/lib/rbf/interpreter/extensions.rb

@@ -21,7 +21,7 @@ class IO
     end
   rescue LoadError
     def read_char
-      system 'stty raw -echo'
+      system 'stty raw'
 
       STDIN.getc
     ensure

data/lib/rbf/interpreter/storage.rb

@@ -65,6 +65,15 @@ class Storage < Hash
     self[position ? position.to_i : @position.to_i].to_i rescue 0
   end
 
+  def clear!
+    self.clear
+  end
+
+  def reset!
+    clear!
+    @position = 0
+  end
+
   def inspect
     "#<Storage(#{position}): #{super}>"
   end

data/lib/rbf/optimizer.rb

@@ -10,6 +10,8 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
+require 'memoized'
+
 module RBF
 
 class Optimizer
@@ -38,10 +40,9 @@ class Optimizer
 
   def optimize (tree)
     result = tree.clone
-    algos  = algorithms
 
     begin
-      changed = algos.any? {|algo|
+      changed = algorithms.any? {|algo|
         algo.optimize(result)
       }
     end while changed
@@ -49,6 +50,7 @@ class Optimizer
     result
   end
 
+  memoize
   def algorithms
     @@optimizations.map {|(name, block)|
       Algorithm.new(self, &block) unless options[name] == false

data/lib/rbf.rb

@@ -16,6 +16,41 @@ require 'rbf/optimizer'
 require 'rbf/jit'
 require 'rbf/interpreter'
 
+module Readline
+  Commands = ['!exit', '!quit', '!storage', '!position', '!get', '!set', '!clear', '!reset']
+
+  def self.supported?
+    require 'colorb'
+    require 'readline'
+  rescue Exception => e
+    false
+  end
+
+  if supported?
+    self.completion_proc = proc {|s|
+      next unless s.start_with?('!')
+
+      Commands.grep(/^#{Regexp.escape(s)}/)
+    }
+  end
+
+  def self.readline_with_hist_management
+    begin
+      line = Readline.readline('>> '.bold, true)
+    rescue Exception => e
+      return
+    end
+
+    return unless line
+
+    if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
+      Readline::HISTORY.pop
+    end
+
+    line
+  end
+end
+
 module RBF
   def self.syntax (name)
     name.is_a?(Hash) ? name :
@@ -48,69 +83,77 @@ module RBF
   end
 
   def self.repl (options=nil)
-    require 'colorb'
+    begin
+      require 'colorb'
+      require 'readline'
+    rescue LoadError
+      warn 'You need colorb and readline to use the REPL, install them.'
+
+      return false
+    end
 
     interpreter = Interpreter.new(options || {})
 
-    loop do
-      STDOUT.print '>> '.bold
-      STDOUT.flush
+    while line = Readline.readline_with_hist_management
+      line.rstrip!
 
-      begin
-        line = STDIN.gets.chomp rescue nil or raise SystemExit
-      rescue Interrupt, SystemExit
-        puts "\nExiting REPL."
+      if line.start_with?('!')
+        case line[1 .. -1]
+          when 'exit', 'quit'
+            break
 
-        return false
-      end
+          when 'storage'
+            STDOUT.puts interpreter.storage.inspect
 
-      begin
-        if line.start_with?('!')
-          case line[1 .. -1]
-            when 'exit', 'quit'
-              return true
+          when /^position(?:\s+(\d+))?$/
+            if $1
+              interpreter.storage.position = $1
+            else
+              STDOUT.puts interpreter.storage.position.to_s.bold
+            end
 
-            when 'storage'
-              STDOUT.puts interpreter.storage.inspect
+          when /^get(?:\s+(\d+))?$/
+            STDOUT.puts "#{($1 || interpreter.storage.position).to_s.bold}: #{interpreter.storage.get($1)}"
 
-            when /^position(?:\s+(\d+))?$/
-              if $1
-                interpreter.storage.position = $1
-              else
-                STDOUT.puts interpreter.storage.position.to_s.bold
-              end
+          when /^set(?:\s+(\d+)\s+(\d+))/
+            interpreter.storage.set($2.to_i, $1.to_i)
 
-            when /^get(?:\s+(\d+))?$/
-              STDOUT.puts "#{($1 || interpreter.storage.position).to_s.bold}: #{interpreter.storage.get($1)}"
+          when 'clear'
+            interpreter.storage.clear!
 
-            when /^set(?:\s+(\d+)\s+(\d+))/
-              interpreter.storage.set($2.to_i, $1.to_i)
+          when 'reset'
+            interpreter.storage.reset!
 
-            else
-              STDOUT.puts 'Command not found or used improperly'.red
-          end
-        else
-          interpreter.evaluate(line, interpreter.options.merge(:output => Class.new {
-            attr_reader :last
+          else
+            STDOUT.puts 'Command not found or used improperly'.red
+        end
+
+        next
+      end
 
-            def print (text)
-              STDOUT.print(text)
+      begin
+        interpreter.evaluate(line, interpreter.options.merge(:output => Class.new {
+          attr_reader :last
 
-              @last = text[-1]
-            end
+          def print (text)
+            STDOUT.print(text)
 
-            def flush
-              STDOUT.sync
-            end
-          }.new))
+            @last = text[-1]
+          end
 
-          puts if interpreter.output.last != "\n"
-        end
+          def flush
+            STDOUT.sync
+          end
+        }.new))
+
+        puts if interpreter.output.last && interpreter.output.last != "\n"
       rescue SyntaxError
         next
       rescue
         STDOUT.puts $!.inspect.red, $@.join("\n")
       end
     end
+    
+    puts "\nExiting REPL."
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rbf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6.1
+  version: 0.0.7
 platform: ruby
 authors: 
 - meh.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-06-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: parslet
@@ -24,7 +24,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: colorb
+  name: memoized
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -34,17 +34,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: memoized
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 description: 
 email: meh@paranoici.org
 executables: