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 | |
| parent | b200f025ccb0b684ff63844dbdddb3f4fa8048df (diff) | |
| download | open-axiom-8ec8acf2a4c9bc6219164111ca9141ff49d8d386.tar.gz | |
Do not rename 'apply'.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/boot/ast.boot | 6 | ||||
| -rw-r--r-- | src/boot/strap/ast.clisp | 7 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 6 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 3 |
5 files changed, 14 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c13c2d95..4a0368a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-12-25 Gabriel Dos Reis <gdr@axiomatics.org> + + * boot/tokens.boot: Do not rename 'apply'. + 2015-12-24 Gabriel Dos Reis <gdr@axiomatics.org> * boot/ast.boot (translateForm): New. diff --git a/src/boot/ast.boot b/src/boot/ast.boot index c741a315..986338f3 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -1474,12 +1474,12 @@ genTypeAlias(head,body) == translateForm x == x isnt [.,:.] => x x.op is 'QUOTE => x - x.op is 'APPLY and x.args is [fun,:args] => + x.op is 'apply and x.args is [fun,:args] => lastItem args = 'NIL => - ['FUNCALL,translateForm fun,:listMap!(butLast! args,function translateForm)] + ['FUNCALL,:listMap!(butLast! x.args,function translateForm)] args is [['LIST,:ys]] => ['FUNCALL,translateForm fun,:listMap!(ys, function translateForm)] - listMap!(x,function translateForm) + ['APPLY,:listMap!(x.args,function translateForm)] x.op is 'LET => bindings := [[var, translateForm init] for [var,init] in first x.args] [x.op,bindings,translateForm second x.args] 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) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index 086a6d8f..c2d0c578 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2014, Gabriel Dos Reis. +-- Copyright (C) 2007-2015, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -261,7 +261,6 @@ for i in [ _ ["alphabetic?", "ALPHA-CHAR-P"], _ ["alphanumeric?", "ALPHANUMERICP"], _ ["and", "AND"] , _ - ["apply", "APPLY"] , _ ["array?", "ARRAYP"] , _ ["arrayRef", "AREF"] , _ ["atom", "ATOM"] , _ |