spitewaste 0.1.010 → 0.1.011

data/lib/spitewaste/libspw/fun.spw

@@ -56,3 +56,24 @@ _collatz_done: pop ret
 
 ; ruby:
 ;   push "'" :strcat push "ruby -e 'p " swap :strcat shell ret
+
+$_to_roman(r, v) {
+  push `v` :divmod swap push `r` swap :strrep
+  push -2 load swap :strcat push -2 swap store
+}
+
+; converts the number N to a string of roman numerals R
+; [N] => [R]
+;
+; [2020] => ["MMXX"]
+; [1666] => ["MDCLXVI"]
+; [1337] => ["MCCCXXXVII"]
+; [94] => ["XCIV"]
+to_roman: push -2,0 store
+  $_to_roman("M", 1000) $_to_roman("CM", 900)
+  $_to_roman("D", 500)  $_to_roman("CD", 400)
+  $_to_roman("C", 100)  $_to_roman("XC", 90)
+  $_to_roman("L", 50)   $_to_roman("XL", 40)
+  $_to_roman("X", 10)   $_to_roman("IX", 9)
+  $_to_roman("V", 5)    $_to_roman("IV", 4)
+  $_to_roman("I", 1) push 2 sub load ret

data/lib/spitewaste/libspw/random.spw

@@ -10,3 +10,7 @@ rand:
 
 rand_range: ; [a b]
   copy 1 sub :rand swap mod add ret
+
+dice:
+  push -2 swap store push 1 :aryfill
+  map (push -2 load :rand_range) ret

data/lib/spitewaste/libspw/string.spw

@@ -293,7 +293,7 @@ strcount:
   reduce (add) ret
 
 ; translates all characters in A to the corresponding characters in B
-; in stirng S, ; similar to the `tr` utility in Unix. A and B must be
+; in string S, ; similar to the `tr` utility in Unix. A and B must be
 ; of the same length. TODO: make this smarter (ranges, length mismatch)
 ; ! clobbers heap addresses -1, -2, and -3
 ; [S A B] => [S']
@@ -343,6 +343,25 @@ _strsqueeze_loop: ; [s]
 _strsqueeze_skip: pop jump _strsqueeze_loop
 _strsqueeze_done: pop :strpack :strrev ret
 
+$_strdel(cmp) {
+  :strunpack push -1 load :strlen
+  select (push -2 load swap :strindex `cmp`)
+  pop :strpack ret
+}
+
+; returns the string S with all characters in string T removed, like `tr -d`.
+; If the first character of T is '^', instead only those characters are kept.
+; [S T] => [S']
+;
+; ["abc123" "abc"] => ["123"]
+; ["abc123" "123"] => ["abc"]
+; ["abcba12321" "abc"] => ["12321"]
+; ["abc12321cba" "^2ac"] => ["ac22ca"]
+; ["facetious" "^aeiou"] => ["aeiou"]
+strdel: push -1 copy 2 store push -2 copy 1 store
+  push 0 :charat push '^' :neq jz _strdel_comp $_strdel(:neg?)
+_strdel_comp: $_strdel(:pos?)
+
 ; returns the sum of the ordinal values of the characters in string S
 ; [S] => [N]
 ;

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/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 push -1 load `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,10 +43,12 @@ $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
@@ -92,11 +96,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,7 +110,7 @@ _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 load mul swap :strcat ret
 
 ; creature comforts
 to_bin: push  2 :itos ret
@@ -190,6 +196,18 @@ 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
@@ -198,3 +216,31 @@ _gte_no: push 0 ret
 heap_seeking_missile:
   $++ dup load copy 2 :eq jz heap_search
   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!

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

@@ -61,10 +61,10 @@ module Spitewaste
       resolve_imports
       seed_prng if @seen.include? 'random'
       resolve_strings
-      remove_comments
       add_sugar
-      fucktionalize
+      remove_comments
       propagate_macros
+      fucktionalize
     end
 
     def resolve_imports

data/lib/spitewaste/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.010
+  version: 0.1.011
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2020-12-22 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