aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/boot/ast.boot8
-rw-r--r--src/boot/strap/ast.clisp8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 2b52c761..b2278564 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -121,10 +121,10 @@ bfGenSymbol()==
$GenVarCounter:=$GenVarCounter+1
INTERN(CONCAT ('"bfVar#",STRINGIMAGE $GenVarCounter))
-bfListOf: %List -> %list
+bfListOf: %List -> %List
bfListOf x==x
-bfListOf: %Thing -> %List
+bfColon: %Thing -> %List
bfColon x== ["COLON",x]
bfColonColon: (%Thing,%Symbol) -> %Symbol
@@ -1112,7 +1112,7 @@ bfCase(x,y)==
c:=bfCaseItems (g1,y)
bfMKPROGN [a,b,["CASE",["CAR", g],:c]]
-bfCaseItem: (%thing,%List) -> %List
+bfCaseItems: (%Thing,%List) -> %List
bfCaseItems(g,x) ==
[bfCI(g,i,j) for [i,j] in x]
@@ -1129,7 +1129,7 @@ bfCARCDR: (%Short,%Thing) -> %List
bfCARCDR(n,g) ==
[INTERN CONCAT ('"CA",bfDs n,'"R"),g]
-bfDs: %Short -> %Symbol
+bfDs: %Short -> %String
bfDs n==
if n=0 then '"" else CONCAT('"D",bfDs(n-1))
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 83d6f8c1..3fc9fc07 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -139,11 +139,11 @@
(SETQ |$GenVarCounter| (+ |$GenVarCounter| 1))
(INTERN (CONCAT "bfVar#" (STRINGIMAGE |$GenVarCounter|)))))))
-(DECLAIM (FTYPE (FUNCTION (|%List|) |%list|) |bfListOf|))
+(DECLAIM (FTYPE (FUNCTION (|%List|) |%List|) |bfListOf|))
(DEFUN |bfListOf| (|x|) (PROG () (RETURN |x|)))
-(DECLAIM (FTYPE (FUNCTION (|%Thing|) |%List|) |bfListOf|))
+(DECLAIM (FTYPE (FUNCTION (|%Thing|) |%List|) |bfColon|))
(DEFUN |bfColon| (|x|) (PROG () (RETURN (LIST 'COLON |x|))))
@@ -2092,7 +2092,7 @@
(|bfMKPROGN|
(LIST |a| |b| (CONS 'CASE (CONS (LIST 'CAR |g|) |c|))))))))
-(DECLAIM (FTYPE (FUNCTION (|%thing| |%List|) |%List|) |bfCaseItem|))
+(DECLAIM (FTYPE (FUNCTION (|%Thing| |%List|) |%List|) |bfCaseItems|))
(DEFUN |bfCaseItems| (|g| |x|)
(PROG (|j| |ISTMP#1| |i|)
@@ -2146,7 +2146,7 @@
(PROG ()
(RETURN (LIST (INTERN (CONCAT "CA" (|bfDs| |n|) "R")) |g|))))
-(DECLAIM (FTYPE (FUNCTION (|%Short|) |%Symbol|) |bfDs|))
+(DECLAIM (FTYPE (FUNCTION (|%Short|) |%String|) |bfDs|))
(DEFUN |bfDs| (|n|)
(PROG ()