idl.yy had some errors related to clash on default action.

CVS:
CVS:

5 files changed, 2199 insertions, 2043 deletions

diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile
index 7672da17b17..6e8f81b4046 100644
--- a/TAO/TAO_IDL/fe/Makefile
+++ b/TAO/TAO_IDL/fe/Makefile
@@ -20,7 +20,7 @@ FE_FILES	= \
 
 OTHER_FILES	= \
 		y.tab \
-		lex.yy 
+		lex.yy
 
 FILES	 = $(FE_FILES) $(OTHER_FILES)
 
@@ -56,8 +56,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 CPPFLAGS += -D_REENTRANT -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
 YACC   = bison
 LEX	= flex
-YFLAGS	= -t -d -y 
-LFLAGS	= -t 
+YFLAGS	= -t -d -y
+LFLAGS	= -t
 
 # Create the parser and lexer
 y.tab.hh y.tab.cpp: idl.yy
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index b7a07242721..10b8a706fd2 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -1,3 +1,4 @@
+
 /*
 
 COPYRIGHT
@@ -51,8 +52,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -80,6 +81,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 extern	"C" int yywrap();
 #endif	// (defined(apollo) || defined(hpux)) && defined(__cplusplus)
 
+void yyerror (char *);
+int yylex (void);
+extern "C" int yywrap (void);
 %}
 
 /*
@@ -106,7 +110,7 @@ extern	"C" int yywrap();
   double		dval;		/* Double value		*/
   float			fval;		/* Float value		*/
   char			cval;		/* Char value		*/
-  
+
   String		*sval;		/* String value		*/
   char			*strval;	/* char * value		*/
   Identifier		*idval;		/* Identifier		*/
@@ -213,6 +217,7 @@ extern	"C" int yywrap();
 
 %type <idval>	interface_decl id
 
+%type <ival> type_dcl
 %%
 
 /*
@@ -287,7 +292,7 @@ module	: MODULE
 		new UTL_ScopedName(new Identifier($3, 1, 0, I_FALSE), NULL);
 	    AST_Module		*m = NULL;
 	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	    UTL_StrList		*p = idl_global->pragmas();	
+	    UTL_StrList		*p = idl_global->pragmas();
 
 	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
 	    /*
@@ -857,10 +862,10 @@ type_dcl
 	  {
 	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
 	  }
-	  type_declarator
-	| struct_type
-	| union_type
-	| enum_type
+	  type_declarator {$$ = 0;}
+	| struct_type { $$ = 0;}
+	| union_type  { $$ = 0;}
+	| enum_type   { $$ = 0;}
 	;
 
 type_declarator :
@@ -888,10 +893,10 @@ type_declarator :
 	    l = new UTL_DecllistActiveIterator($3);
 	    for (;!(l->is_done()); l->next()) {
 	      d = l->item();
-	      if (d == NULL) 
+	      if (d == NULL)
 		continue;
               AST_Type * tp = d->compose($1);
-              if (tp == NULL) 
+              if (tp == NULL)
 		continue;
 	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
 	      (void) s->fe_add_typedef(t);
@@ -1091,14 +1096,14 @@ char_type
 
 octet_type
 	: OCTET
-	{ 
+	{
           $$ = AST_Expression::EV_octet;
 	}
 	;
 
 boolean_type
 	: BOOLEAN
-	{ 
+	{
 	  $$ = AST_Expression::EV_bool;
         }
 	;
@@ -1202,10 +1207,10 @@ member	:
 	    l = new UTL_DecllistActiveIterator($3);
 	    for (;!(l->is_done()); l->next()) {
 	      d = l->item();
-	      if (d == NULL) 
+	      if (d == NULL)
 		continue;
  	      AST_Type *tp = d->compose($1);
-	      if (tp == NULL) 
+	      if (tp == NULL)
 		continue;
 	      f = idl_global->gen()->create_field(tp, d->name(), p);
 	      (void) s->fe_add_field(f);
@@ -1600,7 +1605,7 @@ enumerator :
 	   */
 	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
 	    c = AST_Enum::narrow_from_scope(s);
-	    if (c != NULL) 
+	    if (c != NULL)
 	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
 	    (void) s->fe_add_enum_val(e);
 	  }
@@ -1634,8 +1639,8 @@ sequence_type_spec
 	  } else if ($1 == NULL) {
 	    $$ = NULL;
 	  } else {
- 	    AST_Type *tp = AST_Type::narrow_from_decl($1); 
-	    if (tp == NULL) 
+ 	    AST_Type *tp = AST_Type::narrow_from_decl($1);
+	    if (tp == NULL)
 	      $$ = NULL;
 	    else {
 	      $$ = idl_global->gen()->create_sequence($4, tp);
@@ -1909,7 +1914,7 @@ attribute:
 	    }
 	    delete l;
 	  }
-	}	    
+	}
 	;
 
 opt_readonly
@@ -2124,7 +2129,7 @@ parameter :
 	      (void) s->fe_add_argument(a);
 	    }
 	  }
-	}	    
+	}
 	;
 
 param_type_spec
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index aece9596d6a..31598c499ad 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -1,82 +1,558 @@
+/* A lexical scanner generated by flex */
+
+/* Scanner skeleton version:
+ * $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>
-# define U(x) x
-# define NLSTATE yyprevious=YYNEWLINE
-# define BEGIN yybgin = yysvec + 1 +
-# define INITIAL 0
-# define YYLERR yysvec
-# define YYSTATE (yyestate-yysvec-1)
-# define YYOPTIM 1
-# define YYLMAX BUFSIZ
-#ifndef __cplusplus
-# define output(c) (void)putc(c,yyout)
-#else
-# define lex_output(c) (void)putc(c,yyout)
-#endif
 
-#if defined(__cplusplus) || defined(__STDC__)
 
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-extern "C" {
-#endif
-	int yyback(int *, int);
-	int yyinput(void);
-	int yylook(void);
-	void yyoutput(int);
-	int yyracc(int);
-	int yyreject(void);
-	void yyunput(int);
-	int yylex(void);
-#ifdef YYLEX_E
-	void yywoutput(wchar_t);
-	wchar_t yywinput(void);
-#endif
-#ifndef yyless
-	int yyless(int);
-#endif
-#ifndef yywrap
-	int yywrap(void);
-#endif
-#ifdef LEXDEBUG
-	void allprint(char);
-	void sprint(char *);
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #endif
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-}
 #endif
 
+
 #ifdef __cplusplus
-extern "C" {
-#endif
-	void exit(int);
-#ifdef __cplusplus
-}
+
+#include <stdlib.h>
+#include <unistd.h>
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+#if __STDC__
+
+#define YY_USE_PROTOS
+#define YY_USE_CONST
+
+#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
 
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
 #endif
-# define unput(c) {yytchar= (c);if(yytchar=='\n')yylineno--;*yysptr++=yytchar;}
-# define yymore() (yymorfg=1)
-#ifndef __cplusplus
-# define input() (((yytchar=yysptr>yysbuf?U(*--yysptr):getc(yyin))==10?(yylineno++,yytchar):yytchar)==EOF?0:yytchar)
+
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
 #else
-# define lex_input() (((yytchar=yysptr>yysbuf?U(*--yysptr):getc(yyin))==10?(yylineno++,yytchar):yytchar)==EOF?0:yytchar)
+#define YY_PROTO(proto) ()
 #endif
-#define ECHO fprintf(yyout, "%s",yytext)
-# define REJECT { nstr = yyreject(); goto yyfussy;}
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#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.  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". */
+#define YY_NEW_FILE yyrestart( yyin )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#define YY_BUF_SIZE 16384
+
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+
+extern int yyleng;
+extern FILE *yyin, *yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator).  This
+ * avoids problems with code like:
+ *
+ * 	if ( condition_holds )
+ *		yyless( 5 );
+ *	else
+ *		do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
+#define yyless(n) \
+	do \
+		{ \
+		/* 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 */ \
+		} \
+	while ( 0 )
+
+#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
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	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
+	 * each newline.
+	 */
+	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.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+	};
+
+static YY_BUFFER_STATE yy_current_buffer = 0;
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ */
+#define YY_CURRENT_BUFFER yy_current_buffer
+
+
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+
+
 int yyleng;
-char yytext[YYLMAX];
-int yymorfg;
-extern char *yysptr, yysbuf[];
-int yytchar;
-FILE *yyin = {stdin}, *yyout = {stdout};
-extern int yylineno;
-struct yysvf { 
-	struct yywork *yystoff;
-	struct yysvf *yyother;
-	int *yystops;};
-struct yysvf *yyestate;
-extern struct yysvf yysvec[], *yybgin;
-
-# line 4 "idl.ll"
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 1;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+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 )
+
+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(( 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 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;
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+typedef int yy_state_type;
+extern char *yytext;
+#define yytext_ptr yytext
+
+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(( 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 = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
+	*yy_cp = '\0'; \
+	yy_c_buf_p = yy_cp;
+
+#define YY_NUM_RULES 59
+#define YY_END_OF_BUFFER 60
+static yyconst short int yy_accept[266] =
+    {   0,
+       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,   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,   52,    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,   39,
+       39,   34,   39,   39,   39,   39,   39,   39,   39,   39,
+       39,   39,   39,   39,    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,
+       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,   39,   39,   39,   39,   21,   39,   39,    2,
+       35,    3,   39,   39,   13,   11,   17,   39,   39,   39,
+       39,   50,    0,    0,    0,   39,   27,    7,   19,   39,
+       39,   39,   39,   10,   39,   26,   39,    0,   53,    0,
+       39,   39,   39,    4,   15,   24,   39,    0,    5,    6,
+        8,   14,    0,   49,    0
+    } ;
+
+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,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    4,    1,    5,    6,    1,    1,    1,    7,    1,
+        1,    8,    9,    1,   10,   11,   12,   13,   14,   14,
+       14,   14,   14,   14,   14,   15,   15,   16,    1,   17,
+        1,   18,    1,    1,   19,   20,   20,   20,   21,   22,
+       23,   23,   23,   23,   23,   24,   23,   23,   23,   23,
+       23,   25,   26,   27,   28,   23,   23,   29,   23,   23,
+        1,   30,    1,    1,   31,    1,   32,   33,   34,   35,
+
+       36,   37,   38,   39,   40,   23,   23,   41,   42,   43,
+       44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
+       54,   23,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static 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,
+        3,    3,    4,    4,    4,    4,    4,    4,    4,    1,
+        4,    3,    3,    3,    3,    3,    3,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4
+    } ;
+
+static yyconst short int yy_base[275] =
+    {   0,
+        0,  414,  419,  421,   53,  421,  413,  387,   45,   53,
+       53,   58,  400,  398,  396,    0,  394,  387,   13,  367,
+       31,   40,   34,  369,  366,  364,  363,   47,   56,   44,
+      352,  362,  360,   51,   98,  101,  398,  421,  395,  101,
+      105,  110,  421,  398,  146,  136,  141,  165,    0,  175,
+      421,  421,  421,    0,  376,  371,  344,  348,  352,  347,
+      362,  350,  355,  341,  340,  355,  344,   42,  344,  351,
+      336,  348,  334,  342,  349,  334,  335,  331,  337,  331,
+       69,  335,  335,  324,  189,  421,  233,  194,  337,  324,
+      421,  363,  362,  115,  365,  421,    0,  203,  421,  122,
+
+      208,    0,  341,  345,    0,  318,  323,  327,  315,   84,
+      329,  327,  317,  322,  325,  306,  319,  316,  303,  316,
+      299,    0,  302,  314,  298,  300,   90,  297,  309,  300,
+      303,  307,  309,  293,  334,  333,  301,  304,  421,  421,
+      187,  150,  228,  421,  314,    0,  294,  297,    0,    0,
+      283,  295,  280,  288,    0,  283,  278,  277,  278,    0,
+      283,  274,  290,  285,  276,  283,  269,  274,  282,  281,
+      279,  270,  274,    0,  264,  270,  304,  141,  247,  246,
+      421,  270,    0,  243,  243,    0,  221,  231,  235,  221,
+        0,    0,  231,  231,    0,  212,  216,  220,  219,    0,
+
+      223,  211,  220,  222,    0,  214,  222,  208,  421,  211,
+      191,  197,  183,  188,  179,  178,    0,  180,  187,    0,
+        0,    0,  174,  176,    0,    0,    0,  169,  169,  150,
+      157,  421,  241,  182,  152,  132,    0,    0,    0,  132,
+      139,  112,  117,    0,  113,    0,  111,  136,  421,  167,
+       91,   67,   71,    0,    0,    0,   55,   95,    0,    0,
+        0,    0,   92,  421,  421,  278,  282,  284,  288,  292,
+       75,  296,  300,  304
+    } ;
+
+static yyconst short int yy_def[275] =
+    {   0,
+      265,    1,  265,  265,  265,  265,  266,  267,  265,  265,
+      265,  265,  265,  265,  265,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  265,  265,  266,  265,  265,  269,
+      265,  265,  265,  270,  265,  265,  265,  265,  271,  265,
+      265,  265,  265,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  270,  265,   45,  265,  265,  265,
+
+      265,  271,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  272,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  272,  265,  265,  265,
+      265,  265,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+
+      268,  268,  268,  268,  268,  268,  268,  268,  265,  265,
+      265,  265,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  265,  265,  273,  265,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  273,  265,  265,
+      268,  268,  268,  268,  268,  268,  268,  274,  268,  268,
+      268,  268,  274,  265,    0,  265,  265,  265,  265,  265,
+      265,  265,  265,  265
+    } ;
+
+static yyconst short int yy_nxt[476] =
+    {   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,  102,   48,   76,
+       71,   49,   77,   64,   83,  116,   66,   74,   48,   72,
+      117,   75,   78,   48,  264,   79,   73,  264,   84,   85,
+
+       86,   87,   36,  262,   36,   49,  261,   93,  130,  260,
+       88,   88,   88,   94,   94,   45,  131,   46,   46,   47,
+       45,  140,   50,   50,   50,   48,  259,  141,  141,  168,
+       48,  151,  152,   49,  101,  101,  101,   89,  249,  169,
+       48,  257,   90,  209,  210,   48,   45,  256,   46,   46,
+       47,   45,  255,   47,   47,   47,   48,   49,   97,   97,
+       97,   48,  143,  143,  143,  254,   98,   99,  258,   99,
+      258,   48,  253,  100,  100,  252,   48,  101,  101,  101,
+      251,   98,   99,  250,  249,   45,   99,   50,   50,   50,
+       85,   86,   87,  181,  247,   48,   86,  136,  246,  182,
+
+      182,   88,   88,   88,  245,  244,   88,   88,   88,  243,
+       48,  142,  142,  232,  242,  143,  143,  143,  241,  240,
+      101,  101,  101,  233,  233,  233,  239,  238,   89,  144,
+      237,  144,  236,   90,   85,   86,   87,  135,  235,  234,
+      143,  143,  143,  232,  144,   88,   88,   88,  144,   99,
+      231,   99,  230,  233,  233,  233,  229,  228,  227,  226,
+      225,  224,  223,  222,   99,  221,  220,  219,   99,  218,
+      217,  216,   89,  215,  214,  213,  181,   90,   37,   37,
+       37,   37,   39,  212,   39,   39,   54,   54,   92,  211,
+       92,   92,   95,   95,   95,   95,  177,  177,  177,  177,
+
+      248,  248,  248,  248,  263,  263,  263,  263,  178,  208,
+      207,  206,  205,  204,  203,  202,  201,  200,  199,  198,
+      197,  196,  195,  194,  193,  192,  191,  190,  189,  188,
+      187,  186,  185,  184,  183,  180,  179,  135,  178,  176,
+      175,  174,  173,  172,  171,  170,  167,  166,  165,  164,
+      163,  162,  161,  160,  159,  158,  157,  156,  155,  154,
+      153,  150,  149,  148,  147,  146,  145,   96,  139,  139,
+      138,  137,  134,  133,  132,  129,  128,  127,  126,  125,
+      124,  123,  122,  121,  120,  119,  118,  115,  114,  113,
+      112,  111,  110,  109,  108,  107,  106,  105,  104,  103,
+
+       96,   91,   38,   82,   81,   80,   70,   69,   68,   67,
+       59,   56,   55,   53,   52,   51,   40,   38,  265,   35,
+        3,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265
+    } ;
+
+static yyconst short int yy_chk[476] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    5,   19,    5,    9,    9,    9,
+       10,   19,   21,   11,   10,   11,   11,   11,   12,   21,
+       12,   12,   12,   11,   21,   22,   23,  271,   12,   30,
+       28,   11,   30,   22,   34,   68,   23,   29,   11,   28,
+       68,   29,   30,   12,  263,   30,   28,  258,   34,   35,
+
+       35,   35,   36,  257,   36,   11,  253,   40,   81,  252,
+       35,   35,   35,   40,   40,   41,   81,   41,   41,   41,
+       42,   94,   42,   42,   42,   41,  251,   94,   94,  127,
+       42,  110,  110,   41,  100,  100,  100,   35,  248,  127,
+       41,  247,   35,  178,  178,   42,   46,  245,   46,   46,
+       46,   47,  243,   47,   47,   47,   46,   41,   45,   45,
+       45,   47,  142,  142,  142,  242,   45,   45,  250,   45,
+      250,   46,  241,   48,   48,  240,   47,   48,   48,   48,
+      236,   45,   45,  235,  234,   50,   45,   50,   50,   50,
+       85,   85,   85,  141,  231,   50,   88,   88,  230,  141,
+
+      141,   85,   85,   85,  229,  228,   88,   88,   88,  224,
+       50,   98,   98,  210,  223,   98,   98,   98,  219,  218,
+      101,  101,  101,  210,  210,  210,  216,  215,   85,  101,
+      214,  101,  213,   85,   87,   87,   87,   87,  212,  211,
+      143,  143,  143,  233,  101,   87,   87,   87,  101,  143,
+      208,  143,  207,  233,  233,  233,  206,  204,  203,  202,
+      201,  199,  198,  197,  143,  196,  194,  193,  143,  190,
+      189,  188,   87,  187,  185,  184,  182,   87,  266,  266,
+      266,  266,  267,  180,  267,  267,  268,  268,  269,  179,
+      269,  269,  270,  270,  270,  270,  272,  272,  272,  272,
+
+      273,  273,  273,  273,  274,  274,  274,  274,  177,  176,
+      175,  173,  172,  171,  170,  169,  168,  167,  166,  165,
+      164,  163,  162,  161,  159,  158,  157,  156,  154,  153,
+      152,  151,  148,  147,  145,  138,  137,  136,  135,  134,
+      133,  132,  131,  130,  129,  128,  126,  125,  124,  123,
+      121,  120,  119,  118,  117,  116,  115,  114,  113,  112,
+      111,  109,  108,  107,  106,  104,  103,   95,   93,   92,
+       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,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  265
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#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
+char *yytext;
+#line 1 "idl.ll"
+#define INITIAL 0
+#line 3 "idl.ll"
 /*
 
 COPYRIGHT
@@ -141,8 +617,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-
-# line 68 "idl.ll"
 /*
  * idl.ll - Lexical scanner for IDL 1.1
  */
@@ -166,344 +640,571 @@ static void	idl_store_pragma(char *);
 // we'll always use char *
 static char	*__yytext = (char *) yytext;
 
-# define YYNEWLINE 10
-yylex(){
-int nstr; extern int yyprevious;
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-/* to avoid CC and lint complaining yyfussy not being used ...*/
-static int __lex_hack = 0;
-if (__lex_hack) goto yyfussy;
-#endif
-while((nstr = yylook()) >= 0)
-yyfussy: switch(nstr){
-case 0:
-if(yywrap()) return(0); break;
-case 1:
+extern "C" int yywrap YY_PROTO(( void ));
+#else
+extern int yywrap YY_PROTO(( void ));
+#endif
+#endif
 
-# line 94 "idl.ll"
-            return ANY;
-break;
-case 2:
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
 
-# line 95 "idl.ll"
-	return MODULE;
-break;
-case 3:
+#ifndef yytext_ptr
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+#endif
 
-# line 96 "idl.ll"
-	return RAISES;
-break;
-case 4:
+#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
+#if __STDC__
+#ifndef __cplusplus
+#include <stdlib.h>
+#endif
+#else
+/* Just try to get by without declaring the routines.  This will fail
+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
+ * or sizeof(void*) != sizeof(int).
+ */
+#endif
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( yy_current_buffer->yy_is_interactive ) \
+		{ \
+		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 ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
 
-# line 97 "idl.ll"
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#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 92 "idl.ll"
+
+
+
+	if ( yy_init )
+		{
+		yy_init = 0;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! yy_start )
+			yy_start = 1;	/* first start state */
+
+		if ( ! yyin )
+			yyin = stdin;
+
+		if ( ! yyout )
+			yyout = stdout;
+
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				yy_create_buffer( yyin, YY_BUF_SIZE );
+
+		yy_load_buffer_state();
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = yy_c_buf_p;
+
+		/* Support of yytext. */
+		*yy_cp = yy_hold_char;
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = yy_start;
+		yy_current_state += YY_AT_BOL();
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				yy_last_accepting_state = yy_current_state;
+				yy_last_accepting_cpos = yy_cp;
+				}
+			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 >= 266 )
+					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] != 421 );
+
+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;
+
+
+do_action:	/* This label is used only to access EOF actions. */
+
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = yy_hold_char;
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 94 "idl.ll"
+return ANY;
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 95 "idl.ll"
+return MODULE;
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 96 "idl.ll"
+return RAISES;
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 97 "idl.ll"
 return READONLY;
-break;
+	YY_BREAK
 case 5:
-
-# line 98 "idl.ll"
+YY_RULE_SETUP
+#line 98 "idl.ll"
 return ATTRIBUTE;
-break;
+	YY_BREAK
 case 6:
-
-# line 99 "idl.ll"
+YY_RULE_SETUP
+#line 99 "idl.ll"
 return EXCEPTION;
-break;
+	YY_BREAK
 case 7:
-
-# line 100 "idl.ll"
-	return CONTEXT;
-break;
+YY_RULE_SETUP
+#line 100 "idl.ll"
+return CONTEXT;
+	YY_BREAK
 case 8:
-
-# line 101 "idl.ll"
+YY_RULE_SETUP
+#line 101 "idl.ll"
 return INTERFACE;
-break;
+	YY_BREAK
 case 9:
-
-# line 102 "idl.ll"
-	return CONST;
-break;
+YY_RULE_SETUP
+#line 102 "idl.ll"
+return CONST;
+	YY_BREAK
 case 10:
-
-# line 103 "idl.ll"
-	return TYPEDEF;
-break;
+YY_RULE_SETUP
+#line 103 "idl.ll"
+return TYPEDEF;
+	YY_BREAK
 case 11:
-
-# line 104 "idl.ll"
-	return STRUCT;
-break;
+YY_RULE_SETUP
+#line 104 "idl.ll"
+return STRUCT;
+	YY_BREAK
 case 12:
-
-# line 105 "idl.ll"
-	return ENUM;
-break;
+YY_RULE_SETUP
+#line 105 "idl.ll"
+return ENUM;
+	YY_BREAK
 case 13:
-
-# line 106 "idl.ll"
-	return STRING;
-break;
+YY_RULE_SETUP
+#line 106 "idl.ll"
+return STRING;
+	YY_BREAK
 case 14:
-
-# line 107 "idl.ll"
+YY_RULE_SETUP
+#line 107 "idl.ll"
 return WSTRING;
-break;
+	YY_BREAK
 case 15:
-
-# line 108 "idl.ll"
+YY_RULE_SETUP
+#line 108 "idl.ll"
 return SEQUENCE;
-break;
+	YY_BREAK
 case 16:
-
-# line 109 "idl.ll"
-	return UNION;
-break;
+YY_RULE_SETUP
+#line 109 "idl.ll"
+return UNION;
+	YY_BREAK
 case 17:
-
-# line 110 "idl.ll"
-	return SWITCH;
-break;
+YY_RULE_SETUP
+#line 110 "idl.ll"
+return SWITCH;
+	YY_BREAK
 case 18:
-
-# line 111 "idl.ll"
-	return CASE;
-break;
+YY_RULE_SETUP
+#line 111 "idl.ll"
+return CASE;
+	YY_BREAK
 case 19:
-
-# line 112 "idl.ll"
-	return DEFAULT;
-break;
+YY_RULE_SETUP
+#line 112 "idl.ll"
+return DEFAULT;
+	YY_BREAK
 case 20:
-
-# line 113 "idl.ll"
-	return FLOAT;
-break;
+YY_RULE_SETUP
+#line 113 "idl.ll"
+return FLOAT;
+	YY_BREAK
 case 21:
-
-# line 114 "idl.ll"
-	return DOUBLE;
-break;
+YY_RULE_SETUP
+#line 114 "idl.ll"
+return DOUBLE;
+	YY_BREAK
 case 22:
-
-# line 115 "idl.ll"
-	return LONG;
-break;
+YY_RULE_SETUP
+#line 115 "idl.ll"
+return LONG;
+	YY_BREAK
 case 23:
-
-# line 116 "idl.ll"
-	return SHORT;
-break;
+YY_RULE_SETUP
+#line 116 "idl.ll"
+return SHORT;
+	YY_BREAK
 case 24:
-
-# line 117 "idl.ll"
+YY_RULE_SETUP
+#line 117 "idl.ll"
 return UNSIGNED;
-break;
+	YY_BREAK
 case 25:
-
-# line 118 "idl.ll"
-	return CHAR;
-break;
+YY_RULE_SETUP
+#line 118 "idl.ll"
+return CHAR;
+	YY_BREAK
 case 26:
-
-# line 119 "idl.ll"
-	return WCHAR;
-break;
+YY_RULE_SETUP
+#line 119 "idl.ll"
+return WCHAR;
+	YY_BREAK
 case 27:
-
-# line 120 "idl.ll"
-	return BOOLEAN;
-break;
+YY_RULE_SETUP
+#line 120 "idl.ll"
+return BOOLEAN;
+	YY_BREAK
 case 28:
-
-# line 121 "idl.ll"
-	return OCTET;
-break;
+YY_RULE_SETUP
+#line 121 "idl.ll"
+return OCTET;
+	YY_BREAK
 case 29:
-
-# line 122 "idl.ll"
-	return VOID;
-break;
+YY_RULE_SETUP
+#line 122 "idl.ll"
+return VOID;
+	YY_BREAK
 case 30:
-
-# line 124 "idl.ll"
-	return TRUETOK;
-break;
+YY_RULE_SETUP
+#line 124 "idl.ll"
+return TRUETOK;
+	YY_BREAK
 case 31:
-
-# line 125 "idl.ll"
-	return FALSETOK;
-break;
+YY_RULE_SETUP
+#line 125 "idl.ll"
+return FALSETOK;
+	YY_BREAK
 case 32:
-
-# line 127 "idl.ll"
-	return INOUT;
-break;
+YY_RULE_SETUP
+#line 127 "idl.ll"
+return INOUT;
+	YY_BREAK
 case 33:
-
-# line 128 "idl.ll"
-	return IN;
-break;
+YY_RULE_SETUP
+#line 128 "idl.ll"
+return IN;
+	YY_BREAK
 case 34:
-
-# line 129 "idl.ll"
-	return OUT;
-break;
+YY_RULE_SETUP
+#line 129 "idl.ll"
+return OUT;
+	YY_BREAK
 case 35:
-
-# line 130 "idl.ll"
-	return ONEWAY;
-break;
+YY_RULE_SETUP
+#line 130 "idl.ll"
+return ONEWAY;
+	YY_BREAK
 case 36:
-
-# line 132 "idl.ll"
-	return LEFT_SHIFT;
-break;
+YY_RULE_SETUP
+#line 132 "idl.ll"
+return LEFT_SHIFT;
+	YY_BREAK
 case 37:
-
-# line 133 "idl.ll"
-	return RIGHT_SHIFT;
-break;
+YY_RULE_SETUP
+#line 133 "idl.ll"
+return RIGHT_SHIFT;
+	YY_BREAK
 case 38:
-
-# line 134 "idl.ll"
-	{
+YY_RULE_SETUP
+#line 134 "idl.ll"
+{
 		  yylval.strval = "::";    
 		  return SCOPE_DELIMITOR;
 		}
-break;
+	YY_BREAK
 case 39:
-
-# line 139 "idl.ll"
+YY_RULE_SETUP
+#line 139 "idl.ll"
 {
     char *z = (char *) malloc(strlen(__yytext) + 1);
     strcpy(z, __yytext);
     yylval.strval = z;
     return IDENTIFIER;
 }
-break;
+	YY_BREAK
 case 40:
-
-# line 146 "idl.ll"
-     {
+YY_RULE_SETUP
+#line 146 "idl.ll"
+{
                   yylval.dval = idl_atof(__yytext);
                   return FLOATING_PT_LITERAL;
                 }
-break;
+	YY_BREAK
 case 41:
-
-# line 150 "idl.ll"
- {
+YY_RULE_SETUP
+#line 150 "idl.ll"
+{
                   yylval.dval = idl_atof(__yytext);
                   return FLOATING_PT_LITERAL;
                 }
-break;
+	YY_BREAK
 case 42:
-
-# line 155 "idl.ll"
+YY_RULE_SETUP
+#line 155 "idl.ll"
 {
 		  yylval.ival = idl_atoi(__yytext, 10);
 		  return INTEGER_LITERAL;
 	        }
-break;
+	YY_BREAK
 case 43:
-
-# line 159 "idl.ll"
+YY_RULE_SETUP
+#line 159 "idl.ll"
 {
 		  yylval.ival = idl_atoi(__yytext, 16);
 		  return INTEGER_LITERAL;
 	        }
-break;
+	YY_BREAK
 case 44:
-
-# line 163 "idl.ll"
+YY_RULE_SETUP
+#line 163 "idl.ll"
 {
 		  yylval.ival = idl_atoi(__yytext, 8);
 		  return INTEGER_LITERAL;
 	      	}
-break;
+	YY_BREAK
 case 45:
-
-# line 168 "idl.ll"
+YY_RULE_SETUP
+#line 168 "idl.ll"
 {
 		  __yytext[strlen(__yytext)-1] = '\0';
 		  yylval.sval = new String(__yytext + 1);
 		  return STRING_LITERAL;
 	      	}
-break;
+	YY_BREAK
 case 46:
-
-# line 173 "idl.ll"
-	{
+YY_RULE_SETUP
+#line 173 "idl.ll"
+{
 		  yylval.cval = __yytext[1];
 		  return CHARACTER_LITERAL;
 	      	}
-break;
+	YY_BREAK
 case 47:
-
-# line 177 "idl.ll"
+YY_RULE_SETUP
+#line 177 "idl.ll"
 {
 		  // octal character constant
 		  yylval.cval = idl_escape_reader(__yytext + 1);
 		  return CHARACTER_LITERAL;
 		}
-break;
+	YY_BREAK
 case 48:
-
-# line 182 "idl.ll"
+YY_RULE_SETUP
+#line 182 "idl.ll"
 {
 		  yylval.cval = idl_escape_reader(__yytext + 1);
 		  return CHARACTER_LITERAL;
 		}
-break;
+	YY_BREAK
 case 49:
-
-# line 186 "idl.ll"
+YY_RULE_SETUP
+#line 186 "idl.ll"
 {/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		  idl_store_pragma(__yytext);
 		}
-break;
+	YY_BREAK
 case 50:
-
-# line 190 "idl.ll"
-	{
+YY_RULE_SETUP
+#line 190 "idl.ll"
+{
 		  idl_parse_line_and_file(__yytext);
 		}
-break;
+	YY_BREAK
 case 51:
-
-# line 193 "idl.ll"
-		{
+YY_RULE_SETUP
+#line 193 "idl.ll"
+{
 		  idl_parse_line_and_file(__yytext);
 		}
-break;
+	YY_BREAK
 case 52:
-
-# line 196 "idl.ll"
+YY_RULE_SETUP
+#line 196 "idl.ll"
 {
 		  idl_parse_line_and_file(__yytext);
 	        }
-break;
+	YY_BREAK
 case 53:
-
-# line 199 "idl.ll"
+YY_RULE_SETUP
+#line 199 "idl.ll"
 {
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
-break;
+	YY_BREAK
 case 54:
-
-# line 203 "idl.ll"
+YY_RULE_SETUP
+#line 203 "idl.ll"
 {
 		  /* ignore comments */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
-break;
+	YY_BREAK
 case 55:
-
-# line 207 "idl.ll"
-	{
+YY_RULE_SETUP
+#line 207 "idl.ll"
+{
 		  for(;;) {
 		    char c = yyinput();
 		    if (c == '*') {
@@ -511,36 +1212,924 @@ case 55:
 		      if (next == '/')
 			break;
 		      else
-			yyunput(c);
+			yyunput(c, NULL);
 	              if (c == '\n') 
 		        idl_global->set_lineno(idl_global->lineno() + 1);
 		    }
 	          }
 	        }
-break;
+	YY_BREAK
 case 56:
-
-# line 221 "idl.ll"
-	;
-break;
+YY_RULE_SETUP
+#line 221 "idl.ll"
+;
+	YY_BREAK
 case 57:
-
-# line 222 "idl.ll"
-	{
+YY_RULE_SETUP
+#line 222 "idl.ll"
+{
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
-break;
+	YY_BREAK
 case 58:
+YY_RULE_SETUP
+#line 225 "idl.ll"
+return __yytext[0];
+	YY_BREAK
+case 59:
+YY_RULE_SETUP
+#line 227 "idl.ll"
+ECHO;
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		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 )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
+			 * consistency between yy_current_buffer and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			yy_n_chars = yy_current_buffer->yy_n_chars;
+			yy_current_buffer->yy_input_file = yyin;
+			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state();
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = yytext_ptr + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++yy_c_buf_p;
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = yy_c_buf_p;
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer() )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				yy_did_buffer_switch_on_eof = 0;
+
+				if ( yywrap() )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				yy_c_buf_p =
+					yytext_ptr + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state();
+
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				yy_c_buf_p =
+				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+
+				yy_current_state = yy_get_previous_state();
+
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+	} /* end of yylex */
+
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->yy_ch_buf;
+	register char *source = yytext_ptr;
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( yy_current_buffer->yy_fill_buffer == 0 )
+		{ /* 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 single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+
+	else
+		{
+		int num_to_read =
+			yy_current_buffer->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+#ifdef YY_USES_REJECT
+			YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+#else
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = yy_current_buffer;
+
+			int yy_c_buf_p_offset =
+				(int) (yy_c_buf_p - b->yy_ch_buf);
+
+			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(
+				"fatal error - scanner input buffer overflow" );
+
+			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = yy_current_buffer->yy_buf_size -
+						number_to_move - 1;
+#endif
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* 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 )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			yyrestart( yyin );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			yy_current_buffer->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	yy_n_chars += number_to_move;
+	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_ptr = &yy_current_buffer->yy_ch_buf[0];
+
+	return ret_val;
+	}
+
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+static yy_state_type yy_get_previous_state()
+	{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+
+	yy_current_state = yy_start;
+	yy_current_state += YY_AT_BOL();
+
+	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			yy_last_accepting_state = yy_current_state;
+			yy_last_accepting_cpos = yy_cp;
+			}
+		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 >= 266 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+	}
+
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+
+#ifdef YY_USE_PROTOS
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
+#else
+static yy_state_type yy_try_NUL_trans( yy_current_state )
+yy_state_type yy_current_state;
+#endif
+	{
+	register int yy_is_jam;
+	register char *yy_cp = yy_c_buf_p;
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		yy_last_accepting_state = yy_current_state;
+		yy_last_accepting_cpos = yy_cp;
+		}
+	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 >= 266 )
+			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 == 265);
+
+	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
+static void yyunput( c, yy_bp )
+int c;
+register char *yy_bp;
+#endif
+	{
+	register char *yy_cp = yy_c_buf_p;
+
+	/* undo effects of setting up yytext */
+	*yy_cp = yy_hold_char;
+
+	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = yy_n_chars + 2;
+		register char *dest = &yy_current_buffer->yy_ch_buf[
+					yy_current_buffer->yy_buf_size + 2];
+		register char *source =
+				&yy_current_buffer->yy_ch_buf[number_to_move];
+
+		while ( source > yy_current_buffer->yy_ch_buf )
+			*--dest = *--source;
+
+		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" );
+		}
+
+	*--yy_cp = (char) c;
+
+
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
+#ifdef __cplusplus
+static int yyinput()
+#else
+static int input()
+#endif
+	{
+	int c;
+
+	*yy_c_buf_p = yy_hold_char;
+
+	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+			/* This was really a NUL. */
+			*yy_c_buf_p = '\0';
+
+		else
+			{ /* need more input */
+			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() )
+						return EOF;
+
+					if ( ! yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					yy_c_buf_p = yytext_ptr + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
+	*yy_c_buf_p = '\0';	/* preserve yytext */
+	yy_hold_char = *++yy_c_buf_p;
+
+	yy_current_buffer->yy_at_bol = (c == '\n');
+
+	return c;
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yyrestart( FILE *input_file )
+#else
+void yyrestart( input_file )
+FILE *input_file;
+#endif
+	{
+	if ( ! yy_current_buffer )
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
+#else
+void yy_switch_to_buffer( new_buffer )
+YY_BUFFER_STATE new_buffer;
+#endif
+	{
+	if ( yy_current_buffer == new_buffer )
+		return;
+
+	if ( yy_current_buffer )
+		{
+		/* Flush out information for old buffer. */
+		*yy_c_buf_p = yy_hold_char;
+		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
+		yy_current_buffer->yy_n_chars = yy_n_chars;
+		}
+
+	yy_current_buffer = new_buffer;
+	yy_load_buffer_state();
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	yy_did_buffer_switch_on_eof = 1;
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_load_buffer_state( void )
+#else
+void yy_load_buffer_state()
+#endif
+	{
+	yy_n_chars = yy_current_buffer->yy_n_chars;
+	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
+	yyin = yy_current_buffer->yy_input_file;
+	yy_hold_char = *yy_c_buf_p;
+	}
+
+
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
+#else
+YY_BUFFER_STATE yy_create_buffer( file, size )
+FILE *file;
+int size;
+#endif
+	{
+	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()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->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;
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+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;
+
+	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
+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;
+
+#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_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_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	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
+static void yy_push_state( new_state )
+int new_state;
+#endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
+
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
+
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( new_size );
+
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
+
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
+
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+
+	BEGIN(new_state);
+	}
+#endif
+
+
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state()
+	{
+	if ( --yy_start_stack_ptr < 0 )
+		YY_FATAL_ERROR( "start-condition stack underflow" );
+
+	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( yyconst char msg[] )
+#else
+static void yy_fatal_error( msg )
+char msg[];
+#endif
+	{
+	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+	}
+
+
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+		yytext[yyleng] = yy_hold_char; \
+		yy_c_buf_p = yytext + n; \
+		yy_hold_char = *yy_c_buf_p; \
+		*yy_c_buf_p = '\0'; \
+		yyleng = n; \
+		} \
+	while ( 0 )
+
+
+/* Internal utility routines. */
+
+#ifndef yytext_ptr
+#ifdef YY_USE_PROTOS
+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+#else
+static void yy_flex_strncpy( s1, s2, n )
+char *s1;
+yyconst char *s2;
+int n;
+#endif
+	{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+	}
+#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( yy_size_t size )
+#else
+static void *yy_flex_alloc( size )
+yy_size_t size;
+#endif
+	{
+	return (void *) malloc( size );
+	}
+
+#ifdef YY_USE_PROTOS
+static void *yy_flex_realloc( void *ptr, yy_size_t size )
+#else
+static void *yy_flex_realloc( ptr, size )
+void *ptr;
+yy_size_t size;
+#endif
+	{
+	/* 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
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
+
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
+#endif
+#line 227 "idl.ll"
 
-# line 225 "idl.ll"
-	return __yytext[0];
-break;
-case -1:
-break;
-default:
-(void)fprintf(yyout,"bad switch yylook %d",nstr);
-} return(0); }
-/* end of yylex */
 	/* subroutines */
 
 /*
@@ -582,7 +2171,7 @@ idl_parse_line_and_file(char *buf)
   for (; *r != '\0' && *r != ' ' && *r != '\t'; r++);
   *r++ = 0;
   idl_global->set_lineno(idl_atoi(h, 10));
-
+  
   /* Find file name, if present */
   for (; *r != '"'; r++) {
     if (*r == '\n' || *r == '\0')
@@ -609,7 +2198,7 @@ idl_parse_line_and_file(char *buf)
     idl_global->store_include_file_name(nm);
   }
 }
-
+    
 /*
  * Store a #pragma line into the list of pragmas
  */
@@ -632,7 +2221,7 @@ idl_store_pragma(char *buf)
   if (strcmp(pragma, "import") == 0) {
     idl_global->set_import(I_TRUE);
     return;
-  }
+  } 
   if (strcmp(pragma, "include") == 0) {
     idl_global->set_import(I_FALSE);
     return;
@@ -692,6 +2281,9 @@ idl_atof(char *s)
 	double	e, k;
 	long	neg = 0, negexp = 0;
 
+	ACE_UNUSED_ARG (f);
+	ACE_UNUSED_ARG (h);
+
 	if (*s == '-') {
 	  neg = 1;
 	  s++;
@@ -733,7 +2325,7 @@ idl_atof(char *s)
 	if (neg) d *= -1.0;
 
 	return d;
-}
+}	
 
 /*
  * Convert (some) escaped characters into their ascii values
@@ -800,1473 +2392,3 @@ idl_escape_reader(
 	break;
     }
 }
-int yyvstop[] = {
-0,
-
-56,
-0,
-
-56,
-0,
-
-58,
-0,
-
-56,
-58,
-0,
-
-57,
-0,
-
-58,
-0,
-
-58,
-0,
-
-58,
-0,
-
-58,
-0,
-
-44,
-58,
-0,
-
-42,
-58,
-0,
-
-58,
-0,
-
-58,
-0,
-
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-39,
-58,
-0,
-
-58,
-0,
-
-56,
-0,
-
-45,
-0,
-
-44,
-0,
-
-42,
-0,
-
-55,
-0,
-
-40,
-0,
-
-44,
-0,
-
-38,
-0,
-
-36,
-0,
-
-37,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-33,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-52,
-0,
-
-46,
-0,
-
-46,
-0,
-
-54,
-0,
-
-40,
-0,
-
-41,
-0,
-
-43,
-0,
-
-39,
-0,
-
-39,
-0,
-
-1,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-34,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-48,
-0,
-
-47,
-48,
-0,
-
-40,
-0,
-
-41,
-0,
-
-39,
-0,
-
-30,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-18,
-39,
-0,
-
-25,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-12,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-22,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-29,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-47,
-0,
-
-31,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-9,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-20,
-39,
-0,
-
-32,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-28,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-23,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-16,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-51,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-21,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-2,
-39,
-0,
-
-35,
-39,
-0,
-
-3,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-13,
-39,
-0,
-
-11,
-39,
-0,
-
-17,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-50,
-0,
-
-39,
-0,
-
-27,
-39,
-0,
-
-7,
-39,
-0,
-
-19,
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-10,
-39,
-0,
-
-39,
-0,
-
-26,
-39,
-0,
-
-39,
-0,
-
-53,
-0,
-
-39,
-0,
-
-39,
-0,
-
-39,
-0,
-
-4,
-39,
-0,
-
-15,
-39,
-0,
-
-24,
-39,
-0,
-
-39,
-0,
-
-5,
-39,
-0,
-
-6,
-39,
-0,
-
-8,
-39,
-0,
-
-14,
-39,
-0,
-
-49,
-0,
-0};
-# define YYTYPE int
-struct yywork { YYTYPE verify, advance; } yycrank[] = {
-0,0,	0,0,	1,3,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-0,0,	0,0,	1,4,	1,5,	
-0,0,	4,35,	0,0,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-0,0,	0,0,	0,0,	1,6,	
-4,35,	0,0,	0,0,	0,0,	
-1,7,	0,0,	0,0,	0,0,	
-1,3,	0,0,	1,8,	85,131,	
-1,9,	1,10,	1,11,	38,89,	
-90,135,	0,0,	0,0,	9,42,	
-0,0,	1,11,	0,0,	1,12,	
-9,43,	1,13,	0,0,	1,14,	
-0,0,	0,0,	1,15,	11,44,	
-0,0,	11,41,	1,15,	1,16,	
-1,15,	12,49,	13,50,	14,51,	
-0,0,	1,15,	16,53,	0,0,	
-0,0,	0,0,	0,0,	100,142,	
-0,0,	1,17,	0,0,	0,0,	
-53,99,	1,15,	11,47,	132,131,	
-0,0,	0,0,	17,54,	0,0,	
-1,3,	54,100,	1,18,	1,19,	
-1,20,	1,21,	1,22,	1,23,	
-99,141,	6,36,	1,24,	0,0,	
-0,0,	1,25,	1,26,	59,105,	
-1,27,	6,36,	6,36,	1,28,	
-1,29,	1,30,	1,31,	1,32,	
-1,33,	2,34,	11,47,	18,55,	
-19,57,	2,7,	21,61,	20,58,	
-23,65,	18,56,	22,63,	2,8,	
-24,66,	2,9,	20,59,	25,67,	
-21,62,	26,68,	6,37,	27,69,	
-22,64,	20,60,	30,78,	31,79,	
-2,12,	28,72,	2,13,	6,36,	
-2,14,	28,73,	27,70,	32,80,	
-6,36,	6,36,	41,44,	33,81,	
-41,41,	27,71,	55,101,	56,102,	
-6,36,	29,74,	57,103,	58,104,	
-29,75,	60,106,	61,107,	62,108,	
-63,109,	6,36,	2,17,	33,82,	
-64,110,	6,36,	6,36,	6,36,	
-29,76,	41,47,	65,111,	29,77,	
-6,36,	7,38,	67,114,	2,18,	
-2,19,	2,20,	2,21,	2,22,	
-2,23,	7,38,	7,0,	2,24,	
-6,36,	66,112,	2,25,	2,26,	
-68,115,	2,27,	66,113,	6,36,	
-2,28,	2,29,	2,30,	2,31,	
-2,32,	2,33,	69,116,	70,117,	
-71,118,	41,47,	72,119,	73,120,	
-74,121,	75,122,	7,38,	46,46,	
-46,46,	46,46,	46,46,	46,46,	
-46,46,	46,46,	46,46,	7,38,	
-76,123,	77,124,	78,125,	79,126,	
-7,38,	7,38,	80,128,	81,129,	
-82,130,	87,133,	88,134,	97,140,	
-7,38,	79,127,	102,143,	103,144,	
-104,145,	97,140,	105,146,	106,147,	
-106,148,	7,38,	107,149,	108,150,	
-109,151,	7,38,	7,38,	7,38,	
-110,152,	111,153,	112,154,	113,155,	
-7,38,	8,40,	8,41,	8,41,	
-8,41,	8,41,	8,41,	8,41,	
-8,41,	8,41,	8,41,	97,140,	
-7,38,	114,156,	115,157,	116,158,	
-7,39,	97,140,	10,44,	7,38,	
-10,45,	10,45,	10,45,	10,45,	
-10,45,	10,45,	10,45,	10,45,	
-10,46,	10,46,	117,159,	119,160,	
-120,161,	121,162,	122,163,	124,166,	
-125,167,	47,96,	126,168,	47,96,	
-127,169,	10,47,	47,97,	47,97,	
-47,97,	47,97,	47,97,	47,97,	
-47,97,	47,97,	47,97,	47,97,	
-92,136,	128,170,	129,171,	130,172,	
-133,174,	123,164,	134,175,	141,178,	
-10,48,	92,137,	92,137,	92,137,	
-92,137,	92,137,	92,137,	92,137,	
-92,137,	123,165,	143,179,	144,180,	
-147,181,	10,47,	148,182,	149,183,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	150,184,	152,185,	
-153,186,	154,187,	155,188,	157,189,	
-10,48,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	158,190,	
-159,191,	160,192,	161,193,	15,52,	
-162,194,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	15,52,	
-15,52,	15,52,	15,52,	34,83,	
-34,84,	94,138,	163,195,	94,138,	
-164,196,	165,197,	94,139,	94,139,	
-94,139,	94,139,	94,139,	94,139,	
-94,139,	94,139,	94,139,	94,139,	
-39,90,	166,198,	167,199,	43,43,	
-137,176,	168,200,	34,85,	169,201,	
-39,90,	39,0,	171,202,	43,43,	
-43,93,	137,177,	137,177,	137,177,	
-137,177,	137,177,	137,177,	137,177,	
-137,177,	172,203,	34,86,	34,86,	
-34,86,	34,86,	34,86,	34,86,	
-34,86,	34,86,	34,86,	34,86,	
-173,204,	39,90,	174,206,	175,207,	
-43,43,	177,176,	39,91,	179,208,	
-180,209,	182,210,	39,90,	183,211,	
-184,212,	43,43,	185,213,	39,92,	
-39,92,	188,214,	43,43,	43,43,	
-189,215,	139,95,	173,205,	39,90,	
-191,216,	192,217,	43,43,	139,95,	
-193,218,	194,219,	196,220,	197,221,	
-39,90,	198,222,	199,223,	43,43,	
-39,90,	39,90,	39,90,	43,43,	
-43,43,	43,43,	201,224,	39,90,	
-202,225,	203,226,	43,43,	34,87,	
-206,228,	207,229,	208,230,	209,231,	
-210,232,	139,95,	34,88,	39,90,	
-211,233,	213,234,	43,43,	139,95,	
-214,235,	218,236,	39,90,	219,237,	
-223,238,	43,43,	44,44,	44,44,	
-44,44,	44,44,	44,44,	44,44,	
-44,44,	44,44,	44,44,	44,44,	
-96,97,	96,97,	96,97,	96,97,	
-96,97,	96,97,	96,97,	96,97,	
-96,97,	96,97,	224,239,	44,94,	
-44,95,	225,240,	226,241,	229,243,	
-230,244,	45,44,	44,95,	45,45,	
-45,45,	45,45,	45,45,	45,45,	
-45,45,	45,45,	45,45,	45,46,	
-45,46,	138,139,	138,139,	138,139,	
-138,139,	138,139,	138,139,	138,139,	
-138,139,	138,139,	138,139,	234,245,	
-45,47,	235,246,	236,247,	44,94,	
-44,95,	86,84,	237,248,	239,249,	
-241,250,	244,252,	44,95,	245,253,	
-246,254,	250,255,	0,0,	205,227,	
-48,98,	48,98,	48,98,	48,98,	
-48,98,	48,98,	48,98,	48,98,	
-48,98,	48,98,	0,0,	86,132,	
-0,0,	0,0,	0,0,	131,131,	
-45,47,	48,98,	48,98,	48,98,	
-48,98,	48,98,	48,98,	131,131,	
-131,131,	0,0,	0,0,	86,86,	
-86,86,	86,86,	86,86,	86,86,	
-86,86,	86,86,	86,86,	86,86,	
-86,86,	205,205,	205,205,	205,205,	
-205,205,	205,205,	205,205,	205,205,	
-205,205,	205,205,	205,205,	0,0,	
-131,173,	48,98,	48,98,	48,98,	
-48,98,	48,98,	48,98,	243,251,	
-228,228,	131,131,	0,0,	251,251,	
-0,0,	0,0,	131,131,	131,131,	
-228,228,	228,242,	0,0,	251,251,	
-251,256,	0,0,	131,131,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-0,0,	0,0,	243,251,	131,131,	
-0,0,	0,0,	0,0,	131,131,	
-131,131,	131,131,	0,0,	0,0,	
-0,0,	228,228,	131,131,	0,0,	
-251,251,	0,0,	0,0,	0,0,	
-0,0,	0,0,	228,228,	0,0,	
-0,0,	251,251,	131,131,	228,228,	
-228,228,	0,0,	251,251,	251,251,	
-0,0,	131,131,	0,0,	228,228,	
-0,0,	0,0,	251,251,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-228,228,	0,0,	0,0,	251,251,	
-228,228,	228,228,	228,228,	251,251,	
-251,251,	251,251,	0,0,	228,228,	
-0,0,	0,0,	251,251,	0,0,	
-0,0,	0,0,	0,0,	0,0,	
-0,0,	0,0,	0,0,	228,228,	
-0,0,	0,0,	251,251,	0,0,	
-0,0,	0,0,	228,228,	0,0,	
-0,0,	251,251,	0,0,	0,0,	
-0,0};
-struct yysvf yysvec[] = {
-0,	0,	0,
-yycrank+-1,	0,		yyvstop+1,
-yycrank+-86,	yysvec+1,	yyvstop+3,
-yycrank+0,	0,		yyvstop+5,
-yycrank+4,	0,		yyvstop+7,
-yycrank+0,	0,		yyvstop+10,
-yycrank+-104,	0,		yyvstop+12,
-yycrank+-180,	0,		yyvstop+14,
-yycrank+209,	0,		yyvstop+16,
-yycrank+13,	0,		yyvstop+18,
-yycrank+228,	0,		yyvstop+20,
-yycrank+21,	yysvec+8,	yyvstop+23,
-yycrank+15,	0,		yyvstop+26,
-yycrank+14,	0,		yyvstop+28,
-yycrank+13,	0,		yyvstop+30,
-yycrank+284,	0,		yyvstop+32,
-yycrank+13,	yysvec+15,	yyvstop+35,
-yycrank+12,	yysvec+15,	yyvstop+38,
-yycrank+13,	yysvec+15,	yyvstop+41,
-yycrank+13,	yysvec+15,	yyvstop+44,
-yycrank+30,	yysvec+15,	yyvstop+47,
-yycrank+25,	yysvec+15,	yyvstop+50,
-yycrank+20,	yysvec+15,	yyvstop+53,
-yycrank+20,	yysvec+15,	yyvstop+56,
-yycrank+22,	yysvec+15,	yyvstop+59,
-yycrank+24,	yysvec+15,	yyvstop+62,
-yycrank+26,	yysvec+15,	yyvstop+65,
-yycrank+40,	yysvec+15,	yyvstop+68,
-yycrank+48,	yysvec+15,	yyvstop+71,
-yycrank+60,	yysvec+15,	yyvstop+74,
-yycrank+21,	yysvec+15,	yyvstop+77,
-yycrank+33,	yysvec+15,	yyvstop+80,
-yycrank+40,	yysvec+15,	yyvstop+83,
-yycrank+56,	yysvec+15,	yyvstop+86,
-yycrank+398,	0,		yyvstop+89,
-yycrank+0,	yysvec+4,	yyvstop+91,
-yycrank+0,	yysvec+6,	0,	
-yycrank+0,	0,		yyvstop+93,
-yycrank+12,	0,		0,	
-yycrank+-423,	0,		0,	
-yycrank+0,	yysvec+10,	yyvstop+95,
-yycrank+108,	yysvec+8,	yyvstop+97,
-yycrank+0,	0,		yyvstop+99,
-yycrank+-426,	0,		0,	
-yycrank+474,	0,		yyvstop+101,
-yycrank+503,	0,		yyvstop+103,
-yycrank+167,	yysvec+45,	0,	
-yycrank+250,	0,		0,	
-yycrank+540,	0,		0,	
-yycrank+0,	0,		yyvstop+105,
-yycrank+0,	0,		yyvstop+107,
-yycrank+0,	0,		yyvstop+109,
-yycrank+0,	yysvec+15,	yyvstop+111,
-yycrank+12,	yysvec+15,	yyvstop+113,
-yycrank+12,	yysvec+15,	yyvstop+115,
-yycrank+37,	yysvec+15,	yyvstop+117,
-yycrank+43,	yysvec+15,	yyvstop+119,
-yycrank+51,	yysvec+15,	yyvstop+121,
-yycrank+48,	yysvec+15,	yyvstop+123,
-yycrank+14,	yysvec+15,	yyvstop+125,
-yycrank+55,	yysvec+15,	yyvstop+127,
-yycrank+64,	yysvec+15,	yyvstop+129,
-yycrank+50,	yysvec+15,	yyvstop+131,
-yycrank+51,	yysvec+15,	yyvstop+133,
-yycrank+73,	yysvec+15,	yyvstop+135,
-yycrank+67,	yysvec+15,	yyvstop+137,
-yycrank+82,	yysvec+15,	yyvstop+139,
-yycrank+72,	yysvec+15,	yyvstop+142,
-yycrank+96,	yysvec+15,	yyvstop+144,
-yycrank+90,	yysvec+15,	yyvstop+146,
-yycrank+106,	yysvec+15,	yyvstop+148,
-yycrank+92,	yysvec+15,	yyvstop+150,
-yycrank+105,	yysvec+15,	yyvstop+152,
-yycrank+114,	yysvec+15,	yyvstop+154,
-yycrank+99,	yysvec+15,	yyvstop+156,
-yycrank+102,	yysvec+15,	yyvstop+158,
-yycrank+110,	yysvec+15,	yyvstop+160,
-yycrank+120,	yysvec+15,	yyvstop+162,
-yycrank+114,	yysvec+15,	yyvstop+164,
-yycrank+122,	yysvec+15,	yyvstop+166,
-yycrank+125,	yysvec+15,	yyvstop+168,
-yycrank+127,	yysvec+15,	yyvstop+170,
-yycrank+116,	yysvec+15,	yyvstop+172,
-yycrank+0,	yysvec+34,	0,	
-yycrank+0,	0,		yyvstop+174,
-yycrank+13,	yysvec+34,	0,	
-yycrank+567,	0,		0,	
-yycrank+133,	0,		0,	
-yycrank+120,	0,		0,	
-yycrank+0,	0,		yyvstop+176,
-yycrank+13,	0,		0,	
-yycrank+0,	yysvec+90,	yyvstop+178,
-yycrank+269,	0,		0,	
-yycrank+0,	0,		yyvstop+180,
-yycrank+366,	0,		0,	
-yycrank+0,	0,		yyvstop+182,
-yycrank+484,	0,		0,	
-yycrank+165,	yysvec+96,	yyvstop+184,
-yycrank+0,	yysvec+48,	yyvstop+186,
-yycrank+21,	yysvec+15,	yyvstop+188,
-yycrank+14,	yysvec+15,	yyvstop+190,
-yycrank+0,	yysvec+15,	yyvstop+192,
-yycrank+124,	yysvec+15,	yyvstop+195,
-yycrank+131,	yysvec+15,	yyvstop+197,
-yycrank+139,	yysvec+15,	yyvstop+199,
-yycrank+128,	yysvec+15,	yyvstop+201,
-yycrank+128,	yysvec+15,	yyvstop+203,
-yycrank+149,	yysvec+15,	yyvstop+205,
-yycrank+149,	yysvec+15,	yyvstop+207,
-yycrank+139,	yysvec+15,	yyvstop+209,
-yycrank+151,	yysvec+15,	yyvstop+211,
-yycrank+156,	yysvec+15,	yyvstop+213,
-yycrank+137,	yysvec+15,	yyvstop+215,
-yycrank+154,	yysvec+15,	yyvstop+217,
-yycrank+166,	yysvec+15,	yyvstop+219,
-yycrank+153,	yysvec+15,	yyvstop+221,
-yycrank+170,	yysvec+15,	yyvstop+223,
-yycrank+167,	yysvec+15,	yyvstop+225,
-yycrank+0,	yysvec+15,	yyvstop+227,
-yycrank+172,	yysvec+15,	yyvstop+230,
-yycrank+188,	yysvec+15,	yyvstop+232,
-yycrank+172,	yysvec+15,	yyvstop+234,
-yycrank+176,	yysvec+15,	yyvstop+236,
-yycrank+208,	yysvec+15,	yyvstop+238,
-yycrank+175,	yysvec+15,	yyvstop+240,
-yycrank+191,	yysvec+15,	yyvstop+242,
-yycrank+183,	yysvec+15,	yyvstop+244,
-yycrank+191,	yysvec+15,	yyvstop+246,
-yycrank+209,	yysvec+15,	yyvstop+248,
-yycrank+213,	yysvec+15,	yyvstop+250,
-yycrank+197,	yysvec+15,	yyvstop+252,
-yycrank+-602,	0,		0,	
-yycrank+57,	0,		0,	
-yycrank+211,	0,		0,	
-yycrank+217,	0,		0,	
-yycrank+0,	0,		yyvstop+254,
-yycrank+0,	0,		yyvstop+256,
-yycrank+389,	0,		0,	
-yycrank+513,	0,		0,	
-yycrank+407,	yysvec+138,	yyvstop+259,
-yycrank+0,	0,		yyvstop+261,
-yycrank+246,	yysvec+15,	yyvstop+263,
-yycrank+0,	yysvec+15,	yyvstop+265,
-yycrank+221,	yysvec+15,	yyvstop+268,
-yycrank+226,	yysvec+15,	yyvstop+270,
-yycrank+0,	yysvec+15,	yyvstop+272,
-yycrank+0,	yysvec+15,	yyvstop+275,
-yycrank+212,	yysvec+15,	yyvstop+278,
-yycrank+229,	yysvec+15,	yyvstop+280,
-yycrank+214,	yysvec+15,	yyvstop+282,
-yycrank+234,	yysvec+15,	yyvstop+284,
-yycrank+0,	yysvec+15,	yyvstop+286,
-yycrank+231,	yysvec+15,	yyvstop+289,
-yycrank+228,	yysvec+15,	yyvstop+291,
-yycrank+229,	yysvec+15,	yyvstop+293,
-yycrank+232,	yysvec+15,	yyvstop+295,
-yycrank+0,	yysvec+15,	yyvstop+297,
-yycrank+239,	yysvec+15,	yyvstop+300,
-yycrank+259,	yysvec+15,	yyvstop+302,
-yycrank+279,	yysvec+15,	yyvstop+304,
-yycrank+276,	yysvec+15,	yyvstop+306,
-yycrank+267,	yysvec+15,	yyvstop+308,
-yycrank+279,	yysvec+15,	yyvstop+310,
-yycrank+294,	yysvec+15,	yyvstop+312,
-yycrank+302,	yysvec+15,	yyvstop+314,
-yycrank+314,	yysvec+15,	yyvstop+316,
-yycrank+326,	yysvec+15,	yyvstop+318,
-yycrank+326,	yysvec+15,	yyvstop+320,
-yycrank+319,	yysvec+15,	yyvstop+322,
-yycrank+328,	yysvec+15,	yyvstop+324,
-yycrank+0,	yysvec+15,	yyvstop+326,
-yycrank+320,	yysvec+15,	yyvstop+329,
-yycrank+340,	yysvec+15,	yyvstop+331,
-yycrank+446,	0,		0,	
-yycrank+348,	0,		0,	
-yycrank+356,	0,		0,	
-yycrank+0,	0,		yyvstop+333,
-yycrank+422,	0,		0,	
-yycrank+0,	yysvec+15,	yyvstop+335,
-yycrank+365,	yysvec+15,	yyvstop+338,
-yycrank+367,	yysvec+15,	yyvstop+340,
-yycrank+0,	yysvec+15,	yyvstop+342,
-yycrank+345,	yysvec+15,	yyvstop+345,
-yycrank+359,	yysvec+15,	yyvstop+347,
-yycrank+367,	yysvec+15,	yyvstop+349,
-yycrank+354,	yysvec+15,	yyvstop+351,
-yycrank+0,	yysvec+15,	yyvstop+353,
-yycrank+0,	yysvec+15,	yyvstop+356,
-yycrank+371,	yysvec+15,	yyvstop+359,
-yycrank+375,	yysvec+15,	yyvstop+361,
-yycrank+0,	yysvec+15,	yyvstop+363,
-yycrank+359,	yysvec+15,	yyvstop+366,
-yycrank+366,	yysvec+15,	yyvstop+368,
-yycrank+374,	yysvec+15,	yyvstop+370,
-yycrank+375,	yysvec+15,	yyvstop+372,
-yycrank+0,	yysvec+15,	yyvstop+374,
-yycrank+383,	yysvec+15,	yyvstop+377,
-yycrank+371,	yysvec+15,	yyvstop+379,
-yycrank+385,	yysvec+15,	yyvstop+381,
-yycrank+389,	yysvec+15,	yyvstop+383,
-yycrank+0,	yysvec+15,	yyvstop+385,
-yycrank+388,	yysvec+15,	yyvstop+388,
-yycrank+405,	yysvec+15,	yyvstop+390,
-yycrank+391,	yysvec+15,	yyvstop+392,
-yycrank+0,	0,		yyvstop+394,
-yycrank+577,	0,		0,	
-yycrank+388,	0,		0,	
-yycrank+396,	0,		0,	
-yycrank+389,	yysvec+15,	yyvstop+396,
-yycrank+397,	yysvec+15,	yyvstop+398,
-yycrank+392,	yysvec+15,	yyvstop+400,
-yycrank+396,	yysvec+15,	yyvstop+402,
-yycrank+0,	yysvec+15,	yyvstop+404,
-yycrank+408,	yysvec+15,	yyvstop+407,
-yycrank+419,	yysvec+15,	yyvstop+409,
-yycrank+0,	yysvec+15,	yyvstop+411,
-yycrank+0,	yysvec+15,	yyvstop+414,
-yycrank+0,	yysvec+15,	yyvstop+417,
-yycrank+409,	yysvec+15,	yyvstop+420,
-yycrank+420,	yysvec+15,	yyvstop+422,
-yycrank+0,	yysvec+15,	yyvstop+424,
-yycrank+0,	yysvec+15,	yyvstop+427,
-yycrank+0,	yysvec+15,	yyvstop+430,
-yycrank+418,	yysvec+15,	yyvstop+433,
-yycrank+441,	yysvec+15,	yyvstop+435,
-yycrank+429,	yysvec+15,	yyvstop+437,
-yycrank+443,	yysvec+15,	yyvstop+439,
-yycrank+0,	0,		yyvstop+441,
-yycrank+-643,	0,		0,	
-yycrank+450,	0,		0,	
-yycrank+432,	yysvec+15,	yyvstop+443,
-yycrank+0,	yysvec+15,	yyvstop+445,
-yycrank+0,	yysvec+15,	yyvstop+448,
-yycrank+0,	yysvec+15,	yyvstop+451,
-yycrank+460,	yysvec+15,	yyvstop+454,
-yycrank+474,	yysvec+15,	yyvstop+456,
-yycrank+453,	yysvec+15,	yyvstop+458,
-yycrank+477,	yysvec+15,	yyvstop+460,
-yycrank+0,	yysvec+15,	yyvstop+462,
-yycrank+479,	yysvec+15,	yyvstop+465,
-yycrank+0,	yysvec+15,	yyvstop+467,
-yycrank+485,	yysvec+15,	yyvstop+470,
-yycrank+0,	0,		yyvstop+472,
-yycrank+634,	0,		0,	
-yycrank+480,	yysvec+15,	yyvstop+474,
-yycrank+473,	yysvec+15,	yyvstop+476,
-yycrank+483,	yysvec+15,	yyvstop+478,
-yycrank+0,	yysvec+15,	yyvstop+480,
-yycrank+0,	yysvec+15,	yyvstop+483,
-yycrank+0,	yysvec+15,	yyvstop+486,
-yycrank+469,	yysvec+15,	yyvstop+489,
-yycrank+-646,	0,		0,	
-yycrank+0,	yysvec+15,	yyvstop+491,
-yycrank+0,	yysvec+15,	yyvstop+494,
-yycrank+0,	yysvec+15,	yyvstop+497,
-yycrank+0,	yysvec+15,	yyvstop+500,
-yycrank+0,	0,		yyvstop+503,
-0,	0,	0};
-struct yywork *yytop = yycrank+741;
-struct yysvf *yybgin = yysvec+1;
-char yymatch[] = {
-  0,   1,   1,   1,   1,   1,   1,   1, 
-  1,   9,  10,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  9,   1,  34,   1,   1,   1,   1,   1, 
-  1,   1,   1,  43,   1,  43,   1,   1, 
- 48,  49,  49,  49,  49,  49,  49,  49, 
- 56,  56,   1,   1,   1,   1,   1,   1, 
-  1,  65,  65,  65,  65,  69,  70,  71, 
- 71,  71,  71,  71,  76,  71,  71,  71, 
- 71,  71,  71,  71,  71,  71,  71,  71, 
- 88,  71,  71,   1,   1,   1,   1,  95, 
-  1,  65,  65,  65,  65,  69,  70,  71, 
- 71,  71,  71,  71,  76,  71,  71,  71, 
- 71,  71,  71,  71,  71,  71,  71,  71, 
- 88,  71,  71,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-  1,   1,   1,   1,   1,   1,   1,   1, 
-0};
-char yyextra[] = {
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,
-0};
-/*	Copyright (c) 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*	THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF AT&T	*/
-/*	The copyright notice above does not evidence any   	*/
-/*	actual or intended publication of such source code.	*/
-
-#pragma ident	"@(#)ncform	6.8	95/02/11 SMI"
-
-int yylineno =1;
-# define YYU(x) x
-# define NLSTATE yyprevious=YYNEWLINE
-struct yysvf *yylstate [YYLMAX], **yylsp, **yyolsp;
-char yysbuf[YYLMAX];
-char *yysptr = yysbuf;
-int *yyfnd;
-extern struct yysvf *yyestate;
-int yyprevious = YYNEWLINE;
-#if defined(__cplusplus) || defined(__STDC__)
-int yylook(void)
-#else
-yylook()
-#endif
-{
-	register struct yysvf *yystate, **lsp;
-	register struct yywork *yyt;
-	struct yysvf *yyz;
-	int yych, yyfirst;
-	struct yywork *yyr;
-# ifdef LEXDEBUG
-	int debug;
-# endif
-	char *yylastch;
-	/* start off machines */
-# ifdef LEXDEBUG
-	debug = 0;
-# endif
-	yyfirst=1;
-	if (!yymorfg)
-		yylastch = yytext;
-	else {
-		yymorfg=0;
-		yylastch = yytext+yyleng;
-		}
-	for(;;){
-		lsp = yylstate;
-		yyestate = yystate = yybgin;
-		if (yyprevious==YYNEWLINE) yystate++;
-		for (;;){
-# ifdef LEXDEBUG
-			if(debug)fprintf(yyout,"state %d\n",yystate-yysvec-1);
-# endif
-			yyt = yystate->yystoff;
-			if(yyt == yycrank && !yyfirst){  /* may not be any transitions */
-				yyz = yystate->yyother;
-				if(yyz == 0)break;
-				if(yyz->yystoff == yycrank)break;
-				}
-#ifndef __cplusplus
-			*yylastch++ = yych = input();
-#else
-			*yylastch++ = yych = lex_input();
-#endif
-			if(yylastch > &yytext[YYLMAX]) {
-				fprintf(yyout,"Input string too long, limit %d\n",YYLMAX);
-				exit(1);
-			}
-			yyfirst=0;
-		tryagain:
-# ifdef LEXDEBUG
-			if(debug){
-				fprintf(yyout,"char ");
-				allprint(yych);
-				putchar('\n');
-				}
-# endif
-			yyr = yyt;
-			if ( (int)yyt > (int)yycrank){
-				yyt = yyr + yych;
-				if (yyt <= yytop && yyt->verify+yysvec == yystate){
-					if(yyt->advance+yysvec == YYLERR)	/* error transitions */
-						{unput(*--yylastch);break;}
-					*lsp++ = yystate = yyt->advance+yysvec;
-					if(lsp > &yylstate[YYLMAX]) {
-						fprintf(yyout,"Input string too long, limit %d\n",YYLMAX);
-						exit(1);
-					}
-					goto contin;
-					}
-				}
-# ifdef YYOPTIM
-			else if((int)yyt < (int)yycrank) {		/* r < yycrank */
-				yyt = yyr = yycrank+(yycrank-yyt);
-# ifdef LEXDEBUG
-				if(debug)fprintf(yyout,"compressed state\n");
-# endif
-				yyt = yyt + yych;
-				if(yyt <= yytop && yyt->verify+yysvec == yystate){
-					if(yyt->advance+yysvec == YYLERR)	/* error transitions */
-						{unput(*--yylastch);break;}
-					*lsp++ = yystate = yyt->advance+yysvec;
-					if(lsp > &yylstate[YYLMAX]) {
-						fprintf(yyout,"Input string too long, limit %d\n",YYLMAX);
-						exit(1);
-					}
-					goto contin;
-					}
-				yyt = yyr + YYU(yymatch[yych]);
-# ifdef LEXDEBUG
-				if(debug){
-					fprintf(yyout,"try fall back character ");
-					allprint(YYU(yymatch[yych]));
-					putchar('\n');
-					}
-# endif
-				if(yyt <= yytop && yyt->verify+yysvec == yystate){
-					if(yyt->advance+yysvec == YYLERR)	/* error transition */
-						{unput(*--yylastch);break;}
-					*lsp++ = yystate = yyt->advance+yysvec;
-					if(lsp > &yylstate[YYLMAX]) {
-						fprintf(yyout,"Input string too long, limit %d\n",YYLMAX);
-						exit(1);
-					}
-					goto contin;
-					}
-				}
-			if ((yystate = yystate->yyother) && (yyt= yystate->yystoff) != yycrank){
-# ifdef LEXDEBUG
-				if(debug)fprintf(yyout,"fall back to state %d\n",yystate-yysvec-1);
-# endif
-				goto tryagain;
-				}
-# endif
-			else
-				{unput(*--yylastch);break;}
-		contin:
-# ifdef LEXDEBUG
-			if(debug){
-				fprintf(yyout,"state %d char ",yystate-yysvec-1);
-				allprint(yych);
-				putchar('\n');
-				}
-# endif
-			;
-			}
-# ifdef LEXDEBUG
-		if(debug){
-			fprintf(yyout,"stopped at %d with ",*(lsp-1)-yysvec-1);
-			allprint(yych);
-			putchar('\n');
-			}
-# endif
-		while (lsp-- > yylstate){
-			*yylastch-- = 0;
-			if (*lsp != 0 && (yyfnd= (*lsp)->yystops) && *yyfnd > 0){
-				yyolsp = lsp;
-				if(yyextra[*yyfnd]){		/* must backup */
-					while(yyback((*lsp)->yystops,-*yyfnd) != 1 && lsp > yylstate){
-						lsp--;
-						unput(*yylastch--);
-						}
-					}
-				yyprevious = YYU(*yylastch);
-				yylsp = lsp;
-				yyleng = yylastch-yytext+1;
-				yytext[yyleng] = 0;
-# ifdef LEXDEBUG
-				if(debug){
-					fprintf(yyout,"\nmatch ");
-					sprint(yytext);
-					fprintf(yyout," action %d\n",*yyfnd);
-					}
-# endif
-				return(*yyfnd++);
-				}
-			unput(*yylastch);
-			}
-		if (yytext[0] == 0  /* && feof(yyin) */)
-			{
-			yysptr=yysbuf;
-			return(0);
-			}
-#ifndef __cplusplus
-		yyprevious = yytext[0] = input();
-		if (yyprevious>0)
-			output(yyprevious);
-#else
-		yyprevious = yytext[0] = lex_input();
-		if (yyprevious>0)
-			lex_output(yyprevious);
-#endif
-		yylastch=yytext;
-# ifdef LEXDEBUG
-		if(debug)putchar('\n');
-# endif
-		}
-	}
-#if defined(__cplusplus) || defined(__STDC__)
-int yyback(int *p, int m)
-#else
-yyback(p, m)
-	int *p;
-#endif
-{
-	if (p==0) return(0);
-	while (*p) {
-		if (*p++ == m)
-			return(1);
-	}
-	return(0);
-}
-	/* the following are only used in the lex library */
-#if defined(__cplusplus) || defined(__STDC__)
-int yyinput(void)
-#else
-yyinput()
-#endif
-{
-#ifndef __cplusplus
-	return(input());
-#else
-	return(lex_input());
-#endif
-	}
-#if defined(__cplusplus) || defined(__STDC__)
-void yyoutput(int c)
-#else
-yyoutput(c)
-  int c; 
-#endif
-{
-#ifndef __cplusplus
-	output(c);
-#else
-	lex_output(c);
-#endif
-	}
-#if defined(__cplusplus) || defined(__STDC__)
-void yyunput(int c)
-#else
-yyunput(c)
-   int c; 
-#endif
-{
-	unput(c);
-	}
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 0cdd81b2646..03e51de41e5 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,5 +1,5 @@
 
-# line 72 "idl.yy"
+# line 73 "idl.yy"
 #include "idl.h"
 #include "idl_extern.h"
 
@@ -11,8 +11,11 @@
 extern	"C" int yywrap();
 #endif	// (defined(apollo) || defined(hpux)) && defined(__cplusplus)
 
+void yyerror (char *);
+int yylex (void);
+extern "C" int yywrap (void);
 
-# line 89 "idl.yy"
+# line 93 "idl.yy"
 typedef union
 #ifdef __cplusplus
 	YYSTYPE
@@ -37,7 +40,7 @@ typedef union
   double		dval;		/* Double value		*/
   float			fval;		/* Float value		*/
   char			cval;		/* Char value		*/
-  
+
   String		*sval;		/* String value		*/
   char			*strval;	/* char * value		*/
   Identifier		*idval;		/* Identifier		*/
@@ -134,7 +137,7 @@ YYSTYPE *yyv;
 static int yymaxdepth = YYMAXDEPTH;
 # define YYERRCODE 256
 
-# line 2220 "idl.yy"
+# line 2239 "idl.yy"
 
 /* programs */
 
@@ -315,7 +318,7 @@ yytabelem yypgo[]={
    505,   504,   503,   502,     2,   501,   159,   142,   155,   179,
    130,   182,   234,   500,   143,   141,    10,   499,   498,   105,
    104,   103,   321,   497,   496,   495,     6,    76,   494,   493,
-     1,    15,   492,   491,   490,     0,   489,   207,   488,   166,
+     1,    15,   492,   491,   490,     0,   166,   489,   207,   488,
    487,   162,   486,   158,   485,   484,   483,   482,   481,   480,
    479,   478,   477,   476,   475,   474,   473,   472,   471,   470,
    469,   468,   467,   466,   465,   464,   463,   462,   461,   460,
@@ -330,8 +333,8 @@ yytabelem yypgo[]={
    340,   339,   335,   334,   332,   322 };
 yytabelem yyr1[]={
 
-     0,    66,    67,    67,    70,    68,    72,    68,    74,    68,
-    76,    68,    78,    68,    79,    68,    80,    81,    82,    83,
+     0,    67,    68,    68,    70,    69,    72,    69,    74,    69,
+    76,    69,    78,    69,    79,    69,    80,    81,    82,    83,
     77,    75,    75,    86,    87,    89,    84,    90,    64,    32,
     91,    22,    22,    88,    88,    93,    92,    94,    92,    95,
     92,    97,    92,    99,    92,   100,    92,    20,   101,    21,
@@ -340,7 +343,7 @@ yytabelem yyr1[]={
     48,    33,    34,    35,    35,    36,    36,    37,    37,    38,
     38,    38,    39,    39,    39,    40,    40,    40,    40,    41,
     41,    41,    41,    42,    42,    42,    43,    43,    43,    43,
-    43,    43,    44,   108,    69,    69,    69,    69,   110,   109,
+    43,    43,    44,   108,    66,    66,    66,    66,   110,   109,
      1,     1,     2,     2,     2,    56,    56,    56,    56,    56,
     56,     4,     4,     4,     3,     3,     3,    28,   111,    29,
     29,    60,    60,    30,   112,    31,    31,    61,    62,    49,
@@ -371,7 +374,7 @@ yytabelem yyr2[]={
      3,     2,     2,     2,     7,     2,     7,     2,     7,     2,
      7,     7,     2,     7,     7,     2,     7,     7,     7,     2,
      5,     5,     5,     3,     2,     7,     3,     3,     3,     3,
-     3,     3,     3,     1,     6,     2,     2,     2,     1,     7,
+     3,     3,     3,     1,     7,     3,     3,     3,     1,     7,
      2,     2,     3,     2,     3,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     5,     1,     9,
      1,     2,     2,     5,     1,     9,     1,     3,     3,     2,
@@ -392,9 +395,9 @@ yytabelem yyr2[]={
      1,     5,     1,     9,     1 };
 yytabelem yychk[]={
 
--10000000,   -66,   -67,   -68,   -69,   -71,   -73,   -75,   -77,   256,
+-10000000,   -67,   -68,   -69,   -66,   -71,   -73,   -75,   -77,   256,
    261,    -7,   -10,    -8,   258,   279,   -84,   -85,   259,   272,
-   273,   275,   -32,   -64,   260,   -67,   -70,   -72,   -74,   -76,
+   273,   275,   -32,   -64,   260,   -68,   -70,   -72,   -74,   -76,
    -78,   -79,  -108,  -104,  -164,   -80,  -113,  -123,  -141,   -86,
    -22,    58,   -90,    59,    59,    59,    59,    59,    59,  -109,
     -1,    -2,    -3,   -56,    -4,   -16,    -7,   -10,    -8,   -49,
@@ -410,11 +413,11 @@ yytabelem yychk[]={
    -65,   -44,   -34,   -35,   -36,   -37,   -38,   -39,   -40,   -41,
    -42,    43,    45,   126,   -16,   -43,    40,   292,   293,   294,
    295,   296,   297,   -44,   -44,  -152,  -106,  -166,   -82,  -115,
-  -125,  -143,   -89,   -92,   -69,   -71,   -73,   -96,   -98,   256,
+  -125,  -143,   -89,   -92,   -66,   -71,   -73,   -96,   -98,   256,
    -63,   -59,   282,   284,   285,    44,    44,   -24,   -45,    91,
   -150,   124,    94,    38,   299,   300,    43,    45,    42,    47,
     37,   -42,   -42,   -42,   -34,  -155,  -158,    -2,    61,  -119,
-   -67,  -116,  -118,    -1,   256,    40,  -144,  -146,   257,   125,
+   -68,  -116,  -118,    -1,   256,    40,  -144,  -146,   257,   125,
    -93,   -94,   -95,   -97,   -99,  -100,   283,   -12,   -15,   286,
    -56,    -6,   -16,  -101,  -111,   -25,  -160,    62,   -36,   -37,
    -38,   -39,   -39,   -40,   -40,   -41,   -41,   -41,    41,    62,
@@ -1356,79 +1359,79 @@ int yyparse()
 	{
 		
 case 4:
-# line 230 "idl.yy"
+# line 235 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
         } break;
 case 5:
-# line 234 "idl.yy"
+# line 239 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 6:
-# line 238 "idl.yy"
+# line 243 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
         } break;
 case 7:
-# line 242 "idl.yy"
+# line 247 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 8:
-# line 246 "idl.yy"
+# line 251 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
         } break;
 case 9:
-# line 250 "idl.yy"
+# line 255 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 10:
-# line 254 "idl.yy"
+# line 259 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
         } break;
 case 11:
-# line 258 "idl.yy"
+# line 263 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 12:
-# line 262 "idl.yy"
+# line 267 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
         } break;
 case 13:
-# line 266 "idl.yy"
+# line 271 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 14:
-# line 270 "idl.yy"
+# line 275 "idl.yy"
 {
 	  idl_global->err()->syntax_error(idl_global->parse_state());
 	} break;
 case 15:
-# line 274 "idl.yy"
+# line 279 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
 	  yyerrok;
 	} break;
 case 16:
-# line 281 "idl.yy"
+# line 286 "idl.yy"
 {
 	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
 	  } break;
 case 17:
-# line 285 "idl.yy"
+# line 290 "idl.yy"
 {
 	    UTL_ScopedName 	*n =
 		new UTL_ScopedName(new Identifier(yypvt[-0].strval, 1, 0, I_FALSE), NULL);
 	    AST_Module		*m = NULL;
 	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	    UTL_StrList		*p = idl_global->pragmas();	
+	    UTL_StrList		*p = idl_global->pragmas();
 
 	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
 	    /*
@@ -1444,17 +1447,17 @@ case 17:
 	    idl_global->scopes()->push(m);
 	  } break;
 case 18:
-# line 306 "idl.yy"
+# line 311 "idl.yy"
 {
 	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
 	  } break;
 case 19:
-# line 310 "idl.yy"
+# line 315 "idl.yy"
 {
 	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
 	  } break;
 case 20:
-# line 314 "idl.yy"
+# line 319 "idl.yy"
 {
 	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
 	    /*
@@ -1463,7 +1466,7 @@ case 20:
 	    idl_global->scopes()->pop();
 	  } break;
 case 23:
-# line 330 "idl.yy"
+# line 335 "idl.yy"
 {
 	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
 	  AST_Interface *i = NULL;
@@ -1472,6 +1475,8 @@ case 23:
 	  AST_Decl	*d = NULL;
 	  AST_Interface *fd = NULL;
 
+	  ACE_UNUSED_ARG (v);
+
 	  /*
 	   * Make a new interface node and add it to its enclosing scope
 	   */
@@ -1546,17 +1551,17 @@ case 23:
 	  idl_global->scopes()->push(i);
         } break;
 case 24:
-# line 412 "idl.yy"
+# line 419 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
 	} break;
 case 25:
-# line 416 "idl.yy"
+# line 423 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
 	} break;
 case 26:
-# line 420 "idl.yy"
+# line 427 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
 	  /*
@@ -1565,18 +1570,18 @@ case 26:
 	  idl_global->scopes()->pop();
 	} break;
 case 27:
-# line 431 "idl.yy"
+# line 438 "idl.yy"
 {
 	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
 	 } break;
 case 28:
-# line 435 "idl.yy"
+# line 442 "idl.yy"
 {
 	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
 	   yyval.idval = yypvt[-0].idval;
 	 } break;
 case 29:
-# line 443 "idl.yy"
+# line 450 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
 	  /*
@@ -1588,93 +1593,93 @@ case 29:
 	  yyval.ihval = new FE_InterfaceHeader(new UTL_ScopedName(yypvt[-1].idval, NULL), yypvt[-0].nlval);
 	} break;
 case 30:
-# line 457 "idl.yy"
+# line 464 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
         } break;
 case 31:
-# line 461 "idl.yy"
+# line 468 "idl.yy"
 {
 	  yyval.nlval = yypvt[-0].nlval;
 	} break;
 case 32:
-# line 465 "idl.yy"
+# line 472 "idl.yy"
 {
 	  yyval.nlval = NULL;
 	} break;
 case 35:
-# line 477 "idl.yy"
+# line 484 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
         } break;
 case 36:
-# line 481 "idl.yy"
+# line 488 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 37:
-# line 485 "idl.yy"
+# line 492 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
         } break;
 case 38:
-# line 489 "idl.yy"
+# line 496 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 39:
-# line 493 "idl.yy"
+# line 500 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
         } break;
 case 40:
-# line 497 "idl.yy"
+# line 504 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 41:
-# line 501 "idl.yy"
+# line 508 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
         } break;
 case 42:
-# line 505 "idl.yy"
+# line 512 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 43:
-# line 509 "idl.yy"
+# line 516 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
         } break;
 case 44:
-# line 513 "idl.yy"
+# line 520 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         } break;
 case 45:
-# line 517 "idl.yy"
+# line 524 "idl.yy"
 {
 	  idl_global->err()->syntax_error(idl_global->parse_state());
 	} break;
 case 46:
-# line 521 "idl.yy"
+# line 528 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
 	  yyerrok;
 	} break;
 case 47:
-# line 529 "idl.yy"
+# line 536 "idl.yy"
 {
 	  yyval.nlval = new UTL_NameList(yypvt[-1].idlist, yypvt[-0].nlval);
 	} break;
 case 48:
-# line 537 "idl.yy"
+# line 544 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
         } break;
 case 49:
-# line 541 "idl.yy"
+# line 548 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
 
@@ -1686,24 +1691,24 @@ case 49:
 	  }
 	} break;
 case 50:
-# line 552 "idl.yy"
+# line 559 "idl.yy"
 {
 	  yyval.nlval = NULL;
 	} break;
 case 51:
-# line 559 "idl.yy"
+# line 566 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
 
 	  yyval.idlist = new UTL_IdList(yypvt[-0].idval, NULL);
 	} break;
 case 52:
-# line 565 "idl.yy"
+# line 572 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
         } break;
 case 53:
-# line 569 "idl.yy"
+# line 576 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
 
@@ -1711,12 +1716,12 @@ case 53:
 			      new UTL_IdList(yypvt[-0].idval, NULL));
 	} break;
 case 54:
-# line 577 "idl.yy"
+# line 584 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
         } break;
 case 55:
-# line 581 "idl.yy"
+# line 588 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
 
@@ -1724,12 +1729,12 @@ case 55:
 	  yyval.idlist = yypvt[-3].idlist;
 	} break;
 case 56:
-# line 590 "idl.yy"
+# line 597 "idl.yy"
 {
             yyval.idval = new Identifier(yypvt[-0].strval, 1, 0, I_FALSE);
         } break;
 case 57:
-# line 597 "idl.yy"
+# line 604 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
@@ -1747,27 +1752,27 @@ case 57:
 	  }
 	} break;
 case 58:
-# line 617 "idl.yy"
+# line 624 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
         } break;
 case 59:
-# line 621 "idl.yy"
+# line 628 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
         } break;
 case 60:
-# line 625 "idl.yy"
+# line 632 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
         } break;
 case 61:
-# line 629 "idl.yy"
+# line 636 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
         } break;
 case 62:
-# line 633 "idl.yy"
+# line 640 "idl.yy"
 {
 	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-4].idval, NULL);
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
@@ -1775,6 +1780,8 @@ case 62:
 	  UTL_StrList		*p = idl_global->pragmas();
 	  AST_Decl		*v = NULL;
 
+	  ACE_UNUSED_ARG (v);
+
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
 	  /*
 	   * Create a node representing a constant declaration. Store
@@ -1791,17 +1798,17 @@ case 62:
 	  }
 	} break;
 case 68:
-# line 664 "idl.yy"
+# line 673 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_string;
 	} break;
 case 69:
-# line 668 "idl.yy"
+# line 677 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_wstring;
         } break;
 case 70:
-# line 672 "idl.yy"
+# line 681 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  AST_Decl		*d = NULL;
@@ -1837,78 +1844,78 @@ case 70:
 	    yyval.etval = AST_Expression::EV_any;
 	} break;
 case 74:
-# line 714 "idl.yy"
+# line 723 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, yypvt[-2].exval, yypvt[-0].exval);
 	} break;
 case 76:
-# line 722 "idl.yy"
+# line 731 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, yypvt[-2].exval, yypvt[-0].exval);
 	} break;
 case 78:
-# line 730 "idl.yy"
+# line 739 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, yypvt[-2].exval, yypvt[-0].exval);
 	} break;
 case 80:
-# line 738 "idl.yy"
+# line 747 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,yypvt[-2].exval,yypvt[-0].exval);
 	} break;
 case 81:
-# line 742 "idl.yy"
+# line 751 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,yypvt[-2].exval,yypvt[-0].exval);
 	} break;
 case 83:
-# line 750 "idl.yy"
+# line 759 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, yypvt[-2].exval, yypvt[-0].exval);
 	} break;
 case 84:
-# line 754 "idl.yy"
+# line 763 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,yypvt[-2].exval,yypvt[-0].exval);
 	} break;
 case 86:
-# line 762 "idl.yy"
+# line 771 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, yypvt[-2].exval, yypvt[-0].exval);
 	} break;
 case 87:
-# line 766 "idl.yy"
+# line 775 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, yypvt[-2].exval, yypvt[-0].exval);
 	} break;
 case 88:
-# line 770 "idl.yy"
+# line 779 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, yypvt[-2].exval, yypvt[-0].exval);
 	} break;
 case 90:
-# line 778 "idl.yy"
+# line 787 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
 					      yypvt[-0].exval,
 					      NULL);
 	} break;
 case 91:
-# line 784 "idl.yy"
+# line 793 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
 					      yypvt[-0].exval,
 					      NULL);
 	} break;
 case 92:
-# line 790 "idl.yy"
+# line 799 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
 					      yypvt[-0].exval,
 					      NULL);
 	} break;
 case 93:
-# line 799 "idl.yy"
+# line 808 "idl.yy"
 {
 	  /*
 	   * An expression which is a scoped name is not resolved now,
@@ -1918,60 +1925,72 @@ case 93:
 	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].idlist);
 	} break;
 case 95:
-# line 809 "idl.yy"
+# line 818 "idl.yy"
 {
 	  yyval.exval = yypvt[-1].exval;
 	} break;
 case 96:
-# line 816 "idl.yy"
+# line 825 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].ival);
 	} break;
 case 97:
-# line 820 "idl.yy"
+# line 829 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].sval);
 	} break;
 case 98:
-# line 824 "idl.yy"
+# line 833 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].cval);
 	} break;
 case 99:
-# line 828 "idl.yy"
+# line 837 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].dval);
 	} break;
 case 100:
-# line 832 "idl.yy"
+# line 841 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
 					    AST_Expression::EV_bool);
 	} break;
 case 101:
-# line 837 "idl.yy"
+# line 846 "idl.yy"
 {
 	  yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
 					    AST_Expression::EV_bool);
 	} break;
 case 102:
-# line 845 "idl.yy"
+# line 854 "idl.yy"
 {
 	    yypvt[-0].exval->evaluate(AST_Expression::EK_const);
 	    yyval.exval = idl_global->gen()->create_expr(yypvt[-0].exval, AST_Expression::EV_ulong);
 	} break;
 case 103:
-# line 853 "idl.yy"
+# line 862 "idl.yy"
 {
 	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
 	  } break;
+case 104:
+# line 865 "idl.yy"
+{yyval.ival = 0;} break;
+case 105:
+# line 866 "idl.yy"
+{ yyval.ival = 0;} break;
+case 106:
+# line 867 "idl.yy"
+{ yyval.ival = 0;} break;
+case 107:
+# line 868 "idl.yy"
+{ yyval.ival = 0;} break;
 case 108:
-# line 864 "idl.yy"
+# line 873 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
         } break;
 case 109:
-# line 868 "idl.yy"
+# line 877 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_DecllistActiveIterator *l;
@@ -1980,6 +1999,8 @@ case 109:
 	  AST_Decl		*v = NULL;
 	  UTL_StrList		*p = idl_global->pragmas();
 
+          ACE_UNUSED_ARG (v);
+
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
 	  /*
 	   * Create a list of type renamings. Add them to the
@@ -1989,10 +2010,10 @@ case 109:
 	    l = new UTL_DecllistActiveIterator(yypvt[-0].dlval);
 	    for (;!(l->is_done()); l->next()) {
 	      d = l->item();
-	      if (d == NULL) 
+	      if (d == NULL)
 		continue;
               AST_Type * tp = d->compose(yypvt[-2].dcval);
-              if (tp == NULL) 
+              if (tp == NULL)
 		continue;
 	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
 	      (void) s->fe_add_typedef(t);
@@ -2001,12 +2022,12 @@ case 109:
 	  }
 	} break;
 case 112:
-# line 905 "idl.yy"
+# line 916 "idl.yy"
 {
 	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
 	} break;
 case 114:
-# line 910 "idl.yy"
+# line 921 "idl.yy"
 {
 	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
 	  AST_Decl	*d = NULL;
@@ -2018,17 +2039,17 @@ case 114:
 	  yyval.dcval = d;
 	} break;
 case 127:
-# line 945 "idl.yy"
+# line 956 "idl.yy"
 {
 	  yyval.dlval = new UTL_DeclList(yypvt[-1].deval, yypvt[-0].dlval);
 	} break;
 case 128:
-# line 953 "idl.yy"
+# line 964 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
         } break;
 case 129:
-# line 957 "idl.yy"
+# line 968 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
 
@@ -2040,22 +2061,22 @@ case 129:
 	  }
 	} break;
 case 130:
-# line 968 "idl.yy"
+# line 979 "idl.yy"
 {
 	  yyval.dlval = NULL;
 	} break;
 case 133:
-# line 980 "idl.yy"
+# line 991 "idl.yy"
 {
 	  yyval.dlval = new UTL_DeclList(yypvt[-1].deval, yypvt[-0].dlval);
 	} break;
 case 134:
-# line 988 "idl.yy"
+# line 999 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
         } break;
 case 135:
-# line 992 "idl.yy"
+# line 1003 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
 
@@ -2067,100 +2088,100 @@ case 135:
 	  }
 	} break;
 case 136:
-# line 1003 "idl.yy"
+# line 1014 "idl.yy"
 {
 	  yyval.dlval = NULL;
 	} break;
 case 137:
-# line 1010 "idl.yy"
+# line 1021 "idl.yy"
 {
 	  yyval.deval = new FE_Declarator(new UTL_ScopedName(yypvt[-0].idval, NULL),
 				 FE_Declarator::FD_simple, NULL);
 	} break;
 case 138:
-# line 1018 "idl.yy"
+# line 1029 "idl.yy"
 {
 	  yyval.deval = new FE_Declarator(new UTL_ScopedName(yypvt[-0].dcval->local_name(), NULL),
 				 FE_Declarator::FD_complex,
 				 yypvt[-0].dcval);
 	} break;
 case 141:
-# line 1032 "idl.yy"
+# line 1043 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_long;
 	} break;
 case 142:
-# line 1036 "idl.yy"
+# line 1047 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_longlong;
         } break;
 case 143:
-# line 1040 "idl.yy"
+# line 1051 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_short;
 	} break;
 case 144:
-# line 1047 "idl.yy"
+# line 1058 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_ulong;
 	} break;
 case 145:
-# line 1051 "idl.yy"
+# line 1062 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_ulonglong;
         } break;
 case 146:
-# line 1055 "idl.yy"
+# line 1066 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_ushort;
 	} break;
 case 147:
-# line 1062 "idl.yy"
+# line 1073 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_double;
 	} break;
 case 148:
-# line 1066 "idl.yy"
+# line 1077 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_float;
 	} break;
 case 149:
-# line 1070 "idl.yy"
+# line 1081 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_longdouble;
         } break;
 case 150:
-# line 1077 "idl.yy"
+# line 1088 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_char;
 	} break;
 case 151:
-# line 1081 "idl.yy"
+# line 1092 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_wchar;
         } break;
 case 152:
-# line 1088 "idl.yy"
-{ 
+# line 1099 "idl.yy"
+{
           yyval.etval = AST_Expression::EV_octet;
 	} break;
 case 153:
-# line 1095 "idl.yy"
-{ 
+# line 1106 "idl.yy"
+{
 	  yyval.etval = AST_Expression::EV_bool;
         } break;
 case 154:
-# line 1102 "idl.yy"
+# line 1113 "idl.yy"
 {
 	  yyval.etval = AST_Expression::EV_any;
 	} break;
 case 155:
-# line 1109 "idl.yy"
+# line 1120 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
         } break;
 case 156:
-# line 1113 "idl.yy"
+# line 1124 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
@@ -2168,6 +2189,8 @@ case 156:
 	  UTL_StrList		*p = idl_global->pragmas();
 	  AST_Decl		*v = NULL;
 
+          ACE_UNUSED_ARG (v);
+
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
 	  /*
 	   * Create a node representing a struct declaration. Add it
@@ -2183,17 +2206,17 @@ case 156:
 	  idl_global->scopes()->push(d);
 	} break;
 case 157:
-# line 1135 "idl.yy"
+# line 1148 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
         } break;
 case 158:
-# line 1139 "idl.yy"
+# line 1152 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
         } break;
 case 159:
-# line 1143 "idl.yy"
+# line 1156 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
 	  /*
@@ -2209,17 +2232,17 @@ case 159:
 	  }
 	} break;
 case 163:
-# line 1168 "idl.yy"
+# line 1181 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
         } break;
 case 164:
-# line 1172 "idl.yy"
+# line 1185 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
         } break;
 case 165:
-# line 1176 "idl.yy"
+# line 1189 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_DecllistActiveIterator *l = NULL;
@@ -2241,10 +2264,10 @@ case 165:
 	    l = new UTL_DecllistActiveIterator(yypvt[-2].dlval);
 	    for (;!(l->is_done()); l->next()) {
 	      d = l->item();
-	      if (d == NULL) 
+	      if (d == NULL)
 		continue;
  	      AST_Type *tp = d->compose(yypvt[-4].dcval);
-	      if (tp == NULL) 
+	      if (tp == NULL)
 		continue;
 	      f = idl_global->gen()->create_field(tp, d->name(), p);
 	      (void) s->fe_add_field(f);
@@ -2253,43 +2276,43 @@ case 165:
 	  }
 	} break;
 case 166:
-# line 1209 "idl.yy"
+# line 1222 "idl.yy"
 {
 	  idl_global->err()->syntax_error(idl_global->parse_state());
 	} break;
 case 167:
-# line 1213 "idl.yy"
+# line 1226 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
 	  yyerrok;
 	} break;
 case 168:
-# line 1221 "idl.yy"
+# line 1234 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
         } break;
 case 169:
-# line 1225 "idl.yy"
+# line 1238 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
         } break;
 case 170:
-# line 1229 "idl.yy"
+# line 1242 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
         } break;
 case 171:
-# line 1233 "idl.yy"
+# line 1246 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
         } break;
 case 172:
-# line 1237 "idl.yy"
+# line 1250 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
         } break;
 case 173:
-# line 1241 "idl.yy"
+# line 1254 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-8].idval, NULL);
@@ -2297,6 +2320,8 @@ case 173:
 	  AST_Decl		*v = NULL;
 	  UTL_StrList		*p = idl_global->pragmas();
 
+          ACE_UNUSED_ARG (v);
+
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
 	  /*
 	   * Create a node representing a union. Add it to its enclosing
@@ -2317,17 +2342,17 @@ case 173:
 	  idl_global->scopes()->push(u);
 	} break;
 case 174:
-# line 1268 "idl.yy"
+# line 1283 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
         } break;
 case 175:
-# line 1272 "idl.yy"
+# line 1287 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
         } break;
 case 176:
-# line 1276 "idl.yy"
+# line 1291 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
 	  /*
@@ -2343,27 +2368,27 @@ case 176:
 	  }
 	} break;
 case 177:
-# line 1294 "idl.yy"
+# line 1309 "idl.yy"
 {
 	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
 	} break;
 case 178:
-# line 1298 "idl.yy"
+# line 1313 "idl.yy"
 {
 	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
 	} break;
 case 179:
-# line 1302 "idl.yy"
+# line 1317 "idl.yy"
 {
 	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
 	} break;
 case 180:
-# line 1306 "idl.yy"
+# line 1321 "idl.yy"
 {
 	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
 	} break;
 case 182:
-# line 1311 "idl.yy"
+# line 1326 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  AST_Decl		*d = NULL;
@@ -2424,17 +2449,17 @@ case 182:
 	    idl_global->err()->lookup_error(yypvt[-0].idlist);
 	} break;
 case 186:
-# line 1381 "idl.yy"
+# line 1396 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
         } break;
 case 187:
-# line 1385 "idl.yy"
+# line 1400 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
         } break;
 case 188:
-# line 1389 "idl.yy"
+# line 1404 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_LabellistActiveIterator *l = NULL;
@@ -2463,23 +2488,23 @@ case 188:
 	  }
 	} break;
 case 189:
-# line 1417 "idl.yy"
+# line 1432 "idl.yy"
 {
 	  idl_global->err()->syntax_error(idl_global->parse_state());
 	} break;
 case 190:
-# line 1421 "idl.yy"
+# line 1436 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
 	  yyerrok;
 	} break;
 case 191:
-# line 1429 "idl.yy"
+# line 1444 "idl.yy"
 {
 	  yyval.llval = new UTL_LabelList(yypvt[-1].ulval, yypvt[-0].llval);
 	} break;
 case 192:
-# line 1436 "idl.yy"
+# line 1451 "idl.yy"
 {
 	  if (yypvt[-1].llval == NULL)
 	    yyval.llval = new UTL_LabelList(yypvt[-0].ulval, NULL);
@@ -2489,17 +2514,17 @@ case 192:
 	  }
 	} break;
 case 193:
-# line 1445 "idl.yy"
+# line 1460 "idl.yy"
 {
 	  yyval.llval = NULL;
 	} break;
 case 194:
-# line 1452 "idl.yy"
+# line 1467 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
         } break;
 case 195:
-# line 1456 "idl.yy"
+# line 1471 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
 
@@ -2508,17 +2533,17 @@ case 195:
 				       NULL);
 	} break;
 case 196:
-# line 1464 "idl.yy"
+# line 1479 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
         } break;
 case 197:
-# line 1468 "idl.yy"
+# line 1483 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
         } break;
 case 198:
-# line 1472 "idl.yy"
+# line 1487 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
 
@@ -2526,12 +2551,12 @@ case 198:
 						     yypvt[-2].exval);
 	} break;
 case 199:
-# line 1482 "idl.yy"
+# line 1497 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
         } break;
 case 200:
-# line 1486 "idl.yy"
+# line 1501 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
 	  /*
@@ -2555,12 +2580,12 @@ case 200:
 	  }
 	} break;
 case 201:
-# line 1512 "idl.yy"
+# line 1527 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
         } break;
 case 202:
-# line 1516 "idl.yy"
+# line 1531 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
@@ -2568,6 +2593,8 @@ case 202:
 	  AST_Decl		*v = NULL;
 	  UTL_StrList		*p = idl_global->pragmas();
 
+          ACE_UNUSED_ARG (v);
+
 	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
 	  /*
 	   * Create a node representing an enum and add it to its
@@ -2586,17 +2613,17 @@ case 202:
 	  idl_global->scopes()->push(e);
 	} break;
 case 203:
-# line 1541 "idl.yy"
+# line 1558 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
         } break;
 case 204:
-# line 1545 "idl.yy"
+# line 1562 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
         } break;
 case 205:
-# line 1549 "idl.yy"
+# line 1566 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
 	  /*
@@ -2610,12 +2637,12 @@ case 205:
 	  }
 	} break;
 case 207:
-# line 1568 "idl.yy"
+# line 1585 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
         } break;
 case 210:
-# line 1577 "idl.yy"
+# line 1594 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_ScopedName	*n =
@@ -2630,23 +2657,23 @@ case 210:
 	   */
 	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
 	    c = AST_Enum::narrow_from_scope(s);
-	    if (c != NULL) 
+	    if (c != NULL)
 	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
 	    (void) s->fe_add_enum_val(e);
 	  }
 	} break;
 case 211:
-# line 1601 "idl.yy"
+# line 1618 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
         } break;
 case 212:
-# line 1605 "idl.yy"
+# line 1622 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
         } break;
 case 213:
-# line 1609 "idl.yy"
+# line 1626 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
 	  /*
@@ -2663,8 +2690,8 @@ case 213:
 	  } else if (yypvt[-5].dcval == NULL) {
 	    yyval.dcval = NULL;
 	  } else {
- 	    AST_Type *tp = AST_Type::narrow_from_decl(yypvt[-5].dcval); 
-	    if (tp == NULL) 
+ 	    AST_Type *tp = AST_Type::narrow_from_decl(yypvt[-5].dcval);
+	    if (tp == NULL)
 	      yyval.dcval = NULL;
 	    else {
 	      yyval.dcval = idl_global->gen()->create_sequence(yypvt[-2].exval, tp);
@@ -2677,7 +2704,7 @@ case 213:
 	  }
 	} break;
 case 214:
-# line 1640 "idl.yy"
+# line 1657 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
 	  /*
@@ -2708,7 +2735,7 @@ case 214:
 	  }
 	} break;
 case 215:
-# line 1673 "idl.yy"
+# line 1690 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
 	  /*
@@ -2717,28 +2744,28 @@ case 215:
 	  idl_global->scopes()->push(NULL);
 	} break;
 case 216:
-# line 1681 "idl.yy"
+# line 1698 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
         } break;
 case 217:
-# line 1685 "idl.yy"
+# line 1702 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
 	  yyval.dcval = yypvt[-0].dcval;
         } break;
 case 218:
-# line 1694 "idl.yy"
+# line 1711 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
         } break;
 case 219:
-# line 1698 "idl.yy"
+# line 1715 "idl.yy"
 {
 	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
         } break;
 case 220:
-# line 1702 "idl.yy"
+# line 1719 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
 	  /*
@@ -2757,7 +2784,7 @@ case 220:
 	  }
 	} break;
 case 221:
-# line 1720 "idl.yy"
+# line 1737 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
 	  /*
@@ -2773,22 +2800,22 @@ case 221:
                     ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
 	} break;
 case 222:
-# line 1738 "idl.yy"
+# line 1755 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
         } break;
 case 223:
-# line 1746 "idl.yy"
+# line 1763 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
         } break;
 case 224:
-# line 1750 "idl.yy"
+# line 1767 "idl.yy"
 {
 	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
         } break;
 case 225:
-# line 1754 "idl.yy"
+# line 1771 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
 	  /*
@@ -2807,7 +2834,7 @@ case 225:
 	  }
 	} break;
 case 226:
-# line 1772 "idl.yy"
+# line 1789 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
 	  /*
@@ -2823,17 +2850,17 @@ case 226:
                     ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
 	} break;
 case 227:
-# line 1790 "idl.yy"
+# line 1807 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
         } break;
 case 228:
-# line 1797 "idl.yy"
+# line 1814 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
         } break;
 case 229:
-# line 1801 "idl.yy"
+# line 1818 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
 	  /*
@@ -2845,12 +2872,12 @@ case 229:
 	  }
 	} break;
 case 230:
-# line 1815 "idl.yy"
+# line 1832 "idl.yy"
 {
 	  yyval.elval = new UTL_ExprList(yypvt[-1].exval, yypvt[-0].elval);
 	} break;
 case 231:
-# line 1822 "idl.yy"
+# line 1839 "idl.yy"
 {
 	  if (yypvt[-1].elval == NULL)
 	    yyval.elval = new UTL_ExprList(yypvt[-0].exval, NULL);
@@ -2860,22 +2887,22 @@ case 231:
 	  }
 	} break;
 case 232:
-# line 1831 "idl.yy"
+# line 1848 "idl.yy"
 {
 	  yyval.elval = NULL;
 	} break;
 case 233:
-# line 1838 "idl.yy"
+# line 1855 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
         } break;
 case 234:
-# line 1842 "idl.yy"
+# line 1859 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
         } break;
 case 235:
-# line 1846 "idl.yy"
+# line 1863 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
 	  /*
@@ -2889,17 +2916,17 @@ case 235:
 	    yyval.exval = yypvt[-2].exval;
 	} break;
 case 236:
-# line 1863 "idl.yy"
+# line 1880 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
         } break;
 case 237:
-# line 1867 "idl.yy"
+# line 1884 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
         } break;
 case 238:
-# line 1871 "idl.yy"
+# line 1888 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_DecllistActiveIterator *l = NULL;
@@ -2931,23 +2958,23 @@ case 238:
 	  }
 	} break;
 case 239:
-# line 1905 "idl.yy"
+# line 1922 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
 	  yyval.bval = I_TRUE;
 	} break;
 case 240:
-# line 1910 "idl.yy"
+# line 1927 "idl.yy"
 {
 	  yyval.bval = I_FALSE;
 	} break;
 case 241:
-# line 1917 "idl.yy"
+# line 1934 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
 	} break;
 case 242:
-# line 1921 "idl.yy"
+# line 1938 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
@@ -2955,6 +2982,8 @@ case 242:
 	  UTL_StrList		*p = idl_global->pragmas();
 	  AST_Decl		*v = NULL;
 
+          ACE_UNUSED_ARG (v);
+
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
 	  /*
 	   * Create a node representing an exception and add it to
@@ -2970,17 +2999,17 @@ case 242:
 	  idl_global->scopes()->push(e);
 	} break;
 case 243:
-# line 1943 "idl.yy"
+# line 1962 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
         } break;
 case 244:
-# line 1947 "idl.yy"
+# line 1966 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
         } break;
 case 245:
-# line 1951 "idl.yy"
+# line 1970 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
 	  /*
@@ -2989,12 +3018,12 @@ case 245:
 	  idl_global->scopes()->pop();
 	} break;
 case 246:
-# line 1963 "idl.yy"
+# line 1982 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
         } break;
 case 247:
-# line 1967 "idl.yy"
+# line 1986 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  UTL_ScopedName	*n =
@@ -3024,17 +3053,17 @@ case 247:
 	  idl_global->scopes()->push(o);
 	} break;
 case 248:
-# line 1996 "idl.yy"
+# line 2015 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
         } break;
 case 249:
-# line 2000 "idl.yy"
+# line 2019 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
         } break;
 case 250:
-# line 2004 "idl.yy"
+# line 2023 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  AST_Operation		*o = NULL;
@@ -3057,66 +3086,66 @@ case 250:
 	  idl_global->scopes()->pop();
 	} break;
 case 251:
-# line 2029 "idl.yy"
+# line 2048 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
 	  yyval.ofval = AST_Operation::OP_oneway;
 	} break;
 case 252:
-# line 2034 "idl.yy"
+# line 2053 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
 	  yyval.ofval = AST_Operation::OP_idempotent;
 	} break;
 case 253:
-# line 2039 "idl.yy"
+# line 2058 "idl.yy"
 {
 	  yyval.ofval = AST_Operation::OP_noflags;
 	} break;
 case 255:
-# line 2047 "idl.yy"
+# line 2066 "idl.yy"
 {
 	  yyval.dcval =
 	    idl_global->scopes()->bottom()
 	       ->lookup_primitive_type(AST_Expression::EV_void);
 	} break;
 case 256:
-# line 2056 "idl.yy"
+# line 2075 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
         } break;
 case 257:
-# line 2060 "idl.yy"
+# line 2079 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
         } break;
 case 258:
-# line 2064 "idl.yy"
+# line 2083 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
         } break;
 case 259:
-# line 2069 "idl.yy"
+# line 2088 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
         } break;
 case 261:
-# line 2079 "idl.yy"
+# line 2098 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
         } break;
 case 264:
-# line 2088 "idl.yy"
+# line 2107 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
         } break;
 case 265:
-# line 2092 "idl.yy"
+# line 2111 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
         } break;
 case 266:
-# line 2096 "idl.yy"
+# line 2115 "idl.yy"
 {
 	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
 	  AST_Argument		*a = NULL;
@@ -3136,12 +3165,12 @@ case 266:
 	  }
 	} break;
 case 267:
-# line 2118 "idl.yy"
+# line 2137 "idl.yy"
 {
 	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
 	} break;
 case 269:
-# line 2123 "idl.yy"
+# line 2142 "idl.yy"
 {
 	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
 	  AST_Decl	*d = NULL;
@@ -3153,74 +3182,74 @@ case 269:
 	  yyval.dcval = d;
 	} break;
 case 270:
-# line 2137 "idl.yy"
+# line 2156 "idl.yy"
 {
 	  yyval.dival = AST_Argument::dir_IN;
 	} break;
 case 271:
-# line 2141 "idl.yy"
+# line 2160 "idl.yy"
 {
 	  yyval.dival = AST_Argument::dir_OUT;
 	} break;
 case 272:
-# line 2145 "idl.yy"
+# line 2164 "idl.yy"
 {
 	  yyval.dival = AST_Argument::dir_INOUT;
 	} break;
 case 273:
-# line 2152 "idl.yy"
+# line 2171 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
         } break;
 case 274:
-# line 2156 "idl.yy"
+# line 2175 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
         } break;
 case 275:
-# line 2161 "idl.yy"
+# line 2180 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
 	  yyval.nlval = yypvt[-1].nlval;
 	} break;
 case 276:
-# line 2166 "idl.yy"
+# line 2185 "idl.yy"
 {
 	  yyval.nlval = NULL;
 	} break;
 case 277:
-# line 2173 "idl.yy"
+# line 2192 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
         } break;
 case 278:
-# line 2177 "idl.yy"
+# line 2196 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
         } break;
 case 279:
-# line 2182 "idl.yy"
+# line 2201 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
 	  yyval.slval = yypvt[-1].slval;
 	} break;
 case 280:
-# line 2187 "idl.yy"
+# line 2206 "idl.yy"
 {
 	  yyval.slval = NULL;
 	} break;
 case 281:
-# line 2194 "idl.yy"
+# line 2213 "idl.yy"
 {
 	  yyval.slval = new UTL_StrList(yypvt[-1].sval, yypvt[-0].slval);
 	} break;
 case 282:
-# line 2202 "idl.yy"
+# line 2221 "idl.yy"
 {
 	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
         } break;
 case 283:
-# line 2206 "idl.yy"
+# line 2225 "idl.yy"
 {
 	  if (yypvt[-3].slval == NULL)
 	    yyval.slval = new UTL_StrList(yypvt[-0].sval, NULL);
@@ -3230,7 +3259,7 @@ case 283:
 	  }
 	} break;
 case 284:
-# line 2215 "idl.yy"
+# line 2234 "idl.yy"
 {
 	  yyval.slval = NULL;
 	} break;
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 8df07d2632c..0a1a091ebda 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -23,7 +23,7 @@ typedef union
   double		dval;		/* Double value		*/
   float			fval;		/* Float value		*/
   char			cval;		/* Char value		*/
-  
+
   String		*sval;		/* String value		*/
   char			*strval;	/* char * value		*/
   Identifier		*idval;		/* Identifier		*/