nil 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# 1.0.2
+- Fix bug where instructions were interpreted out of order
+
+# 1.0.1
+- Add executable for compiling/interpreting code
+
+# 1.0
+- Initial working release

data/lib/nil/interpreter.rb

@@ -6,21 +6,7 @@ module Nil
       eval(@compiled_ruby)
     end
 
-    def handle_non_multi_command(char)
-      case char
-      when '['
-        "while stack[sp] != 0\n"
-      when ']'
-        "end\n"
-      when '.'
-        "puts stack[sp]\n"
-      when ','
-        "stack[sp] = gets[0]\n"
-      end
-    end
-
-    def handle_multi_command(command)
-      count = command.length
+    def handle_command(command, count)
       case command[0]
       when '+'
         "stack[sp] += #{count}\n"
@@ -30,6 +16,14 @@ module Nil
         "sp += #{count}\n"
       when '<'
         "sp -= #{count}\n"
+      when '['
+        "while stack[sp] != 0\n"
+      when ']'
+        "end\n"
+      when '.'
+        "puts stack[sp]\n"
+      when ','
+        "stack[sp] = gets[0]\n"
       end
     end
 
@@ -45,17 +39,14 @@ RB
         end
       end
 
-      while code != ""
-        multi_command = code.match(/([><\-\+])(\1*)/)
+      commands = code.scan( /((.)\2*)/ ).collect { |match| match.first }
 
-        if multi_command == nil
-          ruby = handle_non_multi_command(code[0])
-          @compiled_ruby << ruby
-          code[0] = ""
-        else
-          @compiled_ruby << handle_multi_command(multi_command.to_s)
-          code.sub!(multi_command.to_s, "")
-        end
+      commands.each_index do |i|
+        commands[i] = [commands[i], commands[i].length]
+      end
+
+      commands.each do |c|
+        @compiled_ruby << handle_command(c[0], c[1])
       end
       @compiled_ruby
     end

data/lib/nil/macro.rb

@@ -7,8 +7,6 @@ module Nil
     end
 
     def compile_subroutines(code)
-      # TODO: Throw an error when trying to define a subroutine that calls
-      # itself.
       subroutines = {}
       sub_def_regex = Regexp.new ':(?<sub-name>[a-zA-Z0-9_]+)\{(?<sub-code>[><\-\+.,A-Za-z0-9:]+)\}'
       sub_call_regex = Regexp.new '([a-zA-Z0-9_]+):'

data/lib/nil/version.rb

@@ -1,3 +1,3 @@
 module Nil
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/nil_test.rb

@@ -1,18 +1,18 @@
 require 'nil'
 require 'riot'
 
-Riot.pretty_dots
+# Riot.pretty_dots
 
 BOILERPLATE = <<RB
 sp = 0
-stack = Array.new 10_000
+stack = [0] * 10_000
 RB
 
 context "Interpreter" do
   setup { Nil::Interpreter.new }
   asserts("invalid characters in code cause failure") { topic.compile "a++" }.raises SyntaxError
   asserts("creates boilerplate code") { topic.compiled_ruby == BOILERPLATE }
-  asserts("handles .") { topic.compile('.') == (BOILERPLATE + "print stack[sp]\n") }
+  asserts("handles .") { topic.compile('.') == (BOILERPLATE + "puts stack[sp]\n") }
   asserts("handles ,") { topic.compile(',') == (BOILERPLATE + "stack[sp] = gets[0]\n") }
   asserts("handles >") { topic.compile('>') == (BOILERPLATE + "sp += 1\n") }
   asserts("handles <") { topic.compile('<') == (BOILERPLATE + "sp -= 1\n") }
@@ -20,6 +20,7 @@ context "Interpreter" do
   asserts("handles -") { topic.compile('-') == (BOILERPLATE + "stack[sp] -= 1\n") }
   asserts("handles [") { topic.compile('[') == (BOILERPLATE + "while stack[sp] != 0\n" ) }
   asserts("handles ]") { topic.compile(']') == (BOILERPLATE + "end\n" ) }
+
   asserts("handles multiple operators smartly") do
     code = topic.compile "++++---->>>><<<<"
     code == BOILERPLATE + <<CODE
@@ -27,6 +28,18 @@ stack[sp] += 4
 stack[sp] -= 4
 sp += 4
 sp -= 4
+CODE
+  end
+
+  asserts("handles multiple printing statements") do
+    code = "++++.>+++."
+    code = topic.compile(code)
+    code == BOILERPLATE + <<CODE
+stack[sp] += 4
+puts stack[sp]
+sp += 1
+stack[sp] += 3
+puts stack[sp]
 CODE
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nil
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies: []
 description: A brain**** macro language and interpreter
 email:
@@ -21,6 +21,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md