nil 1.0.8 → 1.0.9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.9
+- Bug fixes
+
 # 1.0.8
 - Make ASCII mode not output newline by default
 

data/TODO.md

@@ -1,3 +1,7 @@
 # Future Features
 
 - Passing parameters to macros.
+
+# Bugs
+
+- Input doesn't work

data/lib/nil/interpreter.rb

@@ -29,17 +29,33 @@ module Nil
       when '<'
         "sp -= #{count}\n"
       when '['
-        "while stack[sp] != 0\n"
+        s = ""
+        count.times do
+          s << "while stack[sp] != 0\n"
+        end
+        s
       when ']'
-        "end\n"
+        s = ""
+        count.times do
+          s << "end\n"
+        end
+        s
       when '.'
-        if @@mode == 'num'
-          "puts stack[sp]\n"
-        else
-          "print stack[sp].chr\n"
+        s = ""
+        count.times do
+          if @@mode == 'num'
+            s << "puts stack[sp]\n"
+          else
+            s << "print stack[sp].chr\n"
+          end
         end
+        s
       when ','
-        "stack[sp] = gets[0]\n"
+        s = ""
+        count.times do
+          s << "stack[sp] = gets[0]\n"
+        end
+        s
       end
     end
 

data/lib/nil/macro.rb

@@ -60,6 +60,8 @@ module Nil
 
       compiled_code = interpret_mode_definition(compiled_code)
 
+      Nil::Interpreter.mode = @mode
+
       compiled_code = expand_included_files(compiled_code)
 
       compiled_code = strip_comments(compiled_code)

data/lib/nil/version.rb

@@ -1,3 +1,3 @@
 module Nil
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/test/nil_test.rb

@@ -11,20 +11,28 @@ RB
 context "Interpreter" do
   setup { Nil::Interpreter.new }
 
-  asserts("invalid characters in code cause failure") { topic.compile "a++", 'num' }.raises SyntaxError
+  context "General code generation" do
+    asserts("invalid characters in code cause failure") { topic.compile "a++", 'num' }.raises SyntaxError
 
-  asserts("creates boilerplate code") { topic.compiled_ruby == BOILERPLATE }
+    asserts("creates boilerplate code") { topic.compiled_ruby == BOILERPLATE }
+  end
 
-  asserts("handles . in numerical mode") { topic.compile('.', 'num') == (BOILERPLATE + "puts stack[sp]\n") }
-  asserts("handles . in ascii mode") { topic.compile('.', 'ascii') == (BOILERPLATE + "puts stack[sp].chr\n") }
-  asserts("handles ,") { topic.compile(',', 'num') == (BOILERPLATE + "stack[sp] = gets[0]\n") }
-  asserts("handles >") { topic.compile('>', 'num') == (BOILERPLATE + "sp += 1\n") }
-  asserts("handles <") { topic.compile('<', 'num') == (BOILERPLATE + "sp -= 1\n") }
-  asserts("handles +") { topic.compile('+', 'num') == (BOILERPLATE + "stack[sp] += 1\n") }
-  asserts("handles -") { topic.compile('-', 'num') == (BOILERPLATE + "stack[sp] -= 1\n") }
-  asserts("handles [") { topic.compile('[', 'num') == (BOILERPLATE + "while stack[sp] != 0\n" ) }
-  asserts("handles ]") { topic.compile(']', 'num') == (BOILERPLATE + "end\n" ) }
+  context "Modes" do
+    asserts("handles . in numerical mode") { topic.compile('.', 'num') == (BOILERPLATE + "puts stack[sp]\n") }
+    asserts("handles . in ascii mode") { topic.compile('.', 'ascii') == (BOILERPLATE + "print stack[sp].chr\n") }
+  end
 
+  context "General operator handling" do
+    asserts("handles ,") { topic.compile(',', 'num') == (BOILERPLATE + "stack[sp] = gets[0]\n") }
+    asserts("handles >") { topic.compile('>', 'num') == (BOILERPLATE + "sp += 1\n") }
+    asserts("handles <") { topic.compile('<', 'num') == (BOILERPLATE + "sp -= 1\n") }
+    asserts("handles +") { topic.compile('+', 'num') == (BOILERPLATE + "stack[sp] += 1\n") }
+    asserts("handles -") { topic.compile('-', 'num') == (BOILERPLATE + "stack[sp] -= 1\n") }
+    asserts("handles [") { topic.compile('[', 'num') == (BOILERPLATE + "while stack[sp] != 0\n" ) }
+    asserts("handles ]") { topic.compile(']', 'num') == (BOILERPLATE + "end\n" ) }
+  end
+
+  context "Advanced operator handling" do
   asserts("handles multiple operators smartly") do
     code = topic.compile "++++---->>>><<<<", 'num'
     code == BOILERPLATE + <<CODE
@@ -46,12 +54,15 @@ stack[sp] += 3
 puts stack[sp]
 CODE
   end
+end
 
-  denies("error raised when brackets are inside subroutines") do
-    code = ":sub{+++[-]}sub:"
-    code = (Nil::MacroParser.new).parse code
-    topic.compile(code)
-  end.raises SyntaxError
+  context "Bug testing" do
+    denies("error raised when brackets are inside subroutines") do
+      code = ":sub{+++[-]}sub:"
+      code = (Nil::MacroParser.new).parse code
+      topic.compile(code)
+    end.raises SyntaxError
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nil
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A macro language/interpreter for brain****