spitewaste 0.1.004 → 0.1.009

data/lib/spitewaste/libspw/util.spw

@@ -4,18 +4,44 @@ import stack  ; to_a
 import string ; charat, strcat, strindex, strlen
 
 ; inserts between the top two stack values the intervening consecutive elements
-; ! TODO: Support step, and negative as well.
-; [I J] => [I I+1 ... J]
+; supports counting up or down
+; [I J] => [I I±1 ... J]
 ;
 ; [2 5] => [2 3 4 5]
+; [5 2] => [5 4 3 2]
 ; [0 4] => [0 1 2 3 4]
+; [4 0] => [4 3 2 1 0]
 ; [-2 0] => [-2 -1 0]
+; [0 -2] => [0 -1 -2]
 ; [-3 3] => [-3 -2 -1 0 1 2 3]
+; [3 -3] => [3 2 1 0 -1 -2 -3]
 ; [4 4] => [4 5] TODO: bug
-range:
+range: dup copy 2 sub jn _range_down
   copy 1 push 1 add swap
-  copy 1 copy 1 sub jn range
-  pop ret
+  copy 1 copy 1 sub jn range pop ret
+_range_down:
+  copy 1 push 1 sub swap
+  dup copy 2 sub jn _range_down pop ret
+
+$range_loop(fn, cmp) {
+`fn`:
+  copy 1 copy 1 add swap dup
+  copy 2 add push -1 load `cmp` jz `fn` pop ret
+}
+
+; inserts between the top two stack values the intervening consecutive elements,
+; counting by `step` up/down to (but never beyond) J
+; [I J S] => [I I±S ... ~J]
+;
+; [1 4 1] => [1 2 3 4]
+; [4 1 -1] => [4 3 2 1]
+; [2 10 3] => [2 5 8]
+; [10 2 -3] => [10 7 4]
+; [-5 25 10] => [-5 5 15 25]
+; [25 -5 -10] => [25 15 5 -5]
+steprange: swap push -1 swap store dup copy 2 sub jn _steprange_down_loop
+$range_loop(_steprange_loop, :gt)
+$range_loop(_steprange_down_loop, :lt)
 
 ; prints the string at the top of the stack and halts execution
 die!: :println exit
@@ -34,7 +60,12 @@ alpha: push "0123456789abcdefghijklmnopqrstuvwxyz" ret
 ; ["123____"  10] => [123000] ; TODO: bug
 ; ["dead"  16] => [57005]
 ; ["gabe"  17] => [81699]
-stoi: swap push 0 ; accumulator
+; ["0" 10] => [0]   ["-0" 10] => [0]
+; ["-10001" 2] => [-17]
+; ["-123" 10] => [-123]
+; ["-ff" 16] => [-255]
+stoi: swap dup :_stoi_sign swap copy 1 :eq
+  push 2 mul $-- push -2 swap store push 0
 _stoi_loop: ; [b s a]
   swap dup jz _stoi_done
   swap copy 2 copy 2
@@ -44,10 +75,11 @@ _stoi_loop: ; [b s a]
   dup jn _stoi_invalid ; found something non-alphanumeric
   mul add swap push 128 div swap
   jump _stoi_loop
-_stoi_invalid: pop pop slide 1 swap div ret ; return what we were able to parse
-_stoi_done: swap slide 2 ret
+_stoi_sign: dup push 0 :charat push '-' :eq copy 1 :strlen :strslice ret
+_stoi_invalid: pop pop slide 1 swap div push -2 load mul ret
+_stoi_done: swap slide 2 push -2 load mul ret
 
-;;; creature comforts
+; creature comforts
 bin:  push  2 :stoi ret
 oct:  push  8 :stoi ret
 to_i: push 10 :stoi ret
@@ -71,11 +103,14 @@ _itos_loop:
   swap jump _itos_loop
 _itos_done: swap slide 2 ret
 
-; creature comfort
-to_s: push 10 :itos ret
+; creature comforts
+to_bin: push  2 :itos ret
+to_oct: push  8 :itos ret
+to_s:   push 10 :itos ret
+to_hex: push 16 :itos ret
 
 ; puts the digits of N in base B on the stack as a pseudo-array
-; [N B]
+; [N B] => [Dn ...D0 n]
 ;
 ; [42 2] => [1 0 1 0 1 0 6]
 ; [12345 10] => [1 2 3 4 5 5]
@@ -125,22 +160,33 @@ _neq_no: push 0 ret
 ; pops A and B and pushes 1 if A is greater than B, 0 otherwise
 ; [A B] => [A > B]
 ;
-; [4 3] => [1]
-; [3 4] => [0]
-; [2 2] => [0]
-; [2 1] => [1]
+; [4 3] => [1]   [3 4] => [0]
+; [2 2] => [0]   [2 1] => [1]
 gt: swap ; intentionally flow into lt
 
 ; pops A and B and pushes 1 if A is less than than B, 0 otherwise
 ; [A B] => [A < B]
 ;
-; [3 4] => [1]
-; [4 3] => [0]
-; [2 2] => [0]
-; [1 2] => [1]
+; [3 4] => [1]   [4 3] => [0]
+; [2 2] => [0]   [1 2] => [1]
 lt: sub jn _lt_yes push 0 ret
 _lt_yes: push 1 ret
 
+; pops A and B and pushes 1 if A is less than or equal to B, 0 otherwise
+; [A B] => [A > B]
+;
+; [2 2] => [1]   [2 1] => [0]
+; [4 3] => [0]   [3 4] => [1]
+lte: swap ; intentionally flow into gte
+
+; pops A and B and pushes 1 if A is greater than or equal to B, 0 otherwise
+; [A B] => [A > B]
+;
+; [2 2] => [1]   [1 2] => [0]
+; [3 4] => [0]   [4 3] => [1]
+gte: sub jn _gte_no push 1 ret
+_gte_no: push 0 ret
+
 ; Though extremely rare, it's possible that we know a particular value is
 ; stored in the heap at some key, just not which one. This subroutine takes
 ; a value V to search for and a starting index I, and either returns the first

data/lib/spitewaste/parsers/spitewaste.rb

@@ -11,7 +11,7 @@ module Spitewaste
     INSTRUCTIONS = /(\S+):|(\b(#{OPERATORS_M2T.keys * ?|})\s+(-?\d\S*)?)/
     SPECIAL_INSN = /(call|jump|jz|jn)\s+(\S+)/
 
-    attr_reader :src, :instructions, :error
+    attr_reader :src, :instructions, :error, :symbol_table
 
     def initialize program, **options
       @src = program.dup
@@ -127,8 +127,22 @@ module Spitewaste
     def propagate_macros
       # Macros are write-once, allowing user code to customize the special
       # values that get used to drive certain behavior in the standard library.
+
+      parse = -> s { s.split(?,).map &:strip }
+
+      # Macro "functions" get handled first.
+      @src.gsub!(/(\$\S+?)\(([^)]+)\)\s*{(.+?)}/m) {
+        @macros[$1] ||= [$2, $3]; ''
+      }
+      @src.gsub!(/(\$\S+?)\(([^)]+)\)/) {
+        params, body = @macros[$1]
+        raise "no macro function '#$1'" unless body
+        map = parse[params].zip(parse[$2]).to_h
+        body.gsub(/`(.+?)`/) { map[$1] }
+      }
+
       @src.gsub!(/(\$\S+)\s*=\s*(.+)/) { @macros[$1] ||= $2; '' }
-      @src.gsub!(/(\$\S+)/) { @macros[$1] || raise("no macro '#{$1}'") }
+      @src.gsub!(/(\$\S+)/) { @macros[$1] || raise("no macro '#$1'") }
     end
 
     def eliminate_dead_code!
@@ -146,7 +160,7 @@ module Spitewaste
       subroutines = {}
       while label = tokens.shift
         sublen = tokens.index { |t| t[/:$/] } || tokens.size
-        subroutines[label.chop] = tokens.shift sublen
+        subroutines[label.chop] ||= tokens.shift sublen
       end
 
       # A subroutine may indirectly depend on the one immediately after by

data/lib/spitewaste/version.rb

@@ -1,3 +1,3 @@
 module Spitewaste
-  VERSION = '0.1.004'
+  VERSION = '0.1.009'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.004
+  version: 0.1.009
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,6 +86,7 @@ files:
 - lib/spitewaste/cli/asm.rb
 - lib/spitewaste/cli/compile.rb
 - lib/spitewaste/cli/convert.rb
+- lib/spitewaste/cli/docs.rb
 - lib/spitewaste/cli/exec.rb
 - lib/spitewaste/cli/image.rb
 - lib/spitewaste/emitter.rb
@@ -99,6 +100,7 @@ files:
 - lib/spitewaste/libspw/array.spw
 - lib/spitewaste/libspw/bits.spw
 - lib/spitewaste/libspw/case.spw
+- lib/spitewaste/libspw/docs.json
 - lib/spitewaste/libspw/fun.spw
 - lib/spitewaste/libspw/io.spw
 - lib/spitewaste/libspw/math.spw