Everything's leaf green

Gemfile.lock

@@ -2,21 +2,16 @@ PATH
   remote: .
   specs:
     brainfuck (0.2.0)
-      highline
       parslet
 
 GEM
   remote: http://rubygems.org/
   specs:
     blankslate (2.1.2.4)
-    highline (1.6.2)
     minitest (2.0.2)
     mocha (0.9.12)
     parslet (1.2.0)
       blankslate (~> 2.0)
-    simplecov (0.3.7)
-      simplecov-html (>= 0.3.7)
-    simplecov-html (0.3.9)
 
 PLATFORMS
   java
@@ -26,4 +21,3 @@ DEPENDENCIES
   brainfuck!
   minitest
   mocha
-  simplecov

brainfuck.gemspec

@@ -9,17 +9,15 @@ Gem::Specification.new do |s|
   s.authors     = ["Josep M. Bach"]
   s.email       = ["josep.m.bach@gmail.com"]
   s.homepage    = "http://github.com/txus/brainfuck"
-  s.summary     = %q{Another Brainfuck interpreter in Ruby}
-  s.description     = %q{Another Brainfuck interpreter in Ruby}
+  s.summary     = %q{An implementation of Brainfuck on the Rubinius VM.}
+  s.description = %q{An implementation of Brainfuck on the Rubinius VM.}
 
   s.rubyforge_project = "brainfuck"
 
-  s.add_runtime_dependency "highline"
   s.add_runtime_dependency "parslet"
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "simplecov"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

lib/brainfuck/ast.rb

@@ -83,11 +83,13 @@ def bytecode(g)
     end
     class PutsNode
       def bytecode(g)
+        g.push_const :STDOUT
+
         g.push_local 0
         g.push_local 1
         g.send :[], 1, false
-        g.send :chr, 0, true
-        g.send :puts, 1, true
+
+        g.send :putc, 1, true
       end
     end
     class GetsNode

lib/brainfuck/compiler.rb

@@ -63,7 +63,7 @@ def self.compile_for_eval(code, variable_scope, file = "(eval)", line = 0, print
       end
     end
 
-    class Print < Struct.new(:sexp, :ast, :heap, :asm)
+    class Print < Struct.new(:sexp, :ast, :asm)
       def sexp?
         @sexp
       end
@@ -72,10 +72,6 @@ def ast?
         @ast
       end
 
-      def heap?
-        @heap
-      end
-
       def asm?
         @asm
       end

lib/brainfuck/main.rb

@@ -79,10 +79,6 @@ def options(argv)
         @print.sexp = true
       end
 
-      options.on "--print-heap", "Print the heap and the pointer at the end" do
-        @print.heap = true
-      end
-
       options.on "--print-all", "Print Sexp, AST and Rubinius ASM" do
         @print.ast = @print.asm = @print.sexp = true
       end

lib/brainfuck/stages.rb

@@ -56,7 +56,8 @@ def run
         bottom.set!
 
         @output.use_detected
-        @output.push_nil
+        # Return the heap
+        @output.push_local 0
         @output.ret
         @output.close
 
@@ -130,7 +131,7 @@ def input(code, filename = "eval", line = 1)
       end
 
       def run
-        code = Lexer.clean(File.read(@filename))
+        code = Lexer.clean(@code)
         @output = Lexer.new.tokenize(code)
         pp(@output) if @print.sexp?
         run_next

test/acceptance/acceptance_test.rb

@@ -2,15 +2,17 @@
 
 class BrainfuckAcceptanceTest < MiniTest::Unit::TestCase
 
+  def test_ok
+    assert_evaluates [2,1], "++++>++++---.<--."
+  end
+
   def test_without_loops_nor_user_input
-    $stdout.expects(:print).times(2)
+    STDOUT.expects(:putc).times(2)
     assert_evaluates [2,1], "++++>++++---.<--."
   end
 
   def test_with_user_input
-    stack = Brainfuck::Stack.new
-    Brainfuck::Interpreter.stubs(:stack).returns stack
-    stack.expects(:get_character).returns 97
+    STDIN.expects(:getc).returns 97
 
     assert_evaluates [101], ",++++"
   end
@@ -64,6 +66,10 @@ def test_hello_world
   private
 
   def assert_evaluates(expected, code)
-    assert_equal expected, Brainfuck.run(code)
+    bnd = Object.new
+    def bnd.get; binding; end
+    bnd = bnd.get
+    mod = nil
+    assert_equal expected, Brainfuck::CodeLoader.execute_code(code, bnd, mod)
   end
 end

test/brainfuck/ast_test.rb

@@ -3,24 +3,5 @@
 module Brainfuck
   class ASTTest < MiniTest::Unit::TestCase
 
-    %w{fwd bwd inc dec puts gets}.each do |node|
-      define_method("test_ast_#{node}_node_eval_delegates_to_the_stack") do
-        subject = eval("AST::#{node.capitalize}Node").new stub(:stack)
-        subject.stack.expects(node)
-        subject.eval
-      end
-    end
-
-    def test_iteration_node_evaluates_until_cell_is_zero
-      nodes = [stub(:node), stub(:node)]
-      subject = AST::IterationNode.new stub(:stack), nodes
-      subject.stack.stubs(:current).returns 3, 2, 1, 0
-
-      nodes.each do |node|
-        node.expects(:eval).times(3)
-      end
-      subject.eval
-    end
-
   end
 end

test/brainfuck/lexer_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module Brainfuck
+  class LexerTest < MiniTest::Unit::TestCase
+
+    def test_INSTRUCTIONS_returns_valid_symbols
+      assert_equal %w{> < + - [ ] . ,}, Lexer::INSTRUCTIONS
+    end
+
+    def test_clean_cleans_all_invalid_symbols
+      assert_equal '><+-[-].,', Lexer.clean(">3< 223+fn - ()()[r23-] .bdn*& ,")
+    end
+
+    %w{lparen rparen space space? fwd bwd inc dec puts gets iteration expression}.each do |rule|
+      define_method("test_implements_a_#{rule}_rule") do
+        assert Lexer.new.respond_to?(rule), "Parser should implement a #{rule} rule"
+      end
+    end
+
+  end
+end

test/brainfuck/parser_test.rb

@@ -3,17 +3,12 @@
 module Brainfuck
   class ParserTest < MiniTest::Unit::TestCase
 
-    def test_INSTRUCTIONS_returns_valid_symbols
-      assert_equal %w{> < + - [ ] . ,}, Parser::INSTRUCTIONS
-    end
-
-    def test_clean_cleans_all_invalid_symbols
-      assert_equal '><+-[-].,', Parser.clean(">3< 223+fn - ()()[r23-] .bdn*& ,")
-    end
-
-    %w{lparen rparen space space? fwd bwd inc dec puts gets iteration expression}.each do |rule|
-      define_method("test_implements_a_#{rule}_rule") do
-        assert Parser.new.respond_to?(rule), "Parser should implement a #{rule} rule"
+    %w{fwd bwd inc dec puts gets iteration exp}.each do |rule|
+      define_method "test_implements_a_#{rule}_rule" do
+        rules = Parser.rules.map(&:first).map do |pattern|
+          pattern.instance_variable_get(:@pattern)
+        end.map(&:keys).flatten
+        assert_includes rules, rule.to_sym
       end
     end
 

test/test_helper.rb

@@ -2,11 +2,6 @@
 
 require 'bundler/setup'
 
-require 'simplecov'
-SimpleCov.start do
-  add_group "Lib", "lib"
-end
-
 gem 'minitest'
 require 'minitest/unit'
 require 'minitest/autorun'