brainfucktt 0.1.1 → 0.1.2

data/Rakefile

@@ -23,6 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency 'treetop', '~> 1.4'
   s.add_dependency 'polyglot', '~> 0.3'
   s.add_dependency 'version', '~> 1.0'
+  s.add_dependency 'slop', '~> 3.3'
   s.add_development_dependency 'at', '~> 0.1'
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'guard-rspec', '~> 2.1'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/brainfucktt

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'brainfucktt/repl'
+require 'slop'
+
+opts = Slop.parse help: true do
+  banner "brainfucktt [options]\n    Start the Brainfuck REPL"
+end
+
+if opts.help?
+  puts
+  puts Brainfucktt::REPL.instance.help.lines.collect { |line| "    #{line}"}.join
+else
+  Brainfucktt::REPL.run
+end

data/brainfucktt.gemspec

@@ -2,14 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "brainfucktt"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Scott Lewis"]
   s.date = "2012-12-06"
   s.description = "A Brainfuck interpreter built using Treetop."
   s.email = "ryan@rynet.us"
-  s.files = ["Gemfile", "LICENSE", "README.md", "Rakefile", "VERSION", "brainfucktt.gemspec", "examples/hello_world.rb", "examples/hello_world_with_comments.rb", "examples/stringio.rb", "lib/brainfucktt.rb", "lib/brainfucktt/byte.rb", "lib/brainfucktt/conversion_helpers.rb", "lib/brainfucktt/data.rb", "lib/brainfucktt/errors.rb", "lib/brainfucktt/language.rb", "lib/brainfucktt/language/decrement_byte.rb", "lib/brainfucktt/language/decrement_pointer.rb", "lib/brainfucktt/language/increment_byte.rb", "lib/brainfucktt/language/increment_pointer.rb", "lib/brainfucktt/language/input_byte.rb", "lib/brainfucktt/language/loop.rb", "lib/brainfucktt/language/output_byte.rb", "lib/brainfucktt/language/tree.rb", "lib/brainfucktt/language_parser.treetop", "lib/brainfucktt/node.rb", "lib/brainfucktt/parser.rb"]
+  s.executables = ["brainfucktt"]
+  s.files = ["Gemfile", "LICENSE", "README.md", "Rakefile", "VERSION", "bin/brainfucktt", "brainfucktt.gemspec", "examples/hello_world.rb", "examples/hello_world_with_comments.rb", "examples/rot13.rb", "examples/square_numbers.rb", "examples/stringio.rb", "examples/system_bell.rb", "lib/brainfucktt.rb", "lib/brainfucktt/byte.rb", "lib/brainfucktt/conversion_helpers.rb", "lib/brainfucktt/data.rb", "lib/brainfucktt/errors.rb", "lib/brainfucktt/language.rb", "lib/brainfucktt/language/decrement_byte.rb", "lib/brainfucktt/language/decrement_pointer.rb", "lib/brainfucktt/language/increment_byte.rb", "lib/brainfucktt/language/increment_pointer.rb", "lib/brainfucktt/language/input_byte.rb", "lib/brainfucktt/language/loop.rb", "lib/brainfucktt/language/output_byte.rb", "lib/brainfucktt/language/tree.rb", "lib/brainfucktt/language_parser.treetop", "lib/brainfucktt/node.rb", "lib/brainfucktt/parser.rb", "lib/brainfucktt/repl.rb"]
   s.homepage = "http://github.com/RyanScottLewis/brainfucktt"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
@@ -22,6 +23,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<treetop>, ["~> 1.4"])
       s.add_runtime_dependency(%q<polyglot>, ["~> 0.3"])
       s.add_runtime_dependency(%q<version>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<slop>, ["~> 3.3"])
       s.add_development_dependency(%q<at>, ["~> 0.1"])
       s.add_development_dependency(%q<rake>, ["~> 10.0"])
       s.add_development_dependency(%q<guard-rspec>, ["~> 2.1"])
@@ -34,6 +36,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<treetop>, ["~> 1.4"])
       s.add_dependency(%q<polyglot>, ["~> 0.3"])
       s.add_dependency(%q<version>, ["~> 1.0"])
+      s.add_dependency(%q<slop>, ["~> 3.3"])
       s.add_dependency(%q<at>, ["~> 0.1"])
       s.add_dependency(%q<rake>, ["~> 10.0"])
       s.add_dependency(%q<guard-rspec>, ["~> 2.1"])
@@ -47,6 +50,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<treetop>, ["~> 1.4"])
     s.add_dependency(%q<polyglot>, ["~> 0.3"])
     s.add_dependency(%q<version>, ["~> 1.0"])
+    s.add_dependency(%q<slop>, ["~> 3.3"])
     s.add_dependency(%q<at>, ["~> 0.1"])
     s.add_dependency(%q<rake>, ["~> 10.0"])
     s.add_dependency(%q<guard-rspec>, ["~> 2.1"])

data/examples/hello_world_with_comments.rb

@@ -1,8 +1,6 @@
 require_relative '../lib/brainfucktt'
 
-code = DATA.read
-
-Brainfucktt.run(code)
+Brainfucktt.run( DATA.read )
 
 __END__
 +++++ +++++             initialize counter (cell #0) to 10

data/examples/rot13.rb

@@ -0,0 +1,37 @@
+require_relative '../lib/brainfucktt'
+
+Brainfucktt.run( DATA.read )
+
+__END__
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ THIS IS SLOW THIS IS SLOW THIS IS SLOW THIS IS SLOW THIS IS SLOW THIS IS SLOW 
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+
+-,+[                         Read first character and start outer character reading loop
+    -[                       Skip forward if character is 0
+        >>++++[>++++++++<-]  Set up divisor (32) for division loop
+                               (MEMORY LAYOUT: dividend copy remainder divisor quotient zero zero)
+        <+<-[                Set up dividend (x minus 1) and enter division loop
+            >+>+>-[>>>]      Increase copy and remainder / reduce divisor / Normal case: skip forward
+            <[[>+<-]>>+>]    Special case: move remainder back to divisor and increase quotient
+            <<<<<-           Decrement dividend
+        ]                    End division loop
+    ]>>>[-]+                 End skip loop; zero former divisor and reuse space for a flag
+    >--[-[<->+++[-]]]<[         Zero that flag unless quotient was 2 or 3; zero quotient; check flag
+        ++++++++++++<[       If flag then set up divisor (13) for second division loop
+                               (MEMORY LAYOUT: zero copy dividend divisor remainder quotient zero zero)
+            >-[>+>>]         Reduce divisor; Normal case: increase remainder
+            >[+[<+>-]>+>>]   Special case: increase remainder / move it back to divisor / increase quotient
+            <<<<<-           Decrease dividend
+        ]                    End division loop
+        >>[<+>-]             Add remainder back to divisor to get a useful 13
+        >[                   Skip forward if quotient was 0
+            -[               Decrement quotient and skip forward if quotient was 1
+                -<<[-]>>     Zero quotient and divisor if quotient was 2
+            ]<<[<<->>-]>>    Zero divisor and subtract 13 from copy if quotient was 1
+        ]<<[<<+>>-]          Zero divisor and add 13 to copy if quotient was 0
+    ]                        End outer skip loop (jump to here if ((character minus 1)/32) was not 2 or 3)
+    <[-]                     Clear remainder from first division if second division was skipped
+    <.[-]                    Output ROT13ed character from copy and clear it
+    <-,+                     Read next character
+]                            End character reading loop

data/examples/square_numbers.rb

@@ -0,0 +1,37 @@
+# require 'brainfucktt'
+$:.unshift(File.expand_path(File.join(__FILE__, '..', '..', 'lib-compiled')))
+Rubinius::CodeLoader.require_compiled 'brainfucktt'
+
+Brainfucktt.run( DATA.read )
+
+=begin Benchmarks
+
+ruby 1.9.3p327 (2012-11-10 revision 37606) [x86_64-darwin12.2.0]
+
+real	0m9.986s
+user	0m9.564s
+sys	0m0.274s
+
+rubinius 2.0.0rc1 (1.8.7 release 2012-11-02 JI) [x86_64-apple-darwin12.2.0]
+
+uncompiled
+
+real	0m5.828s
+user	0m6.330s
+sys	0m0.233s
+
+jruby 1.7.0 (1.9.3p203) 2012-10-22 ff1ebbe on Java HotSpot(TM) 64-Bit Server VM 1.6.0_37-b06-434-11M3909 [darwin-x86_64]
+
+real	0m17.404s
+user	0m26.151s
+sys	0m1.402s
+
+
+=end
+
+
+__END__
+++++[>+++++<-]>[<+++++>-]+<+[>[>+>+<<-]++>>[<<+>>-]>>>[-]++>[-]+>>>+[[-]++++++>
+>>]<<<[[<++++++++<++>>-]+<.<[>----<-]<]<<[>>>>>[>>>[-]+++++++++<[>-<-]+++++++++
+>[-[<->-]+[<<<]]<[>+<-]>]<<-]<<-]
+

data/examples/system_bell.rb

@@ -0,0 +1,3 @@
+require_relative '../lib/brainfucktt'
+
+Brainfucktt.run('+++++++.')

data/lib/brainfucktt.rb

@@ -1,17 +1,30 @@
-require 'pathname'
-require 'forwardable'
-
-__LIB__ ||= Pathname.new(__FILE__).join('..').expand_path
-$:.unshift(__LIB__.to_s) unless $:.include?(__LIB__)
+# require 'pathname'
+# 
+# __LIB__ ||= Pathname.new(__FILE__).join('..').expand_path
+# $:.unshift(__LIB__.to_s) unless $:.include?(__LIB__)
 
 require 'brainfucktt/parser'
 
 # A Brainfuck interpreter built in Ruby using Treetop.
 module Brainfucktt
   class << self
-    extend Forwardable
     
-    delegate [:parse, :run] => Parser
+    # Parse the given Brainfuck code.
+    # 
+    # @param [String, #to_s] code
+    # @raise [Brainfucktt::ParserError]
+    # @return [Brainfucktt::Parser]
+    def parse(code)
+      Parser.parse(code)
+    end
+    
+    # Parse and run the given Brainfuck code.
+    # 
+    # @param [String, #to_s] code
+    # @param [Hash, #to_hash, #to_h] options
+    def run(code=nil, options={})
+      Parser.run(code, options)
+    end
     
   end
 end

data/lib/brainfucktt/byte.rb

@@ -44,7 +44,7 @@ module Brainfucktt
     # 
     # @return [true, false]
     def ==(other)
-      self == other
+      self.object_id == other.object_id
     end
     
     # Check to see if the given object instance as an Integer is the same as the value of
@@ -74,7 +74,7 @@ module Brainfucktt
     # 
     # @return [String]
     def to_binary
-      @value.to_s(2)
+      "%08b" % @value
     end
     
     # Return the Byte as an ASCII character.
@@ -89,7 +89,7 @@ module Brainfucktt
     # 
     # @return [String]
     def to_hex
-      @value.to_s(16)
+      '%02x' % @value
     end
     
     # Return the Byte as a binary string.

data/lib/brainfucktt/errors.rb

@@ -39,11 +39,6 @@ module Brainfucktt
   
   # Raised when the code being parsed has a syntax error.
   class ParserError < Error
-    extend Forwardable
-    
-    def_delegator :@language_parser, :failure_reason, :reason
-    def_delegator :@language_parser, :failure_line,   :line
-    def_delegator :@language_parser, :failure_column, :column
     
     # @param [Brainfucktt::LanguageParser] language_parser
     def initialize(language_parser)
@@ -57,6 +52,21 @@ module Brainfucktt
       "Error at column #{column}, line #{line} - '#{reason}'"
     end
     
+    # @return [String]
+    def reason
+      @language_parser.failure_reason
+    end
+    
+    # @return [String]
+    def line
+      @language_parser.failure_line
+    end
+    
+    # @return [String]
+    def column
+      @language_parser.failure_column
+    end
+    
   end
   
 end

data/lib/brainfucktt/language/input_byte.rb

@@ -8,7 +8,7 @@ module Brainfucktt
       
       # Input an ASCII character and store it in the byte at the pointer.
       def run(parser)
-        parser.byte = get_character(parser.stdin)
+        parser.byte = get_character(parser.input)
       end
       
       protected

data/lib/brainfucktt/language/loop.rb

@@ -8,7 +8,7 @@ module Brainfucktt
       
       # Run the loop
       def run(parser)
-        elements.first.run(parser) until parser.byte.empty?
+        elements[0].run(parser) until parser.byte.empty?
       end
       
     end

data/lib/brainfucktt/node.rb

@@ -5,13 +5,11 @@ module Brainfucktt
   # The base class for Brainfucktt syntax nodes in the AST
   class Node < Treetop::Runtime::SyntaxNode
     
-    alias_method :elements_with_treetop, :elements
-    
     # The children of this Node instance.
     # 
     # @return [<Brainfucktt::Node>]
     def elements
-      elements_with_treetop.find_all { |node| node.is_a?(Brainfucktt::Node) } rescue []
+      super.find_all { |node| node.is_a?(Brainfucktt::Node) } rescue []
     end
     
     # Return the text value of this Node instance.

data/lib/brainfucktt/parser.rb

@@ -16,9 +16,16 @@ module Brainfucktt
       
       # Get a new or the cached instance of this class.
       # 
-      # @return [Brainfucktt::LanguageParser]
+      # @return [Brainfucktt::Parser]
       def instance
-        @instance ||= LanguageParser.new
+        @instance ||= new
+      end
+      
+      # Get a new or the cached instance of this class.
+      # 
+      # @return [Brainfucktt::Parser]
+      def language_parser
+        @language_parser ||= LanguageParser.new
       end
       
       # Parse the given Brainfuck code.
@@ -27,38 +34,55 @@ module Brainfucktt
       # @raise [Brainfucktt::ParserError]
       # @return [Brainfucktt::Parser]
       def parse(code)
-        tree = instance.parse(code)
-        raise ParserError, instance unless tree
-        
-        new(tree)
+        instance.parse(code)
       end
       
       # Parse and run the given Brainfuck code.
       # 
       # @param [String, #to_s] code
-      def run(code, options={})
-        parse(code).run(options)
+      # @param [Hash, #to_hash, #to_h] options
+      def run(code=nil, options={})
+        instance.run(code, options)
       end
+      
     end
     
     attr_reader :data, :tree, :input, :output
     attr_accessor :pointer
     
-    def initialize(tree)
-      @data, @tree, @pointer = Data.new, tree, 0
-    end
+    def initialize(options={})
+      options = { :input => STDIN, :output => STDOUT }.merge( convert_to_options(options) )
       
+      @input, @output = options.values_at(:input, :output)
+      @data, @pointer, @tree = Data.new, 0, nil
+    end
+    
     # Run the parsed Brainfuck code.
     # 
-    # @raise [Brainfucktt::InvalidOptionsError] When the given offset cannot be converted into an Integer.
+    # @param [String, #to_s] code The code to parse before running.
     # @param [Hash, #to_hash, #to_h] options
-    def run(options={})
-      options = { input: STDIN, output: STDOUT }.merge( convert_to_options(options) )
-      
+    # @raise [Brainfucktt::InvalidOptionsError] When the given offset cannot be converted into an Integer.
+    def run(code=nil, options={})
+      options = { :input => @input, :output => @output }.merge( convert_to_options(options) )
       @input, @output = options.values_at(:input, :output)
+      
+      parse(code) unless code.nil?
+      
       @tree.run(self)
     end
     
+    # Parse the given Brainfuck code.
+    # 
+    # @param [String, #to_s] code
+    # @raise [Brainfucktt::ParserError]
+    # @return [Brainfucktt::Parser]
+    def parse(code)
+      @tree = self.class.language_parser.parse(code)
+      raise ParserError, self unless @tree
+      
+      self
+    end
+    
     # Returns the Byte instance within the @data collection at pointer.
     # 
     # @return [Brainfucktt::Byte]

data/lib/brainfucktt/repl.rb

@@ -0,0 +1,103 @@
+require 'brainfucktt/parser'
+
+module Brainfucktt
+  
+  class REPL
+    
+    class << self
+      
+      def instance
+        @instance ||= new
+      end
+      
+      def run
+        puts instance.help
+        instance.loop
+      end
+      
+    end
+    
+    def initialize
+      trap('INT') { self.exit }
+      @input, @output = nil
+      @parser = Brainfucktt::Parser.new
+    end
+    
+    def read
+      Kernel.print '> '
+      @input = gets
+    end
+    
+    def eval
+      case @input.strip
+      when 'help' then puts help
+      when '?' then puts help
+      when 'quit' then self.exit
+      when 'exit' then self.exit
+      when 'hex' then puts hex
+      when 'ascii' then puts ascii
+      when 'binary' then puts binary
+      when 'decimal' then puts decimal
+      else; @parser.run(@input)
+      end
+    end
+    
+    def print
+      puts @parser.data.bytes.collect { |byte|
+        byte_str = ''
+        byte_str << (@parser.byte == byte ? '>' : '|')
+        byte_str << byte.to_hex
+        byte_str << (@parser.byte == byte ? '<' : '|')
+        
+        byte_str
+      }.join(' ')
+      
+      @input = nil
+    end
+    
+    def loop
+      Kernel.loop do
+        # begin
+          read
+          eval
+          print
+        # rescue
+        #   # Do squat
+        # end
+      end
+    end
+    
+    def help
+      result = ''
+      result << "Type 'help' or '?' for help.\n"
+      result << "Type 'hex'     to output the data buffer in hexadecimal.\n"
+      result << "Type 'ascii'   to output the data buffer in ASCII.\n"
+      result << "Type 'binary'  to output the data buffer in binary.\n"
+      result << "Type 'decimal' to output the data buffer in decimal.\n"
+      result << "Type 'exit' or 'quit' or press CTRL-C to exit.\n\n"
+    end
+    
+    def exit
+      puts
+      Kernel.exit
+    end
+    
+    def hex
+      @parser.data.bytes.collect(&:to_hex).join(' ')
+    end
+    
+    def ascii
+      @parser.data.bytes.collect(&:to_ascii).join
+    end
+    
+    def binary
+      @parser.data.bytes.collect(&:to_binary).join(' ')
+    end
+    
+    def decimal
+      @parser.data.bytes.collect(&:to_i).join(' ')
+    end
+    
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainfucktt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: at
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +205,8 @@ dependencies:
         version: '0.7'
 description: A Brainfuck interpreter built using Treetop.
 email: ryan@rynet.us
-executables: []
+executables:
+- brainfucktt
 extensions: []
 extra_rdoc_files: []
 files:
@@ -198,10 +215,14 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/brainfucktt
 - brainfucktt.gemspec
 - examples/hello_world.rb
 - examples/hello_world_with_comments.rb
+- examples/rot13.rb
+- examples/square_numbers.rb
 - examples/stringio.rb
+- examples/system_bell.rb
 - lib/brainfucktt.rb
 - lib/brainfucktt/byte.rb
 - lib/brainfucktt/conversion_helpers.rb
@@ -219,6 +240,7 @@ files:
 - lib/brainfucktt/language_parser.treetop
 - lib/brainfucktt/node.rb
 - lib/brainfucktt/parser.rb
+- lib/brainfucktt/repl.rb
 homepage: http://github.com/RyanScottLewis/brainfucktt
 licenses: []
 post_install_message: 
@@ -233,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -107453280338519890
+      hash: -1731370008399117762
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: