*** empty log message ***

5 files changed, 909 insertions, 591 deletions

diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile
index c70d84010b5..dec1c87b205 100644
--- a/TAO/TAO_IDL/fe/Makefile
+++ b/TAO/TAO_IDL/fe/Makefile
@@ -81,8 +81,11 @@ lex.yy.cpp: idl.ll y.tab.h
 .obj/fe_declarator.o .shobj/fe_declarator.so: fe_declarator.cpp ../include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -91,7 +94,6 @@ lex.yy.cpp: idl.ll y.tab.h
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Version.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/streams.h \
  ../include/intlmacros.h ../include/idl_narrow.h \
  ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
  ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
@@ -109,22 +111,25 @@ lex.yy.cpp: idl.ll y.tab.h
  ../include/ast_constant.h ../include/ast_enum_val.h \
  ../include/ast_array.h ../include/ast_sequence.h \
  ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
+ ../include/ast_native.h ../include/utl_strlist.h \
+ ../include/utl_exprlist.h ../include/ast_generator.h \
+ ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
+ ../include/utl_exceptlist.h ../include/utl_namelist.h \
+ ../include/utl_labellist.h ../include/utl_decllist.h \
+ ../include/idl_global.h ../include/utl_error.h \
+ ../include/utl_indenter.h ../include/idl_extern.h \
+ ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
+ ../include/ast_extern.h ../include/nr_extern.h \
+ ../include/global_extern.h ../include/fe_private.h \
+ ../include/fe_interface_header.h ../include/fe_declarator.h
 .obj/fe_private.o .shobj/fe_private.so: fe_private.cpp ../include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -133,7 +138,6 @@ lex.yy.cpp: idl.ll y.tab.h
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Version.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/streams.h \
  ../include/intlmacros.h ../include/idl_narrow.h \
  ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
  ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
@@ -151,22 +155,25 @@ lex.yy.cpp: idl.ll y.tab.h
  ../include/ast_constant.h ../include/ast_enum_val.h \
  ../include/ast_array.h ../include/ast_sequence.h \
  ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
+ ../include/ast_native.h ../include/utl_strlist.h \
+ ../include/utl_exprlist.h ../include/ast_generator.h \
+ ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
+ ../include/utl_exceptlist.h ../include/utl_namelist.h \
+ ../include/utl_labellist.h ../include/utl_decllist.h \
+ ../include/idl_global.h ../include/utl_error.h \
+ ../include/utl_indenter.h ../include/idl_extern.h \
+ ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
+ ../include/ast_extern.h ../include/nr_extern.h \
+ ../include/global_extern.h ../include/fe_private.h \
+ ../include/fe_interface_header.h ../include/fe_declarator.h
 .obj/fe_init.o .shobj/fe_init.so: fe_init.cpp ../include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -175,7 +182,6 @@ lex.yy.cpp: idl.ll y.tab.h
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Version.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/streams.h \
  ../include/intlmacros.h ../include/idl_narrow.h \
  ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
  ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
@@ -193,22 +199,25 @@ lex.yy.cpp: idl.ll y.tab.h
  ../include/ast_constant.h ../include/ast_enum_val.h \
  ../include/ast_array.h ../include/ast_sequence.h \
  ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
+ ../include/ast_native.h ../include/utl_strlist.h \
+ ../include/utl_exprlist.h ../include/ast_generator.h \
+ ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
+ ../include/utl_exceptlist.h ../include/utl_namelist.h \
+ ../include/utl_labellist.h ../include/utl_decllist.h \
+ ../include/idl_global.h ../include/utl_error.h \
+ ../include/utl_indenter.h ../include/idl_extern.h \
+ ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
+ ../include/ast_extern.h ../include/nr_extern.h \
+ ../include/global_extern.h ../include/fe_private.h \
+ ../include/fe_interface_header.h ../include/fe_declarator.h
 .obj/fe_extern.o .shobj/fe_extern.so: fe_extern.cpp ../include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -217,7 +226,6 @@ lex.yy.cpp: idl.ll y.tab.h
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Version.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/streams.h \
  ../include/intlmacros.h ../include/idl_narrow.h \
  ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
  ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
@@ -235,22 +243,25 @@ lex.yy.cpp: idl.ll y.tab.h
  ../include/ast_constant.h ../include/ast_enum_val.h \
  ../include/ast_array.h ../include/ast_sequence.h \
  ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
+ ../include/ast_native.h ../include/utl_strlist.h \
+ ../include/utl_exprlist.h ../include/ast_generator.h \
+ ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
+ ../include/utl_exceptlist.h ../include/utl_namelist.h \
+ ../include/utl_labellist.h ../include/utl_decllist.h \
+ ../include/idl_global.h ../include/utl_error.h \
+ ../include/utl_indenter.h ../include/idl_extern.h \
+ ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
+ ../include/ast_extern.h ../include/nr_extern.h \
+ ../include/global_extern.h ../include/fe_private.h \
+ ../include/fe_interface_header.h ../include/fe_declarator.h
 .obj/fe_interface_header.o .shobj/fe_interface_header.so: fe_interface_header.cpp ../include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -259,7 +270,6 @@ lex.yy.cpp: idl.ll y.tab.h
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Version.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/streams.h \
  ../include/intlmacros.h ../include/idl_narrow.h \
  ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
  ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
@@ -277,22 +287,25 @@ lex.yy.cpp: idl.ll y.tab.h
  ../include/ast_constant.h ../include/ast_enum_val.h \
  ../include/ast_array.h ../include/ast_sequence.h \
  ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
+ ../include/ast_native.h ../include/utl_strlist.h \
+ ../include/utl_exprlist.h ../include/ast_generator.h \
+ ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
+ ../include/utl_exceptlist.h ../include/utl_namelist.h \
+ ../include/utl_labellist.h ../include/utl_decllist.h \
+ ../include/idl_global.h ../include/utl_error.h \
+ ../include/utl_indenter.h ../include/idl_extern.h \
+ ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
+ ../include/ast_extern.h ../include/nr_extern.h \
+ ../include/global_extern.h ../include/fe_private.h \
+ ../include/fe_interface_header.h ../include/fe_declarator.h
 .obj/y.tab.o .shobj/y.tab.so: y.tab.cpp ../include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -301,7 +314,6 @@ lex.yy.cpp: idl.ll y.tab.h
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Version.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/streams.h \
  ../include/intlmacros.h ../include/idl_narrow.h \
  ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
  ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
@@ -319,22 +331,25 @@ lex.yy.cpp: idl.ll y.tab.h
  ../include/ast_constant.h ../include/ast_enum_val.h \
  ../include/ast_array.h ../include/ast_sequence.h \
  ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
+ ../include/ast_native.h ../include/utl_strlist.h \
+ ../include/utl_exprlist.h ../include/ast_generator.h \
+ ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
+ ../include/utl_exceptlist.h ../include/utl_namelist.h \
+ ../include/utl_labellist.h ../include/utl_decllist.h \
+ ../include/idl_global.h ../include/utl_error.h \
+ ../include/utl_indenter.h ../include/idl_extern.h \
+ ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
+ ../include/ast_extern.h ../include/nr_extern.h \
+ ../include/global_extern.h ../include/fe_private.h \
+ ../include/fe_interface_header.h ../include/fe_declarator.h
 .obj/lex.yy.o .shobj/lex.yy.so: lex.yy.cpp ../include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -343,7 +358,6 @@ lex.yy.cpp: idl.ll y.tab.h
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Version.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/streams.h \
  ../include/intlmacros.h ../include/idl_narrow.h \
  ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
  ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
@@ -361,16 +375,16 @@ lex.yy.cpp: idl.ll y.tab.h
  ../include/ast_constant.h ../include/ast_enum_val.h \
  ../include/ast_array.h ../include/ast_sequence.h \
  ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h y.tab.h
+ ../include/ast_native.h ../include/utl_strlist.h \
+ ../include/utl_exprlist.h ../include/ast_generator.h \
+ ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
+ ../include/utl_exceptlist.h ../include/utl_namelist.h \
+ ../include/utl_labellist.h ../include/utl_decllist.h \
+ ../include/idl_global.h ../include/utl_error.h \
+ ../include/utl_indenter.h ../include/idl_extern.h \
+ ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
+ ../include/ast_extern.h ../include/nr_extern.h \
+ ../include/global_extern.h ../include/fe_private.h \
+ ../include/fe_interface_header.h ../include/fe_declarator.h y.tab.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 9b41d547492..43f0cd0029b 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -128,6 +128,7 @@ wchar_t		return IDL_WCHAR;
 boolean		return IDL_BOOLEAN;
 octet		return IDL_OCTET;
 void		return IDL_VOID;
+native          return IDL_NATIVE;
 
 TRUE		return IDL_TRUETOK;
 FALSE		return IDL_FALSETOK;
@@ -269,13 +270,13 @@ idl_parse_line_and_file(char *buf)
   UTL_String	*nm;
 
   /* Skip initial '#' */
-  if (*r != '#') 
+  if (*r != '#')
     return;
   else
     r++;
 
   /* Check to see if we're running under the screwy Microsoft scheme */
-  /* of putting #line num instead of #num. */ 
+  /* of putting #line num instead of #num. */
 
   if (ACE_OS::strncmp (r, "line", 4) == 0)
     r += 5;
@@ -290,7 +291,7 @@ idl_parse_line_and_file(char *buf)
   idl_global->set_lineno(idl_atoi(h, 10));
 
   /* Find file name, if present */
-  for (; *r != '"'; r++) 
+  for (; *r != '"'; r++)
     if (*r == '\n' || *r == '\0')
       return;
 
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 63ef3e24b25..5e0869bebc5 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -161,6 +161,7 @@ extern int yyleng;
 %token		IDL_INOUT
 %token		IDL_RAISES
 %token		IDL_CONTEXT
+%token          IDL_NATIVE
 
 %token <ival>	IDL_INTEGER_LITERAL
 %token <sval>	IDL_STRING_LITERAL
@@ -870,6 +871,28 @@ type_dcl
 	| struct_type { $$ = 0;}
 	| union_type  { $$ = 0;}
 	| enum_type   { $$ = 0;}
+        | IDL_NATIVE simple_declarator
+        {
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  AST_Native		*node = NULL;
+	  AST_Decl		*v = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+          ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen);
+	  /*
+	   * Create a node representing a Native and add it to its
+	   * enclosing scope
+	   */
+	  if (s != NULL) {
+	    node = idl_global->gen()->create_native ($2->name (), p);
+	    /*
+	     * Add it to its defining scope
+	     */
+	    (void) s->fe_add_native (node);
+	  }
+	}
 	;
 
 type_declarator :
@@ -886,7 +909,7 @@ type_declarator :
 	  AST_Decl		*v = NULL;
 	  UTL_StrList		*p = idl_global->pragmas();
 
-      ACE_UNUSED_ARG (v);
+          ACE_UNUSED_ARG (v);
 
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
 	  /*
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index ca89291620e..b1be52d007b 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -1,10 +1,12 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
  */
 
 #define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
 
 #include /**/ <stdio.h>
 
@@ -30,7 +32,7 @@
 
 #else	/* ! __cplusplus */
 
-#ifdef __STDC__
+#if __STDC__
 
 #define YY_USE_PROTOS
 #define YY_USE_CONST
@@ -38,16 +40,19 @@
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-
 #ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include /**/ <io.h>
+#include /**/ <stdlib.h>
 #define YY_USE_CONST
+#define YY_USE_PROTOS
 #endif
 
-
-#ifndef YY_USE_CONST
-#ifndef const
-#define const
-#endif
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
 #endif
 
 
@@ -74,16 +79,16 @@
 #define BEGIN yy_start = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
  */
 #define YY_START ((yy_start - 1) / 2)
+#define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
-/* Special action meaning "start processing a new file".  Now included
- * only for backward compatibility with previous versions of flex.
- */
+/* Special action meaning "start processing a new file". */
 #define YY_NEW_FILE yyrestart( yyin )
 
 #define YY_END_OF_BUFFER_CHAR 0
@@ -96,14 +101,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 extern int yyleng;
 extern FILE *yyin, *yyout;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-	extern int yywrap YY_PROTO(( void ));
-#ifdef __cplusplus
-	}
-#endif
-
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
@@ -129,6 +126,7 @@ extern "C" {
 		{ \
 		/* Undo effects of setting up yytext. */ \
 		*yy_cp = yy_hold_char; \
+		YY_RESTORE_YY_MORE_OFFSET \
 		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
@@ -136,6 +134,12 @@ extern "C" {
 
 #define unput(c) yyunput( c, yytext_ptr )
 
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+typedef unsigned int yy_size_t;
+
 
 struct yy_buffer_state
 	{
@@ -147,13 +151,19 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	int yy_buf_size;
+	yy_size_t yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
 	int 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 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 fread(), to make sure we stop fetching input after
@@ -161,6 +171,12 @@ struct yy_buffer_state
 	 */
 	int 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 yy_at_bol;
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -209,55 +225,59 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
 void yyrestart YY_PROTO(( FILE *input_file ));
+
 void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
 void yy_load_buffer_state YY_PROTO(( void ));
 YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
 void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
 void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
 
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-static void yy_push_state YY_PROTO(( int new_state ));
-static void yy_pop_state YY_PROTO(( void ));
-static int yy_top_state YY_PROTO(( void ));
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
-static void *yy_flex_alloc YY_PROTO(( unsigned int ));
-static void *yy_flex_realloc YY_PROTO(( void *, unsigned int ));
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
 
-#define INITIAL 0
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
+
 typedef unsigned char YY_CHAR;
-typedef int yy_state_type;
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+typedef int yy_state_type;
 extern char yytext[];
 
 
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, const char *, int ));
-#endif
-
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-
 static yy_state_type yy_get_previous_state YY_PROTO(( void ));
 static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
 static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( const char msg[] ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	yytext_ptr = yy_bp; \
-	yyleng = yy_cp - yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
 	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	if ( yyleng >= YYLMAX ) \
@@ -265,42 +285,44 @@ 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_NUM_RULES 61
+#define YY_END_OF_BUFFER 62
+static yyconst short int yy_accept[284] =
     {   0,
-       57,   57,   61,   59,   57,   58,   59,   59,   59,   59,
-       44,   42,   59,   59,   59,   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,
-       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,
-
-        0,   41,   43,   39,   39,    1,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   34,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,    0,    0,    0,    0,    0,
-       48,   47,    0,    0,   40,   41,   39,   30,   39,   39,
-       18,   25,   39,   39,   39,   39,   12,   39,   39,   39,
-       39,   22,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   29,   39,   39,    0,    0,
-        0,    0,    0,   47,    0,   31,   39,   39,    9,   39,
-       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
+       58,   58,   62,   60,   58,   59,   60,   60,   60,   60,
+       45,   43,   60,   60,   60,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   60,   58,    0,   46,    0,
+        0,   45,   43,   57,    0,   41,   45,    0,    0,    0,
+       43,   39,   37,   38,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   34,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,    0,   54,    0,    0,
+        0,    0,    0,   47,    0,   47,    0,    0,   56,   41,
+
+        0,   41,    0,   42,   44,   40,   40,    1,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   35,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,    0,    0,
+        0,    0,    0,   49,   48,    0,    0,   41,   42,   40,
+       31,   40,   40,   18,   25,   40,   40,   40,   40,   12,
+       40,   40,   40,   40,   22,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   29,
+       40,   40,    0,    0,    0,    0,    0,   48,    0,   32,
+       40,   40,    9,   40,   40,   40,   40,   20,   33,   40,
+
+       40,   40,   28,   40,   40,   40,   40,   23,   40,   40,
+       40,   40,   16,   40,   40,   40,   52,    0,    0,    0,
+        0,   40,   40,   40,   40,   21,   40,   40,    2,   30,
+       36,    3,   40,   40,   13,   11,   17,   40,   40,   40,
+       40,   51,    0,    0,    0,    0,    0,    0,   40,   27,
+        7,   19,   40,   40,   40,   40,   10,   40,   26,   40,
+        0,   55,    0,    0,    0,   40,   40,   40,    4,   15,
+       24,   40,    0,    0,    0,    5,    6,    8,   14,   53,
+        0,   50,    0
     } ;
 
-static const int yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -332,7 +354,7 @@ static const int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static const int yy_meta[55] =
+static yyconst int yy_meta[55] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    3,    3,    3,    1,    1,    1,    3,    3,
@@ -342,136 +364,141 @@ static const int yy_meta[55] =
         4,    4,    4,    4
     } ;
 
-static const short int yy_base[288] =
+static yyconst short int yy_base[294] =
     {   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,  444,  449,  451,   53,  451,  443,  417,   45,   53,
+       53,   58,  430,  428,  426,    0,  424,  417,   13,  397,
+       31,   40,   34,  399,  396,  394,  393,  404,   47,   56,
+       44,  381,  391,  389,   51,  105,   96,  427,  451,  424,
+       88,  100,  111,  451,  427,  141,  128,  155,  170,    0,
+      160,  451,  451,  451,    0,  405,  400,  373,  377,  381,
+      376,  391,  379,  384,  370,  369,  384,  373,   42,  373,
+      380,  365,  364,  376,  362,  370,  377,  362,  363,  359,
+      365,  359,   64,  363,  363,  352,  184,  451,  111,  189,
+      365,  359,  351,  451,  390,  389,  120,  392,  451,    0,
+
+      196,  451,  144,  199,    0,  368,  372,    0,  345,  350,
+      354,  342,   82,  356,  354,  344,  349,  352,  333,  346,
+      343,  330,  339,  342,  325,    0,  328,  340,  324,  326,
+       88,  323,  335,  326,  329,  333,  335,  319,  360,  359,
+      327,  319,  329,  451,  451,  187,  202,  213,  451,  339,
+        0,  319,  322,    0,    0,  308,  320,  305,  313,    0,
+      308,  303,  302,  303,    0,  308,  297,  298,  314,  309,
+      300,  307,  293,  298,  306,  305,  303,  294,  298,    0,
+      288,  294,  328,  157,  289,  295,  292,  451,  322,    0,
+      295,  295,    0,  273,  284,  288,  274,    0,    0,  285,
+
+      285,  284,    0,  265,  270,  274,  273,    0,  277,  265,
+      274,  276,    0,  268,  279,  266,  451,  205,  259,  228,
+      265,  256,  262,  255,  254,    0,  262,  269,    0,    0,
+        0,    0,  237,  238,    0,    0,    0,  220,  215,  199,
+      201,  451,  231,  235,  245,  251,  248,  201,  182,    0,
+        0,    0,  181,  188,  153,  159,    0,  155,    0,  158,
+      169,  451,  162,  146,  101,  112,  101,  104,    0,    0,
+        0,   88,  130,  120,  114,    0,    0,    0,    0,  451,
+      107,  451,  451,  266,  270,  272,  276,  280,   75,  284,
+      288,  292,  296
+
     } ;
 
-static const short int yy_def[288] =
+static yyconst short int yy_def[294] =
     {   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
+      283,    1,  283,  283,  283,  283,  284,  285,  283,  283,
+      283,  283,  283,  283,  283,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  283,  283,  284,  283,  283,
+      287,  283,  283,  283,  288,  283,  283,  283,  283,  289,
+      283,  283,  283,  283,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  283,  283,   36,  283,
+      283,  283,  283,  283,  283,  283,  283,  288,  283,   46,
+
+      283,  283,  283,  283,  289,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  290,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  290,  283,  283,  283,  283,  283,  283,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  283,  283,  283,  283,
+      283,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  283,  283,  291,  283,  283,  283,  283,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      291,  283,  292,  283,  283,  286,  286,  286,  286,  286,
+      286,  286,  292,  283,  293,  286,  286,  286,  286,  283,
+      293,  283,    0,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283
+
     } ;
 
-static const short int yy_nxt[501] =
+static yyconst short int yy_nxt[506] =
     {   0,
         4,    5,    6,    5,    7,    4,    8,    4,    4,    9,
         4,   10,   11,   12,   12,   13,   14,   15,   16,   16,
        16,   17,   16,   16,   16,   16,   18,   16,   16,    4,
         4,   19,   20,   21,   22,   23,   24,   16,   16,   25,
-       26,   27,   16,   28,   16,   16,   29,   30,   31,   32,
-       33,   34,   16,   16,   36,   57,   36,   41,   42,   42,
-       43,   58,   60,   45,   44,   46,   46,   47,   45,   61,
-       50,   50,   50,   48,   62,   63,   65,  103,   48,   76,
-       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
-
+       26,   27,   28,   29,   16,   16,   30,   31,   32,   33,
+       34,   35,   16,   16,   37,   58,   37,   42,   43,   43,
+       44,   59,   61,   46,   45,   47,   47,   48,   46,   62,
+       51,   51,   51,   49,   63,   64,   66,  105,   49,   78,
+       73,   50,   79,   65,   85,  119,   67,   76,   49,   74,
+      120,   77,   80,   49,   96,   81,   75,   37,   86,   37,
+
+       97,   97,  275,  134,  275,   50,   87,   88,   89,  282,
+       46,  135,   47,   47,   48,  139,  282,   90,   90,   90,
+       49,   46,  280,   51,   51,   51,  145,  174,   50,  156,
+      157,   49,  146,  146,  274,   49,  279,  175,   46,  278,
+       47,   47,   48,  277,   91,   92,   49,  276,   49,   93,
+      263,  283,   50,  100,  100,  100,  104,  104,  104,  217,
+      218,  101,  102,   49,  102,   46,  274,   48,   48,   48,
+       46,  262,   51,   51,   51,   49,  101,  102,  103,  103,
+       49,  102,  104,  104,  104,   87,   88,   89,  272,  271,
+       49,   88,  140,  188,  270,   49,   90,   90,   90,  189,
+
+      189,   90,   90,   90,  147,  147,  269,  242,  148,  148,
+      148,  104,  104,  104,  148,  148,  148,  243,  243,  243,
+      149,  268,  149,   91,  267,  148,  148,  148,   93,  245,
+      266,  246,  265,  242,  102,  149,  102,  262,  260,  149,
+      247,  247,  247,  243,  243,  243,  245,  259,  246,  102,
+      258,  264,  245,  102,  246,  263,  257,  247,  247,  247,
+      247,  247,  247,  247,  247,  247,   38,   38,   38,   38,
+       40,  256,   40,   40,   55,   55,   95,  255,   95,   95,
+       98,   98,   98,   98,  183,  183,  183,  183,  261,  261,
+      261,  261,  273,  273,  273,  273,  281,  281,  281,  281,
+
+      254,  253,  252,  251,  250,  249,  248,  244,  241,  240,
+      239,  238,  237,  236,  235,  234,  233,  232,  231,  230,
+      229,  228,  227,  226,  225,  224,  223,  222,  188,  221,
+      220,  219,  184,  216,  215,  214,  213,  212,  211,  210,
+      209,  208,  207,  206,  205,  204,  203,  202,  201,  200,
+      199,  198,  197,  196,  195,  194,  193,  192,  191,  190,
+      187,  186,  185,  139,  184,  182,  181,  180,  179,  178,
+      177,  176,  173,  172,  171,  170,  169,  168,  167,  166,
+      165,  164,  163,  162,  161,  160,  159,  158,  155,  154,
+      153,  152,  151,  150,   99,  144,  144,  143,  142,  141,
+
+      138,  137,  136,  133,  132,  131,  130,  129,  128,  127,
+      126,  125,  124,  123,  122,  121,  118,  117,  116,  115,
+      114,  113,  112,  111,  110,  109,  108,  107,  106,   99,
+       94,   39,   84,   83,   82,   72,   71,   70,   69,   68,
+       60,   57,   56,   54,   53,   52,   41,   39,  283,   36,
+        3,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+
+      283,  283,  283,  283,  283
     } ;
 
-static const short int yy_chk[501] =
+static yyconst short int yy_chk[506] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -480,54 +507,55 @@ 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,
-       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
-
+       12,   12,   12,   11,   21,   22,   23,  289,   12,   31,
+       29,   11,   31,   22,   35,   69,   23,   30,   11,   29,
+       69,   30,   31,   12,   41,   31,   29,   37,   35,   37,
+
+       41,   41,  265,   83,  265,   11,   36,   36,   36,  281,
+       42,   83,   42,   42,   42,   89,  275,   36,   36,   36,
+       42,   43,  274,   43,   43,   43,   97,  131,   42,  113,
+      113,   43,   97,   97,  273,   42,  272,  131,   47,  268,
+       47,   47,   47,  267,   36,   36,   43,  266,   47,   36,
+      264,   89,   42,   46,   46,   46,  103,  103,  103,  184,
+      184,   46,   46,   47,   46,   48,  263,   48,   48,   48,
+       51,  261,   51,   51,   51,   48,   46,   46,   49,   49,
+       51,   46,   49,   49,   49,   87,   87,   87,  260,  258,
+       48,   90,   90,  146,  256,   51,   87,   87,   87,  146,
+
+      146,   90,   90,   90,  101,  101,  255,  218,  101,  101,
+      101,  104,  104,  104,  147,  147,  147,  218,  218,  218,
+      104,  254,  104,   87,  253,  148,  148,  148,   87,  220,
+      249,  220,  248,  243,  148,  104,  148,  244,  241,  104,
+      220,  220,  220,  243,  243,  243,  245,  240,  245,  148,
+      239,  247,  246,  148,  246,  246,  238,  245,  245,  245,
+      247,  247,  247,  246,  246,  246,  284,  284,  284,  284,
+      285,  234,  285,  285,  286,  286,  287,  233,  287,  287,
+      288,  288,  288,  288,  290,  290,  290,  290,  291,  291,
+      291,  291,  292,  292,  292,  292,  293,  293,  293,  293,
+
+      228,  227,  225,  224,  223,  222,  221,  219,  216,  215,
+      214,  212,  211,  210,  209,  207,  206,  205,  204,  202,
+      201,  200,  197,  196,  195,  194,  192,  191,  189,  187,
+      186,  185,  183,  182,  181,  179,  178,  177,  176,  175,
+      174,  173,  172,  171,  170,  169,  168,  167,  166,  164,
+      163,  162,  161,  159,  158,  157,  156,  153,  152,  150,
+      143,  142,  141,  140,  139,  138,  137,  136,  135,  134,
+      133,  132,  130,  129,  128,  127,  125,  124,  123,  122,
+      121,  120,  119,  118,  117,  116,  115,  114,  112,  111,
+      110,  109,  107,  106,   98,   96,   95,   93,   92,   91,
+
+       86,   85,   84,   82,   81,   80,   79,   78,   77,   76,
+       75,   74,   73,   72,   71,   70,   68,   67,   66,   65,
+       64,   63,   62,   61,   60,   59,   58,   57,   56,   45,
+       40,   38,   34,   33,   32,   28,   27,   26,   25,   24,
+       20,   18,   17,   15,   14,   13,    8,    7,    3,    2,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+
+      283,  283,  283,  283,  283
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -539,14 +567,16 @@ static char *yy_last_accepting_cpos;
 #define REJECT reject_used_but_not_detected
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
 #ifndef YYLMAX
 #define YYLMAX 8192
 #endif
 
 char yytext[YYLMAX];
 char *yytext_ptr;
-# line 1 "idl.ll"
-# line 3 "idl.ll"
+#line 1 "idl.ll"
+#define INITIAL 0
+#line 3 "idl.ll"
 /*
 
 COPYRIGHT
@@ -645,6 +675,54 @@ inline char *__yytext()
  * section 1.
  */
 
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap YY_PROTO(( void ));
+#else
+extern int yywrap YY_PROTO(( void ));
+#endif
+#endif
+
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+#endif
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+static int yyinput YY_PROTO(( void ));
+#else
+static int input YY_PROTO(( void ));
+#endif
+#endif
+
+#if YY_STACK_USED
+static int yy_start_stack_ptr = 0;
+static int yy_start_stack_depth = 0;
+static int *yy_start_stack = 0;
+#ifndef YY_NO_PUSH_STATE
+static void yy_push_state YY_PROTO(( int new_state ));
+#endif
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state YY_PROTO(( void ));
+#endif
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state YY_PROTO(( void ));
+#endif
+
+#else
+#define YY_NO_PUSH_STATE 1
+#define YY_NO_POP_STATE 1
+#define YY_NO_TOP_STATE 1
+#endif
+
 #ifdef YY_MALLOC_DECL
 YY_MALLOC_DECL
 #else
@@ -681,9 +759,15 @@ YY_MALLOC_DECL
 #define YY_INPUT(buf,result,max_size) \
 	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = getc( yyin ); \
-		result = c == EOF ? 0 : 1; \
-		buf[0] = (char) c; \
+		int c = '*', n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
 		} \
 	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
 		  && ferror( yyin ) ) \
@@ -727,18 +811,26 @@ YY_MALLOC_DECL
 #define YY_BREAK break;
 #endif
 
+#define YY_RULE_SETUP \
+	if ( yyleng > 0 ) \
+		yy_current_buffer->yy_at_bol = \
+				(yytext[yyleng - 1] == '\n'); \
+	YY_USER_ACTION
+
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-# line 100 "idl.ll"
+#line 100 "idl.ll"
 
 
 
 	if ( yy_init )
 		{
+		yy_init = 0;
+
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
@@ -752,15 +844,11 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( yy_current_buffer )
-			yy_init_buffer( yy_current_buffer, yyin );
-		else
+		if ( ! yy_current_buffer )
 			yy_current_buffer =
 				yy_create_buffer( yyin, YY_BUF_SIZE );
 
 		yy_load_buffer_state();
-
-		yy_init = 0;
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
@@ -776,8 +864,7 @@ YY_DECL
 		yy_bp = yy_cp;
 
 		yy_current_state = yy_start;
-		if ( yy_bp[-1] == '\n' )
-			++yy_current_state;
+		yy_current_state += YY_AT_BOL();
 yy_match:
 		do
 			{
@@ -790,16 +877,22 @@ 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 >= 284 )
 					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] != 451 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
+			yy_act = yy_accept[yy_current_state];
+			}
 
 		YY_DO_BEFORE_ACTION;
 
@@ -817,201 +910,206 @@ do_action:	/* This label is used only to access EOF actions. */
 			goto yy_find_action;
 
 case 1:
-YY_USER_ACTION
-# line 102 "idl.ll"
+YY_RULE_SETUP
+#line 102 "idl.ll"
 return IDL_ANY;
 	YY_BREAK
 case 2:
-YY_USER_ACTION
-# line 103 "idl.ll"
+YY_RULE_SETUP
+#line 103 "idl.ll"
 return IDL_MODULE;
 	YY_BREAK
 case 3:
-YY_USER_ACTION
-# line 104 "idl.ll"
+YY_RULE_SETUP
+#line 104 "idl.ll"
 return IDL_RAISES;
 	YY_BREAK
 case 4:
-YY_USER_ACTION
-# line 105 "idl.ll"
+YY_RULE_SETUP
+#line 105 "idl.ll"
 return IDL_READONLY;
 	YY_BREAK
 case 5:
-YY_USER_ACTION
-# line 106 "idl.ll"
+YY_RULE_SETUP
+#line 106 "idl.ll"
 return IDL_ATTRIBUTE;
 	YY_BREAK
 case 6:
-YY_USER_ACTION
-# line 107 "idl.ll"
+YY_RULE_SETUP
+#line 107 "idl.ll"
 return IDL_EXCEPTION;
 	YY_BREAK
 case 7:
-YY_USER_ACTION
-# line 108 "idl.ll"
+YY_RULE_SETUP
+#line 108 "idl.ll"
 return IDL_CONTEXT;
 	YY_BREAK
 case 8:
-YY_USER_ACTION
-# line 109 "idl.ll"
+YY_RULE_SETUP
+#line 109 "idl.ll"
 return IDL_INTERFACE;
 	YY_BREAK
 case 9:
-YY_USER_ACTION
-# line 110 "idl.ll"
+YY_RULE_SETUP
+#line 110 "idl.ll"
 return IDL_CONST;
 	YY_BREAK
 case 10:
-YY_USER_ACTION
-# line 111 "idl.ll"
+YY_RULE_SETUP
+#line 111 "idl.ll"
 return IDL_TYPEDEF;
 	YY_BREAK
 case 11:
-YY_USER_ACTION
-# line 112 "idl.ll"
+YY_RULE_SETUP
+#line 112 "idl.ll"
 return IDL_STRUCT;
 	YY_BREAK
 case 12:
-YY_USER_ACTION
-# line 113 "idl.ll"
+YY_RULE_SETUP
+#line 113 "idl.ll"
 return IDL_ENUM;
 	YY_BREAK
 case 13:
-YY_USER_ACTION
-# line 114 "idl.ll"
+YY_RULE_SETUP
+#line 114 "idl.ll"
 return IDL_STRING;
 	YY_BREAK
 case 14:
-YY_USER_ACTION
-# line 115 "idl.ll"
+YY_RULE_SETUP
+#line 115 "idl.ll"
 return IDL_WSTRING;
 	YY_BREAK
 case 15:
-YY_USER_ACTION
-# line 116 "idl.ll"
+YY_RULE_SETUP
+#line 116 "idl.ll"
 return IDL_SEQUENCE;
 	YY_BREAK
 case 16:
-YY_USER_ACTION
-# line 117 "idl.ll"
+YY_RULE_SETUP
+#line 117 "idl.ll"
 return IDL_UNION;
 	YY_BREAK
 case 17:
-YY_USER_ACTION
-# line 118 "idl.ll"
+YY_RULE_SETUP
+#line 118 "idl.ll"
 return IDL_SWITCH;
 	YY_BREAK
 case 18:
-YY_USER_ACTION
-# line 119 "idl.ll"
+YY_RULE_SETUP
+#line 119 "idl.ll"
 return IDL_CASE;
 	YY_BREAK
 case 19:
-YY_USER_ACTION
-# line 120 "idl.ll"
+YY_RULE_SETUP
+#line 120 "idl.ll"
 return IDL_DEFAULT;
 	YY_BREAK
 case 20:
-YY_USER_ACTION
-# line 121 "idl.ll"
+YY_RULE_SETUP
+#line 121 "idl.ll"
 return IDL_FLOAT;
 	YY_BREAK
 case 21:
-YY_USER_ACTION
-# line 122 "idl.ll"
+YY_RULE_SETUP
+#line 122 "idl.ll"
 return IDL_DOUBLE;
 	YY_BREAK
 case 22:
-YY_USER_ACTION
-# line 123 "idl.ll"
+YY_RULE_SETUP
+#line 123 "idl.ll"
 return IDL_LONG;
 	YY_BREAK
 case 23:
-YY_USER_ACTION
-# line 124 "idl.ll"
+YY_RULE_SETUP
+#line 124 "idl.ll"
 return IDL_SHORT;
 	YY_BREAK
 case 24:
-YY_USER_ACTION
-# line 125 "idl.ll"
+YY_RULE_SETUP
+#line 125 "idl.ll"
 return IDL_UNSIGNED;
 	YY_BREAK
 case 25:
-YY_USER_ACTION
-# line 126 "idl.ll"
+YY_RULE_SETUP
+#line 126 "idl.ll"
 return IDL_CHAR;
 	YY_BREAK
 case 26:
-YY_USER_ACTION
-# line 127 "idl.ll"
+YY_RULE_SETUP
+#line 127 "idl.ll"
 return IDL_WCHAR;
 	YY_BREAK
 case 27:
-YY_USER_ACTION
-# line 128 "idl.ll"
+YY_RULE_SETUP
+#line 128 "idl.ll"
 return IDL_BOOLEAN;
 	YY_BREAK
 case 28:
-YY_USER_ACTION
-# line 129 "idl.ll"
+YY_RULE_SETUP
+#line 129 "idl.ll"
 return IDL_OCTET;
 	YY_BREAK
 case 29:
-YY_USER_ACTION
-# line 130 "idl.ll"
+YY_RULE_SETUP
+#line 130 "idl.ll"
 return IDL_VOID;
 	YY_BREAK
 case 30:
-YY_USER_ACTION
-# line 132 "idl.ll"
-return IDL_TRUETOK;
+YY_RULE_SETUP
+#line 131 "idl.ll"
+return IDL_NATIVE;
 	YY_BREAK
 case 31:
-YY_USER_ACTION
-# line 133 "idl.ll"
-return IDL_FALSETOK;
+YY_RULE_SETUP
+#line 133 "idl.ll"
+return IDL_TRUETOK;
 	YY_BREAK
 case 32:
-YY_USER_ACTION
-# line 135 "idl.ll"
-return IDL_INOUT;
+YY_RULE_SETUP
+#line 134 "idl.ll"
+return IDL_FALSETOK;
 	YY_BREAK
 case 33:
-YY_USER_ACTION
-# line 136 "idl.ll"
-return IDL_IN;
+YY_RULE_SETUP
+#line 136 "idl.ll"
+return IDL_INOUT;
 	YY_BREAK
 case 34:
-YY_USER_ACTION
-# line 137 "idl.ll"
-return IDL_OUT;
+YY_RULE_SETUP
+#line 137 "idl.ll"
+return IDL_IN;
 	YY_BREAK
 case 35:
-YY_USER_ACTION
-# line 138 "idl.ll"
-return IDL_ONEWAY;
+YY_RULE_SETUP
+#line 138 "idl.ll"
+return IDL_OUT;
 	YY_BREAK
 case 36:
-YY_USER_ACTION
-# line 140 "idl.ll"
-return IDL_LEFT_SHIFT;
+YY_RULE_SETUP
+#line 139 "idl.ll"
+return IDL_ONEWAY;
 	YY_BREAK
 case 37:
-YY_USER_ACTION
-# line 141 "idl.ll"
-return IDL_RIGHT_SHIFT;
+YY_RULE_SETUP
+#line 141 "idl.ll"
+return IDL_LEFT_SHIFT;
 	YY_BREAK
 case 38:
-YY_USER_ACTION
-# line 142 "idl.ll"
+YY_RULE_SETUP
+#line 142 "idl.ll"
+return IDL_RIGHT_SHIFT;
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 143 "idl.ll"
 {
 		  yylval.strval = "::";
 		  return IDL_SCOPE_DELIMITOR;
 		}
 	YY_BREAK
-case 39:
-YY_USER_ACTION
-# line 147 "idl.ll"
+case 40:
+YY_RULE_SETUP
+#line 148 "idl.ll"
 {
     char *z = (char *) malloc(strlen(ace_yytext) + 1);
     strcpy(z, ace_yytext);
@@ -1019,49 +1117,49 @@ YY_USER_ACTION
     return IDENTIFIER;
 }
 	YY_BREAK
-case 40:
-YY_USER_ACTION
-# line 154 "idl.ll"
+case 41:
+YY_RULE_SETUP
+#line 155 "idl.ll"
 {
                   yylval.dval = idl_atof(ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
 	YY_BREAK
-case 41:
-YY_USER_ACTION
-# line 158 "idl.ll"
+case 42:
+YY_RULE_SETUP
+#line 159 "idl.ll"
 {
                   yylval.dval = idl_atof(ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
 	YY_BREAK
-case 42:
-YY_USER_ACTION
-# line 163 "idl.ll"
+case 43:
+YY_RULE_SETUP
+#line 164 "idl.ll"
 {
 		  yylval.ival = idl_atoi(ace_yytext, 10);
 		  return IDL_INTEGER_LITERAL;
 	        }
 	YY_BREAK
-case 43:
-YY_USER_ACTION
-# line 167 "idl.ll"
+case 44:
+YY_RULE_SETUP
+#line 168 "idl.ll"
 {
 		  yylval.ival = idl_atoi(ace_yytext, 16);
 		  return IDL_INTEGER_LITERAL;
 	        }
 	YY_BREAK
-case 44:
-YY_USER_ACTION
-# line 171 "idl.ll"
+case 45:
+YY_RULE_SETUP
+#line 172 "idl.ll"
 {
 		  yylval.ival = idl_atoi(ace_yytext, 8);
 		  return IDL_INTEGER_LITERAL;
 	      	}
 	YY_BREAK
-case 45:
-YY_USER_ACTION
-# line 176 "idl.ll"
+case 46:
+YY_RULE_SETUP
+#line 177 "idl.ll"
 {
 		  /* Skip the quotes */
 		  char *tmp = ace_yytext;
@@ -1070,86 +1168,86 @@ YY_USER_ACTION
 		  return IDL_STRING_LITERAL;
 	      	}
 	YY_BREAK
-case 46:
-YY_USER_ACTION
-# line 183 "idl.ll"
+case 47:
+YY_RULE_SETUP
+#line 184 "idl.ll"
 {
 		  yylval.cval = ace_yytext [1];
 		  return IDL_CHARACTER_LITERAL;
 	      	}
 	YY_BREAK
-case 47:
-YY_USER_ACTION
-# line 187 "idl.ll"
+case 48:
+YY_RULE_SETUP
+#line 188 "idl.ll"
 {
 		  // octal character constant
 		  yylval.cval = idl_escape_reader(ace_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	YY_BREAK
-case 48:
-YY_USER_ACTION
-# line 192 "idl.ll"
+case 49:
+YY_RULE_SETUP
+#line 193 "idl.ll"
 {
 		  yylval.cval = idl_escape_reader(ace_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	YY_BREAK
-case 49:
-YY_USER_ACTION
-# line 196 "idl.ll"
+case 50:
+YY_RULE_SETUP
+#line 197 "idl.ll"
 {/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		  idl_store_pragma(ace_yytext);
 		}
 	YY_BREAK
-case 50:
-YY_USER_ACTION
-# line 200 "idl.ll"
+case 51:
+YY_RULE_SETUP
+#line 201 "idl.ll"
 {
 		  idl_parse_line_and_file(ace_yytext);
 		}
 	YY_BREAK
-case 51:
-YY_USER_ACTION
-# line 203 "idl.ll"
+case 52:
+YY_RULE_SETUP
+#line 204 "idl.ll"
 {
 		  idl_parse_line_and_file(ace_yytext);
 		}
 	YY_BREAK
-case 52:
-YY_USER_ACTION
-# line 206 "idl.ll"
+case 53:
+YY_RULE_SETUP
+#line 207 "idl.ll"
 {
 		  idl_parse_line_and_file(ace_yytext);
 		}
 	YY_BREAK
-case 53:
-YY_USER_ACTION
-# line 209 "idl.ll"
+case 54:
+YY_RULE_SETUP
+#line 210 "idl.ll"
 {
 		  idl_parse_line_and_file(ace_yytext);
 	        }
 	YY_BREAK
-case 54:
-YY_USER_ACTION
-# line 212 "idl.ll"
+case 55:
+YY_RULE_SETUP
+#line 213 "idl.ll"
 {
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	YY_BREAK
-case 55:
-YY_USER_ACTION
-# line 216 "idl.ll"
+case 56:
+YY_RULE_SETUP
+#line 217 "idl.ll"
 {
 		  /* ignore comments */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	YY_BREAK
-case 56:
-YY_USER_ACTION
-# line 220 "idl.ll"
+case 57:
+YY_RULE_SETUP
+#line 221 "idl.ll"
 {
 		  for(;;) {
 		    char c = yyinput();
@@ -1165,26 +1263,26 @@ YY_USER_ACTION
 	          }
 	        }
 	YY_BREAK
-case 57:
-YY_USER_ACTION
-# line 234 "idl.ll"
+case 58:
+YY_RULE_SETUP
+#line 235 "idl.ll"
 ;
 	YY_BREAK
-case 58:
-YY_USER_ACTION
-# line 235 "idl.ll"
+case 59:
+YY_RULE_SETUP
+#line 236 "idl.ll"
 {
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	YY_BREAK
-case 59:
-YY_USER_ACTION
-# line 238 "idl.ll"
+case 60:
+YY_RULE_SETUP
+#line 239 "idl.ll"
 return ace_yytext [0];
 	YY_BREAK
-case 60:
-YY_USER_ACTION
-# line 240 "idl.ll"
+case 61:
+YY_RULE_SETUP
+#line 241 "idl.ll"
 TAO_ECHO;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -1193,10 +1291,11 @@ case YY_STATE_EOF(INITIAL):
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = yy_cp - yytext_ptr - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
 		*yy_cp = yy_hold_char;
+		YY_RESTORE_YY_MORE_OFFSET
 
 		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
 			{
@@ -1252,7 +1351,7 @@ case YY_STATE_EOF(INITIAL):
 
 			else
 				{
-							yy_cp = yy_c_buf_p;
+				yy_cp = yy_c_buf_p;
 				goto yy_find_action;
 				}
 			}
@@ -1330,7 +1429,7 @@ case YY_STATE_EOF(INITIAL):
 static int yy_get_next_buffer()
 	{
 	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr - 1; /* copy prev. char, too */
+	register char *source = yytext_ptr;
 	register int number_to_move, i;
 	int ret_val;
 
@@ -1342,7 +1441,7 @@ static int yy_get_next_buffer()
 		{ /* Don't try to fill the buffer, so this is an EOF. */
 		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
 			{
-			/* We matched a singled characater, the EOB, so
+			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
 			 */
 			return EOB_ACT_END_OF_FILE;
@@ -1360,7 +1459,7 @@ static int yy_get_next_buffer()
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = yy_c_buf_p - yytext_ptr;
+	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1369,7 +1468,7 @@ static int yy_get_next_buffer()
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_n_chars = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
@@ -1386,12 +1485,26 @@ static int yy_get_next_buffer()
 			/* just a shorter name for the current buffer */
 			YY_BUFFER_STATE b = yy_current_buffer;
 
-			int yy_c_buf_p_offset = yy_c_buf_p - b->yy_ch_buf;
+			int yy_c_buf_p_offset =
+				(int) (yy_c_buf_p - b->yy_ch_buf);
 
-			b->yy_buf_size *= 2;
-			b->yy_ch_buf = (char *)
-				yy_flex_realloc( (void *) b->yy_ch_buf,
-						 b->yy_buf_size );
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -1410,11 +1523,13 @@ static int yy_get_next_buffer()
 		/* Read in more data. */
 		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
 			yy_n_chars, num_to_read );
+
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
 	if ( yy_n_chars == 0 )
 		{
-		if ( number_to_move - YY_MORE_ADJ == 1 )
+		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
 			yyrestart( yyin );
@@ -1435,13 +1550,7 @@ static int yy_get_next_buffer()
 	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
 	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
 
-	/* yytext begins at the second character in yy_ch_buf; the first
-	 * character is the one which preceded it before reading in the latest
-	 * buffer; it needs to be kept around in case it's a newline, so
-	 * yy_get_previous_state() will have with '^' rules active.
-	 */
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[1];
+	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
 
 	return ret_val;
 	}
@@ -1454,11 +1563,8 @@ static yy_state_type yy_get_previous_state()
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
 
-	register char *yy_bp = yytext_ptr;
-
 	yy_current_state = yy_start;
-	if ( yy_bp[-1] == '\n' )
-		++yy_current_state;
+	yy_current_state += YY_AT_BOL();
 
 	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
@@ -1471,7 +1577,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 >= 284 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1506,16 +1612,17 @@ 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 >= 284 )
 			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 == 283);
 
 	return yy_is_jam ? 0 : yy_current_state;
 	}
 
 
+#ifndef YY_NO_UNPUT
 #ifdef YY_USE_PROTOS
 static void yyunput( int c, register char *yy_bp )
 #else
@@ -1541,25 +1648,23 @@ register char *yy_bp;
 		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
-		yy_cp += dest - source;
-		yy_bp += dest - source;
-		yy_n_chars = yy_current_buffer->yy_buf_size;
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
 		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
-	if ( yy_cp > yy_bp && yy_cp[-1] == '\n' )
-		yy_cp[-2] = '\n';
-
 	*--yy_cp = (char) c;
 
 
-	/* Note: the formal parameter *must* be called "yy_bp" for this
-	 * macro to now work correctly.
-	 */
-	YY_DO_BEFORE_ACTION; /* set up yytext again */
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
 	}
+#endif	/* ifndef YY_NO_UNPUT */
 
 
 #ifdef __cplusplus
@@ -1584,21 +1689,34 @@ static int input()
 
 		else
 			{ /* need more input */
-			yytext_ptr = yy_c_buf_p;
+			int offset = yy_c_buf_p - yytext_ptr;
 			++yy_c_buf_p;
 
 			switch ( yy_get_next_buffer() )
 				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because 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. */
+					yyrestart( yyin );
+
+					/* fall through */
+
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( yywrap() )
-						{
-						yy_c_buf_p =
-						yytext_ptr + YY_MORE_ADJ;
 						return EOF;
-						}
 
-					YY_NEW_FILE;
+					if ( ! yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
 #else
@@ -1607,17 +1725,8 @@ static int input()
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					yy_c_buf_p = yytext_ptr + offset;
 					break;
-
-				case EOB_ACT_LAST_MATCH:
-#ifdef __cplusplus
-					YY_FATAL_ERROR(
-					"unexpected last match in yyinput()" );
-#else
-					YY_FATAL_ERROR(
-					"unexpected last match in input()" );
-#endif
 				}
 			}
 		}
@@ -1626,6 +1735,8 @@ static int input()
 	*yy_c_buf_p = '\0';	/* preserve yytext */
 	yy_hold_char = *++yy_c_buf_p;
 
+	yy_current_buffer->yy_at_bol = (c == '\n');
+
 	return c;
 	}
 
@@ -1699,7 +1810,6 @@ int size;
 	YY_BUFFER_STATE b;
 
 	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1709,10 +1819,11 @@ int size;
 	 * we need to put in 2 end-of-buffer characters.
 	 */
 	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
+	b->yy_is_our_buffer = 1;
+
 	yy_init_buffer( b, file );
 
 	return b;
@@ -1726,14 +1837,25 @@ void yy_delete_buffer( b )
 YY_BUFFER_STATE b;
 #endif
 	{
+	if ( ! b )
+		return;
+
 	if ( b == yy_current_buffer )
 		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
-	yy_flex_free( (void *) b->yy_ch_buf );
+	if ( b->yy_is_our_buffer )
+		yy_flex_free( (void *) b->yy_ch_buf );
+
 	yy_flex_free( (void *) b );
 	}
 
 
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+extern int isatty YY_PROTO(( int ));
+#endif
+#endif
+
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
 #else
@@ -1741,33 +1863,151 @@ void yy_init_buffer( b, file )
 YY_BUFFER_STATE b;
 FILE *file;
 #endif
+
+
 	{
+	yy_flush_buffer( b );
+
 	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
 
-	/* We put in the '\n' and start reading from [1] so that an
-	 * initial match-at-newline will be true.
-	 */
+#if YY_ALWAYS_INTERACTIVE
+	b->yy_is_interactive = 1;
+#else
+#if YY_NEVER_INTERACTIVE
+	b->yy_is_interactive = 0;
+#else
+	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif
+#endif
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_flush_buffer( YY_BUFFER_STATE b )
+#else
+void yy_flush_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+
+	{
+	if ( ! b )
+		return;
 
-	b->yy_ch_buf[0] = '\n';
-	b->yy_n_chars = 1;
+	b->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->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
 	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR;
 
-	b->yy_buf_pos = &b->yy_ch_buf[1];
+	b->yy_buf_pos = &b->yy_ch_buf[0];
 
-	b->yy_is_interactive = file ? isatty( fileno(file) ) : 0;
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	b->yy_fill_buffer = 1;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
+	}
+
+
+#ifndef YY_NO_SCAN_BUFFER
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
+#else
+YY_BUFFER_STATE yy_scan_buffer( base, size )
+char *base;
+yy_size_t size;
+#endif
+	{
+	YY_BUFFER_STATE b;
+
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
 
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	yy_switch_to_buffer( b );
+
+	return b;
 	}
+#endif
 
 
+#ifndef YY_NO_SCAN_STRING
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
+#else
+YY_BUFFER_STATE yy_scan_string( yy_str )
+yyconst char *yy_str;
+#endif
+	{
+	int len;
+	for ( len = 0; yy_str[len]; ++len )
+		;
+
+	return yy_scan_bytes( yy_str, len );
+	}
+#endif
+
+
+#ifndef YY_NO_SCAN_BYTES
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
+#else
+YY_BUFFER_STATE yy_scan_bytes( bytes, len )
+yyconst char *bytes;
+int len;
+#endif
+	{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = len + 2;
+	buf = (char *) yy_flex_alloc( n );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+	for ( i = 0; i < len; ++i )
+		buf[i] = bytes[i];
+
+	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = yy_scan_buffer( buf, n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+	}
+#endif
+
+
+#ifndef YY_NO_PUSH_STATE
 #ifdef YY_USE_PROTOS
 static void yy_push_state( int new_state )
 #else
@@ -1777,7 +2017,7 @@ int new_state;
 	{
 	if ( yy_start_stack_ptr >= yy_start_stack_depth )
 		{
-		int new_size;
+		yy_size_t new_size;
 
 		yy_start_stack_depth += YY_START_STACK_INCR;
 		new_size = yy_start_stack_depth * sizeof( int );
@@ -1798,8 +2038,10 @@ int new_state;
 
 	BEGIN(new_state);
 	}
+#endif
 
 
+#ifndef YY_NO_POP_STATE
 static void yy_pop_state()
 	{
 	if ( --yy_start_stack_ptr < 0 )
@@ -1807,23 +2049,29 @@ static void yy_pop_state()
 
 	BEGIN(yy_start_stack[yy_start_stack_ptr]);
 	}
+#endif
 
 
+#ifndef YY_NO_TOP_STATE
 static int yy_top_state()
 	{
 	return yy_start_stack[yy_start_stack_ptr - 1];
 	}
+#endif
 
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
 #ifdef YY_USE_PROTOS
-static void yy_fatal_error( const char msg[] )
+static void yy_fatal_error( yyconst char msg[] )
 #else
 static void yy_fatal_error( msg )
 char msg[];
 #endif
 	{
 	(void) fprintf( stderr, "%s\n", msg );
-	exit( 1 );
+	exit( YY_EXIT_FAILURE );
 	}
 
 
@@ -1836,7 +2084,7 @@ char msg[];
 		{ \
 		/* Undo effects of setting up yytext. */ \
 		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n - YY_MORE_ADJ; \
+		yy_c_buf_p = yytext + n; \
 		yy_hold_char = *yy_c_buf_p; \
 		*yy_c_buf_p = '\0'; \
 		yyleng = n; \
@@ -1848,11 +2096,11 @@ char msg[];
 
 #ifndef yytext_ptr
 #ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, const char *s2, int n )
+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
 #else
 static void yy_flex_strncpy( s1, s2, n )
 char *s1;
-const char *s2;
+yyconst char *s2;
 int n;
 #endif
 	{
@@ -1862,26 +2110,49 @@ int n;
 	}
 #endif
 
+#ifdef YY_NEED_STRLEN
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+	}
+#endif
+
 
 #ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( unsigned int size )
+static void *yy_flex_alloc( yy_size_t size )
 #else
 static void *yy_flex_alloc( size )
-unsigned int size;
+yy_size_t size;
 #endif
 	{
 	return (void *) malloc( size );
 	}
 
 #ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, unsigned int size )
+static void *yy_flex_realloc( void *ptr, yy_size_t size )
 #else
 static void *yy_flex_realloc( ptr, size )
 void *ptr;
-unsigned int size;
+yy_size_t size;
 #endif
 	{
-	return (void *) realloc( 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 );
 	}
 
 #ifdef YY_USE_PROTOS
@@ -1893,7 +2164,15 @@ void *ptr;
 	{
 	free( ptr );
 	}
-# line 240 "idl.ll"
+
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
+#endif
+#line 241 "idl.ll"
 
 	/* subroutines */
 
@@ -1926,13 +2205,13 @@ idl_parse_line_and_file(char *buf)
   UTL_String	*nm;
 
   /* Skip initial '#' */
-  if (*r != '#') 
+  if (*r != '#')
     return;
   else
     r++;
 
   /* Check to see if we're running under the screwy Microsoft scheme */
-  /* of putting #line num instead of #num. */ 
+  /* of putting #line num instead of #num. */
 
   if (ACE_OS::strncmp (r, "line", 4) == 0)
     r += 5;
@@ -1947,7 +2226,7 @@ idl_parse_line_and_file(char *buf)
   idl_global->set_lineno(idl_atoi(h, 10));
 
   /* Find file name, if present */
-  for (; *r != '"'; r++) 
+  for (; *r != '"'; r++)
     if (*r == '\n' || *r == '\0')
       return;
 
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 7752d999a11..8c197aab46b 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -65,12 +65,13 @@ extern YYSTYPE yylval;
 # define IDL_INOUT 289
 # define IDL_RAISES 290
 # define IDL_CONTEXT 291
-# define IDL_INTEGER_LITERAL 292
-# define IDL_STRING_LITERAL 293
-# define IDL_CHARACTER_LITERAL 294
-# define IDL_FLOATING_PT_LITERAL 295
-# define IDL_TRUETOK 296
-# define IDL_FALSETOK 297
-# define IDL_SCOPE_DELIMITOR 298
-# define IDL_LEFT_SHIFT 299
-# define IDL_RIGHT_SHIFT 300
+# define IDL_NATIVE 292
+# define IDL_INTEGER_LITERAL 293
+# define IDL_STRING_LITERAL 294
+# define IDL_CHARACTER_LITERAL 295
+# define IDL_FLOATING_PT_LITERAL 296
+# define IDL_TRUETOK 297
+# define IDL_FALSETOK 298
+# define IDL_SCOPE_DELIMITOR 299
+# define IDL_LEFT_SHIFT 300
+# define IDL_RIGHT_SHIFT 301