aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--configure.ac.pamphlet2
-rw-r--r--src/ChangeLog5
-rw-r--r--src/interp/comp.lisp28
-rw-r--r--src/interp/compiler.boot9
-rw-r--r--src/interp/nlib.lisp21
7 files changed, 25 insertions, 60 deletions
diff --git a/configure b/configure
index efc25705..5fa1a5c4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-04-07.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-04-08.
#
# Report bugs to <open-axiom-bugs@lists.sf.net>.
#
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='OpenAxiom'
PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.2.0-2008-04-07'
-PACKAGE_STRING='OpenAxiom 1.2.0-2008-04-07'
+PACKAGE_VERSION='1.2.0-2008-04-08'
+PACKAGE_STRING='OpenAxiom 1.2.0-2008-04-08'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -1402,7 +1402,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenAxiom 1.2.0-2008-04-07 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.2.0-2008-04-08 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1472,7 +1472,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-04-07:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-04-08:";;
esac
cat <<\_ACEOF
@@ -1576,7 +1576,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.2.0-2008-04-07
+OpenAxiom configure 1.2.0-2008-04-08
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1590,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenAxiom $as_me 1.2.0-2008-04-07, which was
+It was created by OpenAxiom $as_me 1.2.0-2008-04-08, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -25801,7 +25801,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenAxiom $as_me 1.2.0-2008-04-07, which was
+This file was extended by OpenAxiom $as_me 1.2.0-2008-04-08, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25850,7 +25850,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-OpenAxiom config.status 1.2.0-2008-04-07
+OpenAxiom config.status 1.2.0-2008-04-08
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index ffae31c9..2a0c7878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.2.0-2008-04-07],
+AC_INIT([OpenAxiom], [1.2.0-2008-04-08],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index bc220c4b..6a17ce2c 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1092,7 +1092,7 @@ information:
<<Autoconf init>>=
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.2.0-2008-04-07],
+AC_INIT([OpenAxiom], [1.2.0-2008-04-08],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index 78f584bc..a7790991 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
2008-04-08 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/nlib.lisp (recompile-lib-file-if-necessary): Remove.
+ * interp/comp.lisp (|compileFileQuietly|): Move to compiler.boot.
+
+2008-04-08 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* algebra/Lattice.pamphlet: Remove.
2008-04-07 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/interp/comp.lisp b/src/interp/comp.lisp
index f2bb2a91..8945cc49 100644
--- a/src/interp/comp.lisp
+++ b/src/interp/comp.lisp
@@ -54,8 +54,6 @@
(IMPORT-MODULE "macros")
(in-package "BOOT")
-(export '(Comp FluidVars LocVars OptionList SLAM SPADSLAM ILAM FLUID))
-
(defparameter |$compileDontDefineFunctions| 'T)
;;; Common Block section
@@ -97,32 +95,6 @@
(make-synonym-stream '*standard-output*))))
(COMP fn)))
-#-:CCL
-(defun |compileFileQuietly| (fn)
- (let (
- ;; following creates a null outputstream if $InteractiveMode
- (|$OutputStream|
- (if |$InteractiveMode| (make-broadcast-stream)
- (make-synonym-stream '*standard-output*))))
- (COMPILE-FILE fn)))
-
-#+:CCL
-(defun |compileFileQuietly| (fn)
- (let (
- ;; following creates a null outputstream if $InteractiveMode
- (|$OutputStream|
- (if |$InteractiveMode| (make-broadcast-stream) *standard-output*)))
- ;; The output-library is not opened before use unless set explicitly
- (if (null output-library)
- (|openOutputLibrary|
- (setq |$outputLibraryName|
- (if (null |$outputLibraryName|)
- (make-pathname :directory (get-current-directory)
- :name "user.lib")
- (if (filep |$outputLibraryName|) (truename |$outputLibraryName|)
- |$outputLibraryName|)))))
- (compile-lib-file fn)))
-
;; The following are used mainly in setvars.boot
(defun notEqualLibs (u v)
(if (string= u (library-name v)) (seq (close-library v) t) nil))
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index b70fafab..12a36c52 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1592,6 +1592,15 @@ compilerDoitWithScreenedLisplib(constructor, fun) ==
SEQ(UNEMBED 'RWRITE))
+--% Interface to the backend
+
+compileFileQuietly path ==
+ $OutputStream :=
+ $InteractiveMode => MAKE_-BROADCAST_-STREAM()
+ MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*"
+ COMPILE_-FILE path
+
+
--% Register compilers for special forms.
-- Those compilers are on the `SPECIAL' property of the corresponding
-- special form operator symbol.
diff --git a/src/interp/nlib.lisp b/src/interp/nlib.lisp
index aa3af3bf..47815c0a 100644
--- a/src/interp/nlib.lisp
+++ b/src/interp/nlib.lisp
@@ -262,27 +262,6 @@
(if (and bdate (> bdate ldate)) nil
(progn (compile-lib-file lfile) (list bfile))))))
-#+:CCL
-(defun recompile-lib-file-if-necessary (lfile)
- (let ( (mname (pathname-name (file-namestring (directory-namestring lfile))))
- (mdate (modulep mname))
- (ldate (filedate lfile)) )
- (if (or (not mdate) (datelessp mdate ldate))
- (seq
- (if (null output-library)
- (|openOutputLibrary|
- (setq |$outputLibraryName|
- (if (null |$outputLibraryName|)
- (make-pathname :directory (get-current-directory)
- :name "user.lib")
- (if (filep |$outputLibraryName|)
- (truename |$outputLibraryName|)
- |$outputLibraryName|)))))
- (compile-file lfile
- :output-file (intern (pathname-name
- (directory-namestring lfile))))))))
-
-
#+:AKCL
(defun spad-fixed-arg (fname )
(and (equal (symbol-package fname) (find-package "BOOT"))