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 | 6 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 23 | ||||
| -rw-r--r-- | src/interp/modemap.boot | 10 |
6 files changed, 36 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.2.0-2008-04-08. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-04-11. # # 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-04-08' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-04-08' +PACKAGE_VERSION='1.2.0-2008-04-11' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-04-11' 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-04-08 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-04-11 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-04-08:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-04-11:";; 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-04-08 +OpenAxiom configure 1.2.0-2008-04-11 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-04-08, which was +It was created by OpenAxiom $as_me 1.2.0-2008-04-11, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25801,7 +25801,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-04-08, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-04-11, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25850,7 +25850,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-04-08 +OpenAxiom config.status 1.2.0-2008-04-11 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 2a0c7878..4ffd7e39 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-04-08], +AC_INIT([OpenAxiom], [1.2.0-2008-04-11], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 6a17ce2c..87f3b33a 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1092,7 +1092,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-04-08], +AC_INIT([OpenAxiom], [1.2.0-2008-04-11], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 7298ed24..98f67f86 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-04-11 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/compiler.boot: Register compiler for Enumeration + instantiations. + * interp/modemap.boot (compCat): Move to compiler.boot. + 2008-04-09 Gabriel Dos Reis <gdr@cs.tamu.edu> * boot/translator.boot (bpOutItem): Tidy. diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 12a36c52..d3313980 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1592,6 +1592,20 @@ compilerDoitWithScreenedLisplib(constructor, fun) == SEQ(UNEMBED 'RWRITE)) +--% Categories + +compCat(form is [functorName,:argl],m,e) == + fn:= GETL(functorName,"makeFunctionList") or return nil + [funList,e]:= FUNCALL(fn,form,form,e) + catForm:= + ["Join",'(SetCategory),["CATEGORY","domain",: + [["SIGNATURE",op,sig] for [op,sig,.] in funList | op^="="]]] + --RDJ: for coercion purposes, it necessary to know it's a Set; I'm not + --sure if it uses any of the other signatures(see extendsCategoryForm) + [form,catForm,e] + + + --% Interface to the backend compileFileQuietly path == @@ -1604,10 +1618,10 @@ compileFileQuietly path == --% Register compilers for special forms. -- Those compilers are on the `SPECIAL' property of the corresponding -- special form operator symbol. -for x in [["_|", :"compSuchthat"],_ - ["_@", :"compAtSign"],_ - ["_:", :"compColon"],_ - ["_:_:", :"compCoerce"],_ +for x in [["|", :"compSuchthat"],_ + ["@", :"compAtSign"],_ + [":", :"compColon"],_ + ["::", :"compCoerce"],_ ["QUOTE", :"compQuote"],_ ["add", :"compAdd"],_ ["CAPSULE", :"compCapsule"],_ @@ -1619,6 +1633,7 @@ for x in [["_|", :"compSuchthat"],_ ["construct", :"compConstruct"],_ ["DEF", :"compDefine"],_ ["elt", :"compElt"],_ + ["Enumeration", :"compCat"],_ ["exit", :"compExit"],_ ["has", :"compHas"],_ ["IF", : "compIf"],_ diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index f2ae0fc5..f80df408 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -340,16 +340,6 @@ substNames(domainName,viewName,functorForm,opalist) == for [:modemapform,[sel,"$",pos]] in EQSUBSTLIST(KDR functorForm,$FormalMapVariableList, opalist)] -compCat(form is [functorName,:argl],m,e) == - fn:= GETL(functorName,"makeFunctionList") or return nil - [funList,e]:= FUNCALL(fn,form,form,e) - catForm:= - ["Join",'(SetCategory),["CATEGORY","domain",: - [["SIGNATURE",op,sig] for [op,sig,.] in funList | op^="="]]] - --RDJ: for coercion purposes, it necessary to know it's a Set; I'm not - --sure if it uses any of the other signatures(see extendsCategoryForm) - [form,catForm,e] - addConstructorModemaps(name,form is [functorName,:.],e) == $InteractiveMode: local:= nil e:= putDomainsInScope(name,e) --frame |