diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 44 | ||||
| -rw-r--r-- | TAO/TAO_IDL/Makefile | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 102 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp.diff | 65 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp | 281 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp.diff | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp | 76 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp | 82 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp | 1367 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff | 21 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_command.tab.h | 48 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/Makefile | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp | 29 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff | 83 |
14 files changed, 963 insertions, 1255 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 33d051a5a9c..a24a5699365 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,37 @@ +Mon Nov 12 20:26:35 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * TAO_IDL/Makefile: + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/lex.yy.cpp.diff: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/y.tab.cpp.diff: + * TAO_IDL/fe/y.tab.h: + + Final kill of all the #line directives. This change is very + similar to the changes made to Svc_Conf_l.cpp and Svc_Conf_y.cpp + under $ACE_ROOT/ace described in ChangeLog entry of "Sat Nov 10 + 22:13:54 2001 Krishnakumar B <kitty@cs.wustl.edu>" + + * orbsvcs/orbsvcs/Trader/Constraint_l.cpp: + * orbsvcs/orbsvcs/Trader/Constraint_y.cpp: + + Removed the #line directives directly without changing the + Makefiles as there was neither a Makefile target nor any diff + files to apply. + + * orbsvcs/tests/Concurrency/CC_command.tab.cpp: + * orbsvcs/tests/Concurrency/CC_command.tab.h: + * orbsvcs/tests/Concurrency/Makefile: + * orbsvcs/tests/Concurrency/lex.CC_command.cpp: + * orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff: + + Same changes as the first one. + + There are still some warnings whenever a idl file is processed. + But there is nothing to be done there as it seems to be a bug in + the Sun CC preprocessor which according to the web-page is + fixed. Will have to wait and watch. + Mon Nov 12 17:37:24 2001 Jeff Parsons <parsons@cs.wustl.edu> * tao/TypeCodeFactory/TypeCodeFactory_i.cpp (create_tc_common): @@ -28,7 +62,7 @@ Mon Nov 12 12:15:09 2001 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: * tao/IIOP_Transport.cpp (get_listen_point): Removed some code - that was there, more for historic reasons. + that was there, more for historic reasons. * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: Added a debug statement. @@ -48,14 +82,14 @@ Sun Nov 11 23:50:00 2001 Craig Rodrigues <crodrigu@bbn.com> Sun Nov 11 14:15:23 2001 Balachandran Natarajan <bala@cs.wustl.edu> * docs/configurations.html: Fixed some documentation - inconsistencies. + inconsistencies. Sun Nov 11 11:40:23 2001 Balachandran Natarajan <bala@cs.wustl.edu> - * docs/Options.html: Fixed the documentation to be more helpful. + * docs/Options.html: Fixed the documentation to be more helpful. Sun Nov 11 11:02:23 2001 Craig Rodrigues <crodrigu@bbn.com> - + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: * tests/Exposed_Policies/Policy_Verifier.cpp: @@ -78,7 +112,7 @@ Sun Nov 11 11:02:23 2001 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/tests/Notify/Basic/Simple.cpp: * orbsvcs/tests/Notify/Basic/Updates.cpp: * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp: - * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: More const char * fixes. Sat Nov 10 23:13:37 2001 Ossama Othman <ossama@uci.edu> diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile index 6a0a23ee0b5..84268250b69 100644 --- a/TAO/TAO_IDL/Makefile +++ b/TAO/TAO_IDL/Makefile @@ -73,7 +73,7 @@ fe/lex.yy.cpp: fe/idl.ll YACC = /home/cs/faculty/schmidt/bin/SunOS5/yacc lex.yy.cpp.target: - $(LEX) -t fe/idl.ll | \ + $(LEX) -L -t fe/idl.ll | \ sed -e "s/yy/tao_yy/g" \ -e "s/YY/TAO_YY/g" \ -e "s@#include <unistd\.h>@#include \"ace/OS.h\"@" \ @@ -91,7 +91,7 @@ fe/y.tab.cpp: fe/idl.yy .PHONY: y.tab y.tab: fe/idl.yy - $(YACC) -d fe/idl.yy + $(YACC) -l -d fe/idl.yy sed -e 's/char \*getenv/char *ace_foo/g' \ -e 's/= getenv/= ACE_OS::getenv/g' \ -e 's/int yynew_state,/int,/g' \ diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index fb03bcf31f6..8a217dae6bc 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -728,10 +728,8 @@ static char *tao_yy_last_accepting_cpos; char tao_yytext[TAO_YYLMAX]; char *tao_yytext_ptr; -#line 1 "fe/idl.ll" #define INITIAL 0 -#line 2 "fe/idl.ll" -/* $Id: idl.ll,v 1.54 2001/07/02 18:46:02 parsons Exp $ +/* $Id: idl.ll,v 1.56 2001/09/23 19:16:59 parsons Exp $ COPYRIGHT @@ -1001,7 +999,6 @@ TAO_YY_DECL register char *tao_yy_cp = 0, *tao_yy_bp = 0; register int tao_yy_act; -#line 126 "fe/idl.ll" @@ -1089,247 +1086,198 @@ do_action: /* This label is used only to access EOF actions. */ case 1: TAO_YY_RULE_SETUP -#line 128 "fe/idl.ll" return IDL_ANY; TAO_YY_BREAK case 2: TAO_YY_RULE_SETUP -#line 129 "fe/idl.ll" return IDL_MODULE; TAO_YY_BREAK case 3: TAO_YY_RULE_SETUP -#line 130 "fe/idl.ll" return IDL_RAISES; TAO_YY_BREAK case 4: TAO_YY_RULE_SETUP -#line 131 "fe/idl.ll" return IDL_READONLY; TAO_YY_BREAK case 5: TAO_YY_RULE_SETUP -#line 132 "fe/idl.ll" return IDL_ATTRIBUTE; TAO_YY_BREAK case 6: TAO_YY_RULE_SETUP -#line 133 "fe/idl.ll" return IDL_EXCEPTION; TAO_YY_BREAK case 7: TAO_YY_RULE_SETUP -#line 134 "fe/idl.ll" return IDL_CONTEXT; TAO_YY_BREAK case 8: TAO_YY_RULE_SETUP -#line 135 "fe/idl.ll" return IDL_INTERFACE; TAO_YY_BREAK case 9: TAO_YY_RULE_SETUP -#line 136 "fe/idl.ll" return IDL_CONST; TAO_YY_BREAK case 10: TAO_YY_RULE_SETUP -#line 137 "fe/idl.ll" return IDL_TYPEDEF; TAO_YY_BREAK case 11: TAO_YY_RULE_SETUP -#line 138 "fe/idl.ll" return IDL_STRUCT; TAO_YY_BREAK case 12: TAO_YY_RULE_SETUP -#line 139 "fe/idl.ll" return IDL_ENUM; TAO_YY_BREAK case 13: TAO_YY_RULE_SETUP -#line 140 "fe/idl.ll" return IDL_STRING; TAO_YY_BREAK case 14: TAO_YY_RULE_SETUP -#line 141 "fe/idl.ll" return IDL_WSTRING; TAO_YY_BREAK case 15: TAO_YY_RULE_SETUP -#line 142 "fe/idl.ll" return IDL_SEQUENCE; TAO_YY_BREAK case 16: TAO_YY_RULE_SETUP -#line 143 "fe/idl.ll" return IDL_UNION; TAO_YY_BREAK case 17: TAO_YY_RULE_SETUP -#line 144 "fe/idl.ll" return IDL_FIXED; TAO_YY_BREAK case 18: TAO_YY_RULE_SETUP -#line 145 "fe/idl.ll" return IDL_SWITCH; TAO_YY_BREAK case 19: TAO_YY_RULE_SETUP -#line 146 "fe/idl.ll" return IDL_CASE; TAO_YY_BREAK case 20: TAO_YY_RULE_SETUP -#line 147 "fe/idl.ll" return IDL_DEFAULT; TAO_YY_BREAK case 21: TAO_YY_RULE_SETUP -#line 148 "fe/idl.ll" return IDL_FLOAT; TAO_YY_BREAK case 22: TAO_YY_RULE_SETUP -#line 149 "fe/idl.ll" return IDL_DOUBLE; TAO_YY_BREAK case 23: TAO_YY_RULE_SETUP -#line 150 "fe/idl.ll" return IDL_LONG; TAO_YY_BREAK case 24: TAO_YY_RULE_SETUP -#line 151 "fe/idl.ll" return IDL_SHORT; TAO_YY_BREAK case 25: TAO_YY_RULE_SETUP -#line 152 "fe/idl.ll" return IDL_UNSIGNED; TAO_YY_BREAK case 26: TAO_YY_RULE_SETUP -#line 153 "fe/idl.ll" return IDL_CHAR; TAO_YY_BREAK case 27: TAO_YY_RULE_SETUP -#line 154 "fe/idl.ll" return IDL_WCHAR; TAO_YY_BREAK case 28: TAO_YY_RULE_SETUP -#line 155 "fe/idl.ll" return IDL_BOOLEAN; TAO_YY_BREAK case 29: TAO_YY_RULE_SETUP -#line 156 "fe/idl.ll" return IDL_OCTET; TAO_YY_BREAK case 30: TAO_YY_RULE_SETUP -#line 157 "fe/idl.ll" return IDL_VOID; TAO_YY_BREAK case 31: TAO_YY_RULE_SETUP -#line 158 "fe/idl.ll" return IDL_NATIVE; TAO_YY_BREAK case 32: TAO_YY_RULE_SETUP -#line 159 "fe/idl.ll" return IDL_LOCAL; TAO_YY_BREAK case 33: TAO_YY_RULE_SETUP -#line 160 "fe/idl.ll" return scan_obv_token (IDL_ABSTRACT); TAO_YY_BREAK case 34: TAO_YY_RULE_SETUP -#line 161 "fe/idl.ll" return scan_obv_token (IDL_CUSTOM); TAO_YY_BREAK case 35: TAO_YY_RULE_SETUP -#line 162 "fe/idl.ll" return scan_obv_token (IDL_FACTORY); TAO_YY_BREAK case 36: TAO_YY_RULE_SETUP -#line 163 "fe/idl.ll" return scan_obv_token (IDL_PRIVATE); TAO_YY_BREAK case 37: TAO_YY_RULE_SETUP -#line 164 "fe/idl.ll" return scan_obv_token (IDL_PUBLIC); TAO_YY_BREAK case 38: TAO_YY_RULE_SETUP -#line 165 "fe/idl.ll" return scan_obv_token (IDL_SUPPORTS); TAO_YY_BREAK case 39: TAO_YY_RULE_SETUP -#line 166 "fe/idl.ll" return scan_obv_token (IDL_TRUNCATABLE); TAO_YY_BREAK case 40: TAO_YY_RULE_SETUP -#line 167 "fe/idl.ll" return scan_obv_token (IDL_VALUETYPE); TAO_YY_BREAK case 41: TAO_YY_RULE_SETUP -#line 169 "fe/idl.ll" return IDL_TRUETOK; TAO_YY_BREAK case 42: TAO_YY_RULE_SETUP -#line 170 "fe/idl.ll" return IDL_FALSETOK; TAO_YY_BREAK case 43: TAO_YY_RULE_SETUP -#line 172 "fe/idl.ll" return IDL_INOUT; TAO_YY_BREAK case 44: TAO_YY_RULE_SETUP -#line 173 "fe/idl.ll" return IDL_IN; TAO_YY_BREAK case 45: TAO_YY_RULE_SETUP -#line 174 "fe/idl.ll" return IDL_OUT; TAO_YY_BREAK case 46: TAO_YY_RULE_SETUP -#line 175 "fe/idl.ll" return IDL_ONEWAY; TAO_YY_BREAK case 47: TAO_YY_RULE_SETUP -#line 177 "fe/idl.ll" return IDL_LEFT_SHIFT; TAO_YY_BREAK case 48: TAO_YY_RULE_SETUP -#line 178 "fe/idl.ll" return IDL_RIGHT_SHIFT; TAO_YY_BREAK case 49: TAO_YY_RULE_SETUP -#line 179 "fe/idl.ll" { tao_yylval.strval = (char *) "::"; return IDL_SCOPE_DELIMITOR; @@ -1337,7 +1285,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 50: TAO_YY_RULE_SETUP -#line 184 "fe/idl.ll" { // Make sure that this identifier is not a C++ keyword. If it is, // prepend it with a _cxx_. Lookup in the perfect hash table for C++ @@ -1358,7 +1305,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 51: TAO_YY_RULE_SETUP -#line 202 "fe/idl.ll" { tao_yylval.dval = idl_atof(ace_tao_yytext); return IDL_FLOATING_PT_LITERAL; @@ -1366,7 +1312,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 52: TAO_YY_RULE_SETUP -#line 206 "fe/idl.ll" { tao_yylval.dval = idl_atof(ace_tao_yytext); return IDL_FLOATING_PT_LITERAL; @@ -1374,7 +1319,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 53: TAO_YY_RULE_SETUP -#line 211 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 10); return IDL_INTEGER_LITERAL; @@ -1382,7 +1326,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 54: TAO_YY_RULE_SETUP -#line 215 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 10); return IDL_UINTEGER_LITERAL; @@ -1390,7 +1333,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 55: TAO_YY_RULE_SETUP -#line 219 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 16); return IDL_INTEGER_LITERAL; @@ -1398,7 +1340,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 56: TAO_YY_RULE_SETUP -#line 223 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 16); return IDL_UINTEGER_LITERAL; @@ -1406,7 +1347,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 57: TAO_YY_RULE_SETUP -#line 227 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 8); return IDL_INTEGER_LITERAL; @@ -1414,7 +1354,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 58: TAO_YY_RULE_SETUP -#line 231 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 8); return IDL_UINTEGER_LITERAL; @@ -1422,7 +1361,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 59: TAO_YY_RULE_SETUP -#line 236 "fe/idl.ll" { /* Skip the quotes */ char *tmp = ace_tao_yytext; @@ -1433,7 +1371,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 60: TAO_YY_RULE_SETUP -#line 243 "fe/idl.ll" { /* Skip the bookends */ char *tmp = ACE_OS::strdup (ace_tao_yytext); @@ -1444,7 +1381,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 61: TAO_YY_RULE_SETUP -#line 250 "fe/idl.ll" { tao_yylval.cval = ace_tao_yytext [1]; return IDL_CHARACTER_LITERAL; @@ -1452,7 +1388,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 62: TAO_YY_RULE_SETUP -#line 254 "fe/idl.ll" { // octal character constant tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); @@ -1461,7 +1396,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 63: TAO_YY_RULE_SETUP -#line 259 "fe/idl.ll" { // hexadecimal character constant tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); @@ -1470,7 +1404,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 64: TAO_YY_RULE_SETUP -#line 264 "fe/idl.ll" { tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); return IDL_CHARACTER_LITERAL; @@ -1478,7 +1411,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 65: TAO_YY_RULE_SETUP -#line 268 "fe/idl.ll" { // wide character constant tao_yylval.wcval = ace_tao_yytext [2]; @@ -1487,7 +1419,6 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 66: TAO_YY_RULE_SETUP -#line 273 "fe/idl.ll" { // hexadecimal wide character constant tao_yylval.wcval = idl_wchar_escape_reader(ace_tao_yytext + 2); @@ -1495,73 +1426,58 @@ TAO_YY_RULE_SETUP } TAO_YY_BREAK case 67: -#line 279 "fe/idl.ll" case 68: TAO_YY_RULE_SETUP -#line 279 "fe/idl.ll" {/* remember pragma */ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); - } - break; +} + break; case 69: -#line 284 "fe/idl.ll" case 70: TAO_YY_RULE_SETUP -#line 284 "fe/idl.ll" {/* ignore file */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; case 71: -#line 288 "fe/idl.ll" case 72: TAO_YY_RULE_SETUP -#line 288 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 73: -#line 292 "fe/idl.ll" case 74: TAO_YY_RULE_SETUP -#line 292 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 75: -#line 296 "fe/idl.ll" case 76: TAO_YY_RULE_SETUP -#line 296 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 77: -#line 300 "fe/idl.ll" case 78: TAO_YY_RULE_SETUP -#line 300 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 79: -#line 304 "fe/idl.ll" case 80: TAO_YY_RULE_SETUP -#line 304 "fe/idl.ll" { /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; case 81: TAO_YY_RULE_SETUP -#line 308 "fe/idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); @@ -1569,7 +1485,6 @@ TAO_YY_RULE_SETUP break; case 82: TAO_YY_RULE_SETUP -#line 312 "fe/idl.ll" { for(;;) { char c = tao_yyinput(); @@ -1587,24 +1502,20 @@ TAO_YY_RULE_SETUP break; case 83: TAO_YY_RULE_SETUP -#line 326 "fe/idl.ll" ; break; case 84: TAO_YY_RULE_SETUP -#line 327 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } break; case 85: TAO_YY_RULE_SETUP -#line 330 "fe/idl.ll" return ace_tao_yytext [0]; - TAO_YY_BREAK + break; case 86: TAO_YY_RULE_SETUP -#line 332 "fe/idl.ll" TAO_YY_ECHO; break; case TAO_YY_STATE_EOF(INITIAL): @@ -2494,7 +2405,6 @@ int main() return 0; } #endif -#line 332 "fe/idl.ll" /* subroutines */ diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff index b32aec91961..b761ccc174b 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.orig Mon Apr 17 13:15:44 2000 -+++ lex.yy.cpp Wed Jan 24 16:38:19 2001 -@@ -983,7 +983,7 @@ +--- lex.yy.cpp Mon Nov 12 18:56:44 2001 ++++ lex.yy.cpp.new Mon Nov 12 18:52:48 2001 +@@ -984,7 +984,7 @@ /* Code executed at the end of each rule. */ #ifndef TAO_YY_BREAK @@ -9,7 +9,7 @@ #endif #define TAO_YY_RULE_SETUP \ -@@ -998,7 +998,7 @@ +@@ -996,7 +996,7 @@ TAO_YY_DECL { register tao_yy_state_type tao_yy_current_state; @@ -17,73 +17,65 @@ + register char *tao_yy_cp = 0, *tao_yy_bp = 0; register int tao_yy_act; - #line 126 "fe/idl.ll" -@@ -1503,7 +1503,7 @@ + +@@ -1432,42 +1432,42 @@ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); } - TAO_YY_BREAK -+ break; ++ break; case 69: - #line 284 "fe/idl.ll" case 70: -@@ -1512,7 +1512,7 @@ -{/* ignore file */ - idl_global->set_lineno(idl_global->lineno() + 1); - } + TAO_YY_RULE_SETUP + {/* ignore file */ + idl_global->set_lineno(idl_global->lineno() + 1); + } - TAO_YY_BREAK -+ break; -case 71: -#line 288 "fe/idl.ll" -case 72: -@@ -1521,7 +1521,7 @@ ++ break; + case 71: + case 72: + TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 73: - #line 292 "fe/idl.ll" case 74: -@@ -1530,7 +1530,7 @@ + TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 75: - #line 296 "fe/idl.ll" case 76: -@@ -1539,7 +1539,7 @@ + TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 77: - #line 300 "fe/idl.ll" case 78: -@@ -1548,7 +1548,7 @@ + TAO_YY_RULE_SETUP { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 79: - #line 304 "fe/idl.ll" case 80: -@@ -1557,7 +1557,7 @@ -{ - /* store cpp ident */ - idl_global->ident_string (ace_tao_yytext); + TAO_YY_RULE_SETUP +@@ -1475,14 +1475,14 @@ + /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; case 81: TAO_YY_RULE_SETUP - #line 308 "fe/idl.ll" -@@ -1566,7 +1566,7 @@ + { /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } @@ -91,8 +83,8 @@ case 72: + break; case 82: TAO_YY_RULE_SETUP - #line 312 "fe/idl.ll" -@@ -1584,19 +1584,19 @@ + { +@@ -1499,25 +1499,25 @@ } } } @@ -100,13 +92,11 @@ case 72: + break; case 83: TAO_YY_RULE_SETUP - #line 326 "fe/idl.ll" ; - TAO_YY_BREAK + break; case 84: TAO_YY_RULE_SETUP - #line 327 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } @@ -114,10 +104,11 @@ case 72: + break; case 85: TAO_YY_RULE_SETUP - #line 330 "fe/idl.ll" -@@ -1606,7 +1606,7 @@ + return ace_tao_yytext [0]; +- TAO_YY_BREAK ++ break; + case 86: TAO_YY_RULE_SETUP - #line 332 "fe/idl.ll" TAO_YY_ECHO; - TAO_YY_BREAK + break; diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index fd1b4523bc9..92237c1df6d 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -1,9 +1,8 @@ // $Id$ #ifndef lint -char tao_yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\ +char tao_yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\ Modified 5/2/90 by J. Roskind to support graphic debugging modes"; #endif -#line 74 "fe/idl.tao_yy" #include "idl.h" #include "idl_extern.h" #include "fe_private.h" @@ -13,6 +12,7 @@ char tao_yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\ extern "C" int tao_yywrap(); #endif /* (defined(apollo) || defined(hpux)) && defined(__cplusplus)*/ + void tao_yyerror (const char *); int tao_yylex (void); extern "C" int tao_yywrap (void); @@ -21,7 +21,6 @@ extern int tao_yyleng; #define TAO_YYDEBUG_LEXER_TEXT (tao_yytext[tao_yyleng] = '\0', tao_yytext) /* Force the pretty debugging code to compile.*/ #define TAO_YYDEBUG 1 -#line 97 "fe/idl.tao_yy" typedef union { AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ @@ -52,7 +51,6 @@ typedef union { Identifier *idval; /* Identifier */ UTL_IdList *idlist; /* Identifier list */ } TAO_YYSTYPE; -#line 55 "y.tab.cpp" #define IDENTIFIER 257 #define IDL_CONST 258 #define IDL_MODULE 259 @@ -957,7 +955,6 @@ TAO_YYSTYPE tao_yylval; #define tao_yystacksize TAO_YYSTACKSIZE short tao_yyss[TAO_YYSTACKSIZE]; TAO_YYSTYPE tao_yyvs[TAO_YYSTACKSIZE]; -#line 2776 "fe/idl.tao_yy" /* programs */ /* @@ -979,7 +976,6 @@ tao_yyerror(const char *msg) "%s\n", msg)); } -#line 982 "y.tab.cpp" #define TAO_YYABORT goto tao_yyabort #define TAO_YYACCEPT goto tao_yyaccept #define TAO_YYERROR goto tao_yyerrlab @@ -1264,7 +1260,7 @@ tao_yyinrecovery: if (5 < tao_yydebug) printf("tao_yydebug: state %d, error recovery discards token %d (%s)\n", tao_yystate, tao_yychar, tao_yys); - else + else TAO_YYDEBUG_DISCARD_TOKEN(tao_yystate, tao_yychar, tao_yys, tao_yyssp-tao_yyss); } #endif @@ -1285,98 +1281,82 @@ tao_yyreduce: switch (tao_yyn) { case 4: -#line 260 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen); } break; case 5: -#line 264 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 6: -#line 268 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen); } break; case 7: -#line 272 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 8: -#line 276 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen); } break; case 9: -#line 280 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 10: -#line 284 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen); } break; case 11: -#line 288 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 12: -#line 292 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen); } break; case 13: -#line 296 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 14: -#line 300 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeDeclSeen); } break; case 15: -#line 304 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 16: -#line 308 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; case 17: -#line 312 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; case 18: -#line 319 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen); } break; case 19: -#line 323 "fe/idl.tao_yy" { UTL_ScopedName *n = new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval), NULL); @@ -1399,19 +1379,16 @@ case 19: } break; case 20: -#line 344 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen); } break; case 21: -#line 348 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen); } break; case 22: -#line 352 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen); /* @@ -1430,7 +1407,6 @@ case 22: } break; case 25: -#line 377 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes ()->top_non_null (); AST_Interface *i = NULL; @@ -1465,19 +1441,16 @@ case 25: } break; case 26: -#line 410 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen); } break; case 27: -#line 414 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen); } break; case 28: -#line 418 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen); /* @@ -1499,20 +1472,17 @@ case 28: } break; case 29: -#line 441 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen); } break; case 30: -#line 445 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen); tao_yyval.idval = tao_yyvsp[0].idval; } break; case 31: -#line 453 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen); /* @@ -1525,7 +1495,6 @@ case 31: } break; case 32: -#line 465 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen); /* @@ -1538,7 +1507,6 @@ case 32: } break; case 33: -#line 477 "fe/idl.tao_yy" { cerr << "error in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -1557,25 +1525,21 @@ case 33: } break; case 34: -#line 497 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen); } break; case 35: -#line 501 "fe/idl.tao_yy" { tao_yyval.nlval = tao_yyvsp[0].nlval; } break; case 36: -#line 505 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; case 41: -#line 519 "fe/idl.tao_yy" { cerr << "error in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -1584,7 +1548,6 @@ case 41: } break; case 43: -#line 530 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Interface *i = NULL; @@ -1608,19 +1571,16 @@ case 43: } break; case 44: -#line 552 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen); } break; case 45: -#line 556 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen); } break; case 46: -#line 560 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen); /* @@ -1636,7 +1596,6 @@ case 46: } break; case 47: -#line 578 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Interface *i = NULL; @@ -1666,19 +1625,16 @@ case 47: } break; case 48: -#line 606 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen); } break; case 49: -#line 610 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen); } break; case 50: -#line 614 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen); /* @@ -1694,26 +1650,22 @@ case 50: } break; case 51: -#line 635 "fe/idl.tao_yy" { tao_yyval.vhval = new FE_obv_header (new UTL_ScopedName (tao_yyvsp[-3].idval, NULL), tao_yyvsp[-1].nlval, tao_yyvsp[0].nlval); } break; case 52: -#line 642 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeSeen); } break; case 53: -#line 646 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeIDSeen); tao_yyval.idval = tao_yyvsp[0].idval; } break; case 54: -#line 654 "fe/idl.tao_yy" { cerr << "warning in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -1723,25 +1675,21 @@ case 54: } break; case 55: -#line 662 "fe/idl.tao_yy" { tao_yyval.bval = I_FALSE; } break; case 56: -#line 670 "fe/idl.tao_yy" { tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL); } break; case 57: -#line 674 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; case 58: -#line 682 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -1763,7 +1711,6 @@ case 58: } break; case 59: -#line 703 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -1783,7 +1730,6 @@ case 59: } break; case 60: -#line 725 "fe/idl.tao_yy" { cerr << "error in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -1791,106 +1737,89 @@ case 60: } break; case 66: -#line 745 "fe/idl.tao_yy" { /* is $0 to member_i */ tao_yyval.vival = AST_Field::vis_PUBLIC; } break; case 68: -#line 751 "fe/idl.tao_yy" { /* is $0 to member_i */ tao_yyval.vival = AST_Field::vis_PRIVATE; } break; case 72: -#line 765 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen); } break; case 73: -#line 769 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 74: -#line 773 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen); } break; case 75: -#line 777 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 76: -#line 781 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen); } break; case 77: -#line 785 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 78: -#line 789 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen); } break; case 79: -#line 793 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 80: -#line 797 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen); } break; case 81: -#line 801 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 82: -#line 805 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; case 83: -#line 809 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; case 84: -#line 817 "fe/idl.tao_yy" { tao_yyval.nlval = new UTL_NameList(tao_yyvsp[-1].idlist, tao_yyvsp[0].nlval); } break; case 85: -#line 825 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen); } break; case 86: -#line 829 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen); @@ -1903,13 +1832,11 @@ case 86: } break; case 87: -#line 840 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; case 88: -#line 847 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen); @@ -1917,13 +1844,11 @@ case 88: } break; case 89: -#line 853 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen); } break; case 90: -#line 857 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen); @@ -1932,13 +1857,11 @@ case 90: } break; case 91: -#line 865 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen); } break; case 92: -#line 869 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen); @@ -1947,13 +1870,11 @@ case 92: } break; case 93: -#line 878 "fe/idl.tao_yy" { tao_yyval.idval = new Identifier(tao_yyvsp[0].strval); } break; case 94: -#line 885 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -1973,7 +1894,6 @@ case 94: } break; case 95: -#line 904 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -1993,7 +1913,6 @@ case 95: } break; case 96: -#line 923 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -2013,31 +1932,26 @@ case 96: } break; case 97: -#line 944 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen); } break; case 98: -#line 948 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen); } break; case 99: -#line 952 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen); } break; case 100: -#line 956 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen); } break; case 101: -#line 960 "fe/idl.tao_yy" { UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[-4].idval, NULL); UTL_Scope *s = idl_global->scopes()->top_non_null(); @@ -2065,19 +1979,16 @@ case 101: } break; case 108: -#line 995 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_string; } break; case 109: -#line 999 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_wstring; } break; case 110: -#line 1003 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -2118,67 +2029,56 @@ case 110: } break; case 114: -#line 1049 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; case 116: -#line 1057 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; case 118: -#line 1065 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; case 120: -#line 1073 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,tao_yyvsp[-2].exval,tao_yyvsp[0].exval); } break; case 121: -#line 1077 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,tao_yyvsp[-2].exval,tao_yyvsp[0].exval); } break; case 123: -#line 1085 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; case 124: -#line 1089 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,tao_yyvsp[-2].exval,tao_yyvsp[0].exval); } break; case 126: -#line 1097 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; case 127: -#line 1101 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; case 128: -#line 1105 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; case 130: -#line 1113 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus, tao_yyvsp[0].exval, @@ -2186,7 +2086,6 @@ case 130: } break; case 131: -#line 1119 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus, tao_yyvsp[0].exval, @@ -2194,7 +2093,6 @@ case 131: } break; case 132: -#line 1125 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg, tao_yyvsp[0].exval, @@ -2202,7 +2100,6 @@ case 132: } break; case 133: -#line 1134 "fe/idl.tao_yy" { /* * An expression which is a scoped name is not resolved now, @@ -2216,9 +2113,9 @@ case 133: /* * If the scoped name is an IDL constant, it may be used in an - * array dim, a string bound, or a sequence bound. If so, it + * array dim, a string bound, or a sequence bound. If so, it * must be unsigned and > 0. We assign the constant's value - * and type to the expression created here so we can check + * and type to the expression created here so we can check * them later. */ if (d != 0 && d->node_type () == AST_Decl::NT_const) @@ -2234,70 +2131,59 @@ case 133: } break; case 135: -#line 1165 "fe/idl.tao_yy" { tao_yyval.exval = tao_yyvsp[-1].exval; } break; case 136: -#line 1172 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].ival); } break; case 137: -#line 1176 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].uival); } break; case 138: -#line 1180 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].sval); } break; case 139: -#line 1184 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].wsval); } break; case 140: -#line 1188 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].cval); } break; case 141: -#line 1192 "fe/idl.tao_yy" { ACE_OutputCDR::from_wchar wc (tao_yyvsp[0].wcval); tao_yyval.exval = idl_global->gen()->create_expr(wc); } break; case 142: -#line 1197 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].dval); } break; case 143: -#line 1201 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE, AST_Expression::EV_bool); } break; case 144: -#line 1206 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE, AST_Expression::EV_bool); } break; case 145: -#line 1214 "fe/idl.tao_yy" { int good_expression = 1; @@ -2352,8 +2238,8 @@ case 145: if (good_expression) { - tao_yyval.exval = - idl_global->gen()->create_expr (tao_yyvsp[0].exval, + tao_yyval.exval = + idl_global->gen()->create_expr (tao_yyvsp[0].exval, AST_Expression::EV_ulong); } else @@ -2363,29 +2249,23 @@ case 145: } break; case 146: -#line 1281 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen); } break; case 147: -#line 1284 "fe/idl.tao_yy" {tao_yyval.ival = 0;} break; case 148: -#line 1285 "fe/idl.tao_yy" { tao_yyval.ival = 0;} break; case 149: -#line 1286 "fe/idl.tao_yy" { tao_yyval.ival = 0;} break; case 150: -#line 1287 "fe/idl.tao_yy" { tao_yyval.ival = 0;} break; case 151: -#line 1289 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Native *node = NULL; @@ -2410,13 +2290,11 @@ case 151: } break; case 152: -#line 1315 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen); } break; case 153: -#line 1319 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_DecllistActiveIterator *l; @@ -2452,13 +2330,11 @@ case 153: } break; case 156: -#line 1361 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; case 158: -#line 1366 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -2471,19 +2347,16 @@ case 158: } break; case 172: -#line 1402 "fe/idl.tao_yy" { tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval); } break; case 173: -#line 1410 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen); } break; case 174: -#line 1414 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen); @@ -2496,25 +2369,21 @@ case 174: } break; case 175: -#line 1425 "fe/idl.tao_yy" { tao_yyval.dlval = NULL; } break; case 178: -#line 1437 "fe/idl.tao_yy" { tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval); } break; case 179: -#line 1445 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen); } break; case 180: -#line 1449 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen); @@ -2527,20 +2396,17 @@ case 180: } break; case 181: -#line 1460 "fe/idl.tao_yy" { tao_yyval.dlval = NULL; } break; case 182: -#line 1467 "fe/idl.tao_yy" { tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].idval, NULL), FE_Declarator::FD_simple, NULL); } break; case 183: -#line 1475 "fe/idl.tao_yy" { tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].dcval->local_name(), NULL), FE_Declarator::FD_complex, @@ -2548,61 +2414,51 @@ case 183: } break; case 186: -#line 1489 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_long; } break; case 187: -#line 1493 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_longlong; } break; case 188: -#line 1497 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_short; } break; case 189: -#line 1504 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_ulong; } break; case 190: -#line 1508 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_ulonglong; } break; case 191: -#line 1512 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_ushort; } break; case 192: -#line 1519 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_double; } break; case 193: -#line 1523 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_float; } break; case 194: -#line 1527 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_longdouble; } break; case 195: -#line 1534 "fe/idl.tao_yy" { cerr << "error in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -2610,43 +2466,36 @@ case 195: } break; case 196: -#line 1543 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_char; } break; case 197: -#line 1547 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_wchar; } break; case 198: -#line 1554 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_octet; } break; case 199: -#line 1561 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_bool; } break; case 200: -#line 1568 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_any; } break; case 201: -#line 1575 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen); } break; case 202: -#line 1579 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -2675,19 +2524,16 @@ case 202: } break; case 203: -#line 1606 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen); } break; case 204: -#line 1610 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen); } break; case 205: -#line 1614 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen); /* @@ -2704,26 +2550,22 @@ case 205: } break; case 209: -#line 1638 "fe/idl.tao_yy" { /* is $0 to member_i */ tao_yyval.vival = AST_Field::vis_NA; } break; case 211: -#line 1647 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen); } break; case 212: -#line 1651 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen); } break; case 213: -#line 1655 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_DecllistActiveIterator *l = NULL; @@ -2759,50 +2601,42 @@ case 213: } break; case 214: -#line 1689 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; case 215: -#line 1693 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; case 216: -#line 1701 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen); } break; case 217: -#line 1705 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen); } break; case 218: -#line 1709 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen); } break; case 219: -#line 1713 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen); } break; case 220: -#line 1717 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen); } break; case 221: -#line 1721 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[-8].idval, NULL); @@ -2837,19 +2671,16 @@ case 221: } break; case 222: -#line 1754 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen); } break; case 223: -#line 1758 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen); } break; case 224: -#line 1762 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen); /* @@ -2870,19 +2701,16 @@ case 224: } break; case 225: -#line 1784 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; case 226: -#line 1788 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; case 227: -#line 1792 "fe/idl.tao_yy" { /* octets are not allowed*/ idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); @@ -2890,13 +2718,11 @@ case 227: } break; case 228: -#line 1798 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; case 230: -#line 1803 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -2968,19 +2794,16 @@ case 230: } break; case 234: -#line 1883 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen); } break; case 235: -#line 1887 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen); } break; case 236: -#line 1891 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_LabellistActiveIterator *l = NULL; @@ -3006,26 +2829,22 @@ case 236: } break; case 237: -#line 1915 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; case 238: -#line 1920 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; case 239: -#line 1928 "fe/idl.tao_yy" { tao_yyval.llval = new UTL_LabelList(tao_yyvsp[-1].ulval, tao_yyvsp[0].llval); } break; case 240: -#line 1935 "fe/idl.tao_yy" { if (tao_yyvsp[-1].llval == NULL) tao_yyval.llval = new UTL_LabelList(tao_yyvsp[0].ulval, NULL); @@ -3036,19 +2855,16 @@ case 240: } break; case 241: -#line 1944 "fe/idl.tao_yy" { tao_yyval.llval = NULL; } break; case 242: -#line 1951 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen); } break; case 243: -#line 1955 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen); @@ -3058,19 +2874,16 @@ case 243: } break; case 244: -#line 1963 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen); } break; case 245: -#line 1967 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen); } break; case 246: -#line 1971 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen); @@ -3079,13 +2892,11 @@ case 246: } break; case 247: -#line 1981 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen); } break; case 248: -#line 1985 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen); /* @@ -3110,13 +2921,11 @@ case 248: } break; case 249: -#line 2011 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen); } break; case 250: -#line 2015 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -3148,19 +2957,16 @@ case 250: } break; case 251: -#line 2045 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen); } break; case 252: -#line 2049 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen); } break; case 253: -#line 2053 "fe/idl.tao_yy" { UTL_StrList *p = 0; idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen); @@ -3178,13 +2984,11 @@ case 253: } break; case 255: -#line 2075 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen); } break; case 258: -#line 2084 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = @@ -3206,19 +3010,16 @@ case 258: } break; case 259: -#line 2108 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen); } break; case 260: -#line 2112 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen); } break; case 261: -#line 2116 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen); /* @@ -3254,7 +3055,6 @@ case 261: } break; case 262: -#line 2151 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen); /* @@ -3289,7 +3089,6 @@ case 262: } break; case 263: -#line 2187 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen); /* @@ -3299,32 +3098,27 @@ case 263: } break; case 264: -#line 2195 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen); } break; case 265: -#line 2199 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen); tao_yyval.dcval = tao_yyvsp[0].dcval; } break; case 266: -#line 2208 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen); } break; case 267: -#line 2212 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen); } break; case 268: -#line 2216 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen); /* @@ -3344,7 +3138,6 @@ case 268: } break; case 269: -#line 2234 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted); /* @@ -3361,25 +3154,21 @@ case 269: } break; case 270: -#line 2252 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen); } break; case 271: -#line 2260 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen); } break; case 272: -#line 2264 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen); } break; case 273: -#line 2268 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen); /* @@ -3399,7 +3188,6 @@ case 273: } break; case 274: -#line 2286 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted); /* @@ -3416,19 +3204,16 @@ case 274: } break; case 275: -#line 2304 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen); } break; case 276: -#line 2311 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen); } break; case 277: -#line 2315 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted); /* @@ -3441,13 +3226,11 @@ case 277: } break; case 278: -#line 2329 "fe/idl.tao_yy" { tao_yyval.elval = new UTL_ExprList(tao_yyvsp[-1].exval, tao_yyvsp[0].elval); } break; case 279: -#line 2336 "fe/idl.tao_yy" { if (tao_yyvsp[-1].elval == NULL) tao_yyval.elval = new UTL_ExprList(tao_yyvsp[0].exval, NULL); @@ -3458,25 +3241,21 @@ case 279: } break; case 280: -#line 2345 "fe/idl.tao_yy" { tao_yyval.elval = NULL; } break; case 281: -#line 2352 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen); } break; case 282: -#line 2356 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen); } break; case 283: -#line 2360 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen); /* @@ -3491,19 +3270,16 @@ case 283: } break; case 284: -#line 2377 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen); } break; case 285: -#line 2381 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen); } break; case 286: -#line 2385 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_DecllistActiveIterator *l = NULL; @@ -3542,26 +3318,22 @@ case 286: } break; case 287: -#line 2425 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen); tao_yyval.bval = I_TRUE; } break; case 288: -#line 2430 "fe/idl.tao_yy" { tao_yyval.bval = I_FALSE; } break; case 289: -#line 2437 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen); } break; case 290: -#line 2441 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -3590,19 +3362,16 @@ case 290: } break; case 291: -#line 2468 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen); } break; case 292: -#line 2472 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen); } break; case 293: -#line 2476 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen); /* @@ -3616,13 +3385,11 @@ case 293: } break; case 294: -#line 2492 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen); } break; case 295: -#line 2496 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = @@ -3658,19 +3425,16 @@ case 295: } break; case 296: -#line 2530 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted); } break; case 297: -#line 2534 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted); } break; case 298: -#line 2538 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Operation *o = NULL; @@ -3694,27 +3458,23 @@ case 298: } break; case 299: -#line 2563 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen); tao_yyval.ofval = AST_Operation::OP_oneway; } break; case 300: -#line 2568 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen); tao_yyval.ofval = AST_Operation::OP_idempotent; } break; case 301: -#line 2573 "fe/idl.tao_yy" { tao_yyval.ofval = AST_Operation::OP_noflags; } break; case 303: -#line 2581 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom() @@ -3722,7 +3482,6 @@ case 303: } break; case 304: -#line 2590 "fe/idl.tao_yy" { /* TODO: replace parameter_list with rule that accepts only IN args*/ cerr << "error in " << idl_global->filename()->get_string() @@ -3731,49 +3490,41 @@ case 304: } break; case 305: -#line 2601 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen); } break; case 306: -#line 2605 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen); } break; case 307: -#line 2609 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen); } break; case 308: -#line 2614 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen); } break; case 310: -#line 2624 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen); } break; case 313: -#line 2633 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen); } break; case 314: -#line 2637 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen); } break; case 315: -#line 2641 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Argument *a = NULL; @@ -3803,13 +3554,11 @@ case 315: } break; case 316: -#line 2672 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; case 319: -#line 2678 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -3822,87 +3571,73 @@ case 319: } break; case 320: -#line 2692 "fe/idl.tao_yy" { tao_yyval.dival = AST_Argument::dir_IN; } break; case 321: -#line 2696 "fe/idl.tao_yy" { tao_yyval.dival = AST_Argument::dir_OUT; } break; case 322: -#line 2700 "fe/idl.tao_yy" { tao_yyval.dival = AST_Argument::dir_INOUT; } break; case 323: -#line 2707 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen); } break; case 324: -#line 2711 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen); } break; case 325: -#line 2716 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen); tao_yyval.nlval = tao_yyvsp[-1].nlval; } break; case 326: -#line 2721 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; case 327: -#line 2728 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen); } break; case 328: -#line 2732 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen); } break; case 329: -#line 2737 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen); tao_yyval.slval = tao_yyvsp[-1].slval; } break; case 330: -#line 2742 "fe/idl.tao_yy" { tao_yyval.slval = NULL; } break; case 331: -#line 2749 "fe/idl.tao_yy" { tao_yyval.slval = new UTL_StrList(tao_yyvsp[-1].sval, tao_yyvsp[0].slval); } break; case 332: -#line 2757 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen); } break; case 333: -#line 2761 "fe/idl.tao_yy" { if (tao_yyvsp[-3].slval == NULL) tao_yyval.slval = new UTL_StrList(tao_yyvsp[0].sval, NULL); @@ -3913,12 +3648,10 @@ case 333: } break; case 334: -#line 2770 "fe/idl.tao_yy" { tao_yyval.slval = NULL; } break; -#line 3921 "y.tab.cpp" } tao_yyssp -= tao_yym; tao_yystate = *tao_yyssp; diff --git a/TAO/TAO_IDL/fe/y.tab.cpp.diff b/TAO/TAO_IDL/fe/y.tab.cpp.diff index 5c172efdf1f..1c8ab12a2ff 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp.diff +++ b/TAO/TAO_IDL/fe/y.tab.cpp.diff @@ -1,6 +1,6 @@ ---- y.tab.cpp Tue Dec 19 09:31:07 2000 -+++ y.tab.cpp.mod Tue Dec 19 09:28:09 2000 -@@ -942,7 +942,7 @@ +--- y.tab.cpp.orig Mon Nov 12 18:53:41 2001 ++++ y.tab.cpp Mon Nov 12 18:53:41 2001 +@@ -941,7 +941,7 @@ #ifdef TAO_YYMAXDEPTH #define TAO_YYSTACKSIZE TAO_YYMAXDEPTH #else @@ -9,7 +9,7 @@ #endif #endif int tao_yydebug; -@@ -1137,7 +1137,7 @@ +@@ -1134,7 +1134,7 @@ extern char *ace_foo(); #endif @@ -18,7 +18,7 @@ { tao_yyn = *tao_yys; if (tao_yyn >= '0' && tao_yyn <= '9') -@@ -1154,7 +1154,7 @@ +@@ -1151,7 +1151,7 @@ *tao_yyssp = tao_yystate = 0; tao_yyloop: @@ -27,7 +27,7 @@ if (tao_yychar < 0) { if ((tao_yychar = tao_yylex()) < 0) tao_yychar = 0; -@@ -1205,11 +1205,10 @@ +@@ -1201,11 +1201,10 @@ goto tao_yynewerror; #endif diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 8d5e7c18a68..f37b58d6676 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -402,9 +402,9 @@ static char *yy_last_accepting_cpos; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "Trader/constraint.l" + #define INITIAL 0 -#line 2 "Trader/constraint.l" + // $Id$ // ======================================================================== // @@ -432,7 +432,7 @@ static TAO_Literal_Constraint* extract_string(const char*); #endif /* TAO_CONSTRAINT_DEBUG */ -#line 451 "lex.yy.c" + /* Macros after this point can all be overridden by user definitions in * section 1. @@ -585,10 +585,10 @@ YY_DECL register char *yy_cp = 0, *yy_bp = 0; register int yy_act; -#line 43 "Trader/constraint.l" -#line 605 "lex.yy.c" + + if ( yy_init ) { @@ -673,122 +673,122 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 45 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_MIN; } ACE_NOTREACHED (YY_BREAK) case 2: YY_RULE_SETUP -#line 46 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_MAX; } ACE_NOTREACHED (YY_BREAK) case 3: YY_RULE_SETUP -#line 47 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_FIRST; } ACE_NOTREACHED (YY_BREAK) case 4: YY_RULE_SETUP -#line 48 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_RANDOM; } ACE_NOTREACHED (YY_BREAK) case 5: YY_RULE_SETUP -#line 49 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_WITH; } ACE_NOTREACHED (YY_BREAK) case 6: YY_RULE_SETUP -#line 50 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_EXIST; } ACE_NOTREACHED (YY_BREAK) case 7: YY_RULE_SETUP -#line 51 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_NOT; } ACE_NOTREACHED (YY_BREAK) case 8: YY_RULE_SETUP -#line 52 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_AND; } ACE_NOTREACHED (YY_BREAK) case 9: YY_RULE_SETUP -#line 53 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_OR; } ACE_NOTREACHED (YY_BREAK) case 10: YY_RULE_SETUP -#line 54 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_IN; } ACE_NOTREACHED (YY_BREAK) case 11: YY_RULE_SETUP -#line 55 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_TWIDDLE; } ACE_NOTREACHED (YY_BREAK) case 12: YY_RULE_SETUP -#line 56 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_PLUS; } ACE_NOTREACHED (YY_BREAK) case 13: YY_RULE_SETUP -#line 57 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_MINUS; } ACE_NOTREACHED (YY_BREAK) case 14: YY_RULE_SETUP -#line 58 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_MULT; } ACE_NOTREACHED (YY_BREAK) case 15: YY_RULE_SETUP -#line 59 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_DIV; } ACE_NOTREACHED (YY_BREAK) case 16: YY_RULE_SETUP -#line 60 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_LT; } ACE_NOTREACHED (YY_BREAK) case 17: YY_RULE_SETUP -#line 61 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_LE; } ACE_NOTREACHED (YY_BREAK) case 18: YY_RULE_SETUP -#line 62 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_GT; } ACE_NOTREACHED (YY_BREAK) case 19: YY_RULE_SETUP -#line 63 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_GE; } ACE_NOTREACHED (YY_BREAK) case 20: YY_RULE_SETUP -#line 64 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_EQ; } ACE_NOTREACHED (YY_BREAK) case 21: YY_RULE_SETUP -#line 65 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_NE; } ACE_NOTREACHED (YY_BREAK) case 22: YY_RULE_SETUP -#line 66 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_LPAREN; } ACE_NOTREACHED (YY_BREAK) case 23: YY_RULE_SETUP -#line 67 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_RPAREN; } ACE_NOTREACHED (YY_BREAK) case 24: YY_RULE_SETUP -#line 68 "Trader/constraint.l" + { yylval.constraint_ = new TAO_Literal_Constraint((CORBA::Boolean) 1); @@ -797,7 +797,7 @@ YY_RULE_SETUP ACE_NOTREACHED (YY_BREAK) case 25: YY_RULE_SETUP -#line 73 "Trader/constraint.l" + { yylval.constraint_ = new TAO_Literal_Constraint((CORBA::Boolean) 0); @@ -806,7 +806,7 @@ YY_RULE_SETUP ACE_NOTREACHED (YY_BREAK) case 26: YY_RULE_SETUP -#line 78 "Trader/constraint.l" + { yylval.constraint_ = new TAO_Literal_Constraint((yytext[0] == '-' ? @@ -816,7 +816,7 @@ YY_RULE_SETUP ACE_NOTREACHED (YY_BREAK) case 27: YY_RULE_SETUP -#line 84 "Trader/constraint.l" + { yylval.constraint_ = new TAO_Literal_Constraint((CORBA::Double)atof(yytext)); @@ -825,7 +825,7 @@ YY_RULE_SETUP ACE_NOTREACHED (YY_BREAK) case 28: YY_RULE_SETUP -#line 89 "Trader/constraint.l" + { yylval.constraint_ = extract_string(yytext); TAO_YY_LEX_DEBUG; return TAO_STRING; @@ -833,7 +833,7 @@ YY_RULE_SETUP ACE_NOTREACHED (YY_BREAK) case 29: YY_RULE_SETUP -#line 93 "Trader/constraint.l" + { yylval.constraint_ = new TAO_Property_Constraint(yytext); @@ -842,17 +842,17 @@ YY_RULE_SETUP ACE_NOTREACHED (YY_BREAK) case 30: YY_RULE_SETUP -#line 98 "Trader/constraint.l" + { TAO_YY_LEX_DEBUG; return TAO_UNKNOWN; } ACE_NOTREACHED (YY_BREAK) case 31: YY_RULE_SETUP -#line 101 "Trader/constraint.l" + TAO_TRADER_ECHO; YY_BREAK -#line 869 "lex.yy.c" + case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1726,7 +1726,7 @@ int main() return 0; } #endif -#line 101 "Trader/constraint.l" + TAO_Literal_Constraint* diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index dda4a83a296..55406876dfd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -1,4 +1,4 @@ -# line 2 "Trader/constraint.y" + // $Id$ // ======================================================================== // @@ -89,7 +89,7 @@ YYSTYPE *yyv; static int yymaxdepth = YYMAXDEPTH; # define YYERRCODE 256 -# line 133 "Trader/constraint.y" + //extern int yydebug = 1; @@ -247,7 +247,7 @@ char * yyreds[] = "factor : TAO_BOOLEAN", }; #endif /* YYDEBUG */ -# line 1 "/usr/ccs/bin/yaccpar" + /* * Copyright (c) 1993 by Sun Microsystems, Inc. */ @@ -780,117 +780,117 @@ int yyparse() { case 1: -# line 38 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_CONSTRAINT, yypvt[-0].constraint_); } break; case 2: -# line 40 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 3: -# line 44 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_MIN, yypvt[-0].constraint_); } break; case 4: -# line 46 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_MAX, yypvt[-0].constraint_); } break; case 5: -# line 48 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_WITH, yypvt[-0].constraint_); } break; case 6: -# line 50 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Noop_Constraint(TAO_FIRST); } break; case 7: -# line 52 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Noop_Constraint(TAO_RANDOM); } break; case 8: -# line 56 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_OR, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 9: -# line 58 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 10: -# line 62 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_AND, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 11: -# line 64 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 12: -# line 68 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_EQ, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 13: -# line 70 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_NE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 14: -# line 72 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_GT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 15: -# line 74 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_GE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 16: -# line 76 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_LT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 17: -# line 78 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_LE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 18: -# line 80 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 19: -# line 84 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_IN, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 20: -# line 86 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 21: -# line 90 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_TWIDDLE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 22: -# line 92 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 23: -# line 96 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_PLUS, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 24: -# line 98 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_MINUS, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 25: -# line 100 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 26: -# line 104 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_MULT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 27: -# line 106 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_DIV, yypvt[-2].constraint_, yypvt[-0].constraint_); } break; case 28: -# line 108 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 29: -# line 112 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_NOT, yypvt[-0].constraint_); } break; case 30: -# line 114 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 31: -# line 118 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-1].constraint_; } break; case 32: -# line 120 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_EXIST, yypvt[-0].constraint_); } break; case 33: -# line 122 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 34: -# line 124 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 35: -# line 126 "Trader/constraint.y" + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_UMINUS, yypvt[-0].constraint_); } break; case 36: -# line 128 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; case 37: -# line 130 "Trader/constraint.y" + { yyval.constraint_ = yypvt[-0].constraint_; } break; -# line 532 "/usr/ccs/bin/yaccpar" + } goto yystack; /* reset registers in driver code */ } diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index a2c608b30b0..6c5c63bf5f8 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -1,9 +1,4 @@ // $Id$ -#ifndef lint -char ace_cc_yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\ - Modified 5/2/90 by J. Roskind to support graphic debugging modes"; -#endif -#line 19 "CC_command.y" #include "CC_command.h" #include "ace/ACE.h" #include "orbsvcs/CosConcurrencyControlC.h" @@ -15,172 +10,90 @@ extern int line_no; extern char line_buf[500]; extern char *ace_cc_yytext; extern CC_CommandList *cmdlist; -#line 32 "CC_command.y" -typedef union { +typedef union +#ifdef __cplusplus + ACE_CC_YYSTYPE +#endif + { CC_Command *command; CosConcurrencyControl::lock_mode lock_mode; char *id; int num; } ACE_CC_YYSTYPE; -#line 25 "CC_command.tab.cpp" -#define T_START_CMD 257 -#define T_CREATE_CMD 258 -#define T_LOCK_CMD 259 -#define T_UNLOCK_CMD 260 -#define T_TRYLOCK_CMD 261 -#define T_CHANGEMODE_CMD 262 -#define T_SLEEP_CMD 263 -#define T_WAIT_CMD 264 -#define T_REPEAT_CMD 265 -#define T_EXCEP_CMD 266 -#define T_PRINT_CMD 267 -#define T_LOOKUP_CMD 268 -#define T_TERM 269 -#define T_READ 270 -#define T_IREAD 271 -#define T_UPGRADE 272 -#define T_WRITE 273 -#define T_IWRITE 274 -#define T_IDENT 275 -#define Q_STRING 276 -#define T_NUM 277 -#define ACE_CC_YYERRCODE 256 -short ace_cc_yylhs[] = { -1, - 0, 0, 6, 6, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 3, 4, 5, 5, 5, 5, 5, -}; -short ace_cc_yylen[] = { 2, - 0, 1, 2, 1, 3, 3, 2, 4, 3, 4, - 3, 4, 3, 5, 4, 3, 2, 3, 3, 3, - 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, -}; -short ace_cc_yydefred[] = { 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 4, 0, 23, 0, 7, 24, 0, - 26, 27, 28, 29, 30, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 17, 0, 0, 25, 0, 0, - 0, 3, 5, 6, 0, 9, 0, 11, 0, 13, - 0, 0, 16, 18, 21, 22, 19, 20, 8, 10, - 12, 0, 15, 14, -}; -short ace_cc_yydgoto[] = { 13, - 14, 17, 20, 39, 27, 15, -}; -short ace_cc_yysindex[] = { -254, - -260, -239, -233, -233, -233, -233, -256, -249, -246, -252, - -244, -242, 0, 0, -254, 0, -235, 0, 0, -234, - 0, 0, 0, 0, 0, -222, -226, -222, -225, -222, - -224, -222, -222, -223, 0, -216, -215, 0, -214, -213, - -212, 0, 0, 0, -211, 0, -210, 0, -209, 0, - -222, -208, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -207, 0, 0, -}; -short ace_cc_yyrindex[] = { 63, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 64, 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, -}; -short ace_cc_yygindex[] = { 0, - 50, 0, 13, 0, -4, 0, -}; -#define ACE_CC_YYTABLESIZE 65 -short ace_cc_yytable[] = { 29, - 31, 33, 1, 2, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 16, 26, 28, 30, 32, 35, - 34, 45, 38, 47, 41, 49, 36, 51, 52, 18, - 37, 40, 19, 43, 44, 19, 21, 22, 23, 24, - 25, 19, 46, 48, 50, 53, 62, 21, 22, 23, - 24, 25, 54, 55, 56, 57, 58, 59, 60, 61, - 63, 64, 1, 2, 42, -}; -short ace_cc_yycheck[] = { 4, - 5, 6, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 275, 3, 4, 5, 6, 269, - 277, 26, 275, 28, 12, 30, 276, 32, 33, 269, - 277, 276, 275, 269, 269, 275, 270, 271, 272, 273, - 274, 275, 269, 269, 269, 269, 51, 270, 271, 272, - 273, 274, 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 0, 0, 15, -}; -#define ACE_CC_YYFINAL 13 -#ifndef ACE_CC_YYDEBUG -#define ACE_CC_YYDEBUG 0 +# define T_START_CMD 257 +# define T_CREATE_CMD 258 +# define T_LOCK_CMD 259 +# define T_UNLOCK_CMD 260 +# define T_TRYLOCK_CMD 261 +# define T_CHANGEMODE_CMD 262 +# define T_SLEEP_CMD 263 +# define T_WAIT_CMD 264 +# define T_REPEAT_CMD 265 +# define T_EXCEP_CMD 266 +# define T_PRINT_CMD 267 +# define T_LOOKUP_CMD 268 +# define T_TERM 269 +# define T_READ 270 +# define T_IREAD 271 +# define T_UPGRADE 272 +# define T_WRITE 273 +# define T_IWRITE 274 +# define T_IDENT 275 +# define Q_STRING 276 +# define T_NUM 277 + +#include <inttypes.h> + +#ifdef __STDC__ +#include <stdlib.h> +#include <string.h> +#else +#include <malloc.h> +#include <memory.h> #endif -#define ACE_CC_YYMAXTOKEN 277 -#if ACE_CC_YYDEBUG -char *ace_cc_yyname[] = { -"end-of-file",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,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,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,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,"T_START_CMD","T_CREATE_CMD", -"T_LOCK_CMD","T_UNLOCK_CMD","T_TRYLOCK_CMD","T_CHANGEMODE_CMD","T_SLEEP_CMD", -"T_WAIT_CMD","T_REPEAT_CMD","T_EXCEP_CMD","T_PRINT_CMD","T_LOOKUP_CMD","T_TERM", -"T_READ","T_IREAD","T_UPGRADE","T_WRITE","T_IWRITE","T_IDENT","Q_STRING", -"T_NUM", -}; -char *ace_cc_yyrule[] = { -"$accept : start", -"start :", -"start : cmd_list", -"cmd_list : cmd_list cmd", -"cmd_list : cmd", -"cmd : T_START_CMD config_file_name T_TERM", -"cmd : T_CREATE_CMD lock_set_name T_TERM", -"cmd : T_CREATE_CMD T_TERM", -"cmd : T_LOCK_CMD lock_set_name lock_mode T_TERM", -"cmd : T_LOCK_CMD lock_mode T_TERM", -"cmd : T_UNLOCK_CMD lock_set_name lock_mode T_TERM", -"cmd : T_UNLOCK_CMD lock_mode T_TERM", -"cmd : T_TRYLOCK_CMD lock_set_name lock_mode T_TERM", -"cmd : T_TRYLOCK_CMD lock_mode T_TERM", -"cmd : T_CHANGEMODE_CMD lock_set_name lock_mode lock_mode T_TERM", -"cmd : T_CHANGEMODE_CMD lock_mode lock_mode T_TERM", -"cmd : T_SLEEP_CMD T_NUM T_TERM", -"cmd : T_WAIT_CMD T_TERM", -"cmd : T_WAIT_CMD Q_STRING T_TERM", -"cmd : T_PRINT_CMD Q_STRING T_TERM", -"cmd : T_LOOKUP_CMD lock_set_name T_TERM", -"cmd : T_REPEAT_CMD T_NUM T_TERM", -"cmd : T_EXCEP_CMD exception_name T_TERM", -"config_file_name : T_IDENT", -"lock_set_name : T_IDENT", -"exception_name : T_IDENT", -"lock_mode : T_READ", -"lock_mode : T_IREAD", -"lock_mode : T_UPGRADE", -"lock_mode : T_WRITE", -"lock_mode : T_IWRITE", -}; + +#include <values.h> + +#if defined(__cplusplus) || defined(__STDC__) + +#if defined(__cplusplus) && defined(__EXTERN_C__) +extern "C" { #endif -#define ace_cc_yyclearin (ace_cc_yychar=(-1)) -#define ace_cc_yyerrok (ace_cc_yyerrflag=0) -#ifndef ACE_CC_YYSTACKSIZE -#ifdef ACE_CC_YYMAXDEPTH -#define ACE_CC_YYSTACKSIZE ACE_CC_YYMAXDEPTH -#else -#define ACE_CC_YYSTACKSIZE 300 +#ifndef ace_cc_yyerror +#if defined(__cplusplus) + void ace_cc_yyerror(const char *); #endif #endif -int ace_cc_yydebug; -int ace_cc_yynerrs; -int ace_cc_yyerrflag; -int ace_cc_yychar; -short *ace_cc_yyssp; -ACE_CC_YYSTYPE *ace_cc_yyvsp; -ACE_CC_YYSTYPE ace_cc_yyval; +#ifndef ace_cc_yylex + int ace_cc_yylex(void); +#endif + int ace_cc_yyparse(void); +#if defined(__cplusplus) && defined(__EXTERN_C__) +} +#endif + +#endif + +#define ace_cc_yyclearin ace_cc_yychar = -1 +#define ace_cc_yyerrok ace_cc_yyerrflag = 0 +extern int ace_cc_yychar; +extern int ace_cc_yyerrflag; ACE_CC_YYSTYPE ace_cc_yylval; -#define ace_cc_yystacksize ACE_CC_YYSTACKSIZE -short ace_cc_yyss[ACE_CC_YYSTACKSIZE]; -ACE_CC_YYSTYPE ace_cc_yyvs[ACE_CC_YYSTACKSIZE]; -#line 116 "CC_command.y" +ACE_CC_YYSTYPE ace_cc_yyval; +typedef int ace_cc_yytabelem; +#ifndef ACE_CC_YYMAXDEPTH +#define ACE_CC_YYMAXDEPTH 150 +#endif +#if ACE_CC_YYMAXDEPTH > 0 +int ace_cc_yy_ace_cc_yys[ACE_CC_YYMAXDEPTH], *ace_cc_yys = ace_cc_yy_ace_cc_yys; +ACE_CC_YYSTYPE ace_cc_yy_ace_cc_yyv[ACE_CC_YYMAXDEPTH], *ace_cc_yyv = ace_cc_yy_ace_cc_yyv; +#else /* user does initial allocation */ +int *ace_cc_yys; +ACE_CC_YYSTYPE *ace_cc_yyv; +#endif +static int ace_cc_yymaxdepth = ACE_CC_YYMAXDEPTH; +# define ACE_CC_YYERRCODE 256 + void ace_cc_yyerror (const char *s) @@ -192,506 +105,706 @@ ace_cc_yyerror (const char *s) line_buf); ACE_OS::exit (-1); } -#line 195 "CC_command.tab.cpp" -#define ACE_CC_YYABORT goto ace_cc_yyabort -#define ACE_CC_YYACCEPT goto ace_cc_yyaccept -#define ACE_CC_YYERROR goto ace_cc_yyerrlab -#ifdef ACE_CC_YYDEBUG -#ifndef ACE_CC_YYDEBUG_LEXER_TEXT /* pointer to the text isolated by the lexer*/ -#define ACE_CC_YYDEBUG_LEXER_TEXT "ACE_CC_YYDEBUG_LEXER_TEXT not defined" -#endif -#ifndef ACE_CC_YYDEBUG_INDENT_STRING -#define ACE_CC_YYDEBUG_INDENT_STRING "| " -#endif -#ifndef ACE_CC_YYDEBUG_REDUCE_STRING -#define ACE_CC_YYDEBUG_REDUCE_STRING "+-------" -#endif -#ifndef ACE_CC_YYDEBUG_INDENT -#ifdef __cplusplus -void ACE_CC_YYDEBUG_INDENT(int ace_cc_yyindent) -#else -ACE_CC_YYDEBUG_INDENT(ace_cc_yyindent) -int ace_cc_yyindent; -#endif -{ - while(ace_cc_yyindent-- > 0) - printf("%s", ACE_CC_YYDEBUG_INDENT_STRING); -} -#endif /* ACE_CC_YYDEBUG_INDENT */ -#ifndef ACE_CC_YYDEBUG_REDUCE +static const ace_cc_yytabelem ace_cc_yyexca[] ={ +-1, 1, + 0, -1, + -2, 0, + }; +# define ACE_CC_YYNPROD 31 +# define ACE_CC_YYLAST 102 +static const ace_cc_yytabelem ace_cc_yyact[]={ + + 24, 25, 26, 27, 28, 21, 4, 5, 6, 7, + 8, 9, 10, 11, 14, 15, 12, 13, 24, 25, + 26, 27, 28, 40, 36, 64, 20, 35, 38, 42, + 63, 37, 21, 21, 18, 61, 60, 59, 58, 57, + 56, 55, 54, 53, 50, 48, 46, 44, 43, 23, + 2, 3, 1, 19, 16, 41, 17, 30, 32, 34, + 22, 29, 31, 33, 0, 0, 0, 39, 0, 0, + 0, 0, 45, 0, 0, 0, 0, 0, 0, 47, + 0, 49, 0, 51, 52, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 62 }; +static const ace_cc_yytabelem ace_cc_yypact[]={ + + -251,-10000000, -251,-10000000, -241, -243, -270, -270, -270, -270, + -250, -245, -248, -242, -254, -246,-10000000, -221,-10000000, -222, +-10000000,-10000000, -252, -223,-10000000,-10000000,-10000000,-10000000,-10000000, -252, + -224, -252, -225, -252, -252, -226,-10000000, -227, -228, -229, + -230, -231,-10000000,-10000000,-10000000, -232,-10000000, -233,-10000000, -234, +-10000000, -252, -239,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000, +-10000000,-10000000, -244,-10000000,-10000000 }; +static const ace_cc_yytabelem ace_cc_yypgo[]={ + + 0, 51, 56, 53, 55, 49, 52, 50 }; +static const ace_cc_yytabelem ace_cc_yyr1[]={ + + 0, 6, 6, 7, 7, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, + 5 }; +static const ace_cc_yytabelem ace_cc_yyr2[]={ + + 0, 0, 3, 5, 3, 7, 7, 5, 9, 7, + 9, 7, 9, 7, 11, 9, 7, 5, 7, 7, + 7, 7, 7, 3, 3, 3, 3, 3, 3, 3, + 3 }; +static const ace_cc_yytabelem ace_cc_yychk[]={ + +-10000000, -6, -7, -1, 257, 258, 259, 260, 261, 262, + 263, 264, 267, 268, 265, 266, -1, -2, 275, -3, + 269, 275, -3, -5, 270, 271, 272, 273, 274, -3, + -5, -3, -5, -3, -5, 277, 269, 276, 276, -3, + 277, -4, 275, 269, 269, -5, 269, -5, 269, -5, + 269, -5, -5, 269, 269, 269, 269, 269, 269, 269, + 269, 269, -5, 269, 269 }; +static const ace_cc_yytabelem ace_cc_yydef[]={ + + 1, -2, 2, 4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, 23, 0, + 7, 24, 0, 0, 26, 27, 28, 29, 30, 0, + 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, + 0, 0, 25, 5, 6, 0, 9, 0, 11, 0, + 13, 0, 0, 16, 18, 19, 20, 21, 22, 8, + 10, 12, 0, 15, 14 }; +typedef struct #ifdef __cplusplus -void ACE_CC_YYDEBUG_REDUCE(int /* ace_cc_yynew_state */, - int /* ace_cc_yyrule_num */, - char *ace_cc_yyrule_string, - int ace_cc_yynew_indent, - int ace_cc_yyrhs_count) -#else -ACE_CC_YYDEBUG_REDUCE(ace_cc_yynew_state, ace_cc_yyrule_num, ace_cc_yyrule_string, ace_cc_yynew_indent, ace_cc_yyrhs_count) -int ace_cc_yynew_state; -int ace_cc_yyrule_num; -char * ace_cc_yyrule_string; -int ace_cc_yynew_indent; -int ace_cc_yyrhs_count; + ace_cc_yytoktype #endif -{ - if (1 < ace_cc_yyrhs_count) - { /* draw the graphics for the reduction */ - ACE_CC_YYDEBUG_INDENT(ace_cc_yynew_indent); - while(1 < ace_cc_yyrhs_count--) - printf("%s", ACE_CC_YYDEBUG_REDUCE_STRING); - putchar('+'); /* left rotated L would look nice */ - putchar('\n'); - ACE_CC_YYDEBUG_INDENT(ace_cc_yynew_indent); - putchar('|'); /* down arrow would look nice */ - putchar('\n'); - } - ACE_CC_YYDEBUG_INDENT(ace_cc_yynew_indent); - /* Only print the resulting token name */ - while (*ace_cc_yyrule_string) - putchar(*ace_cc_yyrule_string++); - putchar('\n'); -} -#endif /* ACE_CC_YYDEBUG_REDUCE */ -#ifndef ACE_CC_YYDEBUG_SHIFT_LEXEME -#ifdef __cplusplus -void ACE_CC_YYDEBUG_SHIFT_LEXEME(int /* ace_cc_yyold_state */, - int /* ace_cc_yynew_state */, - char *ace_cc_yytoken_string, - int ace_cc_yynew_indent) -#else -ACE_CC_YYDEBUG_SHIFT_LEXEME(ace_cc_yyold_state, ace_cc_yynew_state, ace_cc_yytoken_string, ace_cc_yynew_indent) -int ace_cc_yyold_state; -int ace_cc_yynew_state; -char * ace_cc_yytoken_string; -int ace_cc_yynew_indent; +{ char *t_name; int t_val; } ace_cc_yytoktype; +#ifndef ACE_CC_YYDEBUG +# define ACE_CC_YYDEBUG 0 /* don't allow debugging */ #endif + +#if ACE_CC_YYDEBUG + +ace_cc_yytoktype ace_cc_yytoks[] = { - ACE_CC_YYDEBUG_INDENT(ace_cc_yynew_indent); - printf("%s <-- `%s'\n", ace_cc_yytoken_string, ACE_CC_YYDEBUG_LEXER_TEXT); -} -#endif /* ACE_CC_YYDEBUG_SHIFT_LEXEME */ -#ifndef ACE_CC_YYDEBUG_LOOK_AHEAD -#ifdef __cplusplus -void ACE_CC_YYDEBUG_LOOK_AHEAD(int /* ace_cc_yynew_state */, - int ace_cc_yytoken_num, - char *ace_cc_yytoken_string, - int ace_cc_yyindent) -#else -ACE_CC_YYDEBUG_LOOK_AHEAD(ace_cc_yynew_state, ace_cc_yytoken_num, ace_cc_yytoken_string, ace_cc_yyindent) -int ace_cc_yynew_state; -int ace_cc_yytoken_num; -char * ace_cc_yytoken_string; -int ace_cc_yyindent; -#endif + "T_START_CMD", 257, + "T_CREATE_CMD", 258, + "T_LOCK_CMD", 259, + "T_UNLOCK_CMD", 260, + "T_TRYLOCK_CMD", 261, + "T_CHANGEMODE_CMD", 262, + "T_SLEEP_CMD", 263, + "T_WAIT_CMD", 264, + "T_REPEAT_CMD", 265, + "T_EXCEP_CMD", 266, + "T_PRINT_CMD", 267, + "T_LOOKUP_CMD", 268, + "T_TERM", 269, + "T_READ", 270, + "T_IREAD", 271, + "T_UPGRADE", 272, + "T_WRITE", 273, + "T_IWRITE", 274, + "T_IDENT", 275, + "Q_STRING", 276, + "T_NUM", 277, + "-unknown-", -1 /* ends search */ +}; + +char * ace_cc_yyreds[] = { - ACE_CC_YYDEBUG_INDENT(ace_cc_yyindent); - printf(" .... look ahead at %s `%s'\n", - ace_cc_yytoken_string, - (0 == ace_cc_yytoken_num)? "\0": ACE_CC_YYDEBUG_LEXER_TEXT); + "-no such reduction-", + "start : /* empty */", + "start : cmd_list", + "cmd_list : cmd_list cmd", + "cmd_list : cmd", + "cmd : T_START_CMD config_file_name T_TERM", + "cmd : T_CREATE_CMD lock_set_name T_TERM", + "cmd : T_CREATE_CMD T_TERM", + "cmd : T_LOCK_CMD lock_set_name lock_mode T_TERM", + "cmd : T_LOCK_CMD lock_mode T_TERM", + "cmd : T_UNLOCK_CMD lock_set_name lock_mode T_TERM", + "cmd : T_UNLOCK_CMD lock_mode T_TERM", + "cmd : T_TRYLOCK_CMD lock_set_name lock_mode T_TERM", + "cmd : T_TRYLOCK_CMD lock_mode T_TERM", + "cmd : T_CHANGEMODE_CMD lock_set_name lock_mode lock_mode T_TERM", + "cmd : T_CHANGEMODE_CMD lock_mode lock_mode T_TERM", + "cmd : T_SLEEP_CMD T_NUM T_TERM", + "cmd : T_WAIT_CMD T_TERM", + "cmd : T_WAIT_CMD Q_STRING T_TERM", + "cmd : T_PRINT_CMD Q_STRING T_TERM", + "cmd : T_LOOKUP_CMD lock_set_name T_TERM", + "cmd : T_REPEAT_CMD T_NUM T_TERM", + "cmd : T_EXCEP_CMD exception_name T_TERM", + "config_file_name : T_IDENT", + "lock_set_name : T_IDENT", + "exception_name : T_IDENT", + "lock_mode : T_READ", + "lock_mode : T_IREAD", + "lock_mode : T_UPGRADE", + "lock_mode : T_WRITE", + "lock_mode : T_IWRITE", +}; +#endif /* ACE_CC_YYDEBUG */ +/* + * Copyright (c) 1993 by Sun Microsystems, Inc. + */ + +#pragma ident "@(#)yaccpar 6.15 97/12/08 SMI" + +/* +** Skeleton parser driver for yacc output +*/ + +/* +** yacc user known macros and defines +*/ +#define ACE_CC_YYERROR goto ace_cc_yyerrlab +#define ACE_CC_YYACCEPT return(0) +#define ACE_CC_YYABORT return(1) +#define ACE_CC_YYBACKUP( newtoken, newvalue )\ +{\ + if ( ace_cc_yychar >= 0 || ( ace_cc_yyr2[ ace_cc_yytmp ] >> 1 ) != 1 )\ + {\ + ace_cc_yyerror( "syntax error - cannot backup" );\ + goto ace_cc_yyerrlab;\ + }\ + ace_cc_yychar = newtoken;\ + ace_cc_yystate = *ace_cc_yyps;\ + ace_cc_yylval = newvalue;\ + goto ace_cc_yynewstate;\ } -#endif /* ACE_CC_YYDEBUG_LOOK_AHEAD */ -#ifndef ACE_CC_YYDEBUG_DISCARD_STATE -#ifdef __cplusplus -void ACE_CC_YYDEBUG_DISCARD_STATE(int /* ace_cc_yynew_state */, int ace_cc_yyindent) -#else -ACE_CC_YYDEBUG_DISCARD_STATE(ace_cc_yynew_state, ace_cc_yyindent) -int ace_cc_yynew_state; -int ace_cc_yyindent; +#define ACE_CC_YYRECOVERING() (!!ace_cc_yyerrflag) +#define ACE_CC_YYNEW(type) malloc(sizeof(type) * ace_cc_yynewmax) +#define ACE_CC_YYCOPY(to, from, type) \ + (type *) memcpy(to, (char *) from, ace_cc_yymaxdepth * sizeof (type)) +#define ACE_CC_YYENLARGE( from, type) \ + (type *) realloc((char *) from, ace_cc_yynewmax * sizeof(type)) +#ifndef ACE_CC_YYDEBUG +# define ACE_CC_YYDEBUG 1 /* make debugging available */ #endif -{ - if (0 < ace_cc_yyindent) - { /* draw the graphics for the reduction */ - ACE_CC_YYDEBUG_INDENT(ace_cc_yyindent-1); - printf("%s", ACE_CC_YYDEBUG_REDUCE_STRING); - putchar('+'); /* left rotated L would look nice */ - printf(" discarding state\n"); - ACE_CC_YYDEBUG_INDENT(ace_cc_yyindent-1); - putchar('|'); /* down arrow would look nice */ - putchar('\n'); - } - else - { - if (0 == ace_cc_yyindent) - printf("discarding state\n"); - else - printf("no more states to discard: parser will abort\n"); - } -} -#endif /* ACE_CC_YYDEBUG_DISCARD_STATE */ -#ifndef ACE_CC_YYDEBUG_DISCARD_TOKEN -#ifdef __cplusplus -void ACE_CC_YYDEBUG_DISCARD_TOKEN(int /* ace_cc_yynew_state */, - int /* ace_cc_yytoken_num */, - char *ace_cc_yytoken_string, - int ace_cc_yyindent) + +/* +** user known globals +*/ +int ace_cc_yydebug; /* set to 1 to get debugging */ + +/* +** driver internal defines +*/ +#define ACE_CC_YYFLAG (-10000000) + +/* +** global variables used by the parser +*/ +ACE_CC_YYSTYPE *ace_cc_yypv; /* top of value stack */ +int *ace_cc_yyps; /* top of state stack */ + +int ace_cc_yystate; /* current state */ +int ace_cc_yytmp; /* extra var (lasts between blocks) */ + +int ace_cc_yynerrs; /* number of errors */ +int ace_cc_yyerrflag; /* error recovery flag */ +int ace_cc_yychar; /* current input token number */ + + + +#ifdef ACE_CC_YYNMBCHARS +#define ACE_CC_YYLEX() ace_cc_yycvtok(ace_cc_yylex()) +/* +** ace_cc_yycvtok - return a token if i is a wchar_t value that exceeds 255. +** If i<255, i itself is the token. If i>255 but the neither +** of the 30th or 31st bit is on, i is already a token. +*/ +#if defined(__STDC__) || defined(__cplusplus) +int ace_cc_yycvtok(int i) #else -ACE_CC_YYDEBUG_DISCARD_TOKEN(ace_cc_yynew_state, ace_cc_yytoken_num, ace_cc_yytoken_string, ace_cc_yyindent) -int ace_cc_yynew_state; -int ace_cc_yytoken_num; -char * ace_cc_yytoken_string; -int ace_cc_yyindent; +int ace_cc_yycvtok(i) int i; #endif { - ACE_CC_YYDEBUG_INDENT(ace_cc_yyindent); - printf("discarding token %s\n", ace_cc_yytoken_string); + int first = 0; + int last = ACE_CC_YYNMBCHARS - 1; + int mid; + wchar_t j; + + if(i&0x60000000){/*Must convert to a token. */ + if( ace_cc_yymbchars[last].character < i ){ + return i;/*Giving up*/ + } + while ((last>=first)&&(first>=0)) {/*Binary search loop*/ + mid = (first+last)/2; + j = ace_cc_yymbchars[mid].character; + if( j==i ){/*Found*/ + return ace_cc_yymbchars[mid].tvalue; + }else if( j<i ){ + first = mid + 1; + }else{ + last = mid -1; + } + } + /*No entry in the table.*/ + return i;/* Giving up.*/ + }else{/* i is already a token. */ + return i; + } } -#endif /* ACE_CC_YYDEBUG_DISCARD_TOKEN */ -#ifndef ACE_CC_YYDEBUG_SHIFT_ERROR_LEXEME -#ifdef __cplusplus -void ACE_CC_YYDEBUG_SHIFT_ERROR_LEXEME(int /* ace_cc_yyold_state */, - int /* ace_cc_yynew_state */, - int ace_cc_yyindent) +#else/*!ACE_CC_YYNMBCHARS*/ +#define ACE_CC_YYLEX() ace_cc_yylex() +#endif/*!ACE_CC_YYNMBCHARS*/ + +/* +** ace_cc_yyparse - return 0 if worked, 1 if syntax error not recovered from +*/ +#if defined(__STDC__) || defined(__cplusplus) +int ace_cc_yyparse(void) #else -ACE_CC_YYDEBUG_SHIFT_ERROR_LEXEME(ace_cc_yyold_state, ace_cc_yynew_state, ace_cc_yyindent) -int ace_cc_yyold_state; -int ace_cc_yynew_state; -int ace_cc_yyindent; +int ace_cc_yyparse() #endif { - ACE_CC_YYDEBUG_INDENT(ace_cc_yyindent); - printf("error\n"); -} -#endif /* ACE_CC_YYDEBUG_SHIFT_ERROR_LEXEME */ -#endif /* ACE_CC_YYDEBUG */ -#ifdef __cplusplus -extern "C" { extern char *ace_foo(const char *); } -#endif -int -ace_cc_yyparse() -{ - register int ace_cc_yym, ace_cc_yyn, ace_cc_yystate; -#if ACE_CC_YYDEBUG - register char *ace_cc_yys; -#ifndef __cplusplus - extern char *ace_foo(); + register ACE_CC_YYSTYPE *ace_cc_yypvt = 0; /* top of value stack for $vars */ + +#if defined(__cplusplus) || defined(lint) +/* + hacks to please C++ and lint - goto's inside + switch should never be executed +*/ + static int __yaccpar_lint_hack__ = 0; + switch (__yaccpar_lint_hack__) + { + case 1: goto ace_cc_yyerrlab; + case 2: goto ace_cc_yynewstate; + } #endif - if (ace_cc_yys = ACE_OS::getenv("ACE_CC_YYDEBUG")) - { - ace_cc_yyn = *ace_cc_yys; - if (ace_cc_yyn >= '0' && ace_cc_yyn <= '9') - ace_cc_yydebug = ace_cc_yyn - '0'; - } + /* + ** Initialize externals - ace_cc_yyparse may be called more than once + */ + ace_cc_yypv = &ace_cc_yyv[-1]; + ace_cc_yyps = &ace_cc_yys[-1]; + ace_cc_yystate = 0; + ace_cc_yytmp = 0; + ace_cc_yynerrs = 0; + ace_cc_yyerrflag = 0; + ace_cc_yychar = -1; + +#if ACE_CC_YYMAXDEPTH <= 0 + if (ace_cc_yymaxdepth <= 0) + { + if ((ace_cc_yymaxdepth = ACE_CC_YYEXPAND(0)) <= 0) + { + ace_cc_yyerror("yacc initialization error"); + ACE_CC_YYABORT; + } + } #endif - ace_cc_yynerrs = 0; - ace_cc_yyerrflag = 0; - ace_cc_yychar = (-1); + { + register ACE_CC_YYSTYPE *ace_cc_yy_pv; /* top of value stack */ + register int *ace_cc_yy_ps; /* top of state stack */ + register int ace_cc_yy_state; /* current state */ + register int ace_cc_yy_n; /* internal state number info */ + goto ace_cc_yystack; /* moved from 6 lines above to here to please C++ */ + + /* + ** get globals into registers. + ** branch to here only if ACE_CC_YYBACKUP was called. + */ + ace_cc_yynewstate: + ace_cc_yy_pv = ace_cc_yypv; + ace_cc_yy_ps = ace_cc_yyps; + ace_cc_yy_state = ace_cc_yystate; + goto ace_cc_yy_newstate; - ace_cc_yyssp = ace_cc_yyss; - ace_cc_yyvsp = ace_cc_yyvs; - *ace_cc_yyssp = ace_cc_yystate = 0; + /* + ** get globals into registers. + ** either we just started, or we just finished a reduction + */ + ace_cc_yystack: + ace_cc_yy_pv = ace_cc_yypv; + ace_cc_yy_ps = ace_cc_yyps; + ace_cc_yy_state = ace_cc_yystate; -ace_cc_yyloop: - if ((ace_cc_yyn = ace_cc_yydefred[ace_cc_yystate])) goto ace_cc_yyreduce; - if (ace_cc_yychar < 0) - { - if ((ace_cc_yychar = ace_cc_yylex()) < 0) ace_cc_yychar = 0; + /* + ** top of for (;;) loop while no reductions done + */ + ace_cc_yy_stack: + /* + ** put a state and value onto the stacks + */ #if ACE_CC_YYDEBUG - if (ace_cc_yydebug) - { - ace_cc_yys = 0; - if (ace_cc_yychar <= ACE_CC_YYMAXTOKEN) ace_cc_yys = ace_cc_yyname[ace_cc_yychar]; - if (!ace_cc_yys) ace_cc_yys = "illegal-symbol"; - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: state %d, reading %d (%s)\n", ace_cc_yystate, - ace_cc_yychar, ace_cc_yys); - else - ACE_CC_YYDEBUG_LOOK_AHEAD(ace_cc_yystate, ace_cc_yychar, ace_cc_yys, ace_cc_yyssp-ace_cc_yyss); - } + /* + ** if debugging, look up token value in list of value vs. + ** name pairs. 0 and negative (-1) are special values. + ** Note: linear search is used since time is not a real + ** consideration while debugging. + */ + if ( ace_cc_yydebug ) + { + register int ace_cc_yy_i; + + printf( "State %d, token ", ace_cc_yy_state ); + if ( ace_cc_yychar == 0 ) + printf( "end-of-file\n" ); + else if ( ace_cc_yychar < 0 ) + printf( "-none-\n" ); + else + { + for ( ace_cc_yy_i = 0; ace_cc_yytoks[ace_cc_yy_i].t_val >= 0; + ace_cc_yy_i++ ) + { + if ( ace_cc_yytoks[ace_cc_yy_i].t_val == ace_cc_yychar ) + break; + } + printf( "%s\n", ace_cc_yytoks[ace_cc_yy_i].t_name ); + } + } +#endif /* ACE_CC_YYDEBUG */ + if ( ++ace_cc_yy_ps >= &ace_cc_yys[ ace_cc_yymaxdepth ] ) /* room on stack? */ + { + /* + ** reallocate and recover. Note that pointers + ** have to be reset, or bad things will happen + */ + long ace_cc_yyps_index = (ace_cc_yy_ps - ace_cc_yys); + long ace_cc_yypv_index = (ace_cc_yy_pv - ace_cc_yyv); + long ace_cc_yypvt_index = (ace_cc_yypvt - ace_cc_yyv); + int ace_cc_yynewmax; +#ifdef ACE_CC_YYEXPAND + ace_cc_yynewmax = ACE_CC_YYEXPAND(ace_cc_yymaxdepth); +#else + ace_cc_yynewmax = 2 * ace_cc_yymaxdepth; /* double table size */ + if (ace_cc_yymaxdepth == ACE_CC_YYMAXDEPTH) /* first time growth */ + { + char *newace_cc_yys = (char *)ACE_CC_YYNEW(int); + char *newace_cc_yyv = (char *)ACE_CC_YYNEW(ACE_CC_YYSTYPE); + if (newace_cc_yys != 0 && newace_cc_yyv != 0) + { + ace_cc_yys = ACE_CC_YYCOPY(newace_cc_yys, ace_cc_yys, int); + ace_cc_yyv = ACE_CC_YYCOPY(newace_cc_yyv, ace_cc_yyv, ACE_CC_YYSTYPE); + } + else + ace_cc_yynewmax = 0; /* failed */ + } + else /* not first time */ + { + ace_cc_yys = ACE_CC_YYENLARGE(ace_cc_yys, int); + ace_cc_yyv = ACE_CC_YYENLARGE(ace_cc_yyv, ACE_CC_YYSTYPE); + if (ace_cc_yys == 0 || ace_cc_yyv == 0) + ace_cc_yynewmax = 0; /* failed */ + } #endif - } - if ((ace_cc_yyn = ace_cc_yysindex[ace_cc_yystate]) && (ace_cc_yyn += ace_cc_yychar) >= 0 && - ace_cc_yyn <= ACE_CC_YYTABLESIZE && ace_cc_yycheck[ace_cc_yyn] == ace_cc_yychar) - { + if (ace_cc_yynewmax <= ace_cc_yymaxdepth) /* tables not expanded */ + { + ace_cc_yyerror( "yacc stack overflow" ); + ACE_CC_YYABORT; + } + ace_cc_yymaxdepth = ace_cc_yynewmax; + + ace_cc_yy_ps = ace_cc_yys + ace_cc_yyps_index; + ace_cc_yy_pv = ace_cc_yyv + ace_cc_yypv_index; + ace_cc_yypvt = ace_cc_yyv + ace_cc_yypvt_index; + } + *ace_cc_yy_ps = ace_cc_yy_state; + *++ace_cc_yy_pv = ace_cc_yyval; + + /* + ** we have a new state - find out what to do + */ + ace_cc_yy_newstate: + if ( ( ace_cc_yy_n = ace_cc_yypact[ ace_cc_yy_state ] ) <= ACE_CC_YYFLAG ) + goto ace_cc_yydefault; /* simple state */ #if ACE_CC_YYDEBUG - if (ace_cc_yydebug) - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: state %d, shifting to state %d\n", - ace_cc_yystate, ace_cc_yytable[ace_cc_yyn]); - else - ACE_CC_YYDEBUG_SHIFT_LEXEME(ace_cc_yystate, ace_cc_yytable[ace_cc_yyn], ace_cc_yys, ace_cc_yyssp-ace_cc_yyss); -#endif - if (ace_cc_yyssp >= ace_cc_yyss + ace_cc_yystacksize - 1) - { - goto ace_cc_yyoverflow; - } - *++ace_cc_yyssp = ace_cc_yystate = ace_cc_yytable[ace_cc_yyn]; - *++ace_cc_yyvsp = ace_cc_yylval; - ace_cc_yychar = (-1); - if (ace_cc_yyerrflag > 0) --ace_cc_yyerrflag; - goto ace_cc_yyloop; - } - if ((ace_cc_yyn = ace_cc_yyrindex[ace_cc_yystate]) && (ace_cc_yyn += ace_cc_yychar) >= 0 && - ace_cc_yyn <= ACE_CC_YYTABLESIZE && ace_cc_yycheck[ace_cc_yyn] == ace_cc_yychar) - { - ace_cc_yyn = ace_cc_yytable[ace_cc_yyn]; - goto ace_cc_yyreduce; - } - if (ace_cc_yyerrflag) goto ace_cc_yyinrecovery; -#ifdef lint - goto ace_cc_yynewerror; + /* + ** if debugging, need to mark whether new token grabbed + */ + ace_cc_yytmp = ace_cc_yychar < 0; #endif + if ( ( ace_cc_yychar < 0 ) && ( ( ace_cc_yychar = ACE_CC_YYLEX() ) < 0 ) ) + ace_cc_yychar = 0; /* reached EOF */ +#if ACE_CC_YYDEBUG + if ( ace_cc_yydebug && ace_cc_yytmp ) + { + register int ace_cc_yy_i; - ace_cc_yyerror("syntax error"); -#ifdef lint - goto ace_cc_yyerrlab; -#endif + printf( "Received token " ); + if ( ace_cc_yychar == 0 ) + printf( "end-of-file\n" ); + else if ( ace_cc_yychar < 0 ) + printf( "-none-\n" ); + else + { + for ( ace_cc_yy_i = 0; ace_cc_yytoks[ace_cc_yy_i].t_val >= 0; + ace_cc_yy_i++ ) + { + if ( ace_cc_yytoks[ace_cc_yy_i].t_val == ace_cc_yychar ) + break; + } + printf( "%s\n", ace_cc_yytoks[ace_cc_yy_i].t_name ); + } + } +#endif /* ACE_CC_YYDEBUG */ + if ( ( ( ace_cc_yy_n += ace_cc_yychar ) < 0 ) || ( ace_cc_yy_n >= ACE_CC_YYLAST ) ) + goto ace_cc_yydefault; + if ( ace_cc_yychk[ ace_cc_yy_n = ace_cc_yyact[ ace_cc_yy_n ] ] == ace_cc_yychar ) /*valid shift*/ + { + ace_cc_yychar = -1; + ace_cc_yyval = ace_cc_yylval; + ace_cc_yy_state = ace_cc_yy_n; + if ( ace_cc_yyerrflag > 0 ) + ace_cc_yyerrflag--; + goto ace_cc_yy_stack; + } - ++ace_cc_yynerrs; -ace_cc_yyinrecovery: - if (ace_cc_yyerrflag < 3) - { - ace_cc_yyerrflag = 3; - for (;;) - { - if ((ace_cc_yyn = ace_cc_yysindex[*ace_cc_yyssp]) && (ace_cc_yyn += ACE_CC_YYERRCODE) >= 0 && - ace_cc_yyn <= ACE_CC_YYTABLESIZE && ace_cc_yycheck[ace_cc_yyn] == ACE_CC_YYERRCODE) - { + ace_cc_yydefault: + if ( ( ace_cc_yy_n = ace_cc_yydef[ ace_cc_yy_state ] ) == -2 ) + { #if ACE_CC_YYDEBUG - if (ace_cc_yydebug) - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: state %d, error recovery shifting\ - to state %d\n", *ace_cc_yyssp, ace_cc_yytable[ace_cc_yyn]); - else - ACE_CC_YYDEBUG_SHIFT_ERROR_LEXEME(*ace_cc_yyssp, ace_cc_yytable[ace_cc_yyn], ace_cc_yyssp-ace_cc_yyss); + ace_cc_yytmp = ace_cc_yychar < 0; #endif - if (ace_cc_yyssp >= ace_cc_yyss + ace_cc_yystacksize - 1) - { - goto ace_cc_yyoverflow; - } - *++ace_cc_yyssp = ace_cc_yystate = ace_cc_yytable[ace_cc_yyn]; - *++ace_cc_yyvsp = ace_cc_yylval; - goto ace_cc_yyloop; - } - else - { + if ( ( ace_cc_yychar < 0 ) && ( ( ace_cc_yychar = ACE_CC_YYLEX() ) < 0 ) ) + ace_cc_yychar = 0; /* reached EOF */ #if ACE_CC_YYDEBUG - if (ace_cc_yydebug) - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: error recovery discarding state %d\ -", - *ace_cc_yyssp); - else - ACE_CC_YYDEBUG_DISCARD_STATE(*ace_cc_yyssp, ace_cc_yyssp-ace_cc_yyss-1); -#endif - if (ace_cc_yyssp <= ace_cc_yyss) goto ace_cc_yyabort; - --ace_cc_yyssp; - --ace_cc_yyvsp; - } - } - } - else - { - if (ace_cc_yychar == 0) goto ace_cc_yyabort; + if ( ace_cc_yydebug && ace_cc_yytmp ) + { + register int ace_cc_yy_i; + + printf( "Received token " ); + if ( ace_cc_yychar == 0 ) + printf( "end-of-file\n" ); + else if ( ace_cc_yychar < 0 ) + printf( "-none-\n" ); + else + { + for ( ace_cc_yy_i = 0; + ace_cc_yytoks[ace_cc_yy_i].t_val >= 0; + ace_cc_yy_i++ ) + { + if ( ace_cc_yytoks[ace_cc_yy_i].t_val + == ace_cc_yychar ) + { + break; + } + } + printf( "%s\n", ace_cc_yytoks[ace_cc_yy_i].t_name ); + } + } +#endif /* ACE_CC_YYDEBUG */ + /* + ** look through exception table + */ + { + register const int *ace_cc_yyxi = ace_cc_yyexca; + + while ( ( *ace_cc_yyxi != -1 ) || + ( ace_cc_yyxi[1] != ace_cc_yy_state ) ) + { + ace_cc_yyxi += 2; + } + while ( ( *(ace_cc_yyxi += 2) >= 0 ) && + ( *ace_cc_yyxi != ace_cc_yychar ) ) + ; + if ( ( ace_cc_yy_n = ace_cc_yyxi[1] ) < 0 ) + ACE_CC_YYACCEPT; + } + } + + /* + ** check for syntax error + */ + if ( ace_cc_yy_n == 0 ) /* have an error */ + { + /* no worry about speed here! */ + switch ( ace_cc_yyerrflag ) + { + case 0: /* new error */ + ace_cc_yyerror( "syntax error" ); + goto skip_init; + ace_cc_yyerrlab: + /* + ** get globals into registers. + ** we have a user generated syntax type error + */ + ace_cc_yy_pv = ace_cc_yypv; + ace_cc_yy_ps = ace_cc_yyps; + ace_cc_yy_state = ace_cc_yystate; + skip_init: + ace_cc_yynerrs++; + /* FALLTHRU */ + case 1: + case 2: /* incompletely recovered error */ + /* try again... */ + ace_cc_yyerrflag = 3; + /* + ** find state where "error" is a legal + ** shift action + */ + while ( ace_cc_yy_ps >= ace_cc_yys ) + { + ace_cc_yy_n = ace_cc_yypact[ *ace_cc_yy_ps ] + ACE_CC_YYERRCODE; + if ( ace_cc_yy_n >= 0 && ace_cc_yy_n < ACE_CC_YYLAST && + ace_cc_yychk[ace_cc_yyact[ace_cc_yy_n]] == ACE_CC_YYERRCODE) { + /* + ** simulate shift of "error" + */ + ace_cc_yy_state = ace_cc_yyact[ ace_cc_yy_n ]; + goto ace_cc_yy_stack; + } + /* + ** current state has no shift on + ** "error", pop stack + */ #if ACE_CC_YYDEBUG - if (ace_cc_yydebug) - { - ace_cc_yys = 0; - if (ace_cc_yychar <= ACE_CC_YYMAXTOKEN) ace_cc_yys = ace_cc_yyname[ace_cc_yychar]; - if (!ace_cc_yys) ace_cc_yys = "illegal-symbol"; - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: state %d, error recovery discards token %d (%s)\n", - ace_cc_yystate, ace_cc_yychar, ace_cc_yys); - else - ACE_CC_YYDEBUG_DISCARD_TOKEN(ace_cc_yystate, ace_cc_yychar, ace_cc_yys, ace_cc_yyssp-ace_cc_yyss); - } +# define _POP_ "Error recovery pops state %d, uncovers state %d\n" + if ( ace_cc_yydebug ) + printf( _POP_, *ace_cc_yy_ps, + ace_cc_yy_ps[-1] ); +# undef _POP_ #endif - ace_cc_yychar = (-1); - goto ace_cc_yyloop; - } -ace_cc_yyreduce: - ace_cc_yym = ace_cc_yylen[ace_cc_yyn]; - ace_cc_yyval = ace_cc_yyvsp[1-ace_cc_yym]; + ace_cc_yy_ps--; + ace_cc_yy_pv--; + } + /* + ** there is no state on stack with "error" as + ** a valid shift. give up. + */ + ACE_CC_YYABORT; + case 3: /* no shift yet; eat a token */ +#if ACE_CC_YYDEBUG + /* + ** if debugging, look up token in list of + ** pairs. 0 and negative shouldn't occur, + ** but since timing doesn't matter when + ** debugging, it doesn't hurt to leave the + ** tests here. + */ + if ( ace_cc_yydebug ) + { + register int ace_cc_yy_i; + + printf( "Error recovery discards " ); + if ( ace_cc_yychar == 0 ) + printf( "token end-of-file\n" ); + else if ( ace_cc_yychar < 0 ) + printf( "token -none-\n" ); + else + { + for ( ace_cc_yy_i = 0; + ace_cc_yytoks[ace_cc_yy_i].t_val >= 0; + ace_cc_yy_i++ ) + { + if ( ace_cc_yytoks[ace_cc_yy_i].t_val + == ace_cc_yychar ) + { + break; + } + } + printf( "token %s\n", + ace_cc_yytoks[ace_cc_yy_i].t_name ); + } + } +#endif /* ACE_CC_YYDEBUG */ + if ( ace_cc_yychar == 0 ) /* reached EOF. quit */ + ACE_CC_YYABORT; + ace_cc_yychar = -1; + goto ace_cc_yy_newstate; + } + }/* end if ( ace_cc_yy_n == 0 ) */ + /* + ** reduction by production ace_cc_yy_n + ** put stack tops, etc. so things right after switch + */ #if ACE_CC_YYDEBUG - if (ace_cc_yydebug) - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: state %d, reducing by rule %d (%s)\n", - ace_cc_yystate, ace_cc_yyn, ace_cc_yyrule[ace_cc_yyn]); - else - ACE_CC_YYDEBUG_REDUCE(ace_cc_yystate, ace_cc_yyn, ace_cc_yyrule[ace_cc_yyn], ace_cc_yyssp-ace_cc_yyss-ace_cc_yym, ace_cc_yym); + /* + ** if debugging, print the string that is the user's + ** specification of the reduction which is just about + ** to be done. + */ + if ( ace_cc_yydebug ) + printf( "Reduce by (%d) \"%s\"\n", + ace_cc_yy_n, ace_cc_yyreds[ ace_cc_yy_n ] ); #endif - switch (ace_cc_yyn) - { -case 2: -#line 52 "CC_command.y" -{ cmdlist->add(new CC_Sleep_Cmd(0)); + ace_cc_yytmp = ace_cc_yy_n; /* value to switch over */ + ace_cc_yypvt = ace_cc_yy_pv; /* $vars top of value stack */ + /* + ** Look in goto table for next state + ** Sorry about using ace_cc_yy_state here as temporary + ** register variable, but why not, if it works... + ** If ace_cc_yyr2[ ace_cc_yy_n ] doesn't have the low order bit + ** set, then there is no action to be done for + ** this reduction. So, no saving & unsaving of + ** registers done. The only difference between the + ** code just after the if and the body of the if is + ** the goto ace_cc_yy_stack in the body. This way the test + ** can be made before the choice of what to do is needed. + */ + { + /* length of production doubled with extra bit */ + register int ace_cc_yy_len = ace_cc_yyr2[ ace_cc_yy_n ]; + + if ( !( ace_cc_yy_len & 01 ) ) + { + ace_cc_yy_len >>= 1; + ace_cc_yyval = ( ace_cc_yy_pv -= ace_cc_yy_len )[1]; /* $$ = $1 */ + ace_cc_yy_state = ace_cc_yypgo[ ace_cc_yy_n = ace_cc_yyr1[ ace_cc_yy_n ] ] + + *( ace_cc_yy_ps -= ace_cc_yy_len ) + 1; + if ( ace_cc_yy_state >= ACE_CC_YYLAST || + ace_cc_yychk[ ace_cc_yy_state = + ace_cc_yyact[ ace_cc_yy_state ] ] != -ace_cc_yy_n ) + { + ace_cc_yy_state = ace_cc_yyact[ ace_cc_yypgo[ ace_cc_yy_n ] ]; + } + goto ace_cc_yy_stack; + } + ace_cc_yy_len >>= 1; + ace_cc_yyval = ( ace_cc_yy_pv -= ace_cc_yy_len )[1]; /* $$ = $1 */ + ace_cc_yy_state = ace_cc_yypgo[ ace_cc_yy_n = ace_cc_yyr1[ ace_cc_yy_n ] ] + + *( ace_cc_yy_ps -= ace_cc_yy_len ) + 1; + if ( ace_cc_yy_state >= ACE_CC_YYLAST || + ace_cc_yychk[ ace_cc_yy_state = ace_cc_yyact[ ace_cc_yy_state ] ] != -ace_cc_yy_n ) + { + ace_cc_yy_state = ace_cc_yyact[ ace_cc_yypgo[ ace_cc_yy_n ] ]; + } + } + /* save until reenter driver code */ + ace_cc_yystate = ace_cc_yy_state; + ace_cc_yyps = ace_cc_yy_ps; + ace_cc_yypv = ace_cc_yy_pv; + } + /* + ** code supplied by user is placed in this switch + */ + switch( ace_cc_yytmp ) + { + +case 2:{ cmdlist->add(new CC_Sleep_Cmd(0)); /* dummy to check exeption in the last command */ - if(cmdlist->execute()!=0) /*CC_FAIL*/ + if(cmdlist->execute()!=0) //CC_FAIL { printf(" ** Test succeded!!\n"); } else - { printf(" ** Test FAILED!!\n"); } } -break; -case 3: -#line 60 "CC_command.y" -{ cmdlist->add(ace_cc_yyvsp[0].command); } -break; -case 4: -#line 61 "CC_command.y" -{ cmdlist->add(ace_cc_yyvsp[0].command); } -break; -case 5: -#line 65 "CC_command.y" -{ ace_cc_yyval.command = new CC_Start_Cmd(ace_cc_yyvsp[-1].id); } -break; -case 6: -#line 67 "CC_command.y" -{ ace_cc_yyval.command = new CC_CreateLockSet_Cmd(ace_cc_yyvsp[-1].id); } -break; -case 7: -#line 69 "CC_command.y" -{ ace_cc_yyval.command = new CC_CreateLockSet_Cmd(""); } -break; -case 8: -#line 71 "CC_command.y" -{ ace_cc_yyval.command = new CC_Lock_Cmd(ace_cc_yyvsp[-2].id, ace_cc_yyvsp[-1].lock_mode); } -break; -case 9: -#line 73 "CC_command.y" -{ ace_cc_yyval.command = new CC_Lock_Cmd("", ace_cc_yyvsp[-1].lock_mode); } -break; -case 10: -#line 75 "CC_command.y" -{ ace_cc_yyval.command = new CC_UnLock_Cmd(ace_cc_yyvsp[-2].id, ace_cc_yyvsp[-1].lock_mode); } -break; -case 11: -#line 77 "CC_command.y" -{ ace_cc_yyval.command = new CC_UnLock_Cmd("", ace_cc_yyvsp[-1].lock_mode); } -break; -case 12: -#line 79 "CC_command.y" -{ ace_cc_yyval.command = new CC_TryLock_Cmd(ace_cc_yyvsp[-2].id, ace_cc_yyvsp[-1].lock_mode); } -break; -case 13: -#line 81 "CC_command.y" -{ ace_cc_yyval.command = new CC_TryLock_Cmd("", ace_cc_yyvsp[-1].lock_mode); } -break; -case 14: -#line 83 "CC_command.y" -{ ace_cc_yyval.command = new CC_ChangeMode_Cmd(ace_cc_yyvsp[-3].id, ace_cc_yyvsp[-2].lock_mode, ace_cc_yyvsp[-1].lock_mode); } -break; -case 15: -#line 85 "CC_command.y" -{ ace_cc_yyval.command = new CC_ChangeMode_Cmd("", ace_cc_yyvsp[-2].lock_mode, ace_cc_yyvsp[-1].lock_mode); } -break; -case 16: -#line 87 "CC_command.y" -{ ace_cc_yyval.command = new CC_Sleep_Cmd(ace_cc_yyvsp[-1].num); } -break; -case 17: -#line 89 "CC_command.y" -{ ace_cc_yyval.command = new CC_Wait_Cmd(""); } -break; -case 18: -#line 91 "CC_command.y" -{ ace_cc_yyval.command = new CC_Wait_Cmd(ace_cc_yyvsp[-1].id); } -break; -case 19: -#line 93 "CC_command.y" -{ ace_cc_yyval.command = new CC_Print_Cmd(ace_cc_yyvsp[-1].id); } -break; -case 20: -#line 95 "CC_command.y" -{ ace_cc_yyval.command = new CC_Lookup_Cmd(ace_cc_yyvsp[-1].id); } -break; -case 21: -#line 97 "CC_command.y" -{ cmdlist->setrepeat(ace_cc_yyvsp[-1].num); - ace_cc_yyval.command = new CC_Dummy_Cmd();} -break; -case 22: -#line 100 "CC_command.y" -{ ace_cc_yyval.command = new CC_Excep_Cmd(ace_cc_yyvsp[-1].id); } -break; -case 23: -#line 103 "CC_command.y" -{ace_cc_yyval.id = ace_cc_yyvsp[0].id; } -break; -case 24: -#line 105 "CC_command.y" -{ace_cc_yyval.id = ace_cc_yyvsp[0].id; } -break; -case 25: -#line 107 "CC_command.y" -{ace_cc_yyval.id = ace_cc_yyvsp[0].id; } -break; -case 26: -#line 109 "CC_command.y" -{ ace_cc_yyval.lock_mode = CosConcurrencyControl::read; } -break; -case 27: -#line 110 "CC_command.y" -{ ace_cc_yyval.lock_mode = CosConcurrencyControl::intention_read; } -break; -case 28: -#line 111 "CC_command.y" -{ ace_cc_yyval.lock_mode = CosConcurrencyControl::upgrade; } -break; -case 29: -#line 112 "CC_command.y" -{ ace_cc_yyval.lock_mode = CosConcurrencyControl::write; } -break; -case 30: -#line 113 "CC_command.y" -{ ace_cc_yyval.lock_mode = CosConcurrencyControl::intention_write; } -break; -#line 622 "CC_command.tab.cpp" - } - ace_cc_yyssp -= ace_cc_yym; - ace_cc_yystate = *ace_cc_yyssp; - ace_cc_yyvsp -= ace_cc_yym; - ace_cc_yym = ace_cc_yylhs[ace_cc_yyn]; - if (ace_cc_yystate == 0 && ace_cc_yym == 0) - { -#ifdef ACE_CC_YYDEBUG - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: after reduction, shifting from state 0 to\ - state %d\n", ACE_CC_YYFINAL); -#endif - ace_cc_yystate = ACE_CC_YYFINAL; - *++ace_cc_yyssp = ACE_CC_YYFINAL; - *++ace_cc_yyvsp = ace_cc_yyval; - if (ace_cc_yychar < 0) - { - if ((ace_cc_yychar = ace_cc_yylex()) < 0) ace_cc_yychar = 0; -#if ACE_CC_YYDEBUG - if (ace_cc_yydebug) - { - ace_cc_yys = 0; - if (ace_cc_yychar <= ACE_CC_YYMAXTOKEN) ace_cc_yys = ace_cc_yyname[ace_cc_yychar]; - if (!ace_cc_yys) ace_cc_yys = "illegal-symbol"; - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: state %d, reading %d (%s)\n", - ACE_CC_YYFINAL, ace_cc_yychar, ace_cc_yys); - else - ACE_CC_YYDEBUG_LOOK_AHEAD(ACE_CC_YYFINAL, ace_cc_yychar, ace_cc_yys, ace_cc_yyssp-ace_cc_yyss); - } -#endif - } - if (ace_cc_yychar == 0) goto ace_cc_yyaccept; - goto ace_cc_yyloop; - } - if ((ace_cc_yyn = ace_cc_yygindex[ace_cc_yym]) && (ace_cc_yyn += ace_cc_yystate) >= 0 && - ace_cc_yyn <= ACE_CC_YYTABLESIZE && ace_cc_yycheck[ace_cc_yyn] == ace_cc_yystate) - ace_cc_yystate = ace_cc_yytable[ace_cc_yyn]; - else - ace_cc_yystate = ace_cc_yydgoto[ace_cc_yym]; -#ifdef ACE_CC_YYDEBUG - if (5 < ace_cc_yydebug) - printf("ace_cc_yydebug: after reduction, shifting from state %d \ -to state %d\n", *ace_cc_yyssp, ace_cc_yystate); -#endif - if (ace_cc_yyssp >= ace_cc_yyss + ace_cc_yystacksize - 1) - { - goto ace_cc_yyoverflow; - } - *++ace_cc_yyssp = ace_cc_yystate; - *++ace_cc_yyvsp = ace_cc_yyval; - goto ace_cc_yyloop; -ace_cc_yyoverflow: - ace_cc_yyerror("yacc stack overflow"); -ace_cc_yyabort: - return (1); -ace_cc_yyaccept: - return (0); + { printf(" ** Test FAILED!!\n"); } } break; +case 3:{ cmdlist->add(ace_cc_yypvt[-0].command); } break; +case 4:{ cmdlist->add(ace_cc_yypvt[-0].command); } break; +case 5:{ ace_cc_yyval.command = new CC_Start_Cmd(ace_cc_yypvt[-1].id); } break; +case 6:{ ace_cc_yyval.command = new CC_CreateLockSet_Cmd(ace_cc_yypvt[-1].id); } break; +case 7:{ ace_cc_yyval.command = new CC_CreateLockSet_Cmd(""); } break; +case 8:{ ace_cc_yyval.command = new CC_Lock_Cmd(ace_cc_yypvt[-2].id, ace_cc_yypvt[-1].lock_mode); } break; +case 9:{ ace_cc_yyval.command = new CC_Lock_Cmd("", ace_cc_yypvt[-1].lock_mode); } break; +case 10:{ ace_cc_yyval.command = new CC_UnLock_Cmd(ace_cc_yypvt[-2].id, ace_cc_yypvt[-1].lock_mode); } break; +case 11:{ ace_cc_yyval.command = new CC_UnLock_Cmd("", ace_cc_yypvt[-1].lock_mode); } break; +case 12:{ ace_cc_yyval.command = new CC_TryLock_Cmd(ace_cc_yypvt[-2].id, ace_cc_yypvt[-1].lock_mode); } break; +case 13:{ ace_cc_yyval.command = new CC_TryLock_Cmd("", ace_cc_yypvt[-1].lock_mode); } break; +case 14:{ ace_cc_yyval.command = new CC_ChangeMode_Cmd(ace_cc_yypvt[-3].id, ace_cc_yypvt[-2].lock_mode, ace_cc_yypvt[-1].lock_mode); } break; +case 15:{ ace_cc_yyval.command = new CC_ChangeMode_Cmd("", ace_cc_yypvt[-2].lock_mode, ace_cc_yypvt[-1].lock_mode); } break; +case 16:{ ace_cc_yyval.command = new CC_Sleep_Cmd(ace_cc_yypvt[-1].num); } break; +case 17:{ ace_cc_yyval.command = new CC_Wait_Cmd(""); } break; +case 18:{ ace_cc_yyval.command = new CC_Wait_Cmd(ace_cc_yypvt[-1].id); } break; +case 19:{ ace_cc_yyval.command = new CC_Print_Cmd(ace_cc_yypvt[-1].id); } break; +case 20:{ ace_cc_yyval.command = new CC_Lookup_Cmd(ace_cc_yypvt[-1].id); } break; +case 21:{ cmdlist->setrepeat(ace_cc_yypvt[-1].num); + ace_cc_yyval.command = new CC_Dummy_Cmd();} break; +case 22:{ ace_cc_yyval.command = new CC_Excep_Cmd(ace_cc_yypvt[-1].id); } break; +case 23:{ace_cc_yyval.id = ace_cc_yypvt[-0].id; } break; +case 24:{ace_cc_yyval.id = ace_cc_yypvt[-0].id; } break; +case 25:{ace_cc_yyval.id = ace_cc_yypvt[-0].id; } break; +case 26:{ ace_cc_yyval.lock_mode = CosConcurrencyControl::read; } break; +case 27:{ ace_cc_yyval.lock_mode = CosConcurrencyControl::intention_read; } break; +case 28:{ ace_cc_yyval.lock_mode = CosConcurrencyControl::upgrade; } break; +case 29:{ ace_cc_yyval.lock_mode = CosConcurrencyControl::write; } break; +case 30:{ ace_cc_yyval.lock_mode = CosConcurrencyControl::intention_write; } break; + } + goto ace_cc_yystack; /* reset registers in driver code */ } + diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff index 1106e37cff4..04e1ca0e7b2 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff @@ -2,24 +2,3 @@ +++ CC_command.tab.cpp Mon Aug 17 11:06:24 1998 @@ -1,3 +1,4 @@ +// $Id$ - #ifndef lint - char ace_cc_yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\ - Modified 5/2/90 by J. Roskind to support graphic debugging modes"; -@@ -367,7 +368,7 @@ - *ace_cc_yyssp = ace_cc_yystate = 0; - - ace_cc_yyloop: -- if (ace_cc_yyn = ace_cc_yydefred[ace_cc_yystate]) goto ace_cc_yyreduce; -+ if ((ace_cc_yyn = ace_cc_yydefred[ace_cc_yystate])) goto ace_cc_yyreduce; - if (ace_cc_yychar < 0) - { - if ((ace_cc_yychar = ace_cc_yylex()) < 0) ace_cc_yychar = 0; -@@ -421,7 +422,7 @@ - #ifdef lint - goto ace_cc_yyerrlab; - #endif --ace_cc_yyerrlab: -+ - ++ace_cc_yynerrs; - ace_cc_yyinrecovery: - if (ace_cc_yyerrflag < 3) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h index 31c03ff7ffc..045368d0674 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h @@ -1,29 +1,33 @@ // $Id$ -#define T_START_CMD 257 -#define T_CREATE_CMD 258 -#define T_LOCK_CMD 259 -#define T_UNLOCK_CMD 260 -#define T_TRYLOCK_CMD 261 -#define T_CHANGEMODE_CMD 262 -#define T_SLEEP_CMD 263 -#define T_WAIT_CMD 264 -#define T_REPEAT_CMD 265 -#define T_EXCEP_CMD 266 -#define T_PRINT_CMD 267 -#define T_LOOKUP_CMD 268 -#define T_TERM 269 -#define T_READ 270 -#define T_IREAD 271 -#define T_UPGRADE 272 -#define T_WRITE 273 -#define T_IWRITE 274 -#define T_IDENT 275 -#define Q_STRING 276 -#define T_NUM 277 -typedef union { +typedef union +#ifdef __cplusplus + ACE_CC_YYSTYPE +#endif + { CC_Command *command; CosConcurrencyControl::lock_mode lock_mode; char *id; int num; } ACE_CC_YYSTYPE; extern ACE_CC_YYSTYPE ace_cc_yylval; +# define T_START_CMD 257 +# define T_CREATE_CMD 258 +# define T_LOCK_CMD 259 +# define T_UNLOCK_CMD 260 +# define T_TRYLOCK_CMD 261 +# define T_CHANGEMODE_CMD 262 +# define T_SLEEP_CMD 263 +# define T_WAIT_CMD 264 +# define T_REPEAT_CMD 265 +# define T_EXCEP_CMD 266 +# define T_PRINT_CMD 267 +# define T_LOOKUP_CMD 268 +# define T_TERM 269 +# define T_READ 270 +# define T_IREAD 271 +# define T_UPGRADE 272 +# define T_WRITE 273 +# define T_IWRITE 274 +# define T_IDENT 275 +# define Q_STRING 276 +# define T_NUM 277 diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile index c74623a8b21..a55b051975f 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile +++ b/TAO/orbsvcs/tests/Concurrency/Makefile @@ -63,7 +63,7 @@ lex.CC_command.cpp: CC_command.l CC_command.tab.h .PHONY: lex.CC_command.cpp.target lex.CC_command.cpp.target: - $(LEX) -t -I CC_command.l > /tmp/$(USER).CC_L1 + $(LEX) -L -t -I CC_command.l > /tmp/$(USER).CC_L1 sed -e "s/unistd/stdio/g" \ -e "s/\\$$\(Header[^$$]*\) \\$$/\\1/" \ -e "s/yy/ace_cc_yy/g" \ @@ -87,7 +87,7 @@ CC_command.tab.cpp CC_command.tab.h: CC_command.y .PHONY: CC_command.tab CC_command.tab: CC_command.y - $(YACC) -d CC_command.y + $(YACC) -d -l CC_command.y sed -e "s/char \*getenv/char *ace_foo/g" \ -e "s/= getenv/= ACE_OS::getenv/g" \ -e "s/yynewerror://g" \ diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index 10caa1379d4..c81ff1ae2ea 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -439,7 +439,6 @@ static char *ace_cc_yy_last_accepting_cpos; #define ACE_CC_YY_MORE_ADJ 0 #define ACE_CC_YY_RESTORE_ACE_CC_YY_MORE_OFFSET char *ace_cc_yytext; -#line 1 "CC_command.l" #define INITIAL 0 /* $id$ * ============================================================================ @@ -461,7 +460,6 @@ char *ace_cc_yytext; #define ACE_CC_YY_NO_UNPUT 1 #define ACE_CC_YY_NO_INPUT 1 #define ACE_CC_YY_ALWAYS_INTERACTIVE 1 -#line 20 "CC_command.l" #include "CC_command.h" #include "CC_command.tab.h" #include "ace/ACE.h" @@ -621,7 +619,6 @@ ACE_CC_YY_DECL register char *ace_cc_yy_cp, *ace_cc_yy_bp; register int ace_cc_yy_act; -#line 28 "CC_command.l" @@ -711,132 +708,107 @@ do_action: /* This label is used only to access EOF actions. */ case 1: ACE_CC_YY_RULE_SETUP -#line 30 "CC_command.l" return T_TERM; /* ACE_CC_YY_BREAK */ case 2: ACE_CC_YY_RULE_SETUP -#line 31 "CC_command.l" return T_START_CMD; /* ACE_CC_YY_BREAK */ case 3: ACE_CC_YY_RULE_SETUP -#line 32 "CC_command.l" return T_CREATE_CMD; /* ACE_CC_YY_BREAK */ case 4: ACE_CC_YY_RULE_SETUP -#line 33 "CC_command.l" return T_LOCK_CMD; /* ACE_CC_YY_BREAK */ case 5: ACE_CC_YY_RULE_SETUP -#line 34 "CC_command.l" return T_UNLOCK_CMD; /* ACE_CC_YY_BREAK */ case 6: ACE_CC_YY_RULE_SETUP -#line 35 "CC_command.l" return T_TRYLOCK_CMD; /* ACE_CC_YY_BREAK */ case 7: ACE_CC_YY_RULE_SETUP -#line 36 "CC_command.l" return T_CHANGEMODE_CMD; /* ACE_CC_YY_BREAK */ case 8: ACE_CC_YY_RULE_SETUP -#line 37 "CC_command.l" return T_SLEEP_CMD; /* ACE_CC_YY_BREAK */ case 9: ACE_CC_YY_RULE_SETUP -#line 38 "CC_command.l" return T_WAIT_CMD; /* ACE_CC_YY_BREAK */ case 10: ACE_CC_YY_RULE_SETUP -#line 39 "CC_command.l" return T_PRINT_CMD; /* ACE_CC_YY_BREAK */ case 11: ACE_CC_YY_RULE_SETUP -#line 40 "CC_command.l" return T_REPEAT_CMD; /* ACE_CC_YY_BREAK */ case 12: ACE_CC_YY_RULE_SETUP -#line 41 "CC_command.l" return T_EXCEP_CMD; /* ACE_CC_YY_BREAK */ case 13: ACE_CC_YY_RULE_SETUP -#line 42 "CC_command.l" return T_LOOKUP_CMD; /* ACE_CC_YY_BREAK */ case 14: ACE_CC_YY_RULE_SETUP -#line 43 "CC_command.l" return T_READ; /* ACE_CC_YY_BREAK */ case 15: ACE_CC_YY_RULE_SETUP -#line 44 "CC_command.l" return T_IREAD; /* ACE_CC_YY_BREAK */ case 16: ACE_CC_YY_RULE_SETUP -#line 45 "CC_command.l" return T_UPGRADE; /* ACE_CC_YY_BREAK */ case 17: ACE_CC_YY_RULE_SETUP -#line 46 "CC_command.l" return T_WRITE; /* ACE_CC_YY_BREAK */ case 18: ACE_CC_YY_RULE_SETUP -#line 47 "CC_command.l" return T_IWRITE; /* ACE_CC_YY_BREAK */ case 19: ACE_CC_YY_RULE_SETUP -#line 48 "CC_command.l" { ace_cc_yylval.id = ACE_OS::strdup(&ace_cc_yytext[1]); ace_cc_yylval.id[ace_cc_yyleng-2]='\0'; return Q_STRING; } /* ACE_CC_YY_BREAK */ case 20: ACE_CC_YY_RULE_SETUP -#line 51 "CC_command.l" { ace_cc_yylval.num = atoi(ace_cc_yytext); return T_NUM; } /* ACE_CC_YY_BREAK */ case 21: ACE_CC_YY_RULE_SETUP -#line 52 "CC_command.l" { ace_cc_yylval.id = ACE_OS::strdup(ace_cc_yytext); return T_IDENT; } /* ACE_CC_YY_BREAK */ case 22: ACE_CC_YY_RULE_SETUP -#line 54 "CC_command.l" { } ACE_CC_YY_BREAK case 23: ACE_CC_YY_RULE_SETUP -#line 55 "CC_command.l" { } ACE_CC_YY_BREAK case 24: ACE_CC_YY_RULE_SETUP -#line 56 "CC_command.l" { line_no ++; ACE_OS::strcpy(line_buf, ace_cc_yytext+1); ace_cc_yyless(1); } ACE_CC_YY_BREAK case 25: ACE_CC_YY_RULE_SETUP -#line 59 "CC_command.l" ACE_CC_ECHO; ACE_CC_YY_BREAK case ACE_CC_YY_STATE_EOF(INITIAL): @@ -1733,4 +1705,3 @@ int main() return 0; } #endif -#line 59 "CC_command.l" diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff index 1ae48a74947..486f965868c 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff @@ -1,5 +1,5 @@ ---- lex.CC_command.cpp.orig Wed Apr 12 15:18:40 2000 -+++ lex.CC_command.cpp Wed Apr 12 15:30:33 2000 +--- lex.CC_command.cpp.orig Mon Nov 12 19:05:12 2001 ++++ lex.CC_command.cpp Mon Nov 12 19:14:49 2001 @@ -1,5 +1,5 @@ /* A lexical scanner generated by flex */ - @@ -10,7 +10,7 @@ @@ -220,10 +220,13 @@ static int ace_cc_yy_init = 1; /* whether we need to initialize */ static int ace_cc_yy_start = 0; /* start state number */ - + +#define ace_cc_yywrap() 1 /* Flag which is used to allow ace_cc_yywrap()'s to do buffer switches * instead of setting up a fresh ace_cc_yyin. A bit of a hack ... @@ -18,146 +18,119 @@ +#if (ace_cc_yywrap() != 1) static int ace_cc_yy_did_buffer_switch_on_eof; +#endif - + void ace_cc_yyrestart ACE_CC_YY_PROTO(( FILE *input_file )); - + @@ -262,7 +265,6 @@ #define ACE_CC_YY_AT_BOL() (ace_cc_yy_current_buffer->ace_cc_yy_at_bol) - - + + -#define ace_cc_yywrap() 1 #define ACE_CC_YY_SKIP_ACE_CC_YYWRAP typedef unsigned char ACE_CC_YY_CHAR; FILE *ace_cc_yyin = (FILE *) 0, *ace_cc_yyout = (FILE *) 0; -@@ -616,7 +618,7 @@ - ACE_CC_YY_DECL - { - register ace_cc_yy_state_type ace_cc_yy_current_state; -- register char *ace_cc_yy_cp = NULL, *ace_cc_yy_bp = NULL; -+ register char *ace_cc_yy_cp, *ace_cc_yy_bp; - register int ace_cc_yy_act; - - #line 28 "CC_command.l" -@@ -647,6 +649,8 @@ +@@ -644,6 +646,8 @@ ace_cc_yy_load_buffer_state(); } - + + ace_cc_yy_cp = ace_cc_yy_bp = 0; /* To avoid g++ warning about + possible uninitialized use. */ while ( 1 ) /* loops until end-of-file is reached */ { ace_cc_yy_cp = ace_cc_yy_c_buf_p; -@@ -709,110 +713,110 @@ +@@ -705,90 +709,90 @@ + case 1: ACE_CC_YY_RULE_SETUP - #line 30 "CC_command.l" return T_TERM; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 2: ACE_CC_YY_RULE_SETUP - #line 31 "CC_command.l" return T_START_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 3: ACE_CC_YY_RULE_SETUP - #line 32 "CC_command.l" return T_CREATE_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 4: ACE_CC_YY_RULE_SETUP - #line 33 "CC_command.l" return T_LOCK_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 5: ACE_CC_YY_RULE_SETUP - #line 34 "CC_command.l" return T_UNLOCK_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 6: ACE_CC_YY_RULE_SETUP - #line 35 "CC_command.l" return T_TRYLOCK_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 7: ACE_CC_YY_RULE_SETUP - #line 36 "CC_command.l" return T_CHANGEMODE_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 8: ACE_CC_YY_RULE_SETUP - #line 37 "CC_command.l" return T_SLEEP_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 9: ACE_CC_YY_RULE_SETUP - #line 38 "CC_command.l" return T_WAIT_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 10: ACE_CC_YY_RULE_SETUP - #line 39 "CC_command.l" return T_PRINT_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 11: ACE_CC_YY_RULE_SETUP - #line 40 "CC_command.l" return T_REPEAT_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 12: ACE_CC_YY_RULE_SETUP - #line 41 "CC_command.l" return T_EXCEP_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 13: ACE_CC_YY_RULE_SETUP - #line 42 "CC_command.l" return T_LOOKUP_CMD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 14: ACE_CC_YY_RULE_SETUP - #line 43 "CC_command.l" return T_READ; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 15: ACE_CC_YY_RULE_SETUP - #line 44 "CC_command.l" return T_IREAD; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 16: ACE_CC_YY_RULE_SETUP - #line 45 "CC_command.l" return T_UPGRADE; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 17: ACE_CC_YY_RULE_SETUP - #line 46 "CC_command.l" return T_WRITE; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 18: ACE_CC_YY_RULE_SETUP - #line 47 "CC_command.l" return T_IWRITE; - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 19: ACE_CC_YY_RULE_SETUP - #line 48 "CC_command.l" { ace_cc_yylval.id = ACE_OS::strdup(&ace_cc_yytext[1]); ace_cc_yylval.id[ace_cc_yyleng-2]='\0'; return Q_STRING; } @@ -165,32 +138,30 @@ + /* ACE_CC_YY_BREAK */ case 20: ACE_CC_YY_RULE_SETUP - #line 51 "CC_command.l" { ace_cc_yylval.num = atoi(ace_cc_yytext); return T_NUM; } - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 21: ACE_CC_YY_RULE_SETUP - #line 52 "CC_command.l" { ace_cc_yylval.id = ACE_OS::strdup(ace_cc_yytext); return T_IDENT; } - ACE_CC_YY_BREAK + /* ACE_CC_YY_BREAK */ case 22: ACE_CC_YY_RULE_SETUP - #line 54 "CC_command.l" -@@ -910,7 +914,9 @@ + { } +@@ -882,7 +886,9 @@ { case EOB_ACT_END_OF_FILE: { +#if (ace_cc_yywrap() != 1) ace_cc_yy_did_buffer_switch_on_eof = 0; +#endif - + if ( ace_cc_yywrap() ) { -@@ -931,8 +937,10 @@ - +@@ -903,8 +909,10 @@ + else { +#if (ace_cc_yywrap() != 1) @@ -200,19 +171,19 @@ } break; } -@@ -1216,7 +1224,7 @@ +@@ -1188,7 +1196,7 @@ } #endif /* ifndef ACE_CC_YY_NO_UNPUT */ - + - +#ifndef ACE_CC_YY_NO_INPUT #ifdef __cplusplus static int ace_cc_yyinput() #else -@@ -1265,13 +1273,13 @@ +@@ -1237,13 +1245,13 @@ if ( ace_cc_yywrap() ) return EOF; - + - if ( ! ace_cc_yy_did_buffer_switch_on_eof ) + /* if ( ! ace_cc_yy_did_buffer_switch_on_eof ) ACE_CC_YY_NEW_FILE; @@ -223,17 +194,17 @@ -#endif + #endif */ } - + case EOB_ACT_CONTINUE_SCAN: -@@ -1289,6 +1297,7 @@ - +@@ -1261,6 +1269,7 @@ + return c; } +#endif /* ! ACE_CC_YY_NO_INPUT */ - - + + #ifdef ACE_CC_YY_USE_PROTOS -@@ -1332,7 +1341,9 @@ +@@ -1304,7 +1313,9 @@ * is looked at is after ace_cc_yywrap() is called, so it's safe * to go ahead and always set it. */ @@ -241,3 +212,5 @@ ace_cc_yy_did_buffer_switch_on_eof = 1; +#endif } + + |