summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog-99c6
-rw-r--r--TAO/TAO_IDL/fe/lex.yy.cpp28
-rw-r--r--TAO/TAO_IDL/fe/lex.yy.cpp.diff26
3 files changed, 33 insertions, 27 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index d13fe4ec091..404378a5c62 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Wed Dec 29 07:21:51 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * TAO_IDL/fe/lex.yy.cpp,lex.yy.cpp.diff: fixed lex.yy.cpp
+ to avoid compile warnings about unreachable statements.
+ Updated lex.yy.cpp.diff.
+
Tue Dec 28 20:54:09 1999 Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
* TAO_IDL/driver/drv_preproc.cpp,TAO_IDL/fe/idl.ll,
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index ae959fdaaec..f60d039fa8f 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -708,7 +708,7 @@ char *tao_yytext_ptr;
#line 1 "fe/idl.ll"
#define INITIAL 0
#line 2 "fe/idl.ll"
-/* $Id: idl.ll,v 1.43 1999/08/13 21:29:15 parsons Exp $
+/* $Id: idl.ll,v 1.44 1999/12/29 02:57:53 levine Exp $
COPYRIGHT
@@ -963,7 +963,7 @@ TAO_YY_MALLOC_DECL
/* Code executed at the end of each rule. */
#ifndef TAO_YY_BREAK
-#define TAO_YY_BREAK break;
+#define TAO_YY_BREAK ACE_NOTREACHED (break;)
#endif
#define TAO_YY_RULE_SETUP \
@@ -975,7 +975,7 @@ TAO_YY_MALLOC_DECL
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;
#line 126 "fe/idl.ll"
@@ -1470,7 +1470,7 @@ TAO_YY_RULE_SETUP
idl_global->set_lineno(idl_global->lineno() + 1);
idl_store_pragma(ace_tao_yytext);
}
- TAO_YY_BREAK
+ break;
case 67:
#line 282 "fe/idl.ll"
case 68:
@@ -1479,7 +1479,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- TAO_YY_BREAK
+ break;
case 69:
#line 286 "fe/idl.ll"
case 70:
@@ -1488,7 +1488,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- TAO_YY_BREAK
+ break;
case 71:
#line 290 "fe/idl.ll"
case 72:
@@ -1497,7 +1497,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- TAO_YY_BREAK
+ break;
case 73:
#line 294 "fe/idl.ll"
case 74:
@@ -1506,7 +1506,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- TAO_YY_BREAK
+ break;
case 75:
#line 298 "fe/idl.ll"
case 76:
@@ -1516,7 +1516,7 @@ TAO_YY_RULE_SETUP
/* ignore cpp ident */
idl_global->set_lineno(idl_global->lineno() + 1);
}
- TAO_YY_BREAK
+ break;
case 77:
TAO_YY_RULE_SETUP
#line 302 "fe/idl.ll"
@@ -1524,7 +1524,7 @@ TAO_YY_RULE_SETUP
/* ignore comments */
idl_global->set_lineno(idl_global->lineno() + 1);
}
- TAO_YY_BREAK
+ break;
case 78:
TAO_YY_RULE_SETUP
#line 306 "fe/idl.ll"
@@ -1542,19 +1542,19 @@ TAO_YY_RULE_SETUP
}
}
}
- TAO_YY_BREAK
+ break;
case 79:
TAO_YY_RULE_SETUP
#line 320 "fe/idl.ll"
;
- TAO_YY_BREAK
+ break;
case 80:
TAO_YY_RULE_SETUP
#line 321 "fe/idl.ll"
{
idl_global->set_lineno(idl_global->lineno() + 1);
}
- TAO_YY_BREAK
+ break;
case 81:
TAO_YY_RULE_SETUP
#line 324 "fe/idl.ll"
@@ -1564,7 +1564,7 @@ case 82:
TAO_YY_RULE_SETUP
#line 326 "fe/idl.ll"
TAO_YY_ECHO;
- TAO_YY_BREAK
+ break;
case TAO_YY_STATE_EOF(INITIAL):
tao_yyterminate();
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
index d1b6cb79ee4..7640779be20 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
@@ -1,6 +1,6 @@
---- lex.yy.cpp Fri Aug 13 15:32:52 1999
-+++ lex.yy.cpp.new Fri Aug 13 15:28:11 1999
-@@ -955,7 +955,7 @@
+--- lex.yy.cpp.orig Wed Dec 29 07:18:42 1999
++++ lex.yy.cpp Wed Dec 29 07:17:42 1999
+@@ -963,7 +963,7 @@
/* Code executed at the end of each rule. */
#ifndef TAO_YY_BREAK
@@ -9,7 +9,7 @@
#endif
#define TAO_YY_RULE_SETUP \
-@@ -967,7 +967,7 @@
+@@ -975,7 +975,7 @@
TAO_YY_DECL
{
register tao_yy_state_type tao_yy_current_state;
@@ -18,7 +18,7 @@
register int tao_yy_act;
#line 126 "fe/idl.ll"
-@@ -1462,7 +1462,7 @@
+@@ -1470,7 +1470,7 @@
idl_global->set_lineno(idl_global->lineno() + 1);
idl_store_pragma(ace_tao_yytext);
}
@@ -27,7 +27,7 @@
case 67:
#line 282 "fe/idl.ll"
case 68:
-@@ -1471,7 +1471,7 @@
+@@ -1479,7 +1479,7 @@
{
idl_parse_line_and_file(ace_tao_yytext);
}
@@ -36,7 +36,7 @@
case 69:
#line 286 "fe/idl.ll"
case 70:
-@@ -1480,7 +1480,7 @@
+@@ -1488,7 +1488,7 @@
{
idl_parse_line_and_file(ace_tao_yytext);
}
@@ -45,7 +45,7 @@
case 71:
#line 290 "fe/idl.ll"
case 72:
-@@ -1489,7 +1489,7 @@
+@@ -1497,7 +1497,7 @@
{
idl_parse_line_and_file(ace_tao_yytext);
}
@@ -54,7 +54,7 @@
case 73:
#line 294 "fe/idl.ll"
case 74:
-@@ -1498,7 +1498,7 @@
+@@ -1506,7 +1506,7 @@
{
idl_parse_line_and_file(ace_tao_yytext);
}
@@ -63,7 +63,7 @@
case 75:
#line 298 "fe/idl.ll"
case 76:
-@@ -1508,7 +1508,7 @@
+@@ -1516,7 +1516,7 @@
/* ignore cpp ident */
idl_global->set_lineno(idl_global->lineno() + 1);
}
@@ -72,7 +72,7 @@
case 77:
TAO_YY_RULE_SETUP
#line 302 "fe/idl.ll"
-@@ -1516,7 +1516,7 @@
+@@ -1524,7 +1524,7 @@
/* ignore comments */
idl_global->set_lineno(idl_global->lineno() + 1);
}
@@ -81,7 +81,7 @@
case 78:
TAO_YY_RULE_SETUP
#line 306 "fe/idl.ll"
-@@ -1534,19 +1534,19 @@
+@@ -1542,19 +1542,19 @@
}
}
}
@@ -104,7 +104,7 @@
case 81:
TAO_YY_RULE_SETUP
#line 324 "fe/idl.ll"
-@@ -1556,7 +1556,7 @@
+@@ -1564,7 +1564,7 @@
TAO_YY_RULE_SETUP
#line 326 "fe/idl.ll"
TAO_YY_ECHO;
View Lorry Controller Status