1 files changed, 9 insertions, 8 deletions

diff --git a/gcc/cobol/scan_post.h b/gcc/cobol/scan_post.h
index dabb168..a273da9 100644
--- a/gcc/cobol/scan_post.h
+++ b/gcc/cobol/scan_post.h
@@ -33,13 +33,15 @@ start_condition_str( int sc ) {
   const char *state = "???";
   switch(sc) {
   case INITIAL: state = "INITIAL"; break;
+  case addr_of: state = "addr_of"; break;
   case author_state: state = "author_state"; break;
   case basis: state = "basis"; break;
   case bool_state: state = "bool_state"; break;
   case cdf_state: state = "cdf_state"; break;
   case classify: state = "classify"; break;
-  case copy_state: state = "copy_state"; break;
+  case cobol_words: state = "cobol_words"; break;
   case comment_entries: state = "comment_entries"; break;
+  case copy_state: state = "copy_state"; break;
   case date_state: state = "date_state"; break;
   case datetime_fmt: state = "datetime_fmt"; break;
   case dot_state: state = "dot_state"; break;
@@ -62,8 +64,8 @@ start_condition_str( int sc ) {
   case quoted2: state = "quoted2"; break;
   case quoteq: state = "quoteq"; break;
   case raising: state = "raising"; break;
-  case subscripts: state = "subscripts"; break;
   case sort_state: state = "sort_state"; break;
+  case subscripts: state = "subscripts"; break;
   }
   return state;
 }
@@ -114,10 +116,10 @@ datetime_format_of( const char input[] ) {
 
     for( auto p = patterns; p < eopatterns; p++ ) {
       static const int cflags = REG_EXTENDED | REG_ICASE;
-      static char msg[80];
       int erc;
 
       if( 0 != (erc = regcomp(&p->re, p->regex, cflags)) ) {
+        static char msg[80];
         regerror(erc, &p->re, msg, sizeof(msg));
         yywarn("%s:%d: %s: %s", __func__, __LINE__, keyword_str(p->token), msg);
       }
@@ -258,13 +260,12 @@ prelex() {
   while( is_cdf_token(token) ) {
 
     if( ! run_cdf(token) ) {
-      dbgmsg( ">>CDF parser failed" );
-      return NO_CONDITION;
+      dbgmsg( ">>CDF parser failed, ydfchar %d", ydfchar );
     }
     // Return the CDF's discarded lookahead token, if extant.
     token = ydfchar > 0? ydfchar : next_token();
     if( token == NO_CONDITION && parsing.at_eof() ) {
-      return token = YYEOF;
+      return YYEOF;
     }
 
     // Reenter cdf parser only if next token could affect parsing state.
@@ -296,7 +297,7 @@ prelex() {
       token = LEVEL;
       break;
     case YDF_NUMBER:
-      if( yy_flex_debug ) yywarn("final token is YDF_NUMBER");
+      if( yy_flex_debug ) yywarn("final token is %<YDF_NUMBER%>");
       yylval.number = ydflval.number;
       token = LEVEL;
       break;
@@ -373,7 +374,7 @@ yylex(void) {
     token = prelex();
     if( yy_flex_debug ) {
       if( parsing.in_cdf() ) {
-        dbgmsg( "%s:%d: %s routing %s to CDF parser", __func__, __LINE__,
+        dbgmsg( "%s:%d: <%s> routing %s to CDF parser", __func__, __LINE__,
                start_condition_is(), keyword_str(token) );
       } else if( !parsing.on() ) {
         dbgmsg( "eating %s because conditional compilation is FALSE",