* interp/format.boot (form2String1): Handle PAREN.

	* interp/g-cndata.boot (condUnabbrev): Handle homogeneous varargs
	for constructors taking tuples.
	* interp/i-resolv.boot: Revolve domains and categories.

7 files changed, 35 insertions, 17 deletions

diff --git a/configure b/configure
index c3247048..a2c821d3 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-05-16.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-05-17.
 #
 # 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-05-16'
-PACKAGE_STRING='OpenAxiom 1.2.0-2008-05-16'
+PACKAGE_VERSION='1.2.0-2008-05-17'
+PACKAGE_STRING='OpenAxiom 1.2.0-2008-05-17'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1402,7 +1402,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-05-16 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.2.0-2008-05-17 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1472,7 +1472,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-05-16:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-05-17:";;
    esac
   cat <<\_ACEOF
 
@@ -1576,7 +1576,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.2.0-2008-05-16
+OpenAxiom configure 1.2.0-2008-05-17
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1590,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-05-16, which was
+It was created by OpenAxiom $as_me 1.2.0-2008-05-17, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26078,7 +26078,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-05-16, which was
+This file was extended by OpenAxiom $as_me 1.2.0-2008-05-17, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26127,7 +26127,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.2.0-2008-05-16
+OpenAxiom config.status 1.2.0-2008-05-17
 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 7efa2deb..93cce25d 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-05-16], 
+AC_INIT([OpenAxiom], [1.2.0-2008-05-17], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 1155df8a..a805f7b9 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1108,7 +1108,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.2.0-2008-05-16], 
+AC_INIT([OpenAxiom], [1.2.0-2008-05-17], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 42358c16..9d80866f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/format.boot (form2String1): Handle PAREN.
+	* interp/g-cndata.boot (condUnabbrev): Handle homogeneous varargs
+	for constructors taking tuples.
+	* interp/i-resolv.boot: Revolve domains and categories.
+
 2008-05-16  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	Fix AW/420
diff --git a/src/interp/format.boot b/src/interp/format.boot
index d1e6e4df..9550ebd5 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -1,6 +1,6 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
 --       the documentation and/or other materials provided with the
 --       distribution.
 --
---     - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+--     - Neither the name of The Numerical Algorithms Group Ltd. nor the
 --       names of its contributors may be used to endorse or promote products
 --       derived from this software without specific prior written permission.
 --
@@ -424,6 +424,9 @@ form2String1 u ==
   op = 'BRACKET =>
     argl' := form2String1 first argl
     ["[",:(atom argl' => [argl']; argl'),"]"]
+  op = 'PAREN =>
+    argl' := form2String1 first argl
+    ["(",:(atom argl' => [argl']; argl'),")"]
   op = "SIGNATURE" =>
      [operation,sig] := argl
      concat(operation,'": ",formatSignature sig)
@@ -626,8 +629,9 @@ application2String(op,argl, linkInfo) ==
     (op' := isInternalFunctionName(op)) => op'
     app2StringWrap(formWrapId op, linkInfo)
   1=#argl =>
-    first argl is ["<",:.] => concat(op,first argl)
-    concat(app2StringWrap(formWrapId op, linkInfo)," ",first argl)
+    arg := first argl
+    arg is ["<",:.] or arg is ["(",:.] => concat(op,arg)
+    concat(app2StringWrap(formWrapId op, linkInfo)," ",arg)
 --op in '(UP SM) =>
 --  newop:= (op = "UP" => "P";"M")
 --  concat(newop,concat(lbrkSch(),argl.0,rbrkSch(),argl.1))
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 285dc570..2477c18f 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -232,9 +232,14 @@ condAbbrev(arglist,argtypes) ==
   res
  
 condUnabbrev(op,arglist,argtypes,modeIfTrue) ==
-  #arglist ^= #argtypes =>
+  #arglist ^= #argtypes and argtypes isnt [["Tuple",t]] =>
     throwKeyedMsg("S2IL0014",[op,plural(#argtypes,'"argument"),
       bright(#arglist)])
+  -- fix up argument list for unary constructor taking tuples.
+  t ^= nil =>
+    categoryForm? t => 
+       [["tuple",:[unabbrev1(arg,modeIfTrue) for arg in arglist]]]
+    [["tuple",:arglist]]
   [newArg for arg in arglist for type in argtypes] where newArg() ==
     categoryForm?(type) => unabbrev1(arg,modeIfTrue)
     arg
diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot
index 7b8acc7f..1038901c 100644
--- a/src/interp/i-resolv.boot
+++ b/src/interp/i-resolv.boot
@@ -244,6 +244,8 @@ resolveTTSpecial(t1,t2) ==
     dom' := resolveTT(dom, t2)
     null dom' => nil
     ['Segment, dom']
+  member(t1,[$Domain,$Category]) and t2 = $Type => t2
+  t1 = $Domain and t2 = $Category => $Type
   nil
 
 resolveTTCC(t1,t2) ==