@@ -1,6 +1,7 @@
 #!/bin/sh
 set -eu
-cd $(dirname "$0") # Change to this directory
+: ${__ORIG_PWD=$PWD}

@@ -2,2 +2,3 @@
 set -eu
-cd $(dirname "$0") # Change to this directory
+: ${__ORIG_PWD=$PWD}
+cd "$(dirname "$0")" # Change to this directory

@@ -74,3 +75,1 @@
-if [ "x${GERBIL_BUILD_CORES:-}" != "x" ]; then
-    echo "--- using ${GERBIL_BUILD_CORES} cores for the build"
-fi
+notify_cores() {

@@ -116,6 +116,7 @@ namespace: #f
        flags                         ; type-flags
        __table::t                    ; type-super
        fields                        ; type-fields
+       ;; TODO: fix the MOP so we can include __table::t in the precedence-list

@@ -165,3 +170,1 @@
-                  (&raw-table-test tab)
-                  (&raw-table-seed tab)
-                  (and (&raw-table-lock tab) (__make-inline-lock))))
+  (let* ((size  (raw-table-size-hint->size size-hint))

@@ -637,2 +647,3 @@
 (def (gc-table-new tab (size-hint #f))
-  (##structure (##structure-type tab) (table-new (&gc-table-gcht tab) size-hint) #f))
+  (##structure (##structure-type tab)
+               (__gc-table-new (if (fixnum? size-hint) size-hint 16)

@@ -705,3 +705,1 @@
-                   (char : :char)
-                   (start :~ nonnegative-fixnum? :- :fixnum :=  0))
-  (let ((len (string-length str)))
+                   criterion

@@ -718,3 +729,1 @@
-  (let* ((len (string-length str))
-         (start (if (fixnum? start) start (fx- len 1))))
-    (let lp ((k start))
+                    criterion

@@ -43,0 +44,4 @@
+      ;; In the large-write-unbuffered path (bio.whi==0, want>=buflen) bio.whi
+      ;; is never advanced by __bio-write, so we must do it here or
+      ;; get-memory-output-* will read zero bytes.
+      (set! mem.whi input-size)

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-cd $(dirname "$0")
+DIR="$(dirname "$0")"

@@ -724,2 +741,2 @@
-               k
-               (lp (fx- k 1))))))))
+                    criterion
+                    (end :? :fixnum := #f)

@@ -726,0 +742,4 @@
+                    (end :? :fixnum := #f)
+                    (start :~ nonnegative-fixnum? :- :fixnum :=  0))
+  (cond
+   ((not end) (set! end (string-length str)))

@@ -726,0 +744,4 @@
+  (cond
+   ((not end) (set! end (string-length str)))
+   ((not (and (nonnegative-fixnum? end) (fx<= end (string-length str))))
+    (error "invalid end for string-index" str end)))

@@ -726,0 +755,4 @@
+                           (char :- :char)
+                           (start :- :fixnum)
+                           (end :- :fixnum))
+  (let lp ((k (fx- end 1)))

@@ -79,0 +76,4 @@
+            (let (port (open-input-string expr))
+              (let loop ()
+                (let skip ()
+                  (let (c (peek-char port))

@@ -116,6 +116,7 @@ namespace: #f
        flags                         ; type-flags
        __table::t                    ; type-super
        fields                        ; type-fields
+       ;; TODO: fix the MOP so we can include __table::t in the precedence-list

@@ -162,14 +163,15 @@ namespace: #f
        flags                            ; type-flags
        __gc-table::t                    ; type-super
        fields                           ; type-fields
+       ;; TODO: fix the MOP so we can include __gc-table::t in the precedence-list

@@ -713,1 +708,3 @@
-               (lp (fx+ k 1))))))))
+                   criterion
+                   (start :~ nonnegative-fixnum? :- :fixnum :=  0)
+                   (end :? :fixnum := #f))

@@ -714,0 +708,4 @@
+                   criterion
+                   (start :~ nonnegative-fixnum? :- :fixnum :=  0)
+                   (end :? :fixnum := #f))
+  (unless end

@@ -714,0 +712,4 @@
+    (set! end (string-length str)))
+  (cond
+   ((< start 0)
+    (error "invalid start for string-index" str start))

@@ -726,0 +749,4 @@
+                    criterion
+                    (start :? :fixnum := #f)
+                    (end : :fixnum := 0))
+  (unless start

@@ -726,0 +753,4 @@
+    (set! start (fx- (string-length str) 1)))
+  (cond
+   ((>= start (string-length str))
+    (error "invalid start for string-rindex" str start))

@@ -232,3 +244,1 @@
-    (cond
-     ((agetq key alist) => (cut eq? <> #t))
-     (else #t)))
+  (def (all-slots-foo? key transparent?)

@@ -266,3 +278,3 @@
           (##fxior type-flag-id type-flag-concrete
                    (if final? 0 type-flag-extensible)
-                   (if opaque? type-flag-opaque 0)
+                   (if (and opaque? (not (agetq equal: properties))) type-flag-opaque 0)

@@ -714,0 +711,4 @@
+                   (start :~ nonnegative-fixnum? :- :fixnum :=  0)
+                   (end :? :fixnum := #f))
+  (unless end
+    (set! end (string-length str)))