Fix SF/2037811

	* interp/vmlisp.lisp (EMBED): Evaluate lambda forms to FUNCTIOn type.
	* interp/trace.boot (transTraceItem): Fix thinko.
	(spadTrace): Use assoc, not ASSOC.
	(addTraceItem): Test for domain objects before constructors.

6 files changed, 26 insertions, 18 deletions

diff --git a/configure b/configure
index f1105b93..4798f8c9 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.60 for OpenAxiom 1.2.0-2008-08-02.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-08-04.
 #
 # 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-08-02'
-PACKAGE_STRING='OpenAxiom 1.2.0-2008-08-02'
+PACKAGE_VERSION='1.2.0-2008-08-04'
+PACKAGE_STRING='OpenAxiom 1.2.0-2008-08-04'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1403,7 +1403,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-08-02 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.2.0-2008-08-04 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1473,7 +1473,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-08-02:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-08-04:";;
    esac
   cat <<\_ACEOF
 
@@ -1577,7 +1577,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.2.0-2008-08-02
+OpenAxiom configure 1.2.0-2008-08-04
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1591,7 +1591,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-08-02, which was
+It was created by OpenAxiom $as_me 1.2.0-2008-08-04, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26074,7 +26074,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-08-02, which was
+This file was extended by OpenAxiom $as_me 1.2.0-2008-08-04, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26123,7 +26123,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.2.0-2008-08-02
+OpenAxiom config.status 1.2.0-2008-08-04
 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 dc45c1d2..89b88f1c 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-08-02], 
+AC_INIT([OpenAxiom], [1.2.0-2008-08-04], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 9be5aaed..93fd48ad 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1103,7 +1103,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.2.0-2008-08-02], 
+AC_INIT([OpenAxiom], [1.2.0-2008-08-04], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 63568972..de0dddcc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2008-08-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	Fix SF/2037811
+	* interp/vmlisp.lisp (EMBED): Evaluate lambda forms to FUNCTIOn type.
+	* interp/trace.boot (transTraceItem): Fix thinko.
+	(spadTrace): Use assoc, not ASSOC.
+	(addTraceItem): Test for domain objects before constructors.
+
+2008-08-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	Fix SF/2037804
 	* interp/i-syscmd.boot (cd): Convert new directory name
 	to PATHNAME type before setting as default.
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index f52892bb..fe6d00ae 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -304,9 +304,8 @@ transTraceItem x ==
         (y:= domainToGenvar x) => y
         x
     UPPER_-CASE_-P (STRINGIMAGE x).(0) =>
-      y := unabbrev x
-      constructor?(y) => y
-      PAIRP(y) and constructor?(CAR y) => CAR y
+      y := opOf unabbrev x
+      constructor? y => y
       (y:= domainToGenvar x) => y
       x
     x
@@ -438,7 +437,7 @@ spadTrace(domain,options) ==
     options := removeOption("VARBREAK",options)
   anyifTrue:= null listOfOperations
   domainId:= opOf domain.(0)
-  currentEntry:= ASSOC(domain,_/TRACENAMES)
+  currentEntry:= assoc(domain,_/TRACENAMES)
   currentAlist:= KDR currentEntry
   opStructureList:= flattenOperationAlist getOperationAlistFromLisplib domainId
   sigSlotNumberAlist:=
@@ -760,9 +759,9 @@ traceReply() ==
     sayBrightly flowSegmentedMsg(displayList,$LINELENGTH,6)
 
 addTraceItem d ==
-  constructor? d => $constructors:=[d,:$constructors]
   isDomain d => $domains:= [devaluate d,:$domains]
   isDomainOrPackage d => $packages:= [devaluate d,:$packages]
+  constructor? d => $constructors:=[d,:$constructors]
 
 _?t() ==
   null _/TRACENAMES => sayMSG bright '"nothing is traced"
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 25e848f2..76b52318 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -1601,10 +1601,11 @@
                 (OR (EQ OP 'LAMBDA) (EQ OP 'MLAMBDA)))
               (COND
                 ( (NOT (MEMQ CURRENT-BINDING (FLAT-BV-LIST BV)))
-                 `(,OP ,BV ((LAMBDA (,CURRENT-BINDING) . ,BODY) ',OLD-DEF))
+                 (eval `(,OP ,BV ((LAMBDA (,CURRENT-BINDING) . ,BODY)
+				  ',OLD-DEF)))
                    )
                 ( 'T
-                  NEW-DEFINITION ) ) )
+                  (eval NEW-DEFINITION) ) ) )
             ( 'T
               `((LAMBDA (,CURRENT-BINDING) ,NEW-DEFINITION) ',OLD-DEF)))
             ) )