* interp/slam.boot (clearCache): Use reallyClearLocalModemaps to

	remove local modemaps.Likewise. 
	(clearLocalModemaps): Likewise. Tidy.
	(reallyClearLocalModemaps): New.  Remove dynamically generated
	function definition for internal Lisp-level functions.

5 files changed, 36 insertions, 15 deletions

diff --git a/configure b/configure
index 550fa571..0bf48680 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-06-21.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-06-28.
 #
 # 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-06-21'
-PACKAGE_STRING='OpenAxiom 1.4.0-2010-06-21'
+PACKAGE_VERSION='1.4.0-2010-06-28'
+PACKAGE_STRING='OpenAxiom 1.4.0-2010-06-28'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1513,7 +1513,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-06-21 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2010-06-28 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1583,7 +1583,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-06-21:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-06-28:";;
    esac
   cat <<\_ACEOF
 
@@ -1691,7 +1691,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2010-06-21
+OpenAxiom configure 1.4.0-2010-06-28
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1705,7 +1705,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-06-21, which was
+It was created by OpenAxiom $as_me 1.4.0-2010-06-28, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -21182,7 +21182,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-06-21, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2010-06-28, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21245,7 +21245,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-06-21
+OpenAxiom config.status 1.4.0-2010-06-28
 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 118fa553..b7cd2931 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-06-21], 
+AC_INIT([OpenAxiom], [1.4.0-2010-06-28], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 2914b7b9..3c65ef15 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1210,7 +1210,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2010-06-21], 
+AC_INIT([OpenAxiom], [1.4.0-2010-06-28], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 3ff117da..a496c95a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2010-06-28  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/slam.boot (clearCache): Use reallyClearLocalModemaps to
+	remove local modemaps.Likewise. 
+	(clearLocalModemaps): Likewise. Tidy.
+	(reallyClearLocalModemaps): New.  Remove dynamically generated
+	function definition for internal Lisp-level functions.
+
+2010-06-28  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/i-map.boot (findExternalVarsInBindExpr): New.
 	(findLocalVars1): Use it for %bind-expressions.
 
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 0affa71f..2b404a55 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -382,21 +382,32 @@ mkCacheVec(op,nam,kind,resetCode,countCode) ==
 --   u:= getI(op,"cache") =>
 --     reportCacheStorePrint(op,'variable,nodeCount u)
 --   nil
- 
+
+++ We are about to clear local modemaps associated with `x'.
+++ It is insufficient to just remove the internal functions
+++ form the 'localModemap property list in the current environment.
+++ We also need to clear any Lisp-level function resulting from
+++ previous compilations.
+reallyClearLocalModemaps x ==
+  for mm in get(x,'localModemap,$e) repeat
+    FMAKUNBOUND second mm
+  $e:= putHist(x,'localModemap,nil,$e)
+  
+
 clearCache x ==
   get(x,'localModemap,$e) or get(x,'mapBody,$e) =>
     for [map,:sub] in $mapSubNameAlist repeat
       map=x => _/UNTRACE_,2(sub,NIL)
-    $e:= putHist(x,'localModemap,nil,$e)
+    $e := reallyClearLocalModemaps x
     $e:= putHist(x,'mapBody,nil,$e)
     $e:= putHist(x,'localVars,nil,$e)
     sayKeyedMsg("S2IX0007",[x])
  
 clearLocalModemaps x ==
-  u:= get(x,"localModemap",$e) =>
+  u := get(x,"localModemap",$e) =>
     for sub in ASSOCRIGHT $mapSubNameAlist repeat
       _/UNTRACE_,2(sub,NIL)
-    $e:= putHist(x,"localModemap",nil,$e)
+    $e:= reallyClearLocalModemaps x
     for mm in u repeat
       [.,fn,:.] := mm
       if def:= get(fn,'definition,$e) then
@@ -406,6 +417,8 @@ clearLocalModemaps x ==
       -- now clear the property list of the identifier
       $e := addIntSymTabBinding(x,nil,$e)
     sayKeyedMsg("S2IX0007",[x])
+    $e
+  $e
  
 compileInteractive fn ==
   if $InteractiveMode then startTimingProcess 'compilation