aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/boot/strap/tokens.clisp1
-rw-r--r--src/boot/tokens.boot1
-rw-r--r--src/doc/msgs/s2-us.msgs2
-rw-r--r--src/interp/sys-driver.boot1
5 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a909d9f5..8206b856 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
2010-12-14 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * boot/tokens.boot: canonicalFilename is now a builtin function.
+ * interp/sys-driver.boot (executeSpadScript): Announce input file.
+
+2010-12-14 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* boot/ast.boot (bfQ): Emit STRING= for string comparison.
* interp/i-output.boot: Fix type violation in equality comparison.
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index ecc3ce7e..de719a77 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -206,6 +206,7 @@
(LIST (LIST '|alphabetic?| 'ALPHA-CHAR-P)
(LIST '|and| 'AND) (LIST '|append| 'APPEND)
(LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM)
+ (LIST '|canonicalFilename| 'PROBE-FILE)
(LIST '|char?| 'CHARACTERP) (LIST '|cons?| 'CONSP)
(LIST '|copy| 'COPY) (LIST '|croak| 'CROAK)
(LIST '|digit?| 'DIGITP) (LIST '|drop| 'DROP)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index e3d7bdf0..8122782f 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -244,6 +244,7 @@ for i in [ _
["append", "APPEND"] , _
["apply", "APPLY"] , _
["atom", "ATOM"] , _
+ ["canonicalFilename", "PROBE-FILE"], _
["char?", "CHARACTERP"] , _
["cons?", "CONSP"] , _
["copy", "COPY"] , _
diff --git a/src/doc/msgs/s2-us.msgs b/src/doc/msgs/s2-us.msgs
index c702924c..036836a2 100644
--- a/src/doc/msgs/s2-us.msgs
+++ b/src/doc/msgs/s2-us.msgs
@@ -1069,6 +1069,8 @@ S2IZ0090
S2IZ0091
OpenAxiom could not find a suitable text editor. Please set and export
the environment variable %b EDITOR %d and start again.
+S2IZ0100
+ -- Running test script from file %1
S2GE0000
Internal Error
S2GE0001
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index fd08789b..6c9c3973 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -269,6 +269,7 @@ executeSpadScript(progname,options,file) ==
-- Accomodate for testsuite stream.
if testing then
set ["message","testing","on"]
+ sayKeyedMsg('S2IZ0100,[NAMESTRING canonicalFilename file])
CATCH($intCoerceFailure,
CATCH($SpadReaderTag,read [file]))
coreQuit (errorCount()> 0 => 1; 0)