diff options
| -rw-r--r-- | src/boot/strap/ast.clisp | 2 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 6 | ||||
| -rw-r--r-- | src/boot/strap/utility.clisp | 6 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 1 | ||||
| -rw-r--r-- | src/interp/debug.lisp | 2 | ||||
| -rw-r--r-- | src/interp/sys-macros.lisp | 14 |
6 files changed, 15 insertions, 16 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|) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index 3a444433..972c43a1 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -308,7 +308,6 @@ for i in [ _ ["makeFilePath", "MAKE-PATHNAME"] , _ ["makeSymbol", "INTERN"] , _ ["mergeFilePaths", "MERGE-PATHNAMES"] , _ - ["mkpf", "MKPF"] , _ ["newVector", "MAKE-ARRAY"], _ ["nil" ,NIL ] , _ ["not", "NOT"] , _ diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp index 73f32cb6..823c5452 100644 --- a/src/interp/debug.lisp +++ b/src/interp/debug.lisp @@ -560,7 +560,7 @@ EXAMINE (SETQ RECNO (NOTE |$InputStream|)) (TRACE_OPTION_ERROR 'DEPTH)) T)) (SETQ CONDITION - (MKPF + (|mkpf| (LIST CONDITION WITHIN_CONDITION FROM_CONDITION COUNT_CONDITION DEPTH_CONDITION ) 'AND)) diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp index 871a9668..a1f5161d 100644 --- a/src/interp/sys-macros.lisp +++ b/src/interp/sys-macros.lisp @@ -383,11 +383,11 @@ ((EQUAL (CAR L) (CADR L)) '(ZERO)) ((|member| (CAR L) '(0 (ZERO))) - (MKPF (CDR L) 'MINUS)) + (|mkpf| (CDR L) 'MINUS)) ((|member| (CADR L) '(0 (ZERO))) (CAR L)) ((EQCAR (CADR L) 'MINUS) - (MKPF (LIST (CAR L) (CADADR L)) 'PLUS)) + (|mkpf| (LIST (CAR L) (CADADR L)) 'PLUS)) ((CONS 'DIFFERENCE L)) )) (EXPT (COND ((GREATERP (LENGTH L) 2) @@ -478,10 +478,10 @@ (REMFLAG (CDR L) KEY)))) - (FLAG '(* + AND |and| OR |or| PROGN) 'NARY) ; flag for MKPF + (FLAG '(* + AND |and| OR |or| PROGN) 'NARY) ; flag for |mkpf| - (defun MKPF (L OP) + (defun |mkpf| (L OP) (if (FLAGP OP 'NARY) (SETQ L (MKPFFLATTEN-1 L OP NIL))) (MKPF1 L OP)) @@ -509,7 +509,7 @@ ((ATOM X) (LIST 'spadDO (|reverse!| IL) - (LIST (MKPF (|reverse!| XCL) 'OR) XV) + (LIST (|mkpf| (|reverse!| XCL) 'OR) XV) (SEQOPT (CONS 'SEQ (|append!| (|reverse!| RSL) (LIST (LIST 'EXIT BD))))))) (COND ((ATOM (CAR X)) @@ -645,7 +645,7 @@ '(EXIT RESET IN ON GSTEP ISTEP STEP GENERAL UNTIL WHILE SUCHTHAT EXIT)) (REPEAT-TRAN (CDR L) (CONS (CAR L) LP))) - ((CONS (|reverse!| LP) (MKPF L 'PROGN))))) + ((CONS (|reverse!| LP) (|mkpf| L 'PROGN))))) (defun MK_LEFORM (U) (COND ((|ident?| U) @@ -954,7 +954,7 @@ ((NULL (EQCAR (CAR L) 'SEQ)) (SETQ BODYFORMS (CONS 'SEQ L))) ((SETQ BODYFORMS (CAR L))))) - (SETQ EXITFORMS `(EXIT ,(MKPF EXITFORMS 'PROGN))) + (SETQ EXITFORMS `(EXIT ,(|mkpf| EXITFORMS 'PROGN))) (AND ENDTEST (SETQ ENDTEST (LIST 'COND (LIST ENDTEST '(GO G191))))) (COND ((NULL U-VARS) |