* algebra/boolean.spad.pamphlet (atoms$PropositionalFormula):

	Rename from terms.

6 files changed, 25 insertions, 21 deletions

diff --git a/configure b/configure
index 75fd5e8a..41366a42 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.4.0-2010-04-07.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-04-08.
 #
 # 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.4.0-2010-04-07'
-PACKAGE_STRING='OpenAxiom 1.4.0-2010-04-07'
+PACKAGE_VERSION='1.4.0-2010-04-08'
+PACKAGE_STRING='OpenAxiom 1.4.0-2010-04-08'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1511,7 +1511,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.4.0-2010-04-07 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2010-04-08 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,7 +1581,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-04-07:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-04-08:";;
    esac
   cat <<\_ACEOF
 
@@ -1688,7 +1688,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2010-04-07
+OpenAxiom configure 1.4.0-2010-04-08
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1702,7 +1702,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.4.0-2010-04-07, which was
+It was created by OpenAxiom $as_me 1.4.0-2010-04-08, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -21165,7 +21165,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.4.0-2010-04-07, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2010-04-08, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21228,7 +21228,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-OpenAxiom config.status 1.4.0-2010-04-07
+OpenAxiom config.status 1.4.0-2010-04-08
 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 2cd433d2..c35dbbba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2010-04-07], 
+AC_INIT([OpenAxiom], [1.4.0-2010-04-08], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index be0f114b..4827e320 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1200,7 +1200,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2010-04-07], 
+AC_INIT([OpenAxiom], [1.4.0-2010-04-08], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 1e98fe3b..087e5c42 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-08  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* algebra/boolean.spad.pamphlet (atoms$PropositionalFormula):
+	Rename from terms.
+
 2010-04-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* algebra/boolean.spad.pamphlet (isAtom$PropositionalFormula):
diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet
index b556b37b..a87b4c9b 100644
--- a/src/algebra/boolean.spad.pamphlet
+++ b/src/algebra/boolean.spad.pamphlet
@@ -270,8 +270,8 @@ PropositionalFormulaFunctions1(T): Public == Private where
   Public == Type with
     dual: PropositionalFormula T -> PropositionalFormula T
       ++ \spad{dual f} returns the dual of the proposition \spad{f}.
-    terms: PropositionalFormula T -> Set T
-      ++ \spad{terms f} ++ returns the set of terms appearing in
+    atoms: PropositionalFormula T -> Set T
+      ++ \spad{atoms f} ++ returns the set of atoms appearing in
       ++ the formula \spad{f}.
     simplify: PropositionalFormula T -> PropositionalFormula T
       ++ \spad{simplify f} returns a formula logically equivalent
@@ -291,13 +291,13 @@ PropositionalFormulaFunctions1(T): Public == Private where
          conjunction(dual first f2, dual second f2)
       error "formula contains `equiv' or `implies'"
 
-    terms f ==
+    atoms f ==
       (t := isAtom f) case T => { t }
-      (f1 := isNot f) case F => terms f1
+      (f1 := isNot f) case F => atoms f1
       (f2 := isAnd f) case Pair(F,F) =>
-         union(terms first f2, terms second f2)
+         union(atoms first f2, atoms second f2)
       (f2 := isOr f) case Pair(F,F) =>
-         union(terms first f2, terms second f2)
+         union(atoms first f2, atoms second f2)
       empty()$Set(T)
 
     -- one-step simplification helper function
@@ -357,7 +357,7 @@ PropositionalFormulaFunctions2(S,T): Public == Private where
   Public == Type with
     map: (S -> T, PropositionalFormula S) -> PropositionalFormula T
       ++ \spad{map(f,x)} returns a propositional formula where
-      ++ all terms in \spad{x} have been replaced by the result
+      ++ all atoms in \spad{x} have been replaced by the result
       ++ of applying the function \spad{f} to them.
   Private == add
     macro FS == PropositionalFormula S
diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot
index 25172e4f..041289bf 100644
--- a/src/interp/modemap.boot
+++ b/src/interp/modemap.boot
@@ -63,9 +63,8 @@ addDomain(domain,e) ==
   -- ??? we should probably augment $DummyFunctorNames with CATEGORY
   -- ??? so that we don't have to do this special check here.  Investigate.
   isQuasiquote domain => e 
-  if not isCategoryForm(domain,e) and
-    not member(name,'(Mapping CATEGORY)) then
-      unknownTypeError name
+  if not isCategoryForm(domain,e) and name ~= "Mapping" then
+    unknownTypeError name
   e        --is not a functor
  
 domainMember(dom,domList) == or/[modeEqual(dom,d) for d in domList]