nil 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.4
+- Fix bug with brackets in subroutines
+
 # 1.0.3
 - Add `-c` option to executable to print the compiled Ruby code
 

data/TODO.md

@@ -0,0 +1,7 @@
+# Future Features
+
+- Passing parameters to macros.
+
+# Issues
+- The `[` and `]` characters cause the interpreter to fail hard when used inside
+  a macro, the interpreter believing that they are invalid characters

data/lib/nil/macro.rb

@@ -8,7 +8,7 @@ module Nil
 
     def compile_subroutines(code)
       subroutines = {}
-      sub_def_regex = Regexp.new ':(?<sub-name>[a-zA-Z0-9_]+)\{(?<sub-code>[><\-\+.,A-Za-z0-9:]+)\}'
+      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_]+):'
       code.scan(sub_def_regex).map do |sub|
         subroutines[sub[0]] = sub[1]

data/lib/nil/version.rb

@@ -1,3 +1,3 @@
 module Nil
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/nil_test.rb

@@ -42,6 +42,13 @@ stack[sp] += 3
 puts stack[sp]
 CODE
   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
+
 end
 
 context "MacroParser" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nil
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -42,6 +42,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/nil
 - lib/nil.rb
 - lib/nil/interpreter.rb