brain_love 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.0.3
+
+ * Parser and transformer were rewritten. All unknown characters are ignored and considered as comments.
+
 ## v0.0.2
 
  * Data cells now are unsigned byte and wrap around on decrement and increment

data/brain_love.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = BrainLove::VERSION
 
+  gem.required_ruby_version = '>= 1.9.2'
+
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
   gem.add_runtime_dependency "parslet"

data/lib/brain_love/parser.rb

@@ -20,9 +20,16 @@ module BrainLove
       input_byte
     end
 
-    rule(:commands)           { command.repeat(1) }
-    rule(:_loop)              { (jump_forward >> (commands | _loop).as(:statements).repeat >> jump_backward).as(:loop) }
+    rule :comment do
+      (command | jump_forward | jump_backward).absnt? >> any.as(:comment)
+    end
+
+    rule :_loop do
+      (jump_forward >> root >> jump_backward).as(:loop)
+    end
 
-    rule(:root)               { (commands | _loop).as(:statements).repeat.as(:statements) }
+    rule :root do
+      (comment | command | _loop).repeat.as(:statements)
+    end
   end
 end

data/lib/brain_love/transformer.rb

@@ -1,3 +1,5 @@
+require 'pp'
+
 module BrainLove
   class Transformer < Parslet::Transform
     rule(:increment_pointer => simple(:_))  { AST::IncrementPointer.new }
@@ -7,20 +9,17 @@ module BrainLove
     rule(:output_byte       => simple(:_))  { AST::OutputByte.new }
     rule(:input_byte        => simple(:_))  { AST::InputByte.new }
 
-    rule(:loop => simple(:_)) do
-      AST::Loop.new
-    end
-
-    rule(:loop => sequence(:statements)) do
-      AST::Loop.new(statements.first)
+    # Hm, still feels ugly but better than was :)
+    rule(:comment => simple(:_)) do
+      nil
     end
 
-    rule :statements => simple(:statements) do
-      AST::Statements.new([statements])
+    rule(:loop => simple(:statements)) do
+      AST::Loop.new(statements)
     end
 
     rule :statements => sequence(:statements) do
-      AST::Statements.new(statements)
+      AST::Statements.new(statements.compact)
     end
   end
 end

data/lib/brain_love/version.rb

@@ -1,3 +1,3 @@
 module BrainLove
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/brain_love/parser_spec.rb

@@ -55,6 +55,7 @@ describe BrainLove::Parser do
     it { should parse('++[]') }
     it { should parse('[[]]') }
     it { should parse('[[++]++]>.') }
+    it { should parse('this is comments and produces no error') }
 
     it { should_not parse('[') }
     it { should_not parse(']') }

data/spec/brain_love/transformer_spec.rb

@@ -6,33 +6,47 @@ end
 
 describe BrainLove::Transformer do
   describe 'simple commands' do
-    it { should transform('>').to(ast_statement([ast_statement([BrainLove::AST::IncrementPointer.new])])) }
-    it { should transform('<').to(ast_statement([ast_statement([BrainLove::AST::DecrementPointer.new])])) }
-    it { should transform('+').to(ast_statement([ast_statement([BrainLove::AST::IncrementByte.new])])) }
-    it { should transform('-').to(ast_statement([ast_statement([BrainLove::AST::DecrementByte.new])])) }
-    it { should transform('.').to(ast_statement([ast_statement([BrainLove::AST::OutputByte.new])])) }
-    it { should transform(',').to(ast_statement([ast_statement([BrainLove::AST::InputByte.new])])) }
+    it { should transform('>').to(ast_statement([BrainLove::AST::IncrementPointer.new])) }
+    it { should transform('<').to(ast_statement([BrainLove::AST::DecrementPointer.new])) }
+    it { should transform('+').to(ast_statement([BrainLove::AST::IncrementByte.new])) }
+    it { should transform('-').to(ast_statement([BrainLove::AST::DecrementByte.new])) }
+    it { should transform('.').to(ast_statement([BrainLove::AST::OutputByte.new])) }
+    it { should transform(',').to(ast_statement([BrainLove::AST::InputByte.new])) }
   end
 
   describe 'loop' do
-    it { should transform('[]').to(ast_statement([ast_statement([BrainLove::AST::Loop.new()])])) }
+    it { should transform('[]').to(ast_statement([BrainLove::AST::Loop.new(ast_statement([]))])) }
   end
 
   describe 'commands and loop' do
     it do
       should transform(',[.,]').to(
         ast_statement([
-          ast_statement([
-            BrainLove::AST::InputByte.new
-          ]),
-          ast_statement([
-            BrainLove::AST::Loop.new(
-              ast_statement([
-                BrainLove::AST::OutputByte.new,
-                BrainLove::AST::InputByte.new
-              ])
-            )
-          ])
+          BrainLove::AST::InputByte.new,
+          BrainLove::AST::Loop.new(
+            ast_statement([
+              BrainLove::AST::OutputByte.new,
+              BrainLove::AST::InputByte.new
+            ])
+          )
+        ])
+      )
+    end
+  end
+
+  describe 'comments' do
+    it { should transform('[should not change ast]').to(ast_statement([BrainLove::AST::Loop.new(ast_statement([]))])) }
+
+    it do
+      should transform(",\n[\n.\n,\n]").to(
+        ast_statement([
+          BrainLove::AST::InputByte.new,
+          BrainLove::AST::Loop.new(
+            ast_statement([
+              BrainLove::AST::OutputByte.new,
+              BrainLove::AST::InputByte.new
+            ])
+          )
         ])
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brain_love
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: