Merge pull request #86 from DJMcMayhem/master

Merge for Release 1.5.2

ClassicInterpreter.rb

@@ -6,6 +6,11 @@
 
 class ClassicInterpreter < Interpreter
 
+  def initialize(source, left_in, right_in, debug, max_cycles, ascii_mode)
+    super(source, left_in, right_in, debug, max_cycles)
+    @ascii_mode = ascii_mode
+  end
+
   # Nilads ~~~~~~~~~~~~~~~~~~~~~
 
   def round_nilad()
@@ -60,7 +65,11 @@ def close_round()
 
   def close_square()
     data = main_stack.pop()
-    puts @current_value
+    if @ascii_mode
+      print (@current_value % 2 ** 32).chr(Encoding::UTF_8)
+    else
+      puts @current_value
+     end
     @current_value += data[1]
   end
 

Interpreter.rb

@@ -26,12 +26,16 @@ class Interpreter
   def initialize(source, left_in, right_in, debug, max_cycles)
     # Strip comments
     source = source.gsub(/(^[^#]*)#.*(\n|$)/, '\1')
-    # Strips the source of any characters that aren't brackets or part of debug flags
-    @source = source.gsub(/(?<=^|[()\[\]<>{}]|\s)[^@()\[\]<>{}\s]*/, "")
-    # Strips extra whitespace
-    @source = @source.gsub(/\s/,"")
-    # Strips extra @s
-    @source = @source.gsub(/@+(?=[()\[\]<>{}]|$)/, "")
+    # Strips the source of any characters that aren't brackets (or part of debug flags in debug mode)
+    if debug then
+      @source = source.gsub(/(?<=^|[()\[\]<>{}]|\s)[^@()\[\]<>{}\s]*/, "")
+      # Strips extra whitespace
+      @source = @source.gsub(/\s/,"")
+      # Strips extra @s
+      @source = @source.gsub(/@+(?=[()\[\]<>{}]|$)/, "")
+    else
+      @source = source.gsub(/[^()\[\]<>{}]*/, "")
+    end
     @left = Stack.new('Left')
     @right = Stack.new('Right')
     @main_stack = []

brain_flak.rb

@@ -171,9 +171,9 @@
   when "brainflak"
     interpreter = BrainFlakInterpreter.new(source, numbers, [], debug, max_cycles)
   when "classic"
-    interpreter = ClassicInterpreter.new(source, numbers, [], debug, max_cycles)
+    interpreter = ClassicInterpreter.new(source, numbers, [], debug, max_cycles, ascii_out)
   when "miniflak", "mini"
-    source = source.gsub(/#.*\n/,"").gsub(/[^\[\]{}()]/,"") # Parsing is done here so that we can strip `[]` properly
+    source = source.gsub(/#.*(\n|$)/,"").gsub(/[^\[\]{}()]/,"") # Parsing is done here so that we can strip `[]` properly
     while source =~ /\[\]/
       source = source.gsub("[]","")
     end