From e813f56af68f00663d6df03c4ed1ff6f85873716 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 27 May 2013 06:28:15 +0000
Subject: Rename MAKE-FULL-FILENAME to makeFullFilename.

---
 src/boot/ast.boot           |  1 +
 src/boot/strap/ast.clisp    |  1 +
 src/boot/strap/tokens.clisp | 14 ++++++++------
 src/boot/tokens.boot        |  1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 6410b524..dfffa58a 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -761,6 +761,7 @@ bfIS1(tu,lhs,rhs) ==
   rhs = true => ['EQ,lhs,rhs]
   bfString? rhs => bfAND [['STRINGP,lhs],["STRING=",lhs,rhs]]
   bfChar? rhs or integer? rhs => ['EQL,lhs,rhs]
+  inert? rhs => ['EQ,lhs,rhs]
   rhs isnt [.,:.] => ['PROGN,bfLetForm(rhs,lhs),'T]
   rhs.op is 'QUOTE =>
     [.,a] := rhs
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 94f3cce2..a51ee1c2 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -1124,6 +1124,7 @@
           ((|bfString?| |rhs|)
            (|bfAND| (LIST (LIST 'STRINGP |lhs|) (LIST 'STRING= |lhs| |rhs|))))
           ((OR (|bfChar?| |rhs|) (INTEGERP |rhs|)) (LIST 'EQL |lhs| |rhs|))
+          ((KEYWORDP |rhs|) (LIST 'EQ |lhs| |rhs|))
           ((NOT (CONSP |rhs|)) (LIST 'PROGN (|bfLetForm| |rhs| |lhs|) 'T))
           ((EQ (CAR |rhs|) 'QUOTE) (SETQ |a| (CADR |rhs|))
            (COND ((SYMBOLP |a|) (LIST 'EQ |lhs| |rhs|))
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index b606644b..3c0dd848 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -225,14 +225,16 @@
              (LIST '|flushOutput| 'FORCE-OUTPUT) (LIST '|fourth| 'CADDDR)
              (LIST '|freshLine| 'FRESH-LINE) (LIST '|function?| 'FUNCTIONP)
              (LIST '|functionSymbol?| 'FBOUNDP) (LIST '|gensym| 'GENSYM)
-             (LIST '|genvar| 'GENVAR) (LIST '|integer?| 'INTEGERP)
-             (LIST 'LAST '|last|) (LIST '|list| 'LIST) (LIST '|listEq?| 'EQUAL)
+             (LIST '|genvar| 'GENVAR) (LIST '|inert?| 'KEYWORDP)
+             (LIST '|integer?| 'INTEGERP) (LIST 'LAST '|last|)
+             (LIST '|list| 'LIST) (LIST '|listEq?| 'EQUAL)
              (LIST '|lowerCase?| 'LOWER-CASE-P)
              (LIST '|makeFilePath| 'MAKE-PATHNAME) (LIST '|makeSymbol| 'INTERN)
-             (LIST '|mkpf| 'MKPF) (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) (LIST '|readInteger| 'PARSE-INTEGER)
+             (LIST '|mergeFilePaths| 'MERGE-PATHNAMES) (LIST '|mkpf| 'MKPF)
+             (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)
+             (LIST '|readInteger| 'PARSE-INTEGER)
              (LIST '|readLispFromString| 'READ-FROM-STRING)
              (LIST '|readOnly?| 'CONSTANTP) (LIST '|removeDuplicates| 'REMDUP)
              (LIST '|rest| 'CDR) (LIST '|sameObject?| 'EQ)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index c8b29ebb..fa340275 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -298,6 +298,7 @@ for i in [ _
   ["functionSymbol?", "FBOUNDP"] , _
   ["gensym",    "GENSYM"]  , _
   ["genvar",    "GENVAR"]  , _
+  ["inert?",  "KEYWORDP"] , _
   ["integer?","INTEGERP"]  , _
   ["LAST",        "last"] , _
   ["list",        "LIST"]  , _
-- 
cgit v1.2.3