fish.rb 1.0.0 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjA2MGU2ZDJlODdkMmMyMjY4NzUxMTQ0ZGU2YzIwYTY1ODNiNzdmNg==
+    MjhkODdkZWVjMjFlODExNGZiNmQ4Yjk4NzFkNmQ1N2I0NmNhZWI5Mw==
   data.tar.gz: !binary |-
-    M2M3MTYyYWY0MDkyZjA4YzU1MWYwNzM3NzJiY2NmYjRlZTk2ZmQ4Nw==
+    MzNlMWE0MGQzZGQzZWQ1OTg3MWRkODczYjM1MzM0MGViNTg4ZmVjMg==
 SHA512:
   metadata.gz: !binary |-
-    NjFiMjE3ZGNlMGViMzRiNGZmNGY1ZWIwYmI0M2ViNjg2NGZmZjE1OWI2N2Zm
-    Y2Q3NjA2N2UxYmU1YTdmMmIwZDEyYzQyMTFhZGM0NjY5YTk3ZjVlYjg2MTk4
-    OTMzZjA0NmExY2ZjYTY4YTNlNjRiNjljZTY0OTkwMzlhNDM0Nzg=
+    ZmZiYWZlMGEzNDNhNWQxM2QxMmEzMmZkMDIxZTQyYTEzZDE4MzVhNmYzMWYw
+    ZTQyZTM4YzZlMjY2YjNlZDNlYjk1M2MzNzA4MDkwMzY2M2U3M2ZjYmNmZjMw
+    N2NkOTY1MDBhM2JmZTAxMjU3NGU3NWNjZjc0NTMzZGFjZTdhMDc=
   data.tar.gz: !binary |-
-    YWI3NzgxYzI1Mzk4ZDhiOTBhZTI5ODFkMjNmY2Y4MThlYWQ3NDlhMGQ5NDIw
-    NTIzZDk2MmU1NmU4NTJlY2I5OGE1NDk1M2NlMjU3Zjc3MTdlYWM2MjQxMWI4
-    YzI3NDcyODNkNjcwY2VjNmMzOTA3N2M2ODg0ZGU5OGMwMjA2YmY=
+    MWRhZGVhOTJhOGM5YTJkZGE2NWZkZDI3ODBkZDdkNjc3ZWU1MDdhZjhjOGE0
+    Yzg4MjdjOGZjNzJlYTRmODgzZjg5YzQzZTE3NWNiMzg0ZjYzYTAwNzA3NWM2
+    YWMzZDAxYmI2ZTcxMzcxNDE2MDg2MmE0MmI4MGE4ZTJiMTdiNTk=

data/README.md

@@ -3,8 +3,14 @@ fish.rb
 
 A [fish](http://esolangs.org/wiki/Fish) interpreter in ruby.
 
+    gem install fish.rb
+
 There is a slew of examples in the examples directory.
 
+Usage
+-----
+
+
 Todo
 ----
 

data/Rakefile

@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |gem|
     gem.summary      = "A fish interpreter"
     gem.description  = "Ruby fish interpreter for the newer multi-stack version of fish"
     
-    gem.files        = `git ls-files`.split($\)
+    gem.files        = `git ls-files | grep -v examples`.split($\)
     
     gem.bindir       = "./"
     gem.executables  = ["fish.rb"]

data/fish.rb

@@ -55,7 +55,7 @@ class Stack
         @data = data
         
         def self.pop cnt
-            if cnt > @data.length; abort 'something smells fishy... (stack error)' end
+            if cnt > @data.length; abort "\nsomething smells fishy... (stack error)" end
             @data.pop cnt
         end
         
@@ -64,18 +64,19 @@ class Stack
         
         @reg = nil
         def self.reg
-            if @reg.is_nil?
-                @reg = self.pop 1
+            if @reg.nil?
+                @reg = (self.pop 1)[0]
             else
                 self.push @reg
                 @reg = nil
-                ret
             end
         end
     end
 end # class Stack
 
 class Interpreter
+    def self.set_stdout file; @@stdout = file end
+    
     @@prng = Random.new
     @@stdout = $stdout
     
@@ -88,7 +89,7 @@ class Interpreter
     }    
     
     @@div_chk = lambda do |d|
-        abort 'something smells fishy... (division by zero)' unless d != 0
+        abort "\nsomething smells fishy... (division by zero)" unless d != 0
     end
     
     @@ops = {
@@ -118,16 +119,16 @@ class Interpreter
         '~' => lambda { |pt, dir, stks, box, cntl| stks[-1].pop 1 },
         '$' => lambda { |pt, dir, stks, box, cntl| x, y = stks[-1].pop 2; stks[-1].push y; stks[-1].push x },
         '@' => lambda { |pt, dir, stks, box, cntl| x, y, z = stks[-1].pop 3; stks[-1].push z; stks[-1].push x; stks[-1].push y },
-        '}' => lambda { |pt, dir, stks, box, cntl| stks[-1].data.rotate! 1 },
-        '{' => lambda { |pt, dir, stks, box, cntl| stks[-1].data.rotate! -1 },
+        '{' => lambda { |pt, dir, stks, box, cntl| stks[-1].data.rotate! 1 },
+        '}' => lambda { |pt, dir, stks, box, cntl| stks[-1].data.rotate! -1 },
         'r' => lambda { |pt, dir, stks, box, cntl| stks[-1].data.reverse! },
         'l' => lambda { |pt, dir, stks, box, cntl| stks[-1].push stks[-1].data.length },
-        '[' => lambda { |pt, dir, stks, box, cntl| stks << (Stack.new stks[-1].pop stks[-1].pop 1) },
-        ']' => lambda { |pt, dir, stks, box, cntl| stks[-1].data.concat stks.pop.data },
+        '[' => lambda { |pt, dir, stks, box, cntl| stks << (Stack.new stks[-1].pop (stks[-1].pop 1)[0]) },
+        ']' => lambda { |pt, dir, stks, box, cntl| stks[-2].data.concat stks.pop.data },
         # io
         'o' => lambda { |pt, dir, stks, box, cntl| @@stdout.write (stks[-1].pop 1)[0].round.chr },
         'n' => lambda { |pt, dir, stks, box, cntl| @@stdout.write (stks[-1].pop 1)[0].to_s },
-        'i' => lambda { |pt, dir, stks, box, cntl| stks[-1].push (cntl[:ibuf].empty? ? -1 : cntl[:ibuf][0].ord); cntl[:ibuf] = cntl[:ibuf][1..-1] unless cntl[:ibuf].length < 2 },
+        'i' => lambda { |pt, dir, stks, box, cntl| stks[-1].push (cntl[:ibuf].empty? ? -1 : cntl[:ibuf][0].ord); cntl[:ibuf] = cntl[:ibuf][1..-1] unless cntl[:ibuf].length < 1 },
         # reflection
         'g' => lambda { |pt, dir, stks, box, cntl| stks[-1].push (box.at stks[-1].pop 2).ord },
         'p' => lambda { |pt, dir, stks, box, cntl| box.set (stks[-1].pop 2), (stks[-1].pop 1) },
@@ -155,7 +156,7 @@ class Interpreter
         @pt = [0, 0]
         @dir = 'r'
         @stks = []
-        @stks << (Stack.new [])
+        @stks << (Stack.new options[:stack])
         @cntl = {
             :ibuf => options[:stdin],
             :done => false,
@@ -167,28 +168,36 @@ class Interpreter
             op = ' ' if op.nil?
             if options[:debug] >= 3; puts op end
             func = @@ops[op]
-            abort 'something smells fishy... (invalid instruction)' if func.nil?
+            abort "\nsomething smells fishy... (invalid instruction)" if func.nil?
             func.call @pt, @dir, @stks, @box, @cntl
             op = @box.send @dir, @pt
         end
+        @@stdout.flush
     end
 end # class Interpreter
 
+banner = "usage: fish <options> <files>"
 
 options = {}
 optparse = OptionParser.new do |opts|
-    opts.banner = "fish.rb <options> <files>"
+    opts.banner = banner
     
     opts.on '-h', '--help', 'Display help' do; puts opts; exit end
     options[:debug] = 0
-    opts.on '-d [level]', '--debug [level]', 'Print debug messages (max of 3, defaults to 1)' do |opt|
+    opts.on '-d <level>', '--debug <level>', 'Print debug messages (max of 3, defaults to 1)' do |opt|
         options[:debug] = opt.to_i || options[:debug] = 1
     end
     options[:stdin] = ""
-    opts.on '-s str', '--stdin str', 'Stdin for fish script' do |opt|; options[:stdin] = opt end
-    opts.on '-r file', '--redir-stdout file', 'Redirect fish stdout to file' do |opt|
-        options[:stdout] = File.open opt, 'w'
+    opts.on '-s <input>', '--stdin <input>', 'Stdin for fish script' do |opt|; options[:stdin] = opt end
+    opts.on '-r <file>', '--redir-stdout <file>', 'Redirect fish stdout to file (useful when debuging)' do |opt|
+        Interpreter.set_stdout (File.open opt, 'w')
+    end
+    options[:stack] = []
+    opts.on '-v <vector>', '--vector <vector>', Array, 'Inital stack vector' do |opt|
+        options[:stack] = opt.collect { |x| x.to_i }
     end
 end.parse!
 
-Interpreter.new (IO.readlines ARGV.shift), options
+puts banner if ARGV.empty?
+
+ARGV.each { |fish| Interpreter.new (IO.readlines fish), options }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fish.rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - ! 'floomby
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: ./
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies: []
 description: Ruby fish interpreter for the newer multi-stack version of fish
 email: ! 'floomby@nmt.edu
@@ -25,9 +25,6 @@ files:
 - .gitignore
 - README.md
 - Rakefile
-- examples/fibonacci.fsh
-- examples/hello.fsh
-- examples/quine.fsh
 - fish.rb
 homepage: https://github.com/zerocool/fish.rb
 licenses: []

data/examples/fibonacci.fsh

@@ -1,2 +0,0 @@
-0:n84*o1:nv
- n:+@:o*48<

data/examples/hello.fsh

@@ -1,2 +0,0 @@
-!v"hello, world"r!
- >l?!;o

data/examples/quine.fsh

@@ -1 +0,0 @@
-"ar00g!;oooooooooo|