substrate-lang 0.9.1 → 0.9.3

package/build/compiler/program

@@ -1,20 +1,21 @@
-substrate.b31300129ffb@0+0
-writer.b698107b491f@0+0
-syntax.500cf1bcecd4@0+0
-path.ec5532669c81@0+0
-fs.3f7cf768e7ed@0+0
-reader.f4378a1f91d1@0+0
-roots.02808ca2c6a7@0+0
-running.7f03ff780e03@0+0
-core.11abd90bead5@0+0
-ops.a5b9269c5240@0+0
-checker.73d84d96c58b@0+0
-leb128.0d2a247f239f@0+0
-binary.5d81a93450b2@0+0
-serialize.f4354af92feb@0+0
-compile.2db0f824839f@0+0
-link.3c4158bb6ba3@0+0
-macros.6f0e1a78d640@0+0
-expander.570faeb51e05@0+0
-prune.f800615ca8cc@0+0
-main.1b378cf3c2a5@0+0
+substrate.4c780d6dd6d4@0+0
+writer.806bc85aa684@0+0
+syntax.9857f6784d63@0+0
+path.dcc4712bcc7b@0+0
+fs.563034be70c3@0+0
+reader.b535e61f99f4@0+0
+roots.6d2942578055@0+0
+running.d73f7826cb74@0+0
+core.fc3dab9d1846@0+0
+ops.b361e858d8e1@0+0
+checker.592d37dcbec9@0+0
+leb128.748b1c37277a@0+0
+binary.3823f89ce414@0+0
+serialize.b2196de75bc8@0+0
+compile.86a2b03b0c9b@0+0
+sha256.5fc9d60f8bb2@0+0
+link.11b643d35670@0+0
+macros.4083601c00db@0+0
+expander.689d326e5a1b@0+0
+prune.d4a3f9834095@0+0
+main.ed62cce43000@0+0

package/build/sub/program

@@ -1,48 +1,48 @@
-substrate.b31300129ffb@0+0
-process.94378bb2ecf2@0+0
-path.ec5532669c81@0+0
-path.b98f74b36b19@0+0
-fs.3f7cf768e7ed@0+0
-common.9ea008df47e6@0+0
-grants.e7dc20c93375@0+0
-writer.b698107b491f@0+0
-syntax.500cf1bcecd4@0+0
-reader.f4378a1f91d1@0+0
-roots.02808ca2c6a7@0+0
-read.4b71de2f3337@0+0
-manifest.0c0fe02b1e58@0+0
-git.c47e41fed371@0+0
-files.25d3fe28ff57@0+0
-sha256.92185201fb4b@0+0
-hash.75dc86b3dd19@0+0
-store.128b4d772823@0+0
-map.b767b94ffe7f@0+0
-env.d4a2d3ca5408@0+0
-events.ee8945a7ea00@0+0
-build.3a016536f5a5@0+0
-pack.a62f186e997c@0+0
-site.81b7f3938874@0+0
-site.b678ce0b53b9@0+0
-fetch.22f5c88f8a7b@0+0
-stream.d95d09173ea2@0+0
-worker.5ced1d8ab0d4@0+0
-deflate.67457f2269ae@0+0
-inflate.16c735654147@0+0
-gzip.0bacbb40f6e2@0+0
-tar.9c01735ea170@0+0
-fetch.59ad8bf17eeb@0+0
-doc.49b234ac4521@0+0
-html.a860b2ff2c4e@0+0
-html.1ab670c5f861@0+0
-text.ca2b0668e319@0+0
-root.5a3e4a594d25@0+0
-doc.e0af22e9d586@0+0
-timer.21d74714d40b@0+0
-chromium.0cdcaad35704@0+0
-test.eed7cfa3264c@0+0
-utf8.b61525c6fb12@0+0
-json.74966c67a96d@0+0
-sha512.bf0d4c469a96@0+0
-base64.fc39f9b2a664@0+0
-upgrade.61c36d2a50cf@0+0
-sub.84126bd636af@0+0
+substrate.4c780d6dd6d4@0+0
+process.aea2c88cb7a0@0+0
+path.dcc4712bcc7b@0+0
+path.b7a8e1cf3aaa@0+0
+fs.563034be70c3@0+0
+common.91ddee6b7a67@0+0
+grants.5bf25700d47c@0+0
+writer.806bc85aa684@0+0
+syntax.9857f6784d63@0+0
+reader.b535e61f99f4@0+0
+roots.6d2942578055@0+0
+read.cd1e693f4fb4@0+0
+manifest.cf7471880377@0+0
+git.48aefa1644be@0+0
+files.30e55182c5df@0+0
+sha256.5fc9d60f8bb2@0+0
+hash.3f0d118da63f@0+0
+store.d4e845ff24ac@0+0
+map.dc516eec27ff@0+0
+env.f051f8166526@0+0
+events.f952172735e0@0+0
+build.84ac996eda63@0+0
+pack.55992e8cc09c@0+0
+site.7c6d8c7747af@0+0
+site.81548474c323@0+0
+fetch.097f1cc9502d@0+0
+stream.4c07247477f7@0+0
+worker.f1190de21b21@0+0
+deflate.fc8075e3aed1@0+0
+inflate.8899e0933792@0+0
+gzip.69588e97c35a@0+0
+tar.e482cf873cfc@0+0
+fetch.5d2f427c995e@0+0
+doc.566f9861828e@0+0
+html.c1671a102b4d@0+0
+html.20baa1dc7ca6@0+0
+text.4ab70ac35b5a@0+0
+root.9b713ec588c1@0+0
+doc.0b48bbac404b@0+0
+timer.3809bb17a7a1@0+0
+chromium.e4db7d29897c@0+0
+test.0d9c079bb309@0+0
+utf8.524c475ecd40@0+0
+json.f15a29d99d8d@0+0
+sha512.b988b9dc6114@0+0
+base64.8fba03e1be0a@0+0
+upgrade.18a5aa0dae89@0+0
+sub.b57e17b6876b@0+0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "substrate-lang",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "A Lisp for writing WebAssembly, and the substrate command that builds, runs and tests it",
   "license": "MIT",
   "repository": {

package/std/crypto/sha256.sub

@@ -1,110 +1,4 @@
-;; SHA-256 (FIPS 180-4), over bytes added in pieces or given at once.
-(provide sha256 sha256-init! sha256-add! sha256-end! sha256-of)
+;; SHA-256 (FIPS 180-4), over bytes added in pieces or given at once. It is defined in compiler/sha256.sub.
+(require-unqualified sha256 compiler/sha256)
 
-(struct sha256 [state (array u32 8)] [block (array u8 64)] [filled u32] [length u64])
-
-(define k (array u32 64)
-  (array-of u32 #x428a2f98 #x71374491 #xb5c0fbcf #xe9b5dba5 #x3956c25b #x59f111f1 #x923f82a4 #xab1c5ed5
-               #xd807aa98 #x12835b01 #x243185be #x550c7dc3 #x72be5d74 #x80deb1fe #x9bdc06a7 #xc19bf174
-               #xe49b69c1 #xefbe4786 #x0fc19dc6 #x240ca1cc #x2de92c6f #x4a7484aa #x5cb0a9dc #x76f988da
-               #x983e5152 #xa831c66d #xb00327c8 #xbf597fc7 #xc6e00bf3 #xd5a79147 #x06ca6351 #x14292967
-               #x27b70a85 #x2e1b2138 #x4d2c6dfc #x53380d13 #x650a7354 #x766a0abb #x81c2c92e #x92722c85
-               #xa2bfe8a1 #xa81a664b #xc24b8b70 #xc76c51a3 #xd192e819 #xd6990624 #xf40e3585 #x106aa070
-               #x19a4c116 #x1e376c08 #x2748774c #x34b0bcb5 #x391c0cb3 #x4ed8aa4a #x5b9cca4f #x682e6ff3
-               #x748f82ee #x78a5636f #x84c87814 #x8cc70208 #x90befffa #xa4506ceb #xbef9a3f7 #xc67178f2))
-
-(define (rotr [x u32] [n u32]) #:inline -> u32 (bit-or (>> x n) (<< x (- 32 n))))
-
-(define (word [p (ptr u8)]) #:inline -> u32
-  (bit-or (<< (cast u32 (@ p 0)) 24) (<< (cast u32 (@ p 1)) 16) (<< (cast u32 (@ p 2)) 8) (cast u32 (@ p 3))))
-
-(define (compress! [s (ptr sha256)] [p (ptr u8)])
-  (let ([w (array u32 64)]
-        [a (@ (-> s state) 0)] [b (@ (-> s state) 1)] [c (@ (-> s state) 2)] [d (@ (-> s state) 3)]
-        [e (@ (-> s state) 4)] [f (@ (-> s state) 5)] [g (@ (-> s state) 6)] [hh (@ (-> s state) 7)])
-    (for ([i u32 0]) (< i 16) (+= i 1) (set! (@ w i) (word (+ p (* i 4)))))
-    (for ([i u32 16]) (< i 64) (+= i 1)
-      (let ([x (@ w (- i 15))] [y (@ w (- i 2))])
-        (set! (@ w i) (+ (@ w (- i 16)) (bit-xor (rotr x 7) (rotr x 18) (>> x 3)) (@ w (- i 7))
-                         (bit-xor (rotr y 17) (rotr y 19) (>> y 10))))))
-    (for ([i u32 0]) (< i 64) (+= i 1)
-      (let* ([t1 (+ hh (bit-xor (rotr e 6) (rotr e 11) (rotr e 25)) (bit-xor (bit-and e f) (bit-and (bit-not e) g))
-                    (@ k i) (@ w i))]
-             [t2 (+ (bit-xor (rotr a 2) (rotr a 13) (rotr a 22)) (bit-xor (bit-and a b) (bit-and a c) (bit-and b c)))])
-        (set! hh g)
-        (set! g f)
-        (set! f e)
-        (set! e (+ d t1))
-        (set! d c)
-        (set! c b)
-        (set! b a)
-        (set! a (+ t1 t2))))
-    (+= (@ (-> s state) 0) a)
-    (+= (@ (-> s state) 1) b)
-    (+= (@ (-> s state) 2) c)
-    (+= (@ (-> s state) 3) d)
-    (+= (@ (-> s state) 4) e)
-    (+= (@ (-> s state) 5) f)
-    (+= (@ (-> s state) 6) g)
-    (+= (@ (-> s state) 7) hh)))
-
-(define (sha256-init! [s (ptr sha256)])
-  (set! (@ (-> s state) 0) #x6a09e667)
-  (set! (@ (-> s state) 1) #xbb67ae85)
-  (set! (@ (-> s state) 2) #x3c6ef372)
-  (set! (@ (-> s state) 3) #xa54ff53a)
-  (set! (@ (-> s state) 4) #x510e527f)
-  (set! (@ (-> s state) 5) #x9b05688c)
-  (set! (@ (-> s state) 6) #x1f83d9ab)
-  (set! (@ (-> s state) 7) #x5be0cd19)
-  (set! (-> s filled) 0)
-  (set! (-> s length) 0))
-
-(define (sha256-add! [s (ptr sha256)] [b (slice u8)])
-  (let ([p (-> b items)] [n (-> b length)] [i u32 0])
-    (+= (-> s length) (cast u64 n))
-    (when (> (-> s filled) 0)
-      (while (and (< i n) (< (-> s filled) 64))
-        (set! (@ (-> s block) (-> s filled)) (@ p i))
-        (+= (-> s filled) 1)
-        (+= i 1))
-      (when (== (-> s filled) 64)
-        (compress! s (-> s block))
-        (set! (-> s filled) 0)))
-    (while (<= (+ i 64) n)
-      (compress! s (+ p i))
-      (+= i 64))
-    (while (< i n)
-      (set! (@ (-> s block) (-> s filled)) (@ p i))
-      (+= (-> s filled) 1)
-      (+= i 1))))
-
-;; into takes the 32 bytes of the digest.
-(define (sha256-end! [s (ptr sha256)] [into (slice u8)])
-  (let ([bits (* (-> s length) 8)])
-    (set! (@ (-> s block) (-> s filled)) 128)
-    (+= (-> s filled) 1)
-    (when (> (-> s filled) 56)
-      (while (< (-> s filled) 64)
-        (set! (@ (-> s block) (-> s filled)) 0)
-        (+= (-> s filled) 1))
-      (compress! s (-> s block))
-      (set! (-> s filled) 0))
-    (while (< (-> s filled) 56)
-      (set! (@ (-> s block) (-> s filled)) 0)
-      (+= (-> s filled) 1))
-    (for ([i u32 0]) (< i 8) (+= i 1)
-      (set! (@ (-> s block) (+ 56 i)) (cast u8 (>> bits (* 8 (- 7 i))))))
-    (compress! s (-> s block))
-    (for ([i u32 0]) (< i 8) (+= i 1)
-      (let ([h (@ (-> s state) i)])
-        (set! (@ into (* i 4)) (cast u8 (>> h 24)))
-        (set! (@ into (+ (* i 4) 1)) (cast u8 (>> h 16)))
-        (set! (@ into (+ (* i 4) 2)) (cast u8 (>> h 8)))
-        (set! (@ into (+ (* i 4) 3)) (cast u8 h))))))
-
-(define (sha256-of [b (slice u8)] [into (slice u8)])
-  (let ([s sha256])
-    (sha256-init! (& s))
-    (sha256-add! (& s) b)
-    (sha256-end! (& s) into)))
+(provide (all-from-out sha256))

package/std/test/session.sub

@@ -20,7 +20,6 @@
 (define (run-session [file string])
   (let ([map (string->datum (setting "SUBSTRATE_MODULE_MAP"))])
     (set-toolchain-directory! (string->datum (setting "SUBSTRATE_TOOLCHAIN")))
-    (install-core!)
     (set-module-map-text! (file-text map) map)
     (set-cache-directory! (string->datum (setting "SUBSTRATE_CACHE")))
     (set-display-directory! (string->datum (parent-of file)))

package/substrate/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.3

package/substrate/compiler/checker.sub

@@ -349,7 +349,7 @@
     [_ #f]))
 
 (define (scalar! [t datum] [where datum]) -> datum
-  (unless (or (arithmetic? t) (address-type? t) (== t 'exnref) (== t 'bool) (view-type? t))
+  (unless (or (arithmetic? t) (address-type? t) (== t 'exnref) (== t 'bool) (view-type? t) (and (pair? t) (== (car t) 'tvar)))
     (substrate-error where "expected a number or pointer type, not ~s" `(,(shown t))))
   t)