nil 1.0.4 → 1.0.5

data/README.md

@@ -1,6 +1,6 @@
 # nil
 
-nil is a brain**** language macro language and interpreter. ## Installation
+nil is a brain**** language macro language and interpreter.
 
 ## Macro language
 
@@ -43,6 +43,17 @@ looking like such are comments:
 
 Comments *must* include both semicolons.
 
+### Modes
+
+The original brain**** specification calls for buffers to be output as ASCII
+text. However, sometimes outputting numbers is more useful. Nil allows modes to
+be set. In the nil code, the line:
+
+    .mode(mode)
+
+Will be used to set the mode. The `mode` can either be `num` or `ascii`. The
+default mode is `ascii`.
+
 ## Interpreter
 
 nil is also a brain**** interpreter. It does the interpreting in its own special
@@ -97,7 +108,7 @@ interpreter.compile code
 interpreter.run
 ```
 
-Executable coming soon!
+Run `nil -h` for command line tool usage.
 
 ## Contributing
 

data/TODO.md

@@ -1,7 +1,3 @@
 # 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/interpreter.rb

@@ -2,10 +2,22 @@ module Nil
   class Interpreter
     attr_reader :compiled_ruby
 
+    def self.mode=(x)
+      @@mode = x
+    end
+
+    def self.mode
+      @@mode
+    end
+
     def run
       eval(@compiled_ruby)
     end
 
+    def initialize
+      @@mode = 'ascii'
+    end
+
     def handle_command(command, count)
       case command[0]
       when '+'
@@ -21,13 +33,18 @@ module Nil
       when ']'
         "end\n"
       when '.'
-        "puts stack[sp]\n"
+        if @@mode == 'num'
+          "puts stack[sp]\n"
+        else
+          "puts stack[sp].chr\n"
+        end
       when ','
         "stack[sp] = gets[0]\n"
       end
     end
 
-    def compile(code)
+    def compile(code, mode)
+      @@mode = mode
       @compiled_ruby = <<RB
 sp = 0
 stack = [0] * 10_000

data/lib/nil/macro.rb

@@ -1,9 +1,8 @@
 module Nil
   class MacroParser
-    attr_accessor :original_code, :compiled_code
+    attr_accessor :original_code, :compiled_code, :mode
 
     def initialize
-      # This method intentionally left blank.
     end
 
     def compile_subroutines(code)
@@ -27,6 +26,13 @@ module Nil
       code.gsub(sub_def_regex, '')
     end
 
+    def interpret_mode_definition(code)
+      code.match /\.mode\((ascii|num)\)/i do |m|
+        $1 == 'num' ? Nil::Interpreter.mode = 'num' : Nil::Interpreter.mode = 'ascii'
+      end
+      code.gsub(/\.mode\((ascii|num)\)/i, '')
+    end
+
     def expand_included_files(code)
       c = code
       include_regex = Regexp.new '\.include\(([^\)]+)\)'
@@ -51,6 +57,8 @@ module Nil
 
       compiled_code.gsub!(/\s/, '')
 
+      compiled_code = interpret_mode_definition(compiled_code)
+
       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.4"
+  VERSION = "1.0.5"
 end

data/test/nil_test.rb

@@ -1,7 +1,7 @@
 require 'nil'
 require 'riot'
 
-# Riot.pretty_dots
+Riot.pretty_dots
 
 BOILERPLATE = <<RB
 sp = 0
@@ -10,19 +10,23 @@ RB
 
 context "Interpreter" do
   setup { Nil::Interpreter.new }
-  asserts("invalid characters in code cause failure") { topic.compile "a++" }.raises SyntaxError
+
+  asserts("invalid characters in code cause failure") { topic.compile "a++", 'num' }.raises SyntaxError
+
   asserts("creates boilerplate code") { topic.compiled_ruby == BOILERPLATE }
-  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") }
-  asserts("handles +") { topic.compile('+') == (BOILERPLATE + "stack[sp] += 1\n") }
-  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 . 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" ) }
 
   asserts("handles multiple operators smartly") do
-    code = topic.compile "++++---->>>><<<<"
+    code = topic.compile "++++---->>>><<<<", 'num'
     code == BOILERPLATE + <<CODE
 stack[sp] += 4
 stack[sp] -= 4
@@ -33,7 +37,7 @@ CODE
 
   asserts("handles multiple printing statements") do
     code = "++++.>+++."
-    code = topic.compile(code)
+    code = topic.compile(code, 'num')
     code == BOILERPLATE + <<CODE
 stack[sp] += 4
 puts stack[sp]
@@ -71,6 +75,26 @@ context "MacroParser" do
     end
   end
 
+  context "Modes" do
+    asserts("that numerical mode is correctly set") do
+      code = ".mode(num)"
+      compiled = topic.parse code
+      Nil::Interpreter.mode == 'num'
+    end
+
+    asserts("that ascii mode is correctly set") do
+      code = ".mode(ascii)"
+      compiled = topic.parse code
+      Nil::Interpreter.mode == 'ascii'
+    end
+
+    asserts("that ascii mode is set by default") do
+      code = "+"
+      compiled = topic.parse code
+      Nil::Interpreter.mode == 'ascii'
+    end
+  end
+
   context "Subroutines" do
     asserts("that subroutines are expanded") do
       code = ":test{++--><}++test:"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nil
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop