spitewaste 0.1.011 → 0.2.3

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

@@ -26,7 +26,7 @@ _range_down:
 
 $range_loop(fn, cmp) {
 `fn`:
-  dup copy 2 add push -1 load `cmp` jz _`fn`_done
+  dup copy 2 add @-1 `cmp` jz _`fn`_done
   copy 1 copy 1 add swap jump `fn`
 _`fn`_done: pop ret
 }
@@ -50,8 +50,10 @@ steprange: swap push -1 copy 1 store copy 2 sub
 $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
@@ -72,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
@@ -83,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
@@ -110,9 +113,10 @@ _itos_loop:
   swap :strcat
   swap copy 2 div
   swap jump _itos_loop
-_itos_done: swap slide 2 push 45,-2 load mul swap :strcat 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
@@ -127,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
 
@@ -213,8 +215,8 @@ between?: copy 2 :gte swap copy 2 :lte mul slide 1 ret
 ; 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
@@ -244,3 +246,31 @@ rgb2hex:
   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/spitewaste.rb

@@ -57,7 +57,7 @@ module Spitewaste
     private
 
     def preprocess!
-      @src.prepend "import syntax\n"
+      @src << "\nimport syntax"
       resolve_imports
       seed_prng if @seen.include? 'random'
       resolve_strings
@@ -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.011'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.011
+  version: 0.2.3
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.18
 signing_key:
 specification_version: 4
 summary: Make programming in Whitespace even better.