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/compiler.boot | 23 |
5 files changed, 30 insertions, 20 deletions
@@ -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-02-14. +# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-02-15. # # 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-02-14' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-02-14' +PACKAGE_VERSION='1.4.0-2010-02-15' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-02-15' 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-02-14 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-02-15 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-02-14:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-02-15:";; 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-02-14 +OpenAxiom configure 1.4.0-2010-02-15 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-02-14, which was +It was created by OpenAxiom $as_me 1.4.0-2010-02-15, 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-02-14, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-02-15, 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-02-14 +OpenAxiom config.status 1.4.0-2010-02-15 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 b683ce91..019d5608 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-02-14], +AC_INIT([OpenAxiom], [1.4.0-2010-02-15], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index d1c5bf2b..c2c90f74 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-02-14], +AC_INIT([OpenAxiom], [1.4.0-2010-02-15], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 63244e90..3f365d21 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-02-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/compiler.boot (transImplementation): Loose last argument. + (compAtomWithModemap): Adjust call. + 2010-02-14 Gabriel Dos Reis <gdr@cse.tamu.edu> Fix SF/2910351 diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 28a4cbf3..1c5808d4 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -58,7 +58,6 @@ compExpression: (%Form,%Mode,%Env) -> %Maybe %Triple compAtom: (%Form,%Mode,%Env) -> %Maybe %Triple compSymbol: (%Form,%Mode,%Env) -> %Maybe %Triple compString: (%Form,%Mode,%Env) -> %Maybe %Triple -compAtomWithModemap: (%Form,%Mode,%Env,%Thing) -> %Maybe %Triple compTypeOf: (%Form,%Mode,%Env) -> %Maybe %Triple compForm: (%Form,%Mode,%Env) -> %Maybe %Triple compForm1: (%Form,%Mode,%Env) -> %Maybe %Triple @@ -77,7 +76,6 @@ modeEqual: (%Form,%Form) -> %Boolean hasUniqueCaseView: (%Form,%Mode,%Env) -> %Boolean convertOrCroak: (%Triple,%Mode) -> %Maybe %Triple getFormModemaps: (%Form,%Env) -> %List -transImplementation: (%Form,%Modemap,%Thing) -> %Code reshapeArgumentList: (%Form,%Signature) -> %Form applyMapping: (%Form,%Mode,%Env,%List) -> %Maybe %Triple @@ -382,24 +380,31 @@ compExpression(x,m,e) == FUNCALL(fn,x,m,e) compForm(x,m,e) +++ Subroutine of compAtomWithModemap. +++ Record a local reference to an overload constant, and return +++ corresponding middle-end form. +transImplementation: (%Form,%Modemap) -> %Code +transImplementation(op,map) == + fn := genDeltaEntry [op,:map] + fn is ["XLAM",:.] => [fn] + ["call",fn] + +++ Subroutine of compAtom. +++ Elaborate use of an overloaded constant. +compAtomWithModemap: (%Symbol,%Mode,%Env,%List) -> %Maybe %Triple compAtomWithModemap(x,m,e,v) == Tl := - [[transImplementation(x,map,fn),target,e] + [[transImplementation(x,map),target,e] for map in v | map is [[.,target],[.,fn]]] => --accept only monadic operators T:= or/[t for (t:= [.,target,.]) in Tl | modeEqual(m,target)] => T 1=#(Tl:= [y for t in Tl | (y:= convert(t,m))]) => first Tl nil -transImplementation(op,map,fn) == - fn := genDeltaEntry [op,:map] - fn is ["XLAM",:.] => [fn] - ["call",fn] - compAtom(x,m,e) == x = "break" => compBreak(x,m,e) x = "iterate" => compIterate(x,m,e) - T:= compAtomWithModemap(x,m,e,get(x,"modemap",e)) => T + T:= IDENTP x and compAtomWithModemap(x,m,e,get(x,"modemap",e)) => T t:= isSymbol x => compSymbol(x,m,e) or return nil member(m,$IOFormDomains) and primitiveType x => [x,m,e] |