spitewaste 0.1.011 → 0.1.012

data/lib/spitewaste/libspw/rational.spw

@@ -174,3 +174,28 @@ ratpow:
   swap $RAT :divmod copy 2 mul
   copy 3 :pow swap copy 3 :pow
   swap :to_r :ratsimp slide 2 ret
+
+; converts the rational number R to a "pseudo-float" with a whole (W) part
+; and a fractional (F) part composed of P digits after the decimal point
+; [R P] => [W F]
+;
+; [R(22,7) 2] => [3 14]
+; [R(355,113) 6] => [3 141592]
+; [R(8675,309) 10] => [28 744336569] TODO: leading 0 is lost (bug)
+; [R(2,4) 3] => [0 500]
+to_f: push -2 swap store :from_r :divmod push 0 swap
+_to_f_loop:
+  push -1 load :divmod  swap
+  copy 2 push 10 mul add
+  swap push 10 mul
+  push 2 :dig
+  push -2 dup :dec load :neg? jz _to_f_loop pop ret
+
+; converts the rational number R to a string S of the form
+; "<simplified numerator>/<simplified denominator>"
+; [R] => [S]
+;
+; [R(22,7)] => ["22/7"]
+; [R(2,4)] => ["1/2"]
+; [R(99,9)] => ["11/1"]
+ratstr: :ratsimp :from_r push 2 map (:to_s) push '/' :strjoinc ret

data/lib/spitewaste/libspw/string.spw

@@ -207,8 +207,10 @@ center: push ' ' :centerc ret
 ; ["foobar"] => ["fooba"]
 ; ["abc"] => ["ab"]
 ; ["a"] => [""]
-; ! [""] => ERROR TODO: Should just be a no-op.
-strchop: dup :strlen push 1 sub push 0 swap :strslice ret
+; [""] => [""]
+strchop: dup jz _strchop_empty
+  dup :strlen push 1 sub push 0 swap :strslice ret
+_strchop_empty: ret
 
 ; splits string S on delimiting character C, leaving the resultant substrings
 ; on the stack as a pseudo-array (length at top of stack)
@@ -368,11 +370,13 @@ _strdel_comp: $_strdel(:pos?)
 ; ["ABC"] => [198]
 ; ["012"] => [147]
 ; ["a"] => [97]
-; [""] => [] TODO: bug, should be 0
-strsum: :strunpack push 0 :to_a reduce (add) ret
+; [""] => [0]
+strsum: dup jz _strsum_empty
+  :strunpack push 0 :to_a reduce (add) ret
+_strsum_empty: ret
 
 ; rotates the string S to the left N times, wrapping
-; [S N]
+; [S N] => [S']
 ;
 ; ["abc" 0] => ["abc"]
 ; ["abcd" 1] => ["bcda"]
@@ -381,9 +385,18 @@ strsum: :strunpack push 0 :to_a reduce (add) ret
 strrotl: push 128 swap copy 2 :strlen mod :pow :divmod :strcat ret
 
 ; rotates the string S to the right N times, wrapping
-; [S N]
+; [S N] => [S']
 ;
 ; ["abcd" 1] => ["dabc"]
 ; ["abcd" 5] => ["dabc"]
 ; ["foodbar" 3] => ["barfood"]
 strrotr: push 0 swap sub :strrotl ret
+
+; frobnicates the string S by XORing all its bytes with 42
+; [S] => [S']
+;
+; ["foobar"] => ["LEEHKX"]
+; ["LEEHKX"] => ["foobar"]
+memfrob:
+  dup :strlen pop :strunpack push -1 load $++
+  map (push 42 :bxor) pop :strpack ret

data/lib/spitewaste/libspw/util.spw

@@ -87,6 +87,7 @@ _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
+
 bin:  push  2 :stoi ret
 oct:  push  8 :stoi ret
 to_i: push 10 :stoi ret
@@ -113,6 +114,7 @@ _itos_loop:
 _itos_done: swap slide 2 push 45,-2 load mul swap :strcat ret
 
 ; creature comforts
+
 to_bin: push  2 :itos ret
 to_oct: push  8 :itos ret
 to_s:   push 10 :itos ret

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

data/lib/spitewaste/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.011
+  version: 0.1.012
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake