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/algebra/mkfunc.spad.pamphlet | 1 | ||||
| -rw-r--r-- | src/interp/i-output.boot | 16 |
6 files changed, 33 insertions, 12 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-17. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-04-19. # # 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-17' -PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-17' +PACKAGE_VERSION='1.3.0-2009-04-19' +PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-19' 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-17 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2009-04-19 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-17:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-19:";; 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-17 +OpenAxiom configure 1.3.0-2009-04-19 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-17, which was +It was created by OpenAxiom $as_me 1.3.0-2009-04-19, 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-17, which was +This file was extended by OpenAxiom $as_me 1.3.0-2009-04-19, 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-17 +OpenAxiom config.status 1.3.0-2009-04-19 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 a3a2abf9..ad6a9d50 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-17], +AC_INIT([OpenAxiom], [1.3.0-2009-04-19], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 706f4762..b8efd016 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-17], +AC_INIT([OpenAxiom], [1.3.0-2009-04-19], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 57e610a1..aab26edd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-04-19 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/mkfunc.spad.pamphlet (tuplify$InputForm): Tidy. + * interp/i-output.boot (parms2String): New. + (inputForm2String): Handle anonymous functions. + 2009-04-18 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/mkfunc.spad.pamphlet (InputForm): Remove assignment to Rep. diff --git a/src/algebra/mkfunc.spad.pamphlet b/src/algebra/mkfunc.spad.pamphlet index 3bb17da5..1770e7c8 100644 --- a/src/algebra/mkfunc.spad.pamphlet +++ b/src/algebra/mkfunc.spad.pamphlet @@ -158,6 +158,7 @@ InputForm(): convert([op, first args, binary(op, rest args)]$List(%)) tuplify l == + empty? l => convert(nil$List(%)) empty? rest l => convert first l conv concat(convert("tuple"::Symbol), [convert x for x in l]$List(%)) diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index e804fb2d..41dacca2 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2008, Gabriel Dos Reis. +-- Copyright (C) 2007-2009, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -2666,6 +2666,17 @@ minusForm2String x == x isnt ["-",lhs,rhs] => plusForm2String x strconc(minusForm2String lhs,'" - ", minusForm2String rhs) +parms2String x == + null x => "()" + IDENTP x => x + x is [var] => var + if x is ["tuple",:.] then x := rest x + paren [parm xs for xs in tails x] where + paren l == "strconc"/["(",:l,")"] + parm xs == + null rest xs => first xs + strconc(first xs, ", ") + inputForm2String x == atom x => primaryForm2String x [op,:args] := x @@ -2680,6 +2691,9 @@ inputForm2String x == op = "-" => minusForm2String x op in '(_@ _:_: pretend) => typedForm2String(op, first args, second args) + op = "+->" => + strconc(parms2String second x, " ", first x, " ", + inputForm2String third x) callForm2String x callForm2String x |