diff options
| author | Gabriel Dos Reis <gdr@axiomatics.org> | 2015-12-25 05:32:16 -0800 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@axiomatics.org> | 2015-12-25 05:32:16 -0800 |
| commit | 8ec8acf2a4c9bc6219164111ca9141ff49d8d386 (patch) | |
| tree | dd71e0d6d18f8dc81d05ad977e082e9b66df8da2 /src/boot/strap | |
| parent | b200f025ccb0b684ff63844dbdddb3f4fa8048df (diff) | |
| download | open-axiom-8ec8acf2a4c9bc6219164111ca9141ff49d8d386.tar.gz | |
Do not rename 'apply'.
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/ast.clisp | 7 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 5c3e7db8..70ce6984 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -2865,7 +2865,7 @@ (DEFUN |translateForm| (|x|) (LET* (|ISTMP#2| |bindings| |init| |var| |ys| |args| |fun| |ISTMP#1|) (COND ((NOT (CONSP |x|)) |x|) ((EQ (CAR |x|) 'QUOTE) |x|) - ((AND (EQ (CAR |x|) 'APPLY) + ((AND (EQ (CAR |x|) '|apply|) (PROGN (SETQ |ISTMP#1| (CDR |x|)) (AND (CONSP |ISTMP#1|) @@ -2876,8 +2876,7 @@ (COND ((EQ (|lastItem| |args|) 'NIL) (CONS 'FUNCALL - (CONS (|translateForm| |fun|) - (|listMap!| (|butLast!| |args|) #'|translateForm|)))) + (|listMap!| (|butLast!| (CDR |x|)) #'|translateForm|))) ((AND (CONSP |args|) (NULL (CDR |args|)) (PROGN (SETQ |ISTMP#1| (CAR |args|)) @@ -2886,7 +2885,7 @@ (CONS 'FUNCALL (CONS (|translateForm| |fun|) (|listMap!| |ys| #'|translateForm|)))) - (T (|listMap!| |x| #'|translateForm|)))) + (T (CONS 'APPLY (|listMap!| (CDR |x|) #'|translateForm|))))) ((EQ (CAR |x|) 'LET) (SETQ |bindings| (LET ((|bfVar#3| NIL) diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 9f975637..9b396a86 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -205,9 +205,9 @@ (LIST (LIST '|abs| 'ABS) (LIST '|abstractChar| 'CODE-CHAR) (LIST '|alphabetic?| 'ALPHA-CHAR-P) (LIST '|alphanumeric?| 'ALPHANUMERICP) (LIST '|and| 'AND) - (LIST '|apply| 'APPLY) (LIST '|array?| 'ARRAYP) - (LIST '|arrayRef| 'AREF) (LIST '|atom| 'ATOM) - (LIST '|bitref| 'SBIT) (LIST '|canonicalFilename| 'PROBE-FILE) + (LIST '|array?| 'ARRAYP) (LIST '|arrayRef| 'AREF) + (LIST '|atom| 'ATOM) (LIST '|bitref| 'SBIT) + (LIST '|canonicalFilename| 'PROBE-FILE) (LIST '|charByName| 'NAME-CHAR) (LIST '|charDowncase| 'CHAR-DOWNCASE) (LIST '|charEq?| 'CHAR=) (LIST '|charUpcase| 'CHAR-UPCASE) (LIST '|charString| 'STRING) |