diff options
Diffstat (limited to 'TAO/TAO_IDL/fe/lex.yy.cpp.diff')
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp.diff | 51 |
1 files changed, 37 insertions, 14 deletions
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff index cc361764657..82b0b590534 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff +++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff @@ -1,13 +1,24 @@ ---- lex.yy.cpp.orig 2006-11-30 07:19:39.000000000 -0600 -+++ lex.yy.cpp 2006-11-30 07:18:28.000000000 -0600 -@@ -1602,42 +1602,42 @@ +--- lex.yy.cpp.orig 2005-07-07 11:05:08.066403000 -0700 ++++ lex.yy.cpp 2005-07-07 10:51:41.804932200 -0700 +@@ -1134,7 +1134,7 @@ + TAO_YY_DECL + { + register tao_yy_state_type tao_yy_current_state; +- register char *tao_yy_cp, *tao_yy_bp; ++ register char *tao_yy_cp = 0, *tao_yy_bp = 0; + register int tao_yy_act; + + +@@ -1664,42 +1664,42 @@ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); } - TAO_YY_BREAK + break; case 87: + /* rule 87 can match eol */ case 88: + /* rule 88 can match eol */ TAO_YY_RULE_SETUP {/* ignore file */ idl_global->set_lineno(idl_global->lineno() + 1); @@ -15,7 +26,9 @@ - TAO_YY_BREAK + break; case 89: + /* rule 89 can match eol */ case 90: + /* rule 90 can match eol */ TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); @@ -23,7 +36,9 @@ - TAO_YY_BREAK + break; case 91: + /* rule 91 can match eol */ case 92: + /* rule 92 can match eol */ TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); @@ -31,7 +46,9 @@ - TAO_YY_BREAK + break; case 93: + /* rule 93 can match eol */ case 94: + /* rule 94 can match eol */ TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); @@ -39,7 +56,9 @@ - TAO_YY_BREAK + break; case 95: + /* rule 95 can match eol */ case 96: + /* rule 96 can match eol */ TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); @@ -47,15 +66,18 @@ - TAO_YY_BREAK + break; case 97: + /* rule 97 can match eol */ case 98: + /* rule 98 can match eol */ TAO_YY_RULE_SETUP -@@ -1645,14 +1645,14 @@ + { /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; case 99: + /* rule 99 can match eol */ TAO_YY_RULE_SETUP { /* ignore comments */ @@ -66,7 +88,16 @@ case 100: TAO_YY_RULE_SETUP { -@@ -1669,17 +1669,17 @@ + for(;;) { + char c = tao_yyinput(); + if (c == '*') { + char next = tao_yyinput(); + if (next == '/') + break; + else + tao_yyunput(c, 0); + if (c == '\n') + idl_global->set_lineno(idl_global->lineno() + 1); } } } @@ -78,6 +109,7 @@ - TAO_YY_BREAK + break; case 102: + /* rule 102 can match eol */ TAO_YY_RULE_SETUP { idl_global->set_lineno(idl_global->lineno() + 1); @@ -87,12 +119,3 @@ case 103: TAO_YY_RULE_SETUP return ace_tao_yytext [0]; -@@ -1687,7 +1687,7 @@ - case 104: - TAO_YY_RULE_SETUP - TAO_YY_ECHO; -- TAO_YY_BREAK -+ break; - case TAO_YY_STATE_EOF(INITIAL): - tao_yyterminate(); - |