rename PUSH to push! and pop to pop!.

Issue #33.

demo/bignum.scm

@@ -30,7 +30,7 @@
   (let ((r '()))
     ;; iterate in reverse to accumulate
     (for-range-rev i (vlen digs)
-      (PUSH r (format (zpad big/repr-width (hex digs[i])))))
+      (push! r (format (zpad big/repr-width (hex digs[i])))))
     (format (join "." r))))
 
 ;; eventually we'll add support to the reader for big literals
@@ -987,11 +987,11 @@
     (while (> nbits 0)
       ;; make sure we have some bits
       (when (= bbits 0)
-        (set! byte (pop bytes))
+        (set! byte (pop! bytes))
         (set! bbits 8))
       ;; start a new digit if we need to
       (when (= dbits 0)
-        (PUSH digits digit)
+        (push! digits digit)
         (set! digit 0)
         (set! dbits big/bits))
       ;; roll some bits in
@@ -1002,7 +1002,7 @@
         (dec! nbits bits)
         (set! byte (logand byte (- (<< 1 bits) 1)))
         ))
-    (PUSH digits digit)
+    (push! digits digit)
     (reverse digits)
     ))
 
@@ -1034,11 +1034,11 @@
     (while (> nbits 0)
       ;; make sure we have some bits
       (when (= dbits 0)
-        (set! digit (pop digits))
+        (set! digit (pop! digits))
         (set! dbits big/bits))
       ;; start a new byte if we need to
       (when (= bbits 0)
-        (PUSH bytes byte)
+        (push! bytes byte)
         (set! byte 0)
         (set! bbits 8))
       ;; roll some bits in
@@ -1052,7 +1052,7 @@
         (dec! bbits bits)
         (dec! nbits bits)
       ))
-    (PUSH bytes byte)
+    (push! bytes byte)
     (remove-zeros bytes)
     ))
 

demo/brainfuck.scm

@@ -31,7 +31,7 @@
              #\, -> (loop (cons (insn:in) code) (+ i 1))
              #\[ -> (let ((sub (P))
                           (len (length sub)))
-                      (PUSH code (insn:left len))
+                      (push! code (insn:left len))
                       (loop (append sub code) (+ i len)))
              #\] -> (let ((len (length code)))
                       (cons (insn:right (+ len 1)) code))

demo/frb.scm

@@ -110,12 +110,12 @@
 ;; some way to do these using foldr?
 (define (tree/keys t)
   (let ((r '()))
-    (tree/reverse (lambda (k v) (PUSH r k)) t)
+    (tree/reverse (lambda (k v) (push! r k)) t)
     r))
 
 (define (tree/values t)
   (let ((r '()))
-    (tree/reverse (lambda (k v) (PUSH r v)) t)
+    (tree/reverse (lambda (k v) (push! r v)) t)
     r))
 
 (define tree/dump

demo/maze/ascii.scm

@@ -126,7 +126,7 @@
 (define (graph->base85 G m n)
   (let ((result '()))
     (for ch (b85-enc (bytegen G m n))
-      (PUSH result ch))
+      (push! result ch))
     (printf (list->string (reverse result)) "\n")
     ))
 

demo/maze/js.scm

@@ -61,12 +61,12 @@ function draw_maze (data, w, h, s) {
           (for-range x m
             (let ((walls G[(+ x (* y m))]))
               (match (bit-set? walls 3) (bit-set? walls 1) with
-                #t #t -> (PUSH line #\T)
-                #t #f -> (PUSH line #\U)
-                #f #t -> (PUSH line #\L)
-                #f #f -> (PUSH line #\space)
+                #t #t -> (push! line #\T)
+                #t #f -> (push! line #\U)
+                #f #t -> (push! line #\L)
+                #f #f -> (push! line #\space)
                 )))
-          (PUSH lines (list->string (reverse line)))
+          (push! lines (list->string (reverse line)))
           (set! line '()))
         (emitf "maze_data = [\n")
         (for-list line (reverse lines)

demo/maze/solve.scm

@@ -47,7 +47,7 @@
             (when (not (bit-set? walls i))
               (let ((node0 (move node (<< 1 i))))
                 (when (not visited[node0])
-                  (PUSH r node0)))))
+                  (push! r node0)))))
           r))
 
       (define (search node dx path)

demo/maze/svg2.scm

@@ -86,9 +86,9 @@
           (let ((walls G[(+ x (* y m))]))
             (match (bit-set? walls 3) (bit-set? walls 1) with
               ;; U L
-              #t #f -> (PUSH u y)
-              #f #t -> (PUSH l y)
-              #t #t -> (PUSH ul y)
+              #t #f -> (push! u y)
+              #f #t -> (push! l y)
+              #t #t -> (push! ul y)
               _ _   -> #u
               )))
         ;; draw a column of each of the markers placed.

demo/parse/antlr2irken/antlr2irken.scm

@@ -296,7 +296,7 @@
     (define (replace-rule exp make)
       (let ((index (cmap/add rule-map exp))
             (new-name (string->symbol (format (sym name) "-" (int index)))))
-        (PUSH new-rules (make new-name exp))
+        (push! new-rules (make new-name exp))
         (exp:name new-name)))
 
     (define walk-exp
@@ -340,8 +340,8 @@
                        (for-list mhi hd0
                          (for-list tli tl0
                            (match mhi with
-                             (maybe:yes hi) -> (PUSH r (list:cons hi tli))
-                             (maybe:no)     -> (PUSH r tli)
+                             (maybe:yes hi) -> (push! r (list:cons hi tli))
+                             (maybe:no)     -> (push! r tli)
                              )))
                        ;; (printf "recur: => ") (printn r)
                        (reverse r)))
@@ -369,7 +369,7 @@
     (let ((new-alts '()))
       (for-list alt alts
         (for-list alt0 (process-alt alt)
-          (PUSH new-alts alt0)))
+          (push! new-alts alt0)))
       (:tuple (reverse new-alts) (reverse new-rules))
       )))
 
@@ -386,7 +386,7 @@
       (match rule with
         (rule:parse name exp)
         -> (let (((new-alts new-rules) (convert-rule name (exp->alts exp))))
-             (PUSH result (rule:parse name (exp:or new-alts)))
+             (push! result (rule:parse name (exp:or new-alts)))
              (for-list new-rule new-rules
                (queue/add! fifo new-rule)))
         other
@@ -416,7 +416,7 @@
   (let ((chars (string->list (read-antlr-string s)))
         (r '()))
     (for-list ch chars
-      (PUSH r (rx:sym (charset/single (char->int ch)))))
+      (push! r (rx:sym (charset/single (char->int ch)))))
     (nary->binary rx:cat (reverse r))))
 
 (define (cs->rx s)
@@ -504,7 +504,7 @@
       (for-list exp exps
         (match exp with
           (exp:literal lit)
-          -> (PUSH lits (lit->rx lit))
+          -> (push! lits (lit->rx lit))
           _ -> (raise (:ANTLR2Irken/UnexpectedGrammarItem (rule-repr rule)))
           ))
       (nary->binary rx:or lits)))
@@ -595,12 +595,12 @@
           (lexicon '()))
       (for-list rule new-rules
         (let (((rrxmap0 earley-rule) (rule->earley rrxmap rule)))
-          (PUSH earley-rules earley-rule)
+          (push! earley-rules earley-rule)
           (set! rrxmap rrxmap0)))
       (set! used-terminals (collect-used-terminals used-terminals earley-rules))
       (for-map rx name rrxmap
         (when (set/member? used-terminals symbol-index-cmp name)
-          (PUSH lexicon (sexp (sym name) (rx->sexp rx)))))
+          (push! lexicon (sexp (sym name) (rx->sexp rx)))))
       (printf ";; -*- Mode: Lisp -*-\n")
       (pp (sexp (sym 'parser)
                 (sexp1 'lexicon (reverse lexicon))

demo/parse/antlr2sexp.scm

@@ -28,7 +28,7 @@
           (r '()))
       (alist/iterate
        (lambda (name alts)
-         (PUSH r (sexp1 name (map prods->sexp alts))))
+         (push! r (sexp1 name (map prods->sexp alts))))
        gram)
       (printf ";; -*- Mode: Irken -*-\n\n")
       (printf ";; generated by " sys.argv[0] " from " sys.argv[1] "\n")

demo/repl/repl.scm

@@ -137,7 +137,7 @@
     (for-list rand rands
       (match rand with
         (sexp:symbol name)
-        -> (begin (PUSH formals name) (univ:undef))
+        -> (begin (push! formals name) (univ:undef))
         _ -> (repl-error (format "bad formals: " (repr (sexp:list rands))))
         ))
     (univ:function (reverse formals) body)

doom/dns.scm

@@ -330,10 +330,10 @@
       (printf "reply truncated\n")
       (raise (:DNSTruncated)))
     (printf "header: " (dnsheader-repr h) "\n")
-    (for-range i h.qdcount (PUSH r.qd (unpack-question)))
-    (for-range i h.ancount (PUSH r.an (unpack-rr)))
-    (for-range i h.nscount (PUSH r.ns (unpack-rr)))
-    (for-range i h.arcount (PUSH r.ar (unpack-rr)))
+    (for-range i h.qdcount (push! r.qd (unpack-question)))
+    (for-range i h.ancount (push! r.an (unpack-rr)))
+    (for-range i h.nscount (push! r.ns (unpack-rr)))
+    (for-range i h.arcount (push! r.ar (unpack-rr)))
     (:tuple h r)
     ))
 

doom/http/hpack.scm

@@ -175,7 +175,7 @@
         (left 8)
         (byte 0))
     (define (emit-byte)
-      (PUSH data (int->char byte))
+      (push! data (int->char byte))
       (set! left 8)
       (set! byte 0))
     (define (emit n bits)
@@ -225,7 +225,7 @@
     (while (>= bits 5) ;; shortest code is 5 bits.
       (let loop ((t huffman-table))
         (match t with
-          (hufftree:leaf val) -> (PUSH r (int->char val))
+          (hufftree:leaf val) -> (push! r (int->char val))
           (hufftree:node L R) -> (if (> bits 0) (loop (if (get-bit) R L)))
           )))
     (list->string (reverse r))
@@ -320,7 +320,7 @@
         (tree/range
          map magic-cmp
          (:tuple name "") (:tuple name "\xff")
-         (lambda (k v) (PUSH range (:tuple k v))))
+         (lambda (k v) (push! range (:tuple k v))))
         (reverse range)))
 
     (define (lookup-name-only map name)
@@ -471,7 +471,7 @@
                  (table.set-size (get-integer 5)))
                 (else
                  (let ((r0 (get-header)))
-                   (PUSH r r0)))))
+                   (push! r r0)))))
         (reverse r)))
 
     unpack
@@ -486,11 +486,11 @@
         (never (set/empty)))
 
     (define (emit byte)
-      (PUSH data (int->char byte)))
+      (push! data (int->char byte)))
 
     (define (emit-string s)
       (for-string ch s
-        (PUSH data ch)))
+        (push! data ch)))
 
     (define (emit-integer n0 bits n1)
       (let ((mask masks[bits]))
@@ -564,8 +564,8 @@
           (match header with
             (:tuple name val)
             -> (if (eq? (string-ref name 0) #\:)
-                   (PUSH pseudo header)
-                   (PUSH normal header))))
+                   (push! pseudo header)
+                   (push! normal header))))
         (for-list header (append (reverse pseudo) (reverse normal))
           (match header with
             (:tuple name val)

doom/http/websocket.scm

@@ -60,7 +60,7 @@
     (define (pack-uint c n)
       (let ((r (list:nil)))
         (for-range i c
-          (PUSH r (int->char (logand #xff n)))
+          (push! r (int->char (logand #xff n)))
           (set! n (>> n 8)))
         (list->string r)))
 

doom/s2n.scm

@@ -208,7 +208,7 @@
               (let ((recvd (recv0)))
                 (when (= recvd 0)
                   (raise (:Doom/EOF sock)))
-                (PUSH parts (buffer/get! ibuf (min left recvd)))
+                (push! parts (buffer/get! ibuf (min left recvd)))
                 (dec! left (min left recvd))
                 ))
             (string-concat (reverse parts)))))

doom/socket.scm

@@ -92,7 +92,7 @@
               (let ((recvd (loop-nb-read sock.fd (sock/recv sock ibuf))))
                 (when (= recvd 0)
                   (raise (:Doom/EOF sock)))
-                (PUSH parts (buffer/get! ibuf (min left recvd)))
+                (push! parts (buffer/get! ibuf (min left recvd)))
                 (dec! left (min left recvd))
                 ))
             (string-concat (reverse parts)))))

doom/tls/codec.scm

@@ -21,7 +21,7 @@
 
     (define (assure n)
       (when (> n (- blen pos))
-        (PUSH current buf)
+        (push! current buf)
         (let (((fkind frag) (get-fragment))
               (flen (string-length frag)))
           (when (not (or (= kind -1) (= fkind kind)))
@@ -215,7 +215,7 @@
               (last (substring buf 0 pos))
               (pkt (string-concat (reverse (list:cons last current))))
               (plen (string-length pkt)))
-          (PUSH records {raw=pkt record=record kind=kind version=#x303 length=plen})))
+          (push! records {raw=pkt record=record kind=kind version=#x303 length=plen})))
       (reverse records))
     ))
 

doom/tls/keysched.scm

@@ -64,7 +64,7 @@
         ))
 
     (define (add-tscript-packet pkt)
-      (PUSH tscript pkt))
+      (push! tscript pkt))
 
     (define (get-tscript-hash)
       (let ((h (hash.make)))
@@ -101,9 +101,9 @@
             (chunk (rope:leaf zeros))
             (padding '()))
         (when (> r 0)
-          (PUSH padding (rope:leaf (substring zeros 0 r))))
+          (push! padding (rope:leaf (substring zeros 0 r))))
         (for-range i q
-          (PUSH padding chunk))
+          (push! padding chunk))
         (rope/cat padding)))
 
     ;; how to encrypt pkt[s]: