spitewaste 0.1.012 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67ded3120c199b08555950070ea3339978a7a23537b902477c69a87d2fe83469
-  data.tar.gz: 6c49ae6ecb268e39894127bdcf5a0c0ba252b5d218b7c3d582b54461f06e48ca
+  metadata.gz: 8cd3201a4c8647de4fb29c8529c45fb379c2633cd660a4155e28720931202f94
+  data.tar.gz: 3ba703110341a406d476aa8afa8d89c8a57b9d6e136f319956f28f7d311b16e7
 SHA512:
-  metadata.gz: a2900fb2ebb4f6cfbb6503615ceb0b8b65ab729cb10354b626397a348867430256bf6d6f60afe9805fec7893a3e327e62144e1f3edba83af12ea7eaabbeb52ce
-  data.tar.gz: f0b3c878bc133874a16255b94076eb9e7ff8f7fb1d438b368fadf53df9f2fff94c466ed90c94011da1008c5a7249370e3bb995903f2b9135bdb968f7505b8cc7
+  metadata.gz: d103c80be7025cca6d784127444702460394e4d0f137f124581212b6d92523b80c7e95e15642f9c0036b26545e821dcee206686818d0728dbe57c7b57a388ef0
+  data.tar.gz: 39f473d86a4df1a125a6edae3ff1e29c5a069da2aa72862834097b7151bd11c4fdfe93f8119b60c7009468e4f5c2a05ef60a92d99a9b9198485f79c42411f33d

data/lib/spitewaste/libspw/array.spw

@@ -72,6 +72,23 @@ aryshift: dup :dig $-- ret
 ; [7 2 8 2 0] => [7 0 2 8 3]
 aryunshift: swap dup times (dup $++ :roll swap) $++ ret
 
+; inserts the element E into array A at index I, increasing its length by 1
+; [A I E] => [A']
+;
+; [9 5 2 3 1 4] => [9 4 5 2 4]
+; [1 1 0 7] => [7 1 2]
+; [3 1 1 7] => [3 7 2]
+; [7 5 2 1 6] => [7 6 5 3]
+aryinsert: swap copy 2 swap sub $++ :bury $++ ret
+
+; removes the element at index I in array A, decreasing its length by 1
+; [A I] => [A']
+;
+; [6 0 9 3 1] => [6 9 2]
+; [7 5 3 1 4 0] => [5 3 1 3]
+; [1 3 5 7 4 3] => [1 3 5 3]
+aryremove: copy 1 swap sub :roll pop $-- ret
+
 ; returns the concatenation of arrays A and B
 ; [A B] => [A+B]
 ;
@@ -121,6 +138,22 @@ aryat:
 _aryat_neg: copy 1 add dup jn _aryat_oob jump aryat
 _aryat_oob: push "(aryat) index out of bounds!" :die!
 
+; swaps the elements at indices I and J in array A
+; [A I J] => [A']
+;
+; [6 0 8 7 4 1 3] => [6 7 8 0 4]
+; [4 3 2 1 4 0 2] => [2 3 4 1 4]
+; [3 2 1 3 1 1] => [3 2 1 3]
+aryswap: copy 1 copy 1 sub jz _aryswap_noop
+  ^-7 ^-6
+  :arydup @-6 :aryat ^-8
+  :arydup @-7 :aryat ^-9
+  @-6 :aryremove
+  @-7 $-- :aryremove
+  @-6 @-9 :aryinsert
+  @-7 @-8 :aryinsert ret
+_aryswap_noop: pop pop ret
+
 ; returns the minimum and maximum elements of array A
 ; [A] => [min max]
 ;

data/lib/spitewaste/libspw/bits.spw

@@ -71,4 +71,8 @@ _blength_zero: ret
 ;
 ; [0] => [0]   [1] => [1]
 ; [7] => [3]   [8] => [1]
-popcount: push 2 :digits reduce (add) ret
+popcount: push 0
+_popcount_loop:
+  copy 1 push 2 mod add swap push 2 div
+  dup jz _popcount_done swap jump _popcount_loop
+_popcount_done: pop ret

data/lib/spitewaste/libspw/docs.json

@@ -227,6 +227,71 @@
         ]
       ]
     },
+    "aryinsert": {
+      "full": "inserts the element E into array A at index I, increasing its length by 1\n[A I E] => [A']\n\n[9 5 2 3 1 4] => [9 4 5 2 4]\n[1 1 0 7] => [7 1 2]\n[3 1 1 7] => [3 7 2]\n[7 5 2 1 6] => [7 6 5 3]\n",
+      "desc": "inserts the element E into array A at index I, increasing its length by 1",
+      "effect": "[A I E] => [A']",
+      "cases": [
+        [
+          [
+            9,
+            5,
+            2,
+            3,
+            1,
+            4
+          ],
+          [
+            9,
+            4,
+            5,
+            2,
+            4
+          ]
+        ],
+        [
+          [
+            1,
+            1,
+            0,
+            7
+          ],
+          [
+            7,
+            1,
+            2
+          ]
+        ],
+        [
+          [
+            3,
+            1,
+            1,
+            7
+          ],
+          [
+            3,
+            7,
+            2
+          ]
+        ],
+        [
+          [
+            7,
+            5,
+            2,
+            1,
+            6
+          ],
+          [
+            7,
+            6,
+            5,
+            3
+          ]
+        ]
+      ]
+    },
     "arypop": {
       "full": "removes the element at the end of the array A, decreasing its length by 1\n[A] => [A']\n\n[10 1] => [0]\n[1 2 3 4 4] => [1 2 3 3]\n[7 10 20 30 3] => [7 10 20 2]\n",
       "desc": "removes the element at the end of the array A, decreasing its length by 1",
@@ -338,6 +403,59 @@
         ]
       ]
     },
+    "aryremove": {
+      "full": "removes the element at index I in array A, decreasing its length by 1\n[A I] => [A']\n\n[6 0 9 3 1] => [6 9 2]\n[7 5 3 1 4 0] => [5 3 1 3]\n[1 3 5 7 4 3] => [1 3 5 3]\n",
+      "desc": "removes the element at index I in array A, decreasing its length by 1",
+      "effect": "[A I] => [A']",
+      "cases": [
+        [
+          [
+            6,
+            0,
+            9,
+            3,
+            1
+          ],
+          [
+            6,
+            9,
+            2
+          ]
+        ],
+        [
+          [
+            7,
+            5,
+            3,
+            1,
+            4,
+            0
+          ],
+          [
+            5,
+            3,
+            1,
+            3
+          ]
+        ],
+        [
+          [
+            1,
+            3,
+            5,
+            7,
+            4,
+            3
+          ],
+          [
+            1,
+            3,
+            5,
+            3
+          ]
+        ]
+      ]
+    },
     "aryrep": {
       "full": "returns the array A replicated N times\n[A N] => [A']\n\n[3 2 1 3 4] => [3 2 1 3 2 1 3 2 1 3 2 1 12]\n",
       "desc": "returns the array A replicated N times",
@@ -505,6 +623,65 @@
         ]
       ]
     },
+    "aryswap": {
+      "full": "swaps the elements at indices I and J in array A\n[A I J] => [A']\n\n[6 0 8 7 4 1 3] => [6 7 8 0 4]\n[4 3 2 1 4 0 2] => [2 3 4 1 4]\n[3 2 1 3 1 1] => [3 2 1 3]\n",
+      "desc": "swaps the elements at indices I and J in array A",
+      "effect": "[A I J] => [A']",
+      "cases": [
+        [
+          [
+            6,
+            0,
+            8,
+            7,
+            4,
+            1,
+            3
+          ],
+          [
+            6,
+            7,
+            8,
+            0,
+            4
+          ]
+        ],
+        [
+          [
+            4,
+            3,
+            2,
+            1,
+            4,
+            0,
+            2
+          ],
+          [
+            2,
+            3,
+            4,
+            1,
+            4
+          ]
+        ],
+        [
+          [
+            3,
+            2,
+            1,
+            3,
+            1,
+            1
+          ],
+          [
+            3,
+            2,
+            1,
+            3
+          ]
+        ]
+      ]
+    },
     "aryunshift": {
       "full": "places the element E at the beginning of the array A, increasing its length by 1\n[A E] => [A']\n\n[3 2 1 3 7] => [7 3 2 1 4]\n[4 2 0 3 9] => [9 4 2 0 4]\n[11 2 2 10] => [10 11 2 3]\n[7 2 8 2 0] => [7 0 2 8 3]\n",
       "desc": "places the element E at the beginning of the array A, increasing its length by 1",
@@ -1907,8 +2084,8 @@
       ]
     },
     "pow": {
-      "full": "returns B raised to the power E\n[B E] => [B**E]\n\n[0 0] => [1],   [0 9] => [0],   [9 0] => [1]\n[3 2] => [9],   [2 3] => [8],   [7 4] => [2401]\n[-2 3] => [-8]  [-5 0] => [1]   [-4 4] => [256]\n",
-      "desc": "returns B raised to the power E",
+      "full": "returns B raised to the power E; if E must be negative, use ratpow instead\n[B E] => [B**E]\n\n[0 0] => [1],   [0 9] => [0],   [9 0] => [1]\n[3 2] => [9],   [2 3] => [8],   [7 4] => [2401]\n[-2 3] => [-8]  [-5 0] => [1]   [-4 4] => [256]\n",
+      "desc": "returns B raised to the power E; if E must be negative, use ratpow instead",
       "effect": "[B E] => [B**E]",
       "cases": [
         [
@@ -2650,7 +2827,7 @@
       ]
     },
     "ratpow": {
-      "full": "returns the rational R raised to the power E\n[R E] => [R']\n\n[R(4,2) 5] => [R(32,1)]\n[R(-3,7) 0] => [R(1,1)]\n[R(-3,14) 2] => [R(9,196)]\n",
+      "full": "returns the rational R raised to the power E\n[R E] => [R']\n\n[R(4,2) 5] => [R(32,1)]\n[R(-3,7) 0] => [R(1,1)]\n[R(-3,14) 2] => [R(9,196)]\n[R(5,1) -1] => [R(1,5)]\n[R(2,5) -2] => [R(25,4)]\n[R(-3,14) -3] => [R(-2744,27)]\n",
       "desc": "returns the rational R raised to the power E",
       "effect": "[R E] => [R']",
       "cases": [
@@ -2680,6 +2857,33 @@
           [
             38654706057
           ]
+        ],
+        [
+          [
+            21474836483,
+            -1
+          ],
+          [
+            4294967307
+          ]
+        ],
+        [
+          [
+            8589934603,
+            -2
+          ],
+          [
+            107374182409
+          ]
+        ],
+        [
+          [
+            12884901916,
+            -3
+          ],
+          [
+            11785390260278
+          ]
         ]
       ]
     },

data/lib/spitewaste/libspw/math.spw

@@ -1,8 +1,7 @@
 import array ; arycat, arydup
 import util  ; eq, inc, range
 
-; returns B raised to the power E
-; ! TODO: support negative exponents (return Rational)
+; returns B raised to the power E; if E must be negative, use ratpow instead
 ; [B E] => [B**E]
 ;
 ; [0 0] => [1],   [0 9] => [0],   [9 0] => [1]

data/lib/spitewaste/libspw/rational.spw

@@ -169,11 +169,15 @@ ratinv:
 ; [R(4,2) 5] => [R(32,1)]
 ; [R(-3,7) 0] => [R(1,1)]
 ; [R(-3,14) 2] => [R(9,196)]
-ratpow:
+; [R(5,1) -1] => [R(1,5)]
+; [R(2,5) -2] => [R(25,4)]
+; [R(-3,14) -3] => [R(-2744,27)]
+ratpow: dup jn _ratpow_neg
   swap push 2 :divmod push 2 mul $--
   swap $RAT :divmod copy 2 mul
   copy 3 :pow swap copy 3 :pow
   swap :to_r :ratsimp slide 2 ret
+_ratpow_neg: push -1 mul swap :ratinv swap :ratpow 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

data/lib/spitewaste/parsers/spitewaste.rb

@@ -117,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!(/\^(-?\d+)/, 'push \1 swap store')
+      # quick load (`@2` = `push 2 load`)
+      @src.gsub!(/@(-?\d+)/, 'push \1 load')
     end
 
     def gensym

data/lib/spitewaste/version.rb

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

metadata

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