* interp/i-analy.boot (putCallInfo): New.

	(bottomUp): Use it.
	* interp/i-spec1.boot (upand): Likewise.
	(upor): Likewise.
	(upcase): Likewise.
	* interp/i-spec2.boot (uperror): Likewise.

7 files changed, 37 insertions, 16 deletions

diff --git a/configure b/configure
index f7762d7b..dcd55d46 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.3.0-2008-09-21.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-09-24.
 #
 # 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-2008-09-21'
-PACKAGE_STRING='OpenAxiom 1.3.0-2008-09-21'
+PACKAGE_VERSION='1.3.0-2008-09-24'
+PACKAGE_STRING='OpenAxiom 1.3.0-2008-09-24'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1404,7 +1404,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-2008-09-21 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2008-09-24 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1474,7 +1474,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-09-21:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-09-24:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1578,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2008-09-21
+OpenAxiom configure 1.3.0-2008-09-24
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1592,7 +1592,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-2008-09-21, which was
+It was created by OpenAxiom $as_me 1.3.0-2008-09-24, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26097,7 +26097,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-2008-09-21, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2008-09-24, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26146,7 +26146,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2008-09-21
+OpenAxiom config.status 1.3.0-2008-09-24
 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 f80c90fd..4dd38c44 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-2008-09-21], 
+AC_INIT([OpenAxiom], [1.3.0-2008-09-24], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 022b62de..50464557 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1126,7 +1126,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2008-09-21], 
+AC_INIT([OpenAxiom], [1.3.0-2008-09-24], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index e70d7990..3f0acc98 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-24  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/i-analy.boot (putCallInfo): New.
+	(bottomUp): Use it.
+	* interp/i-spec1.boot (upand): Likewise.
+	(upor): Likewise.
+	(upcase): Likewise.
+	* interp/i-spec2.boot (uperror): Likewise.
+
 2008-09-23  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* algebra/fortmac.spad.pamphlet (MachineFloat): Don't redeclare base.
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index d288eb80..26a1309d 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -52,6 +52,13 @@ $inRetract := false
 
 --% Interpreter Analysis Functions
 
+++ Record calling context information in the VAT `t'.
+putCallInfo(t,op,arg,nargs) ==
+  putAtree(t,"callingFunction",op)
+  putAtree(t,"argumentNumber",arg)
+  putAtree(t,"totalArgs",nargs)
+  t
+
 getMinimalVariableTower(var,t) ==
   -- gets the minimal polynomial subtower of t that contains the
   -- given variable. Returns NIL if none.
@@ -228,9 +235,7 @@ bottomUp t ==
     (null dol) and (fn:= GETL(opName,"up")) and (u:= FUNCALL(fn, t)) => u
     nargs := #argl
     if opName then for x in argl for i in 1.. repeat
-      putAtree(x,'callingFunction,opName)
-      putAtree(x,'argumentNumber,i)
-      putAtree(x,'totalArgs,nargs)
+      putCallInfo(x,opName,i,nargs)
 
     if tar then pushDownTargetInfo(opName,tar,argl)
 
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index b8f6121d..f8820697 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -249,7 +249,9 @@ upand x ==
   -- evaluated if the first argument is true.
   x isnt [op,term1,term2] => NIL
   putTarget(term1,$Boolean)
+  putCallInfo(term1,"and",1,2)
   putTarget(term2,$Boolean)
+  putCallInfo(term2,"and",2,2)
   ms := bottomUp term1
   ms isnt [=$Boolean] => nil   -- use general modemap
   $genValue =>
@@ -284,7 +286,9 @@ upor x ==
   -- evaluated if the first argument is false.
   x isnt [op,term1,term2] => NIL
   putTarget(term1,$Boolean)
+  putCallInfo(term1,"or",1,2)
   putTarget(term2,$Boolean)
+  putCallInfo(term2,"or",2,2)
   ms := bottomUp term1
   ms isnt [=$Boolean] => nil
   $genValue =>
@@ -331,6 +335,7 @@ userDefinedCase(t is [op, lhs, rhs]) ==
 
 upcase t ==
   t isnt [op,lhs,rhs] => nil
+  putCallInfo(lhs,"case",1,2)
   bottomUp lhs
   triple := getValue lhs
   objMode(triple) isnt ['Union,:unionDoms] => userDefinedCase t
@@ -964,7 +969,9 @@ upconstruct t ==
     CAR(tar) in '(Matrix SquareMatrix RectangularMatrix) =>
       vec := ['List,underDomainOf tar]
       for x in l repeat if not getTarget(x) then putTarget(x,vec)
-  argModeSetList:= [bottomUp x for x in l]
+  nargs := #l
+  argModeSetList:= [bottomUp putCallInfo(x,"construct",i,nargs)
+                      for x in l for i in 1..]
   dol and dol is [topType,:.] and not (topType in aggs) =>
     (mmS:= selectMms(op,l,tar)) and (mS:= evalForm(op,getUnname op,l,mmS)) =>
       putModeSet(op,mS)
diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot
index f4256a06..fb5079a6 100644
--- a/src/interp/i-spec2.boot
+++ b/src/interp/i-spec2.boot
@@ -183,7 +183,7 @@ uperror t ==
   -- which is the name of the function.
   not $compilingMap => NIL
   t isnt [op,msg] => NIL
-  msgMs := bottomUp msg
+  msgMs := bottomUp putCallInfo(msg,"error",1,1)
   msgMs isnt [=$String] => NIL
   RPLACD(t,[mkAtree object2String $mapName,msg])
   bottomUp t