diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-05 15:40:21 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-05 15:40:21 +0000 |
| commit | 104def0e400bbf3a0daed9e490e41485a9213c9d (patch) | |
| tree | 048611db2122fb44a02ed8b4e55a70642e2a95ad /src/boot | |
| parent | fb3bb6231462cddfb70301ea1672ebc04c8e829a (diff) | |
| download | open-axiom-104def0e400bbf3a0daed9e490e41485a9213c9d.tar.gz | |
more cleanup
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/strap/tokens.clisp | 3 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 12 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 2 | ||||
| -rw-r--r-- | src/boot/translator.boot | 10 |
4 files changed, 14 insertions, 13 deletions
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 0207ed51..2891cea0 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -65,7 +65,8 @@ ((OR (ATOM |bfVar#2|) (PROGN (SETQ |st| (CAR |bfVar#2|)) NIL)) (RETURN NIL)) - (T (HPUT |KeyTable| (CAR |st|) (CADR |st|)))) + (T (SETF (|tableValue| |KeyTable| (CAR |st|)) + (CADR |st|)))) (SETQ |bfVar#2| (CDR |bfVar#2|)))) |KeyTable|)))) diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index 7c48e9fe..0d3d6a67 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -844,7 +844,7 @@ ((NULL |a|) (|shoeNotFound| |fn|)) (T (SETQ |$lispWordTable| (MAKE-HASHTABLE 'EQ)) (DO-SYMBOLS (|i| (FIND-PACKAGE 'LISP)) - (HPUT |$lispWordTable| |i| T)) + (SETF (|tableValue| |$lispWordTable| |i|) T)) (SETQ |$bootDefined| (MAKE-HASHTABLE 'EQ)) (SETQ |$bootUsed| (MAKE-HASHTABLE 'EQ)) (SETQ |$bootDefinedTwice| NIL) (SETQ |$GenVarCounter| 0) @@ -1004,7 +1004,7 @@ (COND ((EQ |nee| 'TOP-LEVEL) |$bootDefinedTwice|) (T (CONS |nee| |$bootDefinedTwice|))))) - (T (HPUT |$bootDefined| |nee| T))) + (T (SETF (|tableValue| |$bootDefined| |nee|) T))) (|defuse1| |e| |niens|) (LET ((|bfVar#28| |$used|) (|i| NIL)) (LOOP @@ -1012,8 +1012,8 @@ ((OR (ATOM |bfVar#28|) (PROGN (SETQ |i| (CAR |bfVar#28|)) NIL)) (RETURN NIL)) - (T (HPUT |$bootUsed| |i| - (CONS |nee| (GETHASH |i| |$bootUsed|))))) + (T (SETF (|tableValue| |$bootUsed| |i|) + (CONS |nee| (|tableValue| |$bootUsed| |i|))))) (SETQ |bfVar#28| (CDR |bfVar#28|)))))))) (DEFUN |defuse1| (|e| |y|) @@ -1056,7 +1056,7 @@ ((OR (ATOM |bfVar#29|) (PROGN (SETQ |i| (CAR |bfVar#29|)) NIL)) (RETURN NIL)) - (T (HPUT |$bootDefined| |i| T))) + (T (SETF (|tableValue| |$bootDefined| |i|) T))) (SETQ |bfVar#29| (CDR |bfVar#29|)))) (|defuse1| (|append| |ndol| |e|) |b|)) ((AND (CONSP |y|) (EQ (CAR |y|) 'QUOTE)) (SETQ |a| (CDR |y|)) @@ -1146,7 +1146,7 @@ ((NULL |a|) (|shoeNotFound| |fn|)) (T (SETQ |$lispWordTable| (MAKE-HASHTABLE 'EQ)) (DO-SYMBOLS (|i| (FIND-PACKAGE 'LISP)) - (HPUT |$lispWordTable| |i| T)) + (SETF (|tableValue| |$lispWordTable| |i|) T)) (SETQ |$bootDefined| (MAKE-HASHTABLE 'EQ)) (SETQ |$bootUsed| (MAKE-HASHTABLE 'EQ)) (SETQ |$GenVarCounter| 0) (SETQ |$bfClamming| NIL) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index 0b4946d5..f0dbe004 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -130,7 +130,7 @@ shoeKeyWords == [ _ shoeKeyTableCons()== KeyTable:=MAKE_-HASHTABLE("CVEC") for st in shoeKeyWords repeat - HPUT(KeyTable,first st,second st) + tableValue(KeyTable,first st) := second st KeyTable shoeKeyTable:=shoeKeyTableCons() diff --git a/src/boot/translator.boot b/src/boot/translator.boot index d52ead6c..d258a78d 100644 --- a/src/boot/translator.boot +++ b/src/boot/translator.boot @@ -526,7 +526,7 @@ $lispWordTable := nil shoeDfu(a,fn)== a=nil => shoeNotFound fn $lispWordTable: local := MAKE_-HASHTABLE ("EQ") - DO_-SYMBOLS(i(FIND_-PACKAGE "LISP"),HPUT($lispWordTable,i,true)) + DO_-SYMBOLS(i(FIND_-PACKAGE "LISP"),tableValue($lispWordTable,i) := true) $bootDefined: local :=MAKE_-HASHTABLE "EQ" $bootUsed:local := MAKE_-HASHTABLE "EQ" $bootDefinedTwice: local := nil @@ -572,10 +572,10 @@ defuse(e,x)== $bootDefinedTwice:= nee="TOP-LEVEL"=> $bootDefinedTwice [nee,:$bootDefinedTwice] - else HPUT($bootDefined,nee,true) + else tableValue($bootDefined,nee) := true defuse1 (e,niens) for i in $used repeat - HPUT($bootUsed,i,[nee,:GETHASH(i,$bootUsed)]) + tableValue($bootUsed,i) := [nee,:tableValue($bootUsed,i)] defuse1(e,y)== atom y => @@ -590,7 +590,7 @@ defuse1(e,y)== y is ["PROG",a,:b]=> [dol,ndol]:=defSeparate a for i in dol repeat - HPUT($bootDefined,i,true) + tableValue($bootDefined,i) := true defuse1 (append(ndol,e),b) y is ["QUOTE",:a] => [] y is ["+LINE",:a] => [] @@ -643,7 +643,7 @@ XREF fn== shoeXref(a,fn)== a = nil => shoeNotFound fn $lispWordTable: local := MAKE_-HASHTABLE ("EQ") - DO_-SYMBOLS(i(FIND_-PACKAGE "LISP"),HPUT($lispWordTable,i,true)) + DO_-SYMBOLS(i(FIND_-PACKAGE "LISP"),tableValue($lispWordTable,i) := true) $bootDefined: local := MAKE_-HASHTABLE "EQ" $bootUsed: local := MAKE_-HASHTABLE "EQ" $GenVarCounter: local := 0 |