3 files changed, 9 insertions, 9 deletions

diff --git a/src/boot/initial-env.lisp b/src/boot/initial-env.lisp
index dc767443..7e2deef9 100644
--- a/src/boot/initial-env.lisp
+++ b/src/boot/initial-env.lisp
@@ -167,9 +167,6 @@
 (defun make-bvec (n)
   (bvec-make-full n 0))
  
-(defun bvec-setelt (bv i x)
-  (setf (sbit bv i) x))
-
 (defun |shoeReadLisp| (s n)
   (multiple-value-list (read-from-string s nil nil :start n)))
 
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 97359744..6888f321 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -133,7 +133,7 @@
           (LOOP
             (COND
               ((> |i| 255) (RETURN NIL))
-              (T (BVEC-SETELT |a| |i| 0)))
+              (T (SETF (SBIT |a| |i|) 0)))
             (SETQ |i| (+ |i| 1))))
         (LET ((|bfVar#6| |listing|) (|k| NIL))
           (LOOP
@@ -142,8 +142,8 @@
                    (PROGN (SETQ |k| (CAR |bfVar#6|)) NIL))
                (RETURN NIL))
               (T (COND
-                   ((NOT (|shoeStartsId| (ELT |k| 0)))
-                    (BVEC-SETELT |a| (CHAR-CODE (SCHAR |k| 0)) 1)))))
+                   ((|shoeStartsId| (ELT |k| 0)) NIL)
+                   (T (SETF (SBIT |a| (CHAR-CODE (SCHAR |k| 0))) 1)))))
             (SETQ |bfVar#6| (CDR |bfVar#6|))))
         |a|))))
 
@@ -201,6 +201,7 @@
                   (LIST '|alphanumeric?| 'ALPHANUMERICP)
                   (LIST '|and| 'AND) (LIST '|append| 'APPEND)
                   (LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM)
+                  (LIST '|bitmask| 'SBIT)
                   (LIST '|canonicalFilename| 'PROBE-FILE)
                   (LIST '|charString| 'STRING)
                   (LIST '|char?| 'CHARACTERP)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 4e1a8ac3..9647e0e5 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -167,10 +167,11 @@ shoeDict:=shoeDictCons()
 shoePunCons()==
   listing := HKEYS shoeKeyTable
   a := MAKE_-BVEC 256
-  for i in 0..255 repeat BVEC_-SETELT(a,i,0)
+  for i in 0..255 repeat
+    bitmask(a,i) := 0
   for k in listing repeat
-     if not shoeStartsId k.0
-     then BVEC_-SETELT(a,codePoint stringChar(k,0),1)
+    shoeStartsId k.0 => nil
+    bitmask(a,codePoint stringChar(k,0)) := 1
   a
  
 shoePun:=shoePunCons()
@@ -245,6 +246,7 @@ for i in [ _
   ["append",    "APPEND"]  , _
   ["apply",      "APPLY"]  , _
   ["atom",        "ATOM"]  , _
+  ["bitmask",   "SBIT"] , _
   ["canonicalFilename", "PROBE-FILE"], _
   ["charString", "STRING"] , _
   ["char?", "CHARACTERP"]  , _