ChangeLogTag:Tue Jul 30 09:07:29 2002 Ossama Othman <ossama@uci.edu>

1 files changed, 796 insertions, 790 deletions

diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index b315c3f0d91..5fbc7b3dfbc 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -1,4 +1,5 @@
 #define ACE_YY_NO_UNPUT
+
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
@@ -28,15 +29,15 @@
 /* The "const" storage-class-modifier is valid. */
 #define ACE_YY_USE_CONST
 
-#else   /* ! __cplusplus */
+#else	/* ! __cplusplus */
 
 #if __STDC__
 
 #define ACE_YY_USE_PROTOS
 #define ACE_YY_USE_CONST
 
-#endif  /* __STDC__ */
-#endif  /* ! __cplusplus */
+#endif	/* __STDC__ */
+#endif	/* ! __cplusplus */
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 
@@ -109,10 +110,10 @@ extern FILE *ace_yyin, *ace_yyout;
  * int a single C statement (which needs a semi-colon terminator).  This
  * avoids problems with code like:
  *
- *      if ( condition_holds )
- *              ace_yyless( 5 );
- *      else
- *              do_something_else();
+ * 	if ( condition_holds )
+ *		ace_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
@@ -122,15 +123,15 @@ extern FILE *ace_yyin, *ace_yyout;
 /* Return all but the first 'n' matched characters back to the input stream. */
 
 #define ace_yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up ace_yytext. */ \
-                *ace_yy_cp = ace_yy_hold_char; \
-                ACE_YY_RESTORE_ACE_YY_MORE_OFFSET \
-                ace_yy_c_buf_p = ace_yy_cp = ace_yy_bp + n - ACE_YY_MORE_ADJ; \
-                ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ \
-                } \
-        while ( 0 )
+	do \
+		{ \
+		/* Undo effects of setting up ace_yytext. */ \
+		*ace_yy_cp = ace_yy_hold_char; \
+		ACE_YY_RESTORE_ACE_YY_MORE_OFFSET \
+		ace_yy_c_buf_p = ace_yy_cp = ace_yy_bp + n - ACE_YY_MORE_ADJ; \
+		ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ \
+		} \
+	while ( 0 )
 
 #if 0
 #define unput(c) ace_yyunput( c, ace_yytext_ptr )
@@ -144,61 +145,61 @@ typedef unsigned int ace_yy_size_t;
 
 
 struct ace_yy_buffer_state
-        {
-        FILE *ace_yy_input_file;
-
-        ACE_TCHAR *ace_yy_ch_buf;       /* input buffer */
-        ACE_TCHAR *ace_yy_buf_pos;      /* current position in input buffer */
-
-        /* Size of input buffer in bytes, not including room for EOB
-         * characters.
-         */
-        ace_yy_size_t ace_yy_buf_size;
-
-        /* Number of characters read into ace_yy_ch_buf, not including EOB
-         * characters.
-         */
-        int ace_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 ace_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 ace_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 ace_yy_at_bol;
-
-        /* Whether to try to fill the input buffer when we reach the
-         * end of it.
-         */
-        int ace_yy_fill_buffer;
-
-        int ace_yy_buffer_status;
+	{
+	FILE *ace_yy_input_file;
+
+	ACE_TCHAR *ace_yy_ch_buf;	/* input buffer */
+	ACE_TCHAR *ace_yy_buf_pos;	/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	ace_yy_size_t ace_yy_buf_size;
+
+	/* Number of characters read into ace_yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int ace_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 ace_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 ace_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 ace_yy_at_bol;
+
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int ace_yy_fill_buffer;
+
+	int ace_yy_buffer_status;
 #define ACE_YY_BUFFER_NEW 0
 #define ACE_YY_BUFFER_NORMAL 1
-        /* When an EOF's been seen but there's still some text to process
-         * then we mark the buffer as ACE_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 ace_yyrestart()), so that the user can continue scanning by
-         * just pointing ace_yyin at a new input file.
-         */
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as ACE_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 ace_yyrestart()), so that the user can continue scanning by
+	 * just pointing ace_yyin at a new input file.
+	 */
 #define ACE_YY_BUFFER_EOF_PENDING 2
-        };
+	};
 
 static ACE_YY_BUFFER_STATE ace_yy_current_buffer = 0;
 
@@ -212,15 +213,15 @@ static ACE_YY_BUFFER_STATE ace_yy_current_buffer = 0;
 /* ace_yy_hold_char holds the character lost when ace_yytext is formed. */
 static ACE_TCHAR ace_yy_hold_char;
 
-static int ace_yy_n_chars;              /* number of characters read into ace_yy_ch_buf */
+static int ace_yy_n_chars;		/* number of characters read into ace_yy_ch_buf */
 
 
 int ace_yyleng;
 
 /* Points to current character in buffer. */
 static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0;
-static int ace_yy_init = 1;             /* whether we need to initialize */
-static int ace_yy_start = 0;    /* start state number */
+static int ace_yy_init = 1;		/* whether we need to initialize */
+static int ace_yy_start = 0;	/* start state number */
 
 /* Flag which is used to allow ace_yywrap()'s to do buffer switches
  * instead of setting up a fresh ace_yyin.  A bit of a hack ...
@@ -248,18 +249,18 @@ static void ace_yy_flex_free ACE_YY_PROTO(( void * ));
 #define ace_yy_new_buffer ace_yy_create_buffer
 
 #define ace_yy_set_interactive(is_interactive) \
-        { \
-        if ( ! ace_yy_current_buffer ) \
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
-        ace_yy_current_buffer->ace_yy_is_interactive = is_interactive; \
-        }
+	{ \
+	if ( ! ace_yy_current_buffer ) \
+		ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
+	ace_yy_current_buffer->ace_yy_is_interactive = is_interactive; \
+	}
 
 #define ace_yy_set_bol(at_bol) \
-        { \
-        if ( ! ace_yy_current_buffer ) \
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
-        ace_yy_current_buffer->ace_yy_at_bol = at_bol; \
-        }
+	{ \
+	if ( ! ace_yy_current_buffer ) \
+		ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE ); \
+	ace_yy_current_buffer->ace_yy_at_bol = at_bol; \
+	}
 
 #define ACE_YY_AT_BOL() (ace_yy_current_buffer->ace_yy_at_bol)
 
@@ -278,11 +279,11 @@ static void ace_yy_fatal_error ACE_YY_PROTO(( ace_yyconst ACE_TCHAR msg[] ));
  * corresponding action - sets up ace_yytext.
  */
 #define ACE_YY_DO_BEFORE_ACTION \
-        ace_yytext_ptr = ace_yy_bp; \
-        ace_yyleng = (int) (ace_yy_cp - ace_yy_bp); \
-        ace_yy_hold_char = *ace_yy_cp; \
-        *ace_yy_cp = '\0'; \
-        ace_yy_c_buf_p = ace_yy_cp;
+	ace_yytext_ptr = ace_yy_bp; \
+	ace_yyleng = (int) (ace_yy_cp - ace_yy_bp); \
+	ace_yy_hold_char = *ace_yy_cp; \
+	*ace_yy_cp = '\0'; \
+	ace_yy_c_buf_p = ace_yy_cp;
 
 #define ACE_YY_NUM_RULES 26
 #define ACE_YY_END_OF_BUFFER 27
@@ -513,11 +514,8 @@ ACE_TCHAR *ace_yytext;
 #include "ace/Svc_Conf_Lexer_Guard.h"
 
 ACE_RCSID (ace,
-           Svc_Conf_l,
-           "$Id$")
-
-// Keeps track of the current line for debugging output.
-int ace_yylineno = 1;
+	   Svc_Conf_l,
+	   "$Id$")
 
 #define token(x)  x
 #define PARAMETERS 1
@@ -611,21 +609,32 @@ ACE_YY_MALLOC_DECL
  */
 #ifndef ACE_YY_INPUT
 #define ACE_YY_INPUT(buf,result,max_size) \
-        if ( ace_yy_current_buffer->ace_yy_is_interactive ) \
-                { \
-                int c = '*', n; \
-                for ( n = 0; n < max_size && \
-                             (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \
-                        buf[n] = (ACE_TCHAR) c; \
-                if ( c == '\n' ) \
-                        buf[n++] = (ACE_TCHAR) c; \
-                if ( c == EOF && ferror( ace_yyin ) ) \
-                        ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "input in flex scanner failed") ); \
-                result = n; \
-                } \
-        else if ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \
-                  && ferror( ace_yyin ) ) \
-                ACE_YY_FATAL_ERROR(ACE_LIB_TEXT("input in flex scanner failed") );
+	if ( ace_yy_current_buffer->ace_yy_is_interactive ) \
+		{ \
+		int c = '*', n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (ACE_TCHAR) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (ACE_TCHAR) c; \
+		if ( c == EOF && ferror( ace_yyin ) ) \
+			ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("input in flex scanner failed") ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, sizeof (ACE_TCHAR), max_size, ace_yyin))==0 && ferror(ace_yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				ACE_YY_FATAL_ERROR( ACE_LIB_TEXT ("input in flex scanner failed") ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(ace_yyin); \
+			} \
+		}
 #endif
 
 /* No semi-colon after return; correct usage is to write "ace_yyterminate();" -
@@ -666,108 +675,105 @@ ACE_YY_MALLOC_DECL
 #endif
 
 #define ACE_YY_RULE_SETUP \
-        if ( ace_yyleng > 0 ) \
-                ace_yy_current_buffer->ace_yy_at_bol = \
-                                (ace_yytext[ace_yyleng - 1] == '\n'); \
-        ACE_YY_USER_ACTION
+	if ( ace_yyleng > 0 ) \
+		ace_yy_current_buffer->ace_yy_at_bol = \
+				(ace_yytext[ace_yyleng - 1] == '\n'); \
+	ACE_YY_USER_ACTION
 
 ACE_YY_DECL
-        {
-          ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
-                                    ace_mon,
-                                    *ACE_Static_Object_Lock::instance (),
-                                    -1));
-
-          ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
-
-        register ace_yy_state_type ace_yy_current_state;
-        register ACE_TCHAR *ace_yy_cp=0, *ace_yy_bp=0;
-        register int ace_yy_act;
+	{
+	register ace_yy_state_type ace_yy_current_state;
+	register ACE_TCHAR *ace_yy_cp=0, *ace_yy_bp=0;
+	register int ace_yy_act;
 
+        ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
+                                  ace_mon,
+                                  *ACE_Static_Object_Lock::instance (),
+                                  -1));
 
+        ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
 
-
-        if ( ace_yy_init )
-                {
-                ace_yy_init = 0;
+	if ( ace_yy_init )
+		{
+		ace_yy_init = 0;
 
 #ifdef ACE_YY_USER_INIT
-                ACE_YY_USER_INIT;
+		ACE_YY_USER_INIT;
 #endif
 
-                if ( ! ace_yy_start )
-                        ace_yy_start = 1;       /* first start state */
+		if ( ! ace_yy_start )
+			ace_yy_start = 1;	/* first start state */
 
-                if ( ! ace_yyin )
-                        ace_yyin = stdin;
+		if ( ! ace_yyin )
+			ace_yyin = stdin;
 
-                if ( ! ace_yyout )
-                        ace_yyout = stdout;
+		if ( ! ace_yyout )
+			ace_yyout = stdout;
 
-                if ( ! ace_yy_current_buffer )
-                        ace_yy_current_buffer =
-                                ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
+		if ( ! ace_yy_current_buffer )
+			ace_yy_current_buffer =
+				ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
 
-                ace_yy_load_buffer_state();
-                }
+		ace_yy_load_buffer_state();
+		}
 
-        while ( 1 )             /* loops until end-of-file is reached */
-                {
-                ace_yy_cp = ace_yy_c_buf_p;
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		ace_yy_cp = ace_yy_c_buf_p;
 
-                /* Support of ace_yytext. */
-                *ace_yy_cp = ace_yy_hold_char;
+		/* Support of ace_yytext. */
+		*ace_yy_cp = ace_yy_hold_char;
 
-                /* ace_yy_bp points to the position in ace_yy_ch_buf of the start of
-                 * the current run.
-                 */
-                ace_yy_bp = ace_yy_cp;
+		/* ace_yy_bp points to the position in ace_yy_ch_buf of the start of
+		 * the current run.
+		 */
+		ace_yy_bp = ace_yy_cp;
 
-                ace_yy_current_state = ace_yy_start;
-                ace_yy_current_state += ACE_YY_AT_BOL();
+		ace_yy_current_state = ace_yy_start;
+		ace_yy_current_state += ACE_YY_AT_BOL();
 ace_yy_match:
-                do
-                        {
-                        register ACE_YY_CHAR ace_yy_c = ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)];
-                        if ( ace_yy_accept[ace_yy_current_state] )
-                                {
-                                ace_yy_last_accepting_state = ace_yy_current_state;
-                                ace_yy_last_accepting_cpos = ace_yy_cp;
-                                }
-                        while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                                {
-                                ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                                if ( ace_yy_current_state >= 108 )
-                                        ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                                }
-                        ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-                        ++ace_yy_cp;
-                        }
-                while ( ace_yy_base[ace_yy_current_state] != 438 );
+		do
+			{
+			register ACE_YY_CHAR ace_yy_c = ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)];
+			if ( ace_yy_accept[ace_yy_current_state] )
+				{
+				ace_yy_last_accepting_state = ace_yy_current_state;
+				ace_yy_last_accepting_cpos = ace_yy_cp;
+				}
+			while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
+				{
+				ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
+				if ( ace_yy_current_state >= 108 )
+					ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
+				}
+			ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
+			++ace_yy_cp;
+			}
+		while ( ace_yy_base[ace_yy_current_state] != 438 );
 
 ace_yy_find_action:
-                ace_yy_act = ace_yy_accept[ace_yy_current_state];
-                if ( ace_yy_act == 0 )
-                        { /* have to back up */
-                        ace_yy_cp = ace_yy_last_accepting_cpos;
-                        ace_yy_current_state = ace_yy_last_accepting_state;
-                        ace_yy_act = ace_yy_accept[ace_yy_current_state];
-                        }
+		ace_yy_act = ace_yy_accept[ace_yy_current_state];
+		if ( ace_yy_act == 0 )
+			{ /* have to back up */
+			ace_yy_cp = ace_yy_last_accepting_cpos;
+			ace_yy_current_state = ace_yy_last_accepting_state;
+			ace_yy_act = ace_yy_accept[ace_yy_current_state];
+			}
 
-                ACE_YY_DO_BEFORE_ACTION;
+		ACE_YY_DO_BEFORE_ACTION;
 
 
-do_action:      /* This label is used only to access EOF actions. */
+do_action:	/* This label is used only to access EOF actions. */
 
 
-                switch ( ace_yy_act )
-        { /* beginning of action switch */
-                        case 0: /* must back up */
-                        /* undo the effects of ACE_YY_DO_BEFORE_ACTION */
-                        *ace_yy_cp = ace_yy_hold_char;
-                        ace_yy_cp = ace_yy_last_accepting_cpos;
-                        ace_yy_current_state = ace_yy_last_accepting_state;
-                        goto ace_yy_find_action;
+		switch ( ace_yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of ACE_YY_DO_BEFORE_ACTION */
+			*ace_yy_cp = ace_yy_hold_char;
+			ace_yy_cp = ace_yy_last_accepting_cpos;
+			ace_yy_current_state = ace_yy_last_accepting_state;
+			goto ace_yy_find_action;
 
 case 1:
 *ace_yy_cp = ace_yy_hold_char; /* undo effects of setting up ace_yytext */
@@ -775,75 +781,75 @@ ace_yy_c_buf_p = ace_yy_cp -= 1;
 ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
 ACE_YY_RULE_SETUP
 ; /* EMPTY */
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case 2:
 ACE_YY_RULE_SETUP
 { return token (ACE_DYNAMIC); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 3:
 ACE_YY_RULE_SETUP
 { return token (ACE_STATIC); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 4:
 ACE_YY_RULE_SETUP
 { return token (ACE_SUSPEND); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 5:
 ACE_YY_RULE_SETUP
 { return token (ACE_RESUME); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 6:
 ACE_YY_RULE_SETUP
 { return token (ACE_REMOVE); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 7:
 ACE_YY_RULE_SETUP
 { return token (ACE_USTREAM); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 8:
 ACE_YY_RULE_SETUP
 { return token (ACE_MODULE_T); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 9:
 ACE_YY_RULE_SETUP
 { return token (ACE_SVC_OBJ_T); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 10:
 ACE_YY_RULE_SETUP
 { return token (ACE_STREAM_T); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 11:
 ACE_YY_RULE_SETUP
 { return token (ACE_ACTIVE); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 12:
 ACE_YY_RULE_SETUP
 { return token (ACE_INACTIVE); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 13:
 ACE_YY_RULE_SETUP
 { return token (':'); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 14:
 ACE_YY_RULE_SETUP
 { return token ('*'); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 15:
 ACE_YY_RULE_SETUP
 { return token ('('); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 16:
 ACE_YY_RULE_SETUP
 { return token (')'); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 17:
 ACE_YY_RULE_SETUP
 { return token ('{'); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 18:
 ACE_YY_RULE_SETUP
 { return token ('}'); }
-        //      ACE_YY_BREAK
+	//      ACE_YY_BREAK
 case 19:
 ACE_YY_RULE_SETUP
 {
@@ -859,36 +865,36 @@ ACE_YY_RULE_SETUP
                         // Eliminate the opening and closing double or
                         // single quotes.
                         *s = '\0';
-                        ace_yyleng -= 1;
+			ace_yyleng -= 1;
                         ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng);
-                        return token (ACE_STRING); }
-//      ACE_YY_BREAK
+			return token (ACE_STRING); }
+//	ACE_YY_BREAK
 case 20:
 ACE_YY_RULE_SETUP
 {
-                        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
-                        return token (ACE_IDENT);
-                      }
-//      ACE_YY_BREAK
+		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
+			return token (ACE_IDENT);
+		      }
+//	ACE_YY_BREAK
 case 21:
 ACE_YY_RULE_SETUP
 {
-                        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
-                        return token (ACE_PATHNAME);
-                      }
-//      ACE_YY_BREAK
+		        ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
+			return token (ACE_PATHNAME);
+		      }
+//	ACE_YY_BREAK
 case 22:
 ACE_YY_RULE_SETUP
 ; /* EMPTY */
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case 23:
 ACE_YY_RULE_SETUP
 ; /* EMPTY */
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case 24:
 ACE_YY_RULE_SETUP
-{ ACE_SVC_CONF_PARAM->yylineno++; ace_yylineno++; }
-        ACE_YY_BREAK
+{ ACE_SVC_CONF_PARAM->yylineno++; }
+	ACE_YY_BREAK
 case 25:
 ACE_YY_RULE_SETUP
 {
@@ -899,320 +905,320 @@ ACE_YY_RULE_SETUP
                           ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext));
                         ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n")));
                       }
-        ACE_YY_BREAK
+	ACE_YY_BREAK
 case ACE_YY_STATE_EOF(INITIAL):
 case ACE_YY_STATE_EOF(PARAMETERS):
 case ACE_YY_STATE_EOF(NORMAL):
-{ ace_yyterminate(); }
-//      ACE_YY_BREAK
+{ ace_yyterminate (); }
+	ACE_YY_BREAK
 case 26:
 ACE_YY_RULE_SETUP
 ACE_SVC_CONF_ECHO;
-        ACE_YY_BREAK
-
-        case ACE_YY_END_OF_BUFFER:
-                {
-                /* Amount of text matched not including the EOB ACE_TCHAR. */
-                int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1;
-
-                /* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */
-                *ace_yy_cp = ace_yy_hold_char;
-                ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
-
-                if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_NEW )
-                        {
-                        /* We're scanning a new file or input source.  It's
-                         * possible that this happened because the user
-                         * just pointed ace_yyin at a new source and called
-                         * ace_yylex().  If so, then we have to assure
-                         * consistency between ace_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.
-                         */
-                        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
-                        ace_yy_current_buffer->ace_yy_input_file = ace_yyin;
-                        ace_yy_current_buffer->ace_yy_buffer_status = ACE_YY_BUFFER_NORMAL;
-                        }
-
-                /* Note that here we test for ace_yy_c_buf_p "<=" to the position
-                 * of the first EOB in the buffer, since ace_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 ( ace_yy_c_buf_p <= &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
-                        { /* This was really a NUL. */
-                        ace_yy_state_type ace_yy_next_state;
-
-                        ace_yy_c_buf_p = ace_yytext_ptr + ace_yy_amount_of_matched_text;
-
-                        ace_yy_current_state = ace_yy_get_previous_state();
-
-                        /* Okay, we're now positioned to make the NUL
-                         * transition.  We couldn't have
-                         * ace_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).
-                         */
-
-                        ace_yy_next_state = ace_yy_try_NUL_trans( ace_yy_current_state );
-
-                        ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-
-                        if ( ace_yy_next_state )
-                                {
-                                /* Consume the NUL. */
-                                ace_yy_cp = ++ace_yy_c_buf_p;
-                                ace_yy_current_state = ace_yy_next_state;
-                                goto ace_yy_match;
-                                }
-
-                        else
-                                {
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                goto ace_yy_find_action;
-                                }
-                        }
-
-                else switch ( ace_yy_get_next_buffer() )
-                        {
-                        case EOB_ACT_END_OF_FILE:
-                                {
-                                ace_yy_did_buffer_switch_on_eof = 0;
-
-                                if ( ace_yywrap() )
-                                        {
-                                        /* Note: because we've taken care in
-                                         * ace_yy_get_next_buffer() to have set up
-                                         * ace_yytext, we can now set up
-                                         * ace_yy_c_buf_p so that if some total
-                                         * hoser (like flex itself) wants to
-                                         * call the scanner after we return the
-                                         * ACE_YY_NULL, it'll still work - another
-                                         * ACE_YY_NULL will get returned.
-                                         */
-                                        ace_yy_c_buf_p = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-
-                                        ace_yy_act = ACE_YY_STATE_EOF(ACE_YY_START);
-                                        goto do_action;
-                                        }
-
-                                else
-                                        {
-                                        if ( ! ace_yy_did_buffer_switch_on_eof )
-                                                ACE_YY_NEW_FILE;
-                                        }
-                                break;
-                                }
-
-                        case EOB_ACT_CONTINUE_SCAN:
-                                ace_yy_c_buf_p =
-                                        ace_yytext_ptr + ace_yy_amount_of_matched_text;
-
-                                ace_yy_current_state = ace_yy_get_previous_state();
-
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-                                goto ace_yy_match;
-
-                        case EOB_ACT_LAST_MATCH:
-                                ace_yy_c_buf_p =
-                                &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars];
-
-                                ace_yy_current_state = ace_yy_get_previous_state();
-
-                                ace_yy_cp = ace_yy_c_buf_p;
-                                ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
-                                goto ace_yy_find_action;
-                        }
-                break;
-                }
-
-        default:
-                ACE_YY_FATAL_ERROR(
-                        ACE_LIB_TEXT("fatal flex scanner internal error--no action found") );
-        } /* end of action switch */
-                } /* end of scanning one token */
-        } /* end of ace_yylex */
+	ACE_YY_BREAK
+
+	case ACE_YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB ACE_TCHAR. */
+		int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1;
+
+		/* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */
+		*ace_yy_cp = ace_yy_hold_char;
+		ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
+
+		if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed ace_yyin at a new source and called
+			 * ace_yylex().  If so, then we have to assure
+			 * consistency between ace_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.
+			 */
+			ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
+			ace_yy_current_buffer->ace_yy_input_file = ace_yyin;
+			ace_yy_current_buffer->ace_yy_buffer_status = ACE_YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for ace_yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since ace_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 ( ace_yy_c_buf_p <= &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
+			{ /* This was really a NUL. */
+			ace_yy_state_type ace_yy_next_state;
+
+			ace_yy_c_buf_p = ace_yytext_ptr + ace_yy_amount_of_matched_text;
+
+			ace_yy_current_state = ace_yy_get_previous_state();
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * ace_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).
+			 */
+
+			ace_yy_next_state = ace_yy_try_NUL_trans( ace_yy_current_state );
+
+			ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+
+			if ( ace_yy_next_state )
+				{
+				/* Consume the NUL. */
+				ace_yy_cp = ++ace_yy_c_buf_p;
+				ace_yy_current_state = ace_yy_next_state;
+				goto ace_yy_match;
+				}
+
+			else
+				{
+				ace_yy_cp = ace_yy_c_buf_p;
+				goto ace_yy_find_action;
+				}
+			}
+
+		else switch ( ace_yy_get_next_buffer() )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				ace_yy_did_buffer_switch_on_eof = 0;
+
+				if ( ace_yywrap() )
+					{
+					/* Note: because we've taken care in
+					 * ace_yy_get_next_buffer() to have set up
+					 * ace_yytext, we can now set up
+					 * ace_yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * ACE_YY_NULL, it'll still work - another
+					 * ACE_YY_NULL will get returned.
+					 */
+					ace_yy_c_buf_p = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+
+					ace_yy_act = ACE_YY_STATE_EOF(ACE_YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! ace_yy_did_buffer_switch_on_eof )
+						ACE_YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				ace_yy_c_buf_p =
+					ace_yytext_ptr + ace_yy_amount_of_matched_text;
+
+				ace_yy_current_state = ace_yy_get_previous_state();
+
+				ace_yy_cp = ace_yy_c_buf_p;
+				ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+				goto ace_yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				ace_yy_c_buf_p =
+				&ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars];
+
+				ace_yy_current_state = ace_yy_get_previous_state();
+
+				ace_yy_cp = ace_yy_c_buf_p;
+				ace_yy_bp = ace_yytext_ptr + ACE_YY_MORE_ADJ;
+				goto ace_yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		ACE_YY_FATAL_ERROR(
+			ACE_LIB_TEXT("fatal flex scanner internal error--no action found") );
+	} /* end of action switch */
+		} /* end of scanning one token */
+	} /* end of ace_yylex */
 
 
 /* ace_yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
- *      EOB_ACT_LAST_MATCH -
- *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *      EOB_ACT_END_OF_FILE - end of file
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
  */
 
 static int ace_yy_get_next_buffer()
-        {
-        register ACE_TCHAR *dest = ace_yy_current_buffer->ace_yy_ch_buf;
-        register ACE_TCHAR *source = ace_yytext_ptr;
-        register int number_to_move, i;
-        int ret_val;
-
-        if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] )
-                ACE_YY_FATAL_ERROR(
-                ACE_LIB_TEXT("fatal flex scanner internal error--end of buffer missed") );
-
-        if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 )
-                { /* Don't try to fill the buffer, so this is an EOF. */
-                if ( ace_yy_c_buf_p - ace_yytext_ptr - ACE_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) (ace_yy_c_buf_p - ace_yytext_ptr) - 1;
-
-        for ( i = 0; i < number_to_move; ++i )
-                *(dest++) = *(source++);
-
-        if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_EOF_PENDING )
-                /* don't do the read, it's not guaranteed to return an EOF,
-                 * just force an EOF
-                 */
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars = 0;
-
-        else
-                {
-                int num_to_read =
-                        ace_yy_current_buffer->ace_yy_buf_size - number_to_move - 1;
-
-                while ( num_to_read <= 0 )
-                        { /* Not enough room in the buffer - grow it. */
+	{
+	register ACE_TCHAR *dest = ace_yy_current_buffer->ace_yy_ch_buf;
+	register ACE_TCHAR *source = ace_yytext_ptr;
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] )
+		ACE_YY_FATAL_ERROR(
+		ACE_LIB_TEXT("fatal flex scanner internal error--end of buffer missed") );
+
+	if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( ace_yy_c_buf_p - ace_yytext_ptr - ACE_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) (ace_yy_c_buf_p - ace_yytext_ptr) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( ace_yy_current_buffer->ace_yy_buffer_status == ACE_YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars = 0;
+
+	else
+		{
+		int num_to_read =
+			ace_yy_current_buffer->ace_yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
 #ifdef ACE_YY_USES_REJECT
                           ACE_YY_FATAL_ERROR(ACE_LIB_TEXT(
 "input buffer overflow, can't enlarge buffer because scanner uses REJECT") );
 #else
 
-                        /* just a shorter name for the current buffer */
-                        ACE_YY_BUFFER_STATE b = ace_yy_current_buffer;
+			/* just a shorter name for the current buffer */
+			ACE_YY_BUFFER_STATE b = ace_yy_current_buffer;
 
-                        int ace_yy_c_buf_p_offset =
-                                (int) (ace_yy_c_buf_p - b->ace_yy_ch_buf);
+			int ace_yy_c_buf_p_offset =
+				(int) (ace_yy_c_buf_p - b->ace_yy_ch_buf);
 
-                        if ( b->ace_yy_is_our_buffer )
-                                {
-                                int new_size = b->ace_yy_buf_size * 2;
+			if ( b->ace_yy_is_our_buffer )
+				{
+				int new_size = b->ace_yy_buf_size * 2;
 
-                                if ( new_size <= 0 )
-                                        b->ace_yy_buf_size += b->ace_yy_buf_size / 8;
-                                else
-                                        b->ace_yy_buf_size *= 2;
+				if ( new_size <= 0 )
+					b->ace_yy_buf_size += b->ace_yy_buf_size / 8;
+				else
+					b->ace_yy_buf_size *= 2;
 
-                                b->ace_yy_ch_buf = (ACE_TCHAR *)
-                                        /* Include room in for 2 EOB chars. */
-                                        ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf,
+				b->ace_yy_ch_buf = (ACE_TCHAR *)
+					/* Include room in for 2 EOB chars. */
+					ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf,
                                                       (b->ace_yy_buf_size + 2)*sizeof(ACE_TCHAR));
-                                }
-                        else
-                                /* Can't grow it, we don't own it. */
-                                b->ace_yy_ch_buf = 0;
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->ace_yy_ch_buf = 0;
 
-                        if ( ! b->ace_yy_ch_buf )
+			if ( ! b->ace_yy_ch_buf )
                           ACE_YY_FATAL_ERROR(ACE_LIB_TEXT(
-                                "fatal error - scanner input buffer overflow") );
+				"fatal error - scanner input buffer overflow") );
 
-                        ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset];
+			ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset];
 
-                        num_to_read = ace_yy_current_buffer->ace_yy_buf_size -
-                                                number_to_move - 1;
+			num_to_read = ace_yy_current_buffer->ace_yy_buf_size -
+						number_to_move - 1;
 #endif
-                        }
+			}
 
-                if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE )
-                        num_to_read = ACE_YY_READ_BUF_SIZE/sizeof (ACE_TCHAR);
+		if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE )
+			num_to_read = ACE_YY_READ_BUF_SIZE/sizeof (ACE_TCHAR);
 
-                /* Read in more data. */
-                ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]),
-                        ace_yy_n_chars, num_to_read );
+		/* Read in more data. */
+		ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]),
+			ace_yy_n_chars, num_to_read );
 
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
-                }
+		ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
+		}
 
-        if ( ace_yy_n_chars == 0 )
-                {
-                if ( number_to_move == ACE_YY_MORE_ADJ )
-                        {
-                        ret_val = EOB_ACT_END_OF_FILE;
-                        ace_yyrestart( ace_yyin );
-                        }
+	if ( ace_yy_n_chars == 0 )
+		{
+		if ( number_to_move == ACE_YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			ace_yyrestart( ace_yyin );
+			}
 
-                else
-                        {
-                        ret_val = EOB_ACT_LAST_MATCH;
-                        ace_yy_current_buffer->ace_yy_buffer_status =
-                                ACE_YY_BUFFER_EOF_PENDING;
-                        }
-                }
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			ace_yy_current_buffer->ace_yy_buffer_status =
+				ACE_YY_BUFFER_EOF_PENDING;
+			}
+		}
 
-        else
-                ret_val = EOB_ACT_CONTINUE_SCAN;
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-        ace_yy_n_chars += number_to_move;
-        ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] = ACE_YY_END_OF_BUFFER_CHAR;
-        ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] = ACE_YY_END_OF_BUFFER_CHAR;
+	ace_yy_n_chars += number_to_move;
+	ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] = ACE_YY_END_OF_BUFFER_CHAR;
+	ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] = ACE_YY_END_OF_BUFFER_CHAR;
 
-        ace_yytext_ptr = &ace_yy_current_buffer->ace_yy_ch_buf[0];
+	ace_yytext_ptr = &ace_yy_current_buffer->ace_yy_ch_buf[0];
 
-        return ret_val;
-        }
+	return ret_val;
+	}
 
 
 /* ace_yy_get_previous_state - get the state just before the EOB ACE_TCHAR was reached */
 
 static ace_yy_state_type ace_yy_get_previous_state()
-        {
-        register ace_yy_state_type ace_yy_current_state;
-        register ACE_TCHAR *ace_yy_cp;
-
-        ace_yy_current_state = ace_yy_start;
-        ace_yy_current_state += ACE_YY_AT_BOL();
-
-        for ( ace_yy_cp = ace_yytext_ptr + ACE_YY_MORE_ADJ; ace_yy_cp < ace_yy_c_buf_p; ++ace_yy_cp )
-                {
-                register ACE_YY_CHAR ace_yy_c = (*ace_yy_cp ? ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)] : 1);
-                if ( ace_yy_accept[ace_yy_current_state] )
-                        {
-                        ace_yy_last_accepting_state = ace_yy_current_state;
-                        ace_yy_last_accepting_cpos = ace_yy_cp;
-                        }
-                while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                        {
-                        ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                        if ( ace_yy_current_state >= 108 )
-                                ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                        }
-                ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-                }
-
-        return ace_yy_current_state;
-        }
+	{
+	register ace_yy_state_type ace_yy_current_state;
+	register ACE_TCHAR *ace_yy_cp;
+
+	ace_yy_current_state = ace_yy_start;
+	ace_yy_current_state += ACE_YY_AT_BOL();
+
+	for ( ace_yy_cp = ace_yytext_ptr + ACE_YY_MORE_ADJ; ace_yy_cp < ace_yy_c_buf_p; ++ace_yy_cp )
+		{
+		register ACE_YY_CHAR ace_yy_c = (*ace_yy_cp ? ace_yy_ec[ACE_YY_SC_TO_UI(*ace_yy_cp)] : 1);
+		if ( ace_yy_accept[ace_yy_current_state] )
+			{
+			ace_yy_last_accepting_state = ace_yy_current_state;
+			ace_yy_last_accepting_cpos = ace_yy_cp;
+			}
+		while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
+			{
+			ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
+			if ( ace_yy_current_state >= 108 )
+				ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
+			}
+		ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
+		}
+
+	return ace_yy_current_state;
+	}
 
 
 /* ace_yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
- *      next_state = ace_yy_try_NUL_trans( current_state );
+ *	next_state = ace_yy_try_NUL_trans( current_state );
  */
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1221,27 +1227,27 @@ static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_state_type ace_yy_current_
 static ace_yy_state_type ace_yy_try_NUL_trans( ace_yy_current_state )
 ace_yy_state_type ace_yy_current_state;
 #endif
-        {
-        register int ace_yy_is_jam;
-        register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
-
-        register ACE_YY_CHAR ace_yy_c = 1;
-        if ( ace_yy_accept[ace_yy_current_state] )
-                {
-                ace_yy_last_accepting_state = ace_yy_current_state;
-                ace_yy_last_accepting_cpos = ace_yy_cp;
-                }
-        while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
-                {
-                ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
-                if ( ace_yy_current_state >= 108 )
-                        ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
-                }
-        ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
-        ace_yy_is_jam = (ace_yy_current_state == 107);
-
-        return ace_yy_is_jam ? 0 : ace_yy_current_state;
-        }
+	{
+	register int ace_yy_is_jam;
+	register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
+
+	register ACE_YY_CHAR ace_yy_c = 1;
+	if ( ace_yy_accept[ace_yy_current_state] )
+		{
+		ace_yy_last_accepting_state = ace_yy_current_state;
+		ace_yy_last_accepting_cpos = ace_yy_cp;
+		}
+	while ( ace_yy_chk[ace_yy_base[ace_yy_current_state] + ace_yy_c] != ace_yy_current_state )
+		{
+		ace_yy_current_state = (int) ace_yy_def[ace_yy_current_state];
+		if ( ace_yy_current_state >= 108 )
+			ace_yy_c = ace_yy_meta[(unsigned int) ace_yy_c];
+		}
+	ace_yy_current_state = ace_yy_nxt[ace_yy_base[ace_yy_current_state] + (unsigned int) ace_yy_c];
+	ace_yy_is_jam = (ace_yy_current_state == 107);
+
+	return ace_yy_is_jam ? 0 : ace_yy_current_state;
+	}
 
 
 #ifndef ACE_YY_NO_UNPUT
@@ -1252,41 +1258,41 @@ static void ace_yyunput( c, ace_yy_bp )
 int c;
 register ACE_TCHAR *ace_yy_bp;
 #endif
-        {
-        register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
+	{
+	register ACE_TCHAR *ace_yy_cp = ace_yy_c_buf_p;
 
-        /* undo effects of setting up ace_yytext */
-        *ace_yy_cp = ace_yy_hold_char;
+	/* undo effects of setting up ace_yytext */
+	*ace_yy_cp = ace_yy_hold_char;
 
-        if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
-                { /* need to shift things up to make room */
-                /* +2 for EOB chars. */
-                register int number_to_move = ace_yy_n_chars + 2;
-                register ACE_TCHAR *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
-                                        ace_yy_current_buffer->ace_yy_buf_size + 2];
-                register ACE_TCHAR *source =
-                                &ace_yy_current_buffer->ace_yy_ch_buf[number_to_move];
+	if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = ace_yy_n_chars + 2;
+		register ACE_TCHAR *dest = &ace_yy_current_buffer->ace_yy_ch_buf[
+					ace_yy_current_buffer->ace_yy_buf_size + 2];
+		register ACE_TCHAR *source =
+				&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move];
 
-                while ( source > ace_yy_current_buffer->ace_yy_ch_buf )
-                        *--dest = *--source;
+		while ( source > ace_yy_current_buffer->ace_yy_ch_buf )
+			*--dest = *--source;
 
-                ace_yy_cp += (int) (dest - source);
-                ace_yy_bp += (int) (dest - source);
-                ace_yy_current_buffer->ace_yy_n_chars =
-                        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size;
+		ace_yy_cp += (int) (dest - source);
+		ace_yy_bp += (int) (dest - source);
+		ace_yy_current_buffer->ace_yy_n_chars =
+			ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size;
 
-                if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
-                        ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "flex scanner push-back overflow") );
-                }
+		if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 )
+			ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "flex scanner push-back overflow") );
+		}
 
-        *--ace_yy_cp = (ACE_TCHAR) c;
+	*--ace_yy_cp = (ACE_TCHAR) c;
 
 
-        ace_yytext_ptr = ace_yy_bp;
-        ace_yy_hold_char = *ace_yy_cp;
-        ace_yy_c_buf_p = ace_yy_cp;
-        }
-#endif  /* ifndef ACE_YY_NO_UNPUT */
+	ace_yytext_ptr = ace_yy_bp;
+	ace_yy_hold_char = *ace_yy_cp;
+	ace_yy_c_buf_p = ace_yy_cp;
+	}
+#endif	/* ifndef ACE_YY_NO_UNPUT */
 
 
 #ifdef __cplusplus
@@ -1294,73 +1300,73 @@ static int ace_yyinput()
 #else
 static int input()
 #endif
-        {
-        int c;
-
-        *ace_yy_c_buf_p = ace_yy_hold_char;
-
-        if ( *ace_yy_c_buf_p == ACE_YY_END_OF_BUFFER_CHAR )
-                {
-                /* ace_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 ( ace_yy_c_buf_p < &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
-                        /* This was really a NUL. */
-                        *ace_yy_c_buf_p = '\0';
-
-                else
-                        { /* need more input */
-                        int offset = ace_yy_c_buf_p - ace_yytext_ptr;
-                        ++ace_yy_c_buf_p;
-
-                        switch ( ace_yy_get_next_buffer() )
-                                {
-                                case EOB_ACT_LAST_MATCH:
-                                        /* This happens because ace_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. */
-                                        ace_yyrestart( ace_yyin );
-
-                                        /* fall through */
-
-                                case EOB_ACT_END_OF_FILE:
-                                        {
-                                        if ( ace_yywrap() )
-                                                return EOF;
-
-                                        if ( ! ace_yy_did_buffer_switch_on_eof )
-                                                ACE_YY_NEW_FILE;
+	{
+	int c;
+
+	*ace_yy_c_buf_p = ace_yy_hold_char;
+
+	if ( *ace_yy_c_buf_p == ACE_YY_END_OF_BUFFER_CHAR )
+		{
+		/* ace_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 ( ace_yy_c_buf_p < &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars] )
+			/* This was really a NUL. */
+			*ace_yy_c_buf_p = '\0';
+
+		else
+			{ /* need more input */
+			int offset = ace_yy_c_buf_p - ace_yytext_ptr;
+			++ace_yy_c_buf_p;
+
+			switch ( ace_yy_get_next_buffer() )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because ace_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. */
+					ace_yyrestart( ace_yyin );
+
+					/* fall through */
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( ace_yywrap() )
+						return EOF;
+
+					if ( ! ace_yy_did_buffer_switch_on_eof )
+						ACE_YY_NEW_FILE;
 #ifdef __cplusplus
-                                        return ace_yyinput();
+					return ace_yyinput();
 #else
-                                        return input();
+					return input();
 #endif
-                                        }
+					}
 
-                                case EOB_ACT_CONTINUE_SCAN:
-                                        ace_yy_c_buf_p = ace_yytext_ptr + offset;
-                                        break;
-                                }
-                        }
-                }
+				case EOB_ACT_CONTINUE_SCAN:
+					ace_yy_c_buf_p = ace_yytext_ptr + offset;
+					break;
+				}
+			}
+		}
 
-        c = *(unsigned char *) ace_yy_c_buf_p;  /* cast for 8-bit char's */
-        *ace_yy_c_buf_p = '\0'; /* preserve ace_yytext */
-        ace_yy_hold_char = *++ace_yy_c_buf_p;
+	c = *(unsigned char *) ace_yy_c_buf_p;	/* cast for 8-bit char's */
+	*ace_yy_c_buf_p = '\0';	/* preserve ace_yytext */
+	ace_yy_hold_char = *++ace_yy_c_buf_p;
 
-        ace_yy_current_buffer->ace_yy_at_bol = (c == '\n');
+	ace_yy_current_buffer->ace_yy_at_bol = (c == '\n');
 
-        return c;
-        }
+	return c;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1369,13 +1375,13 @@ void ace_yyrestart( FILE *input_file )
 void ace_yyrestart( input_file )
 FILE *input_file;
 #endif
-        {
-        if ( ! ace_yy_current_buffer )
-                ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
+	{
+	if ( ! ace_yy_current_buffer )
+		ace_yy_current_buffer = ace_yy_create_buffer( ace_yyin, ACE_YY_BUF_SIZE );
 
-        ace_yy_init_buffer( ace_yy_current_buffer, input_file );
-        ace_yy_load_buffer_state();
-        }
+	ace_yy_init_buffer( ace_yy_current_buffer, input_file );
+	ace_yy_load_buffer_state();
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1384,28 +1390,28 @@ void ace_yy_switch_to_buffer( ACE_YY_BUFFER_STATE new_buffer )
 void ace_yy_switch_to_buffer( new_buffer )
 ACE_YY_BUFFER_STATE new_buffer;
 #endif
-        {
-        if ( ace_yy_current_buffer == new_buffer )
-                return;
+	{
+	if ( ace_yy_current_buffer == new_buffer )
+		return;
 
-        if ( ace_yy_current_buffer )
-                {
-                /* Flush out information for old buffer. */
-                *ace_yy_c_buf_p = ace_yy_hold_char;
-                ace_yy_current_buffer->ace_yy_buf_pos = ace_yy_c_buf_p;
-                ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
-                }
+	if ( ace_yy_current_buffer )
+		{
+		/* Flush out information for old buffer. */
+		*ace_yy_c_buf_p = ace_yy_hold_char;
+		ace_yy_current_buffer->ace_yy_buf_pos = ace_yy_c_buf_p;
+		ace_yy_current_buffer->ace_yy_n_chars = ace_yy_n_chars;
+		}
 
-        ace_yy_current_buffer = new_buffer;
-        ace_yy_load_buffer_state();
+	ace_yy_current_buffer = new_buffer;
+	ace_yy_load_buffer_state();
 
-        /* We don't actually know whether we did this switch during
-         * EOF (ace_yywrap()) processing, but the only time this flag
-         * is looked at is after ace_yywrap() is called, so it's safe
-         * to go ahead and always set it.
-         */
-        ace_yy_did_buffer_switch_on_eof = 1;
-        }
+	/* We don't actually know whether we did this switch during
+	 * EOF (ace_yywrap()) processing, but the only time this flag
+	 * is looked at is after ace_yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	ace_yy_did_buffer_switch_on_eof = 1;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1413,12 +1419,12 @@ void ace_yy_load_buffer_state( void )
 #else
 void ace_yy_load_buffer_state()
 #endif
-        {
-        ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
-        ace_yytext_ptr = ace_yy_c_buf_p = ace_yy_current_buffer->ace_yy_buf_pos;
-        ace_yyin = ace_yy_current_buffer->ace_yy_input_file;
-        ace_yy_hold_char = *ace_yy_c_buf_p;
-        }
+	{
+	ace_yy_n_chars = ace_yy_current_buffer->ace_yy_n_chars;
+	ace_yytext_ptr = ace_yy_c_buf_p = ace_yy_current_buffer->ace_yy_buf_pos;
+	ace_yyin = ace_yy_current_buffer->ace_yy_input_file;
+	ace_yy_hold_char = *ace_yy_c_buf_p;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1428,28 +1434,28 @@ ACE_YY_BUFFER_STATE ace_yy_create_buffer( file, size )
 FILE *file;
 int size;
 #endif
-        {
-        ACE_YY_BUFFER_STATE b;
+	{
+	ACE_YY_BUFFER_STATE b;
 
-        b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") );
+	b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
+	if ( ! b )
+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") );
 
-        b->ace_yy_buf_size = size;
+	b->ace_yy_buf_size = size;
 
-        /* ace_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->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2 ) * sizeof (ACE_TCHAR));
-        if ( ! b->ace_yy_ch_buf )
-                ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") );
+	/* ace_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->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2 ) * sizeof (ACE_TCHAR));
+	if ( ! b->ace_yy_ch_buf )
+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") );
 
-        b->ace_yy_is_our_buffer = 1;
+	b->ace_yy_is_our_buffer = 1;
 
-        ace_yy_init_buffer( b, file );
+	ace_yy_init_buffer( b, file );
 
-        return b;
-        }
+	return b;
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1458,18 +1464,18 @@ void ace_yy_delete_buffer( ACE_YY_BUFFER_STATE b )
 void ace_yy_delete_buffer( b )
 ACE_YY_BUFFER_STATE b;
 #endif
-        {
-        if ( ! b )
-                return;
+	{
+	if ( ! b )
+		return;
 
-        if ( b == ace_yy_current_buffer )
-                ace_yy_current_buffer = (ACE_YY_BUFFER_STATE) 0;
+	if ( b == ace_yy_current_buffer )
+		ace_yy_current_buffer = (ACE_YY_BUFFER_STATE) 0;
 
-        if ( b->ace_yy_is_our_buffer )
-                ace_yy_flex_free( (void *) b->ace_yy_ch_buf );
+	if ( b->ace_yy_is_our_buffer )
+		ace_yy_flex_free( (void *) b->ace_yy_ch_buf );
 
-        ace_yy_flex_free( (void *) b );
-        }
+	ace_yy_flex_free( (void *) b );
+	}
 
 #ifndef ACE_YY_ALWAYS_INTERACTIVE
 #ifndef ACE_YY_NEVER_INTERACTIVE
@@ -1492,22 +1498,22 @@ FILE *file;
 #endif
 
 
-        {
-        ace_yy_flush_buffer( b );
+	{
+	ace_yy_flush_buffer( b );
 
-        b->ace_yy_input_file = file;
-        b->ace_yy_fill_buffer = 1;
+	b->ace_yy_input_file = file;
+	b->ace_yy_fill_buffer = 1;
 
 #if ACE_YY_ALWAYS_INTERACTIVE
-        b->ace_yy_is_interactive = 1;
+	b->ace_yy_is_interactive = 1;
 #else
 #if ACE_YY_NEVER_INTERACTIVE
-        b->ace_yy_is_interactive = 0;
+	b->ace_yy_is_interactive = 0;
 #else
-        b->ace_yy_is_interactive = file ? (ACE_OS::isatty( fileno (file) ) > 0) : 0;
+	b->ace_yy_is_interactive = file ? (ACE_OS::isatty( fileno (file) ) > 0) : 0;
 #endif
 #endif
-        }
+	}
 
 
 #ifdef ACE_YY_USE_PROTOS
@@ -1517,27 +1523,27 @@ void ace_yy_flush_buffer( b )
 ACE_YY_BUFFER_STATE b;
 #endif
 
-        {
-        if ( ! b )
-                return;
+	{
+	if ( ! b )
+		return;
 
-        b->ace_yy_n_chars = 0;
+	b->ace_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->ace_yy_ch_buf[0] = ACE_YY_END_OF_BUFFER_CHAR;
-        b->ace_yy_ch_buf[1] = ACE_YY_END_OF_BUFFER_CHAR;
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->ace_yy_ch_buf[0] = ACE_YY_END_OF_BUFFER_CHAR;
+	b->ace_yy_ch_buf[1] = ACE_YY_END_OF_BUFFER_CHAR;
 
-        b->ace_yy_buf_pos = &b->ace_yy_ch_buf[0];
+	b->ace_yy_buf_pos = &b->ace_yy_ch_buf[0];
 
-        b->ace_yy_at_bol = 1;
-        b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
+	b->ace_yy_at_bol = 1;
+	b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
 
-        if ( b == ace_yy_current_buffer )
-                ace_yy_load_buffer_state();
-        }
+	if ( b == ace_yy_current_buffer )
+		ace_yy_load_buffer_state();
+	}
 
 
 #ifndef ACE_YY_NO_SCAN_BUFFER
@@ -1548,33 +1554,33 @@ ACE_YY_BUFFER_STATE ace_yy_scan_buffer( base, size )
 ACE_TCHAR *base;
 ace_yy_size_t size;
 #endif
-        {
-        ACE_YY_BUFFER_STATE b;
+	{
+	ACE_YY_BUFFER_STATE b;
 
-        if ( size < 2 ||
-             base[size-2] != ACE_YY_END_OF_BUFFER_CHAR ||
-             base[size-1] != ACE_YY_END_OF_BUFFER_CHAR )
-                /* They forgot to leave room for the EOB's. */
-                return 0;
+	if ( size < 2 ||
+	     base[size-2] != ACE_YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != ACE_YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
 
-        b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_buffer()" ));
+	b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
+	if ( ! b )
+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_buffer()" ));
 
-        b->ace_yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
-        b->ace_yy_buf_pos = b->ace_yy_ch_buf = base;
-        b->ace_yy_is_our_buffer = 0;
-        b->ace_yy_input_file = 0;
-        b->ace_yy_n_chars = b->ace_yy_buf_size;
-        b->ace_yy_is_interactive = 0;
-        b->ace_yy_at_bol = 1;
-        b->ace_yy_fill_buffer = 0;
-        b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
+	b->ace_yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->ace_yy_buf_pos = b->ace_yy_ch_buf = base;
+	b->ace_yy_is_our_buffer = 0;
+	b->ace_yy_input_file = 0;
+	b->ace_yy_n_chars = b->ace_yy_buf_size;
+	b->ace_yy_is_interactive = 0;
+	b->ace_yy_at_bol = 1;
+	b->ace_yy_fill_buffer = 0;
+	b->ace_yy_buffer_status = ACE_YY_BUFFER_NEW;
 
-        ace_yy_switch_to_buffer( b );
+	ace_yy_switch_to_buffer( b );
 
-        return b;
-        }
+	return b;
+	}
 #endif
 
 
@@ -1585,13 +1591,13 @@ ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yyconst ACE_TCHAR *ace_yy_str )
 ACE_YY_BUFFER_STATE ace_yy_scan_string( ace_yy_str )
 ace_yyconst ACE_TCHAR *ace_yy_str;
 #endif
-        {
-        int len;
-        for ( len = 0; ace_yy_str[len]; ++len )
-                ;
+	{
+	int len;
+	for ( len = 0; ace_yy_str[len]; ++len )
+		;
 
-        return ace_yy_scan_bytes( ace_yy_str, len );
-        }
+	return ace_yy_scan_bytes( ace_yy_str, len );
+	}
 #endif
 
 
@@ -1603,34 +1609,34 @@ ACE_YY_BUFFER_STATE ace_yy_scan_bytes( bytes, len )
 ace_yyconst ACE_TCHAR *bytes;
 int len;
 #endif
-        {
-        ACE_YY_BUFFER_STATE b;
-        ACE_TCHAR *buf;
-        ace_yy_size_t n;
-        int i;
+	{
+	ACE_YY_BUFFER_STATE b;
+	ACE_TCHAR *buf;
+	ace_yy_size_t n;
+	int i;
 
-        /* Get memory for full buffer, including space for trailing EOB's. */
-        n = len + 2;
-        buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR));
-        if ( ! buf )
-                ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_bytes()" ));
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = len + 2;
+	buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR));
+	if ( ! buf )
+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_bytes()" ));
 
-        for ( i = 0; i < len; ++i )
-                buf[i] = bytes[i];
+	for ( i = 0; i < len; ++i )
+		buf[i] = bytes[i];
 
-        buf[len] = buf[len+1] = ACE_YY_END_OF_BUFFER_CHAR;
+	buf[len] = buf[len+1] = ACE_YY_END_OF_BUFFER_CHAR;
 
-        b = ace_yy_scan_buffer( buf, n );
-        if ( ! b )
-                ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "bad buffer in ace_yy_scan_bytes()") );
+	b = ace_yy_scan_buffer( buf, n );
+	if ( ! b )
+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "bad buffer in ace_yy_scan_bytes()") );
 
-        /* It's okay to grow etc. this buffer, and we should throw it
-         * away when we're done.
-         */
-        b->ace_yy_is_our_buffer = 1;
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->ace_yy_is_our_buffer = 1;
 
-        return b;
-        }
+	return b;
+	}
 #endif
 
 
@@ -1641,49 +1647,49 @@ static void ace_yy_push_state( int new_state )
 static void ace_yy_push_state( new_state )
 int new_state;
 #endif
-        {
-        if ( ace_yy_start_stack_ptr >= ace_yy_start_stack_depth )
-                {
-                ace_yy_size_t new_size;
+	{
+	if ( ace_yy_start_stack_ptr >= ace_yy_start_stack_depth )
+		{
+		ace_yy_size_t new_size;
 
-                ace_yy_start_stack_depth += ACE_YY_START_STACK_INCR;
-                new_size = ace_yy_start_stack_depth * sizeof( int );
+		ace_yy_start_stack_depth += ACE_YY_START_STACK_INCR;
+		new_size = ace_yy_start_stack_depth * sizeof( int );
 
-                if ( ! ace_yy_start_stack )
-                        ace_yy_start_stack = (int *) ace_yy_flex_alloc( new_size );
+		if ( ! ace_yy_start_stack )
+			ace_yy_start_stack = (int *) ace_yy_flex_alloc( new_size );
 
-                else
-                        ace_yy_start_stack = (int *) ace_yy_flex_realloc(
-                                        (void *) ace_yy_start_stack, new_size );
+		else
+			ace_yy_start_stack = (int *) ace_yy_flex_realloc(
+					(void *) ace_yy_start_stack, new_size );
 
-                if ( ! ace_yy_start_stack )
+		if ( ! ace_yy_start_stack )
                   ACE_YY_FATAL_ERROR(ACE_LIB_TEXT(
-                        "out of memory expanding start-condition stack" ));
-                }
+			"out of memory expanding start-condition stack" ));
+		}
 
-        ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
+	ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
 
-        BEGIN(new_state);
-        }
+	BEGIN(new_state);
+	}
 #endif
 
 
 #ifndef ACE_YY_NO_POP_STATE
 static void ace_yy_pop_state()
-        {
-        if ( --ace_yy_start_stack_ptr < 0 )
-                ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "start-condition stack underflow" ));
+	{
+	if ( --ace_yy_start_stack_ptr < 0 )
+		ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "start-condition stack underflow" ));
 
-        BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
-        }
+	BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
+	}
 #endif
 
 
 #ifndef ACE_YY_NO_TOP_STATE
 static int ace_yy_top_state()
-        {
-        return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
-        }
+	{
+	return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
+	}
 #endif
 
 #ifndef ACE_YY_EXIT_FAILURE
@@ -1696,10 +1702,10 @@ static void ace_yy_fatal_error( ace_yyconst ACE_TCHAR msg[] )
 static void ace_yy_fatal_error( msg )
 ACE_TCHAR msg[];
 #endif
-        {
-        (void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT("%s\n"), msg );
-        exit( ACE_YY_EXIT_FAILURE );
-        }
+	{
+	(void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT("%s\n"), msg );
+	exit( ACE_YY_EXIT_FAILURE );
+	}
 
 
 
@@ -1707,16 +1713,16 @@ ACE_TCHAR msg[];
 
 #undef ace_yyless
 #define ace_yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up ace_yytext. */ \
-                ace_yytext[ace_yyleng] = ace_yy_hold_char; \
-                ace_yy_c_buf_p = ace_yytext + n; \
-                ace_yy_hold_char = *ace_yy_c_buf_p; \
-                *ace_yy_c_buf_p = '\0'; \
-                ace_yyleng = n; \
-                } \
-        while ( 0 )
+	do \
+		{ \
+		/* Undo effects of setting up ace_yytext. */ \
+		ace_yytext[ace_yyleng] = ace_yy_hold_char; \
+		ace_yy_c_buf_p = ace_yytext + n; \
+		ace_yy_hold_char = *ace_yy_c_buf_p; \
+		*ace_yy_c_buf_p = '\0'; \
+		ace_yyleng = n; \
+		} \
+	while ( 0 )
 
 
 /* Internal utility routines. */
@@ -1730,11 +1736,11 @@ ACE_TCHAR *s1;
 ace_yyconst ACE_TCHAR *s2;
 int n;
 #endif
-        {
-        register int i;
-        for ( i = 0; i < n; ++i )
-                s1[i] = s2[i];
-        }
+	{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+	}
 #endif
 
 #ifdef ACE_YY_NEED_STRLEN
@@ -1744,13 +1750,13 @@ static int ace_yy_flex_strlen( ace_yyconst ACE_TCHAR *s )
 static int ace_yy_flex_strlen( s )
 ace_yyconst ACE_TCHAR *s;
 #endif
-        {
-        register int n;
-        for ( n = 0; s[n]; ++n )
-                ;
+	{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
 
-        return n;
-        }
+	return n;
+	}
 #endif
 
 
@@ -1760,9 +1766,9 @@ static void *ace_yy_flex_alloc( ace_yy_size_t size )
 static void *ace_yy_flex_alloc( size )
 ace_yy_size_t size;
 #endif
-        {
-        return (void *) malloc( size );
-        }
+	{
+	return (void *) malloc( size );
+	}
 
 #ifdef ACE_YY_USE_PROTOS
 static void *ace_yy_flex_realloc( void *ptr, ace_yy_size_t size )
@@ -1771,16 +1777,16 @@ static void *ace_yy_flex_realloc( ptr, size )
 void *ptr;
 ace_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 );
-        }
+	{
+	/* 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 ACE_YY_USE_PROTOS
 static void ace_yy_flex_free( void *ptr )
@@ -1788,16 +1794,16 @@ static void ace_yy_flex_free( void *ptr )
 static void ace_yy_flex_free( ptr )
 void *ptr;
 #endif
-        {
-        free( ACE_MALLOC_T (ptr) );
-        }
+	{
+	free( ACE_MALLOC_T (ptr) );
+	}
 
 #if ACE_YY_MAIN
 int main()
-        {
-        ace_yylex();
-        return 0;
-}
+	{
+	ace_yylex();
+	return 0;
+	}
 #endif
 
 int