summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog-97b25
-rw-r--r--TAO/ChangeLog-98c10
-rw-r--r--TAO/TAO_IDL/be/be_interface.cpp2
-rw-r--r--TAO/TAO_IDL/fe/idl.ll44
-rw-r--r--TAO/TAO_IDL/fe/idl.yy7
-rw-r--r--TAO/TAO_IDL/fe/lex.yy.cpp530
-rw-r--r--TAO/TAO_IDL/fe/y.tab.cpp473
-rw-r--r--ace/CORBA_Handler.h10
-rw-r--r--ace/Filecache.cpp2
-rw-r--r--ace/OS.h12
10 files changed, 574 insertions, 541 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b
index 1a0dd149af0..eebe02c2157 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,19 @@
+Sun Oct 26 00:31:10 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/OS.h: Moved the CORBA portability macros from
+ CORBA_Handler.h into OS.h so they will be accessible from TAO.
+
+ * ace/Filecache.cpp (finish): Replaced filename_ with filename()
+ so that "const correctness" would work with template
+ specialization. Go figure!
+
+ * TAO/tests/IDL_Cubit/Makefile: Enhanced the "realclean" target to
+ remove the generated IDL stubs and skeletons.
+
+ * ace/OS.cpp (ace_sysconf_dump): Made a minor change to OS.cpp
+ to fix some typos. Thanks to Wei Chiang <chiang@tele.nokia.fi>
+ for reporting this.
+
Sun Oct 26 00:06:17 1997 <irfan@TWOSTEP>
* ace/Strategies_T.cpp (~ACE_Cached_Connect_Strategy): Must set
@@ -116,15 +132,6 @@ Sat Oct 25 17:41:57 1997 Sergio Flores <sergio@macarena.cs.wustl.edu>
Added "#pragma instantiate" for template instantiations on
platforms that use pragmas instead, like SGI.
-Sat Oct 25 15:18:34 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-
- * TAO/tests/IDL_Cubit/Makefile: Enhanced the "realclean" target to
- remove the generated IDL stubs and skeletons.
-
- * ace/OS.cpp (ace_sysconf_dump): Made a minor change to OS.cpp
- to fix some typos. Thanks to Wei Chiang <chiang@tele.nokia.fi>
- for reporting this.
-
Sat Oct 25 4:44:00 1997 Carlos O'Ryan <coryan@cs.wustl.edu>
* Today at 06:44 hours (Santiago, 04:44 St. Louis) Fernanda O'Ryan
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 963623244de..7bece645eec 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,9 @@
+Sun Oct 26 00:32:29 1997 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * TAO/TAO_IDL/fe/idl.ll: Reverted a change that Carlos had
+ overwritten. I guess he's not getting enough sleep these
+ days... ;-)
+
Sun Oct 26 00:31:38 1997 <irfan@TWOSTEP>
* tao/orb_core.i (hash_i): Redid the specialization in view of the
@@ -5,6 +11,10 @@ Sun Oct 26 00:31:38 1997 <irfan@TWOSTEP>
Sat Oct 25 18:14:14 1997 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+ * TAO_IDL/be/be_interface.cpp (be_interface): Worked around a
+ nasty MSVC++ compiler bug that doesn't like CORBA::Object
+ (object_ptr). So we use an existing ACE macro for this.
+
* TAO_IDL/be/be_interface.cpp (be_interface): Fixed yet another
round of uninitialized data members. It is clear that the
original authors of this code wouldn't pass my ugrad programming
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 119bee64268..dfb62e52e61 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -668,7 +668,7 @@ be_interface::gen_client_inline (void)
*ci << "ACE_INLINE" << nl;
*ci << this->name () << "::" << this->local_name () <<
" (STUB_Object *objref) // constructor" << nl;
- *ci << "\t: CORBA::Object (objref)" << nl;
+ *ci << "\t: ACE_CORBA_1 (Object) (objref)" << nl;
*ci << "{}" << nl << nl;
*ci << "ACE_INLINE" << nl;
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index d5811f537a6..4827553e84a 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -70,11 +70,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "idl.h"
#include "idl_extern.h"
-
#include "fe_private.h"
-
#include "y.tab.h"
-
#include <string.h>
static char idl_escape_reader(char *);
@@ -83,7 +80,7 @@ static long idl_atoi(char *, long);
static void idl_parse_line_and_file(char *);
static void idl_store_pragma(char *);
-#if 0
+#if 0 /* defined (HPUX) */
// HPUX has yytext typed to unsigned char *. We make sure here that
// we'll always use char * static char* __yytext = (char*) yytext;
// NOTE: This will not work under flex(1) were yytext is not a fixed
@@ -93,8 +90,10 @@ inline char *__yytext()
{
return (char *) yytext;
}
+#define ace_yytext __yytext()
+#else
+#define ace_yytext yytext
#endif /* 0 */
-
%}
%array
@@ -147,66 +146,69 @@ oneway return IDL_ONEWAY;
}
[a-zA-Z][a-zA-Z0-9_]* {
- char *z = (char *) malloc(strlen(yytext) + 1);
- strcpy(z, yytext);
+ char *z = (char *) malloc(strlen(ace_yytext) + 1);
+ strcpy(z, ace_yytext);
yylval.strval = z;
return IDENTIFIER;
}
-?[0-9]+"."[0-9]*([eE][+-]?[0-9]+)?[lLfF]? {
- yylval.dval = idl_atof(yytext);
+ yylval.dval = idl_atof(ace_yytext);
return IDL_FLOATING_PT_LITERAL;
}
-?[0-9]+[eE][+-]?[0-9]+[lLfF]? {
- yylval.dval = idl_atof(yytext);
+ yylval.dval = idl_atof(ace_yytext);
return IDL_FLOATING_PT_LITERAL;
}
-?[1-9][0-9]* {
- yylval.ival = idl_atoi(yytext, 10);
+ yylval.ival = idl_atoi(ace_yytext, 10);
return IDL_INTEGER_LITERAL;
}
-?0[xX][a-fA-F0-9]+ {
- yylval.ival = idl_atoi(yytext, 16);
+ yylval.ival = idl_atoi(ace_yytext, 16);
return IDL_INTEGER_LITERAL;
}
-?0[0-7]* {
- yylval.ival = idl_atoi(yytext, 8);
+ yylval.ival = idl_atoi(ace_yytext, 8);
return IDL_INTEGER_LITERAL;
}
"\""[^\"]*"\"" {
/* Skip the quotes */
- char *tmp = yytext;
+ char *tmp = ace_yytext;
tmp[strlen(tmp)-1] = '\0';
yylval.sval = new String(tmp + 1);
return IDL_STRING_LITERAL;
}
"'"."'" {
- yylval.cval = yytext() [1];
+ yylval.cval = ace_yytext [1];
return IDL_CHARACTER_LITERAL;
}
"'"\\([0-7]{1,3})"'" {
// octal character constant
- yylval.cval = idl_escape_reader(yytext + 1);
+ yylval.cval = idl_escape_reader(ace_yytext + 1);
return IDL_CHARACTER_LITERAL;
}
"'"\\."'" {
- yylval.cval = idl_escape_reader(yytext + 1);
+ yylval.cval = idl_escape_reader(ace_yytext + 1);
return IDL_CHARACTER_LITERAL;
}
^#[ \t]*pragma[ \t].*\n {/* remember pragma */
idl_global->set_lineno(idl_global->lineno() + 1);
- idl_store_pragma(yytext);
+ idl_store_pragma(ace_yytext);
}
^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*\n {
- idl_parse_line_and_file(yytext);
+ idl_parse_line_and_file(ace_yytext);
+ }
+^#[ \t]*[0-9]*" ""\""[^\"]*"\""\n {
+ idl_parse_line_and_file(ace_yytext);
}
^#line[ \t]*[0-9]*" ""\""[^\"]*"\""\n {
- idl_parse_line_and_file(yytext);
+ idl_parse_line_and_file(ace_yytext);
}
^#[ \t]*[0-9]*\n {
- idl_parse_line_and_file(yytext);
+ idl_parse_line_and_file(ace_yytext);
}
^#[ \t]*ident.*\n {
/* ignore cpp ident */
@@ -234,7 +236,7 @@ oneway return IDL_ONEWAY;
\n {
idl_global->set_lineno(idl_global->lineno() + 1);
}
-. return yytext [0];
+. return ace_yytext [0];
%%
/* subroutines */
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index a287d6d8735..3c16c6024ae 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -72,9 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
%{
#include "idl.h"
#include "idl_extern.h"
-
#include "fe_private.h"
-
#include <stdio.h>
#if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
@@ -84,6 +82,11 @@ extern "C" int yywrap();
void yyerror (char *);
int yylex (void);
extern "C" int yywrap (void);
+extern char yytext[];
+extern int yyleng;
+#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
+// Force the pretty debugging code to compile.
+#define YYDEBUG 1
%}
/*
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 4dcf9306910..37f32c24ea1 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -265,19 +265,19 @@ static void yy_fatal_error YY_PROTO(( const char msg[] ));
yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \
yy_c_buf_p = yy_cp;
-#define YY_END_OF_BUFFER 60
-static const short int yy_accept[277] =
+#define YY_END_OF_BUFFER 61
+static const short int yy_accept[278] =
{ 0,
- 56, 56, 60, 58, 56, 57, 58, 58, 58, 58,
- 44, 42, 58, 58, 58, 39, 39, 39, 39, 39,
+ 57, 57, 61, 59, 57, 58, 59, 59, 59, 59,
+ 44, 42, 59, 59, 59, 39, 39, 39, 39, 39,
39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 58, 56, 0, 45, 0, 0,
- 44, 42, 55, 0, 40, 44, 0, 0, 0, 42,
+ 39, 39, 39, 39, 59, 57, 0, 45, 0, 0,
+ 44, 42, 56, 0, 40, 44, 0, 0, 0, 42,
38, 36, 37, 39, 39, 39, 39, 39, 39, 39,
39, 39, 39, 39, 39, 39, 39, 33, 39, 39,
39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 0, 52, 0, 0, 0, 0,
- 0, 46, 0, 46, 0, 0, 54, 40, 0, 40,
+ 39, 39, 39, 39, 0, 53, 0, 0, 0, 0,
+ 0, 46, 0, 46, 0, 0, 55, 40, 0, 40,
0, 41, 43, 39, 39, 1, 39, 39, 39, 39,
39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
@@ -291,13 +291,13 @@ static const short int yy_accept[277] =
39, 39, 39, 20, 32, 39, 39, 28, 39, 39,
39, 39, 23, 39, 39, 39, 39, 16, 39, 39,
- 39, 0, 0, 0, 0, 39, 39, 39, 39, 21,
- 39, 39, 2, 35, 3, 39, 39, 13, 11, 17,
- 39, 39, 39, 39, 50, 0, 0, 0, 0, 0,
- 0, 39, 27, 7, 19, 39, 39, 39, 39, 10,
- 39, 26, 39, 0, 53, 0, 0, 0, 39, 39,
- 39, 4, 15, 24, 39, 0, 0, 0, 5, 6,
- 8, 14, 51, 0, 49, 0
+ 39, 51, 0, 0, 0, 0, 39, 39, 39, 39,
+ 21, 39, 39, 2, 35, 3, 39, 39, 13, 11,
+ 17, 39, 39, 39, 39, 50, 0, 0, 0, 0,
+ 0, 0, 39, 27, 7, 19, 39, 39, 39, 39,
+ 10, 39, 26, 39, 0, 54, 0, 0, 0, 39,
+ 39, 39, 4, 15, 24, 39, 0, 0, 0, 5,
+ 6, 8, 14, 52, 0, 49, 0
} ;
static const int yy_ec[256] =
@@ -342,77 +342,77 @@ static const int yy_meta[55] =
4, 4, 4, 4
} ;
-static const short int yy_base[287] =
+static const short int yy_base[288] =
{ 0,
- 0, 438, 443, 445, 53, 445, 437, 411, 45, 53,
- 53, 58, 424, 422, 420, 0, 418, 411, 13, 391,
- 31, 40, 34, 393, 390, 388, 387, 47, 56, 44,
- 376, 386, 384, 51, 105, 96, 422, 445, 419, 88,
- 100, 111, 445, 422, 141, 128, 155, 170, 0, 160,
- 445, 445, 445, 0, 400, 395, 368, 372, 376, 371,
- 386, 374, 379, 365, 364, 379, 368, 42, 368, 375,
- 360, 372, 358, 366, 373, 358, 359, 355, 361, 355,
- 64, 359, 359, 348, 184, 445, 111, 189, 361, 355,
- 347, 445, 386, 385, 120, 388, 445, 0, 196, 445,
-
- 144, 199, 0, 364, 368, 0, 341, 346, 350, 338,
- 82, 352, 350, 340, 345, 348, 329, 342, 339, 326,
- 339, 322, 0, 325, 337, 321, 323, 88, 320, 332,
- 323, 326, 330, 332, 316, 357, 356, 324, 316, 326,
- 445, 445, 187, 202, 213, 445, 336, 0, 316, 319,
- 0, 0, 305, 317, 302, 310, 0, 305, 300, 299,
- 300, 0, 305, 296, 312, 307, 298, 305, 291, 296,
- 304, 303, 301, 292, 296, 0, 286, 292, 326, 326,
- 286, 292, 289, 445, 319, 0, 292, 292, 0, 270,
- 281, 285, 271, 0, 0, 282, 282, 0, 263, 268,
-
- 272, 271, 0, 275, 263, 272, 274, 0, 266, 277,
- 264, 205, 257, 228, 263, 254, 260, 253, 252, 0,
- 238, 240, 0, 0, 0, 216, 217, 0, 0, 0,
- 211, 203, 189, 195, 445, 231, 228, 245, 251, 248,
- 193, 173, 0, 0, 0, 163, 161, 136, 153, 0,
- 137, 0, 136, 158, 445, 155, 146, 101, 112, 101,
- 104, 0, 0, 0, 88, 130, 120, 114, 0, 0,
- 0, 0, 445, 107, 445, 445, 266, 270, 272, 276,
- 280, 75, 284, 288, 292, 296
+ 0, 439, 444, 446, 53, 446, 438, 412, 45, 53,
+ 53, 58, 425, 423, 421, 0, 419, 412, 13, 392,
+ 31, 40, 34, 394, 391, 389, 388, 47, 56, 44,
+ 377, 387, 385, 51, 105, 96, 423, 446, 420, 88,
+ 100, 111, 446, 423, 141, 128, 155, 170, 0, 160,
+ 446, 446, 446, 0, 401, 396, 369, 373, 377, 372,
+ 387, 375, 380, 366, 365, 380, 369, 42, 369, 376,
+ 361, 373, 359, 367, 374, 359, 360, 356, 362, 356,
+ 64, 360, 360, 349, 184, 446, 111, 189, 362, 356,
+ 348, 446, 387, 386, 120, 389, 446, 0, 196, 446,
+
+ 144, 199, 0, 365, 369, 0, 342, 347, 351, 339,
+ 82, 353, 351, 341, 346, 349, 330, 343, 340, 327,
+ 340, 323, 0, 326, 338, 322, 324, 88, 321, 333,
+ 324, 327, 331, 333, 317, 358, 357, 325, 317, 327,
+ 446, 446, 187, 202, 213, 446, 337, 0, 317, 320,
+ 0, 0, 306, 318, 303, 311, 0, 306, 301, 300,
+ 301, 0, 306, 297, 313, 308, 299, 306, 292, 297,
+ 305, 304, 302, 293, 297, 0, 287, 293, 327, 157,
+ 288, 294, 291, 446, 321, 0, 294, 294, 0, 272,
+ 283, 287, 273, 0, 0, 284, 284, 0, 265, 270,
+
+ 274, 273, 0, 277, 265, 274, 276, 0, 268, 279,
+ 266, 446, 205, 259, 228, 265, 256, 262, 255, 254,
+ 0, 262, 269, 0, 0, 0, 237, 238, 0, 0,
+ 0, 220, 215, 199, 201, 446, 231, 235, 245, 251,
+ 248, 201, 182, 0, 0, 0, 181, 188, 153, 159,
+ 0, 155, 0, 158, 169, 446, 162, 146, 101, 112,
+ 101, 104, 0, 0, 0, 88, 130, 120, 114, 0,
+ 0, 0, 0, 446, 107, 446, 446, 266, 270, 272,
+ 276, 280, 75, 284, 288, 292, 296
} ;
-static const short int yy_def[287] =
+static const short int yy_def[288] =
{ 0,
- 276, 1, 276, 276, 276, 276, 277, 278, 276, 276,
- 276, 276, 276, 276, 276, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 276, 276, 277, 276, 276, 280,
- 276, 276, 276, 281, 276, 276, 276, 276, 282, 276,
- 276, 276, 276, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 276, 276, 35, 276, 276, 276,
- 276, 276, 276, 276, 276, 281, 276, 45, 276, 276,
-
- 276, 276, 282, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 283, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 283, 276,
- 276, 276, 276, 276, 276, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
-
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 276, 276, 276, 276, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 279, 276, 276, 284, 276, 276, 276,
- 276, 279, 279, 279, 279, 279, 279, 279, 279, 279,
- 279, 279, 279, 284, 276, 285, 276, 276, 279, 279,
- 279, 279, 279, 279, 279, 285, 276, 286, 279, 279,
- 279, 279, 276, 286, 276, 0, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276
+ 277, 1, 277, 277, 277, 277, 278, 279, 277, 277,
+ 277, 277, 277, 277, 277, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 277, 277, 278, 277, 277, 281,
+ 277, 277, 277, 282, 277, 277, 277, 277, 283, 277,
+ 277, 277, 277, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 277, 277, 35, 277, 277, 277,
+ 277, 277, 277, 277, 277, 282, 277, 45, 277, 277,
+
+ 277, 277, 283, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 284, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 284, 277,
+ 277, 277, 277, 277, 277, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 277, 277, 277, 277, 277, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 280, 277, 277, 285, 277, 277,
+ 277, 277, 280, 280, 280, 280, 280, 280, 280, 280,
+ 280, 280, 280, 280, 285, 277, 286, 277, 277, 280,
+ 280, 280, 280, 280, 280, 280, 286, 277, 287, 280,
+ 280, 280, 280, 277, 287, 277, 0, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277
} ;
-static const short int yy_nxt[500] =
+static const short int yy_nxt[501] =
{ 0,
4, 5, 6, 5, 7, 4, 8, 4, 4, 9,
4, 10, 11, 12, 12, 13, 14, 15, 16, 16,
@@ -425,53 +425,53 @@ static const short int yy_nxt[500] =
71, 49, 77, 64, 83, 117, 66, 74, 48, 72,
118, 75, 78, 48, 94, 79, 73, 36, 84, 36,
- 95, 95, 268, 131, 268, 49, 85, 86, 87, 275,
- 45, 132, 46, 46, 47, 136, 275, 88, 88, 88,
- 48, 45, 273, 50, 50, 50, 142, 170, 49, 153,
- 154, 48, 143, 143, 267, 48, 272, 171, 45, 271,
- 46, 46, 47, 270, 89, 90, 48, 269, 48, 91,
- 256, 276, 49, 98, 98, 98, 102, 102, 102, 267,
- 255, 99, 100, 48, 100, 45, 265, 47, 47, 47,
- 45, 264, 50, 50, 50, 48, 99, 100, 101, 101,
- 48, 100, 102, 102, 102, 85, 86, 87, 263, 262,
- 48, 86, 137, 184, 261, 48, 88, 88, 88, 185,
-
- 185, 88, 88, 88, 144, 144, 260, 235, 145, 145,
- 145, 102, 102, 102, 145, 145, 145, 236, 236, 236,
- 146, 259, 146, 89, 258, 145, 145, 145, 91, 238,
- 255, 239, 253, 235, 100, 146, 100, 252, 251, 146,
- 240, 240, 240, 236, 236, 236, 238, 250, 239, 100,
- 249, 257, 238, 100, 239, 256, 248, 240, 240, 240,
- 240, 240, 240, 240, 240, 240, 37, 37, 37, 37,
- 39, 247, 39, 39, 54, 54, 93, 246, 93, 93,
- 96, 96, 96, 96, 179, 179, 179, 179, 254, 254,
- 254, 254, 266, 266, 266, 266, 274, 274, 274, 274,
-
- 245, 244, 243, 242, 241, 237, 234, 233, 232, 231,
- 230, 229, 228, 227, 226, 225, 224, 223, 222, 221,
- 220, 219, 218, 217, 216, 184, 215, 214, 213, 212,
- 180, 211, 210, 209, 208, 207, 206, 205, 204, 203,
- 202, 201, 200, 199, 198, 197, 196, 195, 194, 193,
- 192, 191, 190, 189, 188, 187, 186, 183, 182, 181,
- 136, 180, 178, 177, 176, 175, 174, 173, 172, 169,
- 168, 167, 166, 165, 164, 163, 162, 161, 160, 159,
- 158, 157, 156, 155, 152, 151, 150, 149, 148, 147,
- 97, 141, 141, 140, 139, 138, 135, 134, 133, 130,
-
- 129, 128, 127, 126, 125, 124, 123, 122, 121, 120,
- 119, 116, 115, 114, 113, 112, 111, 110, 109, 108,
- 107, 106, 105, 104, 97, 92, 38, 82, 81, 80,
- 70, 69, 68, 67, 59, 56, 55, 53, 52, 51,
- 40, 38, 276, 35, 3, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276
+ 95, 95, 269, 131, 269, 49, 85, 86, 87, 276,
+ 45, 132, 46, 46, 47, 136, 276, 88, 88, 88,
+ 48, 45, 274, 50, 50, 50, 142, 170, 49, 153,
+ 154, 48, 143, 143, 268, 48, 273, 171, 45, 272,
+ 46, 46, 47, 271, 89, 90, 48, 270, 48, 91,
+ 257, 277, 49, 98, 98, 98, 102, 102, 102, 212,
+ 213, 99, 100, 48, 100, 45, 268, 47, 47, 47,
+ 45, 256, 50, 50, 50, 48, 99, 100, 101, 101,
+ 48, 100, 102, 102, 102, 85, 86, 87, 266, 265,
+ 48, 86, 137, 184, 264, 48, 88, 88, 88, 185,
+
+ 185, 88, 88, 88, 144, 144, 263, 236, 145, 145,
+ 145, 102, 102, 102, 145, 145, 145, 237, 237, 237,
+ 146, 262, 146, 89, 261, 145, 145, 145, 91, 239,
+ 260, 240, 259, 236, 100, 146, 100, 256, 254, 146,
+ 241, 241, 241, 237, 237, 237, 239, 253, 240, 100,
+ 252, 258, 239, 100, 240, 257, 251, 241, 241, 241,
+ 241, 241, 241, 241, 241, 241, 37, 37, 37, 37,
+ 39, 250, 39, 39, 54, 54, 93, 249, 93, 93,
+ 96, 96, 96, 96, 179, 179, 179, 179, 255, 255,
+ 255, 255, 267, 267, 267, 267, 275, 275, 275, 275,
+
+ 248, 247, 246, 245, 244, 243, 242, 238, 235, 234,
+ 233, 232, 231, 230, 229, 228, 227, 226, 225, 224,
+ 223, 222, 221, 220, 219, 218, 217, 184, 216, 215,
+ 214, 180, 211, 210, 209, 208, 207, 206, 205, 204,
+ 203, 202, 201, 200, 199, 198, 197, 196, 195, 194,
+ 193, 192, 191, 190, 189, 188, 187, 186, 183, 182,
+ 181, 136, 180, 178, 177, 176, 175, 174, 173, 172,
+ 169, 168, 167, 166, 165, 164, 163, 162, 161, 160,
+ 159, 158, 157, 156, 155, 152, 151, 150, 149, 148,
+ 147, 97, 141, 141, 140, 139, 138, 135, 134, 133,
+
+ 130, 129, 128, 127, 126, 125, 124, 123, 122, 121,
+ 120, 119, 116, 115, 114, 113, 112, 111, 110, 109,
+ 108, 107, 106, 105, 104, 97, 92, 38, 82, 81,
+ 80, 70, 69, 68, 67, 59, 56, 55, 53, 52,
+ 51, 40, 38, 277, 35, 3, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277
} ;
-static const short int yy_chk[500] =
+static const short int yy_chk[501] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -480,53 +480,53 @@ static const short int yy_chk[500] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 5, 19, 5, 9, 9, 9,
10, 19, 21, 11, 10, 11, 11, 11, 12, 21,
- 12, 12, 12, 11, 21, 22, 23, 282, 12, 30,
+ 12, 12, 12, 11, 21, 22, 23, 283, 12, 30,
28, 11, 30, 22, 34, 68, 23, 29, 11, 28,
68, 29, 30, 12, 40, 30, 28, 36, 34, 36,
- 40, 40, 258, 81, 258, 11, 35, 35, 35, 274,
- 41, 81, 41, 41, 41, 87, 268, 35, 35, 35,
- 41, 42, 267, 42, 42, 42, 95, 128, 41, 111,
- 111, 42, 95, 95, 266, 41, 265, 128, 46, 261,
- 46, 46, 46, 260, 35, 35, 42, 259, 46, 35,
- 257, 87, 41, 45, 45, 45, 101, 101, 101, 256,
- 254, 45, 45, 46, 45, 47, 253, 47, 47, 47,
- 50, 251, 50, 50, 50, 47, 45, 45, 48, 48,
- 50, 45, 48, 48, 48, 85, 85, 85, 249, 248,
- 47, 88, 88, 143, 247, 50, 85, 85, 85, 143,
-
- 143, 88, 88, 88, 99, 99, 246, 212, 99, 99,
- 99, 102, 102, 102, 144, 144, 144, 212, 212, 212,
- 102, 242, 102, 85, 241, 145, 145, 145, 85, 214,
- 237, 214, 234, 236, 145, 102, 145, 233, 232, 102,
- 214, 214, 214, 236, 236, 236, 238, 231, 238, 145,
- 227, 240, 239, 145, 239, 239, 226, 238, 238, 238,
- 240, 240, 240, 239, 239, 239, 277, 277, 277, 277,
- 278, 222, 278, 278, 279, 279, 280, 221, 280, 280,
- 281, 281, 281, 281, 283, 283, 283, 283, 284, 284,
- 284, 284, 285, 285, 285, 285, 286, 286, 286, 286,
-
- 219, 218, 217, 216, 215, 213, 211, 210, 209, 207,
- 206, 205, 204, 202, 201, 200, 199, 197, 196, 193,
- 192, 191, 190, 188, 187, 185, 183, 182, 181, 180,
- 179, 178, 177, 175, 174, 173, 172, 171, 170, 169,
- 168, 167, 166, 165, 164, 163, 161, 160, 159, 158,
- 156, 155, 154, 153, 150, 149, 147, 140, 139, 138,
- 137, 136, 135, 134, 133, 132, 131, 130, 129, 127,
- 126, 125, 124, 122, 121, 120, 119, 118, 117, 116,
- 115, 114, 113, 112, 110, 109, 108, 107, 105, 104,
- 96, 94, 93, 91, 90, 89, 84, 83, 82, 80,
-
- 79, 78, 77, 76, 75, 74, 73, 72, 71, 70,
- 69, 67, 66, 65, 64, 63, 62, 61, 60, 59,
- 58, 57, 56, 55, 44, 39, 37, 33, 32, 31,
- 27, 26, 25, 24, 20, 18, 17, 15, 14, 13,
- 8, 7, 3, 2, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
- 276, 276, 276, 276, 276, 276, 276, 276, 276
+ 40, 40, 259, 81, 259, 11, 35, 35, 35, 275,
+ 41, 81, 41, 41, 41, 87, 269, 35, 35, 35,
+ 41, 42, 268, 42, 42, 42, 95, 128, 41, 111,
+ 111, 42, 95, 95, 267, 41, 266, 128, 46, 262,
+ 46, 46, 46, 261, 35, 35, 42, 260, 46, 35,
+ 258, 87, 41, 45, 45, 45, 101, 101, 101, 180,
+ 180, 45, 45, 46, 45, 47, 257, 47, 47, 47,
+ 50, 255, 50, 50, 50, 47, 45, 45, 48, 48,
+ 50, 45, 48, 48, 48, 85, 85, 85, 254, 252,
+ 47, 88, 88, 143, 250, 50, 85, 85, 85, 143,
+
+ 143, 88, 88, 88, 99, 99, 249, 213, 99, 99,
+ 99, 102, 102, 102, 144, 144, 144, 213, 213, 213,
+ 102, 248, 102, 85, 247, 145, 145, 145, 85, 215,
+ 243, 215, 242, 237, 145, 102, 145, 238, 235, 102,
+ 215, 215, 215, 237, 237, 237, 239, 234, 239, 145,
+ 233, 241, 240, 145, 240, 240, 232, 239, 239, 239,
+ 241, 241, 241, 240, 240, 240, 278, 278, 278, 278,
+ 279, 228, 279, 279, 280, 280, 281, 227, 281, 281,
+ 282, 282, 282, 282, 284, 284, 284, 284, 285, 285,
+ 285, 285, 286, 286, 286, 286, 287, 287, 287, 287,
+
+ 223, 222, 220, 219, 218, 217, 216, 214, 211, 210,
+ 209, 207, 206, 205, 204, 202, 201, 200, 199, 197,
+ 196, 193, 192, 191, 190, 188, 187, 185, 183, 182,
+ 181, 179, 178, 177, 175, 174, 173, 172, 171, 170,
+ 169, 168, 167, 166, 165, 164, 163, 161, 160, 159,
+ 158, 156, 155, 154, 153, 150, 149, 147, 140, 139,
+ 138, 137, 136, 135, 134, 133, 132, 131, 130, 129,
+ 127, 126, 125, 124, 122, 121, 120, 119, 118, 117,
+ 116, 115, 114, 113, 112, 110, 109, 108, 107, 105,
+ 104, 96, 94, 93, 91, 90, 89, 84, 83, 82,
+
+ 80, 79, 78, 77, 76, 75, 74, 73, 72, 71,
+ 70, 69, 67, 66, 65, 64, 63, 62, 61, 60,
+ 59, 58, 57, 56, 55, 44, 39, 37, 33, 32,
+ 31, 27, 26, 25, 24, 20, 18, 17, 15, 14,
+ 13, 8, 7, 3, 2, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277
} ;
@@ -617,11 +617,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "idl.h"
#include "idl_extern.h"
-
#include "fe_private.h"
-
#include "y.tab.h"
-
#include /**/ <string.h>
static char idl_escape_reader(char *);
@@ -630,7 +627,7 @@ static long idl_atoi(char *, long);
static void idl_parse_line_and_file(char *);
static void idl_store_pragma(char *);
-#if 0
+#if defined (HPUX)
// HPUX has yytext typed to unsigned char *. We make sure here that
// we'll always use char * static char* __yytext = (char*) yytext;
// NOTE: This will not work under flex(1) were yytext is not a fixed
@@ -640,9 +637,11 @@ inline char *__yytext()
{
return (char *) yytext;
}
+#define ace_yytext __yytext()
+#else
+#define ace_yytext yytext
#endif /* 0 */
-
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
@@ -735,7 +734,7 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-# line 102 "idl.ll"
+# line 101 "idl.ll"
@@ -792,13 +791,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 277 )
+ if ( yy_current_state >= 278 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 445 );
+ while ( yy_base[yy_current_state] != 446 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -820,192 +819,192 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_USER_ACTION
-# line 104 "idl.ll"
+# line 103 "idl.ll"
return IDL_ANY;
YY_BREAK
case 2:
YY_USER_ACTION
-# line 105 "idl.ll"
+# line 104 "idl.ll"
return IDL_MODULE;
YY_BREAK
case 3:
YY_USER_ACTION
-# line 106 "idl.ll"
+# line 105 "idl.ll"
return IDL_RAISES;
YY_BREAK
case 4:
YY_USER_ACTION
-# line 107 "idl.ll"
+# line 106 "idl.ll"
return IDL_READONLY;
YY_BREAK
case 5:
YY_USER_ACTION
-# line 108 "idl.ll"
+# line 107 "idl.ll"
return IDL_ATTRIBUTE;
YY_BREAK
case 6:
YY_USER_ACTION
-# line 109 "idl.ll"
+# line 108 "idl.ll"
return IDL_EXCEPTION;
YY_BREAK
case 7:
YY_USER_ACTION
-# line 110 "idl.ll"
+# line 109 "idl.ll"
return IDL_CONTEXT;
YY_BREAK
case 8:
YY_USER_ACTION
-# line 111 "idl.ll"
+# line 110 "idl.ll"
return IDL_INTERFACE;
YY_BREAK
case 9:
YY_USER_ACTION
-# line 112 "idl.ll"
+# line 111 "idl.ll"
return IDL_CONST;
YY_BREAK
case 10:
YY_USER_ACTION
-# line 113 "idl.ll"
+# line 112 "idl.ll"
return IDL_TYPEDEF;
YY_BREAK
case 11:
YY_USER_ACTION
-# line 114 "idl.ll"
+# line 113 "idl.ll"
return IDL_STRUCT;
YY_BREAK
case 12:
YY_USER_ACTION
-# line 115 "idl.ll"
+# line 114 "idl.ll"
return IDL_ENUM;
YY_BREAK
case 13:
YY_USER_ACTION
-# line 116 "idl.ll"
+# line 115 "idl.ll"
return IDL_STRING;
YY_BREAK
case 14:
YY_USER_ACTION
-# line 117 "idl.ll"
+# line 116 "idl.ll"
return IDL_WSTRING;
YY_BREAK
case 15:
YY_USER_ACTION
-# line 118 "idl.ll"
+# line 117 "idl.ll"
return IDL_SEQUENCE;
YY_BREAK
case 16:
YY_USER_ACTION
-# line 119 "idl.ll"
+# line 118 "idl.ll"
return IDL_UNION;
YY_BREAK
case 17:
YY_USER_ACTION
-# line 120 "idl.ll"
+# line 119 "idl.ll"
return IDL_SWITCH;
YY_BREAK
case 18:
YY_USER_ACTION
-# line 121 "idl.ll"
+# line 120 "idl.ll"
return IDL_CASE;
YY_BREAK
case 19:
YY_USER_ACTION
-# line 122 "idl.ll"
+# line 121 "idl.ll"
return IDL_DEFAULT;
YY_BREAK
case 20:
YY_USER_ACTION
-# line 123 "idl.ll"
+# line 122 "idl.ll"
return IDL_FLOAT;
YY_BREAK
case 21:
YY_USER_ACTION
-# line 124 "idl.ll"
+# line 123 "idl.ll"
return IDL_DOUBLE;
YY_BREAK
case 22:
YY_USER_ACTION
-# line 125 "idl.ll"
+# line 124 "idl.ll"
return IDL_LONG;
YY_BREAK
case 23:
YY_USER_ACTION
-# line 126 "idl.ll"
+# line 125 "idl.ll"
return IDL_SHORT;
YY_BREAK
case 24:
YY_USER_ACTION
-# line 127 "idl.ll"
+# line 126 "idl.ll"
return IDL_UNSIGNED;
YY_BREAK
case 25:
YY_USER_ACTION
-# line 128 "idl.ll"
+# line 127 "idl.ll"
return IDL_CHAR;
YY_BREAK
case 26:
YY_USER_ACTION
-# line 129 "idl.ll"
+# line 128 "idl.ll"
return IDL_WCHAR;
YY_BREAK
case 27:
YY_USER_ACTION
-# line 130 "idl.ll"
+# line 129 "idl.ll"
return IDL_BOOLEAN;
YY_BREAK
case 28:
YY_USER_ACTION
-# line 131 "idl.ll"
+# line 130 "idl.ll"
return IDL_OCTET;
YY_BREAK
case 29:
YY_USER_ACTION
-# line 132 "idl.ll"
+# line 131 "idl.ll"
return IDL_VOID;
YY_BREAK
case 30:
YY_USER_ACTION
-# line 134 "idl.ll"
+# line 133 "idl.ll"
return IDL_TRUETOK;
YY_BREAK
case 31:
YY_USER_ACTION
-# line 135 "idl.ll"
+# line 134 "idl.ll"
return IDL_FALSETOK;
YY_BREAK
case 32:
YY_USER_ACTION
-# line 137 "idl.ll"
+# line 136 "idl.ll"
return IDL_INOUT;
YY_BREAK
case 33:
YY_USER_ACTION
-# line 138 "idl.ll"
+# line 137 "idl.ll"
return IDL_IN;
YY_BREAK
case 34:
YY_USER_ACTION
-# line 139 "idl.ll"
+# line 138 "idl.ll"
return IDL_OUT;
YY_BREAK
case 35:
YY_USER_ACTION
-# line 140 "idl.ll"
+# line 139 "idl.ll"
return IDL_ONEWAY;
YY_BREAK
case 36:
YY_USER_ACTION
-# line 142 "idl.ll"
+# line 141 "idl.ll"
return IDL_LEFT_SHIFT;
YY_BREAK
case 37:
YY_USER_ACTION
-# line 143 "idl.ll"
+# line 142 "idl.ll"
return IDL_RIGHT_SHIFT;
YY_BREAK
case 38:
YY_USER_ACTION
-# line 144 "idl.ll"
+# line 143 "idl.ll"
{
yylval.strval = "::";
return IDL_SCOPE_DELIMITOR;
@@ -1013,60 +1012,60 @@ YY_USER_ACTION
YY_BREAK
case 39:
YY_USER_ACTION
-# line 149 "idl.ll"
+# line 148 "idl.ll"
{
- char *z = (char *) malloc(strlen(yytext) + 1);
- strcpy(z, yytext);
+ char *z = (char *) malloc(strlen(ace_yytext) + 1);
+ strcpy(z, ace_yytext);
yylval.strval = z;
return IDENTIFIER;
}
YY_BREAK
case 40:
YY_USER_ACTION
-# line 156 "idl.ll"
+# line 155 "idl.ll"
{
- yylval.dval = idl_atof(yytext);
+ yylval.dval = idl_atof(ace_yytext);
return IDL_FLOATING_PT_LITERAL;
}
YY_BREAK
case 41:
YY_USER_ACTION
-# line 160 "idl.ll"
+# line 159 "idl.ll"
{
- yylval.dval = idl_atof(yytext);
+ yylval.dval = idl_atof(ace_yytext);
return IDL_FLOATING_PT_LITERAL;
}
YY_BREAK
case 42:
YY_USER_ACTION
-# line 165 "idl.ll"
+# line 164 "idl.ll"
{
- yylval.ival = idl_atoi(yytext, 10);
+ yylval.ival = idl_atoi(ace_yytext, 10);
return IDL_INTEGER_LITERAL;
}
YY_BREAK
case 43:
YY_USER_ACTION
-# line 169 "idl.ll"
+# line 168 "idl.ll"
{
- yylval.ival = idl_atoi(yytext, 16);
+ yylval.ival = idl_atoi(ace_yytext, 16);
return IDL_INTEGER_LITERAL;
}
YY_BREAK
case 44:
YY_USER_ACTION
-# line 173 "idl.ll"
+# line 172 "idl.ll"
{
- yylval.ival = idl_atoi(yytext, 8);
+ yylval.ival = idl_atoi(ace_yytext, 8);
return IDL_INTEGER_LITERAL;
}
YY_BREAK
case 45:
YY_USER_ACTION
-# line 178 "idl.ll"
+# line 177 "idl.ll"
{
/* Skip the quotes */
- char *tmp = yytext;
+ char *tmp = ace_yytext;
tmp[strlen(tmp)-1] = '\0';
yylval.sval = new String(tmp + 1);
return IDL_STRING_LITERAL;
@@ -1074,77 +1073,84 @@ YY_USER_ACTION
YY_BREAK
case 46:
YY_USER_ACTION
-# line 185 "idl.ll"
+# line 184 "idl.ll"
{
- yylval.cval = yytext() [1];
+ yylval.cval = ace_yytext [1];
return IDL_CHARACTER_LITERAL;
}
YY_BREAK
case 47:
YY_USER_ACTION
-# line 189 "idl.ll"
+# line 188 "idl.ll"
{
// octal character constant
- yylval.cval = idl_escape_reader(yytext + 1);
+ yylval.cval = idl_escape_reader(ace_yytext + 1);
return IDL_CHARACTER_LITERAL;
}
YY_BREAK
case 48:
YY_USER_ACTION
-# line 194 "idl.ll"
+# line 193 "idl.ll"
{
- yylval.cval = idl_escape_reader(yytext + 1);
+ yylval.cval = idl_escape_reader(ace_yytext + 1);
return IDL_CHARACTER_LITERAL;
}
YY_BREAK
case 49:
YY_USER_ACTION
-# line 198 "idl.ll"
+# line 197 "idl.ll"
{/* remember pragma */
idl_global->set_lineno(idl_global->lineno() + 1);
- idl_store_pragma(yytext);
+ idl_store_pragma(ace_yytext);
}
YY_BREAK
case 50:
YY_USER_ACTION
-# line 202 "idl.ll"
+# line 201 "idl.ll"
{
- idl_parse_line_and_file(yytext);
+ idl_parse_line_and_file(ace_yytext);
}
YY_BREAK
case 51:
YY_USER_ACTION
-# line 205 "idl.ll"
+# line 204 "idl.ll"
{
- idl_parse_line_and_file(yytext);
+ idl_parse_line_and_file(ace_yytext);
}
YY_BREAK
case 52:
YY_USER_ACTION
-# line 208 "idl.ll"
+# line 207 "idl.ll"
{
- idl_parse_line_and_file(yytext);
- }
+ idl_parse_line_and_file(ace_yytext);
+ }
YY_BREAK
case 53:
YY_USER_ACTION
-# line 211 "idl.ll"
+# line 210 "idl.ll"
+{
+ idl_parse_line_and_file(ace_yytext);
+ }
+ YY_BREAK
+case 54:
+YY_USER_ACTION
+# line 213 "idl.ll"
{
/* ignore cpp ident */
idl_global->set_lineno(idl_global->lineno() + 1);
}
YY_BREAK
-case 54:
+case 55:
YY_USER_ACTION
-# line 215 "idl.ll"
+# line 217 "idl.ll"
{
/* ignore comments */
idl_global->set_lineno(idl_global->lineno() + 1);
}
YY_BREAK
-case 55:
+case 56:
YY_USER_ACTION
-# line 219 "idl.ll"
+# line 221 "idl.ll"
{
for(;;) {
char c = yyinput();
@@ -1160,26 +1166,26 @@ YY_USER_ACTION
}
}
YY_BREAK
-case 56:
+case 57:
YY_USER_ACTION
-# line 233 "idl.ll"
+# line 235 "idl.ll"
;
YY_BREAK
-case 57:
+case 58:
YY_USER_ACTION
-# line 234 "idl.ll"
+# line 236 "idl.ll"
{
idl_global->set_lineno(idl_global->lineno() + 1);
}
YY_BREAK
-case 58:
-YY_USER_ACTION
-# line 237 "idl.ll"
-return yytext [0];
- YY_BREAK
case 59:
YY_USER_ACTION
# line 239 "idl.ll"
+return ace_yytext [0];
+ YY_BREAK
+case 60:
+YY_USER_ACTION
+# line 241 "idl.ll"
ECHO;
YY_BREAK
case YY_STATE_EOF(INITIAL):
@@ -1466,7 +1472,7 @@ static yy_state_type yy_get_previous_state()
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 277 )
+ if ( yy_current_state >= 278 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1501,11 +1507,11 @@ yy_state_type yy_current_state;
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 277 )
+ if ( yy_current_state >= 278 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 276);
+ yy_is_jam = (yy_current_state == 277);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -1888,7 +1894,7 @@ void *ptr;
{
free( ptr );
}
-# line 239 "idl.ll"
+# line 241 "idl.ll"
/* subroutines */
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index d7efaa5d823..e37aad012b0 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -5,9 +5,7 @@ char yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\
#line 73 "idl.yy"
#include "idl.h"
#include "idl_extern.h"
-
#include "fe_private.h"
-
#include <stdio.h>
#if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
@@ -17,7 +15,12 @@ extern "C" int yywrap();
void yyerror (char *);
int yylex (void);
extern "C" int yywrap (void);
-#line 93 "idl.yy"
+extern char yytext[];
+extern int yyleng;
+#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
+/* Force the pretty debugging code to compile.*/
+#define YYDEBUG 1
+#line 96 "idl.yy"
typedef union {
AST_Decl *dcval; /* Decl value */
UTL_StrList *slval; /* String list */
@@ -44,7 +47,7 @@ typedef union {
Identifier *idval; /* Identifier */
UTL_IdList *idlist; /* Identifier list */
} YYSTYPE;
-#line 48 "y.tab.c"
+#line 51 "y.tab.c"
#define IDENTIFIER 257
#define IDL_CONST 258
#define IDL_MODULE 259
@@ -778,7 +781,7 @@ YYSTYPE yylval;
#define yystacksize YYSTACKSIZE
short yyss[YYSTACKSIZE];
YYSTYPE yyvs[YYSTACKSIZE];
-#line 2240 "idl.yy"
+#line 2243 "idl.yy"
/* programs */
/*
@@ -800,7 +803,7 @@ void
yyerror(char *)
{
}
-#line 804 "y.tab.c"
+#line 807 "y.tab.c"
#define YYABORT goto yyabort
#define YYACCEPT goto yyaccept
#define YYERROR goto yyerrlab
@@ -1107,86 +1110,86 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 235 "idl.yy"
+#line 238 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
}
break;
case 5:
-#line 239 "idl.yy"
+#line 242 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 6:
-#line 243 "idl.yy"
+#line 246 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
}
break;
case 7:
-#line 247 "idl.yy"
+#line 250 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 8:
-#line 251 "idl.yy"
+#line 254 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
}
break;
case 9:
-#line 255 "idl.yy"
+#line 258 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 10:
-#line 259 "idl.yy"
+#line 262 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
}
break;
case 11:
-#line 263 "idl.yy"
+#line 266 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 12:
-#line 267 "idl.yy"
+#line 270 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
}
break;
case 13:
-#line 271 "idl.yy"
+#line 274 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 14:
-#line 275 "idl.yy"
+#line 278 "idl.yy"
{
idl_global->err()->syntax_error(idl_global->parse_state());
}
break;
case 15:
-#line 279 "idl.yy"
+#line 282 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
yyerrok;
}
break;
case 16:
-#line 286 "idl.yy"
+#line 289 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
}
break;
case 17:
-#line 290 "idl.yy"
+#line 293 "idl.yy"
{
UTL_ScopedName *n =
new UTL_ScopedName(new Identifier(yyvsp[0].strval, 1, 0, I_FALSE), NULL);
@@ -1209,19 +1212,19 @@ case 17:
}
break;
case 18:
-#line 311 "idl.yy"
+#line 314 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
}
break;
case 19:
-#line 315 "idl.yy"
+#line 318 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
}
break;
case 20:
-#line 319 "idl.yy"
+#line 322 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
/*
@@ -1231,7 +1234,7 @@ case 20:
}
break;
case 23:
-#line 335 "idl.yy"
+#line 338 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
AST_Interface *i = NULL;
@@ -1317,19 +1320,19 @@ case 23:
}
break;
case 24:
-#line 419 "idl.yy"
+#line 422 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
}
break;
case 25:
-#line 423 "idl.yy"
+#line 426 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
}
break;
case 26:
-#line 427 "idl.yy"
+#line 430 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
/*
@@ -1339,20 +1342,20 @@ case 26:
}
break;
case 27:
-#line 438 "idl.yy"
+#line 441 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
}
break;
case 28:
-#line 442 "idl.yy"
+#line 445 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
yyval.idval = yyvsp[0].idval;
}
break;
case 29:
-#line 450 "idl.yy"
+#line 453 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
/*
@@ -1365,110 +1368,110 @@ case 29:
}
break;
case 30:
-#line 464 "idl.yy"
+#line 467 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
}
break;
case 31:
-#line 468 "idl.yy"
+#line 471 "idl.yy"
{
yyval.nlval = yyvsp[0].nlval;
}
break;
case 32:
-#line 472 "idl.yy"
+#line 475 "idl.yy"
{
yyval.nlval = NULL;
}
break;
case 35:
-#line 484 "idl.yy"
+#line 487 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
}
break;
case 36:
-#line 488 "idl.yy"
+#line 491 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 37:
-#line 492 "idl.yy"
+#line 495 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
}
break;
case 38:
-#line 496 "idl.yy"
+#line 499 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 39:
-#line 500 "idl.yy"
+#line 503 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
}
break;
case 40:
-#line 504 "idl.yy"
+#line 507 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 41:
-#line 508 "idl.yy"
+#line 511 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
}
break;
case 42:
-#line 512 "idl.yy"
+#line 515 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 43:
-#line 516 "idl.yy"
+#line 519 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
}
break;
case 44:
-#line 520 "idl.yy"
+#line 523 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
break;
case 45:
-#line 524 "idl.yy"
+#line 527 "idl.yy"
{
idl_global->err()->syntax_error(idl_global->parse_state());
}
break;
case 46:
-#line 528 "idl.yy"
+#line 531 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
yyerrok;
}
break;
case 47:
-#line 536 "idl.yy"
+#line 539 "idl.yy"
{
yyval.nlval = new UTL_NameList(yyvsp[-1].idlist, yyvsp[0].nlval);
}
break;
case 48:
-#line 544 "idl.yy"
+#line 547 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
}
break;
case 49:
-#line 548 "idl.yy"
+#line 551 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
@@ -1481,13 +1484,13 @@ case 49:
}
break;
case 50:
-#line 559 "idl.yy"
+#line 562 "idl.yy"
{
yyval.nlval = NULL;
}
break;
case 51:
-#line 566 "idl.yy"
+#line 569 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
@@ -1495,13 +1498,13 @@ case 51:
}
break;
case 52:
-#line 572 "idl.yy"
+#line 575 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
}
break;
case 53:
-#line 576 "idl.yy"
+#line 579 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
@@ -1510,13 +1513,13 @@ case 53:
}
break;
case 54:
-#line 584 "idl.yy"
+#line 587 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
}
break;
case 55:
-#line 588 "idl.yy"
+#line 591 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
@@ -1525,13 +1528,13 @@ case 55:
}
break;
case 56:
-#line 597 "idl.yy"
+#line 600 "idl.yy"
{
yyval.idval = new Identifier(yyvsp[0].strval, 1, 0, I_FALSE);
}
break;
case 57:
-#line 604 "idl.yy"
+#line 607 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_ScopedName *n = new UTL_ScopedName(yyvsp[0].idval, NULL);
@@ -1550,31 +1553,31 @@ case 57:
}
break;
case 58:
-#line 624 "idl.yy"
+#line 627 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
}
break;
case 59:
-#line 628 "idl.yy"
+#line 631 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
}
break;
case 60:
-#line 632 "idl.yy"
+#line 635 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
}
break;
case 61:
-#line 636 "idl.yy"
+#line 639 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
}
break;
case 62:
-#line 640 "idl.yy"
+#line 643 "idl.yy"
{
UTL_ScopedName *n = new UTL_ScopedName(yyvsp[-4].idval, NULL);
UTL_Scope *s = idl_global->scopes()->top_non_null();
@@ -1601,19 +1604,19 @@ case 62:
}
break;
case 68:
-#line 673 "idl.yy"
+#line 676 "idl.yy"
{
yyval.etval = AST_Expression::EV_string;
}
break;
case 69:
-#line 677 "idl.yy"
+#line 680 "idl.yy"
{
yyval.etval = AST_Expression::EV_wstring;
}
break;
case 70:
-#line 681 "idl.yy"
+#line 684 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
AST_Decl *d = NULL;
@@ -1650,67 +1653,67 @@ case 70:
}
break;
case 74:
-#line 723 "idl.yy"
+#line 726 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, yyvsp[-2].exval, yyvsp[0].exval);
}
break;
case 76:
-#line 731 "idl.yy"
+#line 734 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, yyvsp[-2].exval, yyvsp[0].exval);
}
break;
case 78:
-#line 739 "idl.yy"
+#line 742 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, yyvsp[-2].exval, yyvsp[0].exval);
}
break;
case 80:
-#line 747 "idl.yy"
+#line 750 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,yyvsp[-2].exval,yyvsp[0].exval);
}
break;
case 81:
-#line 751 "idl.yy"
+#line 754 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,yyvsp[-2].exval,yyvsp[0].exval);
}
break;
case 83:
-#line 759 "idl.yy"
+#line 762 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, yyvsp[-2].exval, yyvsp[0].exval);
}
break;
case 84:
-#line 763 "idl.yy"
+#line 766 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,yyvsp[-2].exval,yyvsp[0].exval);
}
break;
case 86:
-#line 771 "idl.yy"
+#line 774 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, yyvsp[-2].exval, yyvsp[0].exval);
}
break;
case 87:
-#line 775 "idl.yy"
+#line 778 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, yyvsp[-2].exval, yyvsp[0].exval);
}
break;
case 88:
-#line 779 "idl.yy"
+#line 782 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, yyvsp[-2].exval, yyvsp[0].exval);
}
break;
case 90:
-#line 787 "idl.yy"
+#line 790 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
yyvsp[0].exval,
@@ -1718,7 +1721,7 @@ case 90:
}
break;
case 91:
-#line 793 "idl.yy"
+#line 796 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
yyvsp[0].exval,
@@ -1726,7 +1729,7 @@ case 91:
}
break;
case 92:
-#line 799 "idl.yy"
+#line 802 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
yyvsp[0].exval,
@@ -1734,7 +1737,7 @@ case 92:
}
break;
case 93:
-#line 808 "idl.yy"
+#line 811 "idl.yy"
{
/*
* An expression which is a scoped name is not resolved now,
@@ -1745,86 +1748,86 @@ case 93:
}
break;
case 95:
-#line 818 "idl.yy"
+#line 821 "idl.yy"
{
yyval.exval = yyvsp[-1].exval;
}
break;
case 96:
-#line 825 "idl.yy"
+#line 828 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(yyvsp[0].ival);
}
break;
case 97:
-#line 829 "idl.yy"
+#line 832 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(yyvsp[0].sval);
}
break;
case 98:
-#line 833 "idl.yy"
+#line 836 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(yyvsp[0].cval);
}
break;
case 99:
-#line 837 "idl.yy"
+#line 840 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr(yyvsp[0].dval);
}
break;
case 100:
-#line 841 "idl.yy"
+#line 844 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
AST_Expression::EV_bool);
}
break;
case 101:
-#line 846 "idl.yy"
+#line 849 "idl.yy"
{
yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
AST_Expression::EV_bool);
}
break;
case 102:
-#line 854 "idl.yy"
+#line 857 "idl.yy"
{
yyvsp[0].exval->evaluate(AST_Expression::EK_const);
yyval.exval = idl_global->gen()->create_expr(yyvsp[0].exval, AST_Expression::EV_ulong);
}
break;
case 103:
-#line 862 "idl.yy"
+#line 865 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
}
break;
case 104:
-#line 865 "idl.yy"
+#line 868 "idl.yy"
{yyval.ival = 0;}
break;
case 105:
-#line 866 "idl.yy"
+#line 869 "idl.yy"
{ yyval.ival = 0;}
break;
case 106:
-#line 867 "idl.yy"
+#line 870 "idl.yy"
{ yyval.ival = 0;}
break;
case 107:
-#line 868 "idl.yy"
+#line 871 "idl.yy"
{ yyval.ival = 0;}
break;
case 108:
-#line 873 "idl.yy"
+#line 876 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
}
break;
case 109:
-#line 877 "idl.yy"
+#line 880 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_DecllistActiveIterator *l;
@@ -1857,13 +1860,13 @@ case 109:
}
break;
case 112:
-#line 916 "idl.yy"
+#line 919 "idl.yy"
{
yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
}
break;
case 114:
-#line 921 "idl.yy"
+#line 924 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
AST_Decl *d = NULL;
@@ -1876,19 +1879,19 @@ case 114:
}
break;
case 127:
-#line 956 "idl.yy"
+#line 959 "idl.yy"
{
yyval.dlval = new UTL_DeclList(yyvsp[-1].deval, yyvsp[0].dlval);
}
break;
case 128:
-#line 964 "idl.yy"
+#line 967 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
}
break;
case 129:
-#line 968 "idl.yy"
+#line 971 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
@@ -1901,25 +1904,25 @@ case 129:
}
break;
case 130:
-#line 979 "idl.yy"
+#line 982 "idl.yy"
{
yyval.dlval = NULL;
}
break;
case 133:
-#line 991 "idl.yy"
+#line 994 "idl.yy"
{
yyval.dlval = new UTL_DeclList(yyvsp[-1].deval, yyvsp[0].dlval);
}
break;
case 134:
-#line 999 "idl.yy"
+#line 1002 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
}
break;
case 135:
-#line 1003 "idl.yy"
+#line 1006 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
@@ -1932,20 +1935,20 @@ case 135:
}
break;
case 136:
-#line 1014 "idl.yy"
+#line 1017 "idl.yy"
{
yyval.dlval = NULL;
}
break;
case 137:
-#line 1021 "idl.yy"
+#line 1024 "idl.yy"
{
yyval.deval = new FE_Declarator(new UTL_ScopedName(yyvsp[0].idval, NULL),
FE_Declarator::FD_simple, NULL);
}
break;
case 138:
-#line 1029 "idl.yy"
+#line 1032 "idl.yy"
{
yyval.deval = new FE_Declarator(new UTL_ScopedName(yyvsp[0].dcval->local_name(), NULL),
FE_Declarator::FD_complex,
@@ -1953,97 +1956,97 @@ case 138:
}
break;
case 141:
-#line 1043 "idl.yy"
+#line 1046 "idl.yy"
{
yyval.etval = AST_Expression::EV_long;
}
break;
case 142:
-#line 1047 "idl.yy"
+#line 1050 "idl.yy"
{
yyval.etval = AST_Expression::EV_longlong;
}
break;
case 143:
-#line 1051 "idl.yy"
+#line 1054 "idl.yy"
{
yyval.etval = AST_Expression::EV_short;
}
break;
case 144:
-#line 1058 "idl.yy"
+#line 1061 "idl.yy"
{
yyval.etval = AST_Expression::EV_ulong;
}
break;
case 145:
-#line 1062 "idl.yy"
+#line 1065 "idl.yy"
{
yyval.etval = AST_Expression::EV_ulonglong;
}
break;
case 146:
-#line 1066 "idl.yy"
+#line 1069 "idl.yy"
{
yyval.etval = AST_Expression::EV_ushort;
}
break;
case 147:
-#line 1073 "idl.yy"
+#line 1076 "idl.yy"
{
yyval.etval = AST_Expression::EV_double;
}
break;
case 148:
-#line 1077 "idl.yy"
+#line 1080 "idl.yy"
{
yyval.etval = AST_Expression::EV_float;
}
break;
case 149:
-#line 1081 "idl.yy"
+#line 1084 "idl.yy"
{
yyval.etval = AST_Expression::EV_longdouble;
}
break;
case 150:
-#line 1088 "idl.yy"
+#line 1091 "idl.yy"
{
yyval.etval = AST_Expression::EV_char;
}
break;
case 151:
-#line 1092 "idl.yy"
+#line 1095 "idl.yy"
{
yyval.etval = AST_Expression::EV_wchar;
}
break;
case 152:
-#line 1099 "idl.yy"
+#line 1102 "idl.yy"
{
yyval.etval = AST_Expression::EV_octet;
}
break;
case 153:
-#line 1106 "idl.yy"
+#line 1109 "idl.yy"
{
yyval.etval = AST_Expression::EV_bool;
}
break;
case 154:
-#line 1113 "idl.yy"
+#line 1116 "idl.yy"
{
yyval.etval = AST_Expression::EV_any;
}
break;
case 155:
-#line 1120 "idl.yy"
+#line 1123 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
}
break;
case 156:
-#line 1124 "idl.yy"
+#line 1127 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_ScopedName *n = new UTL_ScopedName(yyvsp[0].idval, NULL);
@@ -2069,19 +2072,19 @@ case 156:
}
break;
case 157:
-#line 1148 "idl.yy"
+#line 1151 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
}
break;
case 158:
-#line 1152 "idl.yy"
+#line 1155 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
}
break;
case 159:
-#line 1156 "idl.yy"
+#line 1159 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
/*
@@ -2098,19 +2101,19 @@ case 159:
}
break;
case 163:
-#line 1181 "idl.yy"
+#line 1184 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
}
break;
case 164:
-#line 1185 "idl.yy"
+#line 1188 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
}
break;
case 165:
-#line 1189 "idl.yy"
+#line 1192 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_DecllistActiveIterator *l = NULL;
@@ -2145,50 +2148,50 @@ case 165:
}
break;
case 166:
-#line 1222 "idl.yy"
+#line 1225 "idl.yy"
{
idl_global->err()->syntax_error(idl_global->parse_state());
}
break;
case 167:
-#line 1226 "idl.yy"
+#line 1229 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
yyerrok;
}
break;
case 168:
-#line 1234 "idl.yy"
+#line 1237 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
}
break;
case 169:
-#line 1238 "idl.yy"
+#line 1241 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
}
break;
case 170:
-#line 1242 "idl.yy"
+#line 1245 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
}
break;
case 171:
-#line 1246 "idl.yy"
+#line 1249 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
}
break;
case 172:
-#line 1250 "idl.yy"
+#line 1253 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
}
break;
case 173:
-#line 1254 "idl.yy"
+#line 1257 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_ScopedName *n = new UTL_ScopedName(yyvsp[-8].idval, NULL);
@@ -2219,19 +2222,19 @@ case 173:
}
break;
case 174:
-#line 1283 "idl.yy"
+#line 1286 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
}
break;
case 175:
-#line 1287 "idl.yy"
+#line 1290 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
}
break;
case 176:
-#line 1291 "idl.yy"
+#line 1294 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
/*
@@ -2248,31 +2251,31 @@ case 176:
}
break;
case 177:
-#line 1309 "idl.yy"
+#line 1312 "idl.yy"
{
yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
}
break;
case 178:
-#line 1313 "idl.yy"
+#line 1316 "idl.yy"
{
yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
}
break;
case 179:
-#line 1317 "idl.yy"
+#line 1320 "idl.yy"
{
yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
}
break;
case 180:
-#line 1321 "idl.yy"
+#line 1324 "idl.yy"
{
yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
}
break;
case 182:
-#line 1326 "idl.yy"
+#line 1329 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
AST_Decl *d = NULL;
@@ -2334,19 +2337,19 @@ case 182:
}
break;
case 186:
-#line 1396 "idl.yy"
+#line 1399 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
}
break;
case 187:
-#line 1400 "idl.yy"
+#line 1403 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
}
break;
case 188:
-#line 1404 "idl.yy"
+#line 1407 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_LabellistActiveIterator *l = NULL;
@@ -2376,26 +2379,26 @@ case 188:
}
break;
case 189:
-#line 1432 "idl.yy"
+#line 1435 "idl.yy"
{
idl_global->err()->syntax_error(idl_global->parse_state());
}
break;
case 190:
-#line 1436 "idl.yy"
+#line 1439 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
yyerrok;
}
break;
case 191:
-#line 1444 "idl.yy"
+#line 1447 "idl.yy"
{
yyval.llval = new UTL_LabelList(yyvsp[-1].ulval, yyvsp[0].llval);
}
break;
case 192:
-#line 1451 "idl.yy"
+#line 1454 "idl.yy"
{
if (yyvsp[-1].llval == NULL)
yyval.llval = new UTL_LabelList(yyvsp[0].ulval, NULL);
@@ -2406,19 +2409,19 @@ case 192:
}
break;
case 193:
-#line 1460 "idl.yy"
+#line 1463 "idl.yy"
{
yyval.llval = NULL;
}
break;
case 194:
-#line 1467 "idl.yy"
+#line 1470 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
}
break;
case 195:
-#line 1471 "idl.yy"
+#line 1474 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
@@ -2428,19 +2431,19 @@ case 195:
}
break;
case 196:
-#line 1479 "idl.yy"
+#line 1482 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
}
break;
case 197:
-#line 1483 "idl.yy"
+#line 1486 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
}
break;
case 198:
-#line 1487 "idl.yy"
+#line 1490 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
@@ -2449,13 +2452,13 @@ case 198:
}
break;
case 199:
-#line 1497 "idl.yy"
+#line 1500 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
}
break;
case 200:
-#line 1501 "idl.yy"
+#line 1504 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
/*
@@ -2480,13 +2483,13 @@ case 200:
}
break;
case 201:
-#line 1527 "idl.yy"
+#line 1530 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
}
break;
case 202:
-#line 1531 "idl.yy"
+#line 1534 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_ScopedName *n = new UTL_ScopedName(yyvsp[0].idval, NULL);
@@ -2515,19 +2518,19 @@ case 202:
}
break;
case 203:
-#line 1558 "idl.yy"
+#line 1561 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
}
break;
case 204:
-#line 1562 "idl.yy"
+#line 1565 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
}
break;
case 205:
-#line 1566 "idl.yy"
+#line 1569 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
/*
@@ -2542,13 +2545,13 @@ case 205:
}
break;
case 207:
-#line 1585 "idl.yy"
+#line 1588 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
}
break;
case 210:
-#line 1594 "idl.yy"
+#line 1597 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_ScopedName *n =
@@ -2570,19 +2573,19 @@ case 210:
}
break;
case 211:
-#line 1618 "idl.yy"
+#line 1621 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
}
break;
case 212:
-#line 1622 "idl.yy"
+#line 1625 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
}
break;
case 213:
-#line 1626 "idl.yy"
+#line 1629 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
/*
@@ -2614,7 +2617,7 @@ case 213:
}
break;
case 214:
-#line 1657 "idl.yy"
+#line 1660 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
/*
@@ -2646,7 +2649,7 @@ case 214:
}
break;
case 215:
-#line 1690 "idl.yy"
+#line 1693 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
/*
@@ -2656,32 +2659,32 @@ case 215:
}
break;
case 216:
-#line 1698 "idl.yy"
+#line 1701 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
}
break;
case 217:
-#line 1702 "idl.yy"
+#line 1705 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
yyval.dcval = yyvsp[0].dcval;
}
break;
case 218:
-#line 1711 "idl.yy"
+#line 1714 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
}
break;
case 219:
-#line 1715 "idl.yy"
+#line 1718 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
}
break;
case 220:
-#line 1719 "idl.yy"
+#line 1722 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
/*
@@ -2701,7 +2704,7 @@ case 220:
}
break;
case 221:
-#line 1737 "idl.yy"
+#line 1740 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
/*
@@ -2718,25 +2721,25 @@ case 221:
}
break;
case 222:
-#line 1755 "idl.yy"
+#line 1758 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
}
break;
case 223:
-#line 1763 "idl.yy"
+#line 1766 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
}
break;
case 224:
-#line 1767 "idl.yy"
+#line 1770 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
}
break;
case 225:
-#line 1771 "idl.yy"
+#line 1774 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
/*
@@ -2756,7 +2759,7 @@ case 225:
}
break;
case 226:
-#line 1789 "idl.yy"
+#line 1792 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
/*
@@ -2773,19 +2776,19 @@ case 226:
}
break;
case 227:
-#line 1807 "idl.yy"
+#line 1810 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
}
break;
case 228:
-#line 1814 "idl.yy"
+#line 1817 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
}
break;
case 229:
-#line 1818 "idl.yy"
+#line 1821 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
/*
@@ -2798,13 +2801,13 @@ case 229:
}
break;
case 230:
-#line 1832 "idl.yy"
+#line 1835 "idl.yy"
{
yyval.elval = new UTL_ExprList(yyvsp[-1].exval, yyvsp[0].elval);
}
break;
case 231:
-#line 1839 "idl.yy"
+#line 1842 "idl.yy"
{
if (yyvsp[-1].elval == NULL)
yyval.elval = new UTL_ExprList(yyvsp[0].exval, NULL);
@@ -2815,25 +2818,25 @@ case 231:
}
break;
case 232:
-#line 1848 "idl.yy"
+#line 1851 "idl.yy"
{
yyval.elval = NULL;
}
break;
case 233:
-#line 1855 "idl.yy"
+#line 1858 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
}
break;
case 234:
-#line 1859 "idl.yy"
+#line 1862 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
}
break;
case 235:
-#line 1863 "idl.yy"
+#line 1866 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
/*
@@ -2848,19 +2851,19 @@ case 235:
}
break;
case 236:
-#line 1880 "idl.yy"
+#line 1883 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
}
break;
case 237:
-#line 1884 "idl.yy"
+#line 1887 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
}
break;
case 238:
-#line 1888 "idl.yy"
+#line 1891 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_DecllistActiveIterator *l = NULL;
@@ -2893,26 +2896,26 @@ case 238:
}
break;
case 239:
-#line 1922 "idl.yy"
+#line 1925 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
yyval.bval = I_TRUE;
}
break;
case 240:
-#line 1927 "idl.yy"
+#line 1930 "idl.yy"
{
yyval.bval = I_FALSE;
}
break;
case 241:
-#line 1934 "idl.yy"
+#line 1937 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
}
break;
case 242:
-#line 1938 "idl.yy"
+#line 1941 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_ScopedName *n = new UTL_ScopedName(yyvsp[0].idval, NULL);
@@ -2938,19 +2941,19 @@ case 242:
}
break;
case 243:
-#line 1962 "idl.yy"
+#line 1965 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
}
break;
case 244:
-#line 1966 "idl.yy"
+#line 1969 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
}
break;
case 245:
-#line 1970 "idl.yy"
+#line 1973 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
/*
@@ -2960,13 +2963,13 @@ case 245:
}
break;
case 246:
-#line 1982 "idl.yy"
+#line 1985 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
}
break;
case 247:
-#line 1986 "idl.yy"
+#line 1989 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
UTL_ScopedName *n =
@@ -2997,19 +3000,19 @@ case 247:
}
break;
case 248:
-#line 2015 "idl.yy"
+#line 2018 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
}
break;
case 249:
-#line 2019 "idl.yy"
+#line 2022 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
}
break;
case 250:
-#line 2023 "idl.yy"
+#line 2026 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
AST_Operation *o = NULL;
@@ -3033,27 +3036,27 @@ case 250:
}
break;
case 251:
-#line 2048 "idl.yy"
+#line 2051 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
yyval.ofval = AST_Operation::OP_oneway;
}
break;
case 252:
-#line 2053 "idl.yy"
+#line 2056 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
yyval.ofval = AST_Operation::OP_idempotent;
}
break;
case 253:
-#line 2058 "idl.yy"
+#line 2061 "idl.yy"
{
yyval.ofval = AST_Operation::OP_noflags;
}
break;
case 255:
-#line 2066 "idl.yy"
+#line 2069 "idl.yy"
{
yyval.dcval =
idl_global->scopes()->bottom()
@@ -3061,49 +3064,49 @@ case 255:
}
break;
case 256:
-#line 2075 "idl.yy"
+#line 2078 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
}
break;
case 257:
-#line 2079 "idl.yy"
+#line 2082 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
}
break;
case 258:
-#line 2083 "idl.yy"
+#line 2086 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
}
break;
case 259:
-#line 2088 "idl.yy"
+#line 2091 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
}
break;
case 261:
-#line 2098 "idl.yy"
+#line 2101 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
}
break;
case 264:
-#line 2107 "idl.yy"
+#line 2110 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
}
break;
case 265:
-#line 2111 "idl.yy"
+#line 2114 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
}
break;
case 266:
-#line 2115 "idl.yy"
+#line 2118 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
AST_Argument *a = NULL;
@@ -3124,13 +3127,13 @@ case 266:
}
break;
case 267:
-#line 2137 "idl.yy"
+#line 2140 "idl.yy"
{
yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
}
break;
case 269:
-#line 2142 "idl.yy"
+#line 2145 "idl.yy"
{
UTL_Scope *s = idl_global->scopes()->top_non_null();
AST_Decl *d = NULL;
@@ -3143,87 +3146,87 @@ case 269:
}
break;
case 270:
-#line 2156 "idl.yy"
+#line 2159 "idl.yy"
{
yyval.dival = AST_Argument::dir_IN;
}
break;
case 271:
-#line 2160 "idl.yy"
+#line 2163 "idl.yy"
{
yyval.dival = AST_Argument::dir_OUT;
}
break;
case 272:
-#line 2164 "idl.yy"
+#line 2167 "idl.yy"
{
yyval.dival = AST_Argument::dir_INOUT;
}
break;
case 273:
-#line 2171 "idl.yy"
+#line 2174 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
}
break;
case 274:
-#line 2175 "idl.yy"
+#line 2178 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
}
break;
case 275:
-#line 2180 "idl.yy"
+#line 2183 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
yyval.nlval = yyvsp[-1].nlval;
}
break;
case 276:
-#line 2185 "idl.yy"
+#line 2188 "idl.yy"
{
yyval.nlval = NULL;
}
break;
case 277:
-#line 2192 "idl.yy"
+#line 2195 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
}
break;
case 278:
-#line 2196 "idl.yy"
+#line 2199 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
}
break;
case 279:
-#line 2201 "idl.yy"
+#line 2204 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
yyval.slval = yyvsp[-1].slval;
}
break;
case 280:
-#line 2206 "idl.yy"
+#line 2209 "idl.yy"
{
yyval.slval = NULL;
}
break;
case 281:
-#line 2213 "idl.yy"
+#line 2216 "idl.yy"
{
yyval.slval = new UTL_StrList(yyvsp[-1].sval, yyvsp[0].slval);
}
break;
case 282:
-#line 2221 "idl.yy"
+#line 2224 "idl.yy"
{
idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
}
break;
case 283:
-#line 2225 "idl.yy"
+#line 2228 "idl.yy"
{
if (yyvsp[-3].slval == NULL)
yyval.slval = new UTL_StrList(yyvsp[0].sval, NULL);
@@ -3234,12 +3237,12 @@ case 283:
}
break;
case 284:
-#line 2234 "idl.yy"
+#line 2237 "idl.yy"
{
yyval.slval = NULL;
}
break;
-#line 3242 "y.tab.c"
+#line 3245 "y.tab.c"
}
yyssp -= yym;
yystate = *yyssp;
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h
index f32ac335e6a..e1de58eb3e5 100644
--- a/ace/CORBA_Handler.h
+++ b/ace/CORBA_Handler.h
@@ -30,16 +30,6 @@
#undef EXCEPTIONS
#undef WANT_ORBIX_FDS
-#if defined (ACE_WIN32) && !defined (ACE_ORBIX_HAS_NAMESPACES)
-#define ACE_CORBA_1(NAME) CORBA_##NAME
-#define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME
-#define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE##::##NAME
-#else
-#define ACE_CORBA_1(NAME) CORBA::##NAME
-#define ACE_CORBA_2(TYPE, NAME) CORBA::##TYPE##::##NAME
-#define ACE_CORBA_3(TYPE, NAME) CORBA::##TYPE##::##NAME
-#endif /* ACE_WIN32 */
-
class ACE_Export ACE_CORBA_Handler : public ACE_Service_Object
// = TITLE
// Handle CORBA requests in conjunction with ACE.
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp
index 29e881d331c..62e79cd60be 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -382,7 +382,7 @@ ACE_Filecache::finish (ACE_Filecache_Object *&file)
file->release ();
this->remove_i ((char *) file->filename_);
- result = this->hash_.bind (file->filename_, file);
+ result = this->hash_.bind (file->filename (), file);
if (result == 0)
file->acquire ();
diff --git a/ace/OS.h b/ace/OS.h
index 38dc9f847f5..dbf7878b138 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -22,6 +22,18 @@
// configuration file (e.g., config-sunos5-sunc++-4.x.h).
#include "ace/config.h"
+// Deal with MSVC++ insanity for CORBA...
+#if defined (ACE_WIN32) && !defined (ACE_ORBIX_HAS_NAMESPACES)
+#define ACE_CORBA_1(NAME) CORBA_##NAME
+#define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME
+#define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE##::##NAME
+#else
+#define ACE_CORBA_1(NAME) CORBA::##NAME
+#define ACE_CORBA_2(TYPE, NAME) CORBA::##TYPE##::##NAME
+#define ACE_CORBA_3(TYPE, NAME) CORBA::##TYPE##::##NAME
+#endif /* ACE_WIN32 */
+
+// Define some helpful macros.
#define ACE_ONE_SECOND_IN_MSECS 1000L
#define ACE_ONE_SECOND_IN_USECS 1000000L
#define ACE_ONE_SECOND_IN_NSECS 1000000000L
View Lorry Controller Status