diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-01 17:54:16 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-01 17:54:16 +0000 |
| commit | 569c20a430023be60c2b38f47bccc5810c6980aa (patch) | |
| tree | e7929027ccfb4584225245b0839175b34f02328d | |
| parent | b56083910b371806c329bf4657c51db77f7040ef (diff) | |
| download | open-axiom-569c20a430023be60c2b38f47bccc5810c6980aa.tar.gz | |
Simplify compiler ast for `return' expressions.
* interp/parse.boot (parseReturn): Remove.
* interp/compiler.boot (compReturn): Tidy.
| -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 | 3 | ||||
| -rw-r--r-- | src/interp/parse.boot | 10 |
6 files changed, 18 insertions, 23 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.3.0-2009-05-31. +# Generated by GNU Autoconf 2.63 for OpenAxiom 1.3.0-2009-06-01. # # 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.3.0-2009-05-31' -PACKAGE_STRING='OpenAxiom 1.3.0-2009-05-31' +PACKAGE_VERSION='1.3.0-2009-06-01' +PACKAGE_STRING='OpenAxiom 1.3.0-2009-06-01' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1500,7 +1500,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-05-31 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2009-06-01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1570,7 +1570,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-05-31:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-06-01:";; esac cat <<\_ACEOF @@ -1672,7 +1672,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.3.0-2009-05-31 +OpenAxiom configure 1.3.0-2009-06-01 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1686,7 +1686,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-05-31, which was +It was created by OpenAxiom $as_me 1.3.0-2009-06-01, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -17686,7 +17686,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-05-31, which was +This file was extended by OpenAxiom $as_me 1.3.0-2009-06-01, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17749,7 +17749,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -OpenAxiom config.status 1.3.0-2009-05-31 +OpenAxiom config.status 1.3.0-2009-06-01 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 d7f48606..ea091ee0 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-05-31], +AC_INIT([OpenAxiom], [1.3.0-2009-06-01], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 8676fb99..37a8450a 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-05-31], +AC_INIT([OpenAxiom], [1.3.0-2009-06-01], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 250b33c8..6a30d970 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2009-06-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + Simplify compiler ast for `return' expressions. + * interp/parse.boot (parseReturn): Remove. + * interp/compiler.boot (compReturn): Tidy. + +2009-06-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + Fix SF/2799238 * algebra/syntax.spad.pamphlet (SpadAst): Fix typo. diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index d1c626e0..f14ba01d 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1088,11 +1088,10 @@ compLeave(["leave",level,x],m,e) == --% return compReturn: (%Form,%Mode,%Env) -> %Maybe %Triple -compReturn(["return",level,x],m,e) == +compReturn(["return",x],m,e) == null $exitModeStack => stackAndThrow('"the return before %1b is unneccessary",[x]) nil - level^=1 => userError '"multi-level returns not supported" index:= MAX(0,#$exitModeStack-1) if index >= 0 then $returnMode:= resolve($exitModeStack.index,$returnMode) diff --git a/src/interp/parse.boot b/src/interp/parse.boot index e87d8906..278de20e 100644 --- a/src/interp/parse.boot +++ b/src/interp/parse.boot @@ -315,15 +315,6 @@ parseLeave t == ["leave",1,a] -parseReturn: %ParseForm -> %Form -parseReturn t == - t isnt ["return",a,:b] => systemErrorHere ["parseReturn",t] - a:= parseTran a - b:= parseTran b - b => - (if a^=1 then MOAN '"multiple-level 'return' not allowed"; ["return",1,:b]) - ["return",1,a] - parseJoin: %ParseForm -> %Form parseJoin t == t isnt ["Join",:l] => systemErrorHere ["parseJoin",t] @@ -496,7 +487,6 @@ for x in [["<=", :"parseLessEqual"],_ ["or", :"parseOr"],_ ["pretend", :"parsePretend"],_ ["@@",:"parseAtAt"],_ - ["return", :"parseReturn"],_ ["SEGMENT", :"parseSegment"],_ ["SEQ", :"parseSeq"],_ ["VCONS", :"parseVCONS"],_ |