From 751f5dd0f97c1c6e53dcb0ca118f1a8b5cb7fc59 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 18 Dec 2010 14:21:42 +0000
Subject: 	* boot/initial-env.lisp (VEC-SETELT): Remove. 	*
 boot/scanner.boot (shoeIntValue): Tidy. 	(shoeSubString): Likewise. 
 * boot/tokens.boot (shoeInsert): Likewise. 	(shoeDictCons): Likewise.

---
 src/boot/tokens.boot | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/boot/tokens.boot')

diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 789a2002..9103d5e9 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -140,27 +140,31 @@ shoeTAB == 9
 shoeInsert(s,d) ==
       l := #s
       h := QENUM(s,0)
-      u := ELT(d,h)
+      u := d.h
       n := #u
       k:=0
-      while l <= #(ELT(u,k)) repeat
+      while l <= #u.k repeat
           k:=k+1
       v := MAKE_-VEC(n+1)
-      for i in 0..k-1 repeat VEC_-SETELT(v,i,ELT(u,i))
-      VEC_-SETELT(v,k,s)
-      for i in k..n-1 repeat VEC_-SETELT(v,i+1,ELT(u,i))
-      VEC_-SETELT(d,h,v)
+      for i in 0..k-1 repeat
+        v.i := u.i
+      v.k := s
+      for i in k..n-1 repeat
+        v.(i+1) := u.i
+      d.h := v
       s
  
 shoeDictCons()==
-      l:= HKEYS shoeKeyTable
+      l := HKEYS shoeKeyTable
       d :=
-          a:=MAKE_-VEC(256)
-          b:=MAKE_-VEC(1)
-          VEC_-SETELT(b,0,MAKE_-CVEC 0)
-          for i in 0..255 repeat VEC_-SETELT(a,i,b)
+          a := MAKE_-VEC(256)
+          b := MAKE_-VEC(1)
+          b.0 := MAKE_-CVEC 0
+          for i in 0..255 repeat
+            a.i := b
           a
-      for s in l repeat shoeInsert(s,d)
+      for s in l repeat
+        shoeInsert(s,d)
       d
  
 shoeDict:=shoeDictCons()
-- 
cgit v1.2.3