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 | 5 | ||||
| -rw-r--r-- | src/interp/c-util.boot | 9 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 2 | ||||
| -rw-r--r-- | src/interp/wi1.boot | 4 |
7 files changed, 26 insertions, 16 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.2.0-2008-05-10. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-05-12. # # 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.2.0-2008-05-10' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-05-10' +PACKAGE_VERSION='1.2.0-2008-05-12' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-05-12' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1402,7 +1402,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.2.0-2008-05-10 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-05-12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1472,7 +1472,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-05-10:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-05-12:";; esac cat <<\_ACEOF @@ -1576,7 +1576,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-05-10 +OpenAxiom configure 1.2.0-2008-05-12 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1590,7 +1590,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.2.0-2008-05-10, which was +It was created by OpenAxiom $as_me 1.2.0-2008-05-12, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -26078,7 +26078,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.2.0-2008-05-10, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-05-12, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26127,7 +26127,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-05-10 +OpenAxiom config.status 1.2.0-2008-05-12 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 980afddd..aca91eb7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-05-10], +AC_INIT([OpenAxiom], [1.2.0-2008-05-12], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index f02caafc..f54f5c6e 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1108,7 +1108,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-05-10], +AC_INIT([OpenAxiom], [1.2.0-2008-05-12], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index ee195a34..9eb33216 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2008-05-12 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/c-util.boot (isLiteral): Declare. + (makeLiteral): Likewise. + * interp/compiler.boot (compSymbol): Use isLiteral. + * interp/wi1.boot (compSymbol): Likewise. + * algebra/asp.spad.pamphlet (Asp30): Don't name local variable as record field. (Asp31): Likewise. diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index a2691741..4b3647d3 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -350,9 +350,14 @@ isFunction(x,e) == get(x,"modemap",e) or GETL(x,"SPECIAL") or x="case" or getmode(x,e) is [ "Mapping",:.] -isLiteral(x,e) == get(x,"isLiteral",e) +isLiteral: (%Symbol,%Env) -> %Boolean +isLiteral(x,e) == + get(x,"isLiteral",e) -makeLiteral(x,e) == put(x,"isLiteral","true",e) + +makeLiteral: (%Symbol,%Env) -> %Thing +makeLiteral(x,e) == + put(x,"isLiteral","true",e) isSomeDomainVariable s == IDENTP s and #(x:= PNAME s)>2 and x.(0)="#" and x.(1)="#" diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 397e6b9a..94ee5e16 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -320,7 +320,7 @@ compSymbol(s,m,e) == isFluid s => [s,getmode(s,e) or return nil,e] s="true" => ['(QUOTE T),$Boolean,e] s="false" => [false,$Boolean,e] - s=m or get(s,"isLiteral",e) => [["QUOTE",s],s,e] + s=m or isLiteral(s,e) => [["QUOTE",s],s,e] v := get(s,"value",e) => --+ MEMQ(s,$functorLocalParameters) => diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 02f0c892..84476bc9 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -367,7 +367,7 @@ compSymbol(s,m,e) == isFluid s => [s,getmode(s,e) or return nil,e] s="true" => ['(QUOTE T),$Boolean,e] s="false" => [false,$Boolean,e] - s=m or get(s,"isLiteral",e) => [["QUOTE",s],s,e] + s=m or isLiteral(s,e) => [["QUOTE",s],s,e] v:= get(s,"value",e) => --+ MEMQ(s,$functorLocalParameters) => @@ -802,7 +802,7 @@ resolve(min, mout) == coerce(T,m) == T := [T.expr,markKillAll T.mode,T.env] m := markKillAll m - if not get(m, 'isLiteral,T.env) then markImport m + if not isLiteral(m,T.env) then markImport m $InteractiveMode => keyedSystemError("S2GE0016",['"coerce", '"function coerce called from the interpreter."]) |