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 | 7 | ||||
| -rw-r--r-- | src/algebra/any.spad.pamphlet | 10 | ||||
| -rw-r--r-- | src/algebra/boolean.spad.pamphlet | 4 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 6 |
7 files changed, 31 insertions, 18 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-07-06. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-07-10. # # 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-07-06' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-07-06' +PACKAGE_VERSION='1.2.0-2008-07-10' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-07-10' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1403,7 +1403,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-07-06 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-07-10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1473,7 +1473,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-07-06:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-07-10:";; esac cat <<\_ACEOF @@ -1577,7 +1577,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-07-06 +OpenAxiom configure 1.2.0-2008-07-10 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1591,7 +1591,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-07-06, which was +It was created by OpenAxiom $as_me 1.2.0-2008-07-10, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -26074,7 +26074,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-07-06, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-07-10, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26123,7 +26123,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-07-06 +OpenAxiom config.status 1.2.0-2008-07-10 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 e002435f..9d0d7216 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-07-06], +AC_INIT([OpenAxiom], [1.2.0-2008-07-10], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 28a04f33..719995ef 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1103,7 +1103,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-07-06], +AC_INIT([OpenAxiom], [1.2.0-2008-07-10], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 421e1630..aaf4c0cb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2008-07-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/compiler.boot (compQuote): Restrict quoting to literal + symbols. + * algebra/any.spad.pamphlet: Use nil for empty list. + * algebra/boolean.spad.pamphlet: Fix quoting. + 2008-07-09 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/i-spec2.boot (findConstantInDomain): Abstract from diff --git a/src/algebra/any.spad.pamphlet b/src/algebra/any.spad.pamphlet index 42a50805..e0e93817 100644 --- a/src/algebra/any.spad.pamphlet +++ b/src/algebra/any.spad.pamphlet @@ -337,11 +337,12 @@ Scope(): Public == Private where Private ==> add import Contour + Rep == List Contour empty() == - '(()) + per NIL$Lisp contours s == - s pretend List(Contour) + rep s findBinding(n,s) == for c in contours s repeat @@ -394,11 +395,12 @@ Environment(): Public == Private where ++ the current category environment in the interpreter. Private ==> add + Rep == List Scope empty() == - '((())) + per NIL$Lisp scopes e == - e pretend List(Scope) + rep e getProperty(n,p,e) == v := get(n,p,e)$Lisp diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index b9761dcc..5ebd188d 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -253,7 +253,7 @@ PropositionalFormula(T: PropositionalLogic): PropositionalLogic with notFormula(p: %): OutputForm == not? p => - elt(outputForm '_not, [notFormula((rep p).'unForm)])$OutputForm + elt(outputForm '_not, [notFormula((rep p).unForm)])$OutputForm primaryFormula p andFormula(p: %): OutputForm == @@ -488,7 +488,7 @@ Boolean(): Join(OrderedSet, Finite, Logic, PropositionalLogic, ConvertibleTo Inp test a == a nt b == (b => false; true) - true == 'T + true == 'T pretend % false == NIL$Lisp sample() == true not b == (b => false; true) diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 10657288..1d9686bc 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -828,7 +828,11 @@ compConstruct(form is ["construct",:l],m,e) == (T:= compVector(l,["Vector",CADR y],e)) and (T':= convert(T,m)) => return T' -compQuote(expr,m,e) == [expr,m,e] +++ Compile a literal (quoted) symbol. +compQuote: (%Form,%Mode,%Env) -> %Maybe %Triple +compQuote(expr,m,e) == + expr is ["QUOTE",x] and SYMBOLP x => convert([expr,$Symbol,e],m) + stackAndThrow('"%1b is not a literal symbol.",[x]) compList: (%Form,%Mode,%Env) -> %Maybe %Triple compList(l,m is ["List",mUnder],e) == |