*** empty log message ***

2 files changed, 282 insertions, 282 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index aba0093fc49..bd1db7c139b 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,20 +1,18 @@
 Sat Oct 25 22:28:42 1997  Carlos O'Ryan  <coryan@MILONGA>
 
-	* TAO_IDL/fe/idl.ll: 
-	  Since yytext may be an "unsigned char*" under HP-UX they define
-	  an "alias"  __yytext. This hack fails miserably when using flex,
-	  since then the yytext thing can change on the fly. I use an
-	  inline function instead.
-	  Added support for #line preprocessor directives.
-
-	* TAO_IDL/driver/drv_preproc.cpp: 
-	  Documented some of my changes for NT, namely the fact that
-	  unlinking the output file while still open por the parsing fails
-	  on NT.
-
-	* TAO_IDL/tao_idl.dsp: 
-	  Added new folders for source files, header files, template
-	  files, etc. I modelled this based on the ACE project files.
+	* TAO_IDL/fe/idl.ll: Since yytext may be an "unsigned char*" under
+ 	  HP-UX they define an "alias" __yytext. This hack fails miserably
+ 	  when using flex, since then the yytext thing can change on the
+ 	  fly. I use an inline function instead.  Added support for #line
+ 	  preprocessor directives.
+
+	* TAO_IDL/driver/drv_preproc.cpp: Documented some of my changes
+ 	  for NT, namely the fact that unlinking the output file while
+ 	  still open causes the parsing to fail on NT.
+
+	* TAO_IDL/tao_idl.dsp: Added new folders for source files, header
+ 	  files, template files, etc. I modelled this based on the ACE
+ 	  project files.
 
 Sat Oct 25 18:14:14 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 7fad26c55d3..ab974d2247f 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -265,19 +265,19 @@ static void yy_fatal_error YY_PROTO(( const char msg[] ));
 	yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \
 	yy_c_buf_p = yy_cp;
 
-#define YY_END_OF_BUFFER 61
-static const short int yy_accept[278] =
+#define YY_END_OF_BUFFER 60
+static const short int yy_accept[277] =
     {   0,
-       57,   57,   61,   59,   57,   58,   59,   59,   59,   59,
-       44,   42,   59,   59,   59,   39,   39,   39,   39,   39,
+       56,   56,   60,   58,   56,   57,   58,   58,   58,   58,
+       44,   42,   58,   58,   58,   39,   39,   39,   39,   39,
        39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   59,   57,    0,   45,    0,    0,
-       44,   42,   56,    0,   40,   44,    0,    0,    0,   42,
+       39,   39,   39,   39,   58,   56,    0,   45,    0,    0,
+       44,   42,   55,    0,   40,   44,    0,    0,    0,   42,
        38,   36,   37,   39,   39,   39,   39,   39,   39,   39,
        39,   39,   39,   39,   39,   39,   39,   33,   39,   39,
        39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,    0,   53,    0,    0,    0,    0,
-        0,   46,    0,   46,    0,    0,   55,   40,    0,   40,
+       39,   39,   39,   39,    0,   52,    0,    0,    0,    0,
+        0,   46,    0,   46,    0,    0,   54,   40,    0,   40,
 
         0,   41,   43,   39,   39,    1,   39,   39,   39,   39,
        39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
@@ -291,13 +291,13 @@ static const short int yy_accept[278] =
        39,   39,   39,   20,   32,   39,   39,   28,   39,   39,
 
        39,   39,   23,   39,   39,   39,   39,   16,   39,   39,
-       39,   51,    0,    0,    0,    0,   39,   39,   39,   39,
-       21,   39,   39,    2,   35,    3,   39,   39,   13,   11,
-       17,   39,   39,   39,   39,   50,    0,    0,    0,    0,
-        0,    0,   39,   27,    7,   19,   39,   39,   39,   39,
-       10,   39,   26,   39,    0,   54,    0,    0,    0,   39,
-       39,   39,    4,   15,   24,   39,    0,    0,    0,    5,
-        6,    8,   14,   52,    0,   49,    0
+       39,    0,    0,    0,    0,   39,   39,   39,   39,   21,
+       39,   39,    2,   35,    3,   39,   39,   13,   11,   17,
+       39,   39,   39,   39,   50,    0,    0,    0,    0,    0,
+        0,   39,   27,    7,   19,   39,   39,   39,   39,   10,
+       39,   26,   39,    0,   53,    0,    0,    0,   39,   39,
+       39,    4,   15,   24,   39,    0,    0,    0,    5,    6,
+        8,   14,   51,    0,   49,    0
     } ;
 
 static const int yy_ec[256] =
@@ -342,77 +342,77 @@ static const int yy_meta[55] =
         4,    4,    4,    4
     } ;
 
-static const short int yy_base[288] =
+static const short int yy_base[287] =
     {   0,
-        0,  439,  444,  446,   53,  446,  438,  412,   45,   53,
-       53,   58,  425,  423,  421,    0,  419,  412,   13,  392,
-       31,   40,   34,  394,  391,  389,  388,   47,   56,   44,
-      377,  387,  385,   51,  105,   96,  423,  446,  420,   88,
-      100,  111,  446,  423,  141,  128,  155,  170,    0,  160,
-      446,  446,  446,    0,  401,  396,  369,  373,  377,  372,
-      387,  375,  380,  366,  365,  380,  369,   42,  369,  376,
-      361,  373,  359,  367,  374,  359,  360,  356,  362,  356,
-       64,  360,  360,  349,  184,  446,  111,  189,  362,  356,
-      348,  446,  387,  386,  120,  389,  446,    0,  196,  446,
-
-      144,  199,    0,  365,  369,    0,  342,  347,  351,  339,
-       82,  353,  351,  341,  346,  349,  330,  343,  340,  327,
-      340,  323,    0,  326,  338,  322,  324,   88,  321,  333,
-      324,  327,  331,  333,  317,  358,  357,  325,  317,  327,
-      446,  446,  187,  202,  213,  446,  337,    0,  317,  320,
-        0,    0,  306,  318,  303,  311,    0,  306,  301,  300,
-      301,    0,  306,  297,  313,  308,  299,  306,  292,  297,
-      305,  304,  302,  293,  297,    0,  287,  293,  327,  157,
-      288,  294,  291,  446,  321,    0,  294,  294,    0,  272,
-      283,  287,  273,    0,    0,  284,  284,    0,  265,  270,
-
-      274,  273,    0,  277,  265,  274,  276,    0,  268,  279,
-      266,  446,  205,  259,  228,  265,  256,  262,  255,  254,
-        0,  262,  269,    0,    0,    0,  237,  238,    0,    0,
-        0,  220,  215,  199,  201,  446,  231,  235,  245,  251,
-      248,  201,  182,    0,    0,    0,  181,  188,  153,  159,
-        0,  155,    0,  158,  169,  446,  162,  146,  101,  112,
-      101,  104,    0,    0,    0,   88,  130,  120,  114,    0,
-        0,    0,    0,  446,  107,  446,  446,  266,  270,  272,
-      276,  280,   75,  284,  288,  292,  296
+        0,  438,  443,  445,   53,  445,  437,  411,   45,   53,
+       53,   58,  424,  422,  420,    0,  418,  411,   13,  391,
+       31,   40,   34,  393,  390,  388,  387,   47,   56,   44,
+      376,  386,  384,   51,  105,   96,  422,  445,  419,   88,
+      100,  111,  445,  422,  141,  128,  155,  170,    0,  160,
+      445,  445,  445,    0,  400,  395,  368,  372,  376,  371,
+      386,  374,  379,  365,  364,  379,  368,   42,  368,  375,
+      360,  372,  358,  366,  373,  358,  359,  355,  361,  355,
+       64,  359,  359,  348,  184,  445,  111,  189,  361,  355,
+      347,  445,  386,  385,  120,  388,  445,    0,  196,  445,
+
+      144,  199,    0,  364,  368,    0,  341,  346,  350,  338,
+       82,  352,  350,  340,  345,  348,  329,  342,  339,  326,
+      339,  322,    0,  325,  337,  321,  323,   88,  320,  332,
+      323,  326,  330,  332,  316,  357,  356,  324,  316,  326,
+      445,  445,  187,  202,  213,  445,  336,    0,  316,  319,
+        0,    0,  305,  317,  302,  310,    0,  305,  300,  299,
+      300,    0,  305,  296,  312,  307,  298,  305,  291,  296,
+      304,  303,  301,  292,  296,    0,  286,  292,  326,  326,
+      286,  292,  289,  445,  319,    0,  292,  292,    0,  270,
+      281,  285,  271,    0,    0,  282,  282,    0,  263,  268,
+
+      272,  271,    0,  275,  263,  272,  274,    0,  266,  277,
+      264,  205,  257,  228,  263,  254,  260,  253,  252,    0,
+      238,  240,    0,    0,    0,  216,  217,    0,    0,    0,
+      211,  203,  189,  195,  445,  231,  228,  245,  251,  248,
+      193,  173,    0,    0,    0,  163,  161,  136,  153,    0,
+      137,    0,  136,  158,  445,  155,  146,  101,  112,  101,
+      104,    0,    0,    0,   88,  130,  120,  114,    0,    0,
+        0,    0,  445,  107,  445,  445,  266,  270,  272,  276,
+      280,   75,  284,  288,  292,  296
     } ;
 
-static const short int yy_def[288] =
+static const short int yy_def[287] =
     {   0,
-      277,    1,  277,  277,  277,  277,  278,  279,  277,  277,
-      277,  277,  277,  277,  277,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  277,  277,  278,  277,  277,  281,
-      277,  277,  277,  282,  277,  277,  277,  277,  283,  277,
-      277,  277,  277,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  277,  277,   35,  277,  277,  277,
-      277,  277,  277,  277,  277,  282,  277,   45,  277,  277,
-
-      277,  277,  283,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  284,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  284,  277,
-      277,  277,  277,  277,  277,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  277,  277,  277,  277,  277,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  277,  277,  285,  277,  277,
-      277,  277,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  285,  277,  286,  277,  277,  280,
-      280,  280,  280,  280,  280,  280,  286,  277,  287,  280,
-      280,  280,  280,  277,  287,  277,    0,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277
+      276,    1,  276,  276,  276,  276,  277,  278,  276,  276,
+      276,  276,  276,  276,  276,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  276,  276,  277,  276,  276,  280,
+      276,  276,  276,  281,  276,  276,  276,  276,  282,  276,
+      276,  276,  276,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  276,  276,   35,  276,  276,  276,
+      276,  276,  276,  276,  276,  281,  276,   45,  276,  276,
+
+      276,  276,  282,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  283,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  283,  276,
+      276,  276,  276,  276,  276,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  276,  276,  276,  276,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  279,  276,  276,  284,  276,  276,  276,
+      276,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  284,  276,  285,  276,  276,  279,  279,
+      279,  279,  279,  279,  279,  285,  276,  286,  279,  279,
+      279,  279,  276,  286,  276,    0,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276
     } ;
 
-static const short int yy_nxt[501] =
+static const short int yy_nxt[500] =
     {   0,
         4,    5,    6,    5,    7,    4,    8,    4,    4,    9,
         4,   10,   11,   12,   12,   13,   14,   15,   16,   16,
@@ -425,53 +425,53 @@ static const short int yy_nxt[501] =
        71,   49,   77,   64,   83,  117,   66,   74,   48,   72,
       118,   75,   78,   48,   94,   79,   73,   36,   84,   36,
 
-       95,   95,  269,  131,  269,   49,   85,   86,   87,  276,
-       45,  132,   46,   46,   47,  136,  276,   88,   88,   88,
-       48,   45,  274,   50,   50,   50,  142,  170,   49,  153,
-      154,   48,  143,  143,  268,   48,  273,  171,   45,  272,
-       46,   46,   47,  271,   89,   90,   48,  270,   48,   91,
-      257,  277,   49,   98,   98,   98,  102,  102,  102,  212,
-      213,   99,  100,   48,  100,   45,  268,   47,   47,   47,
-       45,  256,   50,   50,   50,   48,   99,  100,  101,  101,
-       48,  100,  102,  102,  102,   85,   86,   87,  266,  265,
-       48,   86,  137,  184,  264,   48,   88,   88,   88,  185,
-
-      185,   88,   88,   88,  144,  144,  263,  236,  145,  145,
-      145,  102,  102,  102,  145,  145,  145,  237,  237,  237,
-      146,  262,  146,   89,  261,  145,  145,  145,   91,  239,
-      260,  240,  259,  236,  100,  146,  100,  256,  254,  146,
-      241,  241,  241,  237,  237,  237,  239,  253,  240,  100,
-      252,  258,  239,  100,  240,  257,  251,  241,  241,  241,
-      241,  241,  241,  241,  241,  241,   37,   37,   37,   37,
-       39,  250,   39,   39,   54,   54,   93,  249,   93,   93,
-       96,   96,   96,   96,  179,  179,  179,  179,  255,  255,
-      255,  255,  267,  267,  267,  267,  275,  275,  275,  275,
-
-      248,  247,  246,  245,  244,  243,  242,  238,  235,  234,
-      233,  232,  231,  230,  229,  228,  227,  226,  225,  224,
-      223,  222,  221,  220,  219,  218,  217,  184,  216,  215,
-      214,  180,  211,  210,  209,  208,  207,  206,  205,  204,
-      203,  202,  201,  200,  199,  198,  197,  196,  195,  194,
-      193,  192,  191,  190,  189,  188,  187,  186,  183,  182,
-      181,  136,  180,  178,  177,  176,  175,  174,  173,  172,
-      169,  168,  167,  166,  165,  164,  163,  162,  161,  160,
-      159,  158,  157,  156,  155,  152,  151,  150,  149,  148,
-      147,   97,  141,  141,  140,  139,  138,  135,  134,  133,
-
-      130,  129,  128,  127,  126,  125,  124,  123,  122,  121,
-      120,  119,  116,  115,  114,  113,  112,  111,  110,  109,
-      108,  107,  106,  105,  104,   97,   92,   38,   82,   81,
-       80,   70,   69,   68,   67,   59,   56,   55,   53,   52,
-       51,   40,   38,  277,   35,    3,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277
+       95,   95,  268,  131,  268,   49,   85,   86,   87,  275,
+       45,  132,   46,   46,   47,  136,  275,   88,   88,   88,
+       48,   45,  273,   50,   50,   50,  142,  170,   49,  153,
+      154,   48,  143,  143,  267,   48,  272,  171,   45,  271,
+       46,   46,   47,  270,   89,   90,   48,  269,   48,   91,
+      256,  276,   49,   98,   98,   98,  102,  102,  102,  267,
+      255,   99,  100,   48,  100,   45,  265,   47,   47,   47,
+       45,  264,   50,   50,   50,   48,   99,  100,  101,  101,
+       48,  100,  102,  102,  102,   85,   86,   87,  263,  262,
+       48,   86,  137,  184,  261,   48,   88,   88,   88,  185,
+
+      185,   88,   88,   88,  144,  144,  260,  235,  145,  145,
+      145,  102,  102,  102,  145,  145,  145,  236,  236,  236,
+      146,  259,  146,   89,  258,  145,  145,  145,   91,  238,
+      255,  239,  253,  235,  100,  146,  100,  252,  251,  146,
+      240,  240,  240,  236,  236,  236,  238,  250,  239,  100,
+      249,  257,  238,  100,  239,  256,  248,  240,  240,  240,
+      240,  240,  240,  240,  240,  240,   37,   37,   37,   37,
+       39,  247,   39,   39,   54,   54,   93,  246,   93,   93,
+       96,   96,   96,   96,  179,  179,  179,  179,  254,  254,
+      254,  254,  266,  266,  266,  266,  274,  274,  274,  274,
+
+      245,  244,  243,  242,  241,  237,  234,  233,  232,  231,
+      230,  229,  228,  227,  226,  225,  224,  223,  222,  221,
+      220,  219,  218,  217,  216,  184,  215,  214,  213,  212,
+      180,  211,  210,  209,  208,  207,  206,  205,  204,  203,
+      202,  201,  200,  199,  198,  197,  196,  195,  194,  193,
+      192,  191,  190,  189,  188,  187,  186,  183,  182,  181,
+      136,  180,  178,  177,  176,  175,  174,  173,  172,  169,
+      168,  167,  166,  165,  164,  163,  162,  161,  160,  159,
+      158,  157,  156,  155,  152,  151,  150,  149,  148,  147,
+       97,  141,  141,  140,  139,  138,  135,  134,  133,  130,
+
+      129,  128,  127,  126,  125,  124,  123,  122,  121,  120,
+      119,  116,  115,  114,  113,  112,  111,  110,  109,  108,
+      107,  106,  105,  104,   97,   92,   38,   82,   81,   80,
+       70,   69,   68,   67,   59,   56,   55,   53,   52,   51,
+       40,   38,  276,   35,    3,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276
 
     } ;
 
-static const short int yy_chk[501] =
+static const short int yy_chk[500] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -480,53 +480,53 @@ static const short int yy_chk[501] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    5,   19,    5,    9,    9,    9,
        10,   19,   21,   11,   10,   11,   11,   11,   12,   21,
-       12,   12,   12,   11,   21,   22,   23,  283,   12,   30,
+       12,   12,   12,   11,   21,   22,   23,  282,   12,   30,
        28,   11,   30,   22,   34,   68,   23,   29,   11,   28,
        68,   29,   30,   12,   40,   30,   28,   36,   34,   36,
 
-       40,   40,  259,   81,  259,   11,   35,   35,   35,  275,
-       41,   81,   41,   41,   41,   87,  269,   35,   35,   35,
-       41,   42,  268,   42,   42,   42,   95,  128,   41,  111,
-      111,   42,   95,   95,  267,   41,  266,  128,   46,  262,
-       46,   46,   46,  261,   35,   35,   42,  260,   46,   35,
-      258,   87,   41,   45,   45,   45,  101,  101,  101,  180,
-      180,   45,   45,   46,   45,   47,  257,   47,   47,   47,
-       50,  255,   50,   50,   50,   47,   45,   45,   48,   48,
-       50,   45,   48,   48,   48,   85,   85,   85,  254,  252,
-       47,   88,   88,  143,  250,   50,   85,   85,   85,  143,
-
-      143,   88,   88,   88,   99,   99,  249,  213,   99,   99,
-       99,  102,  102,  102,  144,  144,  144,  213,  213,  213,
-      102,  248,  102,   85,  247,  145,  145,  145,   85,  215,
-      243,  215,  242,  237,  145,  102,  145,  238,  235,  102,
-      215,  215,  215,  237,  237,  237,  239,  234,  239,  145,
-      233,  241,  240,  145,  240,  240,  232,  239,  239,  239,
-      241,  241,  241,  240,  240,  240,  278,  278,  278,  278,
-      279,  228,  279,  279,  280,  280,  281,  227,  281,  281,
-      282,  282,  282,  282,  284,  284,  284,  284,  285,  285,
-      285,  285,  286,  286,  286,  286,  287,  287,  287,  287,
-
-      223,  222,  220,  219,  218,  217,  216,  214,  211,  210,
-      209,  207,  206,  205,  204,  202,  201,  200,  199,  197,
-      196,  193,  192,  191,  190,  188,  187,  185,  183,  182,
-      181,  179,  178,  177,  175,  174,  173,  172,  171,  170,
-      169,  168,  167,  166,  165,  164,  163,  161,  160,  159,
-      158,  156,  155,  154,  153,  150,  149,  147,  140,  139,
-      138,  137,  136,  135,  134,  133,  132,  131,  130,  129,
-      127,  126,  125,  124,  122,  121,  120,  119,  118,  117,
-      116,  115,  114,  113,  112,  110,  109,  108,  107,  105,
-      104,   96,   94,   93,   91,   90,   89,   84,   83,   82,
-
-       80,   79,   78,   77,   76,   75,   74,   73,   72,   71,
-       70,   69,   67,   66,   65,   64,   63,   62,   61,   60,
-       59,   58,   57,   56,   55,   44,   39,   37,   33,   32,
-       31,   27,   26,   25,   24,   20,   18,   17,   15,   14,
-       13,    8,    7,    3,    2,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277
+       40,   40,  258,   81,  258,   11,   35,   35,   35,  274,
+       41,   81,   41,   41,   41,   87,  268,   35,   35,   35,
+       41,   42,  267,   42,   42,   42,   95,  128,   41,  111,
+      111,   42,   95,   95,  266,   41,  265,  128,   46,  261,
+       46,   46,   46,  260,   35,   35,   42,  259,   46,   35,
+      257,   87,   41,   45,   45,   45,  101,  101,  101,  256,
+      254,   45,   45,   46,   45,   47,  253,   47,   47,   47,
+       50,  251,   50,   50,   50,   47,   45,   45,   48,   48,
+       50,   45,   48,   48,   48,   85,   85,   85,  249,  248,
+       47,   88,   88,  143,  247,   50,   85,   85,   85,  143,
+
+      143,   88,   88,   88,   99,   99,  246,  212,   99,   99,
+       99,  102,  102,  102,  144,  144,  144,  212,  212,  212,
+      102,  242,  102,   85,  241,  145,  145,  145,   85,  214,
+      237,  214,  234,  236,  145,  102,  145,  233,  232,  102,
+      214,  214,  214,  236,  236,  236,  238,  231,  238,  145,
+      227,  240,  239,  145,  239,  239,  226,  238,  238,  238,
+      240,  240,  240,  239,  239,  239,  277,  277,  277,  277,
+      278,  222,  278,  278,  279,  279,  280,  221,  280,  280,
+      281,  281,  281,  281,  283,  283,  283,  283,  284,  284,
+      284,  284,  285,  285,  285,  285,  286,  286,  286,  286,
+
+      219,  218,  217,  216,  215,  213,  211,  210,  209,  207,
+      206,  205,  204,  202,  201,  200,  199,  197,  196,  193,
+      192,  191,  190,  188,  187,  185,  183,  182,  181,  180,
+      179,  178,  177,  175,  174,  173,  172,  171,  170,  169,
+      168,  167,  166,  165,  164,  163,  161,  160,  159,  158,
+      156,  155,  154,  153,  150,  149,  147,  140,  139,  138,
+      137,  136,  135,  134,  133,  132,  131,  130,  129,  127,
+      126,  125,  124,  122,  121,  120,  119,  118,  117,  116,
+      115,  114,  113,  112,  110,  109,  108,  107,  105,  104,
+       96,   94,   93,   91,   90,   89,   84,   83,   82,   80,
+
+       79,   78,   77,   76,   75,   74,   73,   72,   71,   70,
+       69,   67,   66,   65,   64,   63,   62,   61,   60,   59,
+       58,   57,   56,   55,   44,   39,   37,   33,   32,   31,
+       27,   26,   25,   24,   20,   18,   17,   15,   14,   13,
+        8,    7,    3,    2,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  276
 
     } ;
 
@@ -634,7 +634,14 @@ static void	idl_store_pragma(char *);
 
 // HPUX has yytext typed to unsigned char *. We make sure here that
 // we'll always use char *
-static char	*__yytext = (char *) yytext;
+// static char* __yytext = (char*) yytext;
+// NOTE: This will not work under flex(1) were yytext is not a fixed
+// buffer, but a dynamically allocated one. This function should do
+// the trick for us.
+inline char *__yytext()
+{
+  return (char *) yytext;
+}
 
 
 /* Macros after this point can all be overridden by user definitions in
@@ -729,7 +736,7 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-# line 96 "idl.ll"
+# line 103 "idl.ll"
 
 
 
@@ -786,13 +793,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 278 )
+				if ( yy_current_state >= 277 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 446 );
+		while ( yy_base[yy_current_state] != 445 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -814,192 +821,192 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_USER_ACTION
-# line 98 "idl.ll"
+# line 105 "idl.ll"
 return IDL_ANY;
 	YY_BREAK
 case 2:
 YY_USER_ACTION
-# line 99 "idl.ll"
+# line 106 "idl.ll"
 return IDL_MODULE;
 	YY_BREAK
 case 3:
 YY_USER_ACTION
-# line 100 "idl.ll"
+# line 107 "idl.ll"
 return IDL_RAISES;
 	YY_BREAK
 case 4:
 YY_USER_ACTION
-# line 101 "idl.ll"
+# line 108 "idl.ll"
 return IDL_READONLY;
 	YY_BREAK
 case 5:
 YY_USER_ACTION
-# line 102 "idl.ll"
+# line 109 "idl.ll"
 return IDL_ATTRIBUTE;
 	YY_BREAK
 case 6:
 YY_USER_ACTION
-# line 103 "idl.ll"
+# line 110 "idl.ll"
 return IDL_EXCEPTION;
 	YY_BREAK
 case 7:
 YY_USER_ACTION
-# line 104 "idl.ll"
+# line 111 "idl.ll"
 return IDL_CONTEXT;
 	YY_BREAK
 case 8:
 YY_USER_ACTION
-# line 105 "idl.ll"
+# line 112 "idl.ll"
 return IDL_INTERFACE;
 	YY_BREAK
 case 9:
 YY_USER_ACTION
-# line 106 "idl.ll"
+# line 113 "idl.ll"
 return IDL_CONST;
 	YY_BREAK
 case 10:
 YY_USER_ACTION
-# line 107 "idl.ll"
+# line 114 "idl.ll"
 return IDL_TYPEDEF;
 	YY_BREAK
 case 11:
 YY_USER_ACTION
-# line 108 "idl.ll"
+# line 115 "idl.ll"
 return IDL_STRUCT;
 	YY_BREAK
 case 12:
 YY_USER_ACTION
-# line 109 "idl.ll"
+# line 116 "idl.ll"
 return IDL_ENUM;
 	YY_BREAK
 case 13:
 YY_USER_ACTION
-# line 110 "idl.ll"
+# line 117 "idl.ll"
 return IDL_STRING;
 	YY_BREAK
 case 14:
 YY_USER_ACTION
-# line 111 "idl.ll"
+# line 118 "idl.ll"
 return IDL_WSTRING;
 	YY_BREAK
 case 15:
 YY_USER_ACTION
-# line 112 "idl.ll"
+# line 119 "idl.ll"
 return IDL_SEQUENCE;
 	YY_BREAK
 case 16:
 YY_USER_ACTION
-# line 113 "idl.ll"
+# line 120 "idl.ll"
 return IDL_UNION;
 	YY_BREAK
 case 17:
 YY_USER_ACTION
-# line 114 "idl.ll"
+# line 121 "idl.ll"
 return IDL_SWITCH;
 	YY_BREAK
 case 18:
 YY_USER_ACTION
-# line 115 "idl.ll"
+# line 122 "idl.ll"
 return IDL_CASE;
 	YY_BREAK
 case 19:
 YY_USER_ACTION
-# line 116 "idl.ll"
+# line 123 "idl.ll"
 return IDL_DEFAULT;
 	YY_BREAK
 case 20:
 YY_USER_ACTION
-# line 117 "idl.ll"
+# line 124 "idl.ll"
 return IDL_FLOAT;
 	YY_BREAK
 case 21:
 YY_USER_ACTION
-# line 118 "idl.ll"
+# line 125 "idl.ll"
 return IDL_DOUBLE;
 	YY_BREAK
 case 22:
 YY_USER_ACTION
-# line 119 "idl.ll"
+# line 126 "idl.ll"
 return IDL_LONG;
 	YY_BREAK
 case 23:
 YY_USER_ACTION
-# line 120 "idl.ll"
+# line 127 "idl.ll"
 return IDL_SHORT;
 	YY_BREAK
 case 24:
 YY_USER_ACTION
-# line 121 "idl.ll"
+# line 128 "idl.ll"
 return IDL_UNSIGNED;
 	YY_BREAK
 case 25:
 YY_USER_ACTION
-# line 122 "idl.ll"
+# line 129 "idl.ll"
 return IDL_CHAR;
 	YY_BREAK
 case 26:
 YY_USER_ACTION
-# line 123 "idl.ll"
+# line 130 "idl.ll"
 return IDL_WCHAR;
 	YY_BREAK
 case 27:
 YY_USER_ACTION
-# line 124 "idl.ll"
+# line 131 "idl.ll"
 return IDL_BOOLEAN;
 	YY_BREAK
 case 28:
 YY_USER_ACTION
-# line 125 "idl.ll"
+# line 132 "idl.ll"
 return IDL_OCTET;
 	YY_BREAK
 case 29:
 YY_USER_ACTION
-# line 126 "idl.ll"
+# line 133 "idl.ll"
 return IDL_VOID;
 	YY_BREAK
 case 30:
 YY_USER_ACTION
-# line 128 "idl.ll"
+# line 135 "idl.ll"
 return IDL_TRUETOK;
 	YY_BREAK
 case 31:
 YY_USER_ACTION
-# line 129 "idl.ll"
+# line 136 "idl.ll"
 return IDL_FALSETOK;
 	YY_BREAK
 case 32:
 YY_USER_ACTION
-# line 131 "idl.ll"
+# line 138 "idl.ll"
 return IDL_INOUT;
 	YY_BREAK
 case 33:
 YY_USER_ACTION
-# line 132 "idl.ll"
+# line 139 "idl.ll"
 return IDL_IN;
 	YY_BREAK
 case 34:
 YY_USER_ACTION
-# line 133 "idl.ll"
+# line 140 "idl.ll"
 return IDL_OUT;
 	YY_BREAK
 case 35:
 YY_USER_ACTION
-# line 134 "idl.ll"
+# line 141 "idl.ll"
 return IDL_ONEWAY;
 	YY_BREAK
 case 36:
 YY_USER_ACTION
-# line 136 "idl.ll"
+# line 143 "idl.ll"
 return IDL_LEFT_SHIFT;
 	YY_BREAK
 case 37:
 YY_USER_ACTION
-# line 137 "idl.ll"
+# line 144 "idl.ll"
 return IDL_RIGHT_SHIFT;
 	YY_BREAK
 case 38:
 YY_USER_ACTION
-# line 138 "idl.ll"
+# line 145 "idl.ll"
 {
 		  yylval.strval = "::";
 		  return IDL_SCOPE_DELIMITOR;
@@ -1007,143 +1014,138 @@ YY_USER_ACTION
 	YY_BREAK
 case 39:
 YY_USER_ACTION
-# line 143 "idl.ll"
+# line 150 "idl.ll"
 {
-    char *z = (char *) malloc(strlen(__yytext) + 1);
-    strcpy(z, __yytext);
+    char *z = (char *) malloc(strlen(__yytext ()) + 1);
+    strcpy(z, __yytext ());
     yylval.strval = z;
     return IDENTIFIER;
 }
 	YY_BREAK
 case 40:
 YY_USER_ACTION
-# line 150 "idl.ll"
+# line 157 "idl.ll"
 {
-                  yylval.dval = idl_atof(__yytext);
+                  yylval.dval = idl_atof(__yytext ());
                   return IDL_FLOATING_PT_LITERAL;
                 }
 	YY_BREAK
 case 41:
 YY_USER_ACTION
-# line 154 "idl.ll"
+# line 161 "idl.ll"
 {
-                  yylval.dval = idl_atof(__yytext);
+                  yylval.dval = idl_atof(__yytext ());
                   return IDL_FLOATING_PT_LITERAL;
                 }
 	YY_BREAK
 case 42:
 YY_USER_ACTION
-# line 159 "idl.ll"
+# line 166 "idl.ll"
 {
-		  yylval.ival = idl_atoi(__yytext, 10);
+		  yylval.ival = idl_atoi(__yytext (), 10);
 		  return IDL_INTEGER_LITERAL;
 	        }
 	YY_BREAK
 case 43:
 YY_USER_ACTION
-# line 163 "idl.ll"
+# line 170 "idl.ll"
 {
-		  yylval.ival = idl_atoi(__yytext, 16);
+		  yylval.ival = idl_atoi(__yytext (), 16);
 		  return IDL_INTEGER_LITERAL;
 	        }
 	YY_BREAK
 case 44:
 YY_USER_ACTION
-# line 167 "idl.ll"
+# line 174 "idl.ll"
 {
-		  yylval.ival = idl_atoi(__yytext, 8);
+		  yylval.ival = idl_atoi(__yytext (), 8);
 		  return IDL_INTEGER_LITERAL;
 	      	}
 	YY_BREAK
 case 45:
 YY_USER_ACTION
-# line 172 "idl.ll"
+# line 179 "idl.ll"
 {
-		  __yytext[strlen(__yytext)-1] = '\0';
-		  yylval.sval = new String(__yytext + 1);
+		  /* Skip the quotes */
+		  char *tmp = __yytext ();
+		  tmp[strlen(tmp)-1] = '\0';
+		  yylval.sval = new String(tmp + 1);
 		  return IDL_STRING_LITERAL;
 	      	}
 	YY_BREAK
 case 46:
 YY_USER_ACTION
-# line 177 "idl.ll"
+# line 186 "idl.ll"
 {
-		  yylval.cval = __yytext[1];
+		  yylval.cval = __yytext() [1];
 		  return IDL_CHARACTER_LITERAL;
 	      	}
 	YY_BREAK
 case 47:
 YY_USER_ACTION
-# line 181 "idl.ll"
+# line 190 "idl.ll"
 {
 		  // octal character constant
-		  yylval.cval = idl_escape_reader(__yytext + 1);
+		  yylval.cval = idl_escape_reader(__yytext () + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	YY_BREAK
 case 48:
 YY_USER_ACTION
-# line 186 "idl.ll"
+# line 195 "idl.ll"
 {
-		  yylval.cval = idl_escape_reader(__yytext + 1);
+		  yylval.cval = idl_escape_reader(__yytext () + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	YY_BREAK
 case 49:
 YY_USER_ACTION
-# line 190 "idl.ll"
+# line 199 "idl.ll"
 {/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
-		  idl_store_pragma(__yytext);
+		  idl_store_pragma(__yytext ());
 		}
 	YY_BREAK
 case 50:
 YY_USER_ACTION
-# line 194 "idl.ll"
+# line 203 "idl.ll"
 {
-		  idl_parse_line_and_file(__yytext);
+		  idl_parse_line_and_file(__yytext ());
 		}
 	YY_BREAK
 case 51:
 YY_USER_ACTION
-# line 197 "idl.ll"
+# line 206 "idl.ll"
 {
-		  idl_parse_line_and_file(__yytext);
+		  idl_parse_line_and_file(__yytext ());
 		}
 	YY_BREAK
 case 52:
 YY_USER_ACTION
-# line 200 "idl.ll"
+# line 209 "idl.ll"
 {
-		  idl_parse_line_and_file(__yytext);
-		}
-	YY_BREAK
-case 53:
-YY_USER_ACTION
-# line 203 "idl.ll"
-{
-		  idl_parse_line_and_file(__yytext);
+		  idl_parse_line_and_file(__yytext ());
 	        }
 	YY_BREAK
-case 54:
+case 53:
 YY_USER_ACTION
-# line 206 "idl.ll"
+# line 212 "idl.ll"
 {
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	YY_BREAK
-case 55:
+case 54:
 YY_USER_ACTION
-# line 210 "idl.ll"
+# line 216 "idl.ll"
 {
 		  /* ignore comments */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	YY_BREAK
-case 56:
+case 55:
 YY_USER_ACTION
-# line 214 "idl.ll"
+# line 220 "idl.ll"
 {
 		  for(;;) {
 		    char c = yyinput();
@@ -1159,26 +1161,26 @@ YY_USER_ACTION
 	          }
 	        }
 	YY_BREAK
-case 57:
+case 56:
 YY_USER_ACTION
-# line 228 "idl.ll"
+# line 234 "idl.ll"
 ;
 	YY_BREAK
-case 58:
+case 57:
 YY_USER_ACTION
-# line 229 "idl.ll"
+# line 235 "idl.ll"
 {
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	YY_BREAK
-case 59:
+case 58:
 YY_USER_ACTION
-# line 232 "idl.ll"
-return __yytext[0];
+# line 238 "idl.ll"
+return __yytext () [0];
 	YY_BREAK
-case 60:
+case 59:
 YY_USER_ACTION
-# line 234 "idl.ll"
+# line 240 "idl.ll"
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -1465,7 +1467,7 @@ static yy_state_type yy_get_previous_state()
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 278 )
+			if ( yy_current_state >= 277 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1500,11 +1502,11 @@ yy_state_type yy_current_state;
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 278 )
+		if ( yy_current_state >= 277 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 277);
+	yy_is_jam = (yy_current_state == 276);
 
 	return yy_is_jam ? 0 : yy_current_state;
 	}
@@ -1887,7 +1889,7 @@ void *ptr;
 	{
 	free( ptr );
 	}
-# line 234 "idl.ll"
+# line 240 "idl.ll"
 
 	/* subroutines */
 
@@ -1964,7 +1966,7 @@ idl_parse_line_and_file(char *buf)
 
           h[i] = h[j];
         }
-
+      h[i] = '\0';
       idl_global->set_filename(new String(h));
     }
   idl_global->set_in_main_file(