befunge98 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01e0f95f403d53d6741cd5490d880b94e64a5f92
-  data.tar.gz: 43de87a5d275630c9f1616ce66e0ac336866660a
+  metadata.gz: 820a474f794f67a9cbbacea6b3142d41bdc86783
+  data.tar.gz: fcfbaaf5cc90ad71f8cd6284ef7664091b9e68da
 SHA512:
-  metadata.gz: 2f889c5f8c5e79f34effd2b81ffe1a2ce6b25e8c6b7b520dbae380a08e7e5c01fdce6cff813fa1033d2263cfe390c9f717b0cb6ce000b370021d81813f97646b
-  data.tar.gz: 0d5ddb8725d2203f18fafe2cc4f0fcfac044e681b0f69abc4871e8adb4b3f9332193620f03b037983681ab3281e3f84048008bb991d77ad82127d65dd529c496
+  metadata.gz: 751e2be52b36af30dcf99bb8c199f29c28150a9eff24d431aa19afc79f3dd01dfbdaa6464c03f179bffc20f5327c09400535d2c6c20ad77554665ce3175dd501
+  data.tar.gz: 4e9818eda68e4d969a6ac73d8d48207b48504f5c543e543acc67ac25806eed7a794dc187f9fa94bc344fe40ac90f3ab25d50569d7fb2dd842a799a90b58bd899

data/befunge98.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "befunge98"
-  spec.version      = "0.0.1"
+  spec.version      = "0.0.2"
   spec.summary      = "[WIP] Probably the first Befunge-98 interpreter in Ruby"
 
   spec.author       = "Victor Maslov aka Nakilon"

data/bin/befunge98

@@ -6,4 +6,4 @@ end
 
   require_relative "../lib/befunge98"
 
-  exit Befunge98(File.read(ARGV.first), STDOUT).exitcode
+  exit Befunge98(ARGF.read, STDOUT).exitcode

data/lib/befunge98.rb

@@ -18,24 +18,24 @@ def Befunge98 source, stdout = StringIO.new, stdin = STDIN
   move = lambda do
     y, x = y + dy, x + dx
     next if sy + oy + y >= 0 && code[sy + oy + y] && sx + ox + x >= 0 && code[sy + oy + y][sx + ox + x]
-    top    = code. index{ |l| !(l - [32, nil]).empty? }
-    bottom = code.rindex{ |l| !(l - [32, nil]).empty? }
-    left  = code.map{ |l| l. index{ |c| c && c != 32 } }.compact.min
-    right = code.map{ |l| l.rindex{ |c| c && c != 32 } }.compact.max
-    STDERR.puts [code, top..bottom, left..right, [y, x], [dy, dx]].inspect if ENV["DEBUG"]
+    top    = code. index{ |l| l.any?{ |i| i && i != 32 } }
+    bottom = code.rindex{ |l| l.any?{ |i| i && i != 32 } }
+    left  = code.map{ |l| l && l. index{ |c| c && c != 32 } }.compact.min
+    right = code.map{ |l| l && l.rindex{ |c| c && c != 32 } }.compact.max
+    STDERR.puts [top..bottom, left..right, [y, x], [dy, dx], code].inspect if ENV["DEBUG"]
     ty, tx = y, x
     next if loop do
       zy, zx = sy + oy + ty, sx + ox + tx
-      break unless (top..bottom).include?(zy) && (left..right).include?(zx)
+      break unless top <= zy && zy <= bottom && left <= zx && zx <= right
       break true if code[zy] && code[zy][zx] && code[zy][zx] != 32
       ty, tx = ty + dy, tx + dx
     end
     ty, tx = y - dy, x - dx
     loop do
-      STDERR.puts [ty, tx].inspect if ENV["DEBUG"]
       zy, zx = sy + oy + ty, sx + ox + tx
-      break unless (top..bottom).include?(zy) && (left..right).include?(zx)
-      y, x = ty, tx if code[zy] && code[zy][zx] && code[zy][zx] != 32
+      break if dy > 0 && zy <  top || dy < 0 && zy > bottom ||
+               dx > 0 && zx < left || dx < 0 && zx > right
+      y, x = ty, tx if code[zy] && code[zy][zx] && code[zy][zx] != 32   # TODO: should this execute if it's in a 'hole'?
       ty, tx = ty - dy, tx - dx
     end
   end
@@ -47,13 +47,13 @@ def Befunge98 source, stdout = StringIO.new, stdin = STDIN
   loop do
     if iterate.zero?
       move[]
-      char = get[]
     else
       iterate -= 1
     end
+    char = get[]
     STDERR.puts [[y, x], char.chr, stack].inspect if ENV["DEBUG"]
 
-    next stack << char if stringmode && char.chr != ?"
+    next stack << char if stringmode && char.chr != ?"  # TODO: "SGML-style"
     next unless (33..126).include? char
     next if jump_over && char.chr != ?;
     case char.chr
@@ -123,7 +123,7 @@ def Befunge98 source, stdout = StringIO.new, stdin = STDIN
         code[sy + oy + y][sx + ox + x] = pop[]
       when ?[ ; dy, dx = ds[(ds.index([dy, dx]) - 1) % 4]
       when ?] ; dy, dx = ds[(ds.index([dy, dx]) + 1) % 4]
-      when ?w ; dy, dx = ds[(ds.index([dy, dx]) + (pop[] > pop[] ? -1 : 1)) % 4]
+      when ?w ; dy, dx = ds[(ds.index([dy, dx]) - (pop[] <=> pop[])) % 4]
       when ?r ; reflect[]
       when ?x ; dy, dx = [pop[], pop[]]
       when ?j
@@ -131,14 +131,14 @@ def Befunge98 source, stdout = StringIO.new, stdin = STDIN
           t.times{ move[] }
         else
           reflect[]
-          t.times{ move[] }
+          (-t).times{ move[] }
           reflect[]
         end
       when ?k
         iterate = pop[]
-        fail if char != 32 || char.chr != ?;
         move[]
         char = get[]
+        fail if char == 32 || char == ?;.ord
       when ?{
         toss = if 0 > n = pop[]
           stack.concat [0] * -n
@@ -150,7 +150,7 @@ def Befunge98 source, stdout = StringIO.new, stdin = STDIN
         ox += x + dx
         oy += y + dy
         stacks << stack = toss
-      when ?{
+      when ?}
         if 1 == stacks.size
           reflect[]
         elsif 0 > n = pop[]

data/test.rb

@@ -121,6 +121,33 @@ describe "lib" do
         assert_equal 0, Befunge98(?@).exitcode
       end
 
+      it "n" do
+        assert_equal [], Befunge98("1n@", StringIO.new, StringIO.new).stack
+      end
+      it "'" do
+        assert_equal "'@".bytes, Befunge98("'''@@").stack
+      end
+      it "s with 1 and \"" do
+        assert_equal "@1s\1s\0".bytes, Befunge98("1ssss\"@").stack
+      end
+      it "j" do
+        assert_equal [9], Befunge98("2j789@").stack
+      end
+      it "j with -" do
+        assert_equal [2, 3], Befunge98("6-j123@").stack
+      end
+      it "w with 123, # and ." do
+        assert_equal "1 2 3 ", Befunge98( (
+        <<~HEREDOC
+          \#@w1.21\#@w3.@
+            @      2
+                   .
+                   1
+                   #
+                   @
+        HEREDOC
+        ), StringIO.new).stdout.string
+      end
       it "~" do
         assert_equal [2], Befunge98("~1@2", StringIO.new, StringIO.new).stack
         assert_equal [0, 10, 255, 0], Befunge98("~~~~@", StringIO.new,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: befunge98
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest