new branchCIAOCDM

author: William R. Otte <wotte@dre.vanderbilt.edu> 2009-06-24 23:52:35 +0000
committer: William R. Otte <wotte@dre.vanderbilt.edu> 2009-06-24 23:52:35 +0000
commit: 00f5c123221f1f60b1ff365d7cd14d4317e06ce1 (patch)
tree: 03495e9c736e43f1e2d44ad4e7c83a287f29b20b
parent: e0c701f206c2f136457b3d96310e2e28590b48f6 (diff)
download: ATCD-CIAOCDM.tar.gz
38 files changed, 2202 insertions, 2294 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 34091d1590e..db015ed20dc 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,55 +1,6 @@
-Wed Jun 24 19:33:51 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao-ciao.spec:
-          Some more fixes
-
-Wed Jun 24 18:19:24 UTC 2009  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/OS_NS_ctype.inl:
-        * ace/config-win32-msvc.h:
-
-          Revised the change from yesterday to only apply to Visual C++ and not
-          the other Win32 compilers.
-
-Wed Jun 24 08:51:51 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao-ciao.spec:
-          First set of fixed to get x.7.0 compiling on OpenSuSE Build
-
-Sun Jun 21 14:34:13 UTC 2009  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Log_Msg.cpp (log): Changed the use of
-          ACE_Log_Record::MAXLOGMSGLEN to ACE_MAXLOGMSGLEN to avoid
-          problems with "off-by-one" buffer overflow errors.  Thanks to
-          Brendan Murphy <brendan dot murphy at euro dot apple dot com>
-          for contributing this.
-
-Tue Jun 23 20:12:51 UTC 2009  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/Argv_Type_Converter.cpp:
-
-          Allow a 0-length argv list (argc == 0), argv[0] may not be valid.
-
-        * ace/OS_NS_ctype.inl:
-
-          This WinCE/Mobile work-around applies to Win32 w/ wchar as well.
-
-        * ace/OS_NS_stdio.cpp:
-
-          Removed the check for Unicode BOM in ACE_OS::fopen().  This was only
-          checked in Win32 builds with ACE_USES_WCHAR.  This resolves bug#3705.
-
-Tue Jun 23 15:09:50 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-        * etc/index.html:
-          Post release updates.
-
 Mon Jun 22 09:33:40 CDT 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * ACE version 5.7 released.
+	* ACE version 5.7 released.
 
 Tue Jun 16 15:14:52 UTC 2009  Adam Mitz  <mitza@ociweb.com>
 
diff --git a/ACE/NEWS b/ACE/NEWS
index 068e196618e..bdd3c3828b9 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -3,10 +3,6 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . RPM packaging as part of the release process by the doc_group (Remedy and user community)
 
-USER VISIBLE CHANGES BETWEEN ACE-5.7.1 and ACE-5.7.1
-====================================================
-
-
 USER VISIBLE CHANGES BETWEEN ACE-5.6.9 and ACE-5.7.0
 ====================================================
 
diff --git a/ACE/THANKS b/ACE/THANKS
index f139c962211..57e4611943e 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2292,7 +2292,6 @@ Rob Beekmans <r dot a dot beekmans at philips dot com>
 Steven Hartmann <shartmann at militho dot com>
 Dicky <qianchendi at gmail dot com>
 Boyan Kasarov <bkasarov at gmail dot com>
-Brendan Murphy <brendan dot murphy at euro dot apple dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp
index 178d25d9156..e16076818a4 100644
--- a/ACE/ace/Argv_Type_Converter.cpp
+++ b/ACE/ace/Argv_Type_Converter.cpp
@@ -108,10 +108,11 @@ ACE_Argv_Type_Converter::initialize (void)
 void
 ACE_Argv_Type_Converter::align_char_with_wchar (void)
 {
-  for (int wchar_argv_index = 0; wchar_argv_index < this->saved_argc_;
-       ++wchar_argv_index)
+  int wchar_argv_index = 0;
+  wchar_t* match_argv = this->wchar_argv_[0];  // pick the initial entry
+
+  while (wchar_argv_index < this->saved_argc_)
     {
-      wchar_t *match_argv = this->wchar_argv_[wchar_argv_index];
       // if n'th entries of both argv lists are different
       if (ACE_OS::strcmp (this->char_argv_[wchar_argv_index],
                           ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0)
@@ -131,6 +132,9 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void)
                 }
             }
         }
+
+        // move to the next wchar argv list entry
+        match_argv = this->wchar_argv_[++wchar_argv_index];
     }
 
   this->cleanup ();
@@ -139,10 +143,11 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void)
 void
 ACE_Argv_Type_Converter::align_wchar_with_char (void)
 {
-  for (int char_argv_index = 0; char_argv_index < saved_argc_;
-       ++char_argv_index)
+  int char_argv_index = 0;
+  char* match_argv = this->char_argv_[0];  // pick the initial entry
+
+  while (char_argv_index < saved_argc_)
     {
-      char* match_argv = this->char_argv_[char_argv_index];
       // if n'th entries of both argv lists are different
       if (ACE_OS::strcmp (
             ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]),
@@ -163,6 +168,9 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void)
               }
             }
         }
+
+      // move to the next wchar argv list entry
+      match_argv = this->char_argv_[++char_argv_index];
     }
 
   this->cleanup();
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 5c6d75287ac..ce445120de9 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1025,7 +1025,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
   // bp is pointer to where to put next part of logged message.
   // bspace is the number of characters remaining in msg_.
   ACE_TCHAR *bp = const_cast<ACE_TCHAR *> (this->msg ());
-  size_t bspace = ACE_MAXLOGMSGLEN;  // Leave room for Nul term.
+  size_t bspace = ACE_Log_Record::MAXLOGMSGLEN;  // Leave room for Nul term.
   if (this->msg_off_ <= ACE_Log_Record::MAXLOGMSGLEN)
     bspace -= static_cast<size_t> (this->msg_off_);
 
diff --git a/ACE/ace/OS_NS_ctype.inl b/ACE/ace/OS_NS_ctype.inl
index 977ce001ad5..dce7425a0a6 100644
--- a/ACE/ace/OS_NS_ctype.inl
+++ b/ACE/ace/OS_NS_ctype.inl
@@ -123,10 +123,9 @@ ACE_INLINE int
 ACE_OS::ace_isprint (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
-# if defined (ACE_LACKS_CORRECT_ISWPRINT_TAB)
-  /* The MS CRT has the bug that for tab (\t) iswprint returns true instead of
-   * false.  This has been reported to Microsoft:
-   * https://connect.microsoft.com/VisualStudio/feedback ID# 381915
+# if defined (_WIN32_WCE) && (_WIN32_WCE <= 0x600)
+  /* WinCE 6 and earlier have the bug that for tab (\t) the
+   * iswprint returns true instead of false
    */
   if (c == 0x9)
     {
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index 5e53976c5bd..1e5c75dce85 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -74,6 +74,38 @@ ACE_OS::ace_flock_t::dump (void) const
 
 /*****************************************************************************/
 
+#if defined (ACE_USES_WCHAR)
+void ACE_OS::checkUnicodeFormat (FILE* fp)
+{
+  if (fp != 0)
+    {
+      // Due to the ACE_TCHAR definition, all default input files, such as
+      // svc.conf, have to be in Unicode format (small endian) on WinCE
+      // because ACE has all 'char' converted into ACE_TCHAR.
+      // However, for TAO, ASCII files, such as IOR file, can still be read
+      // and be written without any error since given buffers are all in 'char'
+      // type instead of ACE_TCHAR.  Therefore, it is user's reponsibility to
+      // select correct buffer type.
+
+      // At this point, check if the file is Unicode or not.
+      ACE_UINT16 first_two_bytes = 0;
+      size_t const numRead =
+        ACE_OS::fread(&first_two_bytes, sizeof (first_two_bytes), 1, fp);
+
+      if (numRead <= 1)
+        {
+          if ((first_two_bytes != 0xFFFE) && // not a small endian Unicode file
+              (first_two_bytes != 0xFEFF))   // not a big endian Unicode file
+            {
+              // set file pointer back to the beginning
+              ACE_OS::fseek(fp, 0, SEEK_SET);
+            }
+        }
+      // if it is a Unicode file, file pointer will be right next to the first
+      // two-bytes
+    }
+}
+#endif  // ACE_USES_WCHAR
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 namespace
@@ -161,6 +193,9 @@ ACE_OS::fopen (const char *filename,
 #   endif /* defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR)) */
           if (fp != 0)
           {
+#   if defined (ACE_USES_WCHAR)
+            checkUnicodeFormat(fp);
+#   endif  // ACE_USES_WCHAR
             return fp;
           }
           ::_close (fd);
@@ -216,6 +251,9 @@ ACE_OS::fopen (const wchar_t *filename,
 #   endif /* defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR)) */
           if (fp != 0)
           {
+#   if defined (ACE_USES_WCHAR)
+            checkUnicodeFormat(fp);
+#   endif  // ACE_USES_WCHAR
             return fp;
           }
           ::_close (fd);
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 21fc60a2e58..8fe6272e977 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -133,7 +133,6 @@
 
 #define ACE_LACKS_ISBLANK
 #define ACE_LACKS_ISWBLANK
-#define ACE_LACKS_CORRECT_ISWPRINT_TAB
 #define ACE_ISCTYPE_EQUIVALENT ::_isctype
 
 // Turn off warnings for /W4
diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
index 4140e447dd0..ba69dd5123d 100755
--- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -1,11 +1,10 @@
-if test -z $1; then olddate=2009_06_22; else olddate=$1; fi
-if test -z $2; then newdate=`date -u +%Y_%m_%d`; else newdate=$2; fi
-if test -z $3; then prefix=`date -u +%Y%m%d%a`; else prefix=$3; fi
+if test -z $1; then olddate=2009_04_14; else olddate=$1; fi
+if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
 if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi
 if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi
 #
 grep -h \!FIXED_BUGS_ONLY ${ACE_ROOT}/tests/*.lst ${ACE_ROOT}/bin/*.lst ${TAO_ROOT}/bin/*.lst ${CIAO_ROOT}/bin/*.lst | sed -e "s/^\([^\:]*\).*/\1/" | sed -e "s/\(\/run_test.pl\)\?\s*$//" > ${prefix}-Ignore.txt
 #
-perl ${ACE_ROOT}/bin/diff-builds.pl -r -D $olddate -D $newdate | perl -ne 'print unless /^(\@\@|[ \-][a-zA-Z])/' | grep -v -f ${prefix}-Ignore.txt | tee ${prefix}-Builds.txt | grep '+[a-zA-Z]' | sort | uniq -c | sort -n -r -s | sort -k3 -r -s > ${prefix}-Tests.txt
-perl ${ACE_ROOT}/bin/diff-builds.pl -D $olddate -D $newdate | perl -ne 'print unless /^(\@\@|[ \-][a-zA-Z])/' | grep -v -f ${prefix}-Ignore.txt | grep '+[a-zA-Z]' | sort | uniq -c | sort -n -r -s > ${prefix}-Tests-NoTestRev.txt
+perl ${ACE_ROOT}/bin/diff-builds.pl -r -D $olddate -D `date -u +%Y_%m_%d` | perl -ne 'print unless /^(\@\@|[ \-][a-zA-Z])/' | grep -v -f ${prefix}-Ignore.txt | tee ${prefix}-Builds.txt | grep '+[a-zA-Z]' | sort | uniq -c | sort -n -r -s | sort -k3 -r -s > ${prefix}-Tests.txt
+perl ${ACE_ROOT}/bin/diff-builds.pl -D $olddate -D `date -u +%Y_%m_%d` | perl -ne 'print unless /^(\@\@|[ \-][a-zA-Z])/' | grep -v -f ${prefix}-Ignore.txt | grep '+[a-zA-Z]' | sort | uniq -c | sort -n -r -s > ${prefix}-Tests-NoTestRev.txt
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 8e2345d1b2f..3a21c13884e 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -84,101 +84,101 @@ of the ACE, TAO, and CIAO micro release kit is available for
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO+CIAO.tar.gz</TD>
       <TD>ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.9.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.tar.bz2</TD>
       <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.9.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.zip</TD>
       <TD>ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.9.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.9.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.9.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.9.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.9.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.9.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.9.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.9.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.9.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.9.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.9.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
@@ -188,108 +188,108 @@ of the ACE, TAO, and CIAO micro release kit is available for
   <A HREF="ftp://download.dre.vanderbilt.edu/diffs">this location</A>.
 </P>
 
-<LI> <B>Latest Release.</B> The latest release is ACE 5.7, TAO 1.7, and CIAO 0.7
-(ACE+TAO+CIAO x.7), please use the links below to download it.<i>ACE+TAO+CIAO x.7 is the same as the micro release x.7.0</i><P>
+<LI> <B>Latest Release.</B> The latest release is ACE 5.6, TAO 1.6, and CIAO 0.6
+(ACE+TAO+CIAO x.6), please use the links below to download it.<P>
 
 <TABLE BORDER="4">
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
-  <TR><TD>ACE+TAO+CIAO-5.7.tar.gz</TD>
+  <TR><TD>ACE+TAO+CIAO-5.6.tar.gz</TD>
       <TD>ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.tar.gz">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE+TAO+CIAO-5.7.tar.bz2</TD>
+  <TR><TD>ACE+TAO+CIAO-5.6.tar.bz2</TD>
       <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE+TAO+CIAO-5.7.zip</TD>
+  <TR><TD>ACE+TAO+CIAO-5.6.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.6.zip">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE+TAO-5.7.tar.gz</TD>
+  <TR><TD>ACE+TAO-5.6.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.tar.gz">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE+TAO-5.7.tar.bz2</TD>
+  <TR><TD>ACE+TAO-5.6.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE+TAO-5.7.zip</TD>
+  <TR><TD>ACE+TAO-5.6.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.6.zip">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-5.7-html.tar.gz</TD>
+  <TR><TD>ACE-5.6-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.tar.gz">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-5.7-html.tar.bz2</TD>
+  <TR><TD>ACE-5.6-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-5.7-html.zip</TD>
+  <TR><TD>ACE-5.6-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.6.zip">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-5.7.tar.gz</TD>
+  <TR><TD>ACE-5.6.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.tar.gz">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-5.7.tar.bz2</TD>
+  <TR><TD>ACE-5.6.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-5.7.zip</TD>
+  <TR><TD>ACE-5.6.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.0.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.6.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
@@ -297,14 +297,9 @@ of the ACE, TAO, and CIAO micro release kit is available for
 
 
 <LI> <A NAME="stable-beta"></A><B>Latest BFO Micro Release.</B> The
-BFO micro release for the latest release of ACE 5.7, TAO 1.7, CIAO 0.7
-will be ACE 5.7.1, TAO 1.7.1, and CIAO 0.7.1 (ACE+TAO+CIAO x.7.1). The 
-fixes for this release are being gathered now in order to prepare the 
-BFO release.
-
-<!--
-
- Please use the links below to download it.
+BFO micro release for the latest release of ACE 5.6, TAO 1.6, CIAO 0.6
+is, ACE 5.6.1, TAO 1.6.1, and CIAO 0.6.1 (ACE+TAO+CIAO x.6.1).  Please
+use the links below to download it.
 
 <TABLE BORDER="4">
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
@@ -409,9 +404,6 @@ BFO release.
   </TR>
 </TABLE>
 <P>
-
--->
-
 </UL>
 <P>
   Older versions of ACE+TAO are also available via HTTP at  <A
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index 08a77509a03..b526316b798 100644
--- a/ACE/etc/index.html
+++ b/ACE/etc/index.html
@@ -35,7 +35,6 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
-      <LI><P><A HREF="5.7.0/html">5.7</A></P></LI>
       <LI><P><A HREF="5.6.9/html">5.6.9</A></P></LI>
       <LI><P><A HREF="5.6.8/html">5.6.8</A></P></LI>
       <LI><P><A HREF="5.6.7/html">5.6.7</A></P></LI>
diff --git a/ACE/rpmbuild/ace-tao-ciao.spec b/ACE/rpmbuild/ace-tao-ciao.spec
index f4e3d2ed84e..a6bc9baeee2 100644
--- a/ACE/rpmbuild/ace-tao-ciao.spec
+++ b/ACE/rpmbuild/ace-tao-ciao.spec
@@ -1,7 +1,9 @@
 # Set the version number here.
-%define ACEVER  5.7.0
-%define TAOVER  1.7.0
-%define CIAOVER 0.7.0
+%define ACEVER  5.7
+%define TAOVER  1.7
+%define CIAOVER 0.7
+# Set is_major_ver if the version is X.Y instead X.Y.Z
+%define is_major_ver 1
 
 # TODO
 # Test whether a TAO app with MPC can be build against MPC installed version
@@ -49,6 +51,7 @@
 
 %{!?skip_make:%define skip_make 0}
 %{!?make_nosrc:%define make_nosrc 0}
+%{!?is_major_ver:%define is_major_ver 0}
 
 %define have_fox 0
 
@@ -1068,9 +1071,17 @@ $MAKECMD -C $TAO_ROOT/utils
 # install
 # ================================================================
 
+# For major releases the package version will be the shortened version
+# tuple and the shared-object version needs a placeholder '.0'
+%if %is_major_ver
+%define ACEVERSO %{ACEVER}.0
+%define TAOVERSO %{TAOVER}.0
+%define CIAOVERSO %{CIAOVER}.0
+%else
 %define ACEVERSO %{ACEVER}
 %define TAOVERSO %{TAOVER}
 %define CIAOVERSO %{CIAOVER}
+%endif
 
 %install
 
@@ -1286,14 +1297,12 @@ install ${ACE_ROOT}/bin/tao_nslist %{buildroot}%{_bindir}/tao_nslist
 
 install -d %{buildroot}%{_sysconfdir}
 cp -R ${ACE_ROOT}/rpmbuild/logrotate.d %{buildroot}%{_sysconfdir}/logrotate.d
-cp -R ${ACE_ROOT}/rpmbuild/tao %{buildroot}%{_sysconfdir}/tao
+cp -R ${ACE_ROOT}/tao %{buildroot}%{_sysconfdir}/tao
 
 %if %{defined suse_version}
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/init.d/* %{buildroot}%{_sysconfdir}/init.d
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse/tao/* %{buildroot}%{_sysconfdir}/tao
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-suse %{buildroot}%{_sysconfdir}
 %else
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/rc.d/* %{buildroot}%{_sysconfdir}/rc.d
-cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora/tao/* %{buildroot}%{_sysconfdir}/tao
+cp -R ${ACE_ROOT}/rpmbuild/ace-tao-init-fedora %{buildroot}%{_sysconfdir}
 %endif
 
 %if %{defined suse_version}
@@ -2655,9 +2664,6 @@ fi
 # ================================================================
 
 %changelog
-* Wed Jun 24 2009 Johnny Willemsen <jwillemsen@remedy.nl> - 5.7.0-0
-- New minor release
-
 * Fri Mar 13 2009 Johnny Willemsen <jwillemsen@remedy.nl> - 5.6.8-2
 - Removed specific OS checks
 
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index ad84221649d..5cee97a3761 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,17 +1,12 @@
-Tue Jun 23 15:08:50 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-          Added space for 0.7 -> 0.7.1 changes.
-
 Mon Jun 22 09:33:40 CDT 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * CIAO version 0.7 released.
+	* CIAO version 0.7 released.
 
 Thu Jun 18 23:03:06 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tools/Config_Handlers/IRDD_Handler.h:
         * tools/XML/XML_Schema_Resolver.cpp:
-
+        
           There is a curious order-of-inclusion problem on macosx-leopoard
           builds whereby including a non-ACE header before something that
           includes ace/config.h causes a compiler error in
diff --git a/CIAO/NEWS b/CIAO/NEWS
index 3f51ce0e855..2f6e8a6c05a 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -75,13 +75,8 @@ replacement in the near term:
 . Implement a planner to query the TargetManager and RepositoryManager
   and generate deployment plans on the fly.
 
-USER VISIBLE CHANGES BETWEEN CIAO-0.7.0 and CIAO-0.7.1
-=======================================================
-
-
 USER VISIBLE CHANGES BETWEEN CIAO-0.6.9 and CIAO-0.7.0
 =======================================================
-
 .  CIDLC compiler has new command line options:  --suppress-lem which will suppress
    generation of the local executor mapping, --suppress-svnt which will suppress
    generation of the servant code, --lem-enclosing-module which will generate the 
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 460682905c1..d387eae6e1a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,61 +1,6 @@
-Tue Jun 23 20:06:54 UTC 2009  Adam Mitz  <mitza@ociweb.com>
-
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_valuetype.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_init.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/util/utl_err.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Use %C when inserting char* into ACE_DEBUG/ACE_ERROR strings.
-
-        * tao/TAO_Internal.cpp:
-
-          Enable ACE_ARGV's quote_args functionality for user strings
-          like -ORBSvcConf and argv[0].  This resolves bug #3630.
-
-        * tests/Bug_3630_Regression/server.cpp:
-        * bin/tao_orb_tests.lst:
-
-          3630 is now expected to pass; fixed bugs in the test case.
-
-        * tests/Bug_2683_Regression/client.cpp:
-
-          Convert hostname from ACE_TCHAR* to char* before passing to sprintf.
-
-        * orbsvcs/tests/Bug_3486_Regression/run_test.pl:
-
-          Changed the log messages to have the correct bug #.
-
-        * orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:
-        * tests/Crashed_Callback/run_test.pl:
-
-          Extend the timeout.
-
-        * tests/ForwardUponObjectNotExist/client.cpp:
-
-          Use strlen() to find length of an ACE_TCHAR string.
-
-        * tests/Reliable_Oneways/run_test.pl:
-
-          Extend the timeout and use a localhost endpoint to avoid excessive
-          delays on multihomed machines as each endpoint is tried.
-
-Tue Jun 23 14:53:01 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * NEWS:
-          Added space for 1.7 -> 1.7.1 changes.
-
 Mon Jun 22 09:33:40 CDT 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * TAO version 1.7 released.
+	* TAO version 1.7 released.
 
 Thu Jun 18 22:47:05 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
diff --git a/TAO/NEWS b/TAO/NEWS
index 75b7aa5144f..d61f039a198 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,10 +1,6 @@
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
-USER VISIBLE CHANGES BETWEEN TAO-1.7.0 and TAO-1.7.1
-====================================================
-
-
 USER VISIBLE CHANGES BETWEEN TAO-1.6.9 and TAO-1.7.0
 ====================================================
 
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 01924859dd1..33e9ba0f55c 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -1573,7 +1573,7 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e,
               if (d != d_before)
                 {
                   ACE_ERROR ((LM_ERROR,
-                              "warning in %C line %d: ",
+                              "warning in %s line %d: ",
                               idl_global->filename ()->get_string (),
                               idl_global->lineno ()));
 
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index 3f52a0f8190..a201994dba3 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -263,7 +263,7 @@ AST_ValueType::look_in_supported (UTL_ScopedName *e,
               if (d != d_before)
                 {
                   ACE_ERROR ((LM_ERROR,
-                              "warning in %C line %d: ",
+                              "warning in %s line %d: ",
                               idl_global->filename ()->get_string (),
                               idl_global->lineno ()));
 
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index e125936f6f2..08c100117a2 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -327,7 +327,7 @@ TAO_CodeGen::start_client_header (const char *fname)
           else
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("\nERROR, invalid file '%C' included"),
+                                 ACE_TEXT ("\nERROR, invalid file '%s' included"),
                                  idl_name),
                                 -1);
             }
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 24f3e133e89..4bd56a2d91c 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -1674,7 +1674,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             // I expect 'c' or 's' or 'I' or 'T' after this.
             ACE_ERROR ((
                 LM_ERROR,
-                ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                 av[i]
               ));
           }
@@ -1690,7 +1690,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             ACE_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand")
-                ACE_TEXT (" the '%C' option\n"),
+                ACE_TEXT (" the '%s' option\n"),
                 av[i]
               ));
           }
@@ -1719,7 +1719,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             // I expect 's' or 'i' after 'c'.
             ACE_ERROR ((
                 LM_ERROR,
-                ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                 av[i]
               ));
           }
@@ -1765,7 +1765,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             // I expect 's' or 'T' or 'i' or 't' after 's'.
             ACE_ERROR ((
                 LM_ERROR,
-                ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                 av[i]
               ));
           }
@@ -1809,7 +1809,7 @@ BE_GlobalData::parse_args (long &i, char **av)
         else
           {
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("%C: unknown operation lookup <%C>\n"),
+                        ACE_TEXT ("%s: unknown operation lookup <%s>\n"),
                         av[0],
                         av[i + 1]));
           }
@@ -1831,7 +1831,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           {
             ACE_ERROR ((
                 LM_ERROR,
-                ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                 av[i]
               ));
           }
@@ -1859,7 +1859,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             ACE_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand")
-                ACE_TEXT (" the '%C' option\n"),
+                ACE_TEXT (" the '%s' option\n"),
                 av[i]
               ));
           }
@@ -1884,7 +1884,7 @@ BE_GlobalData::parse_args (long &i, char **av)
               {
                 ACE_ERROR ((
                     LM_ERROR,
-                    ACE_TEXT ("IDL: unable to create directory %C")
+                    ACE_TEXT ("IDL: unable to create directory %s")
                     ACE_TEXT (" specified by -o option\n"),
                     av[i + 1]
                   ));
@@ -1912,7 +1912,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                   {
                     ACE_ERROR ((
                         LM_ERROR,
-                        ACE_TEXT ("IDL: unable to create directory %C")
+                        ACE_TEXT ("IDL: unable to create directory %s")
                         ACE_TEXT (" specified by -oA option\n"),
                         av[i + 1]
                       ));
@@ -1928,7 +1928,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand")
-                    ACE_TEXT (" the '%C' option\n"),
+                    ACE_TEXT (" the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -1950,7 +1950,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                   {
                     ACE_ERROR ((
                         LM_ERROR,
-                        ACE_TEXT ("IDL: unable to create directory %C")
+                        ACE_TEXT ("IDL: unable to create directory %s")
                         ACE_TEXT (" specified by -oS option\n"),
                         av[i + 1]
                       ));
@@ -1966,7 +1966,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand")
-                    ACE_TEXT (" the '%C' option\n"),
+                    ACE_TEXT (" the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -1976,7 +1976,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             ACE_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand")
-                ACE_TEXT (" the '%C' option\n"),
+                ACE_TEXT (" the '%s' option\n"),
                 av[i]
               ));
           }
@@ -2027,7 +2027,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand ")
-                    ACE_TEXT ("the '%C' option\n"),
+                    ACE_TEXT ("the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2046,7 +2046,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand ")
-                    ACE_TEXT ("the '%C' option\n"),
+                    ACE_TEXT ("the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2065,7 +2065,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand ")
-                    ACE_TEXT ("the '%C' option\n"),
+                    ACE_TEXT ("the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2083,7 +2083,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand ")
-                    ACE_TEXT ("the '%C' option\n"),
+                    ACE_TEXT ("the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2122,7 +2122,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                         ACE_ERROR ((
                             LM_ERROR,
                             ACE_TEXT ("IDL: I don't understand ")
-                            ACE_TEXT ("the '%C' option\n"),
+                            ACE_TEXT ("the '%s' option\n"),
                             av[i]
                           ));
                       }
@@ -2132,7 +2132,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                     ACE_ERROR ((
                         LM_ERROR,
                         ACE_TEXT ("IDL: I don't understand ")
-                        ACE_TEXT ("the '%C' option\n"),
+                        ACE_TEXT ("the '%s' option\n"),
                         av[i]
                       ));
                   }
@@ -2147,7 +2147,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand ")
-                    ACE_TEXT ("the '%C' option\n"),
+                    ACE_TEXT ("the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2164,7 +2164,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                 ACE_ERROR ((
                     LM_ERROR,
                     ACE_TEXT ("IDL: I don't understand ")
-                    ACE_TEXT ("the '%C' option\n"),
+                    ACE_TEXT ("the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2220,7 +2220,7 @@ BE_GlobalData::parse_args (long &i, char **av)
                     ACE_ERROR ((
                         LM_ERROR,
                         ACE_TEXT ("IDL: I don't understand")
-                        ACE_TEXT (" the '%C' option\n"),
+                        ACE_TEXT (" the '%s' option\n"),
                         av[i]
                       ));
 
@@ -2235,7 +2235,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           {
             ACE_ERROR ((
                 LM_ERROR,
-                ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                 av[i]
               ));
           }
@@ -2293,7 +2293,7 @@ BE_GlobalData::parse_args (long &i, char **av)
               {
                 ACE_ERROR ((
                     LM_ERROR,
-                    ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                    ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2314,7 +2314,7 @@ BE_GlobalData::parse_args (long &i, char **av)
               {
                 ACE_ERROR ((
                     LM_ERROR,
-                    ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                    ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2335,7 +2335,7 @@ BE_GlobalData::parse_args (long &i, char **av)
               {
                 ACE_ERROR ((
                     LM_ERROR,
-                    ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                    ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                     av[i]
                   ));
               }
@@ -2350,7 +2350,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           {
             ACE_ERROR ((
                 LM_ERROR,
-                ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+                ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                 av[i]
               ));
           }
@@ -2359,7 +2359,7 @@ BE_GlobalData::parse_args (long &i, char **av)
       default:
         ACE_ERROR ((
             LM_ERROR,
-            ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+            ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
             av[i]
           ));
 
@@ -2486,8 +2486,11 @@ BE_GlobalData::prep_be_arg (char *s)
       else
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%C: invalid or unknown argument <%C> to back end\n"),
-                      idl_global->prog_name (), arg));
+                      ACE_TEXT ("%s%s%s%s"),
+                      idl_global->prog_name (),
+                      ACE_TEXT (": invalid or unknown argument <"),
+                      arg,
+                      ACE_TEXT ("> to back end\n")));
         }
     }
 }
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
index c1bd5233162..21f2bf20c0a 100644
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ b/TAO/TAO_IDL/be/be_init.cpp
@@ -8,8 +8,9 @@ TAO_IDL_BE_Export void
 BE_version (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("TAO_IDL_BE, version ") ACE_TEXT (TAO_VERSION)
-              ACE_TEXT ("\n")));
+              "%s %s\n",
+              ACE_TEXT ("TAO_IDL_BE, version"),
+              ACE_TEXT (TAO_VERSION)));
 }
 
 TAO_IDL_BE_Export int
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 5c35df61a56..2ae24299e3c 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -105,7 +105,7 @@ BE_visit_root (be_visitor_decl &root_visitor, const char *which_pass)
   if (-1 == root->accept (&root_visitor))
     {
       ACE_ERROR ((LM_ERROR,
-                  "BE_visit_root - %C for Root failed\n",
+                  "BE_visit_root - %s for Root failed\n",
                   which_pass));
       BE_abort ();
     }
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 9722aa40ba5..69e53dc43dc 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -773,7 +773,7 @@ idl_store_pragma (char *buf)
 
       if (!idl_global->add_dcps_data_key (sample_type, key))
         {
-          ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%C\" not found for key \"%C\"\n",
+          ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%s\" not found for key \"%s\"\n",
             sample_type, key));
         }
     }
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 1330888ce1d..adbaccf081d 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -714,7 +714,7 @@ valuetype
         {
 // valuetype : IDL_CUSTOM value_concrete_decl
            ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("error in %C line %d\n"),
+                       ACE_TEXT ("error in %s line %d\n"),
                        idl_global->filename ()->get_string (),
                        idl_global->lineno ()));
            ACE_DEBUG ((LM_DEBUG,
@@ -2310,7 +2310,7 @@ fixed_type
         {
 // fixed_type : IDL_FIXED
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("error in %C line %d\n"),
+                      ACE_TEXT ("error in %s line %d\n"),
                       idl_global->filename ()->get_string (),
                       idl_global->lineno ()));
           ACE_DEBUG ((LM_DEBUG,
@@ -3964,7 +3964,7 @@ init_decl
             {
               //@@ Fire error
               ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("error in %C line %d:\n")
+                          ACE_TEXT ("error in %s line %d:\n")
                           ACE_TEXT ("Abstract valuetype can't have a ")
                           ACE_TEXT ("factory construct.\n"),
                           idl_global->filename ()->get_string (),
@@ -5615,7 +5615,7 @@ event_custom_header :
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
 
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("error in %C line %d\n"),
+                      ACE_TEXT ("error in %s line %d\n"),
                       idl_global->filename ()->get_string (),
                       idl_global->lineno ()));
           ACE_DEBUG ((LM_DEBUG,
@@ -5780,6 +5780,6 @@ void
 yyerror (const char *msg)
 {
   ACE_ERROR ((LM_ERROR,
-              "%C\n",
+              "%s\n",
               msg));
 }
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 82d9a9e4b1f..45c34616da3 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -3,7 +3,7 @@
 
 #define  TAO_YY_INT_ALIGNED short int
 
-/* A lexical scanner generated by flex */
+/*  A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define TAO_YY_FLEX_MAJOR_VERSION 2
@@ -54,31 +54,31 @@ typedef unsigned int flex_uint32_t;
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
-#define INT8_MIN                   (-128)
+#define INT8_MIN               (-128)
 #endif
 #ifndef INT16_MIN
-#define INT16_MIN                  (-32767-1)
+#define INT16_MIN              (-32767-1)
 #endif
 #ifndef INT32_MIN
-#define INT32_MIN                  (-2147483647-1)
+#define INT32_MIN              (-2147483647-1)
 #endif
 #ifndef INT8_MAX
-#define INT8_MAX                   (127)
+#define INT8_MAX               (127)
 #endif
 #ifndef INT16_MAX
-#define INT16_MAX                  (32767)
+#define INT16_MAX              (32767)
 #endif
 #ifndef INT32_MAX
-#define INT32_MAX                  (2147483647)
+#define INT32_MAX              (2147483647)
 #endif
 #ifndef UINT8_MAX
-#define UINT8_MAX                  (255U)
+#define UINT8_MAX              (255U)
 #endif
 #ifndef UINT16_MAX
-#define UINT16_MAX                 (65535U)
+#define UINT16_MAX             (65535U)
 #endif
 #ifndef UINT32_MAX
-#define UINT32_MAX                 (4294967295U)
+#define UINT32_MAX             (4294967295U)
 #endif
 
 #endif /* ! FLEXINT_H */
@@ -88,14 +88,14 @@ typedef unsigned int flex_uint32_t;
 /* The "const" storage-class-modifier is valid. */
 #define TAO_YY_USE_CONST
 
-#else	/* ! __cplusplus */
+#else        /* ! __cplusplus */
 
 #if __STDC__
 
 #define TAO_YY_USE_CONST
 
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
+#endif        /* __STDC__ */
+#endif        /* ! __cplusplus */
 
 #ifdef TAO_YY_USE_CONST
 #define tao_yyconst const
@@ -160,17 +160,17 @@ extern FILE *tao_yyin, *tao_yyout;
 
 /* Return all but the first "n" matched characters back to the input stream. */
 #define tao_yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up tao_yytext. */ \
-          int tao_yyless_macro_arg = (n); \
-          TAO_YY_LESS_LINENO(tao_yyless_macro_arg);\
-		*tao_yy_cp = (tao_yy_hold_char); \
-		TAO_YY_RESTORE_TAO_YY_MORE_OFFSET \
-		(tao_yy_c_buf_p) = tao_yy_cp = tao_yy_bp + tao_yyless_macro_arg - TAO_YY_MORE_ADJ; \
-		TAO_YY_DO_BEFORE_ACTION; /* set up tao_yytext again */ \
-		} \
-	while ( 0 )
+        do \
+                { \
+                /* Undo effects of setting up tao_yytext. */ \
+        int tao_yyless_macro_arg = (n); \
+        TAO_YY_LESS_LINENO(tao_yyless_macro_arg);\
+                *tao_yy_cp = (tao_yy_hold_char); \
+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET \
+                (tao_yy_c_buf_p) = tao_yy_cp = tao_yy_bp + tao_yyless_macro_arg - TAO_YY_MORE_ADJ; \
+                TAO_YY_DO_BEFORE_ACTION; /* set up tao_yytext again */ \
+                } \
+        while ( 0 )
 
 #define unput(c) tao_yyunput( c, (tao_yytext_ptr)  )
 
@@ -187,66 +187,66 @@ typedef unsigned int tao_yy_size_t;
 #ifndef TAO_YY_STRUCT_TAO_YY_BUFFER_STATE
 #define TAO_YY_STRUCT_TAO_YY_BUFFER_STATE
 struct tao_yy_buffer_state
-	{
-	FILE *tao_yy_input_file;
-
-	char *tao_yy_ch_buf;		/* input buffer */
-	char *tao_yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	tao_yy_size_t tao_yy_buf_size;
-
-	/* Number of characters read into tao_yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int tao_yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int tao_yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of static_cast<int> (fread()), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int tao_yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int tao_yy_at_bol;
+        {
+        FILE *tao_yy_input_file;
+
+        char *tao_yy_ch_buf;                /* input buffer */
+        char *tao_yy_buf_pos;                /* current position in input buffer */
+
+        /* Size of input buffer in bytes, not including room for EOB
+         * characters.
+         */
+        tao_yy_size_t tao_yy_buf_size;
+
+        /* Number of characters read into tao_yy_ch_buf, not including EOB
+         * characters.
+         */
+        int tao_yy_n_chars;
+
+        /* Whether we "own" the buffer - i.e., we know we created it,
+         * and can realloc() it to grow it, and should free() it to
+         * delete it.
+         */
+        int tao_yy_is_our_buffer;
+
+        /* Whether this is an "interactive" input source; if so, and
+         * if we're using stdio for input, then we want to use getc()
+         * instead of static_cast<int> (fread()), to make sure we stop fetching input after
+         * each newline.
+         */
+        int tao_yy_is_interactive;
+
+        /* Whether we're considered to be at the beginning of a line.
+         * If so, '^' rules will be active on the next match, otherwise
+         * not.
+         */
+        int tao_yy_at_bol;
 
     int tao_yy_bs_lineno; /**< The line count. */
     int tao_yy_bs_column; /**< The column count. */
 
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int tao_yy_fill_buffer;
+        /* Whether to try to fill the input buffer when we reach the
+         * end of it.
+         */
+        int tao_yy_fill_buffer;
 
-	int tao_yy_buffer_status;
+        int tao_yy_buffer_status;
 
 #define TAO_YY_BUFFER_NEW 0
 #define TAO_YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as TAO_YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via tao_yyrestart()), so that the user can continue scanning by
-	 * just pointing tao_yyin at a new input file.
-	 */
+        /* When an EOF's been seen but there's still some text to process
+         * then we mark the buffer as TAO_YY_EOF_PENDING, to indicate that we
+         * shouldn't try reading from the input source any more.  We might
+         * still have a bunch of tokens to match, though, because of
+         * possible backing-up.
+         *
+         * When we actually see the EOF, we change the status to "new"
+         * (via tao_yyrestart()), so that the user can continue scanning by
+         * just pointing tao_yyin at a new input file.
+         */
 #define TAO_YY_BUFFER_EOF_PENDING 2
 
-	};
+        };
 #endif /* !TAO_YY_STRUCT_TAO_YY_BUFFER_STATE */
 
 /* Stack of input buffers. */
@@ -261,8 +261,8 @@ static TAO_YY_BUFFER_STATE * tao_yy_buffer_stack = 0; /**< Stack as an array. */
  * Returns the top of the stack, or 0.
  */
 #define TAO_YY_CURRENT_BUFFER ( (tao_yy_buffer_stack) \
-                                  ? (tao_yy_buffer_stack)[(tao_yy_buffer_stack_top)] \
-                                  : 0)
+                          ? (tao_yy_buffer_stack)[(tao_yy_buffer_stack_top)] \
+                          : 0)
 
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * 0 or when we need an lvalue. For internal use only.
@@ -271,13 +271,13 @@ static TAO_YY_BUFFER_STATE * tao_yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* tao_yy_hold_char holds the character lost when tao_yytext is formed. */
 static char tao_yy_hold_char;
-static int tao_yy_n_chars;		/* number of characters read into tao_yy_ch_buf */
+static int tao_yy_n_chars;                /* number of characters read into tao_yy_ch_buf */
 int tao_yyleng;
 
 /* Points to current character in buffer. */
 static char *tao_yy_c_buf_p = (char *) 0;
-static int tao_yy_init = 0;		/* whether we need to initialize */
-static int tao_yy_start = 0;	/* start state number */
+static int tao_yy_init = 0;                /* whether we need to initialize */
+static int tao_yy_start = 0;        /* start state number */
 
 /* Flag which is used to allow tao_yywrap()'s to do buffer switches
  * instead of setting up a fresh tao_yyin.  A bit of a hack ...
@@ -309,24 +309,24 @@ void tao_yyfree (void *  );
 #define tao_yy_new_buffer tao_yy_create_buffer
 
 #define tao_yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! TAO_YY_CURRENT_BUFFER ){ \
-          tao_yyensure_buffer_stack (); \
-		TAO_YY_CURRENT_BUFFER_LVALUE =    \
-                tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE ); \
-	} \
-	TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_is_interactive = is_interactive; \
-	}
+        { \
+        if ( ! TAO_YY_CURRENT_BUFFER ){ \
+        tao_yyensure_buffer_stack (); \
+                TAO_YY_CURRENT_BUFFER_LVALUE =    \
+            tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE ); \
+        } \
+        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_is_interactive = is_interactive; \
+        }
 
 #define tao_yy_set_bol(at_bol) \
-	{ \
-	if ( ! TAO_YY_CURRENT_BUFFER ){\
-          tao_yyensure_buffer_stack (); \
-		TAO_YY_CURRENT_BUFFER_LVALUE =    \
-                tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE ); \
-	} \
-	TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_at_bol = at_bol; \
-	}
+        { \
+        if ( ! TAO_YY_CURRENT_BUFFER ){\
+        tao_yyensure_buffer_stack (); \
+                TAO_YY_CURRENT_BUFFER_LVALUE =    \
+            tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE ); \
+        } \
+        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_at_bol = at_bol; \
+        }
 
 #define TAO_YY_AT_BOL() (TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_at_bol)
 
@@ -353,534 +353,534 @@ static void tao_yy_fatal_error (tao_yyconst char msg[]  );
  * corresponding action - sets up tao_yytext.
  */
 #define TAO_YY_DO_BEFORE_ACTION \
-	(tao_yytext_ptr) = tao_yy_bp; \
-	tao_yyleng = (size_t) (tao_yy_cp - tao_yy_bp); \
-	(tao_yy_hold_char) = *tao_yy_cp; \
-	*tao_yy_cp = '\0'; \
-	if ( tao_yyleng >= TAO_YYLMAX ) \
-		TAO_YY_FATAL_ERROR( "token too large, exceeds TAO_YYLMAX" ); \
-	tao_yy_flex_strncpy( tao_yytext, (tao_yytext_ptr), tao_yyleng + 1 ); \
-	(tao_yy_c_buf_p) = tao_yy_cp;
+        (tao_yytext_ptr) = tao_yy_bp; \
+        tao_yyleng = (size_t) (tao_yy_cp - tao_yy_bp); \
+        (tao_yy_hold_char) = *tao_yy_cp; \
+        *tao_yy_cp = '\0'; \
+        if ( tao_yyleng >= TAO_YYLMAX ) \
+                TAO_YY_FATAL_ERROR( "token too large, exceeds TAO_YYLMAX" ); \
+        tao_yy_flex_strncpy( tao_yytext, (tao_yytext_ptr), tao_yyleng + 1 ); \
+        (tao_yy_c_buf_p) = tao_yy_cp;
 
 #define TAO_YY_NUM_RULES 104
 #define TAO_YY_END_OF_BUFFER 105
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct tao_yy_trans_info
-	{
-	flex_int32_t tao_yy_verify;
-	flex_int32_t tao_yy_nxt;
-	};
+        {
+        flex_int32_t tao_yy_verify;
+        flex_int32_t tao_yy_nxt;
+        };
 static tao_yyconst flex_int16_t tao_yy_accept[562] =
     {   0,
-        101,  101,  105,  103,  101,  102,  102,  103,  103,  103,
-        103,  103,   76,   72,  103,  103,  103,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,  101,  103,  102,  101,    0,   77,    0,    0,
-          0,    0,   75,   71,   69,  100,    0,   69,   76,    0,
-          0,    0,   72,   67,   65,   66,   68,   68,    0,    0,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   62,   68,   68,   68,   68,   68,   68,   68,
-
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   68,   68,  101,    0,
-          0,   95,    0,    0,    0,    0,    0,    0,    0,   77,
-          0,    0,    0,   79,    0,   79,    0,    0,   75,    0,
-         71,    0,   69,    0,   99,   99,   69,    0,   70,   74,
-         68,    0,   78,    0,    0,    0,   68,   68,   68,    1,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         63,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,    0,    0,    0,    0,    0,    0,    0,    0,   82,
-         80,    0,    0,   73,    0,   69,   70,   68,   78,    0,
-          0,    0,    0,   83,    0,   68,   59,   68,   68,   68,
-         20,   27,   68,   68,   68,   68,   68,   68,   68,   13,
-         68,   68,   68,   68,   68,   68,   68,   48,   68,   68,
-         68,   68,   24,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   68,   68,   68,   68,   68,   57,   68,   31,   68,
-         68,    0,    0,    0,    0,    0,    0,    0,   96,    0,
-
-          0,    0,    0,    0,    0,    0,   80,    0,   81,    0,
-         60,    0,    0,    0,   68,   68,   68,   68,   68,   10,
-         68,   68,   68,   68,   68,   44,   68,   68,   68,   68,
-         18,   22,   68,   68,   61,   68,   33,   68,   68,   68,
-         68,   30,   68,   68,   68,   68,   68,   68,   68,   68,
-         68,   25,   68,   68,   68,   68,   68,   68,   68,   68,
-         17,   68,   68,   28,   68,   91,    0,    0,    0,    0,
-          0,    0,    0,    0,    0,    0,    0,    0,    0,   84,
-          0,    2,   68,   68,   68,   68,   68,   68,   35,   68,
-         23,   68,   68,   68,   46,   68,   49,   68,   68,    3,
-
-         68,   32,   64,   68,   68,   68,   38,   68,    4,   68,
-         68,   68,   14,   12,   68,   19,   68,   68,   55,   68,
-         68,   68,   68,    0,   89,    0,    0,    0,    0,    0,
-          0,    0,    0,    0,    0,    0,    0,    0,    0,   68,
-         68,   29,   68,   68,    8,   21,   68,   68,   36,   68,
-         68,   58,   68,   68,   37,   68,   68,   68,   68,   68,
-         68,   68,   11,   68,   68,   68,   15,    0,    0,   87,
-         87,    0,    0,   93,    0,    0,   92,    0,    0,    0,
-          0,    0,    0,    0,   34,   68,   68,   43,   68,   68,
-         68,   68,   50,   68,   52,   68,    5,   16,   68,   39,
-
-         68,   68,   26,   68,    0,   97,   97,    0,    0,    0,
-          0,   90,    0,    0,    0,    0,    0,    0,    0,    6,
-         42,   45,    7,   47,    9,   68,   53,   54,   68,   68,
-         41,    0,    0,    0,   85,   85,    0,    0,   88,   88,
-          0,    0,    0,    0,   51,   68,   56,    0,    0,   98,
-         98,    0,    0,    0,   40,    0,   94,    0,   86,   86,
-          0
+      101,  101,  105,  103,  101,  102,  102,  103,  103,  103,
+      103,  103,   76,   72,  103,  103,  103,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,  101,  103,  102,  101,    0,   77,    0,    0,
+        0,    0,   75,   71,   69,  100,    0,   69,   76,    0,
+        0,    0,   72,   67,   65,   66,   68,   68,    0,    0,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   62,   68,   68,   68,   68,   68,   68,   68,
+
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,  101,    0,
+        0,   95,    0,    0,    0,    0,    0,    0,    0,   77,
+        0,    0,    0,   79,    0,   79,    0,    0,   75,    0,
+       71,    0,   69,    0,   99,   99,   69,    0,   70,   74,
+       68,    0,   78,    0,    0,    0,   68,   68,   68,    1,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       63,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,    0,    0,    0,    0,    0,    0,    0,    0,   82,
+       80,    0,    0,   73,    0,   69,   70,   68,   78,    0,
+        0,    0,    0,   83,    0,   68,   59,   68,   68,   68,
+       20,   27,   68,   68,   68,   68,   68,   68,   68,   13,
+       68,   68,   68,   68,   68,   68,   68,   48,   68,   68,
+       68,   68,   24,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   57,   68,   31,   68,
+       68,    0,    0,    0,    0,    0,    0,    0,   96,    0,
+
+        0,    0,    0,    0,    0,    0,   80,    0,   81,    0,
+       60,    0,    0,    0,   68,   68,   68,   68,   68,   10,
+       68,   68,   68,   68,   68,   44,   68,   68,   68,   68,
+       18,   22,   68,   68,   61,   68,   33,   68,   68,   68,
+       68,   30,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   25,   68,   68,   68,   68,   68,   68,   68,   68,
+       17,   68,   68,   28,   68,   91,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   84,
+        0,    2,   68,   68,   68,   68,   68,   68,   35,   68,
+       23,   68,   68,   68,   46,   68,   49,   68,   68,    3,
+
+       68,   32,   64,   68,   68,   68,   38,   68,    4,   68,
+       68,   68,   14,   12,   68,   19,   68,   68,   55,   68,
+       68,   68,   68,    0,   89,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   68,
+       68,   29,   68,   68,    8,   21,   68,   68,   36,   68,
+       68,   58,   68,   68,   37,   68,   68,   68,   68,   68,
+       68,   68,   11,   68,   68,   68,   15,    0,    0,   87,
+       87,    0,    0,   93,    0,    0,   92,    0,    0,    0,
+        0,    0,    0,    0,   34,   68,   68,   43,   68,   68,
+       68,   68,   50,   68,   52,   68,    5,   16,   68,   39,
+
+       68,   68,   26,   68,    0,   97,   97,    0,    0,    0,
+        0,   90,    0,    0,    0,    0,    0,    0,    0,    6,
+       42,   45,    7,   47,    9,   68,   53,   54,   68,   68,
+       41,    0,    0,    0,   85,   85,    0,    0,   88,   88,
+        0,    0,    0,    0,   51,   68,   56,    0,    0,   98,
+       98,    0,    0,    0,   40,    0,   94,    0,   86,   86,
+        0
     } ;
 
 static tao_yyconst flex_int32_t tao_yy_ec[256] =
     {   0,
-          1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-          1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    5,    1,    6,    7,    1,    1,    1,    8,    1,
-          1,    9,   10,    1,   11,   12,   13,   14,   15,   15,
-         15,   15,   15,   15,   15,   16,   16,   17,    1,   18,
-         19,   20,   21,    1,   22,   23,   23,   23,   24,   25,
-         26,   26,   26,   26,   26,   27,   26,   26,   28,   26,
-         26,   29,   30,   31,   32,   26,   26,   33,   26,   26,
-          1,   34,    1,    1,   26,    1,   35,   36,   37,   38,
-
-         39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
-         49,   50,   51,   52,   53,   54,   55,   56,   57,   58,
-         59,   26,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    5,    1,    6,    7,    1,    1,    1,    8,    1,
+        1,    9,   10,    1,   11,   12,   13,   14,   15,   15,
+       15,   15,   15,   15,   15,   16,   16,   17,    1,   18,
+       19,   20,   21,    1,   22,   23,   23,   23,   24,   25,
+       26,   26,   26,   26,   26,   27,   26,   26,   28,   26,
+       26,   29,   30,   31,   32,   26,   26,   33,   26,   26,
+        1,   34,    1,    1,   26,    1,   35,   36,   37,   38,
+
+       39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
+       49,   50,   51,   52,   53,   54,   55,   56,   57,   58,
+       59,   26,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
     } ;
 
 static tao_yyconst flex_int32_t tao_yy_meta[60] =
     {   0,
-          1,    1,    2,    1,    1,    3,    1,    4,    1,    1,
-          1,    1,    1,    5,    5,    6,    1,    1,    1,    1,
-          3,    6,    6,    6,    6,    7,    7,    7,    7,    7,
-          7,    7,    7,    3,    5,    5,    6,    6,    6,    5,
-          7,    7,    7,    7,    7,    7,    7,    8,    7,    7,
-          7,    8,    7,    8,    9,    8,    7,    8,    7
+        1,    1,    2,    1,    1,    3,    1,    4,    1,    1,
+        1,    1,    1,    5,    5,    6,    1,    1,    1,    1,
+        3,    6,    6,    6,    6,    7,    7,    7,    7,    7,
+        7,    7,    7,    3,    5,    5,    6,    6,    6,    5,
+        7,    7,    7,    7,    7,    7,    7,    8,    7,    7,
+        7,    8,    7,    8,    9,    8,    7,    8,    7
     } ;
 
 static tao_yyconst flex_int16_t tao_yy_base[590] =
     {   0,
-          0,   58, 1129, 1130,   59, 1130, 1130,   56, 1094,   54,
-         57,   65,   68,   73, 1110, 1108, 1105,    0, 1102,   69,
+        0,   58, 1129, 1130,   59, 1130, 1130,   56, 1094,   54,
+       57,   65,   68,   73, 1110, 1108, 1105,    0, 1102,   69,
      1087, 1093,   45, 1072,   56,   37,   48,   67, 1081, 1070,
-         61, 1069,   65, 1082,   79,   63,   82,   83,   71,   71,
-         93,   92,  134,  144, 1095,  130,   97,  148,  129, 1107,
-        147,  152,  158,  184,  210, 1130,  148,  161,  197,  203,
-        229,    0,  239, 1130, 1130, 1130,    0, 1087,  151, 1079,
+       61, 1069,   65, 1082,   79,   63,   82,   83,   71,   71,
+       93,   92,  134,  144, 1095,  130,   97,  148,  129, 1107,
+      147,  152,  158,  184,  210, 1130,  148,  161,  197,  203,
+      229,    0,  239, 1130, 1130, 1130,    0, 1087,  151, 1079,
      1068, 1079, 1057, 1050, 1054, 1058, 1053, 1070,  116, 1051,
      1063, 1047, 1058, 1045, 1060, 1061, 1060,  123, 1047, 1041,
      1047, 1043,  129,  155, 1044, 1053, 1044, 1035, 1034, 1048,
 
      1032,  146, 1049, 1041, 1048,  150, 1033, 1029, 1030, 1036,
      1023, 1027,  167, 1037, 1029, 1031, 1031, 1018,  226,    0,
-        192, 1130, 1065,  243, 1027, 1031, 1025, 1015, 1047,  260,
-        173,  180,  246, 1130, 1057, 1056,  259, 1055,  267,    0,
-        272,  261, 1130,  286, 1130,  289,    0,  254,  287,    0,
+      192, 1130, 1065,  243, 1027, 1031, 1025, 1015, 1047,  260,
+      173,  180,  246, 1130, 1057, 1056,  259, 1055,  267,    0,
+      272,  261, 1130,  286, 1130,  289,    0,  254,  287,    0,
      1032,  196,  292,  284, 1053,  277, 1021, 1035, 1004,    0,
      1005, 1010, 1016, 1002, 1003,  251,  998, 1016, 1014,  995,
      1001,  999, 1007,  991, 1006, 1004, 1007,  989, 1001,  990,
-        983,  998, 1001,  994,  999,  978,  978,  988,  991,  972,
-          0,  253,  972,  981,  973,  987,  969,  971,  970,  186,
+      983,  998, 1001,  994,  999,  978,  978,  988,  991,  972,
+        0,  253,  972,  981,  973,  987,  969,  971,  970,  186,
 
-        971,  966,  971,  979,  968,  973,  962,  959,  975,  977,
-        959, 1004, 1003,  962,  968,  958,  970,  338,  302, 1130,
+      971,  966,  971,  979,  968,  973,  962,  959,  975,  977,
+      959, 1004, 1003,  962,  968,  958,  970,  338,  302, 1130,
      1130,  307,  996,    0,  309,  330, 1130,  979,  324,  996,
-        314,  352,    0, 1130,    0,  964,    0,  948,  956,  959,
-          0,    0,  948,  276,  957,  946,  939,  947,  939,    0,
-        937,  940,  940,  949,  949,  932,  950,    0,  932,  929,
-        930,  935,    0,  939,  933,  935,  921,  922,  940,  939,
-        938,  929,  928,  931,  920,  929,  932,  912,  917,  927,
-        914,  925,  924,  318,  912,  918,    0,  919,    0,  905,
-        913,  949,  359,  915,  905,  913,  910,  904, 1130,  289,
-
-        386,  906,  910,  904,  894,  331, 1130,  937, 1130,  936,
-          0,  379,  408,  935,  888,  906,  904,  904,  890,    0,
-        890,  878,  888,  888,  894,    0,  878,  877,  878,  877,
-          0,    0,  885,  873,    0,  886,    0,  886,  885,  873,
-        883,    0,  862,  868,  865,  880,  169,  864,  868,  867,
-        871,    0,  872,  858,  859,  868,  874,  869,  869,  854,
-          0,  857,  850,    0,  855, 1130,  394,  345,  848,  390,
-        854,  894,  893,  852,  858,  848,  860,  343,  435, 1130,
-        886,    0,  856,  729,  735,  728,  699,  681,    0,  680,
-          0,  659,  663,  646,    0,  650,    0,  667,  647,    0,
-
-        652,    0,    0,  638,  654,  653,    0,  635,    0,  629,
-        627,  609,    0,    0,  607,    0,  606,  616,    0,  602,
-        599,  567,  584,  462, 1130,  477,  408,  367,  423,  497,
-        586,  606,  413,  572,  557,  557,  553,  505,  584,  528,
-        527,    0,  511,  505,    0,    0,  505,  505,    0,  493,
-        494,    0,  485,  477,    0,  464,  465,  436,  455,  451,
-        436,  450,    0,  444,  425,  412,    0,  532,  432, 1130,
-        465,  484,  504, 1130,  455,  369, 1130,  547,  377,  402,
-        555,  407,  369,  433,    0,  401,  373,    0,  387,  373,
-        367,  380,    0,  348,    0,  330,    0,    0,  320,    0,
-
-        324,  295,    0,  295,  493, 1130,  512,  322,  562,  535,
-        570, 1130,  585,  576,  450,  593,  608,  588,  283,    0,
-          0,    0,    0,    0,    0,  254,    0,    0,  147,  130,
-          0,  613,  628,  616, 1130,  632,  636,  642, 1130,  644,
-        651,  150,  127,  521,    0,   55,    0,  664,  655, 1130,
-        667,   61,  670,  678,    0,  680, 1130,  683, 1130,  686,
+      314,  352,    0, 1130,    0,  964,    0,  948,  956,  959,
+        0,    0,  948,  276,  957,  946,  939,  947,  939,    0,
+      937,  940,  940,  949,  949,  932,  950,    0,  932,  929,
+      930,  935,    0,  939,  933,  935,  921,  922,  940,  939,
+      938,  929,  928,  931,  920,  929,  932,  912,  917,  927,
+      914,  925,  924,  318,  912,  918,    0,  919,    0,  905,
+      913,  949,  359,  915,  905,  913,  910,  904, 1130,  289,
+
+      386,  906,  910,  904,  894,  331, 1130,  937, 1130,  936,
+        0,  379,  408,  935,  888,  906,  904,  904,  890,    0,
+      890,  878,  888,  888,  894,    0,  878,  877,  878,  877,
+        0,    0,  885,  873,    0,  886,    0,  886,  885,  873,
+      883,    0,  862,  868,  865,  880,  169,  864,  868,  867,
+      871,    0,  872,  858,  859,  868,  874,  869,  869,  854,
+        0,  857,  850,    0,  855, 1130,  394,  345,  848,  390,
+      854,  894,  893,  852,  858,  848,  860,  343,  435, 1130,
+      886,    0,  856,  729,  735,  728,  699,  681,    0,  680,
+        0,  659,  663,  646,    0,  650,    0,  667,  647,    0,
+
+      652,    0,    0,  638,  654,  653,    0,  635,    0,  629,
+      627,  609,    0,    0,  607,    0,  606,  616,    0,  602,
+      599,  567,  584,  462, 1130,  477,  408,  367,  423,  497,
+      586,  606,  413,  572,  557,  557,  553,  505,  584,  528,
+      527,    0,  511,  505,    0,    0,  505,  505,    0,  493,
+      494,    0,  485,  477,    0,  464,  465,  436,  455,  451,
+      436,  450,    0,  444,  425,  412,    0,  532,  432, 1130,
+      465,  484,  504, 1130,  455,  369, 1130,  547,  377,  402,
+      555,  407,  369,  433,    0,  401,  373,    0,  387,  373,
+      367,  380,    0,  348,    0,  330,    0,    0,  320,    0,
+
+      324,  295,    0,  295,  493, 1130,  512,  322,  562,  535,
+      570, 1130,  585,  576,  450,  593,  608,  588,  283,    0,
+        0,    0,    0,    0,    0,  254,    0,    0,  147,  130,
+        0,  613,  628,  616, 1130,  632,  636,  642, 1130,  644,
+      651,  150,  127,  521,    0,   55,    0,  664,  655, 1130,
+      667,   61,  670,  678,    0,  680, 1130,  683, 1130,  686,
      1130,  707,  716,  721,  728,  736,  745,  750,  756,  765,
-        771,  773,  777,  786,  792,  794,  796,  799,  805,  811,
-        817,  823,  829,  838,  847,  856,  865,  874,  883
+      771,  773,  777,  786,  792,  794,  796,  799,  805,  811,
+      817,  823,  829,  838,  847,  856,  865,  874,  883
     } ;
 
 static tao_yyconst flex_int16_t tao_yy_def[590] =
     {   0,
-        561,    1,  561,  561,  561,  561,  561,  562,  563,  561,
-        561,  561,  561,  561,  561,  561,  561,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  561,  561,  561,  561,  562,  561,  565,  561,
-        566,  561,  561,  561,  561,  561,  567,   55,  561,  561,
-        561,  568,  561,  561,  561,  561,  564,  564,  569,  570,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  561,   44,
-         44,  561,  121,  561,  561,  561,  561,  561,  561,  561,
-        562,  562,  562,  561,  561,  561,  561,  571,  561,  572,
-        561,  561,  561,  567,  561,  567,   58,  561,  561,  568,
-        564,  569,  561,  573,  561,  561,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  574,  561,  561,  561,  561,  561,  561,  562,  561,
-        561,  561,  575,  572,  561,  561,  561,  564,  561,  561,
-        569,  569,  576,  561,  577,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  574,  561,  561,  561,  561,  561,  218,  561,  218,
-
-        561,  561,  561,  561,  561,  562,  561,  561,  561,  561,
-        564,  569,  569,  578,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  561,  561,  561,  561,  561,
-        561,  579,  561,  561,  561,  561,  561,  569,  313,  561,
-        580,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  561,  561,  561,  581,  561,  561,  561,
-        561,  579,  561,  561,  561,  561,  561,  313,  582,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  561,  581,  561,
-        581,  583,  561,  561,  584,  561,  561,  561,  561,  561,
-        561,  561,  569,  561,  564,  564,  564,  564,  564,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-        564,  564,  564,  564,  583,  561,  583,  584,  561,  585,
-        561,  561,  561,  586,  561,  561,  561,  561,  561,  564,
-        564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-        564,  561,  561,  585,  561,  585,  561,  586,  561,  586,
-        587,  588,  561,  561,  564,  564,  564,  561,  587,  561,
-        587,  588,  561,  589,  564,  561,  561,  589,  561,  589,
-          0,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561
+      561,    1,  561,  561,  561,  561,  561,  562,  563,  561,
+      561,  561,  561,  561,  561,  561,  561,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  561,  561,  561,  561,  562,  561,  565,  561,
+      566,  561,  561,  561,  561,  561,  567,   55,  561,  561,
+      561,  568,  561,  561,  561,  561,  564,  564,  569,  570,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  561,   44,
+       44,  561,  121,  561,  561,  561,  561,  561,  561,  561,
+      562,  562,  562,  561,  561,  561,  561,  571,  561,  572,
+      561,  561,  561,  567,  561,  567,   58,  561,  561,  568,
+      564,  569,  561,  573,  561,  561,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  574,  561,  561,  561,  561,  561,  561,  562,  561,
+      561,  561,  575,  572,  561,  561,  561,  564,  561,  561,
+      569,  569,  576,  561,  577,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  574,  561,  561,  561,  561,  561,  218,  561,  218,
+
+      561,  561,  561,  561,  561,  562,  561,  561,  561,  561,
+      564,  569,  569,  578,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  561,  561,  561,  561,  561,
+      561,  579,  561,  561,  561,  561,  561,  569,  313,  561,
+      580,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  561,  561,  561,  581,  561,  561,  561,
+      561,  579,  561,  561,  561,  561,  561,  313,  582,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  561,  581,  561,
+      581,  583,  561,  561,  584,  561,  561,  561,  561,  561,
+      561,  561,  569,  561,  564,  564,  564,  564,  564,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+
+      564,  564,  564,  564,  583,  561,  583,  584,  561,  585,
+      561,  561,  561,  586,  561,  561,  561,  561,  561,  564,
+      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
+      564,  561,  561,  585,  561,  585,  561,  586,  561,  586,
+      587,  588,  561,  561,  564,  564,  564,  561,  587,  561,
+      587,  588,  561,  589,  564,  561,  561,  589,  561,  589,
+        0,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561
     } ;
 
 static tao_yyconst flex_int16_t tao_yy_nxt[1190] =
     {   0,
-          4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
-         10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
-          7,   18,   18,   18,   19,   18,   20,   21,   18,   18,
-         22,   18,   18,    4,   23,   24,   25,   26,   27,   28,
-         29,   30,   31,   18,   18,   32,   33,   34,   35,   36,
-         18,   37,   38,   39,   40,   41,   42,   18,   18,   43,
-         46,   48,   43,   46,   44,   52,  553,   53,   54,   54,
-         55,   55,   55,   56,   69,   81,   70,   57,   45,   58,
-         73,   59,   59,   60,   58,   82,   63,   63,   63,   49,
-         77,   61,   74,  555,   83,   84,   61,   78,   75,   95,
-
-         62,   87,   48,   85,   79,   86,   61,   92,   93,   88,
-         80,   61,   89,   96,  102,   99,  104,  103,  113,   97,
-        105,  106,  111,  114,  107,   62,  100,  115,  117,  112,
-         49,   46,  542,  101,   46,  119,  108,  109,  119,  110,
-        120,  116,  133,  133,  118,  121,  122,  122,  123,  130,
-        145,  146,  130,  131,  136,  553,  153,  124,  124,  124,
-        137,  137,  165,  166,  122,   55,   55,   55,  146,   58,
-        175,  139,  139,   60,  147,  147,  147,  181,   48,  138,
-        176,   61,  182,  125,  154,   48,  126,  547,  192,  127,
-        140,  183,  546,  128,  193,   58,   61,  141,  141,  141,
-
-        197,  153,  184,  198,  138,  407,   49,   61,   58,  205,
-         59,   59,   60,   49,   58,  140,   60,   60,   60,  206,
-         61,  408,   61,   55,   55,   55,   61,  119,  279,  154,
-        119,  561,  120,  142,  143,   61,  143,  561,  148,  148,
-        280,   61,  149,  149,  149,  122,  122,  213,  142,  143,
-         58,   48,   63,   63,   63,  143,  124,  124,  124,  219,
-        219,  130,   61,  122,  130,  131,  221,  149,  149,  149,
-        225,  225,  222,  222,  226,  226,  226,   61,   58,   49,
-        139,  139,   60,   58,  234,  141,  141,  141,  145,  146,
-         61,  145,  146,  229,  372,   61,  229,  232,  232,  270,
-
-        149,  149,  149,  244,  245,   61,  146,   48,  271,  146,
-         61,  227,  545,  227,  307,  306,  306,  544,  230,  153,
-        308,  308,  226,  226,  226,  229,  227,  509,  229,  320,
-        321,  235,  227,  531,  561,   49,   48,  530,  233,  298,
-        299,  299,  300,  226,  226,  226,  427,  154,  153,  427,
-        230,  301,  301,  301,  143,  358,  143,  153,  299,  529,
-        359,  366,  366,  367,   49,  312,  312,  360,  472,  143,
-        510,  472,  528,  510,  153,  143,  154,  302,  514,  366,
-        303,  514,  527,  304,  153,  154,  526,  305,  299,  299,
-        373,  429,  378,  378,  429,  424,  425,  425,  424,  301,
-
-        301,  301,  154,  430,  430,  430,  299,  426,  426,  426,
-        470,  471,  154,  153,  425,  477,  477,  478,  525,  524,
-        523,  379,  379,  379,  429,  522,  521,  429,  471,  379,
-        379,  379,  379,  477,  470,  471,  430,  430,  430,  520,
-        380,  154,  379,  379,  379,  379,  379,  379,  438,  438,
-        438,  541,  471,  519,  541,  515,  438,  438,  438,  438,
-        509,  504,  503,  424,  425,  425,  424,  470,  471,  438,
-        438,  438,  438,  438,  438,  468,  468,  468,  424,  425,
-        425,  424,  425,  502,  501,  471,  506,  507,  500,  499,
-        426,  426,  426,  498,  497,  506,  507,  425,  473,  474,
-
-        474,  473,  475,  496,  507,  473,  474,  474,  473,  475,
-        430,  430,  430,  507,  506,  507,  495,  474,  483,  483,
-        483,  494,  554,  493,  474,  554,  483,  483,  483,  483,
-        492,  491,  507,  424,  425,  425,  424,  535,  536,  483,
-        483,  483,  483,  483,  483,  468,  468,  468,  511,  512,
-        512,  511,  425,  490,  489,  536,  516,  488,  487,  517,
-        513,  513,  513,  532,  474,  474,  532,  512,  518,  518,
-        518,  511,  512,  512,  511,  533,  533,  533,  539,  540,
-        486,  485,  474,  537,  537,  537,  511,  512,  512,  511,
-        512,  380,  543,  482,  516,  481,  540,  517,  513,  513,
-
-        513,  518,  518,  518,  480,  512,  518,  518,  518,  516,
-        479,  433,  517,  542,  532,  474,  474,  532,  535,  536,
-        476,  518,  518,  518,  467,  466,  533,  533,  533,  548,
-        474,  474,  548,  474,  535,  536,  536,  465,  512,  512,
-        464,  533,  533,  533,  539,  540,  539,  540,  474,  537,
-        537,  537,  536,  550,  551,  463,  512,  550,  551,  462,
-        461,  460,  540,  459,  540,  548,  474,  474,  548,  550,
-        551,  551,  557,  557,  458,  551,  457,  556,  556,  556,
-        559,  560,  474,  474,  474,  559,  560,  551,  559,  560,
-        557,  456,  455,  556,  556,  556,  454,  453,  560,  452,
-
-        474,  451,  450,  560,  449,  448,  560,   47,   47,   47,
-         47,   47,   47,   47,   47,   47,   50,  447,   50,   50,
-         50,   50,   50,   50,   50,   67,   67,   67,   67,   67,
-        132,  132,  132,  446,  445,  132,  135,  444,  135,  135,
-        135,  135,  135,  135,  135,  144,  144,  144,  144,  144,
-        144,  144,  144,  144,  150,  150,  152,  152,  152,  152,
-        152,  152,  152,  152,  152,  155,  443,  155,  155,  155,
-        155,  155,  155,  155,  223,  223,  223,  224,  224,  231,
-        231,  231,  442,  441,  231,  231,  292,  292,  292,  292,
-        292,  292,  292,  292,  292,  310,  310,  310,  313,  313,
-
-        314,  314,  381,  381,  381,  432,  432,  432,  432,  432,
-        432,  432,  432,  432,  439,  439,  439,  469,  469,  469,
-        469,  469,  469,  469,  469,  469,  484,  484,  484,  505,
-        505,  505,  505,  505,  505,  505,  505,  505,  508,  508,
-        508,  508,  508,  508,  508,  508,  508,  534,  534,  534,
-        534,  534,  534,  534,  534,  534,  538,  538,  538,  538,
-        538,  538,  538,  538,  538,  549,  549,  549,  549,  549,
-        549,  549,  549,  549,  552,  552,  552,  552,  552,  552,
-        552,  552,  552,  558,  558,  558,  558,  558,  558,  558,
-        558,  558,  440,  380,  437,  436,  435,  434,  372,  433,
-
-        431,  428,  423,  422,  421,  420,  419,  418,  417,  416,
-        415,  414,  413,  412,  411,  410,  409,  406,  405,  404,
-        403,  402,  401,  400,  399,  398,  397,  396,  395,  394,
-        393,  392,  391,  390,  389,  388,  387,  386,  385,  384,
-        383,  382,  380,  309,  307,  377,  376,  375,  374,  561,
-        371,  370,  369,  368,  293,  365,  364,  363,  362,  361,
-        357,  356,  355,  354,  353,  352,  351,  350,  349,  348,
-        347,  346,  345,  344,  343,  342,  341,  340,  339,  338,
-        337,  336,  335,  334,  333,  332,  331,  330,  329,  328,
-        327,  326,  325,  324,  323,  322,  319,  318,  317,  316,
-
-        315,   69,  311,  309,  297,  296,  295,  294,  212,  293,
-        291,  290,  289,  288,  287,  286,  285,  284,  283,  282,
-        281,  278,  277,  276,  275,  274,  273,  272,  269,  268,
-        267,  266,  265,  264,  263,  262,  261,  260,  259,  258,
-        257,  256,  255,  254,  253,  252,  251,  250,  249,  248,
-        247,  246,  243,  242,  241,  240,  239,  238,  237,  236,
-        234,  228,  220,  220,  220,  218,  217,  216,  215,  214,
-        212,  211,  210,  209,  208,  207,  204,  203,  202,  201,
-        200,  199,  196,  195,  194,  191,  190,  189,  188,  187,
-        186,  185,  180,  179,  178,  177,  174,  173,  172,  171,
-
-        170,  169,  168,  167,  164,  163,  162,  161,  160,  159,
-        158,  157,  156,  151,  134,  129,   98,   94,   91,   90,
-         76,   72,   71,   68,   66,   65,   64,   51,  561,    3,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561
+        4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
+       10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
+        7,   18,   18,   18,   19,   18,   20,   21,   18,   18,
+       22,   18,   18,    4,   23,   24,   25,   26,   27,   28,
+       29,   30,   31,   18,   18,   32,   33,   34,   35,   36,
+       18,   37,   38,   39,   40,   41,   42,   18,   18,   43,
+       46,   48,   43,   46,   44,   52,  553,   53,   54,   54,
+       55,   55,   55,   56,   69,   81,   70,   57,   45,   58,
+       73,   59,   59,   60,   58,   82,   63,   63,   63,   49,
+       77,   61,   74,  555,   83,   84,   61,   78,   75,   95,
+
+       62,   87,   48,   85,   79,   86,   61,   92,   93,   88,
+       80,   61,   89,   96,  102,   99,  104,  103,  113,   97,
+      105,  106,  111,  114,  107,   62,  100,  115,  117,  112,
+       49,   46,  542,  101,   46,  119,  108,  109,  119,  110,
+      120,  116,  133,  133,  118,  121,  122,  122,  123,  130,
+      145,  146,  130,  131,  136,  553,  153,  124,  124,  124,
+      137,  137,  165,  166,  122,   55,   55,   55,  146,   58,
+      175,  139,  139,   60,  147,  147,  147,  181,   48,  138,
+      176,   61,  182,  125,  154,   48,  126,  547,  192,  127,
+      140,  183,  546,  128,  193,   58,   61,  141,  141,  141,
+
+      197,  153,  184,  198,  138,  407,   49,   61,   58,  205,
+       59,   59,   60,   49,   58,  140,   60,   60,   60,  206,
+       61,  408,   61,   55,   55,   55,   61,  119,  279,  154,
+      119,  561,  120,  142,  143,   61,  143,  561,  148,  148,
+      280,   61,  149,  149,  149,  122,  122,  213,  142,  143,
+       58,   48,   63,   63,   63,  143,  124,  124,  124,  219,
+      219,  130,   61,  122,  130,  131,  221,  149,  149,  149,
+      225,  225,  222,  222,  226,  226,  226,   61,   58,   49,
+      139,  139,   60,   58,  234,  141,  141,  141,  145,  146,
+       61,  145,  146,  229,  372,   61,  229,  232,  232,  270,
+
+      149,  149,  149,  244,  245,   61,  146,   48,  271,  146,
+       61,  227,  545,  227,  307,  306,  306,  544,  230,  153,
+      308,  308,  226,  226,  226,  229,  227,  509,  229,  320,
+      321,  235,  227,  531,  561,   49,   48,  530,  233,  298,
+      299,  299,  300,  226,  226,  226,  427,  154,  153,  427,
+      230,  301,  301,  301,  143,  358,  143,  153,  299,  529,
+      359,  366,  366,  367,   49,  312,  312,  360,  472,  143,
+      510,  472,  528,  510,  153,  143,  154,  302,  514,  366,
+      303,  514,  527,  304,  153,  154,  526,  305,  299,  299,
+      373,  429,  378,  378,  429,  424,  425,  425,  424,  301,
+
+      301,  301,  154,  430,  430,  430,  299,  426,  426,  426,
+      470,  471,  154,  153,  425,  477,  477,  478,  525,  524,
+      523,  379,  379,  379,  429,  522,  521,  429,  471,  379,
+      379,  379,  379,  477,  470,  471,  430,  430,  430,  520,
+      380,  154,  379,  379,  379,  379,  379,  379,  438,  438,
+      438,  541,  471,  519,  541,  515,  438,  438,  438,  438,
+      509,  504,  503,  424,  425,  425,  424,  470,  471,  438,
+      438,  438,  438,  438,  438,  468,  468,  468,  424,  425,
+      425,  424,  425,  502,  501,  471,  506,  507,  500,  499,
+      426,  426,  426,  498,  497,  506,  507,  425,  473,  474,
+
+      474,  473,  475,  496,  507,  473,  474,  474,  473,  475,
+      430,  430,  430,  507,  506,  507,  495,  474,  483,  483,
+      483,  494,  554,  493,  474,  554,  483,  483,  483,  483,
+      492,  491,  507,  424,  425,  425,  424,  535,  536,  483,
+      483,  483,  483,  483,  483,  468,  468,  468,  511,  512,
+      512,  511,  425,  490,  489,  536,  516,  488,  487,  517,
+      513,  513,  513,  532,  474,  474,  532,  512,  518,  518,
+      518,  511,  512,  512,  511,  533,  533,  533,  539,  540,
+      486,  485,  474,  537,  537,  537,  511,  512,  512,  511,
+      512,  380,  543,  482,  516,  481,  540,  517,  513,  513,
+
+      513,  518,  518,  518,  480,  512,  518,  518,  518,  516,
+      479,  433,  517,  542,  532,  474,  474,  532,  535,  536,
+      476,  518,  518,  518,  467,  466,  533,  533,  533,  548,
+      474,  474,  548,  474,  535,  536,  536,  465,  512,  512,
+      464,  533,  533,  533,  539,  540,  539,  540,  474,  537,
+      537,  537,  536,  550,  551,  463,  512,  550,  551,  462,
+      461,  460,  540,  459,  540,  548,  474,  474,  548,  550,
+      551,  551,  557,  557,  458,  551,  457,  556,  556,  556,
+      559,  560,  474,  474,  474,  559,  560,  551,  559,  560,
+      557,  456,  455,  556,  556,  556,  454,  453,  560,  452,
+
+      474,  451,  450,  560,  449,  448,  560,   47,   47,   47,
+       47,   47,   47,   47,   47,   47,   50,  447,   50,   50,
+       50,   50,   50,   50,   50,   67,   67,   67,   67,   67,
+      132,  132,  132,  446,  445,  132,  135,  444,  135,  135,
+      135,  135,  135,  135,  135,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  150,  150,  152,  152,  152,  152,
+      152,  152,  152,  152,  152,  155,  443,  155,  155,  155,
+      155,  155,  155,  155,  223,  223,  223,  224,  224,  231,
+      231,  231,  442,  441,  231,  231,  292,  292,  292,  292,
+      292,  292,  292,  292,  292,  310,  310,  310,  313,  313,
+
+      314,  314,  381,  381,  381,  432,  432,  432,  432,  432,
+      432,  432,  432,  432,  439,  439,  439,  469,  469,  469,
+      469,  469,  469,  469,  469,  469,  484,  484,  484,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  508,  508,
+      508,  508,  508,  508,  508,  508,  508,  534,  534,  534,
+      534,  534,  534,  534,  534,  534,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  549,  549,  549,  549,  549,
+      549,  549,  549,  549,  552,  552,  552,  552,  552,  552,
+      552,  552,  552,  558,  558,  558,  558,  558,  558,  558,
+      558,  558,  440,  380,  437,  436,  435,  434,  372,  433,
+
+      431,  428,  423,  422,  421,  420,  419,  418,  417,  416,
+      415,  414,  413,  412,  411,  410,  409,  406,  405,  404,
+      403,  402,  401,  400,  399,  398,  397,  396,  395,  394,
+      393,  392,  391,  390,  389,  388,  387,  386,  385,  384,
+      383,  382,  380,  309,  307,  377,  376,  375,  374,  561,
+      371,  370,  369,  368,  293,  365,  364,  363,  362,  361,
+      357,  356,  355,  354,  353,  352,  351,  350,  349,  348,
+      347,  346,  345,  344,  343,  342,  341,  340,  339,  338,
+      337,  336,  335,  334,  333,  332,  331,  330,  329,  328,
+      327,  326,  325,  324,  323,  322,  319,  318,  317,  316,
+
+      315,   69,  311,  309,  297,  296,  295,  294,  212,  293,
+      291,  290,  289,  288,  287,  286,  285,  284,  283,  282,
+      281,  278,  277,  276,  275,  274,  273,  272,  269,  268,
+      267,  266,  265,  264,  263,  262,  261,  260,  259,  258,
+      257,  256,  255,  254,  253,  252,  251,  250,  249,  248,
+      247,  246,  243,  242,  241,  240,  239,  238,  237,  236,
+      234,  228,  220,  220,  220,  218,  217,  216,  215,  214,
+      212,  211,  210,  209,  208,  207,  204,  203,  202,  201,
+      200,  199,  196,  195,  194,  191,  190,  189,  188,  187,
+      186,  185,  180,  179,  178,  177,  174,  173,  172,  171,
+
+      170,  169,  168,  167,  164,  163,  162,  161,  160,  159,
+      158,  157,  156,  151,  134,  129,   98,   94,   91,   90,
+       76,   72,   71,   68,   66,   65,   64,   51,  561,    3,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561
     } ;
 
 static tao_yyconst flex_int16_t tao_yy_chk[1190] =
     {   0,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-          1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-          5,    8,    2,    5,    2,   10,  552,   10,   10,   10,
-         11,   11,   11,   12,   20,   26,   20,   12,    2,   13,
-         23,   13,   13,   13,   14,   26,   14,   14,   14,    8,
-         25,   13,   23,  546,   27,   27,   14,   25,   23,   33,
-
-         13,   28,   47,   27,   25,   27,   13,   31,   31,   28,
-         25,   14,   28,   33,   36,   35,   37,   36,   40,   33,
-         37,   38,   39,   40,   38,   13,   35,   41,   42,   39,
-         47,   46,  543,   35,   46,   43,   38,   38,   43,   38,
-         43,   41,   49,   49,   42,   44,   44,   44,   44,   48,
-         57,   57,   48,   48,   51,  542,   69,   44,   44,   44,
-         51,   51,   79,   79,   44,   52,   52,   52,   57,   53,
-         88,   53,   53,   53,   58,   58,   58,   93,  131,   51,
-         88,   53,   93,   44,   69,  132,   44,  530,  102,   44,
-         53,   94,  529,   44,  102,   54,   53,   54,   54,   54,
-
-        106,  152,   94,  106,   51,  347,  131,   54,   59,  113,
-         59,   59,   59,  132,   60,   53,   60,   60,   60,  113,
-         59,  347,   54,   55,   55,   55,   60,  119,  200,  152,
-        119,  121,  119,   55,   55,   59,   55,  121,   61,   61,
-        200,   60,   61,   61,   61,  124,  124,  124,   55,   55,
-         63,  133,   63,   63,   63,   55,  124,  124,  124,  133,
-        133,  130,   63,  124,  130,  130,  137,  148,  148,  148,
-        142,  142,  137,  137,  142,  142,  142,   63,  139,  133,
-        139,  139,  139,  141,  156,  141,  141,  141,  144,  144,
-        139,  146,  146,  153,  300,  141,  153,  154,  154,  192,
-
-        149,  149,  149,  166,  166,  139,  144,  219,  192,  146,
-        141,  149,  526,  149,  222,  219,  219,  519,  153,  231,
-        222,  222,  225,  225,  225,  229,  149,  508,  229,  244,
-        244,  156,  149,  504,  300,  219,  306,  502,  154,  218,
-        218,  218,  218,  226,  226,  226,  368,  231,  378,  368,
-        229,  218,  218,  218,  226,  284,  226,  232,  218,  501,
-        284,  293,  293,  293,  306,  232,  232,  284,  428,  226,
-        476,  428,  499,  476,  483,  226,  378,  218,  479,  293,
-        218,  479,  496,  218,  312,  232,  494,  218,  301,  301,
-        301,  370,  312,  312,  370,  367,  367,  367,  367,  301,
-
-        301,  301,  483,  370,  370,  370,  301,  367,  367,  367,
-        427,  427,  312,  313,  367,  433,  433,  433,  492,  491,
-        490,  313,  313,  313,  429,  489,  487,  429,  427,  313,
-        313,  313,  313,  433,  469,  469,  429,  429,  429,  486,
-        484,  313,  313,  313,  313,  313,  313,  313,  379,  379,
-        379,  515,  469,  482,  515,  480,  379,  379,  379,  379,
-        475,  466,  465,  424,  424,  424,  424,  471,  471,  379,
-        379,  379,  379,  379,  379,  424,  424,  424,  426,  426,
-        426,  426,  424,  464,  462,  471,  472,  472,  461,  460,
-        426,  426,  426,  459,  458,  505,  505,  426,  430,  430,
-
-        430,  430,  430,  457,  472,  473,  473,  473,  473,  473,
-        430,  430,  430,  505,  507,  507,  456,  430,  438,  438,
-        438,  454,  544,  453,  473,  544,  438,  438,  438,  438,
-        451,  450,  507,  468,  468,  468,  468,  510,  510,  438,
-        438,  438,  438,  438,  438,  468,  468,  468,  478,  478,
-        478,  478,  468,  448,  447,  510,  481,  444,  443,  481,
-        478,  478,  478,  509,  509,  509,  509,  478,  481,  481,
-        481,  511,  511,  511,  511,  509,  509,  509,  514,  514,
-        441,  440,  509,  511,  511,  511,  513,  513,  513,  513,
-        511,  439,  518,  437,  516,  436,  514,  516,  513,  513,
-
-        513,  518,  518,  518,  435,  513,  516,  516,  516,  517,
-        434,  432,  517,  517,  532,  532,  532,  532,  534,  534,
-        431,  517,  517,  517,  423,  422,  532,  532,  532,  533,
-        533,  533,  533,  532,  536,  536,  534,  421,  537,  537,
-        420,  533,  533,  533,  538,  538,  540,  540,  533,  537,
-        537,  537,  536,  541,  541,  418,  537,  549,  549,  417,
-        415,  412,  538,  411,  540,  548,  548,  548,  548,  551,
-        551,  541,  553,  553,  410,  549,  408,  548,  548,  548,
-        554,  554,  556,  556,  548,  558,  558,  551,  560,  560,
-        553,  406,  405,  556,  556,  556,  404,  401,  554,  399,
-
-        556,  398,  396,  558,  394,  393,  560,  562,  562,  562,
-        562,  562,  562,  562,  562,  562,  563,  392,  563,  563,
-        563,  563,  563,  563,  563,  564,  564,  564,  564,  564,
-        565,  565,  565,  390,  388,  565,  566,  387,  566,  566,
-        566,  566,  566,  566,  566,  567,  567,  567,  567,  567,
-        567,  567,  567,  567,  568,  568,  569,  569,  569,  569,
-        569,  569,  569,  569,  569,  570,  386,  570,  570,  570,
-        570,  570,  570,  570,  571,  571,  571,  572,  572,  573,
-        573,  573,  385,  384,  573,  573,  574,  574,  574,  574,
-        574,  574,  574,  574,  574,  575,  575,  575,  576,  576,
-
-        577,  577,  578,  578,  578,  579,  579,  579,  579,  579,
-        579,  579,  579,  579,  580,  580,  580,  581,  581,  581,
-        581,  581,  581,  581,  581,  581,  582,  582,  582,  583,
-        583,  583,  583,  583,  583,  583,  583,  583,  584,  584,
-        584,  584,  584,  584,  584,  584,  584,  585,  585,  585,
-        585,  585,  585,  585,  585,  585,  586,  586,  586,  586,
-        586,  586,  586,  586,  586,  587,  587,  587,  587,  587,
-        587,  587,  587,  587,  588,  588,  588,  588,  588,  588,
-        588,  588,  588,  589,  589,  589,  589,  589,  589,  589,
-        589,  589,  383,  381,  377,  376,  375,  374,  373,  372,
-
-        371,  369,  365,  363,  362,  360,  359,  358,  357,  356,
-        355,  354,  353,  351,  350,  349,  348,  346,  345,  344,
-        343,  341,  340,  339,  338,  336,  334,  333,  330,  329,
-        328,  327,  325,  324,  323,  322,  321,  319,  318,  317,
-        316,  315,  314,  310,  308,  305,  304,  303,  302,  298,
-        297,  296,  295,  294,  292,  291,  290,  288,  286,  285,
-        283,  282,  281,  280,  279,  278,  277,  276,  275,  274,
-        273,  272,  271,  270,  269,  268,  267,  266,  265,  264,
-        262,  261,  260,  259,  257,  256,  255,  254,  253,  252,
-        251,  249,  248,  247,  246,  245,  243,  240,  239,  238,
-
-        236,  230,  228,  223,  217,  216,  215,  214,  213,  212,
-        211,  210,  209,  208,  207,  206,  205,  204,  203,  202,
-        201,  199,  198,  197,  196,  195,  194,  193,  190,  189,
-        188,  187,  186,  185,  184,  183,  182,  181,  180,  179,
-        178,  177,  176,  175,  174,  173,  172,  171,  170,  169,
-        168,  167,  165,  164,  163,  162,  161,  159,  158,  157,
-        155,  151,  138,  136,  135,  129,  128,  127,  126,  125,
-        123,  118,  117,  116,  115,  114,  112,  111,  110,  109,
-        108,  107,  105,  104,  103,  101,  100,   99,   98,   97,
-         96,   95,   92,   91,   90,   89,   87,   86,   85,   84,
-
-         83,   82,   81,   80,   78,   77,   76,   75,   74,   73,
-         72,   71,   70,   68,   50,   45,   34,   32,   30,   29,
-         24,   22,   21,   19,   17,   16,   15,    9,    3,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-        561,  561,  561,  561,  561,  561,  561,  561,  561
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+        5,    8,    2,    5,    2,   10,  552,   10,   10,   10,
+       11,   11,   11,   12,   20,   26,   20,   12,    2,   13,
+       23,   13,   13,   13,   14,   26,   14,   14,   14,    8,
+       25,   13,   23,  546,   27,   27,   14,   25,   23,   33,
+
+       13,   28,   47,   27,   25,   27,   13,   31,   31,   28,
+       25,   14,   28,   33,   36,   35,   37,   36,   40,   33,
+       37,   38,   39,   40,   38,   13,   35,   41,   42,   39,
+       47,   46,  543,   35,   46,   43,   38,   38,   43,   38,
+       43,   41,   49,   49,   42,   44,   44,   44,   44,   48,
+       57,   57,   48,   48,   51,  542,   69,   44,   44,   44,
+       51,   51,   79,   79,   44,   52,   52,   52,   57,   53,
+       88,   53,   53,   53,   58,   58,   58,   93,  131,   51,
+       88,   53,   93,   44,   69,  132,   44,  530,  102,   44,
+       53,   94,  529,   44,  102,   54,   53,   54,   54,   54,
+
+      106,  152,   94,  106,   51,  347,  131,   54,   59,  113,
+       59,   59,   59,  132,   60,   53,   60,   60,   60,  113,
+       59,  347,   54,   55,   55,   55,   60,  119,  200,  152,
+      119,  121,  119,   55,   55,   59,   55,  121,   61,   61,
+      200,   60,   61,   61,   61,  124,  124,  124,   55,   55,
+       63,  133,   63,   63,   63,   55,  124,  124,  124,  133,
+      133,  130,   63,  124,  130,  130,  137,  148,  148,  148,
+      142,  142,  137,  137,  142,  142,  142,   63,  139,  133,
+      139,  139,  139,  141,  156,  141,  141,  141,  144,  144,
+      139,  146,  146,  153,  300,  141,  153,  154,  154,  192,
+
+      149,  149,  149,  166,  166,  139,  144,  219,  192,  146,
+      141,  149,  526,  149,  222,  219,  219,  519,  153,  231,
+      222,  222,  225,  225,  225,  229,  149,  508,  229,  244,
+      244,  156,  149,  504,  300,  219,  306,  502,  154,  218,
+      218,  218,  218,  226,  226,  226,  368,  231,  378,  368,
+      229,  218,  218,  218,  226,  284,  226,  232,  218,  501,
+      284,  293,  293,  293,  306,  232,  232,  284,  428,  226,
+      476,  428,  499,  476,  483,  226,  378,  218,  479,  293,
+      218,  479,  496,  218,  312,  232,  494,  218,  301,  301,
+      301,  370,  312,  312,  370,  367,  367,  367,  367,  301,
+
+      301,  301,  483,  370,  370,  370,  301,  367,  367,  367,
+      427,  427,  312,  313,  367,  433,  433,  433,  492,  491,
+      490,  313,  313,  313,  429,  489,  487,  429,  427,  313,
+      313,  313,  313,  433,  469,  469,  429,  429,  429,  486,
+      484,  313,  313,  313,  313,  313,  313,  313,  379,  379,
+      379,  515,  469,  482,  515,  480,  379,  379,  379,  379,
+      475,  466,  465,  424,  424,  424,  424,  471,  471,  379,
+      379,  379,  379,  379,  379,  424,  424,  424,  426,  426,
+      426,  426,  424,  464,  462,  471,  472,  472,  461,  460,
+      426,  426,  426,  459,  458,  505,  505,  426,  430,  430,
+
+      430,  430,  430,  457,  472,  473,  473,  473,  473,  473,
+      430,  430,  430,  505,  507,  507,  456,  430,  438,  438,
+      438,  454,  544,  453,  473,  544,  438,  438,  438,  438,
+      451,  450,  507,  468,  468,  468,  468,  510,  510,  438,
+      438,  438,  438,  438,  438,  468,  468,  468,  478,  478,
+      478,  478,  468,  448,  447,  510,  481,  444,  443,  481,
+      478,  478,  478,  509,  509,  509,  509,  478,  481,  481,
+      481,  511,  511,  511,  511,  509,  509,  509,  514,  514,
+      441,  440,  509,  511,  511,  511,  513,  513,  513,  513,
+      511,  439,  518,  437,  516,  436,  514,  516,  513,  513,
+
+      513,  518,  518,  518,  435,  513,  516,  516,  516,  517,
+      434,  432,  517,  517,  532,  532,  532,  532,  534,  534,
+      431,  517,  517,  517,  423,  422,  532,  532,  532,  533,
+      533,  533,  533,  532,  536,  536,  534,  421,  537,  537,
+      420,  533,  533,  533,  538,  538,  540,  540,  533,  537,
+      537,  537,  536,  541,  541,  418,  537,  549,  549,  417,
+      415,  412,  538,  411,  540,  548,  548,  548,  548,  551,
+      551,  541,  553,  553,  410,  549,  408,  548,  548,  548,
+      554,  554,  556,  556,  548,  558,  558,  551,  560,  560,
+      553,  406,  405,  556,  556,  556,  404,  401,  554,  399,
+
+      556,  398,  396,  558,  394,  393,  560,  562,  562,  562,
+      562,  562,  562,  562,  562,  562,  563,  392,  563,  563,
+      563,  563,  563,  563,  563,  564,  564,  564,  564,  564,
+      565,  565,  565,  390,  388,  565,  566,  387,  566,  566,
+      566,  566,  566,  566,  566,  567,  567,  567,  567,  567,
+      567,  567,  567,  567,  568,  568,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  570,  386,  570,  570,  570,
+      570,  570,  570,  570,  571,  571,  571,  572,  572,  573,
+      573,  573,  385,  384,  573,  573,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  575,  575,  575,  576,  576,
+
+      577,  577,  578,  578,  578,  579,  579,  579,  579,  579,
+      579,  579,  579,  579,  580,  580,  580,  581,  581,  581,
+      581,  581,  581,  581,  581,  581,  582,  582,  582,  583,
+      583,  583,  583,  583,  583,  583,  583,  583,  584,  584,
+      584,  584,  584,  584,  584,  584,  584,  585,  585,  585,
+      585,  585,  585,  585,  585,  585,  586,  586,  586,  586,
+      586,  586,  586,  586,  586,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  588,  588,  588,  588,  588,  588,
+      588,  588,  588,  589,  589,  589,  589,  589,  589,  589,
+      589,  589,  383,  381,  377,  376,  375,  374,  373,  372,
+
+      371,  369,  365,  363,  362,  360,  359,  358,  357,  356,
+      355,  354,  353,  351,  350,  349,  348,  346,  345,  344,
+      343,  341,  340,  339,  338,  336,  334,  333,  330,  329,
+      328,  327,  325,  324,  323,  322,  321,  319,  318,  317,
+      316,  315,  314,  310,  308,  305,  304,  303,  302,  298,
+      297,  296,  295,  294,  292,  291,  290,  288,  286,  285,
+      283,  282,  281,  280,  279,  278,  277,  276,  275,  274,
+      273,  272,  271,  270,  269,  268,  267,  266,  265,  264,
+      262,  261,  260,  259,  257,  256,  255,  254,  253,  252,
+      251,  249,  248,  247,  246,  245,  243,  240,  239,  238,
+
+      236,  230,  228,  223,  217,  216,  215,  214,  213,  212,
+      211,  210,  209,  208,  207,  206,  205,  204,  203,  202,
+      201,  199,  198,  197,  196,  195,  194,  193,  190,  189,
+      188,  187,  186,  185,  184,  183,  182,  181,  180,  179,
+      178,  177,  176,  175,  174,  173,  172,  171,  170,  169,
+      168,  167,  165,  164,  163,  162,  161,  159,  158,  157,
+      155,  151,  138,  136,  135,  129,  128,  127,  126,  125,
+      123,  118,  117,  116,  115,  114,  112,  111,  110,  109,
+      108,  107,  105,  104,  103,  101,  100,   99,   98,   97,
+       96,   95,   92,   91,   90,   89,   87,   86,   85,   84,
+
+       83,   82,   81,   80,   78,   77,   76,   75,   74,   73,
+       72,   71,   70,   68,   50,   45,   34,   32,   30,   29,
+       24,   22,   21,   19,   17,   16,   15,    9,    3,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -989,17 +989,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "nr_extern.h"
 #include "y.tab.h"
 
-static char *             idl_wstring_escape_reader (char *);
+static char *           idl_wstring_escape_reader (char *);
 static ACE_CDR::WChar   idl_wchar_escape_reader (char *);
 static ACE_CDR::Char    idl_escape_reader (char *);
 static ACE_CDR::Double  idl_atof (char *);
 static ACE_CDR::Long    idl_atoi (char *, long);
 static ACE_CDR::ULong   idl_atoui (char *, long);
-static void                 idl_parse_line_and_file (char *);
-static void                 idl_store_pragma (char *);
-static char *             idl_get_pragma_string (char *);
-static bool                 idl_valid_version (char *);
-static AST_Decl *         idl_find_node (char *);
+static void             idl_parse_line_and_file (char *);
+static void             idl_store_pragma (char *);
+static char *           idl_get_pragma_string (char *);
+static bool             idl_valid_version (char *);
+static AST_Decl *       idl_find_node (char *);
 
 #define ace_tao_yytext tao_yytext
 
@@ -1075,33 +1075,33 @@ static int input (void );
  */
 #ifndef TAO_YY_INPUT
 #define TAO_YY_INPUT(buf,result,max_size) \
-	if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		size_t n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( tao_yyin ) ) \
-			TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = static_cast<int> (fread(buf, 1, max_size, tao_yyin)))==0 && ferror(tao_yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(tao_yyin); \
-			} \
-		}\
+        if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_is_interactive ) \
+                { \
+                int c = '*'; \
+                size_t n; \
+                for ( n = 0; n < max_size && \
+                             (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
+                        buf[n] = (char) c; \
+                if ( c == '\n' ) \
+                        buf[n++] = (char) c; \
+                if ( c == EOF && ferror( tao_yyin ) ) \
+                        TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                result = n; \
+                } \
+        else \
+                { \
+                errno=0; \
+                while ( (result = static_cast<int> (fread(buf, 1, max_size, tao_yyin)))==0 && ferror(tao_yyin)) \
+                        { \
+                        if( errno != EINTR) \
+                                { \
+                                TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                                break; \
+                                } \
+                        errno=0; \
+                        clearerr(tao_yyin); \
+                        } \
+                }\
 \
 
 #endif
@@ -1150,368 +1150,368 @@ extern int tao_yylex (void);
 #endif
 
 #define TAO_YY_RULE_SETUP \
-	if ( tao_yyleng > 0 ) \
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_at_bol = \
-				(tao_yytext[tao_yyleng - 1] == '\n'); \
-	TAO_YY_USER_ACTION
+        if ( tao_yyleng > 0 ) \
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_at_bol = \
+                                (tao_yytext[tao_yyleng - 1] == '\n'); \
+        TAO_YY_USER_ACTION
 
 /** The main scanner function which does all the work.
  */
 TAO_YY_DECL
 {
-	register tao_yy_state_type tao_yy_current_state;
-	register char *tao_yy_cp, *tao_yy_bp;
-	register int tao_yy_act;
+        register tao_yy_state_type tao_yy_current_state;
+        register char *tao_yy_cp, *tao_yy_bp;
+        register int tao_yy_act;
 
-	if ( !(tao_yy_init) )
-		{
-		(tao_yy_init) = 1;
+        if ( !(tao_yy_init) )
+                {
+                (tao_yy_init) = 1;
 
 #ifdef TAO_YY_USER_INIT
-		TAO_YY_USER_INIT;
+                TAO_YY_USER_INIT;
 #endif
 
-		if ( ! (tao_yy_start) )
-			(tao_yy_start) = 1;	/* first start state */
+                if ( ! (tao_yy_start) )
+                        (tao_yy_start) = 1;        /* first start state */
 
-		if ( ! tao_yyin )
-			tao_yyin = stdin;
+                if ( ! tao_yyin )
+                        tao_yyin = stdin;
 
-		if ( ! tao_yyout )
-			tao_yyout = stdout;
+                if ( ! tao_yyout )
+                        tao_yyout = stdout;
 
-		if ( ! TAO_YY_CURRENT_BUFFER ) {
-			tao_yyensure_buffer_stack ();
-			TAO_YY_CURRENT_BUFFER_LVALUE =
-				tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE );
-		}
+                if ( ! TAO_YY_CURRENT_BUFFER ) {
+                        tao_yyensure_buffer_stack ();
+                        TAO_YY_CURRENT_BUFFER_LVALUE =
+                                tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE );
+                }
 
-		tao_yy_load_buffer_state( );
-		}
+                tao_yy_load_buffer_state( );
+                }
 
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		tao_yy_cp = (tao_yy_c_buf_p);
+        while ( 1 )                /* loops until end-of-file is reached */
+                {
+                tao_yy_cp = (tao_yy_c_buf_p);
 
-		/* Support of tao_yytext. */
-		*tao_yy_cp = (tao_yy_hold_char);
+                /* Support of tao_yytext. */
+                *tao_yy_cp = (tao_yy_hold_char);
 
-		/* tao_yy_bp points to the position in tao_yy_ch_buf of the start of
-		 * the current run.
-		 */
-		tao_yy_bp = tao_yy_cp;
+                /* tao_yy_bp points to the position in tao_yy_ch_buf of the start of
+                 * the current run.
+                 */
+                tao_yy_bp = tao_yy_cp;
 
-		tao_yy_current_state = (tao_yy_start);
-		tao_yy_current_state += TAO_YY_AT_BOL();
+                tao_yy_current_state = (tao_yy_start);
+                tao_yy_current_state += TAO_YY_AT_BOL();
 tao_yy_match:
-		do
-			{
-			register TAO_YY_CHAR tao_yy_c = tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)];
-			if ( tao_yy_accept[tao_yy_current_state] )
-				{
-				(tao_yy_last_accepting_state) = tao_yy_current_state;
-				(tao_yy_last_accepting_cpos) = tao_yy_cp;
-				}
-			while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-				{
-				tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-				if ( tao_yy_current_state >= 562 )
-					tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-				}
-			tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-			++tao_yy_cp;
-			}
-		while ( tao_yy_current_state != 561 );
-		tao_yy_cp = (tao_yy_last_accepting_cpos);
-		tao_yy_current_state = (tao_yy_last_accepting_state);
+                do
+                        {
+                        register TAO_YY_CHAR tao_yy_c = tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)];
+                        if ( tao_yy_accept[tao_yy_current_state] )
+                                {
+                                (tao_yy_last_accepting_state) = tao_yy_current_state;
+                                (tao_yy_last_accepting_cpos) = tao_yy_cp;
+                                }
+                        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
+                                {
+                                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
+                                if ( tao_yy_current_state >= 562 )
+                                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
+                                }
+                        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
+                        ++tao_yy_cp;
+                        }
+                while ( tao_yy_current_state != 561 );
+                tao_yy_cp = (tao_yy_last_accepting_cpos);
+                tao_yy_current_state = (tao_yy_last_accepting_state);
 
 tao_yy_find_action:
-		tao_yy_act = tao_yy_accept[tao_yy_current_state];
+                tao_yy_act = tao_yy_accept[tao_yy_current_state];
 
-		TAO_YY_DO_BEFORE_ACTION;
+                TAO_YY_DO_BEFORE_ACTION;
 
-do_action:	/* This label is used only to access EOF actions. */
+do_action:        /* This label is used only to access EOF actions. */
 
-		switch ( tao_yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of TAO_YY_DO_BEFORE_ACTION */
-			*tao_yy_cp = (tao_yy_hold_char);
-			tao_yy_cp = (tao_yy_last_accepting_cpos);
-			tao_yy_current_state = (tao_yy_last_accepting_state);
-			goto tao_yy_find_action;
+                switch ( tao_yy_act )
+        { /* beginning of action switch */
+                        case 0: /* must back up */
+                        /* undo the effects of TAO_YY_DO_BEFORE_ACTION */
+                        *tao_yy_cp = (tao_yy_hold_char);
+                        tao_yy_cp = (tao_yy_last_accepting_cpos);
+                        tao_yy_current_state = (tao_yy_last_accepting_state);
+                        goto tao_yy_find_action;
 
 case 1:
 TAO_YY_RULE_SETUP
 return IDL_ANY;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 2:
 TAO_YY_RULE_SETUP
 return IDL_OBJECT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 3:
 TAO_YY_RULE_SETUP
 return IDL_MODULE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 4:
 TAO_YY_RULE_SETUP
 return IDL_RAISES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 5:
 TAO_YY_RULE_SETUP
 return IDL_READONLY;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 6:
 TAO_YY_RULE_SETUP
 return IDL_ATTRIBUTE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 7:
 TAO_YY_RULE_SETUP
 return IDL_EXCEPTION;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 8:
 TAO_YY_RULE_SETUP
 return IDL_CONTEXT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 9:
 TAO_YY_RULE_SETUP
 return IDL_INTERFACE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 10:
 TAO_YY_RULE_SETUP
 return IDL_CONST;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 11:
 TAO_YY_RULE_SETUP
 return IDL_TYPEDEF;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 12:
 TAO_YY_RULE_SETUP
 return IDL_STRUCT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 13:
 TAO_YY_RULE_SETUP
 return IDL_ENUM;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 14:
 TAO_YY_RULE_SETUP
 return IDL_STRING;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 15:
 TAO_YY_RULE_SETUP
 return IDL_WSTRING;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 16:
 TAO_YY_RULE_SETUP
 return IDL_SEQUENCE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 17:
 TAO_YY_RULE_SETUP
 return IDL_UNION;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 18:
 TAO_YY_RULE_SETUP
 return IDL_FIXED;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 19:
 TAO_YY_RULE_SETUP
 return IDL_SWITCH;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 20:
 TAO_YY_RULE_SETUP
 return IDL_CASE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 21:
 TAO_YY_RULE_SETUP
 return IDL_DEFAULT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 22:
 TAO_YY_RULE_SETUP
 return IDL_FLOAT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 23:
 TAO_YY_RULE_SETUP
 return IDL_DOUBLE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 24:
 TAO_YY_RULE_SETUP
 return IDL_LONG;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 25:
 TAO_YY_RULE_SETUP
 return IDL_SHORT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 26:
 TAO_YY_RULE_SETUP
 return IDL_UNSIGNED;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 27:
 TAO_YY_RULE_SETUP
 return IDL_CHAR;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 28:
 TAO_YY_RULE_SETUP
 return IDL_WCHAR;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 29:
 TAO_YY_RULE_SETUP
 return IDL_BOOLEAN;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 30:
 TAO_YY_RULE_SETUP
 return IDL_OCTET;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 31:
 TAO_YY_RULE_SETUP
 return IDL_VOID;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 32:
 TAO_YY_RULE_SETUP
 return IDL_NATIVE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 33:
 TAO_YY_RULE_SETUP
 return IDL_LOCAL;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 34:
 TAO_YY_RULE_SETUP
 return IDL_ABSTRACT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 35:
 TAO_YY_RULE_SETUP
 return IDL_CUSTOM;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 36:
 TAO_YY_RULE_SETUP
 return IDL_FACTORY;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 37:
 TAO_YY_RULE_SETUP
 return IDL_PRIVATE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 38:
 TAO_YY_RULE_SETUP
 return IDL_PUBLIC;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 39:
 TAO_YY_RULE_SETUP
 return IDL_SUPPORTS;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 40:
 TAO_YY_RULE_SETUP
 return IDL_TRUNCATABLE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 41:
 TAO_YY_RULE_SETUP
 return IDL_VALUETYPE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 42:
 TAO_YY_RULE_SETUP
 return IDL_COMPONENT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 43:
 TAO_YY_RULE_SETUP
 return IDL_CONSUMES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 44:
 TAO_YY_RULE_SETUP
 return IDL_EMITS;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 45:
 TAO_YY_RULE_SETUP
 return IDL_EVENTTYPE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 46:
 TAO_YY_RULE_SETUP
 return IDL_FINDER;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 47:
 TAO_YY_RULE_SETUP
 return IDL_GETRAISES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 48:
 TAO_YY_RULE_SETUP
 return IDL_HOME;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 49:
 TAO_YY_RULE_SETUP
 return IDL_IMPORT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 50:
 TAO_YY_RULE_SETUP
 return IDL_MULTIPLE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 51:
 TAO_YY_RULE_SETUP
 return IDL_PRIMARYKEY;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 52:
 TAO_YY_RULE_SETUP
 return IDL_PROVIDES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 53:
 TAO_YY_RULE_SETUP
 return IDL_PUBLISHES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 54:
 TAO_YY_RULE_SETUP
 return IDL_SETRAISES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 55:
 TAO_YY_RULE_SETUP
 return IDL_TYPEID;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 56:
 TAO_YY_RULE_SETUP
 return IDL_TYPEPREFIX;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 57:
 TAO_YY_RULE_SETUP
 return IDL_USES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 58:
 TAO_YY_RULE_SETUP
 return IDL_MANAGES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 59:
 TAO_YY_RULE_SETUP
 return IDL_TRUETOK;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 60:
 TAO_YY_RULE_SETUP
 return IDL_FALSETOK;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 61:
 TAO_YY_RULE_SETUP
 return IDL_INOUT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 62:
 TAO_YY_RULE_SETUP
 return IDL_IN;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 63:
 TAO_YY_RULE_SETUP
 return IDL_OUT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 64:
 TAO_YY_RULE_SETUP
 return IDL_ONEWAY;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 65:
 TAO_YY_RULE_SETUP
 return IDL_LEFT_SHIFT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 66:
 TAO_YY_RULE_SETUP
 return IDL_RIGHT_SHIFT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 67:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.strval = ACE::strnew ("::");
-                        return IDL_SCOPE_DELIMITOR;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.strval = ACE::strnew ("::");
+                  return IDL_SCOPE_DELIMITOR;
+                }
+        TAO_YY_BREAK
 case 68:
 TAO_YY_RULE_SETUP
 {
@@ -1524,198 +1524,198 @@ TAO_YY_RULE_SETUP
   const TAO_IDL_CPP_Keyword_Entry *entry = 0;
   if (!idl_global->preserve_cpp_keywords())
     {
-        // This check will ensure that escaped C++ keywords will be
-        // caught and prepended with '_cxx' as non-escaped keywords
-        // are now prepended with '_cxx_'.
-        const char *tmp =
-          ace_tao_yytext[0] == '_' ? ace_tao_yytext + 1 : ace_tao_yytext;
-
-        entry =
-          cpp_key_tbl.lookup (tmp,
-                                    static_cast<unsigned int> (ACE_OS::strlen (tmp)));
+      // This check will ensure that escaped C++ keywords will be
+      // caught and prepended with '_cxx' as non-escaped keywords
+      // are now prepended with '_cxx_'.
+      const char *tmp =
+        ace_tao_yytext[0] == '_' ? ace_tao_yytext + 1 : ace_tao_yytext;
+
+      entry =
+        cpp_key_tbl.lookup (tmp,
+                            static_cast<unsigned int> (ACE_OS::strlen (tmp)));
     }
 
   if (entry)
     {
-        tao_yylval.strval = ACE::strnew (entry->mapping_);
+      tao_yylval.strval = ACE::strnew (entry->mapping_);
     }
   else
     {
-        tao_yylval.strval = ACE::strnew (ace_tao_yytext);
+      tao_yylval.strval = ACE::strnew (ace_tao_yytext);
     }
 
   return IDENTIFIER;
 }
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 69:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.dval = idl_atof(ace_tao_yytext);
-                        return IDL_FLOATING_PT_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.dval = idl_atof(ace_tao_yytext);
+                  return IDL_FLOATING_PT_LITERAL;
+                }
+        TAO_YY_BREAK
 case 70:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.dval = idl_atof(ace_tao_yytext);
-                        return IDL_FLOATING_PT_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.dval = idl_atof(ace_tao_yytext);
+                  return IDL_FLOATING_PT_LITERAL;
+                }
+        TAO_YY_BREAK
 case 71:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
-                        return IDL_INTEGER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
+                  return IDL_INTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 72:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.uival = idl_atoui(ace_tao_yytext, 10);
-                        return IDL_UINTEGER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 10);
+                  return IDL_UINTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 73:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
-                        return IDL_INTEGER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
+                  return IDL_INTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 74:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.uival = idl_atoui(ace_tao_yytext, 16);
-                        return IDL_UINTEGER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 16);
+                  return IDL_UINTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 75:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
-                        return IDL_INTEGER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
+                  return IDL_INTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 76:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.uival = idl_atoui(ace_tao_yytext, 8);
-                        return IDL_UINTEGER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 8);
+                  return IDL_UINTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 77:
 /* rule 77 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        /* Skip the quotes */
-                        char * const tmp = ace_tao_yytext;
-                        for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
-                          if (isspace(tmp[i])) {
-                            tmp[i] = '\0';
-                          }
-                          else {
-                            break;
-                          }
-                        }
-                        tmp[ACE_OS::strlen (tmp) - 1] = '\0';
-                        ACE_NEW_RETURN (tao_yylval.sval,
-                                            UTL_String (tmp + 1),
-                                            IDL_STRING_LITERAL);
-                        return IDL_STRING_LITERAL;
+                  /* Skip the quotes */
+                  char * const tmp = ace_tao_yytext;
+                  for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
+                    if (isspace(tmp[i])) {
+                      tmp[i] = '\0';
+                    }
+                    else {
+                      break;
                     }
-	TAO_YY_BREAK
+                  }
+                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
+                  ACE_NEW_RETURN (tao_yylval.sval,
+                                  UTL_String (tmp + 1),
+                                  IDL_STRING_LITERAL);
+                  return IDL_STRING_LITERAL;
+                }
+        TAO_YY_BREAK
 case 78:
 /* rule 78 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        /* Skip the bookends */
-                        char * const tmp = ACE_OS::strdup (ace_tao_yytext);
-                        for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
-                          if (isspace(tmp[i])) {
-                            tmp[i] = '\0';
-                          }
-                          else {
-                            break;
-                          }
-                        }
-                        tmp[ACE_OS::strlen (tmp) - 1] = '\0';
-                        tao_yylval.wsval = idl_wstring_escape_reader(tmp + 2);
-                        return IDL_WSTRING_LITERAL;
+                  /* Skip the bookends */
+                  char * const tmp = ACE_OS::strdup (ace_tao_yytext);
+                  for(size_t i = ACE_OS::strlen (tmp); i-- != 0; ) {
+                    if (isspace(tmp[i])) {
+                      tmp[i] = '\0';
+                    }
+                    else {
+                      break;
                     }
-	TAO_YY_BREAK
+                  }
+                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
+                  tao_yylval.wsval = idl_wstring_escape_reader(tmp + 2);
+                  return IDL_WSTRING_LITERAL;
+                }
+        TAO_YY_BREAK
 case 79:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.cval = ace_tao_yytext [1];
-                        return IDL_CHARACTER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.cval = ace_tao_yytext [1];
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 80:
 TAO_YY_RULE_SETUP
 {
-                        // octal character constant
-                        tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-                        return IDL_CHARACTER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  // octal character constant
+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 81:
 TAO_YY_RULE_SETUP
 {
-                        // hexadecimal character constant
-                        tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-                        return IDL_CHARACTER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  // hexadecimal character constant
+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 82:
 TAO_YY_RULE_SETUP
 {
-                        tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-                        return IDL_CHARACTER_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
 case 83:
 TAO_YY_RULE_SETUP
 {
-                        // wide character constant
-                        tao_yylval.wcval = ace_tao_yytext [2];
-                        return IDL_WCHAR_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  // wide character constant
+                  tao_yylval.wcval = ace_tao_yytext [2];
+                  return IDL_WCHAR_LITERAL;
+                }
+        TAO_YY_BREAK
 case 84:
 TAO_YY_RULE_SETUP
 {
-                        // hexadecimal wide character constant
-                        tao_yylval.wcval = idl_wchar_escape_reader(ace_tao_yytext + 2);
-                        return IDL_WCHAR_LITERAL;
-                    }
-	TAO_YY_BREAK
+                  // hexadecimal wide character constant
+                  tao_yylval.wcval = idl_wchar_escape_reader(ace_tao_yytext + 2);
+                  return IDL_WCHAR_LITERAL;
+                }
+        TAO_YY_BREAK
 case 85:
 /* rule 85 can match eol */
 case 86:
 /* rule 86 can match eol */
 TAO_YY_RULE_SETUP
 {/* remember pragma */
-                        idl_global->set_lineno(idl_global->lineno() + 1);
-                        idl_store_pragma(ace_tao_yytext);
-                    }
-	break;
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                  idl_store_pragma(ace_tao_yytext);
+                }
+        break;
 case 87:
 /* rule 87 can match eol */
 case 88:
 /* rule 88 can match eol */
 TAO_YY_RULE_SETUP
 {/* ignore file */
-                        idl_global->set_lineno(idl_global->lineno() + 1);
-                    }
-	break;
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+        break;
 case 89:
 /* rule 89 can match eol */
 case 90:
 /* rule 90 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        idl_parse_line_and_file(ace_tao_yytext);
-                    }
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
         break;
 case 91:
 /* rule 91 can match eol */
@@ -1723,63 +1723,63 @@ case 92:
 /* rule 92 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        idl_parse_line_and_file(ace_tao_yytext);
-                    }
-	break;
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
+        break;
 case 93:
 /* rule 93 can match eol */
 case 94:
 /* rule 94 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        idl_parse_line_and_file(ace_tao_yytext);
-                    }
-	break;
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
+        break;
 case 95:
 /* rule 95 can match eol */
 case 96:
 /* rule 96 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        idl_parse_line_and_file(ace_tao_yytext);
-                    }
-	break;
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
+         break;
 case 97:
 /* rule 97 can match eol */
 case 98:
 /* rule 98 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        /* ignore cpp ident */
-                        idl_global->set_lineno(idl_global->lineno() + 1);
-                    }
+                  /* ignore cpp ident */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
  break;
 case 99:
 /* rule 99 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        /* ignore comments */
-                        idl_global->set_lineno(idl_global->lineno() + 1);
-                    }
+                  /* ignore comments */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
  break;
 case 100:
 TAO_YY_RULE_SETUP
 {
-                        for(;;) {
-                          char const c = tao_yyinput();
-                          if (c == '*') {
-                            char const next = tao_yyinput();
-                            if (next == '/')
-                                break;
-                            else
-                                tao_yyunput(c, 0);
-                          }
-                          else if (c == '\n') {
-                            idl_global->set_lineno(idl_global->lineno() + 1);
-                          }
-                        }
+                  for(;;) {
+                    char const c = tao_yyinput();
+                    if (c == '*') {
+                      char const next = tao_yyinput();
+                      if (next == '/')
+                        break;
+                      else
+                        tao_yyunput(c, 0);
+                    }
+                    else if (c == '\n') {
+                      idl_global->set_lineno(idl_global->lineno() + 1);
                     }
-	TAO_YY_BREAK
+                  }
+                }
+        TAO_YY_BREAK
 case 101:
 TAO_YY_RULE_SETUP
 ;
@@ -1788,374 +1788,374 @@ case 102:
 /* rule 102 can match eol */
 TAO_YY_RULE_SETUP
 {
-                        idl_global->set_lineno(idl_global->lineno() + 1);
-                    }
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
  break;
 case 103:
 TAO_YY_RULE_SETUP
 return ace_tao_yytext [0];
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 104:
 TAO_YY_RULE_SETUP
 TAO_YY_ECHO;
-	break;
+        break;
 case TAO_YY_STATE_EOF(INITIAL):
-	tao_yyterminate();
-
-	case TAO_YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int tao_yy_amount_of_matched_text = (int) (tao_yy_cp - (tao_yytext_ptr)) - 1;
-
-		/* Undo the effects of TAO_YY_DO_BEFORE_ACTION. */
-		*tao_yy_cp = (tao_yy_hold_char);
-		TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
-
-		if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status == TAO_YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed tao_yyin at a new source and called
-			 * tao_yylex().  If so, then we have to assure
-			 * consistency between TAO_YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(tao_yy_n_chars) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars;
-			TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_input_file = tao_yyin;
-			TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status = TAO_YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for tao_yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since tao_yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( (tao_yy_c_buf_p) <= &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)] )
-			{ /* This was really a NUL. */
-			tao_yy_state_type tao_yy_next_state;
-
-			(tao_yy_c_buf_p) = (tao_yytext_ptr) + tao_yy_amount_of_matched_text;
-
-			tao_yy_current_state = tao_yy_get_previous_state(  );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * tao_yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			tao_yy_next_state = tao_yy_try_NUL_trans( tao_yy_current_state );
-
-			tao_yy_bp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
-
-			if ( tao_yy_next_state )
-				{
-				/* Consume the NUL. */
-				tao_yy_cp = ++(tao_yy_c_buf_p);
-				tao_yy_current_state = tao_yy_next_state;
-				goto tao_yy_match;
-				}
-
-			else
-				{
-				tao_yy_cp = (tao_yy_last_accepting_cpos);
-				tao_yy_current_state = (tao_yy_last_accepting_state);
-				goto tao_yy_find_action;
-				}
-			}
-
-		else switch ( tao_yy_get_next_buffer(  ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(tao_yy_did_buffer_switch_on_eof) = 0;
-
-				if ( tao_yywrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * tao_yy_get_next_buffer() to have set up
-					 * tao_yytext, we can now set up
-					 * tao_yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * TAO_YY_NULL, it'll still work - another
-					 * TAO_YY_NULL will get returned.
-					 */
-					(tao_yy_c_buf_p) = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
-
-					tao_yy_act = TAO_YY_STATE_EOF(TAO_YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (tao_yy_did_buffer_switch_on_eof) )
-						TAO_YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(tao_yy_c_buf_p) =
-					(tao_yytext_ptr) + tao_yy_amount_of_matched_text;
-
-				tao_yy_current_state = tao_yy_get_previous_state(  );
-
-				tao_yy_cp = (tao_yy_c_buf_p);
-				tao_yy_bp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
-				goto tao_yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(tao_yy_c_buf_p) =
-				&TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)];
-
-				tao_yy_current_state = tao_yy_get_previous_state(  );
-
-				tao_yy_cp = (tao_yy_c_buf_p);
-				tao_yy_bp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
-				goto tao_yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		TAO_YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
+        tao_yyterminate();
+
+        case TAO_YY_END_OF_BUFFER:
+                {
+                /* Amount of text matched not including the EOB char. */
+                int tao_yy_amount_of_matched_text = (int) (tao_yy_cp - (tao_yytext_ptr)) - 1;
+
+                /* Undo the effects of TAO_YY_DO_BEFORE_ACTION. */
+                *tao_yy_cp = (tao_yy_hold_char);
+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
+
+                if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status == TAO_YY_BUFFER_NEW )
+                        {
+                        /* We're scanning a new file or input source.  It's
+                         * possible that this happened because the user
+                         * just pointed tao_yyin at a new source and called
+                         * tao_yylex().  If so, then we have to assure
+                         * consistency between TAO_YY_CURRENT_BUFFER and our
+                         * globals.  Here is the right place to do so, because
+                         * this is the first action (other than possibly a
+                         * back-up) that will match for the new input source.
+                         */
+                        (tao_yy_n_chars) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars;
+                        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_input_file = tao_yyin;
+                        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status = TAO_YY_BUFFER_NORMAL;
+                        }
+
+                /* Note that here we test for tao_yy_c_buf_p "<=" to the position
+                 * of the first EOB in the buffer, since tao_yy_c_buf_p will
+                 * already have been incremented past the NUL character
+                 * (since all states make transitions on EOB to the
+                 * end-of-buffer state).  Contrast this with the test
+                 * in input().
+                 */
+                if ( (tao_yy_c_buf_p) <= &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)] )
+                        { /* This was really a NUL. */
+                        tao_yy_state_type tao_yy_next_state;
+
+                        (tao_yy_c_buf_p) = (tao_yytext_ptr) + tao_yy_amount_of_matched_text;
+
+                        tao_yy_current_state = tao_yy_get_previous_state(  );
+
+                        /* Okay, we're now positioned to make the NUL
+                         * transition.  We couldn't have
+                         * tao_yy_get_previous_state() go ahead and do it
+                         * for us because it doesn't know how to deal
+                         * with the possibility of jamming (and we don't
+                         * want to build jamming into it because then it
+                         * will run more slowly).
+                         */
+
+                        tao_yy_next_state = tao_yy_try_NUL_trans( tao_yy_current_state );
+
+                        tao_yy_bp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
+
+                        if ( tao_yy_next_state )
+                                {
+                                /* Consume the NUL. */
+                                tao_yy_cp = ++(tao_yy_c_buf_p);
+                                tao_yy_current_state = tao_yy_next_state;
+                                goto tao_yy_match;
+                                }
+
+                        else
+                                {
+                                tao_yy_cp = (tao_yy_last_accepting_cpos);
+                                tao_yy_current_state = (tao_yy_last_accepting_state);
+                                goto tao_yy_find_action;
+                                }
+                        }
+
+                else switch ( tao_yy_get_next_buffer(  ) )
+                        {
+                        case EOB_ACT_END_OF_FILE:
+                                {
+                                (tao_yy_did_buffer_switch_on_eof) = 0;
+
+                                if ( tao_yywrap( ) )
+                                        {
+                                        /* Note: because we've taken care in
+                                         * tao_yy_get_next_buffer() to have set up
+                                         * tao_yytext, we can now set up
+                                         * tao_yy_c_buf_p so that if some total
+                                         * hoser (like flex itself) wants to
+                                         * call the scanner after we return the
+                                         * TAO_YY_NULL, it'll still work - another
+                                         * TAO_YY_NULL will get returned.
+                                         */
+                                        (tao_yy_c_buf_p) = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
+
+                                        tao_yy_act = TAO_YY_STATE_EOF(TAO_YY_START);
+                                        goto do_action;
+                                        }
+
+                                else
+                                        {
+                                        if ( ! (tao_yy_did_buffer_switch_on_eof) )
+                                                TAO_YY_NEW_FILE;
+                                        }
+                                break;
+                                }
+
+                        case EOB_ACT_CONTINUE_SCAN:
+                                (tao_yy_c_buf_p) =
+                                        (tao_yytext_ptr) + tao_yy_amount_of_matched_text;
+
+                                tao_yy_current_state = tao_yy_get_previous_state(  );
+
+                                tao_yy_cp = (tao_yy_c_buf_p);
+                                tao_yy_bp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
+                                goto tao_yy_match;
+
+                        case EOB_ACT_LAST_MATCH:
+                                (tao_yy_c_buf_p) =
+                                &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)];
+
+                                tao_yy_current_state = tao_yy_get_previous_state(  );
+
+                                tao_yy_cp = (tao_yy_c_buf_p);
+                                tao_yy_bp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ;
+                                goto tao_yy_find_action;
+                        }
+                break;
+                }
+
+        default:
+                TAO_YY_FATAL_ERROR(
+                        "fatal flex scanner internal error--no action found" );
+        } /* end of action switch */
+                } /* end of scanning one token */
 } /* end of tao_yylex */
 
 /* tao_yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
+ *        EOB_ACT_LAST_MATCH -
+ *        EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *        EOB_ACT_END_OF_FILE - end of file
  */
 static int tao_yy_get_next_buffer (void)
 {
-    	register char *dest = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf;
-	register char *source = (tao_yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( (tao_yy_c_buf_p) > &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars) + 1] )
-		TAO_YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (tao_yy_c_buf_p) - (tao_yytext_ptr) - TAO_YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((tao_yy_c_buf_p) - (tao_yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status == TAO_YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars) = 0;
-
-	else
-		{
-			int num_to_read =
-			TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			TAO_YY_BUFFER_STATE b = TAO_YY_CURRENT_BUFFER;
-
-			int tao_yy_c_buf_p_offset =
-				(int) ((tao_yy_c_buf_p) - b->tao_yy_ch_buf);
-
-			if ( b->tao_yy_is_our_buffer )
-				{
-				int new_size = b->tao_yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->tao_yy_buf_size += b->tao_yy_buf_size / 8;
-				else
-					b->tao_yy_buf_size *= 2;
-
-				b->tao_yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					tao_yyrealloc((void *) b->tao_yy_ch_buf,b->tao_yy_buf_size + 2  );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->tao_yy_ch_buf = 0;
-
-			if ( ! b->tao_yy_ch_buf )
-				TAO_YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(tao_yy_c_buf_p) = &b->tao_yy_ch_buf[tao_yy_c_buf_p_offset];
-
-			num_to_read = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > TAO_YY_READ_BUF_SIZE )
-			num_to_read = TAO_YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		TAO_YY_INPUT( (&TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[number_to_move]),
-			(tao_yy_n_chars), (size_t) num_to_read );
-
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars);
-		}
-
-	if ( (tao_yy_n_chars) == 0 )
-		{
-		if ( number_to_move == TAO_YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			tao_yyrestart(tao_yyin  );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status =
-				TAO_YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	(tao_yy_n_chars) += number_to_move;
-	TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)] = TAO_YY_END_OF_BUFFER_CHAR;
-	TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars) + 1] = TAO_YY_END_OF_BUFFER_CHAR;
-
-	(tao_yytext_ptr) = &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[0];
+            register char *dest = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf;
+        register char *source = (tao_yytext_ptr);
+        register int number_to_move, i;
+        int ret_val;
+
+        if ( (tao_yy_c_buf_p) > &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars) + 1] )
+                TAO_YY_FATAL_ERROR(
+                "fatal flex scanner internal error--end of buffer missed" );
+
+        if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_fill_buffer == 0 )
+                { /* Don't try to fill the buffer, so this is an EOF. */
+                if ( (tao_yy_c_buf_p) - (tao_yytext_ptr) - TAO_YY_MORE_ADJ == 1 )
+                        {
+                        /* We matched a single character, the EOB, so
+                         * treat this as a final EOF.
+                         */
+                        return EOB_ACT_END_OF_FILE;
+                        }
+
+                else
+                        {
+                        /* We matched some text prior to the EOB, first
+                         * process it.
+                         */
+                        return EOB_ACT_LAST_MATCH;
+                        }
+                }
+
+        /* Try to read more data. */
 
-	return ret_val;
+        /* First move last chars to start of buffer. */
+        number_to_move = (int) ((tao_yy_c_buf_p) - (tao_yytext_ptr)) - 1;
+
+        for ( i = 0; i < number_to_move; ++i )
+                *(dest++) = *(source++);
+
+        if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status == TAO_YY_BUFFER_EOF_PENDING )
+                /* don't do the read, it's not guaranteed to return an EOF,
+                 * just force an EOF
+                 */
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars) = 0;
+
+        else
+                {
+                        int num_to_read =
+                        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size - number_to_move - 1;
+
+                while ( num_to_read <= 0 )
+                        { /* Not enough room in the buffer - grow it. */
+
+                        /* just a shorter name for the current buffer */
+                        TAO_YY_BUFFER_STATE b = TAO_YY_CURRENT_BUFFER;
+
+                        int tao_yy_c_buf_p_offset =
+                                (int) ((tao_yy_c_buf_p) - b->tao_yy_ch_buf);
+
+                        if ( b->tao_yy_is_our_buffer )
+                                {
+                                int new_size = b->tao_yy_buf_size * 2;
+
+                                if ( new_size <= 0 )
+                                        b->tao_yy_buf_size += b->tao_yy_buf_size / 8;
+                                else
+                                        b->tao_yy_buf_size *= 2;
+
+                                b->tao_yy_ch_buf = (char *)
+                                        /* Include room in for 2 EOB chars. */
+                                        tao_yyrealloc((void *) b->tao_yy_ch_buf,b->tao_yy_buf_size + 2  );
+                                }
+                        else
+                                /* Can't grow it, we don't own it. */
+                                b->tao_yy_ch_buf = 0;
+
+                        if ( ! b->tao_yy_ch_buf )
+                                TAO_YY_FATAL_ERROR(
+                                "fatal error - scanner input buffer overflow" );
+
+                        (tao_yy_c_buf_p) = &b->tao_yy_ch_buf[tao_yy_c_buf_p_offset];
+
+                        num_to_read = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size -
+                                                number_to_move - 1;
+
+                        }
+
+                if ( num_to_read > TAO_YY_READ_BUF_SIZE )
+                        num_to_read = TAO_YY_READ_BUF_SIZE;
+
+                /* Read in more data. */
+                TAO_YY_INPUT( (&TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[number_to_move]),
+                        (tao_yy_n_chars), (size_t) num_to_read );
+
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars);
+                }
+
+        if ( (tao_yy_n_chars) == 0 )
+                {
+                if ( number_to_move == TAO_YY_MORE_ADJ )
+                        {
+                        ret_val = EOB_ACT_END_OF_FILE;
+                        tao_yyrestart(tao_yyin  );
+                        }
+
+                else
+                        {
+                        ret_val = EOB_ACT_LAST_MATCH;
+                        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buffer_status =
+                                TAO_YY_BUFFER_EOF_PENDING;
+                        }
+                }
+
+        else
+                ret_val = EOB_ACT_CONTINUE_SCAN;
+
+        (tao_yy_n_chars) += number_to_move;
+        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)] = TAO_YY_END_OF_BUFFER_CHAR;
+        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars) + 1] = TAO_YY_END_OF_BUFFER_CHAR;
+
+        (tao_yytext_ptr) = &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[0];
+
+        return ret_val;
 }
 
 /* tao_yy_get_previous_state - get the state just before the EOB char was reached */
 
     static tao_yy_state_type tao_yy_get_previous_state (void)
 {
-	register tao_yy_state_type tao_yy_current_state;
-	register char *tao_yy_cp;
-
-	tao_yy_current_state = (tao_yy_start);
-	tao_yy_current_state += TAO_YY_AT_BOL();
-
-	for ( tao_yy_cp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ; tao_yy_cp < (tao_yy_c_buf_p); ++tao_yy_cp )
-		{
-		register TAO_YY_CHAR tao_yy_c = (*tao_yy_cp ? tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)] : 1);
-		if ( tao_yy_accept[tao_yy_current_state] )
-			{
-			(tao_yy_last_accepting_state) = tao_yy_current_state;
-			(tao_yy_last_accepting_cpos) = tao_yy_cp;
-			}
-		while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-			{
-			tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-			if ( tao_yy_current_state >= 562 )
-				tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-			}
-		tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-		}
-
-	return tao_yy_current_state;
+        register tao_yy_state_type tao_yy_current_state;
+        register char *tao_yy_cp;
+
+        tao_yy_current_state = (tao_yy_start);
+        tao_yy_current_state += TAO_YY_AT_BOL();
+
+        for ( tao_yy_cp = (tao_yytext_ptr) + TAO_YY_MORE_ADJ; tao_yy_cp < (tao_yy_c_buf_p); ++tao_yy_cp )
+                {
+                register TAO_YY_CHAR tao_yy_c = (*tao_yy_cp ? tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)] : 1);
+                if ( tao_yy_accept[tao_yy_current_state] )
+                        {
+                        (tao_yy_last_accepting_state) = tao_yy_current_state;
+                        (tao_yy_last_accepting_cpos) = tao_yy_cp;
+                        }
+                while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
+                        {
+                        tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
+                        if ( tao_yy_current_state >= 562 )
+                                tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
+                        }
+                tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
+                }
+
+        return tao_yy_current_state;
 }
 
 /* tao_yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
- *	next_state = tao_yy_try_NUL_trans( current_state );
+ *        next_state = tao_yy_try_NUL_trans( current_state );
  */
     static tao_yy_state_type tao_yy_try_NUL_trans  (tao_yy_state_type tao_yy_current_state )
 {
-	register int tao_yy_is_jam;
-    	register char *tao_yy_cp = (tao_yy_c_buf_p);
-
-	register TAO_YY_CHAR tao_yy_c = 1;
-	if ( tao_yy_accept[tao_yy_current_state] )
-		{
-		(tao_yy_last_accepting_state) = tao_yy_current_state;
-		(tao_yy_last_accepting_cpos) = tao_yy_cp;
-		}
-	while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-		{
-		tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-		if ( tao_yy_current_state >= 562 )
-			tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-		}
-	tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-	tao_yy_is_jam = (tao_yy_current_state == 561);
-
-	return tao_yy_is_jam ? 0 : tao_yy_current_state;
+        register int tao_yy_is_jam;
+            register char *tao_yy_cp = (tao_yy_c_buf_p);
+
+        register TAO_YY_CHAR tao_yy_c = 1;
+        if ( tao_yy_accept[tao_yy_current_state] )
+                {
+                (tao_yy_last_accepting_state) = tao_yy_current_state;
+                (tao_yy_last_accepting_cpos) = tao_yy_cp;
+                }
+        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
+                {
+                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
+                if ( tao_yy_current_state >= 562 )
+                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
+                }
+        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
+        tao_yy_is_jam = (tao_yy_current_state == 561);
+
+        return tao_yy_is_jam ? 0 : tao_yy_current_state;
 }
 
     static void tao_yyunput (int c, register char * tao_yy_bp )
 {
-	register char *tao_yy_cp;
+        register char *tao_yy_cp;
 
     tao_yy_cp = (tao_yy_c_buf_p);
 
-	/* undo effects of setting up tao_yytext */
-	*tao_yy_cp = (tao_yy_hold_char);
+        /* undo effects of setting up tao_yytext */
+        *tao_yy_cp = (tao_yy_hold_char);
 
-	if ( tao_yy_cp < TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = (tao_yy_n_chars) + 2;
-		register char *dest = &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[
-					TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size + 2];
-		register char *source =
-				&TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[number_to_move];
+        if ( tao_yy_cp < TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf + 2 )
+                { /* need to shift things up to make room */
+                /* +2 for EOB chars. */
+                register int number_to_move = (tao_yy_n_chars) + 2;
+                register char *dest = &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[
+                                        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size + 2];
+                register char *source =
+                                &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[number_to_move];
 
-		while ( source > TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf )
-			*--dest = *--source;
+                while ( source > TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf )
+                        *--dest = *--source;
 
-		tao_yy_cp += (int) (dest - source);
-		tao_yy_bp += (int) (dest - source);
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars =
-			(tao_yy_n_chars) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size;
+                tao_yy_cp += (int) (dest - source);
+                tao_yy_bp += (int) (dest - source);
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars =
+                        (tao_yy_n_chars) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_size;
 
-		if ( tao_yy_cp < TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf + 2 )
-			TAO_YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
+                if ( tao_yy_cp < TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf + 2 )
+                        TAO_YY_FATAL_ERROR( "flex scanner push-back overflow" );
+                }
 
-	*--tao_yy_cp = (char) c;
+        *--tao_yy_cp = (char) c;
 
-	(tao_yytext_ptr) = tao_yy_bp;
-	(tao_yy_hold_char) = *tao_yy_cp;
-	(tao_yy_c_buf_p) = tao_yy_cp;
+        (tao_yytext_ptr) = tao_yy_bp;
+        (tao_yy_hold_char) = *tao_yy_cp;
+        (tao_yy_c_buf_p) = tao_yy_cp;
 }
 
 #ifndef TAO_YY_NO_INPUT
@@ -2166,73 +2166,73 @@ static int tao_yy_get_next_buffer (void)
 #endif
 
 {
-	int c;
-
-	*(tao_yy_c_buf_p) = (tao_yy_hold_char);
-
-	if ( *(tao_yy_c_buf_p) == TAO_YY_END_OF_BUFFER_CHAR )
-		{
-		/* tao_yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (tao_yy_c_buf_p) < &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)] )
-			/* This was really a NUL. */
-			*(tao_yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			int offset = (tao_yy_c_buf_p) - (tao_yytext_ptr);
-			++(tao_yy_c_buf_p);
-
-			switch ( tao_yy_get_next_buffer(  ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because tao_yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					tao_yyrestart(tao_yyin );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( tao_yywrap( ) )
-						return EOF;
-
-					if ( ! (tao_yy_did_buffer_switch_on_eof) )
-						TAO_YY_NEW_FILE;
+        int c;
+
+        *(tao_yy_c_buf_p) = (tao_yy_hold_char);
+
+        if ( *(tao_yy_c_buf_p) == TAO_YY_END_OF_BUFFER_CHAR )
+                {
+                /* tao_yy_c_buf_p now points to the character we want to return.
+                 * If this occurs *before* the EOB characters, then it's a
+                 * valid NUL; if not, then we've hit the end of the buffer.
+                 */
+                if ( (tao_yy_c_buf_p) < &TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_ch_buf[(tao_yy_n_chars)] )
+                        /* This was really a NUL. */
+                        *(tao_yy_c_buf_p) = '\0';
+
+                else
+                        { /* need more input */
+                        int offset = (tao_yy_c_buf_p) - (tao_yytext_ptr);
+                        ++(tao_yy_c_buf_p);
+
+                        switch ( tao_yy_get_next_buffer(  ) )
+                                {
+                                case EOB_ACT_LAST_MATCH:
+                                        /* This happens because tao_yy_g_n_b()
+                                         * sees that we've accumulated a
+                                         * token and flags that we need to
+                                         * try matching the token before
+                                         * proceeding.  But for input(),
+                                         * there's no matching to consider.
+                                         * So convert the EOB_ACT_LAST_MATCH
+                                         * to EOB_ACT_END_OF_FILE.
+                                         */
+
+                                        /* Reset buffer status. */
+                                        tao_yyrestart(tao_yyin );
+
+                                        /*FALLTHROUGH*/
+
+                                case EOB_ACT_END_OF_FILE:
+                                        {
+                                        if ( tao_yywrap( ) )
+                                                return EOF;
+
+                                        if ( ! (tao_yy_did_buffer_switch_on_eof) )
+                                                TAO_YY_NEW_FILE;
 #ifdef __cplusplus
-					return tao_yyinput();
+                                        return tao_yyinput();
 #else
-					return input();
+                                        return input();
 #endif
-					}
+                                        }
 
-				case EOB_ACT_CONTINUE_SCAN:
-					(tao_yy_c_buf_p) = (tao_yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
+                                case EOB_ACT_CONTINUE_SCAN:
+                                        (tao_yy_c_buf_p) = (tao_yytext_ptr) + offset;
+                                        break;
+                                }
+                        }
+                }
 
-	c = *(unsigned char *) (tao_yy_c_buf_p);	/* cast for 8-bit char's */
-	*(tao_yy_c_buf_p) = '\0';	/* preserve tao_yytext */
-	(tao_yy_hold_char) = *++(tao_yy_c_buf_p);
+        c = *(unsigned char *) (tao_yy_c_buf_p);        /* cast for 8-bit char's */
+        *(tao_yy_c_buf_p) = '\0';        /* preserve tao_yytext */
+        (tao_yy_hold_char) = *++(tao_yy_c_buf_p);
 
-	TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_at_bol = (c == '\n');
+        TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_at_bol = (c == '\n');
 
-	return c;
+        return c;
 }
-#endif	/* ifndef TAO_YY_NO_INPUT */
+#endif        /* ifndef TAO_YY_NO_INPUT */
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
@@ -2242,14 +2242,14 @@ static int tao_yy_get_next_buffer (void)
     void tao_yyrestart  (FILE * input_file )
 {
 
-	if ( ! TAO_YY_CURRENT_BUFFER ){
-          tao_yyensure_buffer_stack ();
-		TAO_YY_CURRENT_BUFFER_LVALUE =
-                tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE );
-	}
+        if ( ! TAO_YY_CURRENT_BUFFER ){
+        tao_yyensure_buffer_stack ();
+                TAO_YY_CURRENT_BUFFER_LVALUE =
+            tao_yy_create_buffer(tao_yyin,TAO_YY_BUF_SIZE );
+        }
 
-	tao_yy_init_buffer(TAO_YY_CURRENT_BUFFER,input_file );
-	tao_yy_load_buffer_state( );
+        tao_yy_init_buffer(TAO_YY_CURRENT_BUFFER,input_file );
+        tao_yy_load_buffer_state( );
 }
 
 /** Switch to a different input buffer.
@@ -2259,40 +2259,40 @@ static int tao_yy_get_next_buffer (void)
     void tao_yy_switch_to_buffer  (TAO_YY_BUFFER_STATE  new_buffer )
 {
 
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		tao_yypop_buffer_state();
-	 *		tao_yypush_buffer_state(new_buffer);
+        /* TODO. We should be able to replace this entire function body
+         * with
+         *                tao_yypop_buffer_state();
+         *                tao_yypush_buffer_state(new_buffer);
      */
-	tao_yyensure_buffer_stack ();
-	if ( TAO_YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( TAO_YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(tao_yy_c_buf_p) = (tao_yy_hold_char);
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_pos = (tao_yy_c_buf_p);
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars);
-		}
-
-	TAO_YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	tao_yy_load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (tao_yywrap()) processing, but the only time this flag
-	 * is looked at is after tao_yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(tao_yy_did_buffer_switch_on_eof) = 1;
+        tao_yyensure_buffer_stack ();
+        if ( TAO_YY_CURRENT_BUFFER == new_buffer )
+                return;
+
+        if ( TAO_YY_CURRENT_BUFFER )
+                {
+                /* Flush out information for old buffer. */
+                *(tao_yy_c_buf_p) = (tao_yy_hold_char);
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_pos = (tao_yy_c_buf_p);
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars);
+                }
+
+        TAO_YY_CURRENT_BUFFER_LVALUE = new_buffer;
+        tao_yy_load_buffer_state( );
+
+        /* We don't actually know whether we did this switch during
+         * EOF (tao_yywrap()) processing, but the only time this flag
+         * is looked at is after tao_yywrap() is called, so it's safe
+         * to go ahead and always set it.
+         */
+        (tao_yy_did_buffer_switch_on_eof) = 1;
 }
 
 static void tao_yy_load_buffer_state  (void)
 {
-    	(tao_yy_n_chars) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars;
-	(tao_yytext_ptr) = (tao_yy_c_buf_p) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_pos;
-	tao_yyin = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_input_file;
-	(tao_yy_hold_char) = *(tao_yy_c_buf_p);
+            (tao_yy_n_chars) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars;
+        (tao_yytext_ptr) = (tao_yy_c_buf_p) = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_pos;
+        tao_yyin = TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_input_file;
+        (tao_yy_hold_char) = *(tao_yy_c_buf_p);
 }
 
 /** Allocate and initialize an input buffer state.
@@ -2303,26 +2303,26 @@ static void tao_yy_load_buffer_state  (void)
  */
     TAO_YY_BUFFER_STATE tao_yy_create_buffer  (FILE * file, int  size )
 {
-	TAO_YY_BUFFER_STATE b;
+        TAO_YY_BUFFER_STATE b;
 
-	b = (TAO_YY_BUFFER_STATE) tao_yyalloc(sizeof( struct tao_yy_buffer_state )  );
-	if ( ! b )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
+        b = (TAO_YY_BUFFER_STATE) tao_yyalloc(sizeof( struct tao_yy_buffer_state )  );
+        if ( ! b )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
 
-	b->tao_yy_buf_size = size;
+        b->tao_yy_buf_size = size;
 
-	/* tao_yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->tao_yy_ch_buf = (char *) tao_yyalloc(b->tao_yy_buf_size + 2  );
-	if ( ! b->tao_yy_ch_buf )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
+        /* tao_yy_ch_buf has to be 2 characters longer than the size given because
+         * we need to put in 2 end-of-buffer characters.
+         */
+        b->tao_yy_ch_buf = (char *) tao_yyalloc(b->tao_yy_buf_size + 2  );
+        if ( ! b->tao_yy_ch_buf )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
 
-	b->tao_yy_is_our_buffer = 1;
+        b->tao_yy_is_our_buffer = 1;
 
-	tao_yy_init_buffer(b,file );
+        tao_yy_init_buffer(b,file );
 
-	return b;
+        return b;
 }
 
 /** Destroy the buffer.
@@ -2332,16 +2332,16 @@ static void tao_yy_load_buffer_state  (void)
     void tao_yy_delete_buffer (TAO_YY_BUFFER_STATE  b )
 {
 
-	if ( ! b )
-		return;
+        if ( ! b )
+                return;
 
-	if ( b == TAO_YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		TAO_YY_CURRENT_BUFFER_LVALUE = (TAO_YY_BUFFER_STATE) 0;
+        if ( b == TAO_YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+                TAO_YY_CURRENT_BUFFER_LVALUE = (TAO_YY_BUFFER_STATE) 0;
 
-	if ( b->tao_yy_is_our_buffer )
-		tao_yyfree((void *) b->tao_yy_ch_buf  );
+        if ( b->tao_yy_is_our_buffer )
+                tao_yyfree((void *) b->tao_yy_ch_buf  );
 
-	tao_yyfree((void *) b  );
+        tao_yyfree((void *) b  );
 }
 
 /* Initializes or reinitializes a buffer.
@@ -2351,25 +2351,25 @@ static void tao_yy_load_buffer_state  (void)
     static void tao_yy_init_buffer  (TAO_YY_BUFFER_STATE  b, FILE * file )
 
 {
-	int oerrno = errno;
+        int oerrno = errno;
 
-	tao_yy_flush_buffer(b );
+        tao_yy_flush_buffer(b );
 
-	b->tao_yy_input_file = file;
-	b->tao_yy_fill_buffer = 1;
+        b->tao_yy_input_file = file;
+        b->tao_yy_fill_buffer = 1;
 
     /* If b is the current buffer, then tao_yy_init_buffer was _probably_
      * called from tao_yyrestart() or through tao_yy_get_next_buffer.
      * In that case, we don't want to reset the lineno or column.
      */
     if (b != TAO_YY_CURRENT_BUFFER){
-          b->tao_yy_bs_lineno = 1;
-          b->tao_yy_bs_column = 0;
+        b->tao_yy_bs_lineno = 1;
+        b->tao_yy_bs_column = 0;
     }
 
-          b->tao_yy_is_interactive = 0;
+        b->tao_yy_is_interactive = 0;
 
-	errno = oerrno;
+        errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, TAO_YY_INPUT will be called.
@@ -2378,25 +2378,25 @@ static void tao_yy_load_buffer_state  (void)
  */
     void tao_yy_flush_buffer (TAO_YY_BUFFER_STATE  b )
 {
-    	if ( ! b )
-		return;
+            if ( ! b )
+                return;
 
-	b->tao_yy_n_chars = 0;
+        b->tao_yy_n_chars = 0;
 
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->tao_yy_ch_buf[0] = TAO_YY_END_OF_BUFFER_CHAR;
-	b->tao_yy_ch_buf[1] = TAO_YY_END_OF_BUFFER_CHAR;
+        /* We always need two end-of-buffer characters.  The first causes
+         * a transition to the end-of-buffer state.  The second causes
+         * a jam in that state.
+         */
+        b->tao_yy_ch_buf[0] = TAO_YY_END_OF_BUFFER_CHAR;
+        b->tao_yy_ch_buf[1] = TAO_YY_END_OF_BUFFER_CHAR;
 
-	b->tao_yy_buf_pos = &b->tao_yy_ch_buf[0];
+        b->tao_yy_buf_pos = &b->tao_yy_ch_buf[0];
 
-	b->tao_yy_at_bol = 1;
-	b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
+        b->tao_yy_at_bol = 1;
+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
 
-	if ( b == TAO_YY_CURRENT_BUFFER )
-		tao_yy_load_buffer_state( );
+        if ( b == TAO_YY_CURRENT_BUFFER )
+                tao_yy_load_buffer_state( );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
@@ -2407,28 +2407,28 @@ static void tao_yy_load_buffer_state  (void)
  */
 void tao_yypush_buffer_state (TAO_YY_BUFFER_STATE new_buffer )
 {
-    	if (new_buffer == 0)
-		return;
+            if (new_buffer == 0)
+                return;
 
-	tao_yyensure_buffer_stack();
+        tao_yyensure_buffer_stack();
 
-	/* This block is copied from tao_yy_switch_to_buffer. */
-	if ( TAO_YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(tao_yy_c_buf_p) = (tao_yy_hold_char);
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_pos = (tao_yy_c_buf_p);
-		TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars);
-		}
+        /* This block is copied from tao_yy_switch_to_buffer. */
+        if ( TAO_YY_CURRENT_BUFFER )
+                {
+                /* Flush out information for old buffer. */
+                *(tao_yy_c_buf_p) = (tao_yy_hold_char);
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_buf_pos = (tao_yy_c_buf_p);
+                TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_n_chars = (tao_yy_n_chars);
+                }
 
-	/* Only push if top exists. Otherwise, replace top. */
-	if (TAO_YY_CURRENT_BUFFER)
-		(tao_yy_buffer_stack_top)++;
-	TAO_YY_CURRENT_BUFFER_LVALUE = new_buffer;
+        /* Only push if top exists. Otherwise, replace top. */
+        if (TAO_YY_CURRENT_BUFFER)
+                (tao_yy_buffer_stack_top)++;
+        TAO_YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
-	/* copied from tao_yy_switch_to_buffer. */
-	tao_yy_load_buffer_state( );
-	(tao_yy_did_buffer_switch_on_eof) = 1;
+        /* copied from tao_yy_switch_to_buffer. */
+        tao_yy_load_buffer_state( );
+        (tao_yy_did_buffer_switch_on_eof) = 1;
 }
 
 /** Removes and deletes the top of the stack, if present.
@@ -2437,18 +2437,18 @@ void tao_yypush_buffer_state (TAO_YY_BUFFER_STATE new_buffer )
  */
 void tao_yypop_buffer_state (void)
 {
-    	if (!TAO_YY_CURRENT_BUFFER)
-		return;
+            if (!TAO_YY_CURRENT_BUFFER)
+                return;
 
-	tao_yy_delete_buffer(TAO_YY_CURRENT_BUFFER );
-	TAO_YY_CURRENT_BUFFER_LVALUE = 0;
-	if ((tao_yy_buffer_stack_top) > 0)
-		--(tao_yy_buffer_stack_top);
+        tao_yy_delete_buffer(TAO_YY_CURRENT_BUFFER );
+        TAO_YY_CURRENT_BUFFER_LVALUE = 0;
+        if ((tao_yy_buffer_stack_top) > 0)
+                --(tao_yy_buffer_stack_top);
 
-	if (TAO_YY_CURRENT_BUFFER) {
-		tao_yy_load_buffer_state( );
-		(tao_yy_did_buffer_switch_on_eof) = 1;
-	}
+        if (TAO_YY_CURRENT_BUFFER) {
+                tao_yy_load_buffer_state( );
+                (tao_yy_did_buffer_switch_on_eof) = 1;
+        }
 }
 
 /* Allocates the stack if it does not exist.
@@ -2456,41 +2456,41 @@ void tao_yypop_buffer_state (void)
  */
 static void tao_yyensure_buffer_stack (void)
 {
-	int num_to_alloc;
-
-	if (!(tao_yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-           */
-		num_to_alloc = 1;
-		(tao_yy_buffer_stack) = (struct tao_yy_buffer_state**)tao_yyalloc
-								(num_to_alloc * sizeof(struct tao_yy_buffer_state*)
-								);
-		
-		memset((tao_yy_buffer_stack), 0, num_to_alloc * sizeof(struct tao_yy_buffer_state*));
-				
-		(tao_yy_buffer_stack_max) = num_to_alloc;
-		(tao_yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((tao_yy_buffer_stack_top) >= ((tao_yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (tao_yy_buffer_stack_max) + grow_size;
-		(tao_yy_buffer_stack) = (struct tao_yy_buffer_state**)tao_yyrealloc
-								((tao_yy_buffer_stack),
-								num_to_alloc * sizeof(struct tao_yy_buffer_state*)
-								);
-
-		/* zero only the new slots.*/
-		memset((tao_yy_buffer_stack) + (tao_yy_buffer_stack_max), 0, grow_size * sizeof(struct tao_yy_buffer_state*));
-		(tao_yy_buffer_stack_max) = num_to_alloc;
-	}
+        int num_to_alloc;
+
+        if (!(tao_yy_buffer_stack)) {
+
+                /* First allocation is just for 2 elements, since we don't know if this
+                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                 * immediate realloc on the next call.
+         */
+                num_to_alloc = 1;
+                (tao_yy_buffer_stack) = (struct tao_yy_buffer_state**)tao_yyalloc
+                                                                (num_to_alloc * sizeof(struct tao_yy_buffer_state*)
+                                                                );
+
+                memset((tao_yy_buffer_stack), 0, num_to_alloc * sizeof(struct tao_yy_buffer_state*));
+
+                (tao_yy_buffer_stack_max) = num_to_alloc;
+                (tao_yy_buffer_stack_top) = 0;
+                return;
+        }
+
+        if ((tao_yy_buffer_stack_top) >= ((tao_yy_buffer_stack_max)) - 1){
+
+                /* Increase the buffer to prepare for a possible push. */
+                int grow_size = 8 /* arbitrary grow size */;
+
+                num_to_alloc = (tao_yy_buffer_stack_max) + grow_size;
+                (tao_yy_buffer_stack) = (struct tao_yy_buffer_state**)tao_yyrealloc
+                                                                ((tao_yy_buffer_stack),
+                                                                num_to_alloc * sizeof(struct tao_yy_buffer_state*)
+                                                                );
+
+                /* zero only the new slots.*/
+                memset((tao_yy_buffer_stack) + (tao_yy_buffer_stack_max), 0, grow_size * sizeof(struct tao_yy_buffer_state*));
+                (tao_yy_buffer_stack_max) = num_to_alloc;
+        }
 }
 
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
@@ -2501,31 +2501,31 @@ static void tao_yyensure_buffer_stack (void)
  */
 TAO_YY_BUFFER_STATE tao_yy_scan_buffer  (char * base, tao_yy_size_t  size )
 {
-	TAO_YY_BUFFER_STATE b;
+        TAO_YY_BUFFER_STATE b;
 
-	if ( size < 2 ||
-	     base[size-2] != TAO_YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != TAO_YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
+        if ( size < 2 ||
+             base[size-2] != TAO_YY_END_OF_BUFFER_CHAR ||
+             base[size-1] != TAO_YY_END_OF_BUFFER_CHAR )
+                /* They forgot to leave room for the EOB's. */
+                return 0;
 
-	b = (TAO_YY_BUFFER_STATE) tao_yyalloc(sizeof( struct tao_yy_buffer_state )  );
-	if ( ! b )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" );
+        b = (TAO_YY_BUFFER_STATE) tao_yyalloc(sizeof( struct tao_yy_buffer_state )  );
+        if ( ! b )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" );
 
-	b->tao_yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->tao_yy_buf_pos = b->tao_yy_ch_buf = base;
-	b->tao_yy_is_our_buffer = 0;
-	b->tao_yy_input_file = 0;
-	b->tao_yy_n_chars = b->tao_yy_buf_size;
-	b->tao_yy_is_interactive = 0;
-	b->tao_yy_at_bol = 1;
-	b->tao_yy_fill_buffer = 0;
-	b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
+        b->tao_yy_buf_size = size - 2;        /* "- 2" to take care of EOB's */
+        b->tao_yy_buf_pos = b->tao_yy_ch_buf = base;
+        b->tao_yy_is_our_buffer = 0;
+        b->tao_yy_input_file = 0;
+        b->tao_yy_n_chars = b->tao_yy_buf_size;
+        b->tao_yy_is_interactive = 0;
+        b->tao_yy_at_bol = 1;
+        b->tao_yy_fill_buffer = 0;
+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
 
-	tao_yy_switch_to_buffer(b  );
+        tao_yy_switch_to_buffer(b  );
 
-	return b;
+        return b;
 }
 
 /** Setup the input buffer state to scan a string. The next call to tao_yylex() will
@@ -2534,12 +2534,12 @@ TAO_YY_BUFFER_STATE tao_yy_scan_buffer  (char * base, tao_yy_size_t  size )
  *
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
- *         tao_yy_scan_bytes() instead.
+ *       tao_yy_scan_bytes() instead.
  */
 TAO_YY_BUFFER_STATE tao_yy_scan_string (tao_yyconst char * tao_yystr )
 {
 
-	return tao_yy_scan_bytes(tao_yystr,strlen(tao_yystr) );
+        return tao_yy_scan_bytes(tao_yystr,strlen(tao_yystr) );
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to tao_yylex() will
@@ -2551,32 +2551,32 @@ TAO_YY_BUFFER_STATE tao_yy_scan_string (tao_yyconst char * tao_yystr )
  */
 TAO_YY_BUFFER_STATE tao_yy_scan_bytes  (tao_yyconst char * tao_yybytes, int  _tao_yybytes_len )
 {
-	TAO_YY_BUFFER_STATE b;
-	char *buf;
-	tao_yy_size_t n;
-	int i;
+        TAO_YY_BUFFER_STATE b;
+        char *buf;
+        tao_yy_size_t n;
+        int i;
 
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _tao_yybytes_len + 2;
-	buf = (char *) tao_yyalloc(n  );
-	if ( ! buf )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_bytes()" );
+        /* Get memory for full buffer, including space for trailing EOB's. */
+        n = _tao_yybytes_len + 2;
+        buf = (char *) tao_yyalloc(n  );
+        if ( ! buf )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_bytes()" );
 
-	for ( i = 0; i < _tao_yybytes_len; ++i )
-		buf[i] = tao_yybytes[i];
+        for ( i = 0; i < _tao_yybytes_len; ++i )
+                buf[i] = tao_yybytes[i];
 
-	buf[_tao_yybytes_len] = buf[_tao_yybytes_len+1] = TAO_YY_END_OF_BUFFER_CHAR;
+        buf[_tao_yybytes_len] = buf[_tao_yybytes_len+1] = TAO_YY_END_OF_BUFFER_CHAR;
 
-	b = tao_yy_scan_buffer(buf,n );
-	if ( ! b )
-		TAO_YY_FATAL_ERROR( "bad buffer in tao_yy_scan_bytes()" );
+        b = tao_yy_scan_buffer(buf,n );
+        if ( ! b )
+                TAO_YY_FATAL_ERROR( "bad buffer in tao_yy_scan_bytes()" );
 
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->tao_yy_is_our_buffer = 1;
+        /* It's okay to grow etc. this buffer, and we should throw it
+         * away when we're done.
+         */
+        b->tao_yy_is_our_buffer = 1;
 
-	return b;
+        return b;
 }
 
 #ifndef TAO_YY_EXIT_FAILURE
@@ -2585,26 +2585,26 @@ TAO_YY_BUFFER_STATE tao_yy_scan_bytes  (tao_yyconst char * tao_yybytes, int  _ta
 
 static void tao_yy_fatal_error (tao_yyconst char* msg )
 {
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( TAO_YY_EXIT_FAILURE );
+            (void) fprintf( stderr, "%s\n", msg );
+        exit( TAO_YY_EXIT_FAILURE );
 }
 
 /* Redefine tao_yyless() so it works in section 3 code. */
 
 #undef tao_yyless
 #define tao_yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up tao_yytext. */ \
-          int tao_yyless_macro_arg = (n); \
-          TAO_YY_LESS_LINENO(tao_yyless_macro_arg);\
-		tao_yytext[tao_yyleng] = (tao_yy_hold_char); \
-		(tao_yy_c_buf_p) = tao_yytext + tao_yyless_macro_arg; \
-		(tao_yy_hold_char) = *(tao_yy_c_buf_p); \
-		*(tao_yy_c_buf_p) = '\0'; \
-		tao_yyleng = tao_yyless_macro_arg; \
-		} \
-	while ( 0 )
+        do \
+                { \
+                /* Undo effects of setting up tao_yytext. */ \
+        int tao_yyless_macro_arg = (n); \
+        TAO_YY_LESS_LINENO(tao_yyless_macro_arg);\
+                tao_yytext[tao_yyleng] = (tao_yy_hold_char); \
+                (tao_yy_c_buf_p) = tao_yytext + tao_yyless_macro_arg; \
+                (tao_yy_hold_char) = *(tao_yy_c_buf_p); \
+                *(tao_yy_c_buf_p) = '\0'; \
+                tao_yyleng = tao_yyless_macro_arg; \
+                } \
+        while ( 0 )
 
 /* Accessor  methods (get/set functions) to struct members. */
 
@@ -2622,7 +2622,7 @@ int tao_yyget_lineno  (void)
  */
 FILE *tao_yyget_in  (void)
 {
-          return tao_yyin;
+        return tao_yyin;
 }
 
 /** Get the output stream.
@@ -2630,7 +2630,7 @@ FILE *tao_yyget_in  (void)
  */
 FILE *tao_yyget_out  (void)
 {
-          return tao_yyout;
+        return tao_yyout;
 }
 
 /** Get the length of the current token.
@@ -2638,7 +2638,7 @@ FILE *tao_yyget_out  (void)
  */
 int tao_yyget_leng  (void)
 {
-          return tao_yyleng;
+        return tao_yyleng;
 }
 
 /** Get the current token.
@@ -2647,7 +2647,7 @@ int tao_yyget_leng  (void)
 
 char *tao_yyget_text  (void)
 {
-          return tao_yytext;
+        return tao_yytext;
 }
 
 /** Set the current line number.
@@ -2668,27 +2668,27 @@ void tao_yyset_lineno (int  line_number )
  */
 void tao_yyset_in (FILE *  in_str )
 {
-          tao_yyin = in_str ;
+        tao_yyin = in_str ;
 }
 
 void tao_yyset_out (FILE *  out_str )
 {
-          tao_yyout = out_str ;
+        tao_yyout = out_str ;
 }
 
 int tao_yyget_debug  (void)
 {
-          return tao_yy_flex_debug;
+        return tao_yy_flex_debug;
 }
 
 void tao_yyset_debug (int  bdebug )
 {
-          tao_yy_flex_debug = bdebug ;
+        tao_yy_flex_debug = bdebug ;
 }
 
 static int tao_yy_init_globals (void)
 {
-          /* Initialization is the same as for the non-reentrant scanner.
+        /* Initialization is the same as for the non-reentrant scanner.
      * This function is called from tao_yylex_destroy(), so don't allocate here.
      */
 
@@ -2719,15 +2719,15 @@ int tao_yylex_destroy  (void)
 {
 
     /* Pop the buffer stack, destroying each element. */
-	while(TAO_YY_CURRENT_BUFFER){
-		tao_yy_delete_buffer(TAO_YY_CURRENT_BUFFER  );
-		TAO_YY_CURRENT_BUFFER_LVALUE = 0;
-		tao_yypop_buffer_state();
-	}
+        while(TAO_YY_CURRENT_BUFFER){
+                tao_yy_delete_buffer(TAO_YY_CURRENT_BUFFER  );
+                TAO_YY_CURRENT_BUFFER_LVALUE = 0;
+                tao_yypop_buffer_state();
+        }
 
-	/* Destroy the stack itself. */
-	tao_yyfree((tao_yy_buffer_stack) );
-	(tao_yy_buffer_stack) = 0;
+        /* Destroy the stack itself. */
+        tao_yyfree((tao_yy_buffer_stack) );
+        (tao_yy_buffer_stack) = 0;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * tao_yylex() is called, initialization will occur. */
@@ -2743,48 +2743,48 @@ int tao_yylex_destroy  (void)
 #ifndef tao_yytext_ptr
 static void tao_yy_flex_strncpy (char* s1, tao_yyconst char * s2, int n )
 {
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
+        register int i;
+        for ( i = 0; i < n; ++i )
+                s1[i] = s2[i];
 }
 #endif
 
 #ifdef TAO_YY_NEED_STRLEN
 static int tao_yy_flex_strlen (tao_yyconst char * s )
 {
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
+        register int n;
+        for ( n = 0; s[n]; ++n )
+                ;
 
-	return n;
+        return n;
 }
 #endif
 
 void *tao_yyalloc (tao_yy_size_t  size )
 {
-	return (void *) malloc( size );
+        return (void *) malloc( size );
 }
 
 void *tao_yyrealloc  (void * ptr, tao_yy_size_t  size )
 {
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
+        /* The cast to (char *) in the following accommodates both
+         * implementations that use char* generic pointers, and those
+         * that use void* generic pointers.  It works with the latter
+         * because both ANSI C and C++ allow castless assignment from
+         * any pointer type to void*, and deal with argument conversions
+         * as though doing an assignment.
+         */
+        return (void *) realloc( (char *) ptr, size );
 }
 
 void tao_yyfree (void * ptr )
 {
-	free( (char *) ptr );	/* see tao_yyrealloc() for (char *) cast */
+        free( (char *) ptr );        /* see tao_yyrealloc() for (char *) cast */
 }
 
 #define TAO_YYTABLES_NAME "tao_yytables"
 
-          /* subroutines */
+        /* subroutines */
 
 static bool
 same_file (char *path1, char *path2)
@@ -2810,11 +2810,11 @@ idl_parse_line_and_file (char *buf)
   // Skip initial '#'.
   if (*r != '#')
     {
-        return;
+      return;
     }
   else
     {
-        r++;
+      r++;
     }
 
   // Check to see if we're running under the screwy Microsoft scheme
@@ -2822,20 +2822,20 @@ idl_parse_line_and_file (char *buf)
 
   if (ACE_OS::strncmp (r, "line", 4) == 0)
     {
-        r += 5;
+      r += 5;
     }
 
   // Find line number.
   while (isspace (*r))
     {
-        r++;
+      r++;
     }
 
   h = r;
 
   for (; isdigit (*r); r++)
     {
-        continue;
+      continue;
     }
 
   *r++ = 0;
@@ -2844,17 +2844,17 @@ idl_parse_line_and_file (char *buf)
   // Find file name, if present.
   for (; *r != '"'; r++)
     {
-        if (*r == '\n' || *r == '\0')
-          {
-            return;
-          }
+      if (*r == '\n' || *r == '\0')
+        {
+          return;
+        }
     }
 
   h = ++r;
 
   for (; *r != '"'; r++)
     {
-        continue;
+      continue;
     }
 
   *r = 0;
@@ -2862,71 +2862,71 @@ idl_parse_line_and_file (char *buf)
 
   if (*h == '\0')
     {
-        ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("IDL: No input files\n")));
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("IDL: No input files\n")));
 
-        throw Bailout ();
+      throw Bailout ();
     }
   else
     {
-        long i;
-        long j;
+      long i;
+      long j;
 
-        // Put Microsoft-style pathnames into a canonical form.
-        for (i = 0, j = 0; h[j] != '\0'; i++, j++)
-          {
-            if (h[j] == '\\' && h[j + 1] == '\\')
-                {
-                  j++;
-                }
+      // Put Microsoft-style pathnames into a canonical form.
+      for (i = 0, j = 0; h[j] != '\0'; i++, j++)
+        {
+          if (h[j] == '\\' && h[j + 1] == '\\')
+            {
+              j++;
+            }
 
-                h[i] = h[j];
-          }
+            h[i] = h[j];
+        }
 
-        h[i] = '\0';
+      h[i] = '\0';
 #if defined (ACE_OPENVMS)
-        // translate this into *nix format as the OpenVMS preprocessor
-        // possibly produced VMS-style paths here.
-        char trans_path[MAXPATHLEN] = "";
-        char *temp_h = IDL_GlobalData::translateName (h, trans_path);
-        if (temp_h) h = temp_h;
+      // translate this into *nix format as the OpenVMS preprocessor
+      // possibly produced VMS-style paths here.
+      char trans_path[MAXPATHLEN] = "";
+      char *temp_h = IDL_GlobalData::translateName (h, trans_path);
+      if (temp_h) h = temp_h;
 #endif
-        ACE_NEW (tmp,
-                   UTL_String (h));
-        idl_global->update_prefix (tmp->get_string ());
-        idl_global->set_filename (tmp);
+      ACE_NEW (tmp,
+               UTL_String (h));
+      idl_global->update_prefix (tmp->get_string ());
+      idl_global->set_filename (tmp);
     }
 
   UTL_String *fname = idl_global->filename ();
   bool in_main_file = false;
   bool is_real_filename
     = fname->compare (idl_global->real_filename ())
-        || same_file (fname->get_string(),
-                          idl_global->real_filename ()->get_string());
+      || same_file (fname->get_string(),
+                    idl_global->real_filename ()->get_string());
 
   bool is_main_filename = false;
   if (!is_real_filename)
     {
 #if defined (ACE_OPENVMS)
-        char full_path[MAXPATHLEN] = "";
-        char *full_fname = ACE_OS::realpath (fname->get_string (), full_path);
-        // I don't see the benefit of using ->compare since this is targeted at IDL identifiers
-        // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really
-        // problematic as filenames retrieved through different mechanisms may give different
-        // casing.
-        is_main_filename = idl_global->path_cmp (idl_global->main_filename ()->get_string (),
-                                                             full_fname) == 0;
+      char full_path[MAXPATHLEN] = "";
+      char *full_fname = ACE_OS::realpath (fname->get_string (), full_path);
+      // I don't see the benefit of using ->compare since this is targeted at IDL identifiers
+      // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really
+      // problematic as filenames retrieved through different mechanisms may give different
+      // casing.
+      is_main_filename = idl_global->path_cmp (idl_global->main_filename ()->get_string (),
+                                               full_fname) == 0;
 #else
-        is_main_filename
-          = fname->compare (idl_global->main_filename ())
-            || same_file (fname->get_string(),
-                                idl_global->main_filename ()->get_string());
+      is_main_filename
+        = fname->compare (idl_global->main_filename ())
+          || same_file (fname->get_string(),
+                        idl_global->main_filename ()->get_string());
 #endif
     }
 
   if (is_real_filename || is_main_filename)
     {
-        in_main_file = true;
+      in_main_file = true;
     }
 
   idl_global->set_in_main_file (in_main_file);
@@ -2935,15 +2935,15 @@ idl_parse_line_and_file (char *buf)
   // by the preprocessor.
   if (!(idl_global->in_main_file ()) && idl_global->import ())
     {
-        ACE_NEW (
-            nm,
-            UTL_String (
-                  idl_global->stripped_preproc_include (fname->get_string ())
-                )
-          );
-
-        // This call also manages the #pragma prefix.
-        idl_global->store_include_file_name (nm);
+      ACE_NEW (
+          nm,
+          UTL_String (
+              idl_global->stripped_preproc_include (fname->get_string ())
+            )
+        );
+
+      // This call also manages the #pragma prefix.
+      idl_global->store_include_file_name (nm);
     }
 }
 
@@ -2957,8 +2957,8 @@ idl_store_pragma (char *buf)
   // Remove all the blanks between the '#' and the 'pragma'.
   while (*sp != 'p')
     {
-        ++sp;
-        ++crunched;
+      ++sp;
+      ++crunched;
     }
 
   char *tp = buf + 1;
@@ -2971,24 +2971,24 @@ idl_store_pragma (char *buf)
   // Intel) don't automatically do.
   while (*sp != '\n')
     {
-        if (*sp == ' ' && (*(sp + 1) == ':' || *(sp + 1) == ' '))
-          {
-            ++crunched;
-          }
-        else if (*sp == ':' && *(sp + 1) == ' ')
-          {
-            *tp = *sp;
-            ++crunched;
-            ++sp;
-            ++tp;
-          }
-        else
-          {
-            *tp = *sp;
-            ++tp;
-          }
+      if (*sp == ' ' && (*(sp + 1) == ':' || *(sp + 1) == ' '))
+        {
+          ++crunched;
+        }
+      else if (*sp == ':' && *(sp + 1) == ' ')
+        {
+          *tp = *sp;
+          ++crunched;
+          ++sp;
+          ++tp;
+        }
+      else
+        {
+          *tp = *sp;
+          ++tp;
+        }
 
-        ++sp;
+      ++sp;
     }
 
   // The '\n' is still <crunched> spaces too far away, with
@@ -2998,205 +2998,205 @@ idl_store_pragma (char *buf)
 
   if (ACE_OS::strstr (buf + 8, "import") != 0)
     {
-        idl_global->set_import (true);
-        return;
+      idl_global->set_import (true);
+      return;
     }
 
   if (ACE_OS::strstr (buf + 8, "include") != 0)
     {
-        idl_global->set_import (false);
-        return;
+      idl_global->set_import (false);
+      return;
     }
 
   if (ACE_OS::strncmp (buf + 8, "prefix", 6) == 0)
     {
-        char *new_prefix = idl_get_pragma_string (buf);
+      char *new_prefix = idl_get_pragma_string (buf);
 
-        if (new_prefix != 0)
-          {
-            unsigned long depth = idl_global->scopes ().depth ();
+      if (new_prefix != 0)
+        {
+          unsigned long depth = idl_global->scopes ().depth ();
 
-            // We replace the prefix only if there is a prefix already
-            // associated with this file, otherwise we add the prefix.
-            char *ext_id = idl_global->filename ()->get_string ();
-            char *int_id = 0;
-            int status = idl_global->file_prefixes ().find (ext_id,
-                                                                            int_id);
+          // We replace the prefix only if there is a prefix already
+          // associated with this file, otherwise we add the prefix.
+          char *ext_id = idl_global->filename ()->get_string ();
+          char *int_id = 0;
+          int status = idl_global->file_prefixes ().find (ext_id,
+                                                          int_id);
 
-            if (status == 0)
+          if (status == 0)
+            {
+              if (ACE_OS::strcmp (int_id, "") != 0)
                 {
-                  if (ACE_OS::strcmp (int_id, "") != 0)
-                    {
-                        char *trash = 0;
-                        idl_global->pragma_prefixes ().pop (trash);
-                        delete [] trash;
-                    }
-                  else if (depth == 1)
-                    {
-                        // Remove the default "" and bind the new prefix.
-                        (void) idl_global->file_prefixes ().unbind (ext_id);
-                        ext_id = ACE::strnew (ext_id);
-                        int_id = ACE::strnew (new_prefix);
-                        (void) idl_global->file_prefixes ().bind (ext_id,
-                                                                                int_id);
-                    }
+                  char *trash = 0;
+                  idl_global->pragma_prefixes ().pop (trash);
+                  delete [] trash;
                 }
-
-            UTL_Scope *top_scope = idl_global->scopes ().top ();
-
-            if (depth > 1)
+              else if (depth == 1)
                 {
-                  top_scope->has_prefix (true);
-                  ScopeAsDecl (top_scope)->prefix_scope (top_scope);
+                  // Remove the default "" and bind the new prefix.
+                  (void) idl_global->file_prefixes ().unbind (ext_id);
+                  ext_id = ACE::strnew (ext_id);
+                  int_id = ACE::strnew (new_prefix);
+                  (void) idl_global->file_prefixes ().bind (ext_id,
+                                                            int_id);
                 }
+            }
 
-            idl_global->pragma_prefixes ().push (new_prefix);
+          UTL_Scope *top_scope = idl_global->scopes ().top ();
 
-            if (depth == 1)
-                {
-                  idl_global->root ()->prefix (new_prefix);
-                }
+          if (depth > 1)
+            {
+              top_scope->has_prefix (true);
+              ScopeAsDecl (top_scope)->prefix_scope (top_scope);
+            }
 
-            if (idl_global->in_main_file ())
-                {
-                  idl_global->root ()->set_imported (false);
-                  top_scope->has_prefix (true);
-                }
+          idl_global->pragma_prefixes ().push (new_prefix);
 
-            if (status != 0)
-                {
-                  ext_id = ACE::strnew (ext_id);
-                  int_id = ACE::strnew (new_prefix);
-                  (void) idl_global->file_prefixes ().bind (ext_id,
-                                                                          int_id);
-                }
-          }
+          if (depth == 1)
+            {
+              idl_global->root ()->prefix (new_prefix);
+            }
+
+          if (idl_global->in_main_file ())
+            {
+              idl_global->root ()->set_imported (false);
+              top_scope->has_prefix (true);
+            }
+
+          if (status != 0)
+            {
+              ext_id = ACE::strnew (ext_id);
+              int_id = ACE::strnew (new_prefix);
+              (void) idl_global->file_prefixes ().bind (ext_id,
+                                                        int_id);
+            }
+        }
     }
   else if (ACE_OS::strncmp (buf + 8, "version", 7) == 0)
     {
-        char *tmp = buf + 16;
+      char *tmp = buf + 16;
 
-        while (*tmp == ' ' || *tmp == '\t')
-          {
-            ++tmp;
-          }
+      while (*tmp == ' ' || *tmp == '\t')
+        {
+          ++tmp;
+        }
 
-        char *number = ACE_OS::strchr (tmp, ' ');
+      char *number = ACE_OS::strchr (tmp, ' ');
 
-        if (number == 0)
-          {
-            number = ACE_OS::strchr (tmp, '\t');
-          }
+      if (number == 0)
+        {
+          number = ACE_OS::strchr (tmp, '\t');
+        }
 
-        // Most likely this means there is only a version number
-        // without an identifier to apply it to.
-        if (number == 0)
-          {
-            const char *msg = "no identifier or scoped name";
-            idl_global->err ()->version_syntax_error (msg);
-            return;
-          }
+      // Most likely this means there is only a version number
+      // without an identifier to apply it to.
+      if (number == 0)
+        {
+          const char *msg = "no identifier or scoped name";
+          idl_global->err ()->version_syntax_error (msg);
+          return;
+        }
 
-        while (*number == ' ' || *number == '\t')
-          {
-            ++number;
-          }
+      while (*number == ' ' || *number == '\t')
+        {
+          ++number;
+        }
 
-        size_t len = ACE_OS::strlen (number);
+      size_t len = ACE_OS::strlen (number);
 
-        // For some reason, the SunCC preprocessor adds a trailing space, which
-        // messes with idl_valid_version() below, so we check and remove.
-        while (number[len - 1] == ' ')
-          {
-            number[len - 1] = '\0';
-            len = ACE_OS::strlen (number);
-          }
+      // For some reason, the SunCC preprocessor adds a trailing space, which
+      // messes with idl_valid_version() below, so we check and remove.
+      while (number[len - 1] == ' ')
+        {
+          number[len - 1] = '\0';
+          len = ACE_OS::strlen (number);
+        }
 
-        // This call adds a proper null terminator to tmp, so no need to
-        // do it here.
-        AST_Decl *d = idl_find_node (tmp);
+      // This call adds a proper null terminator to tmp, so no need to
+      // do it here.
+      AST_Decl *d = idl_find_node (tmp);
 
-        if (d == 0)
-          {
-            return;
-          }
+      if (d == 0)
+        {
+          return;
+        }
 
-        if (!idl_valid_version (number))
-          {
-            idl_global->err ()->version_number_error (number);
-            return;
-          }
+      if (!idl_valid_version (number))
+        {
+          idl_global->err ()->version_number_error (number);
+          return;
+        }
 
-        d->version (ACE::strnew (number));
+      d->version (ACE::strnew (number));
     }
   else if (ACE_OS::strncmp (buf + 8, "ident", 5) == 0)
     {
-        idl_global->ident_string (buf + 8);
+      idl_global->ident_string (buf + 8);
     }
   else if (ACE_OS::strncmp (buf + 8, "ID", 2) == 0)
     {
-        char *tmp = buf + 11;
+      char *tmp = buf + 11;
 
-        while (*tmp == ' ')
-          {
-            ++tmp;
-          }
+      while (*tmp == ' ')
+        {
+          ++tmp;
+        }
 
-        AST_Decl *d = idl_find_node (tmp);
+      AST_Decl *d = idl_find_node (tmp);
 
-        if (d == 0)
-          {
-            return;
-          }
+      if (d == 0)
+        {
+          return;
+        }
 
-        char *new_id = idl_get_pragma_string (buf);
+      char *new_id = idl_get_pragma_string (buf);
 
-        if (new_id != 0)
-          {
-            if (d->typeid_set ())
-                {
-                  idl_global->err ()->id_reset_error (d->repoID (),
-                                                                  new_id);
-                  return;
-                }
+      if (new_id != 0)
+        {
+          if (d->typeid_set ())
+            {
+              idl_global->err ()->id_reset_error (d->repoID (),
+                                                  new_id);
+              return;
+            }
 
-            d->repoID (new_id);
-            d->typeid_set (true);
-          }
+          d->repoID (new_id);
+          d->typeid_set (true);
+        }
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_TYPE", 14) == 0)
     {
-        char *sample_type = idl_get_pragma_string (buf);
-        idl_global->add_dcps_data_type (sample_type);
+      char *sample_type = idl_get_pragma_string (buf);
+      idl_global->add_dcps_data_type (sample_type);
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_KEY", 13) == 0)
     {
-        char *tmp = idl_get_pragma_string (buf);
+      char *tmp = idl_get_pragma_string (buf);
 
-        // split up data type and key strings
-        char *sample_type = tmp;
-        while (*tmp && !isspace (*tmp))
+      // split up data type and key strings
+      char *sample_type = tmp;
+      while (*tmp && !isspace (*tmp))
+        tmp++;
+      while (isspace (*tmp))
+        {
+          *tmp = '\0';
           tmp++;
-        while (isspace (*tmp))
-          {
-            *tmp = '\0';
-            tmp++;
-          }
-        char *key = tmp;
+        }
+      char *key = tmp;
 
-        if (!idl_global->add_dcps_data_key (sample_type, key))
-          {
-            ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%C\" not found for key \"%C\"\n",
-                sample_type, key));
-          }
+      if (!idl_global->add_dcps_data_key (sample_type, key))
+        {
+          ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%s\" not found for key \"%s\"\n",
+            sample_type, key));
+        }
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_SUPPORT_ZERO_COPY_READ", 27) == 0)
     {
-        idl_global->dcps_support_zero_copy_read (true);
+      idl_global->dcps_support_zero_copy_read (true);
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_GEN_ZERO_COPY_READ", 23) == 0)
     {
-        idl_global->dcps_gen_zero_copy_read (true);
+      idl_global->dcps_gen_zero_copy_read (true);
     }
 }
 
@@ -3211,36 +3211,36 @@ idl_atoi(char *s, long b)
   // Skip over the dash and possibly spaces after the dash
   while (*s == '-' || *s == ' ' || *s == '\t')
     {
-        s++;
+      s++;
     }
 
   if (b == 8 && *s == '0')
     {
-        s++;
+      s++;
     }
   else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
     {
-        s += 2;
+      s += 2;
     }
 
   for (; *s; ++s)
     {
-        if (*s <= '9' && *s >= '0')
-          {
-            r = (r * b) + (*s - '0');
-          }
-        else if (b > 10 && *s <= 'f' && *s >= 'a')
-          {
-            r = (r * b) + (*s - 'a' + 10);
-          }
-        else if (b > 10 && *s <= 'F' && *s >= 'A')
-          {
-            r = (r * b) + (*s - 'A' + 10);
-          }
-        else
-          {
-            break;
-          }
+      if (*s <= '9' && *s >= '0')
+        {
+          r = (r * b) + (*s - '0');
+        }
+      else if (b > 10 && *s <= 'f' && *s >= 'a')
+        {
+          r = (r * b) + (*s - 'a' + 10);
+        }
+      else if (b > 10 && *s <= 'F' && *s >= 'A')
+        {
+          r = (r * b) + (*s - 'A' + 10);
+        }
+      else
+        {
+          break;
+        }
     }
 
   return -r;
@@ -3256,31 +3256,31 @@ idl_atoui(char *s, long b)
 
   if (b == 8 && *s == '0')
     {
-        s++;
+      s++;
     }
   else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
     {
-        s += 2;
+      s += 2;
     }
 
   for (; *s; ++s)
     {
-        if (*s <= '9' && *s >= '0')
-          {
-            r = (r * b) + (*s - '0');
-          }
-        else if (b > 10 && *s <= 'f' && *s >= 'a')
-          {
-            r = (r * b) + (*s - 'a' + 10);
-          }
-        else if (b > 10 && *s <= 'F' && *s >= 'A')
-          {
-            r = (r * b) + (*s - 'A' + 10);
-          }
-        else
-          {
-            break;
-          }
+      if (*s <= '9' && *s >= '0')
+        {
+          r = (r * b) + (*s - '0');
+        }
+      else if (b > 10 && *s <= 'f' && *s >= 'a')
+        {
+          r = (r * b) + (*s - 'a' + 10);
+        }
+      else if (b > 10 && *s <= 'F' && *s >= 'A')
+        {
+          r = (r * b) + (*s - 'A' + 10);
+        }
+      else
+        {
+          break;
+        }
     }
 
   return r;
@@ -3298,74 +3298,74 @@ idl_atof (char *s)
 
   if (*s == '-')
     {
-        neg = 1;
+      neg = 1;
 
-        // Skip over the dash and possibly spaces after the dash
-        while (*s == '-' || *s == ' ' || *s == '\t')
-          {
-            s++;
-          }
+      // Skip over the dash and possibly spaces after the dash
+      while (*s == '-' || *s == ' ' || *s == '\t')
+        {
+          s++;
+        }
     }
 
   while (*s >= '0' && *s <= '9')
     {
-        d = (d * 10) + *s - '0';
-        s++;
+      d = (d * 10) + *s - '0';
+      s++;
     }
 
   if (*s == '.')
     {
-        s++;
-        e = 10;
+      s++;
+      e = 10;
 
-        while (*s >= '0' && *s <= '9')
-          {
-            d += (*s - '0') / (e * 1.0);
-            e *= 10;
-            s++;
-          }
+      while (*s >= '0' && *s <= '9')
+        {
+          d += (*s - '0') / (e * 1.0);
+          e *= 10;
+          s++;
+        }
     }
 
   if (*s == 'e' || *s == 'E')
     {
-        s++;
+      s++;
 
-        if (*s == '-')
-          {
-                negexp = 1;
-                s++;
-          }
-        else if (*s == '+')
-          {
+      if (*s == '-')
+        {
+            negexp = 1;
             s++;
-          }
+        }
+      else if (*s == '+')
+        {
+          s++;
+        }
 
-        e = 0;
+      e = 0;
 
-        while (*s >= '0' && *s <= '9')
-          {
-            e = (e * 10) + *s - '0';
-            s++;
-          }
+      while (*s >= '0' && *s <= '9')
+        {
+          e = (e * 10) + *s - '0';
+          s++;
+        }
 
-        if (e > 0)
-          {
-            for (k = 1; e > 0; k *= 10, e--) ;
+      if (e > 0)
+        {
+          for (k = 1; e > 0; k *= 10, e--) ;
 
-            if (negexp)
-                {
-                  d /= k;
-                }
-            else
-                {
-                  d *= k;
-                }
-          }
+          if (negexp)
+            {
+              d /= k;
+            }
+          else
+            {
+              d *= k;
+            }
+        }
     }
 
   if (neg)
     {
-        d *= -1.0;
+      d *= -1.0;
     }
 
   return d;
@@ -3381,72 +3381,72 @@ idl_escape_reader(
 {
   if (str[0] != '\\')
     {
-                return str[0];
+            return str[0];
     }
 
   switch (str[1])
   {
     case 'n':
-        return '\n';
+      return '\n';
     case 't':
-        return '\t';
+      return '\t';
     case 'v':
-        return '\v';
+      return '\v';
     case 'b':
-        return '\b';
+      return '\b';
     case 'r':
-        return '\r';
+      return '\r';
     case 'f':
-        return '\f';
+      return '\f';
     case 'a':
-        return '\a';
+      return '\a';
     case '\\':
-        return '\\';
+      return '\\';
     case '\?':
-        return '?';
+      return '?';
     case '\'':
-        return '\'';
+      return '\'';
     case '"':
-        return '"';
+      return '"';
     case 'x':
+      {
+        int i;
+
+        // hex value
+        for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i)
+          {
+            continue;
+          }
+
+        char save = str[i];
+        str[i] = '\0';
+        char out = (char)idl_atoui(&str[2], 16);
+        str[i] = save;
+        return out;
+      }
+      ACE_NOTREACHED (break;)
+    default:
+      // check for octal value
+      if (str[1] >= '0' && str[1] <= '7')
         {
           int i;
 
-          // hex value
-          for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i)
+          for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
             {
-                continue;
+              continue;
             }
 
           char save = str[i];
           str[i] = '\0';
-          char out = (char)idl_atoui(&str[2], 16);
+          char out = (char)idl_atoui(&str[1], 8);
           str[i] = save;
           return out;
         }
-        ACE_NOTREACHED (break;)
-    default:
-        // check for octal value
-        if (str[1] >= '0' && str[1] <= '7')
-          {
-            int i;
-
-            for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
-                {
-                  continue;
-                }
-
-            char save = str[i];
-            str[i] = '\0';
-            char out = (char)idl_atoui(&str[1], 8);
-            str[i] = save;
-            return out;
-          }
-        else
-          {
-            return str[1] - 'a';
-          }
-        ACE_NOTREACHED  (break;)
+      else
+        {
+          return str[1] - 'a';
+        }
+      ACE_NOTREACHED  (break;)
   }
 }
 /*
@@ -3457,14 +3457,14 @@ idl_wchar_escape_reader (char *str)
 {
   if (str[0] != '\\' || str[1] != 'u')
     {
-        return 0;
+      return 0;
     }
 
   int i;
   // get the hex digits
   for (i = 2; str[i] != '\0' && isxdigit (str[i]); i++)
     {
-        continue;
+      continue;
     }
   char save = str[i];
   str[i] = '\0';
@@ -3490,11 +3490,11 @@ idl_get_pragma_string (char *pragma)
 
   if (firstquote == 0)
     {
-        idl_global->err ()->syntax_error (
-            IDL_GlobalData::PS_PragmaPrefixSyntax
-          );
+      idl_global->err ()->syntax_error (
+          IDL_GlobalData::PS_PragmaPrefixSyntax
+        );
 
-        return 0;
+      return 0;
     }
 
   const char *start = firstquote + 1;
@@ -3502,23 +3502,23 @@ idl_get_pragma_string (char *pragma)
 
   if (end == 0)
     {
-        idl_global->err ()->syntax_error (
-            IDL_GlobalData::PS_PragmaPrefixSyntax
-          );
+      idl_global->err ()->syntax_error (
+          IDL_GlobalData::PS_PragmaPrefixSyntax
+        );
 
-        return 0;
+      return 0;
     }
 
   int len = end - start;
   char *retval = 0;
 
   ACE_NEW_RETURN (retval,
-                        char[len + 1],
-                        0);
+                  char[len + 1],
+                  0);
 
   ACE_OS::strncpy (retval,
-                         start,
-                         len);
+                   start,
+                   len);
 
   retval[len] = '\0';
   return retval;
@@ -3530,7 +3530,7 @@ idl_valid_version (char *s)
   // Nothing preceding decimal point.
   if (*s == '.')
     {
-        return 0;
+      return 0;
     }
 
   char *minor = ACE_OS::strchr (s, '.');
@@ -3538,41 +3538,41 @@ idl_valid_version (char *s)
 
   if (minor == 0)
     {
-        // No decimal point.
-        return 0;
+      // No decimal point.
+      return 0;
     }
 
   if (*(minor + 1) == '\0')
     {
-        // Nothing following decimal point.
-        return 0;
+      // Nothing following decimal point.
+      return 0;
     }
 
   char *tmp = minor + 1;
 
   for (i = 0; tmp[i] != '\0'; ++i)
     {
-        if (!isdigit (tmp[i]))
-          {
-            return 0;
-          }
+      if (!isdigit (tmp[i]))
+        {
+          return 0;
+        }
     }
 
   ptrdiff_t const len = minor - s;
 
   for (i = 0; i < len; ++i)
     {
-        if (!isdigit (s[i]))
-          {
-            return 0;
-          }
+      if (!isdigit (s[i]))
+        {
+          return 0;
+        }
     }
 
   // Major and minor version numbers must be unsigned shorts.
   if (ACE_OS::atoi (minor + 1) > ACE_UINT16_MAX
-        || ACE_OS::atoi (s) > ACE_UINT16_MAX)
+      || ACE_OS::atoi (s) > ACE_UINT16_MAX)
     {
-        return 0;
+      return 0;
     }
 
   return 1;
@@ -3586,16 +3586,16 @@ idl_find_node (char *s)
 
   if (node != 0)
     {
-        d = idl_global->scopes ().top_non_null ()->lookup_by_name (node,
-                                                                                     true);
+      d = idl_global->scopes ().top_non_null ()->lookup_by_name (node,
+                                                                 true);
 
-        if (d == 0)
-          {
-            idl_global->err ()->lookup_error (node);
-          }
+      if (d == 0)
+        {
+          idl_global->err ()->lookup_error (node);
+        }
 
-        node->destroy ();
-        delete node;
+      node->destroy ();
+      delete node;
     }
 
   return d;
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 8d7df259bf8..a71d990eeeb 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,7 +1,7 @@
 // $Id$
-/* A Bison parser, made by GNU Bison 1.875c.  */
+/*  A Bison parser, made by GNU Bison 1.875d.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
+/*   Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -46,8 +46,6 @@
 /* Using locations.  */
 #define TAO_YYLSP_NEEDED 0
 
-
-
 /* Tokens.  */
 #ifndef TAO_YYTOKENTYPE
 # define TAO_YYTOKENTYPE
@@ -336,13 +334,6 @@ typedef union TAO_YYSTYPE {
 
 #if ! defined (tao_yyoverflow) || TAO_YYERROR_VERBOSE
 
-# ifndef TAO_YYFREE
-#  define TAO_YYFREE free
-# endif
-# ifndef TAO_YYMALLOC
-#  define TAO_YYMALLOC malloc
-# endif
-
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef TAO_YYSTACK_USE_ALLOCA
@@ -367,8 +358,8 @@ typedef union TAO_YYSTYPE {
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define TAO_YYSIZE_T size_t
 #  endif
-#  define TAO_YYSTACK_ALLOC TAO_YYMALLOC
-#  define TAO_YYSTACK_FREE TAO_YYFREE
+#  define TAO_YYSTACK_ALLOC malloc
+#  define TAO_YYSTACK_FREE free
 # endif
 #endif /* ! defined (tao_yyoverflow) || TAO_YYERROR_VERBOSE */
 
@@ -685,48 +676,48 @@ static const unsigned short tao_yyrline[] =
      457,   483,   488,   451,   504,   505,   510,   549,   554,   509,
      572,   571,   585,   623,   654,   688,   687,   699,   706,   707,
      708,   709,   713,   724,   729,   773,   778,   728,   807,   846,
-     851,   805,   870,   868,   908,   907,   921,   927,   934,   941,
-     948,   974,  1001,  1066,  1067,  1071,  1072,  1073,  1079,  1078,
-    1086,  1085,  1095,  1096,  1101,  1100,  1111,  1110,  1121,  1120,
-    1131,  1130,  1141,  1140,  1151,  1150,  1161,  1160,  1171,  1170,
-    1184,  1197,  1195,  1225,  1232,  1243,  1242,  1270,  1268,  1295,
-    1307,  1353,  1381,  1412,  1417,  1422,  1427,  1411,  1480,  1481,
-    1482,  1483,  1484,  1485,  1486,  1498,  1503,  1578,  1580,  1582,
-    1583,  1597,  1598,  1612,  1613,  1626,  1627,  1637,  1650,  1651,
-    1661,  1674,  1675,  1685,  1695,  1708,  1709,  1719,  1729,  1742,
-    1777,  1778,  1787,  1792,  1799,  1807,  1812,  1817,  1823,  1828,
-    1833,  1841,  1913,  1912,  1922,  1927,  1932,  1937,  1964,  1973,
-    1972,  2043,  2044,  2048,  2056,  2057,  2085,  2086,  2087,  2088,
-    2089,  2090,  2091,  2092,  2096,  2097,  2098,  2102,  2103,  2104,
-    2108,  2109,  2113,  2126,  2124,  2154,  2161,  2162,  2166,  2179,
-    2177,  2207,  2214,  2231,  2250,  2251,  2255,  2260,  2265,  2273,
-    2278,  2283,  2291,  2296,  2301,  2309,  2323,  2328,  2336,  2344,
-    2352,  2360,  2369,  2368,  2384,  2418,  2423,  2383,  2442,  2445,
-    2446,  2450,  2450,  2460,  2465,  2459,  2528,  2527,  2542,  2541,
-    2556,  2561,  2566,  2571,  2618,  2623,  2555,  2647,  2655,  2669,
-    2679,  2687,  2688,  2796,  2799,  2800,  2805,  2810,  2804,  2846,
-    2845,  2859,  2870,  2892,  2900,  2899,  2915,  2920,  2914,  2937,
-    2936,  2989,  3013,  3038,  3043,  3076,  3081,  3037,  3107,  3112,
-    3110,  3117,  3121,  3158,  3163,  3156,  3230,  3285,  3295,  3284,
-    3310,  3315,  3308,  3356,  3382,  3392,  3397,  3390,  3427,  3452,
-    3461,  3460,  3496,  3507,  3529,  3537,  3542,  3536,  3579,  3580,
-    3585,  3590,  3595,  3600,  3584,  3669,  3674,  3679,  3684,  3668,
-    3762,  3767,  3797,  3802,  3761,  3820,  3825,  3878,  3883,  3818,
-    3920,  3926,  3933,  3940,  3941,  3953,  3959,  4001,  3952,  4023,
-    4022,  4033,  4032,  4045,  4050,  4048,  4055,  4060,  4065,  4059,
-    4106,  4105,  4116,  4115,  4128,  4133,  4131,  4138,  4143,  4148,
-    4142,  4195,  4203,  4204,  4205,  4293,  4298,  4303,  4312,  4317,
-    4311,  4329,  4337,  4342,  4336,  4354,  4362,  4367,  4361,  4379,
-    4387,  4392,  4386,  4404,  4411,  4424,  4422,  4450,  4457,  4486,
-    4524,  4525,  4529,  4559,  4599,  4604,  4558,  4623,  4628,  4621,
-    4670,  4669,  4680,  4687,  4688,  4693,  4692,  4703,  4702,  4713,
-    4712,  4723,  4722,  4733,  4732,  4743,  4742,  4755,  4820,  4827,
-    4852,  4926,  4932,  4939,  4998,  5057,  5117,  5116,  5166,  5171,
-    5176,  5181,  5186,  5191,  5165,  5245,  5244,  5255,  5262,  5269,
-    5277,  5282,  5276,  5294,  5295,  5299,  5301,  5300,  5311,  5310,
-    5325,  5361,  5323,  5395,  5431,  5393,  5463,  5464,  5465,  5469,
-    5470,  5474,  5502,  5533,  5578,  5583,  5531,  5600,  5610,  5629,
-    5641,  5640,  5680,  5730,  5735,  5678,  5752,  5757
+     851,   805,   870,   868,   919,   918,   932,   938,   945,   952,
+     959,   985,  1012,  1067,  1068,  1072,  1073,  1074,  1080,  1079,
+    1087,  1086,  1096,  1097,  1102,  1101,  1112,  1111,  1122,  1121,
+    1132,  1131,  1142,  1141,  1152,  1151,  1162,  1161,  1172,  1171,
+    1185,  1198,  1196,  1226,  1233,  1244,  1243,  1271,  1269,  1296,
+    1308,  1354,  1382,  1413,  1418,  1423,  1428,  1412,  1481,  1482,
+    1483,  1484,  1485,  1486,  1487,  1499,  1504,  1579,  1581,  1583,
+    1584,  1598,  1599,  1613,  1614,  1627,  1628,  1638,  1651,  1652,
+    1662,  1675,  1676,  1686,  1696,  1709,  1710,  1720,  1730,  1743,
+    1778,  1779,  1788,  1793,  1800,  1808,  1813,  1818,  1824,  1829,
+    1834,  1842,  1914,  1913,  1923,  1928,  1933,  1938,  1965,  1974,
+    1973,  2032,  2033,  2037,  2045,  2046,  2074,  2075,  2076,  2077,
+    2078,  2079,  2080,  2081,  2085,  2086,  2087,  2091,  2092,  2093,
+    2097,  2098,  2102,  2115,  2113,  2143,  2150,  2151,  2155,  2168,
+    2166,  2196,  2203,  2220,  2239,  2240,  2244,  2249,  2254,  2262,
+    2267,  2272,  2280,  2285,  2290,  2298,  2312,  2317,  2325,  2333,
+    2341,  2349,  2358,  2357,  2373,  2407,  2412,  2372,  2431,  2434,
+    2435,  2439,  2439,  2449,  2454,  2448,  2517,  2516,  2531,  2530,
+    2545,  2550,  2555,  2560,  2607,  2612,  2544,  2636,  2644,  2658,
+    2668,  2676,  2677,  2785,  2788,  2789,  2794,  2799,  2793,  2835,
+    2834,  2848,  2859,  2881,  2889,  2888,  2904,  2909,  2903,  2926,
+    2925,  2978,  3002,  3027,  3032,  3065,  3070,  3026,  3096,  3101,
+    3099,  3106,  3110,  3147,  3152,  3145,  3219,  3274,  3284,  3273,
+    3299,  3304,  3297,  3345,  3369,  3379,  3384,  3377,  3414,  3437,
+    3446,  3445,  3481,  3492,  3514,  3522,  3527,  3521,  3564,  3565,
+    3570,  3575,  3580,  3585,  3569,  3654,  3659,  3664,  3669,  3653,
+    3747,  3752,  3782,  3787,  3746,  3805,  3810,  3863,  3868,  3803,
+    3905,  3911,  3918,  3925,  3926,  3938,  3944,  3986,  3937,  4008,
+    4007,  4018,  4017,  4030,  4035,  4033,  4040,  4045,  4050,  4044,
+    4091,  4090,  4101,  4100,  4113,  4118,  4116,  4123,  4128,  4133,
+    4127,  4180,  4188,  4189,  4190,  4233,  4238,  4243,  4252,  4257,
+    4251,  4269,  4277,  4282,  4276,  4294,  4302,  4307,  4301,  4319,
+    4327,  4332,  4326,  4344,  4351,  4364,  4362,  4390,  4397,  4426,
+    4464,  4465,  4469,  4499,  4539,  4544,  4498,  4563,  4568,  4561,
+    4610,  4609,  4620,  4627,  4628,  4633,  4632,  4643,  4642,  4653,
+    4652,  4663,  4662,  4673,  4672,  4683,  4682,  4695,  4759,  4766,
+    4791,  4864,  4870,  4877,  4935,  4993,  5052,  5051,  5101,  5106,
+    5111,  5116,  5121,  5126,  5100,  5180,  5179,  5190,  5197,  5204,
+    5212,  5217,  5211,  5229,  5230,  5234,  5236,  5235,  5246,  5245,
+    5260,  5296,  5258,  5330,  5366,  5328,  5398,  5399,  5400,  5404,
+    5405,  5409,  5437,  5468,  5513,  5518,  5466,  5535,  5545,  5564,
+    5576,  5575,  5626,  5676,  5681,  5624,  5698,  5703
 };
 #endif
 
@@ -2559,7 +2550,7 @@ tao_yyreduce:
     {
 // valuetype : IDL_CUSTOM value_concrete_decl
            ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("error in %C line %d\n"),
+                       ACE_TEXT ("error in %s line %d\n"),
                        idl_global->filename ()->get_string (),
                        idl_global->lineno ()));
            ACE_DEBUG ((LM_DEBUG,
@@ -4286,7 +4277,7 @@ tao_yyreduce:
     {
 // fixed_type : IDL_FIXED
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("error in %C line %d\n"),
+                      ACE_TEXT ("error in %s line %d\n"),
                       idl_global->filename ()->get_string (),
                       idl_global->lineno ()));
           ACE_DEBUG ((LM_DEBUG,
@@ -5439,7 +5430,7 @@ tao_yyreduce:
            * Create a node representing a string.
            */
           ACE_CDR::ULong bound = 0UL;
-
+          
           tao_yyval.dcval =
             idl_global->gen ()->create_string (
                 idl_global->gen ()->create_expr (bound,
@@ -5519,7 +5510,7 @@ tao_yyreduce:
            * Create a node representing a wstring.
            */
           ACE_CDR::ULong bound = 0UL;
-
+          
           tao_yyval.dcval =
             idl_global->gen ()->create_wstring (
                 idl_global->gen ()->create_expr (bound,
@@ -6112,7 +6103,7 @@ tao_yyreduce:
             {
               //@@ Fire error
               ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("error in %C line %d:\n")
+                          ACE_TEXT ("error in %s line %d:\n")
                           ACE_TEXT ("Abstract valuetype can't have a ")
                           ACE_TEXT ("factory construct.\n"),
                           idl_global->filename ()->get_string (),
@@ -6397,7 +6388,7 @@ tao_yyreduce:
             {
               d->last_referenced_as (tao_yyvsp[0].idlist);
               AST_Decl::NodeType nt = d->node_type ();
-              AST_Type *t = AST_Type::narrow_from_decl (d);
+              AST_Type *t = AST_Type::narrow_from_decl (d);                  
               AST_Typedef *td = 0;
               bool can_be_undefined = false;
 
@@ -6414,7 +6405,7 @@ tao_yyreduce:
                     {
                       td = AST_Typedef::narrow_from_decl (d);
                       AST_Type *pbt = td->primitive_base_type ();
-
+                      
                       if (pbt->node_type () == AST_Decl::NT_sequence)
                         {
                           t = pbt;
@@ -6424,7 +6415,7 @@ tao_yyreduce:
                             seq_type->base_type ();
                           AST_Decl::NodeType elem_nt =
                             elem_type->node_type ();
-
+                            
                           if (elem_nt == AST_Decl::NT_typedef)
                             {
                               AST_Typedef *elem_td =
@@ -6432,7 +6423,7 @@ tao_yyreduce:
                               elem_type = elem_td->primitive_base_type ();
                               elem_nt = elem_type->node_type ();
                             }
-
+                            
                           if (elem_nt == AST_Decl::NT_interface
                               || elem_nt == AST_Decl::NT_interface_fwd
                               || elem_nt == AST_Decl::NT_valuetype
@@ -6444,7 +6435,7 @@ tao_yyreduce:
                             }
                         }
                     }
-
+                    
                   if (! t->is_defined () && ! can_be_undefined)
                     {
                       idl_global->err ()->error1 (
@@ -7241,7 +7232,7 @@ tao_yyreduce:
                   pd.id = tao_yyvsp[0].idval;
                   pd.impl = event_type;
                   pd.line_number = idl_global->lineno ();
-                  c->emits ().enqueue_tail (pd);
+                 c->emits ().enqueue_tail (pd);
                 }
             }
 
@@ -7906,7 +7897,7 @@ tao_yyreduce:
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
 
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("error in %C line %d\n"),
+                      ACE_TEXT ("error in %s line %d\n"),
                       idl_global->filename ()->get_string (),
                       idl_global->lineno ()));
           ACE_DEBUG ((LM_DEBUG,
@@ -7931,6 +7922,7 @@ tao_yyreduce:
     {
 // event_rest_of_header : inheritance_spec
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
+
         }
     break;
 
@@ -8068,7 +8060,7 @@ tao_yyreduce:
 
     }
 
-/* Line 1000 of yacc.c.  */
+/* Line 993 of yacc.c.  */
 
 
   tao_yyvsp -= tao_yylen;
@@ -8314,7 +8306,6 @@ void
 tao_yyerror (const char *msg)
 {
   ACE_ERROR ((LM_ERROR,
-              "%C\n",
+              "%s\n",
               msg));
 }
-
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index fd916fc3ed1..506648e4899 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -227,7 +227,7 @@ idl_error_header (UTL_Error::ErrorCode c,
                   ACE_CString s)
 {
   ACE_ERROR ((LM_ERROR,
-              "%C: \"%C\", line %d: %C",
+              "%s: \"%s\", line %d: %s",
               idl_global->prog_name (),
               s.c_str (),
               lineno == -1 ? idl_global->lineno () : lineno,
@@ -629,7 +629,7 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps)
                     idl_global->lineno (),
                     idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
-              "%C\n",
+              "%s\n",
               parse_state_to_error_message (ps)));
 
   // Better to bail here than to increment the error count and
@@ -780,7 +780,7 @@ UTL_Error::coercion_error (AST_Expression *v,
                     v->file_name ()->get_string ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
-              " to %C\n",
+              " to %s\n",
               exprtype_to_string (t)));
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
@@ -806,7 +806,7 @@ UTL_Error::version_number_error (char *n)
                     idl_global->lineno (),
                     idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
-              "%C\n",
+              "%s\n",
               n));
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
@@ -818,7 +818,7 @@ UTL_Error::version_syntax_error (const char *msg)
                     idl_global->lineno (),
                     idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
-              "%C\n",
+              "%s\n",
               msg));
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
@@ -1152,7 +1152,7 @@ UTL_Error::enum_val_expected (AST_Union *u,
                     u->line (),
                     u->file_name ());
   ACE_ERROR ((LM_ERROR,
-              " union %C, ",
+              " union %s, ",
               u->local_name ()->get_string ()));
   l->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
@@ -1174,7 +1174,7 @@ UTL_Error::enum_val_lookup_failure (AST_Union *u,
                     u->line (),
                     u->file_name ());
   ACE_ERROR ((LM_ERROR,
-              " union %C,  enum %C,  enumerator ",
+              " union %s,  enum %s,  enumerator ",
               u->local_name ()->get_string (),
               e->local_name ()->get_string ()));
   n->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1206,7 +1206,7 @@ UTL_Error::name_case_error (char *b,
                     idl_global->lineno (),
                     idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
-              "\"%C\" and \"%C\"\n",
+              "\"%s\" and \"%s\"\n",
               b,
               n));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -1222,7 +1222,7 @@ UTL_Error::name_case_warning (char *b,
                         idl_global->lineno (),
                         idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
-                  "\"%C\" and \"%C\"\n",
+                  "\"%s\" and \"%s\"\n",
                   b,
                   n));
     }
@@ -1235,7 +1235,7 @@ UTL_Error::idl_keyword_error (char *n)
                     idl_global->lineno (),
                     idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
-              "\"%C\"\n",
+              "\"%s\"\n",
               n));
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
@@ -1249,7 +1249,7 @@ UTL_Error::idl_keyword_warning (char *n)
                         idl_global->lineno (),
                         idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
-                  "\"%C\"\n",
+                  "\"%s\"\n",
                   n));
     }
 }
@@ -1264,12 +1264,12 @@ UTL_Error::ambiguous (UTL_Scope *s,
                     d->line (),
                     d->file_name ());
   ACE_ERROR ((LM_ERROR,
-              " scope: %C,  collision: ",
+              " scope: %s,  collision: ",
               (ScopeAsDecl (s))->local_name ()->get_string ()));
-  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
+  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               " vs. "));
-  l->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
+  l->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index fe3d381320f..68d05df6e0d 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -1799,7 +1799,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) Unable to insert type")
-                      ACE_TEXT (" into DCPS type container: %C.\n"),
+                      ACE_TEXT (" into DCPS type container: %s.\n"),
                       id));
           return;
         }
@@ -1807,7 +1807,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id)
   else
     {
       ACE_ERROR ((LM_WARNING,
-                  ACE_TEXT ("(%P|%t) Duplicate DCPS type defined: %C.\n"),
+                  ACE_TEXT ("(%P|%t) Duplicate DCPS type defined: %s.\n"),
                   id));
     }
 
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 5314801b0f7..4373cea7356 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -1835,7 +1835,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                   if (0 != d)
                     {
                       ACE_ERROR (( LM_ERROR,
-                        ACE_TEXT ("%C: \"%C\", line %d: Did you mean \"::%C\"\n")
+                        ACE_TEXT ("%s: \"%s\", line %d: Did you mean \"::%s\"\n")
                         ACE_TEXT ("   declared at "),
                         idl_global->prog_name (),
                         idl_global->filename ()->get_string (),
@@ -1848,7 +1848,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                       if (!same_file)
                         {
                           ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("%C "),
+                            ACE_TEXT ("%s "),
                             d->file_name ().c_str () ));
                         }
                       ACE_ERROR ((LM_ERROR,
@@ -1856,11 +1856,11 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                         d->line () ));
                       if (ScopeAsDecl (this)->full_name ()[0])
                         {
-                          ACE_ERROR ((LM_ERROR, ACE_TEXT ("::%C"),
+                          ACE_ERROR ((LM_ERROR, ACE_TEXT ("::%s"),
                             ScopeAsDecl (this)->full_name () ));
                         }
                       ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("::%C\""),
+                        ACE_TEXT ("::%s\""),
                         e->head ()->get_string () ));
                       const bool same_file_again=
                         (same_file &&
@@ -1871,7 +1871,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                         {
                           ACE_ERROR ((LM_ERROR,
                             ACE_TEXT ("\n")
-                            ACE_TEXT ("   declared at %C "),
+                            ACE_TEXT ("   declared at %s "),
                             first_one_found->file_name ().c_str () ));
                         }
                       else
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index ec626b96138..b2f9368eb10 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -154,7 +154,7 @@ TAO/tests/Bug_3574_Regression/run_test.pl:
 TAO/tests/Bug_3575_Regression/run_test.pl:
 TAO/tests/Bug_3597_Regression/run_test.pl:
 TAO/tests/Bug_3598a_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
-TAO/tests/Bug_3630_Regression/run_test.pl:
+TAO/tests/Bug_3630_Regression/run_test.pl: !FIXED_BUGS_ONLY
 TAO/tests/Bug_3632_Regression/run_test.pl:
 TAO/tests/Bug_3636_Regression/run_test.pl: !FIXED_BUGS_ONLY
 TAO/tests/Bug_3647_Regression/run_test.pl:
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl
index 32f3accc0c6..0e7080fef23 100755
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/run_test.pl
@@ -20,14 +20,14 @@ else {
     $SV = new PerlACE::Process ("server", "");
 }
 
-print STDERR "\n\n==== Running bug 3486 regression test\n";
+print STDERR "\n\n==== Running bug 2926 regression test\n";
 
 $SV->Spawn ();
 
 $collocated = $SV->WaitKill (15);
 
 if ($collocated != 0) {
-    print STDERR "ERROR: Bug_3486_Regression returned $collocated\n";
+    print STDERR "ERROR: Bug_2926_Regression returned $collocated\n";
     $status = 1;
 }
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl b/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
index 2bd5418f160..fe9d674c547 100755
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
@@ -45,7 +45,7 @@ print STDERR "Starting Manager\n";
 
 $MANAGER->Spawn ();
 
-$manager = $MANAGER->WaitKill (60);
+$manager = $MANAGER->WaitKill (30);
 
 $SERV1->WaitKill(5);
 
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 5d6fec86d28..e9ce6e621cc 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -246,7 +246,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv)
   ACE_ARGV global_svc_config_argv (true); // only this ctor allows
   // subsequent use of add()!
   global_svc_config_argv.add ((argc <= 0 || argv == 0) ?
-            ACE_TEXT ("") : argv[0], true);
+            ACE_TEXT ("") : argv[0]);
 
   // Will expand the environment variables, if any were used.
   // Is this a good thing? I guess it provides greater flexibility
@@ -382,8 +382,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
   // has something to skip!
   ACE_ARGV svc_config_argv (true);  // only this ctor allows subsequent
                                     // use of add()!
-  svc_config_argv.add ((argc <= 0 || argv == 0) ? ACE_TEXT ("") : argv[0],
-                       true);
+  svc_config_argv.add ((argc <= 0 || argv == 0) ? ACE_TEXT ("") : argv[0]);
 
   // Should we skip the ACE_Service_Config::open() method?,
   // e.g., because of -ORBSkipServiceConfigOpen
@@ -768,7 +767,7 @@ namespace
               }
 
             svc_config_argv.add (ACE_TEXT ("-f"));
-            svc_config_argv.add (current_arg, true);
+            svc_config_argv.add (current_arg);
           }
         else
           {
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index 7a0f53f3394..de8846a7d5c 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -111,8 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       char ior[100];
-      ACE_OS::sprintf (ior, "corbaloc::%s:%d/Racer",
-                       ACE_TEXT_ALWAYS_CHAR (target_host), port);
+      ACE_OS::sprintf (ior,"corbaloc::%s:%d/Racer",target_host,port);
 
       Pinger pinger(orb, ior);
 
diff --git a/TAO/tests/Bug_3630_Regression/server.cpp b/TAO/tests/Bug_3630_Regression/server.cpp
index 55ff6e69e3d..f2e0bf4d4ae 100644
--- a/TAO/tests/Bug_3630_Regression/server.cpp
+++ b/TAO/tests/Bug_3630_Regression/server.cpp
@@ -54,13 +54,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_TCHAR **second_extra = 0;
       ACE_NEW_RETURN (second_extra, ACE_TCHAR *[second_extra_argc], -1);
-      second_extra[0] = ACE::strnew (ACE_TEXT ("-ORBSvcConf"));
-      second_extra[1] = ACE::strnew (ACE_TEXT ("TAO_Conf_File.conf"));
+      extra[0] = ACE::strnew (ACE_TEXT ("-ORBSvcConf"));
+      extra[1] = ACE::strnew (ACE_TEXT ("TAO_Conf_File.conf"));
       ACE_TCHAR **second_largv = new ACE_TCHAR *[second_largc+second_extra_argc];
       for (int i = 0; i < second_largc; i++)
         second_largv[i] = argv[i];
       for (int i = 0; i < second_extra_argc; i++)
-        second_largv[second_largc + i] = second_extra[i];
+        second_largv[argc+i] = second_extra[i];
 
       second_largc += second_extra_argc;
 
diff --git a/TAO/tests/Crashed_Callback/run_test.pl b/TAO/tests/Crashed_Callback/run_test.pl
index 0f97c117d96..205ae00ffa6 100755
--- a/TAO/tests/Crashed_Callback/run_test.pl
+++ b/TAO/tests/Crashed_Callback/run_test.pl
@@ -38,7 +38,7 @@ if ($client == -1) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (210);
+$server = $SV->WaitKill (60);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp
index 4243ec5ee13..cea8a74686a 100755
--- a/TAO/tests/ForwardUponObjectNotExist/client.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
     if (ACE_OS::strncmp (ior,
                           corbaloc_prefix,
-                          ACE_OS::strlen (corbaloc_prefix)) != 0)
+                          sizeof corbaloc_prefix -1) != 0)
       return 1;
 
   // Indicates sucessful parsing of the command line
diff --git a/TAO/tests/Reliable_Oneways/run_test.pl b/TAO/tests/Reliable_Oneways/run_test.pl
index 2a123c14f9a..1d4b8a8d9a4 100755
--- a/TAO/tests/Reliable_Oneways/run_test.pl
+++ b/TAO/tests/Reliable_Oneways/run_test.pl
@@ -12,14 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior");
 unlink $iorfile;
 $status = 0;
 
-my $ep = '-ORBListenEndpoints iiop://localhost';
-
 foreach $i ("-n", "-t", "-s", "-r") {
   if (PerlACE::is_vxworks_test()) {
-      $SV = new PerlACE::ProcessVX ("server", "-o server.ior $ep");
+      $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
   }
   else {
-      $SV = new PerlACE::Process ("server", "-o $iorfile $ep");
+      $SV = new PerlACE::Process ("server", "-o $iorfile");
   }
   $CL = new PerlACE::Process ("client", " -k file://$iorfile $i");
 
@@ -31,7 +29,7 @@ foreach $i ("-n", "-t", "-s", "-r") {
     exit 1;
   }
 
-  $client = $CL->SpawnWaitKill (600);
+  $client = $CL->SpawnWaitKill (200);
 
   if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
author	William R. Otte <wotte@dre.vanderbilt.edu>	2009-06-24 23:52:35 +0000
committer	William R. Otte <wotte@dre.vanderbilt.edu>	2009-06-24 23:52:35 +0000
commit	00f5c123221f1f60b1ff365d7cd14d4317e06ce1 (patch)
tree	03495e9c736e43f1e2d44ad4e7c83a287f29b20b
parent	e0c701f206c2f136457b3d96310e2e28590b48f6 (diff)
download	ATCD-CIAOCDM.tar.gz