From e88adcff035ac357b03f21325c0edacbc3d55b66 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 23 Feb 2010 18:53:04 +0000 Subject: * interp/nruncomp.boot (genDeltaEntry): Don't store extraneous item on $NRTdeltaList. (NRTgetLocalIndex): Likewise. Tidy. --- configure | 18 +++++++++--------- configure.ac | 2 +- configure.ac.pamphlet | 2 +- src/ChangeLog | 6 ++++++ src/interp/nruncomp.boot | 12 ++++-------- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/configure b/configure index e53d3631..9a5d3054 100755 --- a/configure +++ b/configure @@ -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-22. +# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-02-23. # # Report bugs to . # @@ -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-22' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-02-22' +PACKAGE_VERSION='1.4.0-2010-02-23' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-02-23' 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-22 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-02-23 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-22:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-02-23:";; 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-22 +OpenAxiom configure 1.4.0-2010-02-23 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-22, which was +It was created by OpenAxiom $as_me 1.4.0-2010-02-23, 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-22, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-02-23, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21228,7 +21228,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -OpenAxiom config.status 1.4.0-2010-02-22 +OpenAxiom config.status 1.4.0-2010-02-23 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 f257c48e..76f473a3 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-22], +AC_INIT([OpenAxiom], [1.4.0-2010-02-23], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 009aa656..f8659d78 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1200,7 +1200,7 @@ information: <>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2010-02-22], +AC_INIT([OpenAxiom], [1.4.0-2010-02-23], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 0010e2d3..050f5f10 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-02-23 Gabriel Dos Reis + + * interp/nruncomp.boot (genDeltaEntry): Don't store extraneous + item on $NRTdeltaList. + (NRTgetLocalIndex): Likewise. Tidy. + 2010-02-22 Gabriel Dos Reis Expand support for domain inlining to non-niladic functors. diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index dce086dc..0dfd95f5 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -198,7 +198,7 @@ genDeltaEntry opMmPair == if null NRTassocIndex dc and (member(dc,$functorLocalParameters) or not atom dc) then --create "%domain" entry to $NRTdeltaList - $NRTdeltaList:= [["%domain",NRTaddInner dc,:dc],:$NRTdeltaList] + $NRTdeltaList:= [["%domain",NRTaddInner dc],:$NRTdeltaList] saveNRTdeltaListComp:= $NRTdeltaListComp:=[nil,:$NRTdeltaListComp] $NRTdeltaLength := $NRTdeltaLength+1 compEntry:= (compOrCroak(odc,$EmptyMode,$e)).expr @@ -232,12 +232,8 @@ NRTgetLocalIndex item == k := NRTassocIndex item => k item = "$" => 0 item = "$$" => 2 - value:= - atom item => - MEMQ(item,$formalArgList) => item - nil - atom item and null value => --give slots to atoms - $NRTdeltaList:= [["%domain",NRTaddInner item,:value],:$NRTdeltaList] + atom item and not MEMQ(item,$formalArgList) => --give slots to atoms + $NRTdeltaList:= [["%domain",NRTaddInner item],:$NRTdeltaList] $NRTdeltaListComp:=[item,:$NRTdeltaListComp] index := $NRTbase + $NRTdeltaLength -- slot number to return $NRTdeltaLength := $NRTdeltaLength+1 @@ -245,7 +241,7 @@ NRTgetLocalIndex item == -- when assigning slot to flag values, we don't really want to -- compile them. Rather, we want to record them as if they were atoms. flag := isQuasiquote item - $NRTdeltaList:= [["%domain", NRTaddInner item,:value], :$NRTdeltaList] + $NRTdeltaList:= [["%domain", NRTaddInner item], :$NRTdeltaList] -- remember the item's place in the `delta list' and its slot number -- before the recursive call to the compiler, as that might generate -- more references that would extend the `delta list'. -- cgit v1.2.3