[PATCH] misc cleanups

[Qian Yun]

Another batch of misc cleanups and fixes from last month.

A short note on the change to "file-kind": its argument is
string, could not be nil.

- Qian

diff --git a/contrib/load-fricas.lisp b/contrib/load-fricas.lisp
index 5959a8c7..52df2808 100644
--- a/contrib/load-fricas.lisp
+++ b/contrib/load-fricas.lisp
@@ -42,7 +42,7 @@ Notes:
- the simplest interface is |parseAndInterpret| which takes a string
as input and produces a Lisp form representing printed output. As
side effect |parseAndInterpret| prints the result.
-- at deeper lever FriCAS functions are overloaded, so to call correct
+- at deeper level FriCAS functions are overloaded, so to call correct
function one has to first use |getFunctionFromDomain| to get
function which matches to given argument types. Above I want to
multiply two sparse univariate polynomials with integer coefficients.
diff --git a/src/etc/fricas b/src/etc/fricas
index 0768c153..9d8bb1f9 100644
--- a/src/etc/fricas
+++ b/src/etc/fricas
@@ -211,7 +211,7 @@ if [ $had_nogr != true -a ! -f $FRICAS/lib/viewman ]
; then
fi

if [ $had_noht != true -a ! -f $FRICAS/bin/hypertex ]; then
- echo "hypertex not present, disabling"
+ echo "hypertex not present, disabling HyperDoc"
otheropts="$otheropts -noht"
fi

diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index 7af033ce..2a996c54 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -49,11 +49,9 @@ DEFPARAMETER($AlgebraError, 'AlgebraError)

DEFVAR($timedNameStack)

-DEFPARAMETER($inLispVM, false)
-
spad_system_error_handler (c) ==
$NeedToSignalSessionManager := true
- not($inLispVM) and MEMQ($BreakMode,
+ MEMQ($BreakMode,
["nobreak", "query", "resume", "quit", "trapSpadErrors"]) =>
systemError(error_format(c))
$BreakMode = "letPrint2" =>
@@ -61,8 +59,6 @@ spad_system_error_handler (c) ==
THROW("letPrint2", nil)
nil

-BUMPCOMPERRORCOUNT() == nil
-
argumentDataError(argnum, condit, funname) ==
msg := ['"The test",:bright pred2English condit,'"evaluates to",
:bright '"false",'%l,'" for argument",:bright argnum,_
@@ -82,7 +78,6 @@ errorSupervisor(errorType,errorMsg) ==
errorSupervisor1(errorType,errorMsg,$BreakMode)

errorSupervisor1(errorType,errorMsg,$BreakMode) ==
- BUMPCOMPERRORCOUNT()
errorLabel :=
errorType = $SystemError => '"System error"
errorType = $UserError => '"Apparent user error"
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 1ea66e2a..fb9aca5d 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -389,7 +389,6 @@ throwListOfKeyedMsgs(descKey,descArgs,l) ==
-- a chance to play around in a break loop if $BreakMode is not 'nobreak

breakKeyedMsg(key,args) ==
- BUMPCOMPERRORCOUNT()
sayKeyedMsg(key,args)
handleLispBreakLoop($BreakMode)

diff --git a/src/lisp/fricas-lisp.lisp b/src/lisp/fricas-lisp.lisp
index 9e3e305a..8680a3a1 100644
--- a/src/lisp/fricas-lisp.lisp
+++ b/src/lisp/fricas-lisp.lisp
@@ -742,8 +742,8 @@ with this hack and will try to convince the GCL
crowd to fix this.
(defun trim-directory-name (name)
#+(or :unix :win32)
(if (char= (char name (1- (length name))) #\/)
- (setf name (subseq name 0 (1- (length name)))))
- name)
+ (subseq name 0 (1- (length name)))
+ name))

(defun pad-directory-name (name)
#+(or :unix :win32)
@@ -818,17 +818,14 @@ with this hack and will try to convince the GCL
crowd to fix this.
0
-1)))
#+:abcl
- (if filename
(if (ext:file-directory-p filename)
1
(if (probe-file filename) 0 -1))
- -1)
#+:lispworks
- (if filename
(if (lispworks:file-directory-p filename)
1
(if (probe-file filename) 0 -1))
- -1))
+)

#+:cmu
(defun get-current-directory ()
diff --git a/src/scripts/build_helper b/src/scripts/build_helper
index 2d4551b5..4560a640 100755
--- a/src/scripts/build_helper
+++ b/src/scripts/build_helper
@@ -14,7 +14,7 @@ compile_lisp() {
$optimizations
(in-package "FRICAS-LISP")
(unless (fricas_compile_file "$1" "$output")
- (exit-with-status 1))
+ (|exit_with_status| 1))
(quit)
EOF
}
@@ -24,7 +24,7 @@ make_program () {
$optimizations
(in-package "FRICAS-LISP")
(unless (make-program "$output" (quote ($*)))
- (exit-with-status 1))
+ (|exit_with_status| 1))
(quit)
EOF
}

[Waldek Hebisch]

On Thu, Jan 04, 2024 at 08:28:45AM +0800, Qian Yun wrote:
> Another batch of misc cleanups and fixes from last month.
>
> A short note on the change to "file-kind": its argument is
> string, could not be nil.

OK.

--
Waldek Hebisch