aboutsummaryrefslogtreecommitdiff
path: root/src/boot/strap
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot/strap')
-rw-r--r--src/boot/strap/ast.clisp2
-rw-r--r--src/boot/strap/tokens.clisp6
-rw-r--r--src/boot/strap/utility.clisp6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 70ce6984..4cb50b33 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -2874,7 +2874,7 @@
(SETQ |args| (CDR |ISTMP#1|))
T))))
(COND
- ((EQ (|lastItem| |args|) 'NIL)
+ ((EQ (|last| |args|) 'NIL)
(CONS 'FUNCALL
(|listMap!| (|butLast!| (CDR |x|)) #'|translateForm|)))
((AND (CONSP |args|) (NULL (CDR |args|))
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 9b396a86..aede083d 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -216,8 +216,8 @@
(LIST '|copyString| 'COPY-SEQ) (LIST '|copyVector| 'COPY-SEQ)
(LIST '|croak| 'CROAK) (LIST '|digit?| 'DIGIT-CHAR-P)
(LIST '|exit| 'EXIT) (LIST '|false| 'NIL) (LIST '|fifth| 'FIFTH)
- (LIST '|first| 'CAR) (LIST '|filePath| 'PATHNAME)
- (LIST '|filePath?| 'PATHNAMEP)
+ (LIST '|first| 'CAR) (LIST '|fileNameString| 'FILE-NAMESTRING)
+ (LIST '|filePath| 'PATHNAME) (LIST '|filePath?| 'PATHNAMEP)
(LIST '|filePathDirectory| 'PATHNAME-DIRECTORY)
(LIST '|filePathName| 'PATHNAME-NAME)
(LIST '|filePathString| 'NAMESTRING)
@@ -230,7 +230,7 @@
(LIST 'LAST '|last|) (LIST '|list| 'LIST) (LIST '|listEq?| 'EQUAL)
(LIST '|lowerCase?| 'LOWER-CASE-P)
(LIST '|makeFilePath| 'MAKE-PATHNAME) (LIST '|makeSymbol| 'INTERN)
- (LIST '|mergeFilePaths| 'MERGE-PATHNAMES) (LIST '|mkpf| 'MKPF)
+ (LIST '|mergeFilePaths| 'MERGE-PATHNAMES)
(LIST '|newVector| 'MAKE-ARRAY) (LIST '|nil| NIL)
(LIST '|not| 'NOT) (LIST '|null| 'NULL) (LIST '|odd?| 'ODDP)
(LIST '|or| 'OR) (LIST '|otherwise| 'T) (LIST '|property| 'GET)
diff --git a/src/boot/strap/utility.clisp b/src/boot/strap/utility.clisp
index 784ec366..c998e665 100644
--- a/src/boot/strap/utility.clisp
+++ b/src/boot/strap/utility.clisp
@@ -19,7 +19,7 @@
|scalarMember?| |listMember?| |reverse| |reverse!|
|lastNode| |append| |append!| |copyList| |substitute|
|substitute!| |listMap| |listMap!| |butLast| |butLast!|
- |lastItem| |setDifference| |setUnion| |setIntersection|
+ |last| |setDifference| |setUnion| |setIntersection|
|symbolAssoc| |applySubst| |applySubst!| |applySubstNQ|
|objectAssoc| |invertSubst| |substTarget| |substSource|
|remove| |removeSymbol| |atomic?| |every?| |any?| |take|
@@ -44,7 +44,7 @@
(FTYPE (FUNCTION ((|%List| |%Thing|)) (|%Maybe| (|%Node| |%Thing|)))
|lastNode|))
-(DECLAIM (FTYPE (FUNCTION ((|%List| |%Thing|)) |%Thing|) |lastItem|))
+(DECLAIM (FTYPE (FUNCTION ((|%List| |%Thing|)) |%Thing|) |last|))
(DECLAIM (FTYPE (FUNCTION ((|%List| |%Thing|)) (|%List| |%Thing|)) |butLast|))
@@ -261,7 +261,7 @@
(T (SETQ |l| |l'|))))
|l|)))
-(DEFUN |lastItem| (|l|) (CAR (|lastNode| |l|)))
+(DEFUN |last| (|l|) (CAR (|lastNode| |l|)))
(DEFUN |butLast| (|l|)
(LET* (|xs| |LETTMP#1|)