aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--configure.ac.pamphlet2
-rw-r--r--src/ChangeLog17
-rw-r--r--src/algebra/fortpak.spad.pamphlet4
-rw-r--r--src/algebra/fortran.spad.pamphlet4
-rw-r--r--src/algebra/gdirprod.spad.pamphlet3
-rw-r--r--src/algebra/mkfunc.spad.pamphlet3
-rw-r--r--src/algebra/oct.spad.pamphlet1
-rw-r--r--src/algebra/si.spad.pamphlet7
-rw-r--r--src/algebra/vector.spad.pamphlet5
-rw-r--r--src/interp/category.boot20
-rw-r--r--src/interp/define.boot7
-rw-r--r--src/interp/functor.boot3
-rw-r--r--src/interp/info.boot2
-rw-r--r--src/interp/sys-globals.boot3
16 files changed, 31 insertions, 70 deletions
diff --git a/configure b/configure
index f8d64565..acc79255 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.63 for OpenAxiom 1.3.0-2009-06-14.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.3.0-2009-06-20.
#
# Report bugs to <open-axiom-bugs@lists.sf.net>.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='OpenAxiom'
PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.3.0-2009-06-14'
-PACKAGE_STRING='OpenAxiom 1.3.0-2009-06-14'
+PACKAGE_VERSION='1.3.0-2009-06-20'
+PACKAGE_STRING='OpenAxiom 1.3.0-2009-06-20'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -1500,7 +1500,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-06-14 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2009-06-20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1570,7 +1570,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-06-14:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-06-20:";;
esac
cat <<\_ACEOF
@@ -1672,7 +1672,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2009-06-14
+OpenAxiom configure 1.3.0-2009-06-20
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1686,7 +1686,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-06-14, which was
+It was created by OpenAxiom $as_me 1.3.0-2009-06-20, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -17686,7 +17686,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-06-14, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2009-06-20, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17749,7 +17749,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2009-06-14
+OpenAxiom config.status 1.3.0-2009-06-20
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index bbe8c381..02746da5 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-06-14],
+AC_INIT([OpenAxiom], [1.3.0-2009-06-20],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index bb662ab1..2714efe3 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1131,7 +1131,7 @@ information:
<<Autoconf init>>=
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-06-14],
+AC_INIT([OpenAxiom], [1.3.0-2009-06-20],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index c6160271..305a1291 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2009-06-20 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/category.boot (SigOpsubsume): Remove as unused.
+ (SourceLevelSubsume): Remove.
+ (SourceLevelSubset): Likewise.
+ * interp/sys-globals.boot: Likewise.
+ * interp/define.boot: Tidy.
+ * interp/functor.boot: Likewise.
+ * interp/info.boot: Likewise.
+ * algebra/si.spad.pamphlet: Don't set $noSubsets.
+ * algebra/fortpak.spad.pamphlet: Don't set $noSubsumption.
+ * algebra/fortran.spad.pamphlet: Likewise.
+ * algebra/gdirprod.spad.pamphlet: Likewise.
+ * algebra/mkfunc.spad.pamphlet: Likewise.
+ * algebra/oct.spad.pamphlet: Likewise.
+ * algebra/vector.spad.pamphlet: Likewise.
+
2009-06-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
* algebra/domain.spad.pamphlet: ConstructorCall is now
diff --git a/src/algebra/fortpak.spad.pamphlet b/src/algebra/fortpak.spad.pamphlet
index b3ae68a3..da7bd7f9 100644
--- a/src/algebra/fortpak.spad.pamphlet
+++ b/src/algebra/fortpak.spad.pamphlet
@@ -229,8 +229,6 @@ NAGLinkSupportPackage() : exports == implementation where
\section{package FORT FortranPackage}
<<package FORT FortranPackage>>=
)abbrev package FORT FortranPackage
--- Because of a bug in the compiler:
-)bo $noSubsumption:=true
++ Author: Mike Dewar
++ Date Created: October 6 1991
@@ -323,8 +321,6 @@ FortranPackage(): Exports == Implementation where
\section{package FOP FortranOutputStackPackage}
<<package FOP FortranOutputStackPackage>>=
)abbrev package FOP FortranOutputStackPackage
--- Because of a bug in the compiler:
-)bo $noSubsumption:=false
++ Author: Mike Dewar
++ Date Created: October 1992
diff --git a/src/algebra/fortran.spad.pamphlet b/src/algebra/fortran.spad.pamphlet
index aa9902d4..a35ce6dd 100644
--- a/src/algebra/fortran.spad.pamphlet
+++ b/src/algebra/fortran.spad.pamphlet
@@ -1158,8 +1158,6 @@ ThreeDimensionalMatrix(R) : Exports == Implementation where
\section{domain SFORT SimpleFortranProgram}
<<domain SFORT SimpleFortranProgram>>=
)abbrev domain SFORT SimpleFortranProgram
--- Because of a bug in the compiler:
-)bo $noSubsumption:=true
++ Author: Mike Dewar
++ Date Created: November 1992
@@ -1222,8 +1220,6 @@ SimpleFortranProgram(R,FS): Exports == Implementation where
\section{domain SWITCH Switch}
<<domain SWITCH Switch>>=
)abbrev domain SWITCH Switch
--- Because of a bug in the compiler:
-)bo $noSubsumption:=false
++ Author: Mike Dewar
++ Date Created: April 1991
diff --git a/src/algebra/gdirprod.spad.pamphlet b/src/algebra/gdirprod.spad.pamphlet
index 622e8726..f0041f84 100644
--- a/src/algebra/gdirprod.spad.pamphlet
+++ b/src/algebra/gdirprod.spad.pamphlet
@@ -85,9 +85,6 @@ OrderingFunctions(dim,S) : T == C where
\section{domain ODP OrderedDirectProduct}
<<domain ODP OrderedDirectProduct>>=
)abbrev domain ODP OrderedDirectProduct
--- all direct product category domains must be compiled
--- without subsumption, set SourceLevelSubset to EQUAL
---)bo $noSubsumption := true
++ Author:
++ Date Created:
diff --git a/src/algebra/mkfunc.spad.pamphlet b/src/algebra/mkfunc.spad.pamphlet
index d9ecaafc..a66a0fb6 100644
--- a/src/algebra/mkfunc.spad.pamphlet
+++ b/src/algebra/mkfunc.spad.pamphlet
@@ -24,8 +24,6 @@
++ This is also the interface between algebra code and facilities
++ in the interpreter.
---)boot $noSubsumption := true
-
InputForm():
Join(SExpressionCategory(String,Symbol,Integer,DoubleFloat,OutputForm),
ConvertibleTo SExpression) with
@@ -200,7 +198,6 @@ InputForm():
\section{package INFORM1 InputFormFunctions1}
<<package INFORM1 InputFormFunctions1>>=
)abbrev package INFORM1 InputFormFunctions1
---)boot $noSubsumption := false
++ Tools for manipulating input forms
++ Author: Manuel Bronstein
diff --git a/src/algebra/oct.spad.pamphlet b/src/algebra/oct.spad.pamphlet
index e2b6c52e..35805e37 100644
--- a/src/algebra/oct.spad.pamphlet
+++ b/src/algebra/oct.spad.pamphlet
@@ -284,7 +284,6 @@ OctonionCategory(R: CommutativeRing): Category ==
++ imaginary part, the k imaginary part, (as with quaternions)
++ and in addition the imaginary parts E, I, J, K.
-- Examples: octonion.input
---)boot $noSubsumption := true
Octonion(R:CommutativeRing): export == impl where
QR ==> Quaternion R
diff --git a/src/algebra/si.spad.pamphlet b/src/algebra/si.spad.pamphlet
index 1d18f7cd..e0cd68b1 100644
--- a/src/algebra/si.spad.pamphlet
+++ b/src/algebra/si.spad.pamphlet
@@ -165,11 +165,6 @@ IntegerNumberSystem(): Category ==
<<domain SINT SingleInteger>>=
)abbrev domain SINT SingleInteger
--- following patch needed to deal with *:(I,%) -> %
--- affects behavior of SourceLevelSubset
---)bo $noSubsets := true
--- No longer - JHD !! still needed 5/3/91 BMT
-
++ Author: Michael Monagan
++ Date Created:
++ January 1988
@@ -344,8 +339,6 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,Logic,OpenMath) with
x < 0 => [-1,-x,-1]$UCA
[1,x,1]$UCA
-)bo $noSubsets := false
-
@
diff --git a/src/algebra/vector.spad.pamphlet b/src/algebra/vector.spad.pamphlet
index a096f39e..70d7193d 100644
--- a/src/algebra/vector.spad.pamphlet
+++ b/src/algebra/vector.spad.pamphlet
@@ -215,9 +215,6 @@ VectorFunctions2(A, B): Exports == Implementation where
\section{category DIRPCAT DirectProductCategory}
<<category DIRPCAT DirectProductCategory>>=
)abbrev category DIRPCAT DirectProductCategory
--- all direct product category domains must be compiled
--- without subsumption, set SourceLevelSubset to EQUAL
---)bo $noSubsumption := true
--% DirectProductCategory
@@ -404,8 +401,6 @@ DirectProduct(dim:NonNegativeInteger, R:Type):
if R has OrderedAbelianMonoidSup then sup(x, y) == map(sup, x, y)
---)bo $noSubsumption := false
-
@
\section{package DIRPROD2 DirectProductFunctions2}
<<package DIRPROD2 DirectProductFunctions2>>=
diff --git a/src/interp/category.boot b/src/interp/category.boot
index dbdf9919..77b45dfe 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -300,28 +300,10 @@ SigListOpSubsume([[name1,sig1,:.],:.],list) ==
lsig1 := #sig1
ans:=[]
for (n:=[[name2,sig2,:.],:.]) in list repeat
- name1=name2 and lsig1 = #sig2 and SourceLevelSubsume(sig1,sig2) =>
+ name1=name2 and lsig1 = #sig2 and sig1 = sig2 =>
ans:=[n,:ans]
return ans
-SigOpsubsume([[name1,sig1,:flag1],pred1,:.],[[name2,sig2,:flag2],pred2,:.]) ==
- --flag1 = flag2 and :this really should be checked
- name1=name2 and LENGTH sig1=LENGTH sig2 and SourceLevelSubsume(sig1,sig2)
-
-SourceLevelSubsume([out1,:in1],[out2,:in2]) ==
- -- Checks for source-level subsumption in the sense of SYSTEM SCRIPT
- -- true if the first signature subsumes the second
- SourceLevelSubset(out1,out2) and
- (and/[SourceLevelSubset(inarg2,inarg1) for inarg1 in in1 for inarg2 in in2])
-
-SourceLevelSubset(a,b) ==
- --true if a is a source-level subset of b
- a=b => true
- $noSubsumption=true => false
- b is ["Union",:blist] and member(a,blist) => true
- BOUNDP '$noSubsets and $noSubsets => false
- not null isSubDomain(a,b)
-
MachineLevelSubsume([name1,[out1,:in1],:flag1],[name2,[out2,:in2],:flag2]) ==
-- Checks for machine-level subsumption in the sense of SYSTEM SCRIPT
-- true if the first signature subsumes the second
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 8a188026..f0d9cb16 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1127,13 +1127,6 @@ getSignature(op,argModeList,$e) ==
else for [[dc,:sig],:.] in mmList repeat printSignature(" ",op,sig)
printSignature("NEED ",op,["?",:argModeList])
nil
- for u in sigl repeat
- for v in sigl | not (u=v) repeat
- if SourceLevelSubsume(u,v) then sigl:= delete(v,sigl)
- --before we complain about duplicate signatures, we should
- --check that we do not have for example, a partial - as
- --well as a total one. SourceLevelSubsume (from CATEGORY BOOT)
- --should do this
1=#sigl => first sigl
stackSemanticError(["duplicate signatures for ",op,": ",argModeList],nil)
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index b792ff7e..0a1a700c 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -734,8 +734,7 @@ SigSlotsMatch(sig,pattern,implem) ==
sig'=pat' => true
--If we don't have this next test, then we'll recurse in SetFunctionSlots
implem is ['Subsumed,:.] => nil
- SourceLevelSubsume(sig',pat') => true
- nil
+ sig' = pat'
CheckVector(vec,name,catvecListMaker) ==
code:= nil
diff --git a/src/interp/info.boot b/src/interp/info.boot
index 1e9cb6ef..2e168e03 100644
--- a/src/interp/info.boot
+++ b/src/interp/info.boot
@@ -200,7 +200,7 @@ knownInfo pred ==
v:= get(op,"modemap",$e)
for w in v repeat
ww:= CDAR w --the actual signature part
- #ww = #sig and SourceLevelSubsume(ww,sig) =>
+ ww = sig =>
CAADR w = true => return true
false
--error '"knownInfo"
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index c90028e7..d73e5234 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -374,9 +374,6 @@ $constructorLineNumber := 0
++
$maxSignatureLineNumber := 0
-++
-$noSubsumption :=true
-
SPADERRORSTREAM := _*ERROR_-OUTPUT_*
++
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-08 09:25:30 +0000