From 2020a9302668d02132612f8baf1e4cc8e22cd96d Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Tue, 22 Feb 2005 11:46:44 +0000 Subject: [PATCH] - Support implict_handle attribute in IDL files. - Build mixed-mode stub files. svn path=/trunk/; revision=13711 --- reactos/tools/widl/Makefile | 8 +- reactos/tools/widl/client.c | 46 +- reactos/tools/widl/header.c | 10 +- reactos/tools/widl/lex.yy.c | 7 +- reactos/tools/widl/parser.l | 7 +- reactos/tools/widl/parser.y | 27 +- reactos/tools/widl/server.c | 24 +- reactos/tools/widl/widltypes.h | 5 +- reactos/tools/widl/y.tab.c | 1996 ++++++++++++++++---------------- reactos/tools/widl/y.tab.h | 148 +-- 10 files changed, 1194 insertions(+), 1084 deletions(-) diff --git a/reactos/tools/widl/Makefile b/reactos/tools/widl/Makefile index 2716d5384c9..664a62726d7 100644 --- a/reactos/tools/widl/Makefile +++ b/reactos/tools/widl/Makefile @@ -63,10 +63,10 @@ YACCOPT = #-v # Optional use of flex and bison, this will allow independent building from # Wine. # -#y.tab.c y.tab.h: parser.y -# bison $(YACCOPT) -d -o y.tab.c parser.y +y.tab.c y.tab.h: parser.y + bison $(YACCOPT) -d -o y.tab.c parser.y # -#lex.yy.c: parser.l y.tab.h -# flex $(LEXOPT) -d -8 -olex.yy.c parser.l +lex.yy.c: parser.l y.tab.h + flex $(LEXOPT) -d -8 -olex.yy.c parser.l # EOF diff --git a/reactos/tools/widl/client.c b/reactos/tools/widl/client.c index 456acbfeb68..9dfcf76dda5 100644 --- a/reactos/tools/widl/client.c +++ b/reactos/tools/widl/client.c @@ -116,6 +116,7 @@ static void write_typeformatstring(void) static void write_function_stubs(type_t *iface) { func_t *cur = iface->funcs; + char *handle_name = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int method_count = 0; unsigned int proc_offset = 0; @@ -148,6 +149,9 @@ static void write_function_stubs(type_t *iface) fprintf(client, " _RetVal;\n"); } + if (handle_name) + print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); + print_client("RPC_MESSAGE _RpcMessage;\n"); print_client("MIDL_STUB_MESSAGE _StubMsg;\n"); fprintf(client, "\n"); @@ -164,24 +168,32 @@ static void write_function_stubs(type_t *iface) indent--; fprintf(client, "\n"); + if (handle_name) + print_client("_Handle = %s;\n", handle_name); /* FIXME: marshal arguments */ print_client("_StubMsg.BufferLength = 0UL;\n"); - print_client("NdrNsGetBuffer(\n"); +// print_client("NdrNsGetBuffer(\n"); + print_client("NdrGetBuffer(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - print_client("%s__MIDL_AutoBindHandle);\n", iface->name); + if (handle_name) + print_client("%_Handle);\n"); + else + print_client("%s__MIDL_AutoBindHandle);\n", iface->name); indent--; fprintf(client, "\n"); /* send/recieve message */ - print_client("NdrNsSendReceive(\n"); +// print_client("NdrNsSendReceive(\n"); + print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer,\n"); - print_client("(RPC_BINDING_HANDLE __RPC_FAR *) &%s__MIDL_AutoBindHandle);\n", iface->name); + print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer);\n"); +// print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer,\n"); +// print_client("(RPC_BINDING_HANDLE __RPC_FAR *) &%s__MIDL_AutoBindHandle);\n", iface->name); indent--; /* unmarshal return value */ @@ -206,7 +218,7 @@ static void write_function_stubs(type_t *iface) write_type(client, def->type, def, def->tname); fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n"); - /* FIXME: update pro_offset */ + /* FIXME: update proc_offset */ proc_offset += 2; } @@ -242,12 +254,14 @@ static void write_function_stubs(type_t *iface) } } + static void write_bindinghandledecl(type_t *iface) { print_client("static RPC_BINDING_HANDLE %s__MIDL_AutoBindHandle;\n", iface->name); fprintf(client, "\n"); } + static void write_stubdescdecl(type_t *iface) { print_client("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); @@ -257,13 +271,18 @@ static void write_stubdescdecl(type_t *iface) static void write_stubdescriptor(type_t *iface) { + char *handle_name = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); indent++; print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); print_client("MIDL_user_allocate,\n"); print_client("MIDL_user_free,\n"); - print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); + if (handle_name) + print_client("&%s,\n", handle_name); + else + print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); print_client("0,\n"); print_client("0,\n"); print_client("0,\n"); @@ -354,6 +373,18 @@ static void write_formatstringsdecl(type_t *iface) } +static void write_implicithandledecl(type_t *iface) +{ + char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + + if (var) + { + fprintf(client, "handle_t %s;\n", var); + fprintf(client, "\n"); + } +} + + static void init_client(void) { if (client) return; @@ -388,6 +419,7 @@ void write_client(ifref_t *ifaces) return; write_formatstringsdecl(lcur->iface); + write_implicithandledecl(lcur->iface); write_clientinterfacedecl(lcur->iface); write_stubdescdecl(lcur->iface); diff --git a/reactos/tools/widl/header.c b/reactos/tools/widl/header.c index 75becddf828..f64f3f9f8ee 100644 --- a/reactos/tools/widl/header.c +++ b/reactos/tools/widl/header.c @@ -668,7 +668,10 @@ static void write_function_proto(type_t *iface) fprintf(header, " "); write_name(header, def); fprintf(header, "(\n"); - write_args(header, cur->args, iface->name, 0, TRUE); + if (cur->args) + write_args(header, cur->args, iface->name, 0, TRUE); + else + fprintf(header, " void"); fprintf(header, ");\n"); cur = PREV_LINK(cur); @@ -783,6 +786,7 @@ void write_com_interface(type_t *iface) void write_rpc_interface(type_t *iface) { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); + char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); if (!iface->funcs) return; @@ -790,6 +794,10 @@ void write_rpc_interface(type_t *iface) fprintf(header, " * %s interface (v%d.%d)\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(header, " */\n"); write_iface_guid(iface); + if (var) + { + fprintf(header, "extern handle_t %s;\n", var); + } fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); write_function_proto(iface); diff --git a/reactos/tools/widl/lex.yy.c b/reactos/tools/widl/lex.yy.c index a8cac3ff60b..f0a0a3453a9 100644 --- a/reactos/tools/widl/lex.yy.c +++ b/reactos/tools/widl/lex.yy.c @@ -4498,7 +4498,7 @@ static struct keyword { {"entry", tENTRY}, {"enum", tENUM}, {"error_status_t", tERRORSTATUST}, -/* ... */ + {"explicit_handle", tEXPLICITHANDLE}, {"extern", tEXTERN}, /* ... */ {"float", tFLOAT}, @@ -4512,13 +4512,14 @@ static struct keyword { {"helpstringcontext", tHELPSTRINGCONTEXT}, {"helpstringdll", tHELPSTRINGDLL}, /* ... */ - {"hidden", tHIDDEN}, + {"hidden", tHIDDEN}, {"hyper", tHYPER}, {"id", tID}, {"idempotent", tIDEMPOTENT}, /* ... */ {"iid_is", tIIDIS}, /* ... */ + {"implicit_handle", tIMPLICITHANDLE}, {"import", tIMPORT}, {"importlib", tIMPORTLIB}, {"in", tIN}, @@ -4559,7 +4560,7 @@ static struct keyword { {"readonly", tREADONLY}, {"ref", tREF}, /* ... */ - {"restricted", tRESTRICTED}, + {"restricted", tRESTRICTED}, {"retval", tRETVAL}, /* ... */ {"short", tSHORT}, diff --git a/reactos/tools/widl/parser.l b/reactos/tools/widl/parser.l index 340322cc15c..f943cf0a160 100644 --- a/reactos/tools/widl/parser.l +++ b/reactos/tools/widl/parser.l @@ -218,7 +218,7 @@ static struct keyword { {"entry", tENTRY}, {"enum", tENUM}, {"error_status_t", tERRORSTATUST}, -/* ... */ + {"explicit_handle", tEXPLICITHANDLE}, {"extern", tEXTERN}, /* ... */ {"float", tFLOAT}, @@ -232,13 +232,14 @@ static struct keyword { {"helpstringcontext", tHELPSTRINGCONTEXT}, {"helpstringdll", tHELPSTRINGDLL}, /* ... */ - {"hidden", tHIDDEN}, + {"hidden", tHIDDEN}, {"hyper", tHYPER}, {"id", tID}, {"idempotent", tIDEMPOTENT}, /* ... */ {"iid_is", tIIDIS}, /* ... */ + {"implicit_handle", tIMPLICITHANDLE}, {"import", tIMPORT}, {"importlib", tIMPORTLIB}, {"in", tIN}, @@ -279,7 +280,7 @@ static struct keyword { {"readonly", tREADONLY}, {"ref", tREF}, /* ... */ - {"restricted", tRESTRICTED}, + {"restricted", tRESTRICTED}, {"retval", tRETVAL}, /* ... */ {"short", tSHORT}, diff --git a/reactos/tools/widl/parser.y b/reactos/tools/widl/parser.y index 106a9ec47a5..ff97fe691a6 100644 --- a/reactos/tools/widl/parser.y +++ b/reactos/tools/widl/parser.y @@ -138,7 +138,7 @@ static type_t std_uhyper = { "MIDL_uhyper" }; %token tDLLNAME tDOUBLE tDUAL %token tENDPOINT %token tENTRY tENUM tERRORSTATUST -%token tEXTERN +%token tEXPLICITHANDLE tEXTERN %token tFLOAT %token tHANDLE %token tHANDLET @@ -147,6 +147,7 @@ static type_t std_uhyper = { "MIDL_uhyper" }; %token tHIDDEN %token tHYPER tID tIDEMPOTENT %token tIIDIS +%token tIMPLICITHANDLE %token tIMPORT tIMPORTLIB %token tIN tINCLUDE tINLINE %token tINPUTSYNC @@ -333,6 +334,7 @@ attrib_list: attribute attribute: tASYNC { $$ = make_attr(ATTR_ASYNC); } + | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); } | tCALLAS '(' ident ')' { $$ = make_attrp(ATTR_CALLAS, $3); } | tCASE '(' expr_list_const ')' { $$ = make_attrp(ATTR_CASE, $3); } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } @@ -347,6 +349,7 @@ attribute: | tENDPOINT '(' aSTRING ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' aSTRING ')' { $$ = make_attrp(ATTR_ENTRY_STRING, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY_ORDINAL, $3); } + | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tHANDLE { $$ = make_attr(ATTR_HANDLE); } | tHELPCONTEXT '(' expr_const ')' { $$ = make_attrp(ATTR_HELPCONTEXT, $3); } | tHELPFILE '(' aSTRING ')' { $$ = make_attrp(ATTR_HELPFILE, $3); } @@ -357,6 +360,7 @@ attribute: | tID '(' expr_const ')' { $$ = make_attrp(ATTR_ID, $3); } | tIDEMPOTENT { $$ = make_attr(ATTR_IDEMPOTENT); } | tIIDIS '(' ident ')' { $$ = make_attrp(ATTR_IIDIS, $3); } + | tIMPLICITHANDLE '(' tHANDLET aIDENTIFIER ')' { $$ = make_attrp(ATTR_IMPLICIT_HANDLE, $4); } | tIN { $$ = make_attr(ATTR_IN); } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } @@ -365,7 +369,7 @@ attribute: | tOBJECT { $$ = make_attr(ATTR_OBJECT); } | tODL { $$ = make_attr(ATTR_ODL); } | tOLEAUTOMATION { $$ = make_attr(ATTR_OLEAUTOMATION); } - | tOPTIONAL { $$ = make_attr(ATTR_OPTIONAL); } + | tOPTIONAL { $$ = make_attr(ATTR_OPTIONAL); } | tOUT { $$ = make_attr(ATTR_OUT); } | tPOINTERDEFAULT '(' pointer_type ')' { $$ = make_attrv(ATTR_POINTERDEFAULT, $3); } | tPROPGET { $$ = make_attr(ATTR_PROPGET); } @@ -431,19 +435,19 @@ enum_list: enum enum: ident '=' expr_const { $$ = reg_const($1); $$->eval = $3; $$->lval = $3->cval; - $$->type = make_type(RPC_FC_LONG, &std_int); + $$->type = make_type(RPC_FC_LONG, &std_int); } | ident { $$ = reg_const($1); $$->lval = 0; /* default for first enum entry */ - $$->type = make_type(RPC_FC_LONG, &std_int); + $$->type = make_type(RPC_FC_LONG, &std_int); } ; enumdef: tENUM t_ident '{' enums '}' { $$ = get_typev(RPC_FC_ENUM16, $2, tsENUM); $$->fields = $4; $$->defined = TRUE; - if(in_typelib) - add_enum($$); + if(in_typelib) + add_enum($$); } ; @@ -490,7 +494,8 @@ expr_list_const: expr_const ; expr_const: expr { $$ = $1; - if (!$$->is_const) yyerror("expression is not constant\n"); + if (!$$->is_const) + yyerror("expression is not constant\n"); } ; @@ -713,13 +718,13 @@ pointer_type: ; structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); - /* overwrite RPC_FC_STRUCT with a more exact type */ + /* overwrite RPC_FC_STRUCT with a more exact type */ $$->type = get_struct_type( $4 ); $$->fields = $4; $$->defined = TRUE; - if(in_typelib) - add_struct($$); - } + if(in_typelib) + add_struct($$); + } ; type: tVOID { $$ = make_tref(NULL, make_type(0, NULL)); } diff --git a/reactos/tools/widl/server.c b/reactos/tools/widl/server.c index 3d4f649fd1f..180151e7e5c 100644 --- a/reactos/tools/widl/server.c +++ b/reactos/tools/widl/server.c @@ -118,6 +118,28 @@ static void write_typeformatstring(void) } +unsigned int get_required_stack_size(type_t *type) +{ + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + case RPC_FC_ULONG: + case RPC_FC_LONG: + return 4; + + case RPC_FC_HYPER: + return 8; + + default: + error("Unknown/unsupported type: %s\n", type->name); + } +} + + static void write_function_stubs(type_t *iface) { func_t *cur = iface->funcs; @@ -197,7 +219,7 @@ static void write_function_stubs(type_t *iface) if (!is_void(def->type, NULL)) { fprintf(server, "\n"); - print_server("_StubMsg.BufferLength = %uU;\n", 4); /* FIXME */ + print_server("_StubMsg.BufferLength = %uU;\n", get_required_stack_size(def->type)); print_server("_pRpcMessage->BufferLength = _StubMsg.BufferLength;\n"); fprintf(server, "\n"); print_server("_Status = I_RpcGetBuffer(_pRpcMessage);\n"); diff --git a/reactos/tools/widl/widltypes.h b/reactos/tools/widl/widltypes.h index a0026fc0a5d..6ea50d429ee 100644 --- a/reactos/tools/widl/widltypes.h +++ b/reactos/tools/widl/widltypes.h @@ -58,6 +58,7 @@ typedef struct _typelib_t typelib_t; enum attr_type { ATTR_ASYNC, + ATTR_AUTO_HANDLE, ATTR_CALLAS, ATTR_CASE, ATTR_CONTEXTHANDLE, @@ -70,6 +71,7 @@ enum attr_type ATTR_ENDPOINT, ATTR_ENTRY_STRING, ATTR_ENTRY_ORDINAL, + ATTR_EXPLICIT_HANDLE, ATTR_HANDLE, ATTR_HELPCONTEXT, ATTR_HELPFILE, @@ -80,6 +82,7 @@ enum attr_type ATTR_ID, ATTR_IDEMPOTENT, ATTR_IIDIS, + ATTR_IMPLICIT_HANDLE, ATTR_IN, ATTR_INPUTSYNC, ATTR_LENGTHIS, @@ -147,7 +150,7 @@ enum type_kind TKIND_UNION, TKIND_MAX }; - + struct _attr_t { enum attr_type type; union { diff --git a/reactos/tools/widl/y.tab.c b/reactos/tools/widl/y.tab.c index 63bce9ab388..6f40b48abc8 100644 --- a/reactos/tools/widl/y.tab.c +++ b/reactos/tools/widl/y.tab.c @@ -49,79 +49,81 @@ #define tENTRY 299 #define tENUM 300 #define tERRORSTATUST 301 -#define tEXTERN 302 -#define tFLOAT 303 -#define tHANDLE 304 -#define tHANDLET 305 -#define tHELPCONTEXT 306 -#define tHELPFILE 307 -#define tHELPSTRING 308 -#define tHELPSTRINGCONTEXT 309 -#define tHELPSTRINGDLL 310 -#define tHIDDEN 311 -#define tHYPER 312 -#define tID 313 -#define tIDEMPOTENT 314 -#define tIIDIS 315 -#define tIMPORT 316 -#define tIMPORTLIB 317 -#define tIN 318 -#define tINCLUDE 319 -#define tINLINE 320 -#define tINPUTSYNC 321 -#define tINT 322 -#define tINT64 323 -#define tINTERFACE 324 -#define tLENGTHIS 325 -#define tLIBRARY 326 -#define tLOCAL 327 -#define tLONG 328 -#define tMETHODS 329 -#define tMODULE 330 -#define tNONCREATABLE 331 -#define tOBJECT 332 -#define tODL 333 -#define tOLEAUTOMATION 334 -#define tOPTIONAL 335 -#define tOUT 336 -#define tPOINTERDEFAULT 337 -#define tPROPERTIES 338 -#define tPROPGET 339 -#define tPROPPUT 340 -#define tPROPPUTREF 341 -#define tPUBLIC 342 -#define tREADONLY 343 -#define tREF 344 -#define tRESTRICTED 345 -#define tRETVAL 346 -#define tSHORT 347 -#define tSIGNED 348 -#define tSIZEIS 349 -#define tSIZEOF 350 -#define tSOURCE 351 -#define tSTDCALL 352 -#define tSTRING 353 -#define tSTRUCT 354 -#define tSWITCH 355 -#define tSWITCHIS 356 -#define tSWITCHTYPE 357 -#define tTRANSMITAS 358 -#define tTYPEDEF 359 -#define tUNION 360 -#define tUNIQUE 361 -#define tUNSIGNED 362 -#define tUUID 363 -#define tV1ENUM 364 -#define tVARARG 365 -#define tVERSION 366 -#define tVOID 367 -#define tWCHAR 368 -#define tWIREMARSHAL 369 -#define tPOINTERTYPE 370 -#define COND 371 -#define CAST 372 -#define PPTR 373 -#define NEG 374 +#define tEXPLICITHANDLE 302 +#define tEXTERN 303 +#define tFLOAT 304 +#define tHANDLE 305 +#define tHANDLET 306 +#define tHELPCONTEXT 307 +#define tHELPFILE 308 +#define tHELPSTRING 309 +#define tHELPSTRINGCONTEXT 310 +#define tHELPSTRINGDLL 311 +#define tHIDDEN 312 +#define tHYPER 313 +#define tID 314 +#define tIDEMPOTENT 315 +#define tIIDIS 316 +#define tIMPLICITHANDLE 317 +#define tIMPORT 318 +#define tIMPORTLIB 319 +#define tIN 320 +#define tINCLUDE 321 +#define tINLINE 322 +#define tINPUTSYNC 323 +#define tINT 324 +#define tINT64 325 +#define tINTERFACE 326 +#define tLENGTHIS 327 +#define tLIBRARY 328 +#define tLOCAL 329 +#define tLONG 330 +#define tMETHODS 331 +#define tMODULE 332 +#define tNONCREATABLE 333 +#define tOBJECT 334 +#define tODL 335 +#define tOLEAUTOMATION 336 +#define tOPTIONAL 337 +#define tOUT 338 +#define tPOINTERDEFAULT 339 +#define tPROPERTIES 340 +#define tPROPGET 341 +#define tPROPPUT 342 +#define tPROPPUTREF 343 +#define tPUBLIC 344 +#define tREADONLY 345 +#define tREF 346 +#define tRESTRICTED 347 +#define tRETVAL 348 +#define tSHORT 349 +#define tSIGNED 350 +#define tSIZEIS 351 +#define tSIZEOF 352 +#define tSOURCE 353 +#define tSTDCALL 354 +#define tSTRING 355 +#define tSTRUCT 356 +#define tSWITCH 357 +#define tSWITCHIS 358 +#define tSWITCHTYPE 359 +#define tTRANSMITAS 360 +#define tTYPEDEF 361 +#define tUNION 362 +#define tUNIQUE 363 +#define tUNSIGNED 364 +#define tUUID 365 +#define tV1ENUM 366 +#define tVARARG 367 +#define tVERSION 368 +#define tVOID 369 +#define tWCHAR 370 +#define tWIREMARSHAL 371 +#define tPOINTERTYPE 372 +#define COND 373 +#define CAST 374 +#define PPTR 375 +#define NEG 376 #line 1 "parser.y" @@ -232,7 +234,7 @@ static type_t std_int64 = { "__int64" }; static type_t std_uhyper = { "MIDL_uhyper" }; -#line 111 "parser.y" +#line 109 "parser.y" typedef union { attr_t *attr; expr_t *expr; @@ -256,26 +258,26 @@ typedef union { -#define YYFINAL 450 +#define YYFINAL 457 #define YYFLAG -32768 -#define YYNTBASE 140 +#define YYNTBASE 142 -#define YYTRANSLATE(x) ((unsigned)(x) <= 374 ? yytranslate[x] : 212) +#define YYTRANSLATE(x) ((unsigned)(x) <= 376 ? yytranslate[x] : 214) static const short yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 120, 2, 130, - 131, 123, 122, 117, 121, 139, 124, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 136, 129, 2, - 137, 2, 138, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 122, 2, 132, + 133, 125, 124, 119, 123, 141, 126, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 138, 131, 2, + 139, 2, 140, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 134, 2, 135, 2, 2, 2, 2, 2, 2, 2, + 136, 2, 137, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 132, 119, 133, 125, 2, 2, 2, 2, + 2, 2, 134, 121, 135, 127, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -300,7 +302,7 @@ static const short yytranslate[] = { 0, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 118, 126, 127, 128 + 117, 118, 120, 128, 129, 130 }; #if YYDEBUG != 0 @@ -310,133 +312,136 @@ static const short yyprhs[] = { 0, 52, 55, 58, 60, 63, 66, 69, 74, 78, 82, 85, 89, 93, 94, 96, 98, 100, 104, 106, 111, 115, 122, 128, 129, 133, 137, 139, 143, 148, 149, - 151, 155, 157, 161, 166, 168, 173, 178, 180, 182, - 184, 186, 188, 193, 198, 203, 205, 210, 215, 220, - 222, 227, 232, 237, 242, 247, 249, 254, 256, 261, - 263, 265, 270, 272, 274, 276, 278, 280, 282, 284, - 289, 291, 293, 295, 297, 299, 301, 303, 308, 310, - 312, 317, 322, 327, 332, 334, 336, 341, 346, 348, - 349, 351, 352, 355, 360, 364, 370, 371, 374, 376, - 378, 382, 386, 388, 394, 396, 400, 401, 403, 405, - 407, 409, 415, 419, 423, 427, 431, 435, 439, 443, - 447, 450, 453, 456, 461, 466, 470, 472, 476, 478, - 483, 484, 487, 490, 494, 497, 499, 504, 512, 513, - 515, 516, 518, 520, 522, 524, 526, 528, 530, 532, - 534, 536, 539, 542, 544, 546, 548, 550, 552, 553, - 555, 557, 560, 563, 566, 568, 570, 573, 576, 579, - 584, 585, 588, 591, 594, 597, 600, 603, 607, 610, - 614, 620, 621, 624, 627, 630, 633, 639, 647, 649, - 652, 655, 658, 661, 664, 669, 672, 675, 677, 679, - 683, 685, 689, 691, 693, 699, 701, 703, 705, 708, - 710, 713, 715, 718, 720, 723, 728, 734, 745, 747 + 151, 155, 157, 161, 166, 168, 170, 175, 180, 182, + 184, 186, 188, 190, 195, 200, 205, 207, 212, 217, + 222, 224, 226, 231, 236, 241, 246, 251, 253, 258, + 260, 265, 271, 273, 275, 280, 282, 284, 286, 288, + 290, 292, 294, 299, 301, 303, 305, 307, 309, 311, + 313, 318, 320, 322, 327, 332, 337, 342, 344, 346, + 351, 356, 358, 359, 361, 362, 365, 370, 374, 380, + 381, 384, 386, 388, 392, 396, 398, 404, 406, 410, + 411, 413, 415, 417, 419, 425, 429, 433, 437, 441, + 445, 449, 453, 457, 460, 463, 466, 471, 476, 480, + 482, 486, 488, 493, 494, 497, 500, 504, 507, 509, + 514, 522, 523, 525, 526, 528, 530, 532, 534, 536, + 538, 540, 542, 544, 546, 549, 552, 554, 556, 558, + 560, 562, 563, 565, 567, 570, 573, 576, 578, 580, + 583, 586, 589, 594, 595, 598, 601, 604, 607, 610, + 613, 617, 620, 624, 630, 631, 634, 637, 640, 643, + 649, 657, 659, 662, 665, 668, 671, 674, 679, 682, + 685, 687, 689, 693, 695, 699, 701, 703, 709, 711, + 713, 715, 718, 720, 723, 725, 728, 730, 733, 738, + 744, 755, 757 }; -static const short yyrhs[] = { 141, - 0, 0, 141, 199, 0, 141, 198, 0, 141, 187, - 0, 141, 202, 0, 141, 150, 0, 141, 144, 0, - 0, 142, 199, 0, 142, 198, 0, 142, 187, 0, - 142, 202, 0, 142, 144, 0, 0, 143, 178, 129, - 0, 143, 144, 0, 129, 0, 164, 129, 0, 145, - 0, 168, 129, 0, 174, 129, 0, 147, 0, 207, - 129, 0, 209, 129, 0, 210, 129, 0, 37, 130, - 7, 131, 0, 62, 7, 129, 0, 146, 142, 9, - 0, 72, 3, 0, 158, 148, 132, 0, 149, 142, - 133, 0, 0, 153, 0, 113, 0, 154, 0, 153, - 117, 154, 0, 152, 0, 158, 208, 204, 155, 0, - 208, 204, 155, 0, 158, 208, 204, 130, 151, 131, - 0, 208, 204, 130, 151, 131, 0, 0, 134, 156, - 135, 0, 134, 123, 135, 0, 170, 0, 156, 117, - 171, 0, 156, 135, 134, 171, 0, 0, 158, 0, - 134, 159, 135, 0, 160, 0, 159, 117, 160, 0, - 159, 135, 134, 160, 0, 16, 0, 24, 130, 181, - 131, 0, 26, 130, 172, 131, 0, 33, 0, 34, - 0, 35, 0, 36, 0, 38, 0, 39, 130, 173, - 131, 0, 39, 130, 7, 131, 0, 41, 130, 7, - 131, 0, 43, 0, 44, 130, 7, 131, 0, 45, - 130, 7, 131, 0, 45, 130, 173, 131, 0, 50, - 0, 52, 130, 173, 131, 0, 53, 130, 7, 131, - 0, 54, 130, 7, 131, 0, 55, 130, 173, 131, - 0, 56, 130, 7, 131, 0, 57, 0, 59, 130, - 173, 131, 0, 60, 0, 61, 130, 181, 131, 0, - 64, 0, 67, 0, 71, 130, 169, 131, 0, 73, - 0, 77, 0, 78, 0, 79, 0, 80, 0, 81, - 0, 82, 0, 83, 130, 206, 131, 0, 85, 0, - 86, 0, 87, 0, 88, 0, 89, 0, 91, 0, - 92, 0, 95, 130, 169, 131, 0, 97, 0, 99, - 0, 102, 130, 171, 131, 0, 103, 130, 208, 131, - 0, 104, 130, 208, 131, 0, 109, 130, 8, 131, - 0, 110, 0, 111, 0, 112, 130, 211, 131, 0, - 115, 130, 208, 131, 0, 206, 0, 0, 98, 0, - 0, 162, 163, 0, 26, 171, 136, 176, 0, 38, - 136, 176, 0, 32, 208, 181, 137, 173, 0, 0, - 166, 117, 0, 166, 0, 167, 0, 166, 117, 167, - 0, 181, 137, 173, 0, 181, 0, 46, 180, 132, - 165, 133, 0, 170, 0, 169, 117, 170, 0, 0, - 171, 0, 5, 0, 6, 0, 3, 0, 171, 138, - 171, 136, 171, 0, 171, 119, 171, 0, 171, 120, - 171, 0, 171, 122, 171, 0, 171, 121, 171, 0, - 171, 123, 171, 0, 171, 124, 171, 0, 171, 10, - 171, 0, 171, 11, 171, 0, 125, 171, 0, 121, - 171, 0, 123, 171, 0, 130, 208, 131, 171, 0, - 96, 130, 208, 131, 0, 130, 171, 131, 0, 173, - 0, 172, 117, 173, 0, 171, 0, 48, 32, 208, - 181, 0, 0, 175, 176, 0, 177, 129, 0, 157, - 210, 129, 0, 158, 129, 0, 129, 0, 157, 208, - 204, 155, 0, 157, 208, 161, 204, 130, 151, 131, - 0, 0, 181, 0, 0, 3, 0, 4, 0, 3, - 0, 4, 0, 59, 0, 92, 0, 112, 0, 22, - 0, 114, 0, 184, 0, 94, 184, 0, 108, 184, - 0, 49, 0, 42, 0, 20, 0, 47, 0, 51, - 0, 0, 68, 0, 68, 0, 93, 183, 0, 74, - 183, 0, 58, 183, 0, 69, 0, 28, 0, 29, - 3, 0, 29, 4, 0, 158, 185, 0, 186, 132, - 188, 133, 0, 0, 188, 189, 0, 157, 199, 0, - 40, 3, 0, 40, 4, 0, 158, 190, 0, 84, - 136, 0, 192, 177, 129, 0, 75, 136, 0, 193, - 178, 129, 0, 191, 132, 192, 193, 133, 0, 0, - 136, 4, 0, 70, 3, 0, 70, 4, 0, 158, - 196, 0, 197, 195, 132, 143, 133, 0, 197, 136, - 3, 132, 147, 143, 133, 0, 194, 0, 196, 129, - 0, 190, 129, 0, 76, 3, 0, 76, 4, 0, - 158, 200, 0, 201, 132, 143, 133, 0, 123, 204, - 0, 32, 203, 0, 181, 0, 203, 0, 130, 204, - 131, 0, 204, 0, 205, 117, 204, 0, 90, 0, - 107, 0, 100, 180, 132, 175, 133, 0, 113, 0, - 4, 0, 182, 0, 32, 208, 0, 168, 0, 46, - 3, 0, 207, 0, 100, 3, 0, 210, 0, 106, - 3, 0, 105, 157, 208, 205, 0, 106, 180, 132, - 175, 133, 0, 106, 180, 101, 130, 177, 131, 179, - 132, 162, 133, 0, 5, 0, 5, 139, 5, 0 +static const short yyrhs[] = { 143, + 0, 0, 143, 201, 0, 143, 200, 0, 143, 189, + 0, 143, 204, 0, 143, 152, 0, 143, 146, 0, + 0, 144, 201, 0, 144, 200, 0, 144, 189, 0, + 144, 204, 0, 144, 146, 0, 0, 145, 180, 131, + 0, 145, 146, 0, 131, 0, 166, 131, 0, 147, + 0, 170, 131, 0, 176, 131, 0, 149, 0, 209, + 131, 0, 211, 131, 0, 212, 131, 0, 37, 132, + 7, 133, 0, 64, 7, 131, 0, 148, 144, 9, + 0, 74, 3, 0, 160, 150, 134, 0, 151, 144, + 135, 0, 0, 155, 0, 115, 0, 156, 0, 155, + 119, 156, 0, 154, 0, 160, 210, 206, 157, 0, + 210, 206, 157, 0, 160, 210, 206, 132, 153, 133, + 0, 210, 206, 132, 153, 133, 0, 0, 136, 158, + 137, 0, 136, 125, 137, 0, 172, 0, 158, 119, + 173, 0, 158, 137, 136, 173, 0, 0, 160, 0, + 136, 161, 137, 0, 162, 0, 161, 119, 162, 0, + 161, 137, 136, 162, 0, 16, 0, 18, 0, 24, + 132, 183, 133, 0, 26, 132, 174, 133, 0, 33, + 0, 34, 0, 35, 0, 36, 0, 38, 0, 39, + 132, 175, 133, 0, 39, 132, 7, 133, 0, 41, + 132, 7, 133, 0, 43, 0, 44, 132, 7, 133, + 0, 45, 132, 7, 133, 0, 45, 132, 175, 133, + 0, 48, 0, 51, 0, 53, 132, 175, 133, 0, + 54, 132, 7, 133, 0, 55, 132, 7, 133, 0, + 56, 132, 175, 133, 0, 57, 132, 7, 133, 0, + 58, 0, 60, 132, 175, 133, 0, 61, 0, 62, + 132, 183, 133, 0, 63, 132, 52, 3, 133, 0, + 66, 0, 69, 0, 73, 132, 171, 133, 0, 75, + 0, 79, 0, 80, 0, 81, 0, 82, 0, 83, + 0, 84, 0, 85, 132, 208, 133, 0, 87, 0, + 88, 0, 89, 0, 90, 0, 91, 0, 93, 0, + 94, 0, 97, 132, 171, 133, 0, 99, 0, 101, + 0, 104, 132, 173, 133, 0, 105, 132, 210, 133, + 0, 106, 132, 210, 133, 0, 111, 132, 8, 133, + 0, 112, 0, 113, 0, 114, 132, 213, 133, 0, + 117, 132, 210, 133, 0, 208, 0, 0, 100, 0, + 0, 164, 165, 0, 26, 173, 138, 178, 0, 38, + 138, 178, 0, 32, 210, 183, 139, 175, 0, 0, + 168, 119, 0, 168, 0, 169, 0, 168, 119, 169, + 0, 183, 139, 175, 0, 183, 0, 46, 182, 134, + 167, 135, 0, 172, 0, 171, 119, 172, 0, 0, + 173, 0, 5, 0, 6, 0, 3, 0, 173, 140, + 173, 138, 173, 0, 173, 121, 173, 0, 173, 122, + 173, 0, 173, 124, 173, 0, 173, 123, 173, 0, + 173, 125, 173, 0, 173, 126, 173, 0, 173, 10, + 173, 0, 173, 11, 173, 0, 127, 173, 0, 123, + 173, 0, 125, 173, 0, 132, 210, 133, 173, 0, + 98, 132, 210, 133, 0, 132, 173, 133, 0, 175, + 0, 174, 119, 175, 0, 173, 0, 49, 32, 210, + 183, 0, 0, 177, 178, 0, 179, 131, 0, 159, + 212, 131, 0, 160, 131, 0, 131, 0, 159, 210, + 206, 157, 0, 159, 210, 163, 206, 132, 153, 133, + 0, 0, 183, 0, 0, 3, 0, 4, 0, 3, + 0, 4, 0, 60, 0, 94, 0, 114, 0, 22, + 0, 116, 0, 186, 0, 96, 186, 0, 110, 186, + 0, 50, 0, 42, 0, 20, 0, 47, 0, 52, + 0, 0, 70, 0, 70, 0, 95, 185, 0, 76, + 185, 0, 59, 185, 0, 71, 0, 28, 0, 29, + 3, 0, 29, 4, 0, 160, 187, 0, 188, 134, + 190, 135, 0, 0, 190, 191, 0, 159, 201, 0, + 40, 3, 0, 40, 4, 0, 160, 192, 0, 86, + 138, 0, 194, 179, 131, 0, 77, 138, 0, 195, + 180, 131, 0, 193, 134, 194, 195, 135, 0, 0, + 138, 4, 0, 72, 3, 0, 72, 4, 0, 160, + 198, 0, 199, 197, 134, 145, 135, 0, 199, 138, + 3, 134, 149, 145, 135, 0, 196, 0, 198, 131, + 0, 192, 131, 0, 78, 3, 0, 78, 4, 0, + 160, 202, 0, 203, 134, 145, 135, 0, 125, 206, + 0, 32, 205, 0, 183, 0, 205, 0, 132, 206, + 133, 0, 206, 0, 207, 119, 206, 0, 92, 0, + 109, 0, 102, 182, 134, 177, 135, 0, 115, 0, + 4, 0, 184, 0, 32, 210, 0, 170, 0, 46, + 3, 0, 209, 0, 102, 3, 0, 212, 0, 108, + 3, 0, 107, 159, 210, 207, 0, 108, 182, 134, + 177, 135, 0, 108, 182, 103, 132, 179, 133, 181, + 134, 164, 135, 0, 5, 0, 5, 141, 5, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 229, 232, 233, 234, 235, 236, 237, 238, 241, 242, - 243, 244, 245, 246, 249, 250, 251, 254, 255, 256, - 257, 258, 259, 260, 261, 262, 265, 267, 270, 273, - 275, 277, 280, 281, 284, 287, 288, 289, 293, 297, - 300, 306, 313, 314, 315, 318, 319, 320, 323, 324, - 327, 331, 332, 333, 336, 338, 339, 340, 341, 342, - 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, - 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, - 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 389, 390, 391, 394, - 395, 398, 399, 404, 408, 414, 421, 422, 423, 426, - 427, 433, 438, 444, 452, 453, 466, 467, 470, 471, - 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, - 482, 483, 484, 485, 486, 487, 490, 491, 494, 499, - 504, 505, 510, 511, 512, 513, 516, 519, 530, 531, - 534, 535, 536, 539, 541, 542, 543, 544, 547, 548, - 549, 550, 551, 563, 564, 565, 566, 567, 570, 571, - 574, 575, 576, 577, 578, 579, 582, 583, 586, 592, - 597, 598, 601, 605, 606, 609, 621, 622, 625, 626, - 629, 644, 645, 648, 649, 652, 660, 668, 675, 678, - 680, 683, 684, 687, 692, 698, 699, 702, 703, 704, - 707, 709, 712, 714, 717, 727, 728, 729, 730, 731, - 732, 733, 734, 735, 736, 739, 751, 755, 768, 770 + 228, 231, 232, 233, 234, 235, 236, 237, 240, 241, + 242, 243, 244, 245, 248, 249, 250, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 264, 266, 269, 272, + 274, 276, 279, 280, 283, 286, 287, 288, 292, 296, + 299, 305, 312, 313, 314, 317, 318, 319, 322, 323, + 326, 330, 331, 332, 335, 337, 338, 339, 340, 341, + 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, + 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, + 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, + 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, + 392, 393, 396, 397, 400, 401, 406, 410, 416, 423, + 424, 425, 428, 429, 435, 440, 446, 454, 455, 468, + 469, 472, 473, 474, 475, 476, 477, 478, 479, 480, + 481, 482, 483, 484, 485, 486, 487, 488, 489, 492, + 493, 496, 502, 507, 508, 513, 514, 515, 516, 519, + 522, 533, 534, 537, 538, 539, 542, 544, 545, 546, + 547, 550, 551, 552, 553, 554, 566, 567, 568, 569, + 570, 573, 574, 577, 578, 579, 580, 581, 582, 585, + 586, 589, 595, 600, 601, 604, 608, 609, 612, 624, + 625, 628, 629, 632, 647, 648, 651, 652, 655, 663, + 671, 678, 681, 683, 686, 687, 690, 695, 701, 702, + 705, 706, 707, 710, 712, 715, 717, 720, 730, 731, + 732, 733, 734, 735, 736, 737, 738, 739, 742, 754, + 758, 771, 773 }; #endif @@ -450,22 +455,22 @@ static const char * const yytname[] = { "$","error","$undefined.","aIDENTIFIER "tCHAR","tCOCLASS","tCODE","tCOMMSTATUS","tCONST","tCONTEXTHANDLE","tCONTEXTHANDLENOSERIALIZE", "tCONTEXTHANDLESERIALIZE","tCONTROL","tCPPQUOTE","tDEFAULT","tDEFAULTVALUE", "tDISPINTERFACE","tDLLNAME","tDOUBLE","tDUAL","tENDPOINT","tENTRY","tENUM","tERRORSTATUST", -"tEXTERN","tFLOAT","tHANDLE","tHANDLET","tHELPCONTEXT","tHELPFILE","tHELPSTRING", -"tHELPSTRINGCONTEXT","tHELPSTRINGDLL","tHIDDEN","tHYPER","tID","tIDEMPOTENT", -"tIIDIS","tIMPORT","tIMPORTLIB","tIN","tINCLUDE","tINLINE","tINPUTSYNC","tINT", -"tINT64","tINTERFACE","tLENGTHIS","tLIBRARY","tLOCAL","tLONG","tMETHODS","tMODULE", -"tNONCREATABLE","tOBJECT","tODL","tOLEAUTOMATION","tOPTIONAL","tOUT","tPOINTERDEFAULT", -"tPROPERTIES","tPROPGET","tPROPPUT","tPROPPUTREF","tPUBLIC","tREADONLY","tREF", -"tRESTRICTED","tRETVAL","tSHORT","tSIGNED","tSIZEIS","tSIZEOF","tSOURCE","tSTDCALL", -"tSTRING","tSTRUCT","tSWITCH","tSWITCHIS","tSWITCHTYPE","tTRANSMITAS","tTYPEDEF", -"tUNION","tUNIQUE","tUNSIGNED","tUUID","tV1ENUM","tVARARG","tVERSION","tVOID", -"tWCHAR","tWIREMARSHAL","tPOINTERTYPE","','","COND","'|'","'&'","'-'","'+'", -"'*'","'/'","'~'","CAST","PPTR","NEG","';'","'('","')'","'{'","'}'","'['","']'", -"':'","'='","'?'","'.'","input","gbl_statements","imp_statements","int_statements", -"statement","cppquote","import_start","import","libraryhdr","library_start", -"librarydef","m_args","no_args","args","arg","array","array_list","m_attributes", -"attributes","attrib_list","attribute","callconv","cases","case","constdef", -"enums","enum_list","enum","enumdef","m_exprs","m_expr","expr","expr_list_const", +"tEXPLICITHANDLE","tEXTERN","tFLOAT","tHANDLE","tHANDLET","tHELPCONTEXT","tHELPFILE", +"tHELPSTRING","tHELPSTRINGCONTEXT","tHELPSTRINGDLL","tHIDDEN","tHYPER","tID", +"tIDEMPOTENT","tIIDIS","tIMPLICITHANDLE","tIMPORT","tIMPORTLIB","tIN","tINCLUDE", +"tINLINE","tINPUTSYNC","tINT","tINT64","tINTERFACE","tLENGTHIS","tLIBRARY","tLOCAL", +"tLONG","tMETHODS","tMODULE","tNONCREATABLE","tOBJECT","tODL","tOLEAUTOMATION", +"tOPTIONAL","tOUT","tPOINTERDEFAULT","tPROPERTIES","tPROPGET","tPROPPUT","tPROPPUTREF", +"tPUBLIC","tREADONLY","tREF","tRESTRICTED","tRETVAL","tSHORT","tSIGNED","tSIZEIS", +"tSIZEOF","tSOURCE","tSTDCALL","tSTRING","tSTRUCT","tSWITCH","tSWITCHIS","tSWITCHTYPE", +"tTRANSMITAS","tTYPEDEF","tUNION","tUNIQUE","tUNSIGNED","tUUID","tV1ENUM","tVARARG", +"tVERSION","tVOID","tWCHAR","tWIREMARSHAL","tPOINTERTYPE","','","COND","'|'", +"'&'","'-'","'+'","'*'","'/'","'~'","CAST","PPTR","NEG","';'","'('","')'","'{'", +"'}'","'['","']'","':'","'='","'?'","'.'","input","gbl_statements","imp_statements", +"int_statements","statement","cppquote","import_start","import","libraryhdr", +"library_start","librarydef","m_args","no_args","args","arg","array","array_list", +"m_attributes","attributes","attrib_list","attribute","callconv","cases","case", +"constdef","enums","enum_list","enum","enumdef","m_exprs","m_expr","expr","expr_list_const", "expr_const","externdef","fields","field","s_field","funcdef","m_ident","t_ident", "ident","base_type","m_int","int_std","coclass","coclasshdr","coclassdef","coclass_ints", "coclass_int","dispinterface","dispinterfacehdr","dispint_props","dispint_meths", @@ -476,30 +481,31 @@ static const char * const yytname[] = { "$","error","$undefined.","aIDENTIFIER #endif static const short yyr1[] = { 0, - 140, 141, 141, 141, 141, 141, 141, 141, 142, 142, - 142, 142, 142, 142, 143, 143, 143, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 145, 146, 147, 148, - 149, 150, 151, 151, 152, 153, 153, 153, 154, 154, - 154, 154, 155, 155, 155, 156, 156, 156, 157, 157, - 158, 159, 159, 159, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 161, - 161, 162, 162, 163, 163, 164, 165, 165, 165, 166, - 166, 167, 167, 168, 169, 169, 170, 170, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 172, 172, 173, 174, - 175, 175, 176, 176, 176, 176, 177, 178, 179, 179, - 180, 180, 180, 181, 181, 181, 181, 181, 182, 182, - 182, 182, 182, 182, 182, 182, 182, 182, 183, 183, - 184, 184, 184, 184, 184, 184, 185, 185, 186, 187, - 188, 188, 189, 190, 190, 191, 192, 192, 193, 193, - 194, 195, 195, 196, 196, 197, 198, 198, 198, 199, - 199, 200, 200, 201, 202, 203, 203, 204, 204, 204, - 205, 205, 206, 206, 207, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 209, 210, 210, 211, 211 + 142, 143, 143, 143, 143, 143, 143, 143, 144, 144, + 144, 144, 144, 144, 145, 145, 145, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 147, 148, 149, 150, + 151, 152, 153, 153, 154, 155, 155, 155, 156, 156, + 156, 156, 157, 157, 157, 158, 158, 158, 159, 159, + 160, 161, 161, 161, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 163, 163, 164, 164, 165, 165, 166, 167, + 167, 167, 168, 168, 169, 169, 170, 171, 171, 172, + 172, 173, 173, 173, 173, 173, 173, 173, 173, 173, + 173, 173, 173, 173, 173, 173, 173, 173, 173, 174, + 174, 175, 176, 177, 177, 178, 178, 178, 178, 179, + 180, 181, 181, 182, 182, 182, 183, 183, 183, 183, + 183, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 184, 185, 185, 186, 186, 186, 186, 186, 186, 187, + 187, 188, 189, 190, 190, 191, 192, 192, 193, 194, + 194, 195, 195, 196, 197, 197, 198, 198, 199, 200, + 200, 200, 201, 201, 202, 202, 203, 204, 205, 205, + 206, 206, 206, 207, 207, 208, 208, 209, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 211, 212, + 212, 213, 213 }; static const short yyr2[] = { 0, @@ -508,321 +514,338 @@ static const short yyr2[] = { 0, 2, 2, 1, 2, 2, 2, 4, 3, 3, 2, 3, 3, 0, 1, 1, 1, 3, 1, 4, 3, 6, 5, 0, 3, 3, 1, 3, 4, 0, 1, - 3, 1, 3, 4, 1, 4, 4, 1, 1, 1, - 1, 1, 4, 4, 4, 1, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 1, 4, 1, 4, 1, - 1, 4, 1, 1, 1, 1, 1, 1, 1, 4, - 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, - 4, 4, 4, 4, 1, 1, 4, 4, 1, 0, - 1, 0, 2, 4, 3, 5, 0, 2, 1, 1, - 3, 3, 1, 5, 1, 3, 0, 1, 1, 1, - 1, 5, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 2, 2, 4, 4, 3, 1, 3, 1, 4, - 0, 2, 2, 3, 2, 1, 4, 7, 0, 1, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 1, 1, 1, 1, 1, 0, 1, - 1, 2, 2, 2, 1, 1, 2, 2, 2, 4, - 0, 2, 2, 2, 2, 2, 2, 3, 2, 3, - 5, 0, 2, 2, 2, 2, 5, 7, 1, 2, - 2, 2, 2, 2, 4, 2, 2, 1, 1, 3, - 1, 3, 1, 1, 5, 1, 1, 1, 2, 1, - 2, 1, 2, 1, 2, 4, 5, 10, 1, 3 + 3, 1, 3, 4, 1, 1, 4, 4, 1, 1, + 1, 1, 1, 4, 4, 4, 1, 4, 4, 4, + 1, 1, 4, 4, 4, 4, 4, 1, 4, 1, + 4, 5, 1, 1, 4, 1, 1, 1, 1, 1, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 4, 1, 1, 4, 4, 4, 4, 1, 1, 4, + 4, 1, 0, 1, 0, 2, 4, 3, 5, 0, + 2, 1, 1, 3, 3, 1, 5, 1, 3, 0, + 1, 1, 1, 1, 5, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 2, 2, 4, 4, 3, 1, + 3, 1, 4, 0, 2, 2, 3, 2, 1, 4, + 7, 0, 1, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, + 1, 0, 1, 1, 2, 2, 2, 1, 1, 2, + 2, 2, 4, 0, 2, 2, 2, 2, 2, 2, + 3, 2, 3, 5, 0, 2, 2, 2, 2, 5, + 7, 1, 2, 2, 2, 2, 2, 4, 2, 2, + 1, 1, 3, 1, 3, 1, 1, 5, 1, 1, + 1, 2, 1, 2, 1, 2, 1, 2, 4, 5, + 10, 1, 3 }; static const short yydefact[] = { 2, - 1, 0, 0, 0, 161, 0, 0, 0, 161, 49, - 161, 18, 0, 8, 20, 9, 23, 9, 7, 0, - 0, 0, 0, 0, 5, 0, 0, 209, 0, 202, - 4, 3, 0, 6, 0, 0, 0, 227, 176, 169, - 186, 0, 175, 161, 177, 174, 178, 179, 181, 185, - 179, 179, 0, 161, 161, 0, 226, 170, 230, 228, - 171, 232, 0, 234, 0, 194, 195, 162, 163, 0, - 0, 0, 204, 205, 0, 0, 50, 0, 55, 0, - 0, 58, 59, 60, 61, 62, 0, 0, 66, 0, - 0, 70, 0, 0, 0, 0, 0, 76, 0, 78, - 0, 80, 81, 0, 83, 84, 85, 86, 87, 88, - 89, 0, 91, 92, 93, 94, 95, 223, 96, 97, - 0, 99, 100, 0, 0, 0, 224, 0, 105, 106, - 0, 0, 0, 52, 109, 0, 0, 0, 0, 0, - 0, 189, 196, 206, 214, 19, 21, 22, 191, 211, - 0, 210, 0, 0, 15, 24, 25, 26, 229, 231, - 180, 184, 183, 182, 172, 233, 235, 173, 164, 165, - 166, 167, 168, 0, 0, 117, 0, 28, 151, 0, - 0, 151, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 127, 0, 127, 0, 0, - 0, 0, 0, 0, 0, 51, 29, 14, 0, 12, - 11, 10, 13, 32, 187, 188, 30, 212, 213, 31, - 49, 0, 49, 0, 203, 15, 49, 0, 27, 0, - 119, 120, 123, 150, 49, 0, 0, 0, 218, 219, - 221, 236, 49, 49, 0, 131, 129, 130, 0, 0, - 0, 0, 0, 149, 0, 147, 0, 0, 0, 0, + 1, 0, 0, 0, 164, 0, 0, 0, 164, 49, + 164, 18, 0, 8, 20, 9, 23, 9, 7, 0, + 0, 0, 0, 0, 5, 0, 0, 212, 0, 205, + 4, 3, 0, 6, 0, 0, 0, 230, 179, 172, + 189, 0, 178, 164, 180, 177, 181, 182, 184, 188, + 182, 182, 0, 164, 164, 0, 229, 173, 233, 231, + 174, 235, 0, 237, 0, 197, 198, 165, 166, 0, + 0, 0, 207, 208, 0, 0, 50, 0, 55, 56, + 0, 0, 59, 60, 61, 62, 63, 0, 0, 67, + 0, 0, 71, 72, 0, 0, 0, 0, 0, 78, + 0, 80, 0, 0, 83, 84, 0, 86, 87, 88, + 89, 90, 91, 92, 0, 94, 95, 96, 97, 98, + 226, 99, 100, 0, 102, 103, 0, 0, 0, 227, + 0, 108, 109, 0, 0, 0, 52, 112, 0, 0, + 0, 0, 0, 0, 192, 199, 209, 217, 19, 21, + 22, 194, 214, 0, 213, 0, 0, 15, 24, 25, + 26, 232, 234, 183, 187, 186, 185, 175, 236, 238, + 176, 167, 168, 169, 170, 171, 0, 0, 120, 0, + 28, 154, 0, 0, 154, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, + 0, 130, 0, 0, 0, 0, 0, 0, 0, 51, + 29, 14, 0, 12, 11, 10, 13, 32, 190, 191, + 30, 215, 216, 31, 49, 0, 49, 0, 206, 15, + 49, 0, 27, 0, 122, 123, 126, 153, 49, 0, + 0, 0, 221, 222, 224, 239, 49, 49, 0, 134, + 132, 133, 0, 0, 0, 0, 0, 152, 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 128, 0, 0, 0, 0, 0, 0, 239, 0, - 0, 53, 0, 190, 0, 192, 197, 0, 0, 0, - 49, 0, 49, 215, 17, 0, 0, 116, 124, 118, - 0, 156, 225, 0, 50, 152, 0, 217, 216, 0, - 0, 0, 237, 56, 0, 142, 143, 141, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 57, 64, 63, 65, 67, 68, 69, 71, 72, 73, - 74, 75, 77, 79, 127, 82, 90, 98, 101, 102, - 103, 104, 0, 107, 108, 54, 193, 199, 0, 198, - 201, 0, 15, 207, 110, 16, 121, 122, 234, 155, - 153, 220, 222, 159, 0, 146, 0, 139, 140, 133, - 134, 136, 135, 137, 138, 0, 148, 126, 240, 43, - 200, 49, 111, 0, 154, 0, 160, 145, 144, 0, - 127, 157, 208, 0, 112, 132, 0, 0, 46, 33, - 0, 45, 0, 44, 226, 0, 38, 34, 36, 0, - 0, 0, 0, 238, 113, 47, 0, 158, 0, 0, - 43, 0, 49, 48, 37, 43, 33, 40, 49, 115, - 33, 39, 0, 114, 0, 42, 41, 0, 0, 0 + 0, 0, 0, 0, 0, 128, 131, 0, 0, 0, + 0, 0, 0, 242, 0, 0, 53, 0, 193, 0, + 195, 200, 0, 0, 0, 49, 0, 49, 218, 17, + 0, 0, 119, 127, 121, 0, 159, 228, 0, 50, + 155, 0, 220, 219, 0, 0, 0, 240, 57, 0, + 145, 146, 144, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 58, 65, 64, 66, 68, + 69, 70, 73, 74, 75, 76, 77, 79, 81, 0, + 130, 85, 93, 101, 104, 105, 106, 107, 0, 110, + 111, 54, 196, 202, 0, 201, 204, 0, 15, 210, + 113, 16, 124, 125, 237, 158, 156, 223, 225, 162, + 0, 149, 0, 142, 143, 136, 137, 139, 138, 140, + 141, 0, 151, 82, 129, 243, 43, 203, 49, 114, + 0, 157, 0, 163, 148, 147, 0, 130, 160, 211, + 0, 115, 135, 0, 0, 46, 33, 0, 45, 0, + 44, 229, 0, 38, 34, 36, 0, 0, 0, 0, + 241, 116, 47, 0, 161, 0, 0, 43, 0, 49, + 48, 37, 43, 33, 40, 49, 118, 33, 39, 0, + 117, 0, 42, 41, 0, 0, 0 }; -static const short yydefgoto[] = { 448, - 1, 136, 227, 295, 15, 16, 17, 141, 18, 19, - 416, 417, 418, 419, 402, 408, 296, 77, 133, 134, - 394, 411, 425, 21, 230, 231, 232, 59, 270, 271, - 254, 255, 256, 23, 235, 306, 307, 297, 396, 70, - 239, 60, 162, 61, 142, 24, 210, 221, 286, 26, - 27, 223, 291, 28, 154, 29, 30, 211, 212, 145, - 33, 213, 240, 241, 242, 135, 62, 421, 36, 64, - 280 +static const short yydefgoto[] = { 455, + 1, 139, 231, 300, 15, 16, 17, 144, 18, 19, + 423, 424, 425, 426, 409, 415, 301, 77, 136, 137, + 401, 418, 432, 21, 234, 235, 236, 59, 275, 276, + 258, 259, 260, 23, 239, 311, 312, 302, 403, 70, + 243, 60, 165, 61, 145, 24, 214, 225, 291, 26, + 27, 227, 296, 28, 157, 29, 30, 215, 216, 148, + 33, 217, 244, 245, 246, 138, 62, 428, 36, 64, + 285 }; static const short yypact[] = {-32768, - 592, 576, 0, 79, 100, 88, 131, 208, 100, -77, - 100,-32768, 723,-32768,-32768,-32768,-32768,-32768,-32768, 35, - 14, 27, 57, 63,-32768, 71, 66,-32768, 74, 70, --32768,-32768, 82,-32768, 96, 102, 115,-32768,-32768,-32768, --32768, 576,-32768, 214,-32768,-32768,-32768, 183,-32768,-32768, - 183, 183, 407, 217, 219, 407,-32768,-32768,-32768,-32768, --32768,-32768, 25,-32768, 143,-32768,-32768,-32768,-32768, 126, - 576, 133,-32768,-32768, 138, 576,-32768, -78,-32768, 135, - 154,-32768,-32768,-32768,-32768,-32768, 155, 156,-32768, 158, - 161,-32768, 162, 165, 170, 171, 172,-32768, 176,-32768, - 178,-32768,-32768, 179,-32768,-32768,-32768,-32768,-32768,-32768, --32768, 180,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 181,-32768,-32768, 184, 185, 187,-32768, 191,-32768,-32768, - 193, 194, -73,-32768,-32768, 487, -7, 238, 310, 246, - 195,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 242,-32768, 252, 197,-32768,-32768,-32768,-32768,-32768, 198, --32768,-32768,-32768,-32768,-32768, 198, -67,-32768,-32768,-32768, --32768,-32768,-32768, 199, 206, 25, 25,-32768,-32768, 438, - 213,-32768, 25, 413, 103, 337, 338, 383, 413, 341, - 343, 413, 345, 413, 25, 413, -39, 413, 413, 576, - 576, 346, 348, 576, 723, 221,-32768,-32768, 18,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 130, 220, -60, 228,-32768,-32768, 580, 413,-32768, 224, - 244,-32768, 226,-32768, -10, -22, 438, 438,-32768,-32768, --32768, 245, -77, 75, 233,-32768,-32768,-32768, 235, 413, - 413, 413, 452, 258, -72,-32768, 236, 253, 254, 260, - 261, 267, 268, 270, 272, 273, 274, 276, 279, -61, --32768, 258, 280, -44, 50, 281, 284, 286, 227, 289, - 291,-32768, 723,-32768, 8,-32768,-32768, 239, 576, 247, - 145, 321, 611,-32768,-32768, 576, 294,-32768,-32768, 25, - 413,-32768,-32768, 576, 295,-32768, 297,-32768,-32768, 296, - 438, 298,-32768,-32768, 576, 292, 292, 292, 56, 302, - 413, 413, 413, 413, 413, 413, 413, 413, 413, 413, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 413,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 432,-32768,-32768,-32768,-32768,-32768, 438,-32768, --32768, 340,-32768,-32768, 361,-32768,-32768,-32768, 342,-32768, --32768,-32768,-32768, 25, 308,-32768, 413, 292, 292, 69, - 249, 21, 21, 11, 11, 324,-32768,-32768,-32768, 333, --32768, 619,-32768, 438,-32768, 350,-32768,-32768, 292, 413, - 458,-32768,-32768, 347,-32768, 258, 152, -64,-32768, 225, - -2,-32768, 413, 339, -36, 352,-32768, 368,-32768, 576, - 438, 413, 351,-32768,-32768, 258, 413,-32768, 300, 438, - -84, 330, -16, 258,-32768, -18, 225,-32768, -16,-32768, - 225,-32768, 355,-32768, 357,-32768,-32768, 478, 489,-32768 + 634, 592, -72, 85, 119, 88, 130, 176, 119, 12, + 119,-32768, 788,-32768,-32768,-32768,-32768,-32768,-32768, 239, + 42, 73, 76, 63,-32768, 82, 84,-32768, 93, 92, +-32768,-32768, 112,-32768, 95, 118, 134,-32768,-32768,-32768, +-32768, 592,-32768, 186,-32768,-32768,-32768, 189,-32768,-32768, + 189, 189, 8, 208, 212, 8,-32768,-32768,-32768,-32768, +-32768,-32768, 16,-32768, 139,-32768,-32768,-32768,-32768, 133, + 592, 138,-32768,-32768, 147, 592,-32768, -61,-32768,-32768, + 150, 151,-32768,-32768,-32768,-32768,-32768, 152, 164,-32768, + 165, 173,-32768,-32768, 174, 177, 183, 184, 187,-32768, + 190,-32768, 193, 194,-32768,-32768, 195,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, 197,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 199,-32768,-32768, 200, 201, 202,-32768, + 203,-32768,-32768, 205, 209, -78,-32768,-32768, 546, 603, + 218, 337, 249, 214,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 260,-32768, 258, 216,-32768,-32768,-32768, +-32768,-32768, 217,-32768,-32768,-32768,-32768,-32768, 217, -47, +-32768,-32768,-32768,-32768,-32768,-32768, 213, 220, 16, 16, +-32768,-32768, 282, 223,-32768, 16, 110, 222, 349, 351, + 414, 110, 352, 355, 110, 356, 110, 16, 320, 110, + -35, 110, 110, 592, 592, 366, 373, 592, 788, 243, +-32768,-32768, 299,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, -87, 242, -54, 252,-32768,-32768, + -2, 110,-32768, 248, 274,-32768, 255,-32768, -24, -11, + 282, 282,-32768,-32768,-32768, 278, 12, -10, 265,-32768, +-32768,-32768, 269, 110, 110, 110, 474, 266, -95,-32768, + 275, 277, 280, 285, 289, 292, 293, 294, 297, 298, + 300, 307, 308, 408, -58,-32768, 266, 309, -48, 70, + 311, 313, 317, 310, 319, 321,-32768, 788,-32768, -6, +-32768,-32768, 315, 592, 284, 128, 392, 667,-32768,-32768, + 592, 326,-32768,-32768, 16, 110,-32768,-32768, 592, 327, +-32768, 328,-32768,-32768, 329, 282, 331,-32768,-32768, 592, + 325, 325, 325, 167, 333, 110, 110, 110, 110, 110, + 110, 110, 110, 110, 110,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 334, + 110,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 455,-32768, +-32768,-32768,-32768,-32768, 282,-32768,-32768, 339,-32768,-32768, + 381,-32768,-32768,-32768, 354,-32768,-32768,-32768,-32768, 16, + 358,-32768, 110, 325, 325, 35, 59, 15, 15, 22, + 22, 244,-32768,-32768,-32768,-32768, 346,-32768, 680,-32768, + 282,-32768, 359,-32768,-32768, 325, 110, 431,-32768,-32768, + 360,-32768, 266, 49, -69,-32768, 228, -16,-32768, 110, + 347, -36, 362,-32768, 365,-32768, 592, 282, 110, 348, +-32768,-32768, 266, 110,-32768, 353, 282, -4, 350, -41, + 266,-32768, 66, 228,-32768, -41,-32768, 228,-32768, 364, +-32768, 367,-32768,-32768, 487, 498,-32768 }; static const short yypgoto[] = {-32768, --32768, 472, -212, 16,-32768,-32768, 200,-32768,-32768,-32768, - -309,-32768,-32768, 62, -302,-32768, -8, -1,-32768, -186, --32768,-32768,-32768,-32768,-32768,-32768, 202, 5, 307, -325, - -161,-32768, -176,-32768, 311, -337, -174, 204,-32768, 31, - -62,-32768, 229, 129,-32768,-32768, 506,-32768,-32768, -13, --32768,-32768,-32768,-32768,-32768, -12,-32768, 510, 4,-32768, --32768, 511, 278, -211,-32768, 318, 10, 1,-32768, 3, +-32768, 481, -215, 13,-32768,-32768, 204,-32768,-32768,-32768, + -313,-32768,-32768, 67, -339,-32768, -8, -1,-32768, -192, +-32768,-32768,-32768,-32768,-32768,-32768, 206, 5, 302, -322, + -163,-32768, -179,-32768, 322, -382, -196, 219,-32768, 54, + -62,-32768, 221, 45,-32768,-32768, 504,-32768,-32768, -13, +-32768,-32768,-32768,-32768,-32768, -12,-32768, 507, 4,-32768, +-32768, 508, 270, -214,-32768, 312, 10, 1,-32768, 3, -32768 }; -#define YYLAST 838 +#define YYLAST 905 static const short yytable[] = { 20, - 174, 76, 63, 37, 32, 22, 143, 144, 258, 236, - 35, 262, 263, 293, 288, 266, 14, 268, 282, 388, - 321, 322, 181, 422, 2, 309, 310, 169, 170, 3, - 321, 322, 4, -162, 272, 423, 272, 275, 5, 75, - 6, 78, 159, 205, 330, 437, 138, 4, 290, 401, - 118, 298, 413, 182, 7, 345, 13, 4, 331, 321, - 322, 206, 8, 138, -162, 321, 322, 127, 312, 346, - 414, 177, 345, 13, 4, 409, 180, 8, 321, 322, - -35, 66, 67, 171, 75, 78, 348, 8, 316, 317, - 318, 319, 9, 140, -35, 440, 356, 10, 11, 373, - 237, 444, 68, 69, 8, 246, 139, 247, 248, 257, - 140, 441, 302, 233, 234, 401, 172, 13, 302, 71, - 245, 12, 303, 13, 368, 214, 13, 443, 438, 65, - 424, 445, 269, 442, 209, 209, 173, 72, 37, 37, - 22, 22, 146, 327, 328, 35, 35, 390, 329, 175, - 392, 208, 208, 387, 246, 147, 247, 248, 329, 378, - 379, 380, 381, 382, 383, 384, 385, 386, 323, 324, - 325, 326, 327, 328, 323, 324, 325, 326, 327, 328, - 349, 165, 404, 272, 168, 148, 376, 329, 324, 325, - 326, 327, 328, 329, 149, 143, 144, 151, 249, 150, - 276, 277, 152, 302, 281, 153, 329, 313, 13, 431, - 73, 74, 285, 155, 289, 399, 160, 69, 436, 166, - 69, 167, 69, 250, 156, 251, 304, 252, 38, 37, - 157, 22, 253, 305, 289, 304, 35, 233, 406, 272, - 215, 216, 305, 158, 39, 317, 40, 249, 218, 219, - 161, 426, 41, 320, 224, 225, 42, 176, 321, 322, - 432, 178, 284, 13, 183, 434, 43, 321, 322, 179, - 44, 45, 250, 46, 251, 47, 252, 361, 13, 163, - 164, 253, 48, 184, 185, 186, 412, 187, 357, 359, - 188, 189, 49, 50, 190, 37, 365, 22, 51, 191, - 192, 193, 35, 38, 359, 194, 369, 195, 196, 197, - 198, 397, 217, 199, 200, 375, 201, 52, 53, 39, - 202, 40, 203, 204, 54, 222, 220, 41, 226, -162, - 55, 42, 56, 321, 322, 228, 229, 415, 58, 321, - 322, 43, 243, 259, 260, 44, 45, 264, 46, 265, - 47, 267, 279, 278, 283, 287, 299, 48, 13, 292, - 300, 311, 301, 314, 315, 353, 332, 49, 50, 325, - 326, 327, 328, 51, 358, 360, 323, 324, 325, 326, - 327, 328, 7, 333, 334, 246, 329, 247, 248, 261, - 335, 336, 52, 53, 37, 329, 22, 337, 338, 54, - 339, 35, 340, 341, 342, 55, 343, 56, 420, 344, - 347, 350, 57, 58, 351, 246, 352, 247, 248, 354, - 430, 355, 366, 370, 304, 371, 372, 420, 374, 329, - 304, 305, 377, 13, 41, 420, 389, 305, 398, 420, - 169, 170, 323, 324, 325, 326, 327, 328, 323, 324, - 325, 326, 327, 328, 246, 38, 247, 248, 393, 400, - 246, 329, 247, 248, 48, 439, 401, 329, 391, 236, - 395, 39, 427, 40, 49, 50, 410, 449, 249, 41, - 51, 405, 428, 42, 429, 446, 433, 447, 450, 137, - 435, 363, 244, 43, 362, 207, 171, 44, 45, 52, - 46, 367, 47, 250, 274, 251, 25, 252, 249, 48, - 31, 34, 253, 308, 273, 0, 0, 0, 2, 49, - 50, 0, 0, 3, 0, 51, 4, 0, 0, 172, - 0, 0, 5, 250, 6, 251, 0, 252, 0, 0, - 0, 0, 253, 0, 52, 53, 0, 249, 7, 173, - 0, 54, 0, 249, 0, 0, 8, 55, 0, 56, - 237, 0, 0, 0, 57, 58, 0, 238, 0, 0, - 0, 0, 250, 0, 251, 0, 252, 0, 250, 38, - 407, 253, 252, 0, 0, 0, 9, 253, 0, 0, - 0, 10, 11, 0, 0, 39, 0, 40, 0, 0, - 0, 0, 0, 41, 0, 0, 0, 42, 0, 0, - 0, 2, 0, 0, 0, 12, 3, 43, 0, 0, - 13, 44, 45, 2, 46, 5, 47, 6, 3, 0, - 0, 4, 0, 48, 0, 0, 0, 5, 0, 6, - 0, 7, 2, 49, 50, 0, 0, 3, 0, 51, - 2, 0, 0, 7, 0, 3, 5, 0, 6, 0, - 0, 8, 0, 0, 5, 0, 6, 0, 52, 53, - 0, 0, 7, 0, 0, 54, 0, 0, 0, 9, - 7, 55, 0, 56, 10, 11, 0, 0, 57, 58, + 177, 76, 63, 37, 32, 22, 146, 147, 262, 429, + 35, 266, 267, 14, 298, 270, 287, 272, 172, 173, + 240, 430, 293, 335, 326, 327, 314, 315, 395, 2, + 295, 326, 327, 4, 3, 41, 277, 336, 277, 280, + 209, 184, 162, 5, 326, 327, 6, 289, 13, 420, + 317, 250, 303, 251, 252, -165, 121, 447, 210, 65, + 351, 7, 75, 451, 78, 8, 48, 421, 326, 327, + 351, 180, 185, 130, 352, 174, 183, 49, 50, 326, + 327, 13, -35, 51, 354, 416, -165, 66, 67, 307, + 321, 322, 323, 324, 13, 362, -35, 168, 445, 9, + 171, 379, 52, 449, 10, 11, 307, 75, 78, 175, + 308, 13, 250, 241, 251, 252, 237, 238, 431, 71, + 307, 68, 69, 249, 318, 13, 374, 444, 12, 176, + 450, 408, 299, 13, 452, 273, 72, 213, 213, 332, + 333, 37, 37, 22, 22, 178, 253, 13, 35, 35, + 397, 212, 212, 399, 334, 393, 329, 330, 331, 332, + 333, 334, 384, 385, 386, 387, 388, 389, 390, 391, + 392, 254, 149, 255, 334, 256, 326, 327, 73, 74, + 257, 330, 331, 332, 333, 419, 411, 277, 163, 69, + 328, 329, 330, 331, 332, 333, 152, 448, 334, 146, + 147, 408, 355, 150, 281, 282, 151, 253, 286, 334, + 169, 69, 153, 438, 170, 69, 290, 154, 294, 406, + 219, 220, 443, 155, 250, 159, 251, 252, 261, 156, + 309, 38, 254, 37, 255, 22, 256, 310, 294, 309, + 35, 257, 237, 413, 277, 158, 310, 39, 160, 40, + 322, 222, 223, 326, 327, 41, 433, 325, 164, 42, + 228, 229, 367, 13, 161, 439, 179, 141, 181, 43, + 441, 166, 167, 44, 45, 326, 327, 46, 4, 47, + 182, 186, 187, 188, 172, 173, 48, 328, 329, 330, + 331, 332, 333, 363, 365, 189, 190, 49, 50, 382, + 37, 371, 22, 51, 191, 192, 334, 35, 193, 365, + 8, 375, 142, 240, 194, 195, 143, 404, 196, 253, + 381, 197, 52, 53, 198, 199, 200, 141, 201, 54, + 202, 203, 204, 205, 206, 55, 207, 56, 4, 221, + 208, 174, 422, 58, 254, 226, 255, 224, 256, 230, + -165, 232, 233, 257, 247, 263, 38, 264, 268, 326, + 327, 269, 271, 13, 328, 329, 330, 331, 332, 333, + 8, 274, 39, 283, 40, 175, 143, 284, 288, 292, + 41, 407, 304, 334, 42, 297, 328, 329, 330, 331, + 332, 333, 305, 306, 43, 176, 316, 319, 44, 45, + 320, 37, 46, 22, 47, 334, 241, 337, 35, 338, + 350, 48, 339, 242, 366, 427, 250, 340, 251, 252, + 265, 341, 49, 50, 342, 343, 344, 437, 51, 345, + 346, 309, 347, 250, 427, 251, 252, 309, 310, 348, + 349, 353, 427, 356, 310, 357, 427, 52, 53, 358, + 359, 360, 364, 361, 54, 7, 372, 376, 377, 396, + 55, 378, 56, 380, 334, 383, 394, 57, 58, 398, + 328, 329, 330, 331, 332, 333, 250, 38, 251, 252, + 400, 408, 434, 436, 402, 440, 456, 446, 13, 334, + 405, 417, 412, 39, 435, 40, 453, 457, 140, 454, + 369, 41, 442, 279, 25, 42, 248, 31, 34, 313, + 373, 253, 278, 0, 368, 43, 0, 0, 0, 44, + 45, 0, 0, 46, 0, 47, 0, 0, 253, 0, + 0, 0, 48, 0, 0, 0, 254, 0, 255, 0, + 256, 0, 0, 49, 50, 257, 0, 0, 0, 51, + 0, 0, 0, 254, 211, 414, 0, 256, 0, 0, + 0, 0, 257, 0, 0, 0, 0, 0, 52, 53, + 0, 253, 0, 0, 0, 54, 0, 2, 0, 0, + 0, 55, 3, 56, 0, 4, 0, 0, 57, 58, + 0, 5, 0, 0, 6, 38, 254, 0, 255, 0, + 256, 0, 0, 0, 0, 257, 0, 0, 0, 7, + 0, 39, 0, 40, 0, 0, 0, 8, 0, 41, + 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 43, 2, 0, 0, 44, 45, 3, + 0, 46, 4, 47, 0, 0, 0, 9, 5, 0, + 48, 6, 10, 11, 0, 0, 0, 0, 0, 0, + 0, 49, 50, 0, 0, 2, 7, 51, 0, 0, + 3, 0, 0, 4, 8, 0, 12, 0, 0, 5, + 0, 13, 6, 0, 0, 0, 52, 53, 0, 0, + 0, 0, 0, 54, 0, 0, 0, 7, 2, 55, + 0, 56, 0, 3, 9, 8, 57, 58, 0, 10, + 11, 2, 5, 0, 0, 6, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 5, 0, 0, 6, 0, + 7, 0, 0, 12, 0, 9, 0, 218, 13, 0, + 10, 11, 0, 7, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 12, 0, 0, 0, 9, 13, + 0, 0, 0, 10, 11, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 10, 11, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, - 9, 0, 294, 13, 0, 10, 11, 0, 9, 0, - 12, 0, 0, 10, 11, 13, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 79, 12, - 0, 0, 0, 364, 13, 0, 80, 12, 81, 0, - 0, 403, 13, 0, 0, 82, 83, 84, 85, 0, - 86, 87, 0, 88, 0, 89, 90, 91, 0, 0, - 0, 0, 92, 0, 93, 94, 95, 96, 97, 98, - 0, 99, 100, 101, 0, 0, 102, 0, 0, 103, - 0, 0, 0, 104, 0, 105, 0, 0, 0, 106, - 107, 108, 109, 110, 111, 112, 0, 113, 114, 115, - 116, 117, 118, 119, 120, 0, 0, 121, 0, 122, - 0, 123, 0, 0, 124, 125, 126, 0, 0, 127, - 0, 128, 129, 130, 131, 0, 0, 132 + 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, + 0, 370, 13, 79, 0, 80, 0, 0, 0, 0, + 12, 81, 0, 82, 410, 13, 0, 0, 0, 0, + 83, 84, 85, 86, 0, 87, 88, 0, 89, 0, + 90, 91, 92, 0, 0, 93, 0, 0, 94, 0, + 95, 96, 97, 98, 99, 100, 0, 101, 102, 103, + 104, 0, 0, 105, 0, 0, 106, 0, 0, 0, + 107, 0, 108, 0, 0, 0, 109, 110, 111, 112, + 113, 114, 115, 0, 116, 117, 118, 119, 120, 121, + 122, 123, 0, 0, 124, 0, 125, 0, 126, 0, + 0, 127, 128, 129, 0, 0, 130, 0, 131, 132, + 133, 134, 0, 0, 135 }; static const short yycheck[] = { 1, - 63, 10, 2, 1, 1, 1, 20, 20, 185, 32, - 1, 188, 189, 226, 75, 192, 1, 194, 205, 345, - 10, 11, 101, 26, 32, 237, 238, 3, 4, 37, - 10, 11, 40, 101, 196, 38, 198, 199, 46, 9, - 48, 11, 42, 117, 117, 130, 29, 40, 223, 134, - 90, 228, 117, 132, 62, 117, 134, 40, 131, 10, - 11, 135, 70, 29, 132, 10, 11, 107, 243, 131, - 135, 71, 117, 134, 40, 401, 76, 70, 10, 11, - 117, 3, 4, 59, 54, 55, 131, 70, 250, 251, - 252, 253, 100, 76, 131, 433, 283, 105, 106, 311, - 123, 439, 3, 4, 70, 3, 72, 5, 6, 7, - 76, 130, 129, 176, 177, 134, 92, 134, 129, 32, - 183, 129, 133, 134, 301, 133, 134, 437, 431, 130, - 133, 441, 195, 436, 136, 137, 112, 7, 136, 137, - 136, 137, 129, 123, 124, 136, 137, 359, 138, 7, - 363, 136, 137, 330, 3, 129, 5, 6, 138, 321, - 322, 323, 324, 325, 326, 327, 328, 329, 119, 120, - 121, 122, 123, 124, 119, 120, 121, 122, 123, 124, - 131, 53, 394, 345, 56, 129, 131, 138, 120, 121, - 122, 123, 124, 138, 132, 209, 209, 132, 96, 129, - 200, 201, 129, 129, 204, 136, 138, 133, 134, 421, - 3, 4, 221, 132, 223, 377, 3, 4, 430, 3, - 4, 3, 4, 121, 129, 123, 235, 125, 4, 227, - 129, 227, 130, 235, 243, 244, 227, 300, 400, 401, - 3, 4, 244, 129, 20, 407, 22, 96, 3, 4, - 68, 413, 28, 253, 3, 4, 32, 132, 10, 11, - 422, 129, 133, 134, 130, 427, 42, 10, 11, 132, - 46, 47, 121, 49, 123, 51, 125, 133, 134, 51, - 52, 130, 58, 130, 130, 130, 135, 130, 285, 289, - 130, 130, 68, 69, 130, 293, 296, 293, 74, 130, - 130, 130, 293, 4, 304, 130, 304, 130, 130, 130, - 130, 374, 3, 130, 130, 315, 130, 93, 94, 20, - 130, 22, 130, 130, 100, 84, 132, 28, 132, 132, - 106, 32, 108, 10, 11, 137, 131, 113, 114, 10, - 11, 42, 130, 7, 7, 46, 47, 7, 49, 7, - 51, 7, 5, 8, 134, 136, 133, 58, 134, 132, - 117, 117, 137, 131, 130, 139, 131, 68, 69, 121, - 122, 123, 124, 74, 136, 129, 119, 120, 121, 122, - 123, 124, 62, 131, 131, 3, 138, 5, 6, 7, - 131, 131, 93, 94, 392, 138, 392, 131, 131, 100, - 131, 392, 131, 131, 131, 106, 131, 108, 410, 131, - 131, 131, 113, 114, 131, 3, 131, 5, 6, 131, - 420, 131, 129, 129, 433, 129, 131, 429, 131, 138, - 439, 433, 131, 134, 28, 437, 5, 439, 131, 441, - 3, 4, 119, 120, 121, 122, 123, 124, 119, 120, - 121, 122, 123, 124, 3, 4, 5, 6, 98, 136, - 3, 138, 5, 6, 58, 136, 134, 138, 129, 32, - 129, 20, 134, 22, 68, 69, 130, 0, 96, 28, - 74, 132, 131, 32, 117, 131, 136, 131, 0, 18, - 429, 292, 182, 42, 291, 9, 59, 46, 47, 93, - 49, 300, 51, 121, 198, 123, 1, 125, 96, 58, - 1, 1, 130, 236, 197, -1, -1, -1, 32, 68, - 69, -1, -1, 37, -1, 74, 40, -1, -1, 92, - -1, -1, 46, 121, 48, 123, -1, 125, -1, -1, - -1, -1, 130, -1, 93, 94, -1, 96, 62, 112, - -1, 100, -1, 96, -1, -1, 70, 106, -1, 108, - 123, -1, -1, -1, 113, 114, -1, 130, -1, -1, - -1, -1, 121, -1, 123, -1, 125, -1, 121, 4, - 123, 130, 125, -1, -1, -1, 100, 130, -1, -1, - -1, 105, 106, -1, -1, 20, -1, 22, -1, -1, - -1, -1, -1, 28, -1, -1, -1, 32, -1, -1, - -1, 32, -1, -1, -1, 129, 37, 42, -1, -1, - 134, 46, 47, 32, 49, 46, 51, 48, 37, -1, - -1, 40, -1, 58, -1, -1, -1, 46, -1, 48, - -1, 62, 32, 68, 69, -1, -1, 37, -1, 74, - 32, -1, -1, 62, -1, 37, 46, -1, 48, -1, - -1, 70, -1, -1, 46, -1, 48, -1, 93, 94, - -1, -1, 62, -1, -1, 100, -1, -1, -1, 100, - 62, 106, -1, 108, 105, 106, -1, -1, 113, 114, - -1, 100, -1, -1, -1, -1, 105, 106, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 129, -1, - 100, -1, 133, 134, -1, 105, 106, -1, 100, -1, - 129, -1, -1, 105, 106, 134, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 16, 129, - -1, -1, -1, 133, 134, -1, 24, 129, 26, -1, - -1, 133, 134, -1, -1, 33, 34, 35, 36, -1, - 38, 39, -1, 41, -1, 43, 44, 45, -1, -1, - -1, -1, 50, -1, 52, 53, 54, 55, 56, 57, - -1, 59, 60, 61, -1, -1, 64, -1, -1, 67, - -1, -1, -1, 71, -1, 73, -1, -1, -1, 77, - 78, 79, 80, 81, 82, 83, -1, 85, 86, 87, - 88, 89, 90, 91, 92, -1, -1, 95, -1, 97, - -1, 99, -1, -1, 102, 103, 104, -1, -1, 107, - -1, 109, 110, 111, 112, -1, -1, 115 + 63, 10, 2, 1, 1, 1, 20, 20, 188, 26, + 1, 191, 192, 1, 230, 195, 209, 197, 3, 4, + 32, 38, 77, 119, 10, 11, 241, 242, 351, 32, + 227, 10, 11, 40, 37, 28, 200, 133, 202, 203, + 119, 103, 42, 46, 10, 11, 49, 135, 136, 119, + 247, 3, 232, 5, 6, 103, 92, 440, 137, 132, + 119, 64, 9, 446, 11, 72, 59, 137, 10, 11, + 119, 71, 134, 109, 133, 60, 76, 70, 71, 10, + 11, 136, 119, 76, 133, 408, 134, 3, 4, 131, + 254, 255, 256, 257, 136, 288, 133, 53, 438, 102, + 56, 316, 95, 443, 107, 108, 131, 54, 55, 94, + 135, 136, 3, 125, 5, 6, 179, 180, 135, 32, + 131, 3, 4, 186, 135, 136, 306, 132, 131, 114, + 444, 136, 135, 136, 448, 198, 7, 139, 140, 125, + 126, 139, 140, 139, 140, 7, 98, 136, 139, 140, + 365, 139, 140, 369, 140, 335, 122, 123, 124, 125, + 126, 140, 326, 327, 328, 329, 330, 331, 332, 333, + 334, 123, 131, 125, 140, 127, 10, 11, 3, 4, + 132, 123, 124, 125, 126, 137, 401, 351, 3, 4, + 121, 122, 123, 124, 125, 126, 134, 132, 140, 213, + 213, 136, 133, 131, 204, 205, 131, 98, 208, 140, + 3, 4, 131, 428, 3, 4, 225, 134, 227, 383, + 3, 4, 437, 131, 3, 131, 5, 6, 7, 138, + 239, 4, 123, 231, 125, 231, 127, 239, 247, 248, + 231, 132, 305, 407, 408, 134, 248, 20, 131, 22, + 414, 3, 4, 10, 11, 28, 420, 257, 70, 32, + 3, 4, 135, 136, 131, 429, 134, 29, 131, 42, + 434, 51, 52, 46, 47, 10, 11, 50, 40, 52, + 134, 132, 132, 132, 3, 4, 59, 121, 122, 123, + 124, 125, 126, 290, 294, 132, 132, 70, 71, 133, + 298, 301, 298, 76, 132, 132, 140, 298, 132, 309, + 72, 309, 74, 32, 132, 132, 78, 380, 132, 98, + 320, 132, 95, 96, 132, 132, 132, 29, 132, 102, + 132, 132, 132, 132, 132, 108, 132, 110, 40, 3, + 132, 60, 115, 116, 123, 86, 125, 134, 127, 134, + 134, 139, 133, 132, 132, 7, 4, 7, 7, 10, + 11, 7, 7, 136, 121, 122, 123, 124, 125, 126, + 72, 52, 20, 8, 22, 94, 78, 5, 136, 138, + 28, 138, 135, 140, 32, 134, 121, 122, 123, 124, + 125, 126, 119, 139, 42, 114, 119, 133, 46, 47, + 132, 399, 50, 399, 52, 140, 125, 133, 399, 133, + 3, 59, 133, 132, 131, 417, 3, 133, 5, 6, + 7, 133, 70, 71, 133, 133, 133, 427, 76, 133, + 133, 440, 133, 3, 436, 5, 6, 446, 440, 133, + 133, 133, 444, 133, 446, 133, 448, 95, 96, 133, + 141, 133, 138, 133, 102, 64, 131, 131, 131, 5, + 108, 133, 110, 133, 140, 133, 133, 115, 116, 131, + 121, 122, 123, 124, 125, 126, 3, 4, 5, 6, + 100, 136, 136, 119, 131, 138, 0, 138, 136, 140, + 133, 132, 134, 20, 133, 22, 133, 0, 18, 133, + 297, 28, 436, 202, 1, 32, 185, 1, 1, 240, + 305, 98, 201, -1, 296, 42, -1, -1, -1, 46, + 47, -1, -1, 50, -1, 52, -1, -1, 98, -1, + -1, -1, 59, -1, -1, -1, 123, -1, 125, -1, + 127, -1, -1, 70, 71, 132, -1, -1, -1, 76, + -1, -1, -1, 123, 9, 125, -1, 127, -1, -1, + -1, -1, 132, -1, -1, -1, -1, -1, 95, 96, + -1, 98, -1, -1, -1, 102, -1, 32, -1, -1, + -1, 108, 37, 110, -1, 40, -1, -1, 115, 116, + -1, 46, -1, -1, 49, 4, 123, -1, 125, -1, + 127, -1, -1, -1, -1, 132, -1, -1, -1, 64, + -1, 20, -1, 22, -1, -1, -1, 72, -1, 28, + -1, -1, -1, 32, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 42, 32, -1, -1, 46, 47, 37, + -1, 50, 40, 52, -1, -1, -1, 102, 46, -1, + 59, 49, 107, 108, -1, -1, -1, -1, -1, -1, + -1, 70, 71, -1, -1, 32, 64, 76, -1, -1, + 37, -1, -1, 40, 72, -1, 131, -1, -1, 46, + -1, 136, 49, -1, -1, -1, 95, 96, -1, -1, + -1, -1, -1, 102, -1, -1, -1, 64, 32, 108, + -1, 110, -1, 37, 102, 72, 115, 116, -1, 107, + 108, 32, 46, -1, -1, 49, 37, -1, -1, -1, + -1, -1, -1, -1, -1, 46, -1, -1, 49, -1, + 64, -1, -1, 131, -1, 102, -1, 135, 136, -1, + 107, 108, -1, 64, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 131, -1, -1, -1, 102, 136, + -1, -1, -1, 107, 108, -1, -1, -1, -1, -1, + -1, 102, -1, -1, -1, -1, 107, 108, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 131, -1, -1, + -1, 135, 136, 16, -1, 18, -1, -1, -1, -1, + 131, 24, -1, 26, 135, 136, -1, -1, -1, -1, + 33, 34, 35, 36, -1, 38, 39, -1, 41, -1, + 43, 44, 45, -1, -1, 48, -1, -1, 51, -1, + 53, 54, 55, 56, 57, 58, -1, 60, 61, 62, + 63, -1, -1, 66, -1, -1, 69, -1, -1, -1, + 73, -1, 75, -1, -1, -1, 79, 80, 81, 82, + 83, 84, 85, -1, 87, 88, 89, 90, 91, 92, + 93, 94, -1, -1, 97, -1, 99, -1, 101, -1, + -1, 104, 105, 106, -1, -1, 109, -1, 111, 112, + 113, 114, -1, -1, 117 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/share/bison.simple" @@ -1368,161 +1391,161 @@ yyreduce: switch (yyn) { case 1: -#line 229 "parser.y" +#line 228 "parser.y" { write_proxies(yyvsp[0].ifref); write_client(yyvsp[0].ifref); write_server(yyvsp[0].ifref); ; break;} case 2: -#line 232 "parser.y" +#line 231 "parser.y" { yyval.ifref = NULL; ; break;} case 3: -#line 233 "parser.y" +#line 232 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 4: -#line 234 "parser.y" +#line 233 "parser.y" { yyval.ifref = make_ifref(yyvsp[0].type); LINK(yyval.ifref, yyvsp[-1].ifref); ; break;} case 5: -#line 235 "parser.y" +#line 234 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_coclass(yyvsp[0].clas); ; break;} case 6: -#line 236 "parser.y" +#line 235 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_module(yyvsp[0].type); ; break;} case 7: -#line 237 "parser.y" +#line 236 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 8: -#line 238 "parser.y" +#line 237 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 9: -#line 241 "parser.y" +#line 240 "parser.y" {; break;} case 10: -#line 242 "parser.y" +#line 241 "parser.y" { if (!parse_only) add_interface(yyvsp[0].type); ; break;} case 11: -#line 243 "parser.y" +#line 242 "parser.y" { if (!parse_only) add_interface(yyvsp[0].type); ; break;} case 12: -#line 244 "parser.y" +#line 243 "parser.y" { if (!parse_only) add_coclass(yyvsp[0].clas); ; break;} case 13: -#line 245 "parser.y" +#line 244 "parser.y" { if (!parse_only) add_module(yyvsp[0].type); ; break;} case 14: -#line 246 "parser.y" +#line 245 "parser.y" {; break;} case 15: -#line 249 "parser.y" +#line 248 "parser.y" { yyval.func = NULL; ; break;} case 16: -#line 250 "parser.y" +#line 249 "parser.y" { yyval.func = yyvsp[-1].func; LINK(yyval.func, yyvsp[-2].func); ; break;} case 17: -#line 251 "parser.y" +#line 250 "parser.y" { yyval.func = yyvsp[-1].func; ; break;} case 18: -#line 254 "parser.y" +#line 253 "parser.y" {; break;} case 19: -#line 255 "parser.y" +#line 254 "parser.y" { if (!parse_only && do_header) { write_constdef(yyvsp[-1].var); } ; break;} case 20: -#line 256 "parser.y" +#line 255 "parser.y" {; break;} case 21: -#line 257 "parser.y" +#line 256 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 22: -#line 258 "parser.y" +#line 257 "parser.y" { if (!parse_only && do_header) { write_externdef(yyvsp[-1].var); } ; break;} case 23: -#line 259 "parser.y" +#line 258 "parser.y" {; break;} case 24: -#line 260 "parser.y" +#line 259 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 25: -#line 261 "parser.y" +#line 260 "parser.y" {; break;} case 26: -#line 262 "parser.y" +#line 261 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 27: -#line 265 "parser.y" +#line 264 "parser.y" { if (!parse_only && do_header) fprintf(header, "%s\n", yyvsp[-1].str); ; break;} case 28: -#line 267 "parser.y" +#line 266 "parser.y" { assert(yychar == YYEMPTY); if (!do_import(yyvsp[-1].str)) yychar = aEOF; ; break;} case 29: -#line 270 "parser.y" +#line 269 "parser.y" {; break;} case 30: -#line 273 "parser.y" +#line 272 "parser.y" { yyval.str = yyvsp[0].str; ; break;} case 31: -#line 275 "parser.y" +#line 274 "parser.y" { start_typelib(yyvsp[-1].str, yyvsp[-2].attr); ; break;} case 32: -#line 277 "parser.y" +#line 276 "parser.y" { end_typelib(); ; break;} case 33: -#line 280 "parser.y" +#line 279 "parser.y" { yyval.var = NULL; ; break;} case 35: -#line 284 "parser.y" +#line 283 "parser.y" { yyval.var = NULL; ; break;} case 37: -#line 288 "parser.y" +#line 287 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; ; break;} case 39: -#line 293 "parser.y" +#line 292 "parser.y" { yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); yyval.var->attrs = yyvsp[-3].attr; ; break;} case 40: -#line 297 "parser.y" +#line 296 "parser.y" { yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); ; break;} case 41: -#line 300 "parser.y" +#line 299 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1531,7 +1554,7 @@ case 41: ; break;} case 42: -#line 306 "parser.y" +#line 305 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1539,460 +1562,473 @@ case 42: ; break;} case 43: -#line 313 "parser.y" +#line 312 "parser.y" { yyval.expr = NULL; ; break;} case 44: -#line 314 "parser.y" +#line 313 "parser.y" { yyval.expr = yyvsp[-1].expr; ; break;} case 45: -#line 315 "parser.y" +#line 314 "parser.y" { yyval.expr = make_expr(EXPR_VOID); ; break;} case 47: -#line 319 "parser.y" +#line 318 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 48: -#line 320 "parser.y" +#line 319 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-3].expr); yyval.expr = yyvsp[0].expr; ; break;} case 49: -#line 323 "parser.y" +#line 322 "parser.y" { yyval.attr = NULL; ; break;} case 51: -#line 328 "parser.y" +#line 327 "parser.y" { yyval.attr = yyvsp[-1].attr; ; break;} case 53: -#line 332 "parser.y" +#line 331 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-2].attr); yyval.attr = yyvsp[0].attr; ; break;} case 54: -#line 333 "parser.y" +#line 332 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-3].attr); yyval.attr = yyvsp[0].attr; ; break;} case 55: -#line 337 "parser.y" +#line 336 "parser.y" { yyval.attr = make_attr(ATTR_ASYNC); ; break;} case 56: +#line 337 "parser.y" +{ yyval.attr = make_attr(ATTR_AUTO_HANDLE); ; + break;} +case 57: #line 338 "parser.y" { yyval.attr = make_attrp(ATTR_CALLAS, yyvsp[-1].var); ; break;} -case 57: +case 58: #line 339 "parser.y" { yyval.attr = make_attrp(ATTR_CASE, yyvsp[-1].expr); ; break;} -case 58: +case 59: #line 340 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); ; break;} -case 59: +case 60: #line 341 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ ; break;} -case 60: +case 61: #line 342 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ ; break;} -case 61: +case 62: #line 343 "parser.y" { yyval.attr = make_attr(ATTR_CONTROL); ; break;} -case 62: +case 63: #line 344 "parser.y" { yyval.attr = make_attr(ATTR_DEFAULT); ; break;} -case 63: +case 64: #line 345 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_EXPR, yyvsp[-1].expr); ; break;} -case 64: +case 65: #line 346 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_STRING, yyvsp[-1].str); ; break;} -case 65: +case 66: #line 347 "parser.y" { yyval.attr = make_attrp(ATTR_DLLNAME, yyvsp[-1].str); ; break;} -case 66: +case 67: #line 348 "parser.y" { yyval.attr = make_attr(ATTR_DUAL); ; break;} -case 67: +case 68: #line 349 "parser.y" { yyval.attr = make_attrp(ATTR_ENDPOINT, yyvsp[-1].str); ; break;} -case 68: +case 69: #line 350 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_STRING, yyvsp[-1].str); ; break;} -case 69: +case 70: #line 351 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_ORDINAL, yyvsp[-1].expr); ; break;} -case 70: -#line 352 "parser.y" -{ yyval.attr = make_attr(ATTR_HANDLE); ; - break;} case 71: -#line 353 "parser.y" -{ yyval.attr = make_attrp(ATTR_HELPCONTEXT, yyvsp[-1].expr); ; +#line 352 "parser.y" +{ yyval.attr = make_attr(ATTR_EXPLICIT_HANDLE); ; break;} case 72: -#line 354 "parser.y" -{ yyval.attr = make_attrp(ATTR_HELPFILE, yyvsp[-1].str); ; +#line 353 "parser.y" +{ yyval.attr = make_attr(ATTR_HANDLE); ; break;} case 73: -#line 355 "parser.y" -{ yyval.attr = make_attrp(ATTR_HELPSTRING, yyvsp[-1].str); ; +#line 354 "parser.y" +{ yyval.attr = make_attrp(ATTR_HELPCONTEXT, yyvsp[-1].expr); ; break;} case 74: -#line 356 "parser.y" -{ yyval.attr = make_attrp(ATTR_HELPSTRINGCONTEXT, yyvsp[-1].expr); ; +#line 355 "parser.y" +{ yyval.attr = make_attrp(ATTR_HELPFILE, yyvsp[-1].str); ; break;} case 75: -#line 357 "parser.y" -{ yyval.attr = make_attrp(ATTR_HELPSTRINGDLL, yyvsp[-1].str); ; +#line 356 "parser.y" +{ yyval.attr = make_attrp(ATTR_HELPSTRING, yyvsp[-1].str); ; break;} case 76: -#line 358 "parser.y" -{ yyval.attr = make_attr(ATTR_HIDDEN); ; +#line 357 "parser.y" +{ yyval.attr = make_attrp(ATTR_HELPSTRINGCONTEXT, yyvsp[-1].expr); ; break;} case 77: -#line 359 "parser.y" -{ yyval.attr = make_attrp(ATTR_ID, yyvsp[-1].expr); ; +#line 358 "parser.y" +{ yyval.attr = make_attrp(ATTR_HELPSTRINGDLL, yyvsp[-1].str); ; break;} case 78: -#line 360 "parser.y" -{ yyval.attr = make_attr(ATTR_IDEMPOTENT); ; +#line 359 "parser.y" +{ yyval.attr = make_attr(ATTR_HIDDEN); ; break;} case 79: -#line 361 "parser.y" -{ yyval.attr = make_attrp(ATTR_IIDIS, yyvsp[-1].var); ; +#line 360 "parser.y" +{ yyval.attr = make_attrp(ATTR_ID, yyvsp[-1].expr); ; break;} case 80: -#line 362 "parser.y" -{ yyval.attr = make_attr(ATTR_IN); ; +#line 361 "parser.y" +{ yyval.attr = make_attr(ATTR_IDEMPOTENT); ; break;} case 81: -#line 363 "parser.y" -{ yyval.attr = make_attr(ATTR_INPUTSYNC); ; +#line 362 "parser.y" +{ yyval.attr = make_attrp(ATTR_IIDIS, yyvsp[-1].var); ; break;} case 82: -#line 364 "parser.y" -{ yyval.attr = make_attrp(ATTR_LENGTHIS, yyvsp[-1].expr); ; +#line 363 "parser.y" +{ yyval.attr = make_attrp(ATTR_IMPLICIT_HANDLE, yyvsp[-1].str); ; break;} case 83: -#line 365 "parser.y" -{ yyval.attr = make_attr(ATTR_LOCAL); ; +#line 364 "parser.y" +{ yyval.attr = make_attr(ATTR_IN); ; break;} case 84: -#line 366 "parser.y" -{ yyval.attr = make_attr(ATTR_NONCREATABLE); ; +#line 365 "parser.y" +{ yyval.attr = make_attr(ATTR_INPUTSYNC); ; break;} case 85: -#line 367 "parser.y" -{ yyval.attr = make_attr(ATTR_OBJECT); ; +#line 366 "parser.y" +{ yyval.attr = make_attrp(ATTR_LENGTHIS, yyvsp[-1].expr); ; break;} case 86: -#line 368 "parser.y" -{ yyval.attr = make_attr(ATTR_ODL); ; +#line 367 "parser.y" +{ yyval.attr = make_attr(ATTR_LOCAL); ; break;} case 87: -#line 369 "parser.y" -{ yyval.attr = make_attr(ATTR_OLEAUTOMATION); ; +#line 368 "parser.y" +{ yyval.attr = make_attr(ATTR_NONCREATABLE); ; break;} case 88: -#line 370 "parser.y" -{ yyval.attr = make_attr(ATTR_OPTIONAL); ; +#line 369 "parser.y" +{ yyval.attr = make_attr(ATTR_OBJECT); ; break;} case 89: -#line 371 "parser.y" -{ yyval.attr = make_attr(ATTR_OUT); ; +#line 370 "parser.y" +{ yyval.attr = make_attr(ATTR_ODL); ; break;} case 90: -#line 372 "parser.y" -{ yyval.attr = make_attrv(ATTR_POINTERDEFAULT, yyvsp[-1].num); ; +#line 371 "parser.y" +{ yyval.attr = make_attr(ATTR_OLEAUTOMATION); ; break;} case 91: -#line 373 "parser.y" -{ yyval.attr = make_attr(ATTR_PROPGET); ; +#line 372 "parser.y" +{ yyval.attr = make_attr(ATTR_OPTIONAL); ; break;} case 92: -#line 374 "parser.y" -{ yyval.attr = make_attr(ATTR_PROPPUT); ; +#line 373 "parser.y" +{ yyval.attr = make_attr(ATTR_OUT); ; break;} case 93: -#line 375 "parser.y" -{ yyval.attr = make_attr(ATTR_PROPPUTREF); ; +#line 374 "parser.y" +{ yyval.attr = make_attrv(ATTR_POINTERDEFAULT, yyvsp[-1].num); ; break;} case 94: -#line 376 "parser.y" -{ yyval.attr = make_attr(ATTR_PUBLIC); ; +#line 375 "parser.y" +{ yyval.attr = make_attr(ATTR_PROPGET); ; break;} case 95: -#line 377 "parser.y" -{ yyval.attr = make_attr(ATTR_READONLY); ; +#line 376 "parser.y" +{ yyval.attr = make_attr(ATTR_PROPPUT); ; break;} case 96: -#line 378 "parser.y" -{ yyval.attr = make_attr(ATTR_RESTRICTED); ; +#line 377 "parser.y" +{ yyval.attr = make_attr(ATTR_PROPPUTREF); ; break;} case 97: -#line 379 "parser.y" -{ yyval.attr = make_attr(ATTR_RETVAL); ; +#line 378 "parser.y" +{ yyval.attr = make_attr(ATTR_PUBLIC); ; break;} case 98: -#line 380 "parser.y" -{ yyval.attr = make_attrp(ATTR_SIZEIS, yyvsp[-1].expr); ; +#line 379 "parser.y" +{ yyval.attr = make_attr(ATTR_READONLY); ; break;} case 99: -#line 381 "parser.y" -{ yyval.attr = make_attr(ATTR_SOURCE); ; +#line 380 "parser.y" +{ yyval.attr = make_attr(ATTR_RESTRICTED); ; break;} case 100: -#line 382 "parser.y" -{ yyval.attr = make_attr(ATTR_STRING); ; +#line 381 "parser.y" +{ yyval.attr = make_attr(ATTR_RETVAL); ; break;} case 101: -#line 383 "parser.y" -{ yyval.attr = make_attrp(ATTR_SWITCHIS, yyvsp[-1].expr); ; +#line 382 "parser.y" +{ yyval.attr = make_attrp(ATTR_SIZEIS, yyvsp[-1].expr); ; break;} case 102: -#line 384 "parser.y" -{ yyval.attr = make_attrp(ATTR_SWITCHTYPE, type_ref(yyvsp[-1].tref)); ; +#line 383 "parser.y" +{ yyval.attr = make_attr(ATTR_SOURCE); ; break;} case 103: -#line 385 "parser.y" -{ yyval.attr = make_attrp(ATTR_TRANSMITAS, type_ref(yyvsp[-1].tref)); ; +#line 384 "parser.y" +{ yyval.attr = make_attr(ATTR_STRING); ; break;} case 104: -#line 386 "parser.y" -{ yyval.attr = make_attrp(ATTR_UUID, yyvsp[-1].uuid); ; +#line 385 "parser.y" +{ yyval.attr = make_attrp(ATTR_SWITCHIS, yyvsp[-1].expr); ; break;} case 105: -#line 387 "parser.y" -{ yyval.attr = make_attr(ATTR_V1ENUM); ; +#line 386 "parser.y" +{ yyval.attr = make_attrp(ATTR_SWITCHTYPE, type_ref(yyvsp[-1].tref)); ; break;} case 106: -#line 388 "parser.y" -{ yyval.attr = make_attr(ATTR_VARARG); ; +#line 387 "parser.y" +{ yyval.attr = make_attrp(ATTR_TRANSMITAS, type_ref(yyvsp[-1].tref)); ; break;} case 107: -#line 389 "parser.y" -{ yyval.attr = make_attrv(ATTR_VERSION, yyvsp[-1].num); ; +#line 388 "parser.y" +{ yyval.attr = make_attrp(ATTR_UUID, yyvsp[-1].uuid); ; break;} case 108: -#line 390 "parser.y" -{ yyval.attr = make_attrp(ATTR_WIREMARSHAL, type_ref(yyvsp[-1].tref)); ; +#line 389 "parser.y" +{ yyval.attr = make_attr(ATTR_V1ENUM); ; break;} case 109: +#line 390 "parser.y" +{ yyval.attr = make_attr(ATTR_VARARG); ; + break;} +case 110: #line 391 "parser.y" -{ yyval.attr = make_attrv(ATTR_POINTERTYPE, yyvsp[0].num); ; +{ yyval.attr = make_attrv(ATTR_VERSION, yyvsp[-1].num); ; + break;} +case 111: +#line 392 "parser.y" +{ yyval.attr = make_attrp(ATTR_WIREMARSHAL, type_ref(yyvsp[-1].tref)); ; break;} case 112: -#line 398 "parser.y" +#line 393 "parser.y" +{ yyval.attr = make_attrv(ATTR_POINTERTYPE, yyvsp[0].num); ; + break;} +case 115: +#line 400 "parser.y" { yyval.var = NULL; ; break;} -case 113: -#line 399 "parser.y" +case 116: +#line 401 "parser.y" { if (yyvsp[0].var) { LINK(yyvsp[0].var, yyvsp[-1].var); yyval.var = yyvsp[0].var; } else { yyval.var = yyvsp[-1].var; } ; break;} -case 114: -#line 404 "parser.y" +case 117: +#line 406 "parser.y" { attr_t *a = make_attrp(ATTR_CASE, yyvsp[-2].expr); yyval.var = yyvsp[0].var; if (!yyval.var) yyval.var = make_var(NULL); LINK(a, yyval.var->attrs); yyval.var->attrs = a; ; break;} -case 115: -#line 408 "parser.y" +case 118: +#line 410 "parser.y" { attr_t *a = make_attr(ATTR_DEFAULT); yyval.var = yyvsp[0].var; if (!yyval.var) yyval.var = make_var(NULL); LINK(a, yyval.var->attrs); yyval.var->attrs = a; ; break;} -case 116: -#line 414 "parser.y" +case 119: +#line 416 "parser.y" { yyval.var = reg_const(yyvsp[-2].var); set_type(yyval.var, yyvsp[-3].tref, NULL); yyval.var->eval = yyvsp[0].expr; yyval.var->lval = yyvsp[0].expr->cval; ; break;} -case 117: -#line 421 "parser.y" +case 120: +#line 423 "parser.y" { yyval.var = NULL; ; break;} -case 118: -#line 422 "parser.y" +case 121: +#line 424 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} -case 121: -#line 427 "parser.y" +case 124: +#line 429 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; if (yyvsp[-2].var && !yyvsp[0].var->eval) yyvsp[0].var->lval = yyvsp[-2].var->lval + 1; ; break;} -case 122: -#line 433 "parser.y" +case 125: +#line 435 "parser.y" { yyval.var = reg_const(yyvsp[-2].var); yyval.var->eval = yyvsp[0].expr; yyval.var->lval = yyvsp[0].expr->cval; - yyval.var->type = make_type(RPC_FC_LONG, &std_int); - ; - break;} -case 123: -#line 438 "parser.y" -{ yyval.var = reg_const(yyvsp[0].var); - yyval.var->lval = 0; /* default for first enum entry */ - yyval.var->type = make_type(RPC_FC_LONG, &std_int); - ; - break;} -case 124: -#line 444 "parser.y" -{ yyval.type = get_typev(RPC_FC_ENUM16, yyvsp[-3].var, tsENUM); - yyval.type->fields = yyvsp[-1].var; - yyval.type->defined = TRUE; - if(in_typelib) - add_enum(yyval.type); + yyval.var->type = make_type(RPC_FC_LONG, &std_int); ; break;} case 126: -#line 453 "parser.y" -{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; - break;} -case 127: -#line 466 "parser.y" -{ yyval.expr = make_expr(EXPR_VOID); ; - break;} -case 129: -#line 470 "parser.y" -{ yyval.expr = make_exprl(EXPR_NUM, yyvsp[0].num); ; - break;} -case 130: -#line 471 "parser.y" -{ yyval.expr = make_exprl(EXPR_HEXNUM, yyvsp[0].num); ; - break;} -case 131: -#line 472 "parser.y" -{ yyval.expr = make_exprs(EXPR_IDENTIFIER, yyvsp[0].str); ; - break;} -case 132: -#line 473 "parser.y" -{ yyval.expr = make_expr3(EXPR_COND, yyvsp[-4].expr, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 133: -#line 474 "parser.y" -{ yyval.expr = make_expr2(EXPR_OR , yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 134: -#line 475 "parser.y" -{ yyval.expr = make_expr2(EXPR_AND, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 135: -#line 476 "parser.y" -{ yyval.expr = make_expr2(EXPR_ADD, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 136: -#line 477 "parser.y" -{ yyval.expr = make_expr2(EXPR_SUB, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 137: -#line 478 "parser.y" -{ yyval.expr = make_expr2(EXPR_MUL, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 138: -#line 479 "parser.y" -{ yyval.expr = make_expr2(EXPR_DIV, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 139: -#line 480 "parser.y" -{ yyval.expr = make_expr2(EXPR_SHL, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 140: -#line 481 "parser.y" -{ yyval.expr = make_expr2(EXPR_SHR, yyvsp[-2].expr, yyvsp[0].expr); ; - break;} -case 141: -#line 482 "parser.y" -{ yyval.expr = make_expr1(EXPR_NOT, yyvsp[0].expr); ; - break;} -case 142: -#line 483 "parser.y" -{ yyval.expr = make_expr1(EXPR_NEG, yyvsp[0].expr); ; - break;} -case 143: -#line 484 "parser.y" -{ yyval.expr = make_expr1(EXPR_PPTR, yyvsp[0].expr); ; - break;} -case 144: -#line 485 "parser.y" -{ yyval.expr = make_exprt(EXPR_CAST, yyvsp[-2].tref, yyvsp[0].expr); ; - break;} -case 145: -#line 486 "parser.y" -{ yyval.expr = make_exprt(EXPR_SIZEOF, yyvsp[-1].tref, NULL); ; - break;} -case 146: -#line 487 "parser.y" -{ yyval.expr = yyvsp[-1].expr; ; - break;} -case 148: -#line 491 "parser.y" -{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; - break;} -case 149: -#line 494 "parser.y" -{ yyval.expr = yyvsp[0].expr; - if (!yyval.expr->is_const) yyerror("expression is not constant\n"); +#line 440 "parser.y" +{ yyval.var = reg_const(yyvsp[0].var); + yyval.var->lval = 0; /* default for first enum entry */ + yyval.var->type = make_type(RPC_FC_LONG, &std_int); ; break;} -case 150: -#line 499 "parser.y" +case 127: +#line 446 "parser.y" +{ yyval.type = get_typev(RPC_FC_ENUM16, yyvsp[-3].var, tsENUM); + yyval.type->fields = yyvsp[-1].var; + yyval.type->defined = TRUE; + if(in_typelib) + add_enum(yyval.type); + ; + break;} +case 129: +#line 455 "parser.y" +{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; + break;} +case 130: +#line 468 "parser.y" +{ yyval.expr = make_expr(EXPR_VOID); ; + break;} +case 132: +#line 472 "parser.y" +{ yyval.expr = make_exprl(EXPR_NUM, yyvsp[0].num); ; + break;} +case 133: +#line 473 "parser.y" +{ yyval.expr = make_exprl(EXPR_HEXNUM, yyvsp[0].num); ; + break;} +case 134: +#line 474 "parser.y" +{ yyval.expr = make_exprs(EXPR_IDENTIFIER, yyvsp[0].str); ; + break;} +case 135: +#line 475 "parser.y" +{ yyval.expr = make_expr3(EXPR_COND, yyvsp[-4].expr, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 136: +#line 476 "parser.y" +{ yyval.expr = make_expr2(EXPR_OR , yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 137: +#line 477 "parser.y" +{ yyval.expr = make_expr2(EXPR_AND, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 138: +#line 478 "parser.y" +{ yyval.expr = make_expr2(EXPR_ADD, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 139: +#line 479 "parser.y" +{ yyval.expr = make_expr2(EXPR_SUB, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 140: +#line 480 "parser.y" +{ yyval.expr = make_expr2(EXPR_MUL, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 141: +#line 481 "parser.y" +{ yyval.expr = make_expr2(EXPR_DIV, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 142: +#line 482 "parser.y" +{ yyval.expr = make_expr2(EXPR_SHL, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 143: +#line 483 "parser.y" +{ yyval.expr = make_expr2(EXPR_SHR, yyvsp[-2].expr, yyvsp[0].expr); ; + break;} +case 144: +#line 484 "parser.y" +{ yyval.expr = make_expr1(EXPR_NOT, yyvsp[0].expr); ; + break;} +case 145: +#line 485 "parser.y" +{ yyval.expr = make_expr1(EXPR_NEG, yyvsp[0].expr); ; + break;} +case 146: +#line 486 "parser.y" +{ yyval.expr = make_expr1(EXPR_PPTR, yyvsp[0].expr); ; + break;} +case 147: +#line 487 "parser.y" +{ yyval.expr = make_exprt(EXPR_CAST, yyvsp[-2].tref, yyvsp[0].expr); ; + break;} +case 148: +#line 488 "parser.y" +{ yyval.expr = make_exprt(EXPR_SIZEOF, yyvsp[-1].tref, NULL); ; + break;} +case 149: +#line 489 "parser.y" +{ yyval.expr = yyvsp[-1].expr; ; + break;} +case 151: +#line 493 "parser.y" +{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; + break;} +case 152: +#line 496 "parser.y" +{ yyval.expr = yyvsp[0].expr; + if (!yyval.expr->is_const) + yyerror("expression is not constant\n"); + ; + break;} +case 153: +#line 502 "parser.y" { yyval.var = yyvsp[0].var; set_type(yyval.var, yyvsp[-1].tref, NULL); ; break;} -case 151: -#line 504 "parser.y" +case 154: +#line 507 "parser.y" { yyval.var = NULL; ; break;} -case 152: -#line 505 "parser.y" +case 155: +#line 508 "parser.y" { if (yyvsp[0].var) { LINK(yyvsp[0].var, yyvsp[-1].var); yyval.var = yyvsp[0].var; } else { yyval.var = yyvsp[-1].var; } ; break;} -case 153: -#line 510 "parser.y" -{ yyval.var = yyvsp[-1].var; ; - break;} -case 154: -#line 511 "parser.y" -{ yyval.var = make_var(NULL); yyval.var->type = yyvsp[-1].type; yyval.var->attrs = yyvsp[-2].attr; ; - break;} -case 155: -#line 512 "parser.y" -{ yyval.var = make_var(NULL); yyval.var->attrs = yyvsp[-1].attr; ; - break;} case 156: #line 513 "parser.y" -{ yyval.var = NULL; ; +{ yyval.var = yyvsp[-1].var; ; break;} case 157: -#line 516 "parser.y" -{ yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); yyval.var->attrs = yyvsp[-3].attr; ; +#line 514 "parser.y" +{ yyval.var = make_var(NULL); yyval.var->type = yyvsp[-1].type; yyval.var->attrs = yyvsp[-2].attr; ; break;} case 158: -#line 521 "parser.y" +#line 515 "parser.y" +{ yyval.var = make_var(NULL); yyval.var->attrs = yyvsp[-1].attr; ; + break;} +case 159: +#line 516 "parser.y" +{ yyval.var = NULL; ; + break;} +case 160: +#line 519 "parser.y" +{ yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); yyval.var->attrs = yyvsp[-3].attr; ; + break;} +case 161: +#line 524 "parser.y" { set_type(yyvsp[-3].var, yyvsp[-5].tref, NULL); yyvsp[-3].var->attrs = yyvsp[-6].attr; yyval.func = make_func(yyvsp[-3].var, yyvsp[-1].var); @@ -2001,36 +2037,24 @@ case 158: } ; break;} -case 159: -#line 530 "parser.y" -{ yyval.var = NULL; ; - break;} -case 161: -#line 534 "parser.y" -{ yyval.var = NULL; ; - break;} case 162: -#line 535 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; - break;} -case 163: -#line 536 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; +#line 533 "parser.y" +{ yyval.var = NULL; ; break;} case 164: -#line 539 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; +#line 537 "parser.y" +{ yyval.var = NULL; ; break;} case 165: -#line 541 "parser.y" +#line 538 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 166: -#line 542 "parser.y" +#line 539 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 167: -#line 543 "parser.y" +#line 542 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 168: @@ -2038,19 +2062,31 @@ case 168: { yyval.var = make_var(yyvsp[0].str); ; break;} case 169: -#line 547 "parser.y" -{ yyval.type = make_type(RPC_FC_BYTE, NULL); ; +#line 545 "parser.y" +{ yyval.var = make_var(yyvsp[0].str); ; break;} case 170: -#line 548 "parser.y" -{ yyval.type = make_type(RPC_FC_WCHAR, NULL); ; +#line 546 "parser.y" +{ yyval.var = make_var(yyvsp[0].str); ; + break;} +case 171: +#line 547 "parser.y" +{ yyval.var = make_var(yyvsp[0].str); ; break;} case 172: #line 550 "parser.y" -{ yyval.type = yyvsp[0].type; yyval.type->sign = 1; ; +{ yyval.type = make_type(RPC_FC_BYTE, NULL); ; break;} case 173: #line 551 "parser.y" +{ yyval.type = make_type(RPC_FC_WCHAR, NULL); ; + break;} +case 175: +#line 553 "parser.y" +{ yyval.type = yyvsp[0].type; yyval.type->sign = 1; ; + break;} +case 176: +#line 554 "parser.y" { yyval.type = yyvsp[0].type; yyval.type->sign = -1; switch (yyval.type->type) { case RPC_FC_CHAR: yyval.type->type = RPC_FC_BYTE; yyval.type->sign = 0; break; @@ -2064,93 +2100,93 @@ case 173: } ; break;} -case 174: -#line 563 "parser.y" -{ yyval.type = make_type(RPC_FC_FLOAT, NULL); ; - break;} -case 175: -#line 564 "parser.y" -{ yyval.type = make_type(RPC_FC_DOUBLE, NULL); ; - break;} -case 176: -#line 565 "parser.y" -{ yyval.type = make_type(RPC_FC_BYTE, &std_bool); /* ? */ ; - break;} case 177: #line 566 "parser.y" -{ yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); ; +{ yyval.type = make_type(RPC_FC_FLOAT, NULL); ; break;} case 178: #line 567 "parser.y" -{ yyval.type = make_type(RPC_FC_BIND_PRIMITIVE, NULL); /* ? */ ; +{ yyval.type = make_type(RPC_FC_DOUBLE, NULL); ; + break;} +case 179: +#line 568 "parser.y" +{ yyval.type = make_type(RPC_FC_BYTE, &std_bool); /* ? */ ; + break;} +case 180: +#line 569 "parser.y" +{ yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); ; break;} case 181: -#line 574 "parser.y" -{ yyval.type = make_type(RPC_FC_LONG, &std_int); ; - break;} -case 182: -#line 575 "parser.y" -{ yyval.type = make_type(RPC_FC_SHORT, NULL); ; - break;} -case 183: -#line 576 "parser.y" -{ yyval.type = make_type(RPC_FC_LONG, NULL); ; +#line 570 "parser.y" +{ yyval.type = make_type(RPC_FC_BIND_PRIMITIVE, NULL); /* ? */ ; break;} case 184: #line 577 "parser.y" -{ yyval.type = make_type(RPC_FC_HYPER, NULL); ; +{ yyval.type = make_type(RPC_FC_LONG, &std_int); ; break;} case 185: #line 578 "parser.y" -{ yyval.type = make_type(RPC_FC_HYPER, &std_int64); ; +{ yyval.type = make_type(RPC_FC_SHORT, NULL); ; break;} case 186: #line 579 "parser.y" -{ yyval.type = make_type(RPC_FC_CHAR, NULL); ; +{ yyval.type = make_type(RPC_FC_LONG, NULL); ; break;} case 187: -#line 582 "parser.y" -{ yyval.clas = make_class(yyvsp[0].str); ; +#line 580 "parser.y" +{ yyval.type = make_type(RPC_FC_HYPER, NULL); ; break;} case 188: -#line 583 "parser.y" -{ yyval.clas = make_class(yyvsp[0].str); ; +#line 581 "parser.y" +{ yyval.type = make_type(RPC_FC_HYPER, &std_int64); ; break;} case 189: +#line 582 "parser.y" +{ yyval.type = make_type(RPC_FC_CHAR, NULL); ; + break;} +case 190: +#line 585 "parser.y" +{ yyval.clas = make_class(yyvsp[0].str); ; + break;} +case 191: #line 586 "parser.y" +{ yyval.clas = make_class(yyvsp[0].str); ; + break;} +case 192: +#line 589 "parser.y" { yyval.clas = yyvsp[0].clas; yyval.clas->attrs = yyvsp[-1].attr; if (!parse_only && do_header) write_coclass(yyval.clas); ; break;} -case 190: -#line 592 "parser.y" +case 193: +#line 595 "parser.y" { yyval.clas = yyvsp[-3].clas; yyval.clas->ifaces = yyvsp[-1].ifref; ; break;} -case 191: -#line 597 "parser.y" +case 194: +#line 600 "parser.y" { yyval.ifref = NULL; ; break;} -case 192: -#line 598 "parser.y" +case 195: +#line 601 "parser.y" { LINK(yyvsp[0].ifref, yyvsp[-1].ifref); yyval.ifref = yyvsp[0].ifref; ; break;} -case 193: -#line 602 "parser.y" +case 196: +#line 605 "parser.y" { yyval.ifref = make_ifref(yyvsp[0].type); yyval.ifref->attrs = yyvsp[-1].attr; ; break;} -case 194: -#line 605 "parser.y" +case 197: +#line 608 "parser.y" { yyval.type = get_type(0, yyvsp[0].str, 0); ; break;} -case 195: -#line 606 "parser.y" -{ yyval.type = get_type(0, yyvsp[0].str, 0); ; - break;} -case 196: +case 198: #line 609 "parser.y" +{ yyval.type = get_type(0, yyvsp[0].str, 0); ; + break;} +case 199: +#line 612 "parser.y" { yyval.type = yyvsp[0].type; if (yyval.type->defined) yyerror("multiple definition error\n"); yyval.type->attrs = yyvsp[-1].attr; @@ -2162,48 +2198,48 @@ case 196: if (!parse_only && do_header) write_forward(yyval.type); ; break;} -case 197: -#line 621 "parser.y" +case 200: +#line 624 "parser.y" { yyval.var = NULL; ; break;} -case 198: -#line 622 "parser.y" +case 201: +#line 625 "parser.y" { LINK(yyvsp[-1].var, yyvsp[-2].var); yyval.var = yyvsp[-1].var; ; break;} -case 199: -#line 625 "parser.y" +case 202: +#line 628 "parser.y" { yyval.func = NULL; ; break;} -case 200: -#line 626 "parser.y" +case 203: +#line 629 "parser.y" { LINK(yyvsp[-1].func, yyvsp[-2].func); yyval.func = yyvsp[-1].func; ; break;} -case 201: -#line 632 "parser.y" +case 204: +#line 635 "parser.y" { yyval.type = yyvsp[-4].type; yyval.type->fields = yyvsp[-2].var; yyval.type->funcs = yyvsp[-1].func; if (!parse_only && do_header) write_dispinterface(yyval.type); ; break;} -case 202: -#line 644 "parser.y" +case 205: +#line 647 "parser.y" { yyval.type = NULL; ; break;} -case 203: -#line 645 "parser.y" +case 206: +#line 648 "parser.y" { yyval.type = find_type2(yyvsp[0].str, 0); ; break;} -case 204: -#line 648 "parser.y" +case 207: +#line 651 "parser.y" { yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; break;} -case 205: -#line 649 "parser.y" -{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; - break;} -case 206: +case 208: #line 652 "parser.y" +{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; + break;} +case 209: +#line 655 "parser.y" { yyval.type = yyvsp[0].type; if (yyval.type->defined) yyerror("multiple definition error\n"); yyval.type->attrs = yyvsp[-1].attr; @@ -2211,16 +2247,16 @@ case 206: if (!parse_only && do_header) write_forward(yyval.type); ; break;} -case 207: -#line 661 "parser.y" +case 210: +#line 664 "parser.y" { yyval.type = yyvsp[-4].type; yyval.type->ref = yyvsp[-3].type; yyval.type->funcs = yyvsp[-1].func; if (!parse_only && do_header) write_interface(yyval.type); ; break;} -case 208: -#line 669 "parser.y" +case 211: +#line 672 "parser.y" { yyval.type = yyvsp[-6].type; yyval.type->ref = find_type2(yyvsp[-4].str, 0); if (!yyval.type->ref) yyerror("base class %s not found in import\n", yyvsp[-4].str); @@ -2228,116 +2264,116 @@ case 208: if (!parse_only && do_header) write_interface(yyval.type); ; break;} -case 209: -#line 675 "parser.y" +case 212: +#line 678 "parser.y" { yyval.type = yyvsp[0].type; ; break;} -case 210: -#line 679 "parser.y" -{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; - break;} -case 211: -#line 680 "parser.y" -{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; - break;} -case 212: -#line 683 "parser.y" -{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; - break;} case 213: -#line 684 "parser.y" -{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; +#line 682 "parser.y" +{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; break;} case 214: +#line 683 "parser.y" +{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; + break;} +case 215: +#line 686 "parser.y" +{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; + break;} +case 216: #line 687 "parser.y" +{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; + break;} +case 217: +#line 690 "parser.y" { yyval.type = yyvsp[0].type; yyval.type->attrs = yyvsp[-1].attr; ; break;} -case 215: -#line 692 "parser.y" +case 218: +#line 695 "parser.y" { yyval.type = yyvsp[-3].type; yyval.type->funcs = yyvsp[-1].func; /* FIXME: if (!parse_only && do_header) write_module($$); */ ; break;} -case 216: -#line 698 "parser.y" +case 219: +#line 701 "parser.y" { yyval.var = yyvsp[0].var; yyval.var->ptr_level++; ; break;} -case 217: -#line 699 "parser.y" +case 220: +#line 702 "parser.y" { yyval.var = yyvsp[0].var; /* FIXME */ ; break;} -case 220: -#line 704 "parser.y" +case 223: +#line 707 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} -case 222: -#line 709 "parser.y" +case 225: +#line 712 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; ; break;} -case 223: -#line 713 "parser.y" +case 226: +#line 716 "parser.y" { yyval.num = RPC_FC_RP; ; break;} -case 224: -#line 714 "parser.y" +case 227: +#line 717 "parser.y" { yyval.num = RPC_FC_UP; ; break;} -case 225: -#line 717 "parser.y" +case 228: +#line 720 "parser.y" { yyval.type = get_typev(RPC_FC_STRUCT, yyvsp[-3].var, tsSTRUCT); - /* overwrite RPC_FC_STRUCT with a more exact type */ + /* overwrite RPC_FC_STRUCT with a more exact type */ yyval.type->type = get_struct_type( yyvsp[-1].var ); yyval.type->fields = yyvsp[-1].var; yyval.type->defined = TRUE; - if(in_typelib) - add_struct(yyval.type); - ; - break;} -case 226: -#line 727 "parser.y" -{ yyval.tref = make_tref(NULL, make_type(0, NULL)); ; - break;} -case 227: -#line 728 "parser.y" -{ yyval.tref = make_tref(yyvsp[0].str, find_type(yyvsp[0].str, 0)); ; - break;} -case 228: -#line 729 "parser.y" -{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; + if(in_typelib) + add_struct(yyval.type); + ; break;} case 229: #line 730 "parser.y" -{ yyval.tref = uniq_tref(yyvsp[0].tref); yyval.tref->ref->is_const = TRUE; ; +{ yyval.tref = make_tref(NULL, make_type(0, NULL)); ; break;} case 230: #line 731 "parser.y" -{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; +{ yyval.tref = make_tref(yyvsp[0].str, find_type(yyvsp[0].str, 0)); ; break;} case 231: #line 732 "parser.y" -{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsENUM)); ; +{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} case 232: #line 733 "parser.y" -{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; +{ yyval.tref = uniq_tref(yyvsp[0].tref); yyval.tref->ref->is_const = TRUE; ; break;} case 233: #line 734 "parser.y" -{ yyval.tref = make_tref(NULL, get_type(RPC_FC_STRUCT, yyvsp[0].str, tsSTRUCT)); ; +{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} case 234: #line 735 "parser.y" -{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; +{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsENUM)); ; break;} case 235: #line 736 "parser.y" -{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsUNION)); ; +{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} case 236: +#line 737 "parser.y" +{ yyval.tref = make_tref(NULL, get_type(RPC_FC_STRUCT, yyvsp[0].str, tsSTRUCT)); ; + break;} +case 237: +#line 738 "parser.y" +{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; + break;} +case 238: #line 739 "parser.y" +{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsUNION)); ; + break;} +case 239: +#line 742 "parser.y" { typeref_t *tref = uniq_tref(yyvsp[-1].tref); yyvsp[0].var->tname = tref->name; tref->name = NULL; @@ -2349,15 +2385,15 @@ case 236: reg_types(yyval.type, yyvsp[0].var, 0); ; break;} -case 237: -#line 751 "parser.y" +case 240: +#line 754 "parser.y" { yyval.type = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, yyvsp[-3].var, tsUNION); yyval.type->fields = yyvsp[-1].var; yyval.type->defined = TRUE; ; break;} -case 238: -#line 757 "parser.y" +case 241: +#line 760 "parser.y" { var_t *u = yyvsp[-3].var; yyval.type = get_typev(RPC_FC_ENCAPSULATED_UNION, yyvsp[-8].var, tsUNION); if (!u) u = make_var("tagged_union"); @@ -2368,12 +2404,12 @@ case 238: yyval.type->defined = TRUE; ; break;} -case 239: -#line 769 "parser.y" +case 242: +#line 772 "parser.y" { yyval.num = MAKELONG(yyvsp[0].num, 0); ; break;} -case 240: -#line 770 "parser.y" +case 243: +#line 773 "parser.y" { yyval.num = MAKELONG(yyvsp[-2].num, yyvsp[0].num); ; break;} } @@ -2598,7 +2634,7 @@ yyerrhandle: } return 1; } -#line 773 "parser.y" +#line 776 "parser.y" static attr_t *make_attr(enum attr_type type) diff --git a/reactos/tools/widl/y.tab.h b/reactos/tools/widl/y.tab.h index 70ea7632b46..72763e4f937 100644 --- a/reactos/tools/widl/y.tab.h +++ b/reactos/tools/widl/y.tab.h @@ -56,79 +56,81 @@ typedef union { #define tENTRY 299 #define tENUM 300 #define tERRORSTATUST 301 -#define tEXTERN 302 -#define tFLOAT 303 -#define tHANDLE 304 -#define tHANDLET 305 -#define tHELPCONTEXT 306 -#define tHELPFILE 307 -#define tHELPSTRING 308 -#define tHELPSTRINGCONTEXT 309 -#define tHELPSTRINGDLL 310 -#define tHIDDEN 311 -#define tHYPER 312 -#define tID 313 -#define tIDEMPOTENT 314 -#define tIIDIS 315 -#define tIMPORT 316 -#define tIMPORTLIB 317 -#define tIN 318 -#define tINCLUDE 319 -#define tINLINE 320 -#define tINPUTSYNC 321 -#define tINT 322 -#define tINT64 323 -#define tINTERFACE 324 -#define tLENGTHIS 325 -#define tLIBRARY 326 -#define tLOCAL 327 -#define tLONG 328 -#define tMETHODS 329 -#define tMODULE 330 -#define tNONCREATABLE 331 -#define tOBJECT 332 -#define tODL 333 -#define tOLEAUTOMATION 334 -#define tOPTIONAL 335 -#define tOUT 336 -#define tPOINTERDEFAULT 337 -#define tPROPERTIES 338 -#define tPROPGET 339 -#define tPROPPUT 340 -#define tPROPPUTREF 341 -#define tPUBLIC 342 -#define tREADONLY 343 -#define tREF 344 -#define tRESTRICTED 345 -#define tRETVAL 346 -#define tSHORT 347 -#define tSIGNED 348 -#define tSIZEIS 349 -#define tSIZEOF 350 -#define tSOURCE 351 -#define tSTDCALL 352 -#define tSTRING 353 -#define tSTRUCT 354 -#define tSWITCH 355 -#define tSWITCHIS 356 -#define tSWITCHTYPE 357 -#define tTRANSMITAS 358 -#define tTYPEDEF 359 -#define tUNION 360 -#define tUNIQUE 361 -#define tUNSIGNED 362 -#define tUUID 363 -#define tV1ENUM 364 -#define tVARARG 365 -#define tVERSION 366 -#define tVOID 367 -#define tWCHAR 368 -#define tWIREMARSHAL 369 -#define tPOINTERTYPE 370 -#define COND 371 -#define CAST 372 -#define PPTR 373 -#define NEG 374 +#define tEXPLICITHANDLE 302 +#define tEXTERN 303 +#define tFLOAT 304 +#define tHANDLE 305 +#define tHANDLET 306 +#define tHELPCONTEXT 307 +#define tHELPFILE 308 +#define tHELPSTRING 309 +#define tHELPSTRINGCONTEXT 310 +#define tHELPSTRINGDLL 311 +#define tHIDDEN 312 +#define tHYPER 313 +#define tID 314 +#define tIDEMPOTENT 315 +#define tIIDIS 316 +#define tIMPLICITHANDLE 317 +#define tIMPORT 318 +#define tIMPORTLIB 319 +#define tIN 320 +#define tINCLUDE 321 +#define tINLINE 322 +#define tINPUTSYNC 323 +#define tINT 324 +#define tINT64 325 +#define tINTERFACE 326 +#define tLENGTHIS 327 +#define tLIBRARY 328 +#define tLOCAL 329 +#define tLONG 330 +#define tMETHODS 331 +#define tMODULE 332 +#define tNONCREATABLE 333 +#define tOBJECT 334 +#define tODL 335 +#define tOLEAUTOMATION 336 +#define tOPTIONAL 337 +#define tOUT 338 +#define tPOINTERDEFAULT 339 +#define tPROPERTIES 340 +#define tPROPGET 341 +#define tPROPPUT 342 +#define tPROPPUTREF 343 +#define tPUBLIC 344 +#define tREADONLY 345 +#define tREF 346 +#define tRESTRICTED 347 +#define tRETVAL 348 +#define tSHORT 349 +#define tSIGNED 350 +#define tSIZEIS 351 +#define tSIZEOF 352 +#define tSOURCE 353 +#define tSTDCALL 354 +#define tSTRING 355 +#define tSTRUCT 356 +#define tSWITCH 357 +#define tSWITCHIS 358 +#define tSWITCHTYPE 359 +#define tTRANSMITAS 360 +#define tTYPEDEF 361 +#define tUNION 362 +#define tUNIQUE 363 +#define tUNSIGNED 364 +#define tUUID 365 +#define tV1ENUM 366 +#define tVARARG 367 +#define tVERSION 368 +#define tVOID 369 +#define tWCHAR 370 +#define tWIREMARSHAL 371 +#define tPOINTERTYPE 372 +#define COND 373 +#define CAST 374 +#define PPTR 375 +#define NEG 376 extern YYSTYPE yylval;