ChangeLogTag: Thu Feb 11 17:04:59 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 58 insertions, 43 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ba15aeb78b9..36d070e6f5f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Feb 11 17:04:59 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/tao_idl_fe.mpc:
+        
+          Changes to restore mods that Johnny Willemsen made to 
+          lex.yy.cpp without corresponding changes to idl.ll and
+          tao_idl_fe.mpc. These changes are in
+          
+          Mon Feb  8 06:58:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
 Wed Feb 10 22:16:15 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/include/idl_global.h:
@@ -26,10 +38,6 @@ Wed Feb 10 22:02:06 UTC 2010  Yan Dai  <dai_y@ociweb.com>
 
           Added support for ORBKeepalive in SSL mode.
 
-Wed Feb 10 19:27:58 UTC 2010  Jeff Parsons  <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp:
-
 Wed Feb 10 16:34:24 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 4645c90b75d..69545e07757 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -619,8 +619,8 @@ idl_store_pragma (char *buf)
           // 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);
+          int const status =
+            idl_global->file_prefixes ().find (ext_id, int_id);
 
           if (status == 0)
             {
@@ -778,15 +778,20 @@ idl_store_pragma (char *buf)
     {
       char *tmp = idl_get_pragma_string (buf);
 
-      // split up data type and key strings
+      // Split up data type and key strings
       char *sample_type = tmp;
+      
       while (*tmp && !isspace (*tmp))
-        tmp++;
+        {
+          ++tmp;
+        }
+        
       while (isspace (*tmp))
         {
           *tmp = '\0';
           tmp++;
         }
+        
       char *key = tmp;
 
       if (!idl_global->add_dcps_data_key (sample_type, key))
@@ -821,12 +826,12 @@ 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'))
     {
@@ -866,7 +871,7 @@ 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'))
     {
@@ -913,32 +918,32 @@ idl_atof (char *s)
       // Skip over the dash and possibly spaces after the dash
       while (*s == '-' || *s == ' ' || *s == '\t')
         {
-          s++;
+          ++s;
         }
     }
 
   while (*s >= '0' && *s <= '9')
     {
       d = (d * 10) + *s - '0';
-      s++;
+      ++s;
     }
 
   if (*s == '.')
     {
-      s++;
+      ++s;
       e = 10;
 
       while (*s >= '0' && *s <= '9')
         {
           d += (*s - '0') / (e * 1.0);
           e *= 10;
-          s++;
+          ++s;
         }
     }
 
   if (*s == 'e' || *s == 'E')
     {
-      s++;
+      ++s;
 
       if (*s == '-')
         {
@@ -947,7 +952,7 @@ idl_atof (char *s)
         }
       else if (*s == '+')
         {
-          s++;
+          ++s;
         }
 
       e = 0;
@@ -955,7 +960,7 @@ idl_atof (char *s)
       while (*s >= '0' && *s <= '9')
         {
           e = (e * 10) + *s - '0';
-          s++;
+          ++s;
         }
 
       if (e > 0)
@@ -985,13 +990,11 @@ idl_atof (char *s)
  * Convert (some) escaped characters into their ascii values
  */
 static char
-idl_escape_reader(
-    char *str
-  )
+idl_escape_reader (char *str)
 {
   if (str[0] != '\\')
     {
-            return str[0];
+      return str[0];
     }
 
   switch (str[1])
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 8c4b963dd9a..37ad1ea14d3 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -16,7 +16,7 @@
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
-#include "ace/os_include/os_stdio.h"
+#include "ace/OS_NS_stdio.h"
 
 /* end standard C headers. */
 
@@ -1129,7 +1129,7 @@ static int input (void );
                 int c = '*'; \
                 size_t n; \
                 for ( n = 0; n < max_size && \
-                             (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
+                             (c = ACE_OS::getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
                         buf[n] = (char) c; \
                 if ( c == '\n' ) \
                         buf[n++] = (char) c; \
@@ -3105,8 +3105,8 @@ idl_store_pragma (char *buf)
           // 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);
+          int const status =
+            idl_global->file_prefixes ().find (ext_id, int_id);
 
           if (status == 0)
             {
@@ -3264,15 +3264,20 @@ idl_store_pragma (char *buf)
     {
       char *tmp = idl_get_pragma_string (buf);
 
-      // split up data type and key strings
+      // Split up data type and key strings
       char *sample_type = tmp;
+      
       while (*tmp && !isspace (*tmp))
-        tmp++;
+        {
+          ++tmp;
+        }
+        
       while (isspace (*tmp))
         {
           *tmp = '\0';
           tmp++;
         }
+        
       char *key = tmp;
 
       if (!idl_global->add_dcps_data_key (sample_type, key))
@@ -3307,12 +3312,12 @@ 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'))
     {
@@ -3352,7 +3357,7 @@ 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'))
     {
@@ -3399,32 +3404,32 @@ idl_atof (char *s)
       // Skip over the dash and possibly spaces after the dash
       while (*s == '-' || *s == ' ' || *s == '\t')
         {
-          s++;
+          ++s;
         }
     }
 
   while (*s >= '0' && *s <= '9')
     {
       d = (d * 10) + *s - '0';
-      s++;
+      ++s;
     }
 
   if (*s == '.')
     {
-      s++;
+      ++s;
       e = 10;
 
       while (*s >= '0' && *s <= '9')
         {
           d += (*s - '0') / (e * 1.0);
           e *= 10;
-          s++;
+          ++s;
         }
     }
 
   if (*s == 'e' || *s == 'E')
     {
-      s++;
+      ++s;
 
       if (*s == '-')
         {
@@ -3433,7 +3438,7 @@ idl_atof (char *s)
         }
       else if (*s == '+')
         {
-          s++;
+          ++s;
         }
 
       e = 0;
@@ -3441,7 +3446,7 @@ idl_atof (char *s)
       while (*s >= '0' && *s <= '9')
         {
           e = (e * 10) + *s - '0';
-          s++;
+          ++s;
         }
 
       if (e > 0)
@@ -3471,13 +3476,11 @@ idl_atof (char *s)
  * Convert (some) escaped characters into their ascii values
  */
 static char
-idl_escape_reader(
-    char *str
-  )
+idl_escape_reader (char *str)
 {
   if (str[0] != '\\')
     {
-            return str[0];
+      return str[0];
     }
 
   switch (str[1])
diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc
index 3cbb26717f0..eb3a58d9bf1 100644
--- a/TAO/TAO_IDL/tao_idl_fe.mpc
+++ b/TAO/TAO_IDL/tao_idl_fe.mpc
@@ -34,8 +34,9 @@ project(TAO_IDL_GEN) {
     "	    -e 's/ECHO/TAO_YY_ECHO/' \\"
     "	    -e 's/fread\([^\)]*\)/static_cast<int> (&)/g' \\"
     "	    -e 's/\\$$Hea''der.*\\$$/$$I''d$$/' \\"
-    "	    -e 's@#include <stdio\.h>@#include \"ace/os_include/os_stdio.h\"@' \\"
+    "	    -e 's@#include <stdio\.h>@#include \"ace/OS_NS_stdio.h\"@' \\"
     "	    -e 's@#include <unistd\.h>@#include \"ace/os_include/os_ctype.h\"@' \\"
+    "     -e 's@c = getc@c = ACE_OS::getc@' \\"
     "	    -e '/#include </d' \\"
     "	> fe/lex.yy.cpp"
     "	(cd fe; patch < lex.yy.cpp.diff)"