spitewaste 0.1.010 → 0.2.2

data/lib/spitewaste/libspw/terminal.spw

@@ -0,0 +1,14 @@
+;;; Miscellaneous terminal-based functionality
+
+import util ; hex2rgb
+
+$_setg(code) {
+  push 91,27 ochr ochr
+  push `code` onum push 50,59 ochr ochr
+  :hex2rgb each (push 59 ochr onum)
+  push 109 ochr ret
+}
+
+setfg: $_setg(38)
+setbg: $_setg(48)
+reset: push 109,91,27 ochr ochr ochr ret

data/lib/spitewaste/libspw/test.spw

@@ -8,3 +8,6 @@ assert_eq:
   push ", got " :print onum
   push " for test " swap :strcat :die!
 _assert_eq_yes: pop pop pop ret
+
+assert_nz: jz _assert_nz_no pop ret
+_assert_nz_no: push "expected nonzero for test " swap :strcat :die!

data/lib/spitewaste/libspw/util.spw

@@ -15,22 +15,24 @@ import string ; charat, strcat, strindex, strlen
 ; [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: dup copy 2 sub jn _range_down
+; [4 4] => [4]
+range: dup copy 2 sub jz _range_one dup copy 2 sub jn _range_down
   copy 1 push 1 add swap
   copy 1 copy 1 sub jn range pop ret
+_range_one: 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
+  dup copy 2 add @-1 `cmp` jz _`fn`_done
+  copy 1 copy 1 add swap jump `fn`
+_`fn`_done: pop ret
 }
 
-; inserts between the top two stack values the intervening consecutive elements,
-; counting by `step` up/down to (but never beyond) J
+; inserts between I and J the intervening consecutive elements, counting by
+; step S up/down to (but never beyond) J
 ; [I J S] => [I I±S ... ~J]
 ;
 ; [1 4 1] => [1 2 3 4]
@@ -41,13 +43,17 @@ $range_loop(fn, cmp) {
 ; [25 -5 -10] => [25 15 5 -5]
 ; [4 20 3] => [4 7 10 13 16 19]
 ; [20 4 -3] => [20 17 14 11 8 5]
+; [3 9 7] => [3]
+; [9 3 -7] => [9]
 steprange: swap push -1 copy 1 store copy 2 sub
   jn _steprange_down_loop jump _steprange_loop ; prevent DCE
-$range_loop(_steprange_loop, :gt)
-$range_loop(_steprange_down_loop, :lt)
+$range_loop(_steprange_loop, :lte)
+$range_loop(_steprange_down_loop, :gte)
 
-; prints the string at the top of the stack and halts execution
-die!: :println exit
+; prints the string at the top of the stack and halts execution after pushing
+; something onto the stack to signal abnormal termination/unclean exit
+; [...] => [... 1]
+die!: :println push 1 exit
 
 ; for stoi and itos
 alpha: push "0123456789abcdefghijklmnopqrstuvwxyz" ret
@@ -68,7 +74,7 @@ alpha: push "0123456789abcdefghijklmnopqrstuvwxyz" ret
 ; ["-123" 10] => [-123]
 ; ["-ff" 16] => [-255]
 stoi: swap dup :_stoi_sign swap copy 1 :eq
-  push 2 mul $-- push -2 swap store push 0
+  push 2 mul $-- ^-2 push 0
 _stoi_loop: ; [b s a]
   swap dup jz _stoi_done
   swap copy 2 copy 2
@@ -79,10 +85,11 @@ _stoi_loop: ; [b s a]
   mul add swap push 128 div swap
   jump _stoi_loop
 _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
+_stoi_invalid: pop pop slide 1 swap div @-2 mul ret
+_stoi_done: swap slide 2 @-2 mul ret
 
 ; creature comforts
+
 bin:  push  2 :stoi ret
 oct:  push  8 :stoi ret
 to_i: push 10 :stoi ret
@@ -92,11 +99,13 @@ hex:  push 16 :stoi ret
 ; [N B]
 ;
 ; [42 2] => ["101010"]
+; [-42 2] => ["-101010"]
 ; [511 8] => ["777"]
 ; [12345 10] => ["12345"]
+; [-54321 10] => ["-54321"]
 ; [57005 16] => ["dead"]
 ; [81699 17] => ["gabe"]
-itos: swap push 0 ; accumulator
+itos: swap push -2 copy 1 :neg? store :abs push 0
 _itos_loop:
   swap dup jz _itos_done
   swap copy 1 copy 3 mod
@@ -104,9 +113,10 @@ _itos_loop:
   swap :strcat
   swap copy 2 div
   swap jump _itos_loop
-_itos_done: swap slide 2 ret
+_itos_done: swap slide 2 push 45 @-2 mul swap :strcat ret
 
 ; creature comforts
+
 to_bin: push  2 :itos ret
 to_oct: push  8 :itos ret
 to_s:   push 10 :itos ret
@@ -121,12 +131,10 @@ to_hex: push 16 :itos ret
 ; [256 16] => [1 0 0 3]
 digits:
   copy 1 jz _digits_zero ; special case
-  push -1 swap store
-  push -1 swap ; sentinel value
+  ^-1 push -1 swap ; sentinel value
 _digits_loop:
   dup jz _digits_done
-  push -1 load :divmod
-  swap jump _digits_loop
+  @-1 :divmod swap jump _digits_loop
 _digits_zero: dup div ret
 _digits_done: push 1 sub :to_a ret
 
@@ -190,11 +198,79 @@ lte: swap ; intentionally flow into gte
 gte: sub jn _gte_no push 1 ret
 _gte_no: push 0 ret
 
+; returns 1 if the number N is between A and B (inclusive), 0 otherwise
+; ! A must be <= B for sensible results TODO: bug?
+; [N A B]
+;
+; [5 0 10] => [1]
+; [11 0 10] => [0]
+; [4 0 4] => [1]
+; [-1 0 4] => [0]
+; [-5 -10 0] => [1]
+; [3 4 2] => [0]
+between?: copy 2 :gte swap copy 2 :lte mul slide 1 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
 ; key associated with that value or loops forever. Probably don't touch.
 ; [V I]
-heap_seeking_missile:
-  $++ dup load copy 2 :eq jz heap_search
+heap-seeking_missile:
+  $++ dup load copy 2 :eq jz heap-seeking_missile
   slide 1 ret
+
+; converts the #RRGGBB (leading '#' optional) color string S to
+; its individual RGB components as integers in the range 0-255
+; [S] => [R G B]
+;
+; ["#000000"] => [0 0 0]
+; ["ffffff"]  => [255 255 255]
+; ["#102030"] => [16 32 48]
+; ["c0ffee"] => [192 255 238]
+hex2rgb:
+  dup push 0 :charat push '#' :eq push 127 mul $++ div
+  push 128,2 :pow :divmod :hex swap
+  push 128,2 :pow :divmod :hex swap :hex ret
+
+; converts R, G, and B components to length-6 hexadecimal string S
+; ! dies if any of the values to convert aren't between 0 and 255
+; [R G B] => [S]
+;
+; [0 0 0] => ["000000"]
+; [255 255 255] => ["ffffff"]
+; [16 32 48] => ["102030"]
+; [192 255 238] => ["c0ffee"]
+rgb2hex:
+  push 3 :arydup all (push 0,255 :between?) jz _rgb2hex_invalid
+  pop copy 2 push 256,2 :pow mul
+  copy 2 push 256 mul add add
+  slide 2 :to_hex push 6,48 :rjustc ret
+_rgb2hex_invalid: push "(rgb2hex) invalid RGB" :die!
+
+; stashes the array A in negative heap space starting at index I
+; [A I] => []
+aryheap:
+  $++ dup copy 2 store
+  swap times ($-- swap copy 1 swap store) pop ret
+
+; restores the heaped array starting at index I
+; [I] => [A]
+heapary:
+  $++ dup load swap copy 1 sub swap
+  times (dup load swap $++) load ret
+
+; swaps the elements in the heap at indices I and J
+; ! TODO: make heap effects doctest-able
+; [I J] => []
+heapswap: dup load swap copy 2 load store store ret
+
+; returns the number of nanoseconds N since the Unix epoch
+; [] => [N]
+time: push "date +%s%N" shell :to_i ret
+
+$bench(insns) {
+  #insns :println
+  :time ^0 `insns` :time @0 sub
+  push 10,9 :pow :divmod swap onum
+  push '.' ochr :to_s push 9,48 :rjustc :println
+}

data/lib/spitewaste/parsers/fucktional.rb

@@ -64,9 +64,13 @@ maxby_lesser_%1$s: swap jump maxby_resume_%1$s
 maxby_done_%1$s:
 SPW
 
-    'minby' => 'maxby (%2$s push -1 mul)',
-    'each' => 'dup times (dup call roll %2$s push 1 sub) pop',
-    'count' => 'select (%2$s) dup call nslide',
+    'minby'  => 'maxby (%2$s push -1 mul)',
+    'each'   => 'dup times (dup call roll %2$s push 1 sub) pop',
+    'all'    => 'map (%2$s) reduce (add) push -11 load call eq',
+    # TODO: optimize any to stop early if possible
+    'any'    => 'map (%2$s) reduce (add) push 0 call gt',
+    'none'   => 'map (%2$s) reduce (add) push 0 call eq',
+    'count'  => 'select (%2$s) dup call nslide',
     'select' => generate_filter_spw('select', 0, 1),
     'reject' => generate_filter_spw('reject', 1, 0),
   }

data/lib/spitewaste/parsers/spitewaste.rb

@@ -57,14 +57,14 @@ module Spitewaste
     private
 
     def preprocess!
-      @src.prepend "import syntax\n"
+      @src << "\nimport syntax"
       resolve_imports
       seed_prng if @seen.include? 'random'
       resolve_strings
-      remove_comments
       add_sugar
-      fucktionalize
+      remove_comments
       propagate_macros
+      fucktionalize
     end
 
     def resolve_imports
@@ -78,7 +78,13 @@ module Spitewaste
       while @src['import']
         imports = []
         @src.gsub!(/import\s+(\S+).*/) {
-          imports << resolve($1) if @seen.add? $1
+          if $1 == ?*
+            imports = Dir[LIBSPW + '/*.spw'].map {
+              File.read(_1) if @seen.add? File.basename(_1, '.spw')
+            }
+          else
+            imports << resolve($1) if @seen.add? $1
+          end
           '' # remove import statement
         }
         @src << imports.join(?\n)
@@ -91,7 +97,7 @@ module Spitewaste
     end
 
     def seed_prng
-      @src.prepend "push $seed,#{rand 2**31} store $seed = -9001"
+      @src.prepend "push $seed,#{rand 2**31} store $seed = -9001\n"
     end
 
     def resolve_strings
@@ -111,6 +117,10 @@ module Spitewaste
       @src.gsub!(/'(.)'/) { $1.ord }
       # quick push (`push 1,2,3` desugars to individual pushes)
       @src.gsub!(/push \S+/) { |m| m.split(?,) * ' push ' }
+      # quick store (`^2` = `push 2 swap store`)
+      @src.gsub!(/\^(\S+)/, 'push \1 swap store')
+      # quick load (`@2` = `push 2 load`)
+      @src.gsub!(/@(\S+)/, 'push \1 load')
     end
 
     def gensym
@@ -131,18 +141,20 @@ module Spitewaste
       parse = -> s { s.split(?,).map &:strip }
 
       # Macro "functions" get handled first.
-      @src.gsub!(/(\$\S+?)\(([^)]+)\)\s*{(.+?)}/m) {
+      @src.gsub!(/(\$\S+?)\(([^)]*)\)\s*{(.+?)}/m) {
         @macros[$1] ||= [$2, $3]; ''
       }
-      @src.gsub!(/(\$\S+?)\(([^)]+)\)/) {
+      @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] }
+        body
+          .gsub(/`(.+?)`/) { map[$1] }
+          .gsub(/#(\S+)/) { "push #{Spitewaste.strpack 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!

data/lib/spitewaste/version.rb

@@ -1,3 +1,3 @@
 module Spitewaste
-  VERSION = '0.1.010'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.010
+  version: 0.2.2
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,6 +110,7 @@ files:
 - lib/spitewaste/libspw/stack.spw
 - lib/spitewaste/libspw/string.spw
 - lib/spitewaste/libspw/syntax.spw
+- lib/spitewaste/libspw/terminal.spw
 - lib/spitewaste/libspw/test.spw
 - lib/spitewaste/libspw/util.spw
 - lib/spitewaste/parsers/assembly.rb