aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure164
-rw-r--r--configure.ac8
-rw-r--r--configure.ac.pamphlet8
-rw-r--r--src/ChangeLog6
-rw-r--r--src/interp/br-op2.boot3
-rw-r--r--src/interp/compat.boot9
-rw-r--r--src/interp/i-spec2.boot4
-rw-r--r--src/interp/i-syscmd.boot22
-rw-r--r--src/lisp/Makefile.in3
-rw-r--r--src/lisp/core.lisp.in3
11 files changed, 176 insertions, 58 deletions
diff --git a/ChangeLog b/ChangeLog
index f54a7e0d..81cf6189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * configure.ac.pamphlet: Check path for `vi'.
+
2009-02-07 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: Check endianness.
diff --git a/configure b/configure
index 208946ae..a2bf51ba 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.3.0-2009-01-28.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-02-09.
#
# 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.3.0-2009-01-28'
-PACKAGE_STRING='OpenAxiom 1.3.0-2009-01-28'
+PACKAGE_VERSION='1.3.0-2009-02-09'
+PACKAGE_STRING='OpenAxiom 1.3.0-2009-02-09'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -837,6 +837,7 @@ target_cpu
target_vendor
target_os
open_axiom_installdir
+oa_editor
MAKE
axiom_cflags
INSTALL_PROGRAM
@@ -1405,7 +1406,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.3.0-2009-01-28 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2009-02-09 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1476,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-01-28:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-02-09:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1580,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2009-01-28
+OpenAxiom configure 1.3.0-2009-02-09
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1593,7 +1594,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.3.0-2009-01-28, which was
+It was created by OpenAxiom $as_me 1.3.0-2009-02-09, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -3799,7 +3800,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3802 "configure"' > conftest.$ac_ext
+ echo '#line 3803 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6944,11 +6945,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6947: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6948: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6951: \$? = $ac_status" >&5
+ echo "$as_me:6952: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7212,11 +7213,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7215: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7216: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7219: \$? = $ac_status" >&5
+ echo "$as_me:7220: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7316,11 +7317,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7319: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7320: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7323: \$? = $ac_status" >&5
+ echo "$as_me:7324: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9768,7 +9769,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9771 "configure"
+#line 9772 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9868,7 +9869,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9871 "configure"
+#line 9872 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12236,11 +12237,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12239: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12240: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12243: \$? = $ac_status" >&5
+ echo "$as_me:12244: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12340,11 +12341,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12343: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12344: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12347: \$? = $ac_status" >&5
+ echo "$as_me:12348: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13910,11 +13911,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13913: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13914: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13917: \$? = $ac_status" >&5
+ echo "$as_me:13918: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14014,11 +14015,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14017: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14018: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14021: \$? = $ac_status" >&5
+ echo "$as_me:14022: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16244,11 +16245,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16247: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16248: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16251: \$? = $ac_status" >&5
+ echo "$as_me:16252: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16512,11 +16513,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16515: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16516: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16519: \$? = $ac_status" >&5
+ echo "$as_me:16520: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16616,11 +16617,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16619: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16623: \$? = $ac_status" >&5
+ echo "$as_me:16624: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19402,10 +19403,102 @@ axiom_build_sharedir=$axiom_builddir/share
case $host in
*mingw*)
ac_default_prefix="C:/Program Files/OpenAxiom"
+ for ac_prog in notepad.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_oa_editor+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $oa_editor in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_oa_editor="$oa_editor" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_oa_editor="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+oa_editor=$ac_cv_path_oa_editor
+if test -n "$oa_editor"; then
+ { echo "$as_me:$LINENO: result: $oa_editor" >&5
+echo "${ECHO_T}$oa_editor" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$oa_editor" && break
+done
+
+ ;;
+ *)
+ for ac_prog in vi
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_oa_editor+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $oa_editor in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_oa_editor="$oa_editor" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_oa_editor="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+oa_editor=$ac_cv_path_oa_editor
+if test -n "$oa_editor"; then
+ { echo "$as_me:$LINENO: result: $oa_editor" >&5
+echo "${ECHO_T}$oa_editor" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$oa_editor" && break
+done
+
;;
- *) ;;
esac
+
## Accumulate list of utils needed for the build platform
## It is vital that noweb is present in the build environement.
axiom_all_prerequisites=
@@ -26712,7 +26805,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.3.0-2009-01-28, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2009-02-09, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26761,7 +26854,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2009-01-28
+OpenAxiom config.status 1.3.0-2009-02-09
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -27037,6 +27130,7 @@ target_cpu!$target_cpu$ac_delim
target_vendor!$target_vendor$ac_delim
target_os!$target_os$ac_delim
open_axiom_installdir!$open_axiom_installdir$ac_delim
+oa_editor!$oa_editor$ac_delim
MAKE!$MAKE$ac_delim
axiom_cflags!$axiom_cflags$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
@@ -27050,7 +27144,6 @@ PATCH!$PATCH$ac_delim
LATEX!$LATEX$ac_delim
MAKEINDEX!$MAKEINDEX$ac_delim
NOTANGLE!$NOTANGLE$ac_delim
-NOWEAVE!$NOWEAVE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -27092,6 +27185,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+NOWEAVE!$NOWEAVE$ac_delim
AXIOM_LISP!$AXIOM_LISP$ac_delim
axiom_include_gcl!$axiom_include_gcl$ac_delim
axiom_lisp_flavor!$axiom_lisp_flavor$ac_delim
@@ -27130,7 +27224,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 5b2aa386..5e28b888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-01-28],
+AC_INIT([OpenAxiom], [1.3.0-2009-02-09],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
@@ -67,9 +67,13 @@ axiom_build_sharedir=$axiom_builddir/share
case $host in
*mingw*)
ac_default_prefix="C:/Program Files/OpenAxiom"
+ AC_PATH_PROGS([oa_editor],[notepad.exe])
+ ;;
+ *)
+ AC_PATH_PROGS([oa_editor],[vi])
;;
- *) ;;
esac
+AC_SUBST(oa_editor)
## Accumulate list of utils needed for the build platform
## It is vital that noweb is present in the build environement.
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 40176e35..a222a6f2 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1129,7 +1129,7 @@ information:
<<Autoconf init>>=
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-01-28],
+AC_INIT([OpenAxiom], [1.3.0-2009-02-09],
[open-axiom-bugs@lists.sf.net])
@
@@ -1300,9 +1300,13 @@ AC_SUBST(axiom_src_subdirs)
case $host in
*mingw*)
ac_default_prefix="C:/Program Files/OpenAxiom"
+ AC_PATH_PROGS([oa_editor],[notepad.exe])
;;
- *) ;;
+ *)
+ AC_PATH_PROGS([oa_editor],[vi])
+ ;;
esac
+AC_SUBST(oa_editor)
<<build utils>>
<<runtime checking>>
diff --git a/src/ChangeLog b/src/ChangeLog
index 681f5356..79db4323 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/i-spec2.boot (upDollar): Fix thinko.
+ * interp/compat.boot (editFile): Tidy.
+ * interp/br-op2.boot (modemap2Sig): Don't update $badStack.xo
+
2009-02-08 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/i-spec2.boot (constantInDomain?): Move from i-coerce.boot.
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index 9ef668ee..f4d259dd 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -578,7 +578,6 @@ modemap2Sig(op,mm) ==
pp predList
pp nsig
pp mm
- $badStack := [[op, mm], :$badStack]
--pause nsig
[predList, origin, substitute("%", origin, nsig)]
diff --git a/src/interp/compat.boot b/src/interp/compat.boot
index bdda2846..b5082786 100644
--- a/src/interp/compat.boot
+++ b/src/interp/compat.boot
@@ -57,9 +57,12 @@ system() ==
terminateSystemCommand()
editFile file ==
- MEMQ(INTERN('"WIN32",FIND_-PACKAGE("KEYWORD")),_*FEATURES_*) =>
- runCommand STRCONC('"notepad ", namestring pathname file)
- runCommand STRCONC('"$AXIOM/lib/SPADEDIT ",namestring pathname file)
+ editProg :=
+ %hasFeature KEYWORD::WIN32 => '"notepad"
+ prog := getEnv '"EDITOR" => prog
+ # $EditorProgram ^= 0 => $EditorProgram
+ return nil -- FIXME: Should we not notify user?
+ runCommand STRCONC(editProg,'" ",namestring pathname file)
makeBigFloat(mantissa,expon) ==
[$BFtag,mantissa,:expon]
diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot
index 38c1f021..0f158a2b 100644
--- a/src/interp/i-spec2.boot
+++ b/src/interp/i-spec2.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -123,7 +123,7 @@ upDollar t ==
type := constantInDomain?([f],t) =>
type ^= true => findConstantInDomain(op,f,type,t)
-- Ambiguous constant. FIXME: try to narrow before giving up.
- throwKeyedMsg("S2IB0008h",[c,t])
+ throwKeyedMsg("S2IB0008h",[f,t])
findUniqueOpInDomain(op,f,t)
nargs := #rest form
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index c936105e..ec6a4d2e 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -833,8 +833,8 @@ compileSpad2Cmd args ==
throwKeyedMsg("S2IZ0036",[STRCONC('")",object2String optname)])
$InteractiveMode : local := nil
- -- avoid transformations based on syntax only
- $normalizeTree := false
+ -- avoid Boolean semantics transformations based on syntax only
+ $normalizeTree: local := false
if translateOldToNew then
spad2AsTranslatorAutoloadOnceTrigger()
sayKeyedMsg("S2IZ0085", nil)
@@ -855,8 +855,6 @@ convertSpadToAsFile path ==
$globalMacroStack : local := nil -- for spad -> as translator
$abbreviationStack: local := nil -- for spad -> as translator
$macrosAlreadyPrinted: local := nil -- for spad -> as translator
- SETQ($badStack, nil) --ditto TEMP to check for bad code
- $newPaths: local := true --ditto TEMP
$abbreviationsAlreadyPrinted: local := nil -- for spad -> as translator
$convertingSpadFile : local := true
$options: local := '((nolib)) -- translator shouldn't create nrlibs
@@ -1142,8 +1140,8 @@ fixObjectForPrinting(v) ==
v
displayProperties(option,l) ==
- $dependentAlist : local
- $dependeeAlist : local
+ $dependentAlist : local := nil
+ $dependeeAlist : local := nil
[opt,:vl]:= (l or ['properties])
imacs := getInterpMacroNames()
pmacs := getParserMacroNames()
@@ -1280,7 +1278,7 @@ editSpad2Cmd l ==
l:=
null l => _/EDITFILE
CAR l
- l := pathname l
+ l := pathname STRING l
oldDir := pathnameDirectory l
fileTypes :=
pathnameType l => [pathnameType l]
@@ -1326,7 +1324,7 @@ newHelpSpad2Cmd args ==
null (helpFile := MAKE_-INPUT_-FILENAME [narg,'HELPSPAD,'_*]) => NIL
$useFullScreenHelp =>
- runCommand STRCONC('"$AXIOM/lib/SPADEDIT ",namestring helpFile)
+ editFile helpFile
true
filestream := MAKE_-INSTREAM(helpFile)
@@ -2290,7 +2288,7 @@ reportCount () ==
--% )library
library args ==
origDir := GET_-CURRENT_-DIRECTORY()
- $newConlist := []
+ $newConlist: local := nil
-- Users typically specify abbreviations without quotes.
LOCALDATABASE([STRING a for a in args],$options)
extendLocalLibdb $newConlist
@@ -2600,9 +2598,9 @@ spool filename ==
SETQ(_*TRACE_-OUTPUT_*,_*STANDARD_-OUTPUT_*)
TERPRI()
resetHighlight()
- PROBE_-FILE car filename =>
- systemError CONCAT('"file ", STRING car filename, '" already exists")
- DRIBBLE car filename
+ PROBE_-FILE STRING first filename =>
+ systemError CONCAT('"file ", STRING first filename, '" already exists")
+ DRIBBLE STRING first filename
SETQ(_*TRACE_-OUTPUT_*,_*STANDARD_-OUTPUT_*)
TERPRI()
clearHighlight()
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index c187df70..94d88729 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -128,6 +128,8 @@ $(oa_base_lisp_linkset): $(oa_target_lispdir)/core.$(LNKEXT)
axiom_optimize_options = @axiom_optimize_options@
+oa_editor = @oa_editor@
+
void_type = @void_type@
char_type = @char_type@
int_type = @int_type@
@@ -138,6 +140,7 @@ string_type = @string_type@
edit = sed \
-e 's|@open_axiom_installdir[@]|$(open_axiom_installdir)|g' \
-e 's|@axiom_optimize_options[@]|$(axiom_optimize_options)|g' \
+ -e 's|@oa_editor[@]|$(oa_editor)|g' \
-e 's|@host[@]|$(host)|g' \
-e 's|@build[@]|$(build)|g' \
-e 's|@target[@]|$(target)|g' \
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 6cf8744d..53643489 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -129,6 +129,7 @@
;; Lisp compiler optimization settings.
(defconstant |$LispOptimizeOptions|
'(@axiom_optimize_options@))
+
(proclaim '(optimize @axiom_optimize_options@))
;; Return true if the full OpenAxiom algebra system is completed
@@ -195,6 +196,8 @@
(cond (|$useDynamicLink| "@SHREXT@")
(t ".@LIBEXT@")))
+(defconstant |$EditorProgram| "@oa_editor@")
+
;; Base name of the native core runtime library
(defconstant |$CoreLibName|
"open-axiom-core")
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 17:45:31 +0000