* interp/c-doc.boot (checkDecorate): Tidy.

	* interp/format.boot (form2Fence1): Likewise.
	(form2FenceQuote): Likewise.

6 files changed, 27 insertions, 20 deletions

diff --git a/configure b/configure
index 0e9db2b9..891f5f94 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-2009-07-24.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2009-07-26.
 #
 # 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-2009-07-24'
-PACKAGE_STRING='OpenAxiom 1.4.0-2009-07-24'
+PACKAGE_VERSION='1.4.0-2009-07-26'
+PACKAGE_STRING='OpenAxiom 1.4.0-2009-07-26'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1501,7 +1501,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-2009-07-24 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2009-07-26 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1571,7 +1571,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2009-07-24:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2009-07-26:";;
    esac
   cat <<\_ACEOF
 
@@ -1674,7 +1674,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2009-07-24
+OpenAxiom configure 1.4.0-2009-07-26
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1688,7 +1688,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-2009-07-24, which was
+It was created by OpenAxiom $as_me 1.4.0-2009-07-26, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -17677,7 +17677,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-2009-07-24, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2009-07-26, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17740,7 +17740,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-2009-07-24
+OpenAxiom config.status 1.4.0-2009-07-26
 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 67059c42..8c27e55e 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-2009-07-24], 
+AC_INIT([OpenAxiom], [1.4.0-2009-07-26], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 6f2dce46..adf47418 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1154,7 +1154,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2009-07-24], 
+AC_INIT([OpenAxiom], [1.4.0-2009-07-26], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index ca318df2..8051a423 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-26  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/c-doc.boot (checkDecorate): Tidy.
+	* interp/format.boot (form2Fence1): Likewise.
+	(form2FenceQuote): Likewise.
+
 2009-07-24  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	Fix SF/2798962
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 7355d14f..9afdd7b0 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -53,7 +53,7 @@ getDoc(conName,op,modemap) ==
   sig := MSUBST('$,dc,sig)
   getDocForCategory(conName,op,sig)
 
-++ Given a preidcate `pred' for a modemap, returns the first
+++ Given a predicate `pred' for a modemap, returns the first
 ++ argument to the ofCategory predicate it contains.  Return
 ++ nil otherwise.
 getOfCategoryArgument pred ==
@@ -821,10 +821,10 @@ checkDecorate u ==
         ['"th",$charRbrace,x.0,$charLbrace,'"\spad",:acc]
       xcount = 4 and x.1 = char '_- and x.2 = char 't and x.3 = char 'h =>
         ['"-th",$charRbrace,x.0,$charLbrace,'"\spad",:acc]
-      xcount = 2 and x.1 = char 'i or              --wrap ei, xi, hi
-        not spadflag and xcount > 0 and xcount < 4 and not member(x,'("th" "rd" "st")) and
-          hasNoVowels x =>                         --wrap words with no vowels
-            [$charRbrace,x,$charLbrace,'"\spad",:acc]
+      not spadflag and (xcount = 2 and x.1 = char 'i or  --wrap ei, xi, hi
+         xcount > 0 and xcount < 4 and not member(x,'("th" "rd" "st")) and
+           hasNoVowels x) =>                    --wrap words with no vowels
+             [$charRbrace,x,$charLbrace,'"\spad",:acc]
       [checkAddBackSlashes x,:acc]
     u := rest u
   NREVERSE acc
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 9e2c9416..3d72f266 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -782,16 +782,17 @@ form2Fence form ==
 
 form2Fence1 x ==
   x is [op,:argl] =>
-    op = 'QUOTE => ['"(QUOTE ",:form2FenceQuote first argl,'")"]
+    op = "QUOTE" => ['"(QUOTE ",:form2FenceQuote first argl,'")"]
     ['"(", FORMAT(NIL, '"|~a|", op),:"append"/[form2Fence1 y for y in argl],'")"]
+  null x => '""
   IDENTP x => FORMAT(NIL, '"|~a|", x)
---  [x]
   ['"  ", x]
 
 form2FenceQuote x ==
   NUMBERP x => [STRINGIMAGE x]
   SYMBOLP x => [FORMAT(NIL, '"|~a|", x)]
-  atom    x => '"??"   
+  STRINGP x => ['"_"",x,'"_""]
+  atom    x => systemErrorHere ["form2FenceQuote",x]
   ['"(",:form2FenceQuote first x,:form2FenceQuoteTail rest x]
 
 form2FenceQuoteTail x ==