aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-02-02 16:17:00 +0000
committerdos-reis <gdr@axiomatics.org>2008-02-02 16:17:00 +0000
commit82a303c752601bf7bae50a4a919380cfd1872e96 (patch)
treea6fc72ddcb26c5041b30d271c02fdf7f19008c76
parenta4a1cbc3f3dc2b5822733ebd1f54ba7d4e133c39 (diff)
downloadopen-axiom-82a303c752601bf7bae50a4a919380cfd1872e96.tar.gz
* interp/sys-globals.boot ($consistencyCheck): Remove.
($insideCanCoerceFrom): Define. * interp/setq.lisp: Remove more unused variables. * interp/patches.lisp (/RF-1): Tidy. * interp/server.boot (parseAndInterpret): Likewise. * interp/packtran.boot ($useNewParser): Remove. * interp/ht-util.boot (parseAndEval): Tidy. * interp/clam.boot ($failed): Define. * interp/g-timer.boot ($printStorageIfTrue): Likewise. * interp/hashcode.boot ($DomainsWithoutLisplibs): Likewise. * interp/i-coerce.boot ($useCoerceOrCroak): Likewise. * interp/i-analy.boot ($univariateDomains): Likewise. ($multivariateDomains): Likewise. * interp/i-object.boot ($useIntegerSubdomain): Likewise. * interp/i-syscmd.boot ($existingFiles): Likewise. * interp/newfort.boot ($fortranArrayStartingIndex): Likewise. * interp/setvars.boot (resetWorkspaceVariables): Don't reset $dependeeClosureAlist.
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--configure.ac.pamphlet2
-rw-r--r--src/ChangeLog21
-rw-r--r--src/interp/apply.boot1
-rw-r--r--src/interp/category.boot1
-rw-r--r--src/interp/cattable.boot2
-rw-r--r--src/interp/nruncomp.boot11
-rw-r--r--src/interp/nrunfast.boot5
-rw-r--r--src/interp/rulesets.boot2
-rw-r--r--src/interp/setq.lisp8
11 files changed, 43 insertions, 30 deletions
diff --git a/configure b/configure
index 6fe307cb..84ad3f8f 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.1.0-2008-01-31.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2008-02-02.
#
# 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.1.0-2008-01-31'
-PACKAGE_STRING='OpenAxiom 1.1.0-2008-01-31'
+PACKAGE_VERSION='1.1.0-2008-02-02'
+PACKAGE_STRING='OpenAxiom 1.1.0-2008-02-02'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -1387,7 +1387,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.1.0-2008-01-31 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.1.0-2008-02-02 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1457,7 +1457,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2008-01-31:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2008-02-02:";;
esac
cat <<\_ACEOF
@@ -1561,7 +1561,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.1.0-2008-01-31
+OpenAxiom configure 1.1.0-2008-02-02
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1575,7 +1575,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.1.0-2008-01-31, which was
+It was created by OpenAxiom $as_me 1.1.0-2008-02-02, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -25225,7 +25225,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.1.0-2008-01-31, which was
+This file was extended by OpenAxiom $as_me 1.1.0-2008-02-02, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25274,7 +25274,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-OpenAxiom config.status 1.1.0-2008-01-31
+OpenAxiom config.status 1.1.0-2008-02-02
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 6543fb95..7699f85f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.1.0-2008-01-31],
+AC_INIT([OpenAxiom], [1.1.0-2008-02-02],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 55befb7c..a116a483 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1019,7 +1019,7 @@ information:
<<Autoconf init>>=
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.1.0-2008-01-31],
+AC_INIT([OpenAxiom], [1.1.0-2008-02-02],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index 50a905f8..ff7ce709 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,26 @@
2008-02-02 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/sys-globals.boot ($consistencyCheck): Remove.
+ ($insideCanCoerceFrom): Define.
+ * interp/setq.lisp: Remove more unused variables.
+ * interp/patches.lisp (/RF-1): Tidy.
+ * interp/server.boot (parseAndInterpret): Likewise.
+ * interp/packtran.boot ($useNewParser): Remove.
+ * interp/ht-util.boot (parseAndEval): Tidy.
+ * interp/clam.boot ($failed): Define.
+ * interp/g-timer.boot ($printStorageIfTrue): Likewise.
+ * interp/hashcode.boot ($DomainsWithoutLisplibs): Likewise.
+ * interp/i-coerce.boot ($useCoerceOrCroak): Likewise.
+ * interp/i-analy.boot ($univariateDomains): Likewise.
+ ($multivariateDomains): Likewise.
+ * interp/i-object.boot ($useIntegerSubdomain): Likewise.
+ * interp/i-syscmd.boot ($existingFiles): Likewise.
+ * interp/newfort.boot ($fortranArrayStartingIndex): Likewise.
+ * interp/setvars.boot (resetWorkspaceVariables): Don't reset
+ $dependeeClosureAlist.
+
+2008-02-02 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/setq.lisp: Remove more unused variables.
* interp/nruncomp.boot ($Slot1DataBase): Define here.
* interp/parse.boot ($oldParserExpandAbbrs): Likewise.
diff --git a/src/interp/apply.boot b/src/interp/apply.boot
index 3da4dd8e..1faf163b 100644
--- a/src/interp/apply.boot
+++ b/src/interp/apply.boot
@@ -220,7 +220,6 @@ compApplyModemap(form,modemap,$e,sl) ==
--+ information which is no longer valid; thus ignore this index and
--+ store the signature instead.
---$NRTflag=true and f is [op1,d,.] and NE(d,'$) and member(op1,'(ELT CONST)) =>
f is [op1,d,.] and member(op1,'(ELT CONST Subsumed)) =>
[genDeltaEntry [op,:modemap],lt',$bindings]
[f,lt',$bindings]
diff --git a/src/interp/category.boot b/src/interp/category.boot
index c6a411bb..304b943f 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -451,7 +451,6 @@ JoinInner(l,$e) ==
if ancindex
then ($NewCatVec.ancindex:= bname; reallynew:= nil)
else
- -- check for $NRTflag until massive algebra recompilation
if originalVector and (condition=true) then
$NewCatVec:= CatEval bname
copied:= nil
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 0da1a93f..c69bb136 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -459,7 +459,7 @@ updateCategoryTable(cname,kind) ==
updateCategoryTableForDomain(cname,getConstrCat(
GETDATABASE(cname,'CONSTRUCTORCATEGORY)))
--+
- kind = 'domain and $NRTflag = true =>
+ kind = 'domain =>
updateCategoryTableForDomain(cname,getConstrCat(
GETDATABASE(cname,'CONSTRUCTORCATEGORY)))
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 71b79c0b..d2730f29 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -54,6 +54,13 @@ $profileCompiler := false
++
$Slot1DataBase := MAKE_-HASHTABLE "ID"
+++
+$NRTdeltaList := []
+$NRTdeltaLength := 0
+
+++
+$NRTaddForm := nil
+
-----------------------------NEW buildFunctor CODE-----------------------------
NRTaddDeltaCode() ==
@@ -567,9 +574,7 @@ NRTsetVector4a(sig,form,cond) ==
NRTmakeSlot1 domainShell ==
opDirectName := INTERN STRCONC(PNAME first $definition,'";opDirect")
- fun :=
- $NRTmakeCompactDirect => '(function lookupInCompactTable)
- '(function lookupInTable)
+ fun := '(function lookupInCompactTable)
[($QuickCode=>'QSETREFV;'SETELT), '$,1, ['LIST,fun,'$,opDirectName]]
NRTmakeSlot1Info() ==
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 520dda39..81791987 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -45,12 +45,7 @@ $lookupDefaults := false
-- Basic Functions
--=======================================================================
initNewWorld() ==
- $NRTflag := true
$NRTvec := true
- $NRTmakeCompactDirect := true
- $NRTquick := true
- $NRTmakeShortDirect := true
- $newWorld := true
$monitorNewWorld := false
$spadLibFT := 'NRLIB
$NRTmonitorIfTrue := false
diff --git a/src/interp/rulesets.boot b/src/interp/rulesets.boot
index 0e786f7f..d6e9ae15 100644
--- a/src/interp/rulesets.boot
+++ b/src/interp/rulesets.boot
@@ -35,6 +35,8 @@
import '"vmlisp"
)package "BOOT"
+$ruleSetsInitialized := false
+
--% Mode and Type Resolution Rule Data and Ruleset Creation
--% resolveTT Rules
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index eb0202ee..f64336c7 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -46,10 +46,6 @@
(defvar MARG 0)
;" Margin for testing by ?OP"
-(SETQ |$NRTmakeCompactDirect| NIL)
-(SETQ |$NRTquick| NIL)
-(SETQ |$NRTmakeShortDirect| NIL)
-(SETQ |$newWorld| NIL)
(SETQ |$returnNowhereFromGoGet| NIL)
(SETQ |$abbreviateJoin| NIL)
@@ -90,10 +86,6 @@
(SETQ |$prefix| NIL)
(SETQ |$formalArgList| ())
-(SETQ |$NRTflag| T)
-(SETQ |$NRTaddForm| NIL)
-(SETQ |$NRTdeltaList| NIL)
-(SETQ |$NRTdeltaLength| 0)
(SETQ |$NRTopt| NIL) ;; turns off buggy code
(SETQ |$NRTmonitorIfTrue| NIL)