This is a relatively large misc cleanup, so I'd like a review before
commit.
A question: shall we remove GCL_DIST related stuff in
src/scripts/mkdist.sh?
- Qian
--
You received this message because you are subscribed to the Google Groups "FriCAS -
computer algebra system" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/fricas-devel/988c6e15-4777-4264-bb7c-7a83594b3b50%40gmail.com.
diff --git a/Makefile.in b/Makefile.in
index 57376ff8..4093a5c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -242,7 +242,6 @@ dist-doc:
${DIST_TARBALL}: out-of-source-check lastBuildDate dist-help dist-lisp dist-doc
cp -r ${abs_top_srcdir}/* ${distdir}
- find ${distdir} -type d -name .svn -exec rm -rf {} \+
tar cjf $@ ${distdir}
dist: ${DIST_TARBALL}
diff --git a/configure b/configure
index 45e95717..46cdd288 100755
--- a/configure
+++ b/configure
@@ -4221,7 +4221,7 @@ esac
-## In case our underlying lisp is SBCL or Closure CL, we provide a
+## In case our underlying lisp is SBCL or Clozure CL, we provide a
## wrapper to enable GMP bignums in lisp
GMP_WRAP_SO_TARGET=""
GMP_CPPFLAGS=""
@@ -4735,7 +4735,7 @@ $as_echo "$ac_cv_lib_gmp___gmpz_init" >&6; }
if test "x$ac_cv_lib_gmp___gmpz_init" = xyes; then :
true
else
- as_fn_error $? "GNU MP not found, see http://swox.com/gmp"; "$LINENO" 5
+ as_fn_error $? "GNU MP not found" "$LINENO" 5
fi
CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS"
@@ -4748,7 +4748,7 @@ if test "x$ac_cv_header_gmp_h" = xyes; then :
_ACEOF
else
- as_fn_error $? "gmp.h not found, see http://swox.com/gmp"; "$LINENO" 5
+ as_fn_error $? "gmp.h not found" "$LINENO" 5
fi
done
diff --git a/configure.ac b/configure.ac
index bf24093c..749e2b9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,7 +342,7 @@ esac
AC_SUBST(LIBSPAD_SO_TARGET)
AC_SUBST(SOLIB_FLAGS)
-## In case our underlying lisp is SBCL or Closure CL, we provide a
+## In case our underlying lisp is SBCL or Clozure CL, we provide a
## wrapper to enable GMP bignums in lisp
GMP_WRAP_SO_TARGET=""
GMP_CPPFLAGS=""
@@ -414,10 +414,10 @@ AS_IF([test -n "$GMP_WRAP_SO_TARGET"],[
# ask for shared library in AC_CHECK_LIB
LDFLAGS="$LDFLAGS $GMP_LDFLAGS -fPIC $SOLIB_FLAGS"
AC_CHECK_LIB(gmp, __gmpz_init, [true], [AC_MSG_ERROR(
- [GNU MP not found, see http://swox.com/gmp])])
+ [GNU MP not found])])
CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS"
AC_CHECK_HEADERS([gmp.h], [], [AC_MSG_ERROR(
- [gmp.h not found, see http://swox.com/gmp])])
+ [gmp.h not found])])
# reset CPPFLAGS and LDFLAGS
CPPFLAGS=$fricas_save_CPPFLAGS
LDFLAGS=$fricas_save_LDFLAGS
diff --git a/doc/build.txt b/doc/build.txt
index c365fc67..9dce0ed4 100644
--- a/doc/build.txt
+++ b/doc/build.txt
@@ -1,6 +1,6 @@
Short overview of FriCAS build process.
-Normal build from svn works as follows:
+Normal build from git repo works as follows:
1) First is src/lisp subdirectory. This creates 'lisp' executable
which is kind of virtual Lisp specialized to support FriCAS.
@@ -11,7 +11,7 @@ Normal build from svn works as follows:
resonably uniform set of tools.
2) src/boot. This contains Shoe to Lisp translator. Uses bootstrap
techinque to build from cached (precompiled) Lisp files and
- then re-build form Shoe sources. Part titled 'The Boot Compiler'
+ then re-build from Shoe sources. Part titled 'The Boot Compiler'
in src/boot/Makenotes.tex contains reasonable description of
bootstrap process for Shoe. The result of Shoe bootstrap
is 'bootsys'.
@@ -24,12 +24,12 @@ Normal build from svn works as follows:
is 'interpsys'.
4) 'interpsys' is used to compile Spad files and bootstrap
algebra. This is described in 'doc/algebra_build.txt'.
-5) Once algebra is build small but frequently used part
+5) Once algebra is built, a small but frequently used part
of algebra is preloaded into 'interpsys' creating
- FRICASsys' (the rest of algebra is loaded on demand).
- Also a few variables in 'FRICASsys' have different value
+ 'FRICASsys' (the rest of algebra is loaded on demand).
+ Also a few variables in 'FRICASsys' have different values
than in 'interpsys'. For ECL preloading does not work
- and 'FRICASsys' differs from 'interpsys' only in few
+ and 'FRICASsys' differs from 'interpsys' only in a few
variables.
6) FRICASsys is used to generate .pht pages for HyperDoc.
diff --git a/src/algebra/exposed.lsp b/src/algebra/exposed.lsp
index 44a09ad6..26252417 100644
--- a/src/algebra/exposed.lsp
+++ b/src/algebra/exposed.lsp
@@ -1,7 +1,7 @@
(in-package "BOOT")
(setq |$globalExposureGroupAlist|
'(
-;;define the groups |basic| |naglink| |anna| |categories| |Hidden| |defaults|
+;;define the groups |basic| |categories| |Hidden| |defaults|
(|basic|
(|AlgebraicManipulations| . ALGMANIP)
(|AlgebraicNumber| . AN)
diff --git a/src/doc/ht/expose.ht b/src/doc/ht/expose.ht
index 7da6d7d8..634dd68f 100644
--- a/src/doc/ht/expose.ht
+++ b/src/doc/ht/expose.ht
@@ -42,11 +42,10 @@ Seven exposure groups are system-defined:\beginmenu
\item\tab{3}{\em package}\tab{13}Package constructors not in {\em basic}
\item\tab{3}{\em default}\tab{13}Default constructors not in {\em basic}
\item\tab{3}{\em hidden}\tab{13}All constructors not in {\em basic}
-\item\tab{3}{\em naglink}\tab{13}All constructors used in the AXIOM NAG Link
\endmenu
\par
When you first use \Language{}, the {\em current} exposure group is
-set to {\em basic} and {\em naglink}. Using \HyperName{} or the system command
+set to {\em basic} and {\em category}. Using \HyperName{} or the system command
{\em expose}, you may
change the current exposure group by
adding or dropping constructors or by setting {\em current}
diff --git a/src/doc/htex/ug15.htex b/src/doc/htex/ug15.htex
index 895609bf..0b77ef9b 100644
--- a/src/doc/htex/ug15.htex
+++ b/src/doc/htex/ug15.htex
@@ -481,7 +481,7 @@ Bug fixes, in particular:
function which builds Laurent series from order and stream of
coefficients.
-\item GMP should now work with sbcl on all platforms and with Closure CL
+\item GMP should now work with sbcl on all platforms and with Clozure CL
on all platforms except for Power PC.
\item Added a few domains for discrete groups.
@@ -574,7 +574,7 @@ Bug fixes, in particular:
\item Avoid crash when printing error message from '-eval'.
-\item Redirect I/O when running programs from Closure CL.
+\item Redirect I/O when running programs from Clozure CL.
\end{itemize}
@@ -883,7 +883,7 @@ Bug fixes, in particular:
\item 'try', 'catch' and 'finally' are now Spad keywords.
-\item Experimental support for using gmp with Closure CL (64-bit
+\item Experimental support for using gmp with Clozure CL (64-bit
Intel/Amd only).
\item New categories CoercibleFrom and ConvertibleFrom. New domain for
diff --git a/src/input/test.input b/src/input/test.input
index d6eb5c54..1e70f055 100644
--- a/src/input/test.input
+++ b/src/input/test.input
@@ -370,7 +370,7 @@ r:Record(a: INT) := [1]
)time on
-- p: POLY FLOAT := (x-1)^30
--- for large exponents draw below is very slow using Closure CL
+-- for large exponents draw below is very slow using Clozure CL
p: POLY FLOAT := (x-1)^12
draw(p, x=-1..1)
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 2bae098f..f97c7fcb 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -2249,7 +2249,6 @@ mathPrint1(x,fg) ==
maPrin u ==
null u => nil
- $highlightDelta := 0
c := CATCH('outputFailure,charybdis(u, $MARGIN, $LINELENGTH))
c ~= 'outputFailure => c
sayKeyedMsg("S2IX0009",NIL)
diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot
index aa4fd0b4..20b4773c 100644
--- a/src/interp/i-toplev.boot
+++ b/src/interp/i-toplev.boot
@@ -246,7 +246,6 @@ justifyMyType(t) ==
CONCAT(fillerSpaces($LINELENGTH-len, '" "), t)
typeTimePrin x ==
- $highlightDelta: local:= 0
maprinSpecial(x,0,79)
printStorage() ==
diff --git a/src/lib/sockio-c.c b/src/lib/sockio-c.c
index fb9e7059..6609b50e 100644
--- a/src/lib/sockio-c.c
+++ b/src/lib/sockio-c.c
@@ -179,7 +179,7 @@ fricas_close_socket(fricas_socket s)
#endif
}
-/* Return 1 is the last call was cancelled. */
+/* Return 1 if the last call was cancelled. */
static inline int
fricas_call_was_cancelled(void)
@@ -191,7 +191,7 @@ fricas_call_was_cancelled(void)
#endif
}
-/* Return 1 is last connect() was refused. */
+/* Return 1 if last connect() was refused. */
static inline int
fricas_connection_refused(void)
diff --git a/src/lisp/fricas-lisp.lisp b/src/lisp/fricas-lisp.lisp
index b81fb0c4..819e788c 100644
--- a/src/lisp/fricas-lisp.lisp
+++ b/src/lisp/fricas-lisp.lisp
@@ -167,40 +167,6 @@ with this hack and will try to convince the GCL crowd to fix this.
(if restart
(hcl:save-image core-image :restart-function restart)
(hcl:save-image core-image)))
-#|
- (let ((ccl-dir (|getEnv| "CCL_DEFAULT_DIRECTORY"))
- (core-fname (concatenate 'string core-image ".image"))
- (eval-arg (if restart
- (format nil " --eval '(~A)'" restart)
- ""))
- core-path exe-path)
- ;;; truename works only on existing files, so we
- ;;; create one just to get absolute path
- (with-open-file (ims core-fname
- :direction :output :if-exists :supersede)
- (declare (ignore ims))
- (setf core-path (namestring (truename core-fname))))
- (delete-file core-path)
- (with-open-file (ims core-image
- :direction :output :if-exists :supersede)
- (setf exe-path (namestring (truename core-image)))
- (format ims "#!/bin/sh~2%")
- (format ims "CCL_DEFAULT_DIRECTORY=~A~%" ccl-dir)
- (format ims "export CCL_DEFAULT_DIRECTORY~%")
- (format ims "exec ~A/~A -I ~A~A~%"
- ccl-dir (ccl::standard-kernel-name)
- core-path eval-arg))
- (ccl::run-program "chmod" (list "a+x" exe-path))
- #|
- ;;; We would prefer this version, but due to openmcl bug
- ;;; it does not work
- (if restart
- (ccl::save-application core-path :toplevel-function restart)
- (ccl::save-application core-path))
- |#
- (ccl::save-application core-path)
- )
- |#
)
(defun save-core (core-image)
@@ -677,9 +643,6 @@ with this hack and will try to convince the GCL crowd to fix this.
(purpose int)
(val int))
-#+:GCL
-(SI::clines "extern double sock_get_float();")
-
(fricas-foreign-call |sockGetFloat| "sock_get_float" double
(purpose int))
@@ -692,9 +655,6 @@ with this hack and will try to convince the GCL crowd to fix this.
(str c-string)
(len int))
-(defun |sockSendString| (purpose str)
- (sock_send_string_len purpose str (length str)))
-
(fricas-foreign-call |serverSwitch| "server_switch" int)
(fricas-foreign-call |sockSendSignal| "sock_send_signal" int
@@ -709,6 +669,9 @@ with this hack and will try to convince the GCL crowd to fix this.
)
+(defun |sockSendString| (purpose str)
+ (sock_send_string_len purpose str (length str)))
+
#+:GCL
(progn
@@ -958,7 +921,7 @@ with this hack and will try to convince the GCL crowd to fix this.
(declare (inline member))
(when (and testp notp)
(error ":TEST and :TEST-NOT were both supplied."))
- ;; We have to possibilities here: for shortish lists we pick up the
+ ;; We have two possibilities here: for shortish lists we pick up the
;; shorter one as the result, and add the other one to it. For long
;; lists we use a hash-table when possible.
(let ((n1 (length list1))
@@ -998,7 +961,7 @@ with this hack and will try to convince the GCL crowd to fix this.
(declare (inline member))
(when (and testp notp)
(error ":TEST and :TEST-NOT were both supplied."))
- ;; We have to possibilities here: for shortish lists we pick up the
+ ;; We have two possibilities here: for shortish lists we pick up the
;; shorter one as the result, and add the other one to it. For long
;; lists we use a hash-table when possible.
(let ((n1 (length list1))
diff --git a/src/lisp/primitives.lisp b/src/lisp/primitives.lisp
index 136f95fe..87a6802d 100644
--- a/src/lisp/primitives.lisp
+++ b/src/lisp/primitives.lisp
@@ -290,7 +290,7 @@
;;; Floating point macros
-;; Before version 1.8 Closure CL had buggy floating point optimizer, so
+;; Before version 1.8 Clozure CL had buggy floating point optimizer, so
;; for it we need to omit type declarations to disable optimization
#-(and :openmcl (not :CCL-1.8))
(defmacro DEF_DF_BINOP (name op)
diff --git a/src/scripts/mkdist.sh b/src/scripts/mkdist.sh
index f476c2a7..f41d9618 100755
--- a/src/scripts/mkdist.sh
+++ b/src/scripts/mkdist.sh
@@ -69,7 +69,6 @@ rm -rf .git*
# copy gcl
if [ ! -z "${GCL_DIST}" ] ; then
cp -r "${GCL_DIST}" gcl
- clean_svn gcl
fi
# copy help files
diff --git a/src/sman/sman.c b/src/sman/sman.c
index e32ceaf6..d5114624 100644
--- a/src/sman/sman.c
+++ b/src/sman/sman.c
@@ -567,7 +567,7 @@ fork_FriCAS(void)
augmented_ws_path = (char *)malloc(2 * strlen(ws_path) + strlen(eval_code) + strlen(" -- ") + strlen(" ") + 1);
strcpy(augmented_ws_path,ws_path); /* write the name */
/* Pass '--' to make sure that argument(s) passed to FRICASsys
- do not cause trouble from host Lisp (Closure CL would
+ do not cause trouble from host Lisp (Clozure CL would
treat argument as Lisp kernel name, Clisp signals error
if it can not recognize the option. */
strcat(augmented_ws_path," -- ");
