diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/interp/br-con.boot | 4 | ||||
| -rw-r--r-- | src/interp/br-op2.boot | 3 | ||||
| -rw-r--r-- | src/interp/br-saturn.boot | 12 | ||||
| -rw-r--r-- | src/interp/buildom.boot | 2 | ||||
| -rw-r--r-- | src/interp/sys-constants.boot | 5 |
9 files changed, 35 insertions, 25 deletions
@@ -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-04-28. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-05-04. # # 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-04-28' -PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-28' +PACKAGE_VERSION='1.3.0-2009-05-04' +PACKAGE_STRING='OpenAxiom 1.3.0-2009-05-04' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1406,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-04-28 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2009-05-04 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1476,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-04-28:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-05-04:";; esac cat <<\_ACEOF @@ -1580,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-04-28 +OpenAxiom configure 1.3.0-2009-05-04 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,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-04-28, which was +It was created by OpenAxiom $as_me 1.3.0-2009-05-04, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -26808,7 +26808,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-04-28, which was +This file was extended by OpenAxiom $as_me 1.3.0-2009-05-04, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26857,7 +26857,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.3.0-2009-04-28 +OpenAxiom config.status 1.3.0-2009-05-04 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 3ca650c8..2e095780 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-04-28], +AC_INIT([OpenAxiom], [1.3.0-2009-05-04], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index bb8626e3..e6579895 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-04-28], +AC_INIT([OpenAxiom], [1.3.0-2009-05-04], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 614d802a..a0a2950a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2009-05-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + + Fix SF/2785271 + * interp/sys-constants.boot ($Primitives): Remove. + * interp/br-con.boot (conOpPage1): Replace $Primitives by + $DomainNames. + (dbShowConsDoc1): Likewise. + * interp/buildom.boot ($nonLisplibDomains): Likewise. + * interp/br-op2.boot (kFormatSlotDomain): isConstructorName. + * interp/br-saturn.boot (bfConform1): Handle string literals as + constructor arguments. + 2009-04-28 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/define.boot (canCacheLocalDomain): Remove dead code. diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot index 423ea272..b6c9f566 100644 --- a/src/interp/br-con.boot +++ b/src/interp/br-con.boot @@ -738,7 +738,7 @@ conOpPage1(conform,:options) == --constructors Cname\#\E\sig \args \abb \comments (C is C, D, P, X) bindingsAlist := IFCAR options conname := opOf conform - MEMQ(conname,$Primitives) => + MEMQ(conname,$DomainNames) => dbSpecialOperations conname domname := --> !!note!! <-- null atom conform => conform @@ -1055,7 +1055,7 @@ dbShowConsDoc(htPage,conlist) == dbShowConsDoc1(htPage,conform,indexOrNil) == [conname,:conargs] := conform - MEMQ(conname,$Primitives) => + MEMQ(conname,$DomainNames) => conname := htpProperty(htPage,'conname) [["constructor",["NIL",doc]],:.] := GETL(conname,'documentation) sig := '((CATEGORY domain) (SetCategory) (SetCategory)) diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot index f4d259dd..c1f8ac28 100644 --- a/src/interp/br-op2.boot +++ b/src/interp/br-op2.boot @@ -424,8 +424,7 @@ kFormatSlotDomain x == fn formatSlotDomain x where fn x == (op := CAR x) = '_$ => '_$ op = 'local => CADR x op = ":" => [":",CADR x,fn CADDR x] - MEMQ(op,$Primitives) or constructor? op => - [fn y for y in x] + isConstructorName op => [fn y for y in x] INTEGERP op => op op = 'QUOTE and atom CADR x => CADR x x diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot index 3880cebc..272fb6e6 100644 --- a/src/interp/br-saturn.boot +++ b/src/interp/br-saturn.boot @@ -1245,7 +1245,7 @@ displayDomainOp(htPage,which,origin,op,sig,predicate, $conargs : local := rest conform if which = '"operation" then $signature : local := - MEMQ(conname,$Primitives) => nil + MEMQ(conname,$DomainNames) => nil CDAR getConstructorModemapFromDB conname --RDJ: this next line is necessary until compiler bug is fixed --that forgets to substitute #variables for t#variables; @@ -1629,14 +1629,18 @@ bcConform1 form == main where hd form hd form == atom form => - not MEMQ(form,$Primitives) and null constructor? form => - s := STRINGIMAGE form + -- string literals, e.g. "failed", are constructor arguments + -- too, until we fix that. + STRINGP form or not isConstructorName form => + s := + STRINGP form => strconc("_"",form,"_"") + STRINGIMAGE form (s.0 = char '_#) => (n := POSN1(form, $FormalFunctionParameterList)) => htSay form2HtString ($FormalMapVariableList . n) htSay '"\" htSay form - htSay escapeSpecialChars STRINGIMAGE form + htSay escapeSpecialChars s s := STRINGIMAGE form $italicHead? => htSayItalics s $bcMultipleNames => diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot index 11a86a37..bc417364 100644 --- a/src/interp/buildom.boot +++ b/src/interp/buildom.boot @@ -44,7 +44,7 @@ import sys_-macros namespace BOOT $noCategoryDomains == '(Mode SubDomain) -$nonLisplibDomains == APPEND($Primitives,$noCategoryDomains) +$nonLisplibDomains == APPEND($DomainNames,$noCategoryDomains) ++ Category ancestors for Record, Union, Mapping, and Enumeration domains. $commonCategoryAncestors == diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot index f7cdc25f..ab119c84 100644 --- a/src/interp/sys-constants.boot +++ b/src/interp/sys-constants.boot @@ -473,11 +473,6 @@ $NoValueMode == $ExitMode == "$ExitMode" - -+++ List of domains that are (currently) built-in into the system. -$Primitives == - '(Union Record Mapping Enumeration) - --% ++ Category constructor form |