diff --git a/reactos/tools/widl/ChangeLog b/reactos/tools/widl/ChangeLog index 40eca25ea06..3b14c38e2e3 100644 --- a/reactos/tools/widl/ChangeLog +++ b/reactos/tools/widl/ChangeLog @@ -1,5 +1,15 @@ ChangeLog +2005-04-03 ekohl + + tools/widl/client.c + tools/widl/parser.l + tools/widl/parser.y + tools/widl/server.c + tools/widl/widltypes.h + +Support 'ref' and 'unique' attributes for pointers. + 2005-03-27 Jacek Caban (from WINE) tools/widl/parser.y diff --git a/reactos/tools/widl/client.c b/reactos/tools/widl/client.c index 88fc579517f..134652997c0 100644 --- a/reactos/tools/widl/client.c +++ b/reactos/tools/widl/client.c @@ -187,6 +187,7 @@ static void write_typeformatstring(type_t *iface) var_t *var; int out_attr; int string_attr; + int ptr_attr, ref_attr, unique_attr; print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); @@ -217,12 +218,27 @@ static void write_typeformatstring(type_t *iface) if (var->ptr_level == 1) { + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + if (is_base_type(var->type)) { if (out_attr) print_client("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else - print_client("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); + { + if (ptr_attr) + print_client("0x14, 0x08, /* FC_FP [simple_pointer] */\n"); + else if (ref_attr) + print_client("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); + else if (unique_attr) + print_client("0x12, 0x08, /* FC_UP [simple_pointer] */\n"); + } + if (string_attr) { if (var->type->type == RPC_FC_CHAR) @@ -268,6 +284,7 @@ static void print_message_buffer_size(func_t *func, unsigned int *type_offset) int out_attr; int string_attr; int nothing_printed = 1; + int ptr_attr, ref_attr, unique_attr; var_t *var; unsigned int local_type_offset = *type_offset; @@ -286,19 +303,104 @@ static void print_message_buffer_size(func_t *func, unsigned int *type_offset) if (!out_attr && !in_attr) in_attr = 1; + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + + /* default to 'ref' attribute */ + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + if (!in_attr) continue; - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + if (var->ptr_level == 1) { - size = 12; - alignment = 0; - if (last_size != -1) - fprintf(client, " +"); - fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - nothing_printed = 0; + if (unique_attr) + { + if (string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { + size = 16; + alignment = 0; + if (last_size != -1) + fprintf(client, " +"); + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); + nothing_printed = 0; + } + else + { + size = 8; + alignment = 0; + if (last_size != -1) + fprintf(client, " +"); + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); + nothing_printed = 0; + } + } + else if (ref_attr) + { + if (string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { + size = 12; + alignment = 0; + if (last_size != -1) + fprintf(client, " +"); + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); + nothing_printed = 0; + } + else + { + alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment += (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment += (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment += (4 - last_size); + break; + + case RPC_FC_IGNORE: + size = 0; + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } + + if (last_size != -1) + fprintf(client, " +"); + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); + nothing_printed = 0; + } + } } else { @@ -377,20 +479,46 @@ static void print_message_buffer_size(func_t *func, unsigned int *type_offset) if (!out_attr && !in_attr) in_attr = 1; + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + + /* default to 'ref' attribute */ + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + if (in_attr) { if (var->ptr_level == 1 && string_attr && (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - print_client("NdrConformantStringBufferSize(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - local_type_offset + 2); - nothing_printed = 1; - indent--; + if (ptr_attr) + { + /* FIXME: not supported yet */ + } + if (ref_attr) + { + print_client("NdrConformantStringBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 2); + nothing_printed = 1; + indent--; + } + else if (unique_attr) + { + print_client("NdrPointerBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset); + nothing_printed = 1; + indent--; + } } } @@ -415,6 +543,7 @@ static void marshall_in_arguments(func_t *func, unsigned int *type_offset) int in_attr; int out_attr; int string_attr; + int ptr_attr, ref_attr, unique_attr; var_t *var; if (!func->args) @@ -441,17 +570,103 @@ static void marshall_in_arguments(func_t *func, unsigned int *type_offset) return; } - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + if (var->ptr_level == 1) { - print_client("NdrConformantStringMarshall(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset + 2); - indent--; - fprintf(client, "\n"); + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + + if (ref_attr) + { + if (string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { + print_client("NdrConformantStringMarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset + 2); + indent--; + fprintf(client, "\n"); + } + else + { + alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_IGNORE: + size = 0; + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } + + if (size != 0) + { + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); + + print_client("*(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR*)_StubMsg.Buffer) = "); + if (var->ptr_level == 1) + fprintf(client, "*"); + write_name(client, var); + fprintf(client, ";\n"); + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, ");\n"); + fprintf(client, "\n"); + + last_size = size; + } + } + } + else if (unique_attr) + { + print_client("NdrPointerMarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset); + indent--; + fprintf(client, "\n"); + } } else { @@ -675,6 +890,9 @@ static void unmarshall_out_arguments(func_t *func) static void check_pointers(func_t *func) { var_t *var; + int ptr_attr; + int ref_attr; + int unique_attr; if (!func->args) return; @@ -683,20 +901,50 @@ static void check_pointers(func_t *func) while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->ptr_level == 1) + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + + if (var->ptr_level == 0) { - print_client("if (!%s)\n", var->name); - print_client("{\n"); - indent++; - print_client("RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); - indent--; - print_client("}\n"); - fprintf(client, "\n"); + if (ptr_attr + ref_attr + unique_attr != 0) + { + error("The attributes [ptr], [ref] and [unique] can only be used for pointers!\n"); + return; + } } - else if (var->ptr_level > 1) + else { - error("Pointer level %d not supported!\n", var->ptr_level); - return; + /* default to 'ref' attribute */ + if (ptr_attr + ref_attr + unique_attr == 0) + { + ref_attr = 1; + } + + if (ptr_attr + ref_attr + unique_attr > 1) + { + error("The attributes [ptr], [ref] and [unique] are mutually exclusive!\n"); + return; + } + + if (var->ptr_level == 1) + { + if (ref_attr) + { + print_client("if (!%s)\n", var->name); + print_client("{\n"); + indent++; + print_client("RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); + indent--; + print_client("}\n"); + fprintf(client, "\n"); + } + } + else if (var->ptr_level > 1) + { + error("Pointer level %d not supported!\n", var->ptr_level); + return; + } } var = PREV_LINK(var); diff --git a/reactos/tools/widl/lex.yy.c b/reactos/tools/widl/lex.yy.c index 419d7576c26..6083b88b7c2 100644 --- a/reactos/tools/widl/lex.yy.c +++ b/reactos/tools/widl/lex.yy.c @@ -4555,6 +4555,7 @@ static struct keyword { {"propput", tPROPPUT}, {"propputref", tPROPPUTREF}, /* ... */ + {"ptr", tPTR}, {"public", tPUBLIC}, /* ... */ {"readonly", tREADONLY}, @@ -4579,8 +4580,8 @@ static struct keyword { /* ... */ {"transmit_as", tTRANSMITAS}, {"typedef", tTYPEDEF}, - {"union", tUNION}, /* ... */ + {"union", tUNION}, {"unique", tUNIQUE}, {"unsigned", tUNSIGNED}, /* ... */ diff --git a/reactos/tools/widl/parser.l b/reactos/tools/widl/parser.l index f41af6bff25..72716b70e0d 100644 --- a/reactos/tools/widl/parser.l +++ b/reactos/tools/widl/parser.l @@ -275,6 +275,7 @@ static struct keyword { {"propput", tPROPPUT}, {"propputref", tPROPPUTREF}, /* ... */ + {"ptr", tPTR}, {"public", tPUBLIC}, /* ... */ {"readonly", tREADONLY}, @@ -299,8 +300,8 @@ static struct keyword { /* ... */ {"transmit_as", tTRANSMITAS}, {"typedef", tTYPEDEF}, - {"union", tUNION}, /* ... */ + {"union", tUNION}, {"unique", tUNIQUE}, {"unsigned", tUNSIGNED}, /* ... */ diff --git a/reactos/tools/widl/parser.y b/reactos/tools/widl/parser.y index 120e5e70623..a4b7edf05c6 100644 --- a/reactos/tools/widl/parser.y +++ b/reactos/tools/widl/parser.y @@ -162,6 +162,7 @@ static type_t std_uhyper = { "MIDL_uhyper" }; %token tPOINTERDEFAULT %token tPROPERTIES %token tPROPGET tPROPPUT tPROPPUTREF +%token tPTR %token tPUBLIC %token tREADONLY tREF %token tRESTRICTED @@ -373,8 +374,10 @@ attribute: | tPROPGET { $$ = make_attr(ATTR_PROPGET); } | tPROPPUT { $$ = make_attr(ATTR_PROPPUT); } | tPROPPUTREF { $$ = make_attr(ATTR_PROPPUTREF); } + | tPTR { $$ = make_attr(ATTR_PTR); } | tPUBLIC { $$ = make_attr(ATTR_PUBLIC); } | tREADONLY { $$ = make_attr(ATTR_READONLY); } + | tREF { $$ = make_attr(ATTR_REF); } | tRESTRICTED { $$ = make_attr(ATTR_RESTRICTED); } | tRETVAL { $$ = make_attr(ATTR_RETVAL); } | tSIZEIS '(' m_exprs ')' { $$ = make_attrp(ATTR_SIZEIS, $3); } @@ -383,6 +386,7 @@ attribute: | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } | tSWITCHTYPE '(' type ')' { $$ = make_attrp(ATTR_SWITCHTYPE, type_ref($3)); } | tTRANSMITAS '(' type ')' { $$ = make_attrp(ATTR_TRANSMITAS, type_ref($3)); } + | tUNIQUE { $$ = make_attr(ATTR_UNIQUE); } | tUUID '(' aUUID ')' { $$ = make_attrp(ATTR_UUID, $3); } | tV1ENUM { $$ = make_attr(ATTR_V1ENUM); } | tVARARG { $$ = make_attr(ATTR_VARARG); } diff --git a/reactos/tools/widl/server.c b/reactos/tools/widl/server.c index dfa359fefcc..833c117951b 100644 --- a/reactos/tools/widl/server.c +++ b/reactos/tools/widl/server.c @@ -192,6 +192,7 @@ static void write_typeformatstring(type_t *iface) var_t *var; int out_attr; int string_attr; + int ptr_attr, ref_attr, unique_attr; print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); @@ -222,12 +223,27 @@ static void write_typeformatstring(type_t *iface) if (var->ptr_level == 1) { + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + if (is_base_type(var->type)) { if (out_attr) print_server("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else - print_server("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); + { + if (ptr_attr) + print_server("0x14, 0x08, /* FC_FP [simple_pointer] */\n"); + else if (ref_attr) + print_server("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); + else if (unique_attr) + print_server("0x12, 0x08, /* FC_UP [simple_pointer] */\n"); + } + if (string_attr) { if (var->type->type == RPC_FC_CHAR) @@ -439,9 +455,9 @@ static void unmarshall_in_arguments(func_t *func, unsigned int *type_offset) unsigned int size; unsigned int last_size = 0; var_t *var; - int in_attr; - int out_attr; + int in_attr, out_attr; int string_attr; + int ptr_attr, ref_attr, unique_attr; if (!func->args) return; @@ -460,18 +476,104 @@ static void unmarshall_in_arguments(func_t *func, unsigned int *type_offset) if (in_attr) { - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + if (var->ptr_level == 1) { - print_server("NdrConformantStringUnmarshall(\n"); - indent++; - print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); - print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", *type_offset + 2); - print_server("(unsigned char)0);\n"); - indent--; - fprintf(server, "\n"); + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + + if (ref_attr) + { + if (string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { + print_server("NdrConformantStringUnmarshall(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", *type_offset + 2); + print_server("(unsigned char)0);\n"); + indent--; + fprintf(server, "\n"); + } + else + { + alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_IGNORE: + size = 0; + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } + + if (size != 0) + { + if (alignment != 0) + print_server("_StubMsg.Buffer += %u;\n", alignment); + + print_server(""); + write_name(server, var); + fprintf(server, " = ("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer;\n"); + print_server("_StubMsg.Buffer += sizeof("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, ");\n"); + fprintf(server, "\n"); + + last_size = size; + } + } + } + else if (unique_attr) + { + print_server("NdrPointerUnmarshall(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", *type_offset); + print_server("(unsigned char)0);\n"); + indent--; + fprintf(server, "\n"); + } + } else { @@ -523,35 +625,15 @@ static void unmarshall_in_arguments(func_t *func, unsigned int *type_offset) if (alignment != 0) print_server("_StubMsg.Buffer += %u;\n", alignment); - if (var->ptr_level == 0) - { - print_server(""); - write_name(server, var); - fprintf(server, " = *(("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer);\n"); - print_server("_StubMsg.Buffer += sizeof("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, ");\n"); - fprintf(server, "\n"); - } - else if (var->ptr_level == 1) - { - print_server(""); - write_name(server, var); - fprintf(server, " = ("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer;\n"); - print_server("_StubMsg.Buffer += sizeof("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, ");\n"); - fprintf(server, "\n"); - } - else - { - error("Pointer level %d is not supported!\n", var->ptr_level); - return; - } + print_server(""); + write_name(server, var); + fprintf(server, " = *(("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer);\n"); + print_server("_StubMsg.Buffer += sizeof("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, ");\n"); + fprintf(server, "\n"); last_size = size; } diff --git a/reactos/tools/widl/widltypes.h b/reactos/tools/widl/widltypes.h index 6ea50d429ee..5802099589d 100644 --- a/reactos/tools/widl/widltypes.h +++ b/reactos/tools/widl/widltypes.h @@ -98,8 +98,10 @@ enum attr_type ATTR_PROPGET, ATTR_PROPPUT, ATTR_PROPPUTREF, + ATTR_PTR, ATTR_PUBLIC, ATTR_READONLY, + ATTR_REF, ATTR_RESTRICTED, ATTR_RETVAL, ATTR_SIZEIS, @@ -108,6 +110,7 @@ enum attr_type ATTR_SWITCHIS, ATTR_SWITCHTYPE, ATTR_TRANSMITAS, + ATTR_UNIQUE, ATTR_UUID, ATTR_V1ENUM, ATTR_VARARG, diff --git a/reactos/tools/widl/y.tab.c b/reactos/tools/widl/y.tab.c index 694b3e25674..ca14f77f36f 100644 --- a/reactos/tools/widl/y.tab.c +++ b/reactos/tools/widl/y.tab.c @@ -91,40 +91,41 @@ #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 tSMALL 353 -#define tSOURCE 354 -#define tSTDCALL 355 -#define tSTRING 356 -#define tSTRUCT 357 -#define tSWITCH 358 -#define tSWITCHIS 359 -#define tSWITCHTYPE 360 -#define tTRANSMITAS 361 -#define tTYPEDEF 362 -#define tUNION 363 -#define tUNIQUE 364 -#define tUNSIGNED 365 -#define tUUID 366 -#define tV1ENUM 367 -#define tVARARG 368 -#define tVERSION 369 -#define tVOID 370 -#define tWCHAR 371 -#define tWIREMARSHAL 372 -#define tPOINTERTYPE 373 -#define COND 374 -#define CAST 375 -#define PPTR 376 -#define NEG 377 +#define tPTR 344 +#define tPUBLIC 345 +#define tREADONLY 346 +#define tREF 347 +#define tRESTRICTED 348 +#define tRETVAL 349 +#define tSHORT 350 +#define tSIGNED 351 +#define tSIZEIS 352 +#define tSIZEOF 353 +#define tSMALL 354 +#define tSOURCE 355 +#define tSTDCALL 356 +#define tSTRING 357 +#define tSTRUCT 358 +#define tSWITCH 359 +#define tSWITCHIS 360 +#define tSWITCHTYPE 361 +#define tTRANSMITAS 362 +#define tTYPEDEF 363 +#define tUNION 364 +#define tUNIQUE 365 +#define tUNSIGNED 366 +#define tUUID 367 +#define tV1ENUM 368 +#define tVARARG 369 +#define tVERSION 370 +#define tVOID 371 +#define tWCHAR 372 +#define tWIREMARSHAL 373 +#define tPOINTERTYPE 374 +#define COND 375 +#define CAST 376 +#define PPTR 377 +#define NEG 378 #line 1 "parser.y" @@ -256,26 +257,26 @@ typedef union { -#define YYFINAL 459 +#define YYFINAL 462 #define YYFLAG -32768 -#define YYNTBASE 143 +#define YYNTBASE 144 -#define YYTRANSLATE(x) ((unsigned)(x) <= 377 ? yytranslate[x] : 215) +#define YYTRANSLATE(x) ((unsigned)(x) <= 378 ? yytranslate[x] : 216) 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, 123, 2, 133, - 134, 126, 125, 120, 124, 142, 127, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 139, 132, 2, - 140, 2, 141, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 124, 2, 134, + 135, 127, 126, 121, 125, 143, 128, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 140, 133, 2, + 141, 2, 142, 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, - 137, 2, 138, 2, 2, 2, 2, 2, 2, 2, + 138, 2, 139, 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, 135, 122, 136, 128, 2, 2, 2, 2, + 2, 2, 136, 123, 137, 129, 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 +301,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, - 117, 118, 119, 121, 129, 130, 131 + 117, 118, 119, 120, 122, 130, 131, 132 }; #if YYDEBUG != 0 @@ -315,132 +316,133 @@ static const short yyprhs[] = { 0, 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, 564, 565, 567, 569, 572, 575, 578, 581, - 583, 585, 588, 591, 594, 599, 600, 603, 606, 609, - 612, 615, 618, 622, 625, 629, 635, 636, 639, 642, - 645, 648, 654, 662, 664, 667, 670, 673, 676, 679, - 684, 687, 690, 692, 694, 698, 700, 704, 706, 708, - 714, 716, 718, 720, 723, 725, 728, 730, 733, 735, - 738, 743, 749, 760, 762 + 313, 315, 317, 322, 324, 326, 331, 336, 341, 343, + 348, 350, 352, 357, 362, 364, 365, 367, 368, 371, + 376, 380, 386, 387, 390, 392, 394, 398, 402, 404, + 410, 412, 416, 417, 419, 421, 423, 425, 431, 435, + 439, 443, 447, 451, 455, 459, 463, 466, 469, 472, + 477, 482, 486, 488, 492, 494, 499, 500, 503, 506, + 510, 513, 515, 520, 528, 529, 531, 532, 534, 536, + 538, 540, 542, 544, 546, 548, 550, 552, 555, 558, + 560, 562, 564, 566, 568, 570, 571, 573, 575, 578, + 581, 584, 587, 589, 591, 594, 597, 600, 605, 606, + 609, 612, 615, 618, 621, 624, 628, 631, 635, 641, + 642, 645, 648, 651, 654, 660, 668, 670, 673, 676, + 679, 682, 685, 690, 693, 696, 698, 700, 704, 706, + 710, 712, 714, 720, 722, 724, 726, 729, 731, 734, + 736, 739, 741, 744, 749, 755, 766, 768 }; -static const short yyrhs[] = { 144, - 0, 0, 144, 202, 0, 144, 201, 0, 144, 190, - 0, 144, 205, 0, 144, 153, 0, 144, 147, 0, - 0, 145, 202, 0, 145, 201, 0, 145, 190, 0, - 145, 205, 0, 145, 147, 0, 0, 146, 181, 132, - 0, 146, 147, 0, 132, 0, 167, 132, 0, 148, - 0, 171, 132, 0, 177, 132, 0, 150, 0, 210, - 132, 0, 212, 132, 0, 213, 132, 0, 37, 133, - 7, 134, 0, 64, 7, 132, 0, 149, 145, 9, - 0, 74, 3, 0, 161, 151, 135, 0, 152, 145, - 136, 0, 0, 156, 0, 116, 0, 157, 0, 156, - 120, 157, 0, 155, 0, 161, 211, 207, 158, 0, - 211, 207, 158, 0, 161, 211, 207, 133, 154, 134, - 0, 211, 207, 133, 154, 134, 0, 0, 137, 159, - 138, 0, 137, 126, 138, 0, 173, 0, 159, 120, - 174, 0, 159, 138, 137, 174, 0, 0, 161, 0, - 137, 162, 138, 0, 163, 0, 162, 120, 163, 0, - 162, 138, 137, 163, 0, 16, 0, 18, 0, 24, - 133, 184, 134, 0, 26, 133, 175, 134, 0, 33, +static const short yyrhs[] = { 145, + 0, 0, 145, 203, 0, 145, 202, 0, 145, 191, + 0, 145, 206, 0, 145, 154, 0, 145, 148, 0, + 0, 146, 203, 0, 146, 202, 0, 146, 191, 0, + 146, 206, 0, 146, 148, 0, 0, 147, 182, 133, + 0, 147, 148, 0, 133, 0, 168, 133, 0, 149, + 0, 172, 133, 0, 178, 133, 0, 151, 0, 211, + 133, 0, 213, 133, 0, 214, 133, 0, 37, 134, + 7, 135, 0, 64, 7, 133, 0, 150, 146, 9, + 0, 74, 3, 0, 162, 152, 136, 0, 153, 146, + 137, 0, 0, 157, 0, 117, 0, 158, 0, 157, + 121, 158, 0, 156, 0, 162, 212, 208, 159, 0, + 212, 208, 159, 0, 162, 212, 208, 134, 155, 135, + 0, 212, 208, 134, 155, 135, 0, 0, 138, 160, + 139, 0, 138, 127, 139, 0, 174, 0, 160, 121, + 175, 0, 160, 139, 138, 175, 0, 0, 162, 0, + 138, 163, 139, 0, 164, 0, 163, 121, 164, 0, + 163, 139, 138, 164, 0, 16, 0, 18, 0, 24, + 134, 185, 135, 0, 26, 134, 176, 135, 0, 33, 0, 34, 0, 35, 0, 36, 0, 38, 0, 39, - 133, 176, 134, 0, 39, 133, 7, 134, 0, 41, - 133, 7, 134, 0, 43, 0, 44, 133, 7, 134, - 0, 45, 133, 7, 134, 0, 45, 133, 176, 134, - 0, 48, 0, 51, 0, 53, 133, 176, 134, 0, - 54, 133, 7, 134, 0, 55, 133, 7, 134, 0, - 56, 133, 176, 134, 0, 57, 133, 7, 134, 0, - 58, 0, 60, 133, 176, 134, 0, 61, 0, 62, - 133, 184, 134, 0, 63, 133, 52, 3, 134, 0, - 66, 0, 69, 0, 73, 133, 172, 134, 0, 75, + 134, 177, 135, 0, 39, 134, 7, 135, 0, 41, + 134, 7, 135, 0, 43, 0, 44, 134, 7, 135, + 0, 45, 134, 7, 135, 0, 45, 134, 177, 135, + 0, 48, 0, 51, 0, 53, 134, 177, 135, 0, + 54, 134, 7, 135, 0, 55, 134, 7, 135, 0, + 56, 134, 177, 135, 0, 57, 134, 7, 135, 0, + 58, 0, 60, 134, 177, 135, 0, 61, 0, 62, + 134, 185, 135, 0, 63, 134, 52, 3, 135, 0, + 66, 0, 69, 0, 73, 134, 173, 135, 0, 75, 0, 79, 0, 80, 0, 81, 0, 82, 0, 83, - 0, 84, 0, 85, 133, 209, 134, 0, 87, 0, - 88, 0, 89, 0, 90, 0, 91, 0, 93, 0, - 94, 0, 97, 133, 172, 134, 0, 100, 0, 102, - 0, 105, 133, 174, 134, 0, 106, 133, 211, 134, - 0, 107, 133, 211, 134, 0, 112, 133, 8, 134, - 0, 113, 0, 114, 0, 115, 133, 214, 134, 0, - 118, 133, 211, 134, 0, 209, 0, 0, 101, 0, - 0, 165, 166, 0, 26, 174, 139, 179, 0, 38, - 139, 179, 0, 32, 211, 184, 140, 176, 0, 0, - 169, 120, 0, 169, 0, 170, 0, 169, 120, 170, - 0, 184, 140, 176, 0, 184, 0, 46, 183, 135, - 168, 136, 0, 173, 0, 172, 120, 173, 0, 0, - 174, 0, 5, 0, 6, 0, 3, 0, 174, 141, - 174, 139, 174, 0, 174, 122, 174, 0, 174, 123, - 174, 0, 174, 125, 174, 0, 174, 124, 174, 0, - 174, 126, 174, 0, 174, 127, 174, 0, 174, 10, - 174, 0, 174, 11, 174, 0, 128, 174, 0, 124, - 174, 0, 126, 174, 0, 133, 211, 134, 174, 0, - 98, 133, 211, 134, 0, 133, 174, 134, 0, 176, - 0, 175, 120, 176, 0, 174, 0, 49, 32, 211, - 184, 0, 0, 178, 179, 0, 180, 132, 0, 160, - 213, 132, 0, 161, 132, 0, 132, 0, 160, 211, - 207, 158, 0, 160, 211, 164, 207, 133, 154, 134, - 0, 0, 184, 0, 0, 3, 0, 4, 0, 3, - 0, 4, 0, 60, 0, 94, 0, 115, 0, 22, - 0, 117, 0, 187, 0, 96, 187, 0, 111, 187, - 0, 111, 0, 50, 0, 42, 0, 20, 0, 47, - 0, 52, 0, 0, 70, 0, 70, 0, 99, 186, - 0, 95, 186, 0, 76, 186, 0, 59, 186, 0, - 71, 0, 28, 0, 29, 3, 0, 29, 4, 0, - 161, 188, 0, 189, 135, 191, 136, 0, 0, 191, - 192, 0, 160, 202, 0, 40, 3, 0, 40, 4, - 0, 161, 193, 0, 86, 139, 0, 195, 180, 132, - 0, 77, 139, 0, 196, 181, 132, 0, 194, 135, - 195, 196, 136, 0, 0, 139, 4, 0, 72, 3, - 0, 72, 4, 0, 161, 199, 0, 200, 198, 135, - 146, 136, 0, 200, 139, 3, 135, 150, 146, 136, - 0, 197, 0, 199, 132, 0, 193, 132, 0, 78, - 3, 0, 78, 4, 0, 161, 203, 0, 204, 135, - 146, 136, 0, 126, 207, 0, 32, 206, 0, 184, - 0, 206, 0, 133, 207, 134, 0, 207, 0, 208, - 120, 207, 0, 92, 0, 110, 0, 103, 183, 135, - 178, 136, 0, 116, 0, 4, 0, 185, 0, 32, - 211, 0, 171, 0, 46, 3, 0, 210, 0, 103, - 3, 0, 213, 0, 109, 3, 0, 108, 160, 211, - 208, 0, 109, 183, 135, 178, 136, 0, 109, 183, - 104, 133, 180, 134, 182, 135, 165, 136, 0, 5, - 0, 5, 142, 5, 0 + 0, 84, 0, 85, 134, 210, 135, 0, 87, 0, + 88, 0, 89, 0, 90, 0, 91, 0, 92, 0, + 93, 0, 94, 0, 95, 0, 98, 134, 173, 135, + 0, 101, 0, 103, 0, 106, 134, 175, 135, 0, + 107, 134, 212, 135, 0, 108, 134, 212, 135, 0, + 111, 0, 113, 134, 8, 135, 0, 114, 0, 115, + 0, 116, 134, 215, 135, 0, 119, 134, 212, 135, + 0, 210, 0, 0, 102, 0, 0, 166, 167, 0, + 26, 175, 140, 180, 0, 38, 140, 180, 0, 32, + 212, 185, 141, 177, 0, 0, 170, 121, 0, 170, + 0, 171, 0, 170, 121, 171, 0, 185, 141, 177, + 0, 185, 0, 46, 184, 136, 169, 137, 0, 174, + 0, 173, 121, 174, 0, 0, 175, 0, 5, 0, + 6, 0, 3, 0, 175, 142, 175, 140, 175, 0, + 175, 123, 175, 0, 175, 124, 175, 0, 175, 126, + 175, 0, 175, 125, 175, 0, 175, 127, 175, 0, + 175, 128, 175, 0, 175, 10, 175, 0, 175, 11, + 175, 0, 129, 175, 0, 125, 175, 0, 127, 175, + 0, 134, 212, 135, 175, 0, 99, 134, 212, 135, + 0, 134, 175, 135, 0, 177, 0, 176, 121, 177, + 0, 175, 0, 49, 32, 212, 185, 0, 0, 179, + 180, 0, 181, 133, 0, 161, 214, 133, 0, 162, + 133, 0, 133, 0, 161, 212, 208, 159, 0, 161, + 212, 165, 208, 134, 155, 135, 0, 0, 185, 0, + 0, 3, 0, 4, 0, 3, 0, 4, 0, 60, + 0, 95, 0, 116, 0, 22, 0, 118, 0, 188, + 0, 97, 188, 0, 112, 188, 0, 112, 0, 50, + 0, 42, 0, 20, 0, 47, 0, 52, 0, 0, + 70, 0, 70, 0, 100, 187, 0, 96, 187, 0, + 76, 187, 0, 59, 187, 0, 71, 0, 28, 0, + 29, 3, 0, 29, 4, 0, 162, 189, 0, 190, + 136, 192, 137, 0, 0, 192, 193, 0, 161, 203, + 0, 40, 3, 0, 40, 4, 0, 162, 194, 0, + 86, 140, 0, 196, 181, 133, 0, 77, 140, 0, + 197, 182, 133, 0, 195, 136, 196, 197, 137, 0, + 0, 140, 4, 0, 72, 3, 0, 72, 4, 0, + 162, 200, 0, 201, 199, 136, 147, 137, 0, 201, + 140, 3, 136, 151, 147, 137, 0, 198, 0, 200, + 133, 0, 194, 133, 0, 78, 3, 0, 78, 4, + 0, 162, 204, 0, 205, 136, 147, 137, 0, 127, + 208, 0, 32, 207, 0, 185, 0, 207, 0, 134, + 208, 135, 0, 208, 0, 209, 121, 208, 0, 93, + 0, 111, 0, 104, 184, 136, 179, 137, 0, 117, + 0, 4, 0, 186, 0, 32, 212, 0, 172, 0, + 46, 3, 0, 211, 0, 104, 3, 0, 214, 0, + 110, 3, 0, 109, 161, 212, 209, 0, 110, 184, + 136, 179, 137, 0, 110, 184, 105, 134, 181, 135, + 183, 136, 166, 137, 0, 5, 0, 5, 143, 5, + 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 226, 229, 230, 231, 232, 233, 234, 235, 238, 239, - 240, 241, 242, 243, 246, 247, 248, 251, 252, 253, - 254, 255, 256, 257, 258, 259, 262, 264, 267, 270, - 272, 274, 277, 278, 281, 284, 285, 286, 290, 294, - 297, 303, 310, 311, 312, 315, 316, 317, 320, 321, - 324, 328, 329, 330, 333, 335, 336, 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, 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, 500, 505, 506, 511, 512, 513, 514, 517, - 520, 531, 532, 535, 536, 537, 540, 542, 543, 544, - 545, 548, 549, 550, 551, 552, 564, 566, 567, 568, - 569, 570, 573, 574, 577, 578, 579, 580, 581, 582, - 583, 586, 587, 590, 596, 601, 602, 605, 609, 610, - 613, 625, 626, 629, 630, 633, 648, 649, 652, 653, - 656, 664, 672, 679, 682, 684, 687, 688, 691, 696, - 702, 703, 706, 707, 708, 711, 713, 716, 718, 721, - 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, - 743, 755, 759, 772, 774 + 227, 230, 231, 232, 233, 234, 235, 236, 239, 240, + 241, 242, 243, 244, 247, 248, 249, 252, 253, 254, + 255, 256, 257, 258, 259, 260, 263, 265, 268, 271, + 273, 275, 278, 279, 282, 285, 286, 287, 291, 295, + 298, 304, 311, 312, 313, 316, 317, 318, 321, 322, + 325, 329, 330, 331, 334, 336, 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, 394, 395, 398, 399, 402, 403, 408, + 412, 418, 425, 426, 427, 430, 431, 437, 442, 448, + 456, 457, 470, 471, 474, 475, 476, 477, 478, 479, + 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, + 490, 491, 494, 495, 498, 504, 509, 510, 515, 516, + 517, 518, 521, 524, 535, 536, 539, 540, 541, 544, + 546, 547, 548, 549, 552, 553, 554, 555, 556, 568, + 570, 571, 572, 573, 574, 577, 578, 581, 582, 583, + 584, 585, 586, 587, 590, 591, 594, 600, 605, 606, + 609, 613, 614, 617, 629, 630, 633, 634, 637, 652, + 653, 656, 657, 660, 668, 676, 683, 686, 688, 691, + 692, 695, 700, 706, 707, 710, 711, 712, 715, 717, + 720, 722, 725, 735, 736, 737, 738, 739, 740, 741, + 742, 743, 744, 747, 759, 763, 776, 778 }; #endif @@ -460,10 +462,10 @@ static const char * const yytname[] = { "$","error","$undefined.","aIDENTIFIER "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","tSMALL","tSOURCE","tSTDCALL","tSTRING","tSTRUCT","tSWITCH","tSWITCHIS", -"tSWITCHTYPE","tTRANSMITAS","tTYPEDEF","tUNION","tUNIQUE","tUNSIGNED","tUUID", -"tV1ENUM","tVARARG","tVERSION","tVOID","tWCHAR","tWIREMARSHAL","tPOINTERTYPE", +"tPTR","tPUBLIC","tREADONLY","tREF","tRESTRICTED","tRETVAL","tSHORT","tSIGNED", +"tSIZEIS","tSIZEOF","tSMALL","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", @@ -480,31 +482,31 @@ static const char * const yytname[] = { "$","error","$undefined.","aIDENTIFIER #endif static const short yyr1[] = { 0, - 143, 144, 144, 144, 144, 144, 144, 144, 145, 145, - 145, 145, 145, 145, 146, 146, 146, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 148, 149, 150, 151, - 152, 153, 154, 154, 155, 156, 156, 156, 157, 157, - 157, 157, 158, 158, 158, 159, 159, 159, 160, 160, - 161, 162, 162, 162, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 164, 164, 165, 165, 166, 166, 167, 168, - 168, 168, 169, 169, 170, 170, 171, 172, 172, 173, - 173, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 175, - 175, 176, 177, 178, 178, 179, 179, 179, 179, 180, - 181, 182, 182, 183, 183, 183, 184, 184, 184, 184, - 184, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 186, 186, 187, 187, 187, 187, 187, 187, - 187, 188, 188, 189, 190, 191, 191, 192, 193, 193, - 194, 195, 195, 196, 196, 197, 198, 198, 199, 199, - 200, 201, 201, 201, 202, 202, 203, 203, 204, 205, - 206, 206, 207, 207, 207, 208, 208, 209, 209, 210, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 212, 213, 213, 214, 214 + 144, 145, 145, 145, 145, 145, 145, 145, 146, 146, + 146, 146, 146, 146, 147, 147, 147, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 149, 150, 151, 152, + 153, 154, 155, 155, 156, 157, 157, 157, 158, 158, + 158, 158, 159, 159, 159, 160, 160, 160, 161, 161, + 162, 163, 163, 163, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 165, 165, 166, 166, 167, + 167, 168, 169, 169, 169, 170, 170, 171, 171, 172, + 173, 173, 174, 174, 175, 175, 175, 175, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, + 175, 175, 176, 176, 177, 178, 179, 179, 180, 180, + 180, 180, 181, 182, 183, 183, 184, 184, 184, 185, + 185, 185, 185, 185, 186, 186, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 187, 187, 188, 188, 188, + 188, 188, 188, 188, 189, 189, 190, 191, 192, 192, + 193, 194, 194, 195, 196, 196, 197, 197, 198, 199, + 199, 200, 200, 201, 202, 202, 202, 203, 203, 204, + 204, 205, 206, 207, 207, 208, 208, 208, 209, 209, + 210, 210, 211, 212, 212, 212, 212, 212, 212, 212, + 212, 212, 212, 213, 214, 214, 215, 215 }; static const short yyr2[] = { 0, @@ -518,333 +520,327 @@ static const short yyr2[] = { 0, 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, 1, 0, 1, 1, 2, 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 + 1, 1, 4, 1, 1, 4, 4, 4, 1, 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, 1, 0, 1, 1, 2, 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, 164, 0, 0, 0, 164, 49, - 164, 18, 0, 8, 20, 9, 23, 9, 7, 0, - 0, 0, 0, 0, 5, 0, 0, 214, 0, 207, - 4, 3, 0, 6, 0, 0, 0, 232, 180, 172, - 191, 0, 179, 164, 181, 178, 182, 183, 185, 190, - 183, 183, 0, 183, 164, 164, 177, 231, 173, 235, - 233, 174, 237, 0, 239, 0, 199, 200, 165, 166, - 0, 0, 0, 209, 210, 0, 0, 50, 0, 55, + 1, 0, 0, 0, 167, 0, 0, 0, 167, 49, + 167, 18, 0, 8, 20, 9, 23, 9, 7, 0, + 0, 0, 0, 0, 5, 0, 0, 217, 0, 210, + 4, 3, 0, 6, 0, 0, 0, 235, 183, 175, + 194, 0, 182, 167, 184, 181, 185, 186, 188, 193, + 186, 186, 0, 186, 167, 167, 180, 234, 176, 238, + 236, 177, 240, 0, 242, 0, 202, 203, 168, 169, + 0, 0, 0, 212, 213, 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, 228, 99, 100, 0, 102, 103, 0, 0, 0, - 229, 0, 108, 109, 0, 0, 0, 52, 112, 0, - 0, 0, 0, 0, 0, 194, 201, 211, 219, 19, - 21, 22, 196, 216, 0, 215, 0, 0, 15, 24, - 25, 26, 234, 236, 184, 189, 188, 187, 175, 186, - 238, 240, 176, 167, 168, 169, 170, 171, 0, 0, - 120, 0, 28, 154, 0, 0, 154, 0, 0, 0, + 98, 99, 100, 101, 102, 0, 104, 105, 0, 0, + 0, 109, 0, 111, 112, 0, 0, 0, 52, 115, + 0, 0, 0, 0, 0, 0, 197, 204, 214, 222, + 19, 21, 22, 199, 219, 0, 218, 0, 0, 15, + 24, 25, 26, 237, 239, 187, 192, 191, 190, 178, + 189, 241, 243, 179, 170, 171, 172, 173, 174, 0, + 0, 123, 0, 28, 157, 0, 0, 157, 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, - 192, 193, 30, 217, 218, 31, 49, 0, 49, 0, - 208, 15, 49, 0, 27, 0, 122, 123, 126, 153, - 49, 0, 0, 0, 223, 224, 226, 241, 49, 49, - 0, 134, 132, 133, 0, 0, 0, 0, 0, 152, - 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 128, 131, 0, - 0, 0, 0, 0, 0, 244, 0, 0, 53, 0, - 195, 0, 197, 202, 0, 0, 0, 49, 0, 49, - 220, 17, 0, 0, 119, 127, 121, 0, 159, 230, - 0, 50, 155, 0, 222, 221, 0, 0, 0, 242, - 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, 198, 204, 0, 203, 206, 0, - 15, 212, 113, 16, 124, 125, 239, 158, 156, 225, - 227, 162, 0, 149, 0, 142, 143, 136, 137, 139, - 138, 140, 141, 0, 151, 82, 129, 245, 43, 205, - 49, 114, 0, 157, 0, 163, 148, 147, 0, 130, - 160, 213, 0, 115, 135, 0, 0, 46, 33, 0, - 45, 0, 44, 231, 0, 38, 34, 36, 0, 0, - 0, 0, 243, 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 + 0, 0, 133, 0, 133, 0, 0, 0, 0, 0, + 0, 0, 51, 29, 14, 0, 12, 11, 10, 13, + 32, 195, 196, 30, 220, 221, 31, 49, 0, 49, + 0, 211, 15, 49, 0, 27, 0, 125, 126, 129, + 156, 49, 0, 0, 0, 226, 227, 229, 244, 49, + 49, 0, 137, 135, 136, 0, 0, 0, 0, 0, + 155, 0, 153, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 131, 134, + 231, 232, 0, 0, 0, 0, 0, 0, 247, 0, + 0, 53, 0, 198, 0, 200, 205, 0, 0, 0, + 49, 0, 49, 223, 17, 0, 0, 122, 130, 124, + 0, 162, 233, 0, 50, 158, 0, 225, 224, 0, + 0, 0, 245, 57, 0, 148, 149, 147, 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, 133, 85, 93, 103, 106, + 107, 108, 110, 0, 113, 114, 54, 201, 207, 0, + 206, 209, 0, 15, 215, 116, 16, 127, 128, 242, + 161, 159, 228, 230, 165, 0, 152, 0, 145, 146, + 139, 140, 142, 141, 143, 144, 0, 154, 82, 132, + 248, 43, 208, 49, 117, 0, 160, 0, 166, 151, + 150, 0, 133, 163, 216, 0, 118, 138, 0, 0, + 46, 33, 0, 45, 0, 44, 234, 0, 38, 34, + 36, 0, 0, 0, 0, 246, 119, 47, 0, 164, + 0, 0, 43, 0, 49, 48, 37, 43, 33, 40, + 49, 121, 33, 39, 0, 120, 0, 42, 41, 0, + 0, 0 }; -static const short yydefgoto[] = { 457, - 1, 140, 233, 302, 15, 16, 17, 145, 18, 19, - 425, 426, 427, 428, 411, 417, 303, 78, 137, 138, - 403, 420, 434, 21, 236, 237, 238, 60, 277, 278, - 260, 261, 262, 23, 241, 313, 314, 304, 405, 71, - 245, 61, 166, 62, 146, 24, 216, 227, 293, 26, - 27, 229, 298, 28, 158, 29, 30, 217, 218, 149, - 33, 219, 246, 247, 248, 139, 63, 430, 36, 65, - 287 +static const short yydefgoto[] = { 460, + 1, 141, 234, 305, 15, 16, 17, 146, 18, 19, + 428, 429, 430, 431, 414, 420, 306, 78, 138, 139, + 406, 423, 437, 21, 237, 238, 239, 60, 278, 279, + 261, 262, 263, 23, 242, 316, 317, 307, 408, 71, + 246, 61, 167, 62, 147, 24, 217, 228, 296, 26, + 27, 230, 301, 28, 159, 29, 30, 218, 219, 150, + 33, 220, 247, 248, 249, 140, 63, 433, 36, 65, + 290 }; static const short yypact[] = {-32768, - 609, 598, -98, 138, 144, 22, 30, 172, 144, -61, - 144,-32768, 791,-32768,-32768,-32768,-32768,-32768,-32768, 35, - -49, -42, -32, -14,-32768, -24, -5,-32768, 32, -3, --32768,-32768, 44,-32768, 49, 59, 68,-32768,-32768,-32768, --32768, 598,-32768, 185,-32768,-32768,-32768, 63,-32768,-32768, - 63, 63, 27, 63, 220, 260, 27,-32768,-32768,-32768, --32768,-32768,-32768, 17,-32768, 176,-32768,-32768,-32768,-32768, - 69, 598, 74,-32768,-32768, 85, 598,-32768, -73,-32768, --32768, 53, 76,-32768,-32768,-32768,-32768,-32768, 102, 106, --32768, 115, 118,-32768,-32768, 121, 124, 134, 136, 148, --32768, 157,-32768, 158, 159,-32768,-32768, 160,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 161,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 162,-32768,-32768, 165, 169, 178, --32768, 180,-32768,-32768, 182, 183, -87,-32768,-32768, 505, - 587, 271, 234, 275, 174,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 231,-32768, 280, 186,-32768,-32768, --32768,-32768,-32768, 187,-32768,-32768,-32768,-32768,-32768,-32768, - 187, -72,-32768,-32768,-32768,-32768,-32768,-32768, 184, 194, - 17, 17,-32768,-32768, 267, 197,-32768, 17, 389, 329, - 311, 313, 337, 389, 324, 330, 389, 331, 389, 17, - 293, 389, -58, 389, 389, 598, 598, 340, 344, 598, - 791, 213,-32768,-32768, 51,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 149, 212, -50, 217, --32768,-32768, 634, 389,-32768, 218, 233,-32768, 215,-32768, - -20, -6, 267, 267,-32768,-32768,-32768, 236, -61, 129, - 223,-32768,-32768,-32768, 225, 389, 389, 389, 477, 104, - -90,-32768, 226, 232, 239, 240, 242, 244, 246, 247, - 250, 251, 254, 255, 256, 361, -64,-32768, 104, 257, - -62, 71, 262, 264, 265, 237, 269, 274,-32768, 791, --32768, -11,-32768,-32768, 270, 598, 278, 151, 301, 676, --32768,-32768, 598, 281,-32768,-32768, 17, 389,-32768,-32768, - 598, 283,-32768, 284,-32768,-32768, 294, 267, 295,-32768, --32768, 598, 276, 276, 276, 91, 298, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389,-32768,-32768,-32768, + 514, 533, -109, 177, 188, 15, 30, 207, 188, -79, + 188,-32768, 742,-32768,-32768,-32768,-32768,-32768,-32768, 24, + -83, -54, -36, -20,-32768, -27, -5,-32768, -11, 2, +-32768,-32768, 17,-32768, 6, 42, 60,-32768,-32768,-32768, +-32768, 533,-32768, 215,-32768,-32768,-32768, 54,-32768,-32768, + 54, 54, 29, 54, 265, 270, 29,-32768,-32768,-32768, +-32768,-32768,-32768, 299,-32768, 175,-32768,-32768,-32768,-32768, + 66, 533, 83,-32768,-32768, 91, 533,-32768, -74,-32768, +-32768, 96, 98,-32768,-32768,-32768,-32768,-32768, 102, 117, +-32768, 119, 126,-32768,-32768, 129, 131, 141, 145, 151, +-32768, 160,-32768, 161, 162,-32768,-32768, 163,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 164,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 167,-32768,-32768, 178, 180, + 182,-32768, 184,-32768,-32768, 186, 187, -88,-32768,-32768, + 498, 595, 274, 306, 279, 189,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 225,-32768, 284, 191,-32768, +-32768,-32768,-32768,-32768, 192,-32768,-32768,-32768,-32768,-32768, +-32768, 192, -71,-32768,-32768,-32768,-32768,-32768,-32768, 183, + 194, 299, 299,-32768,-32768, 394, 198,-32768, 299, 220, + 106, 316, 326, 130, 220, 328, 329, 220, 330, 220, + 299, 287, 220, -45, 220, 220, 533, 533, 332, 336, + 533, 742, 204,-32768,-32768, 32,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 152, 203, -57, + 212,-32768,-32768, 616, 220,-32768, 213, 237,-32768, 214, +-32768, -30, -9, 394, 394,-32768,-32768,-32768, 239, -79, + -10, 235,-32768,-32768,-32768, 240, 220, 220, 220, 472, + 357, -61,-32768, 241, 243, 244, 247, 254, 255, 257, + 258, 268, 269, 271, 276, 281, 372, -50,-32768, 357, +-32768,-32768, 282, -46, 72, 283, 288, 289, 262, 292, + 293,-32768, 742,-32768, -14,-32768,-32768, 290, 533, 296, + 154, 358, 626,-32768,-32768, 533, 298,-32768,-32768, 299, + 220,-32768,-32768, 533, 301,-32768, 302,-32768,-32768, 297, + 394, 303,-32768,-32768, 533, 294, 294, 294, 238, 304, + 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, 299, 389,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 407,-32768,-32768,-32768,-32768,-32768, 267,-32768,-32768, 307, --32768,-32768, 341,-32768,-32768,-32768, 312,-32768,-32768,-32768, --32768, 17, 309,-32768, 389, 276, 276, 245, 36, 58, - 58, 12, 12, 297,-32768,-32768,-32768,-32768, 315,-32768, - 684,-32768, 267,-32768, 321,-32768,-32768, 276, 389, 483, --32768,-32768, 326,-32768, 104, 54, -71,-32768, 230, -2, --32768, 389, 323, -55, 314,-32768, 347,-32768, 598, 267, - 389, 334,-32768,-32768, 104, 389,-32768, 355, 267, -45, - 352, -66, 104,-32768, -27, 230,-32768, -66,-32768, 230, --32768, 335,-32768, 350,-32768,-32768, 446, 468,-32768 +-32768,-32768,-32768,-32768, 307, 220,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 436,-32768,-32768,-32768,-32768,-32768, 394, +-32768,-32768, 314,-32768,-32768, 353,-32768,-32768,-32768, 318, +-32768,-32768,-32768,-32768, 299, 321,-32768, 220, 294, 294, + 31, 59, 35, 35, 18, 18, 260,-32768,-32768,-32768, +-32768, 319,-32768, 636,-32768, 394,-32768, 322,-32768,-32768, + 294, 220, 407,-32768,-32768, 331,-32768, 357, 49, -72, +-32768, 234, -16,-32768, 220, 324, -34, 325,-32768, 342, +-32768, 533, 394, 220, 339,-32768,-32768, 357, 220,-32768, + 349, 394, -4, 346, -98, 357,-32768, 56, 234,-32768, + -98,-32768, 234,-32768, 333,-32768, 355,-32768,-32768, 464, + 491,-32768 }; static const short yypgoto[] = {-32768, --32768, 467, -222, 18,-32768,-32768, 191,-32768,-32768,-32768, - -322,-32768,-32768, 56, -395,-32768, -8, -1,-32768, -186, --32768,-32768,-32768,-32768,-32768,-32768, 188, 5, 292, -336, - -163,-32768, -181,-32768, 316, -343, -201, 200,-32768, 29, - -63,-32768, 103, 78,-32768,-32768, 499,-32768,-32768, -13, --32768,-32768,-32768,-32768,-32768, -12,-32768, 500, 4,-32768, --32768, 501, 266, -229,-32768, 303, 10, 1,-32768, 3, +-32768, 475, -220, 8,-32768,-32768, 193,-32768,-32768,-32768, + -236,-32768,-32768, 55, -380,-32768, -8, -1,-32768, -198, +-32768,-32768,-32768,-32768,-32768,-32768, 195, 5, 308, -329, + -167,-32768, -179,-32768, 309, -365, -206, 197,-32768, 21, + -63,-32768, 63, 171,-32768,-32768, 500,-32768,-32768, -13, +-32768,-32768,-32768,-32768,-32768, -12,-32768, 501, 4,-32768, +-32768, 502, 266, -227,-32768, 311, 10, 1,-32768, 3, -32768 }; -#define YYLAST 909 +#define YYLAST 861 static const short yytable[] = { 20, - 179, 77, 64, 37, 32, 22, 147, 148, 264, 300, - 35, 268, 269, 316, 317, 272, 397, 274, 14, 174, - 175, 328, 329, 431, 289, 242, 295, 297, 4, 337, - 186, -165, 211, 122, 66, 432, 73, 76, 279, 79, - 279, 282, 163, 338, 447, 328, 329, 319, 422, 451, - 212, 131, 305, 72, 41, 353, 252, 353, 253, 254, - 8, 187, -165, 142, -35, 309, 423, 328, 329, 354, - 13, 356, 182, 418, 4, 13, 176, 185, -35, 142, - 328, 329, 150, 76, 79, 48, 13, 446, 381, 151, - 4, 410, 323, 324, 325, 326, 49, 50, 449, 152, - 328, 329, 51, 364, 453, 450, 8, 154, 143, 410, - 177, 309, 144, 328, 329, 310, 13, 239, 240, 243, - 153, 52, 8, 452, 251, 54, 376, 454, 144, 155, - 169, 178, 165, 433, 173, 157, 275, 399, 215, 215, - 67, 68, 37, 37, 22, 22, 69, 70, 401, 35, - 35, 255, 336, 167, 168, 395, 170, 214, 214, 332, - 333, 334, 335, 156, 386, 387, 388, 389, 390, 391, - 392, 393, 394, 413, 74, 75, 336, 256, 159, 257, - 160, 258, 180, 334, 335, 188, 259, 164, 70, 279, - 161, 421, 330, 331, 332, 333, 334, 335, 336, 162, - 440, 147, 148, 181, 357, 183, 283, 284, 189, 445, - 288, 336, 330, 331, 332, 333, 334, 335, 292, 184, - 296, 408, 171, 70, 384, 330, 331, 332, 333, 334, - 335, 336, 311, 38, 190, 37, 223, 22, 191, 312, - 296, 311, 35, 239, 336, 415, 279, 192, 312, 39, - 193, 40, 324, 194, 328, 329, 195, 41, 435, 327, - 309, 42, 172, 70, 320, 13, 196, 441, 197, 174, - 175, 43, 443, 221, 222, 44, 45, 224, 225, 46, - 198, 47, 230, 231, 291, 13, 369, 13, 48, 199, - 200, 201, 202, 203, 204, 365, 367, 205, 242, 49, - 50, 206, 37, 373, 22, 51, 328, 329, 226, 35, - 207, 367, 208, 377, 209, 210, 228, 265, 406, 266, - 232, -165, 383, 234, 52, 53, 176, 235, 54, 249, - 270, 252, 55, 253, 254, 263, 271, 273, 56, 252, - 57, 253, 254, 267, 276, 424, 59, 285, 286, 290, - 294, 299, 307, 306, 308, 318, 321, 322, 38, 339, - 177, 328, 329, 352, 7, 340, 13, 331, 332, 333, - 334, 335, 341, 342, 39, 343, 40, 344, 361, 345, - 346, 178, 41, 347, 348, 336, 42, 349, 350, 351, - 355, 252, 243, 253, 254, 358, 43, 359, 360, 244, - 44, 45, 362, 37, 46, 22, 47, 363, 366, 368, - 35, 398, 374, 48, 378, 379, 336, 429, 330, 331, - 332, 333, 334, 335, 49, 50, 255, 380, 382, 439, - 51, 385, 396, 311, 255, 409, 429, 336, 400, 311, - 312, 402, 407, 404, 429, 458, 312, 437, 429, 52, - 53, 410, 256, 54, 257, 414, 258, 55, 419, 436, - 256, 259, 257, 56, 258, 57, 438, 459, 455, 259, - 58, 59, 442, 330, 331, 332, 333, 334, 335, 252, - 38, 253, 254, 456, 141, 252, 255, 253, 254, 371, - 448, 13, 336, 444, 375, 281, 39, 370, 40, 25, - 31, 34, 250, 0, 41, 280, 0, 315, 42, 0, - 0, 0, 256, 213, 257, 0, 258, 0, 43, 0, - 0, 259, 44, 45, 0, 0, 46, 0, 47, 0, - 0, 0, 0, 0, 0, 48, 2, 0, 0, 0, - 0, 3, 0, 0, 4, 0, 49, 50, 0, 0, - 5, 0, 51, 6, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, - 0, 52, 53, 0, 255, 54, 8, 0, 0, 55, - 255, 0, 0, 0, 0, 56, 0, 57, 0, 0, - 0, 0, 58, 59, 0, 0, 0, 0, 0, 0, - 256, 38, 257, 0, 258, 0, 256, 9, 416, 259, - 258, 0, 10, 11, 0, 259, 0, 39, 2, 40, - 0, 0, 0, 3, 0, 41, 4, 0, 0, 42, - 0, 0, 5, 0, 0, 6, 12, 0, 0, 43, - 2, 13, 0, 44, 45, 3, 0, 46, 4, 47, - 7, 0, 0, 0, 5, 0, 48, 6, 8, 0, - 0, 0, 0, 0, 0, 2, 0, 49, 50, 0, - 3, 0, 7, 51, 0, 0, 0, 0, 0, 5, - 8, 0, 6, 0, 0, 0, 0, 0, 0, 9, - 0, 0, 52, 53, 10, 11, 54, 7, 0, 0, - 55, 0, 0, 0, 0, 0, 56, 2, 57, 0, - 0, 9, 3, 58, 59, 2, 10, 11, 12, 0, - 3, 5, 220, 13, 6, 0, 0, 0, 0, 5, - 0, 0, 6, 0, 0, 0, 9, 0, 0, 7, - 12, 10, 11, 0, 0, 13, 0, 7, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 301, - 13, 0, 0, 0, 0, 0, 0, 0, 9, 0, - 0, 0, 0, 10, 11, 0, 9, 0, 0, 0, - 0, 10, 11, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 80, 12, 81, 0, - 0, 372, 13, 0, 82, 12, 83, 0, 0, 412, - 13, 0, 0, 84, 85, 86, 87, 0, 88, 89, - 0, 90, 0, 91, 92, 93, 0, 0, 94, 0, - 0, 95, 0, 96, 97, 98, 99, 100, 101, 0, - 102, 103, 104, 105, 0, 0, 106, 0, 0, 107, - 0, 0, 0, 108, 0, 109, 0, 0, 0, 110, - 111, 112, 113, 114, 115, 116, 0, 117, 118, 119, - 120, 121, 122, 123, 124, 0, 0, 125, 0, 0, - 126, 0, 127, 0, 0, 128, 129, 130, 0, 0, - 131, 0, 132, 133, 134, 135, 0, 0, 136 + 180, 77, 64, 37, 32, 22, 148, 149, 14, 434, + 35, 265, 303, 292, 269, 270, 319, 320, 273, 298, + 275, 435, 243, 300, 66, 4, 400, 331, 332, 76, + 187, 79, 212, -168, 312, 280, 73, 280, 285, 13, + 331, 332, 164, 322, 331, 332, 72, 281, 425, 151, + 213, 253, 143, 254, 255, 308, 41, 8, 13, 340, + 143, 188, 450, 4, -168, 282, 426, 454, 331, 332, + 356, 4, 183, 341, 356, 76, 79, 186, 152, 452, + 13, 331, 332, 421, 357, 456, -35, 48, 359, 326, + 327, 328, 329, 384, 367, 8, 153, 144, 49, 50, + -35, 145, 312, 8, 51, 155, 313, 13, 253, 145, + 254, 255, 264, 168, 169, 154, 171, 244, 240, 241, + 436, 157, 312, 166, 52, 252, 323, 13, 54, 449, + 156, 379, 253, 413, 254, 255, 268, 276, 161, 216, + 216, 158, 402, 37, 37, 22, 22, 256, 215, 215, + 35, 35, 160, 404, 334, 335, 336, 337, 338, 339, + 398, 337, 338, 389, 390, 391, 392, 393, 394, 395, + 396, 397, 339, 257, 162, 258, 339, 259, 416, 67, + 68, 181, 260, 335, 336, 337, 338, 424, 280, 453, + 69, 70, 163, 413, 333, 334, 335, 336, 337, 338, + 339, 182, 148, 149, 256, 443, 360, 286, 287, 74, + 75, 291, 455, 339, 448, 184, 457, 165, 70, 295, + 411, 299, 253, 170, 254, 255, 185, 174, 256, 189, + 257, 190, 258, 314, 259, 191, 37, 38, 22, 260, + 315, 299, 314, 35, 418, 280, 240, 331, 332, 315, + 192, 327, 193, 39, 257, 40, 258, 438, 259, 194, + 330, 41, 195, 260, 196, 42, 444, 172, 70, 331, + 332, 446, 173, 70, 197, 43, 222, 223, 198, 44, + 45, 225, 226, 46, 199, 47, 231, 232, 294, 13, + 372, 13, 48, 200, 201, 202, 203, 204, 368, 370, + 205, 175, 176, 49, 50, 37, 376, 22, 224, 51, + 229, 206, 35, 207, 370, 208, 380, 209, 256, 210, + 211, 409, 266, 235, 227, 386, 233, -168, 236, 52, + 53, 250, 267, 54, 271, 272, 274, 55, 277, 288, + 289, 293, 297, 56, 257, 57, 258, 302, 259, 309, + 427, 59, 38, 260, 311, 331, 332, 310, 177, 321, + 333, 334, 335, 336, 337, 338, 331, 332, 39, 324, + 40, 13, 387, 325, 355, 342, 41, 343, 344, 339, + 42, 345, 333, 334, 335, 336, 337, 338, 346, 347, + 43, 348, 349, 178, 44, 45, 175, 176, 46, 412, + 47, 339, 350, 351, 364, 352, 37, 48, 22, 253, + 353, 254, 255, 35, 179, 354, 358, 361, 49, 50, + 432, 7, 362, 363, 51, 243, 365, 366, 371, 369, + 377, 383, 442, 381, 382, 339, 314, 385, 388, 432, + 401, 399, 314, 315, 52, 53, 403, 432, 54, 315, + 407, 432, 55, 177, 405, 410, 413, 417, 56, 440, + 57, 439, 441, 461, 422, 58, 59, 458, 333, 334, + 335, 336, 337, 338, 253, 38, 254, 255, 445, 333, + 334, 335, 336, 337, 338, 451, 13, 339, 178, 459, + 462, 39, 142, 40, 374, 447, 251, 373, 339, 41, + 25, 31, 34, 42, 378, 256, 214, 0, 318, 179, + 0, 0, 284, 43, 283, 0, 0, 44, 45, 0, + 244, 46, 0, 47, 0, 0, 0, 245, 0, 2, + 48, 257, 0, 419, 3, 259, 38, 4, 0, 0, + 260, 49, 50, 5, 0, 2, 6, 51, 0, 0, + 3, 0, 39, 4, 40, 0, 0, 0, 0, 5, + 41, 7, 6, 0, 42, 0, 0, 52, 53, 8, + 256, 54, 0, 0, 43, 55, 0, 7, 44, 45, + 0, 56, 46, 57, 47, 8, 0, 0, 58, 59, + 0, 48, 0, 0, 0, 0, 257, 0, 258, 0, + 259, 9, 49, 50, 0, 260, 10, 11, 51, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, + 0, 0, 10, 11, 0, 0, 2, 0, 52, 53, + 12, 3, 54, 0, 4, 13, 55, 0, 0, 0, + 5, 0, 56, 6, 57, 0, 12, 2, 0, 58, + 59, 13, 3, 0, 0, 0, 0, 2, 7, 0, + 0, 5, 3, 0, 6, 0, 8, 2, 0, 0, + 0, 5, 3, 0, 6, 0, 0, 0, 0, 7, + 0, 5, 0, 0, 6, 0, 0, 0, 0, 7, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 7, + 0, 0, 0, 10, 11, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 0, 0, 0, 0, 10, 11, 0, 12, 0, 9, + 0, 221, 13, 0, 10, 11, 0, 0, 0, 9, + 0, 0, 0, 0, 10, 11, 0, 0, 12, 0, + 0, 0, 304, 13, 0, 0, 0, 80, 12, 81, + 0, 0, 375, 13, 0, 82, 0, 83, 12, 0, + 0, 0, 415, 13, 84, 85, 86, 87, 0, 88, + 89, 0, 90, 0, 91, 92, 93, 0, 0, 94, + 0, 0, 95, 0, 96, 97, 98, 99, 100, 101, + 0, 102, 103, 104, 105, 0, 0, 106, 0, 0, + 107, 0, 0, 0, 108, 0, 109, 0, 0, 0, + 110, 111, 112, 113, 114, 115, 116, 0, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 0, 0, 126, + 0, 0, 127, 0, 128, 0, 0, 129, 130, 131, + 0, 0, 132, 0, 133, 134, 135, 136, 0, 0, + 137 }; static const short yycheck[] = { 1, - 64, 10, 2, 1, 1, 1, 20, 20, 190, 232, - 1, 193, 194, 243, 244, 197, 353, 199, 1, 3, - 4, 10, 11, 26, 211, 32, 77, 229, 40, 120, - 104, 104, 120, 92, 133, 38, 7, 9, 202, 11, - 204, 205, 42, 134, 440, 10, 11, 249, 120, 445, - 138, 110, 234, 32, 28, 120, 3, 120, 5, 6, - 72, 135, 135, 29, 120, 132, 138, 10, 11, 134, - 137, 134, 72, 410, 40, 137, 60, 77, 134, 29, - 10, 11, 132, 55, 56, 59, 137, 133, 318, 132, - 40, 137, 256, 257, 258, 259, 70, 71, 442, 132, - 10, 11, 76, 290, 448, 133, 72, 132, 74, 137, - 94, 132, 78, 10, 11, 136, 137, 181, 182, 126, - 135, 95, 72, 446, 188, 99, 308, 450, 78, 135, - 53, 115, 70, 136, 57, 139, 200, 367, 140, 141, - 3, 4, 140, 141, 140, 141, 3, 4, 371, 140, - 141, 98, 141, 51, 52, 337, 54, 140, 141, 124, - 125, 126, 127, 132, 328, 329, 330, 331, 332, 333, - 334, 335, 336, 403, 3, 4, 141, 124, 135, 126, - 132, 128, 7, 126, 127, 133, 133, 3, 4, 353, - 132, 138, 122, 123, 124, 125, 126, 127, 141, 132, - 430, 215, 215, 135, 134, 132, 206, 207, 133, 439, - 210, 141, 122, 123, 124, 125, 126, 127, 227, 135, - 229, 385, 3, 4, 134, 122, 123, 124, 125, 126, - 127, 141, 241, 4, 133, 233, 3, 233, 133, 241, - 249, 250, 233, 307, 141, 409, 410, 133, 250, 20, - 133, 22, 416, 133, 10, 11, 133, 28, 422, 259, - 132, 32, 3, 4, 136, 137, 133, 431, 133, 3, - 4, 42, 436, 3, 4, 46, 47, 3, 4, 50, - 133, 52, 3, 4, 136, 137, 136, 137, 59, 133, - 133, 133, 133, 133, 133, 292, 296, 133, 32, 70, - 71, 133, 300, 303, 300, 76, 10, 11, 135, 300, - 133, 311, 133, 311, 133, 133, 86, 7, 382, 7, - 135, 135, 322, 140, 95, 96, 60, 134, 99, 133, - 7, 3, 103, 5, 6, 7, 7, 7, 109, 3, - 111, 5, 6, 7, 52, 116, 117, 8, 5, 137, - 139, 135, 120, 136, 140, 120, 134, 133, 4, 134, - 94, 10, 11, 3, 64, 134, 137, 123, 124, 125, - 126, 127, 134, 134, 20, 134, 22, 134, 142, 134, - 134, 115, 28, 134, 134, 141, 32, 134, 134, 134, - 134, 3, 126, 5, 6, 134, 42, 134, 134, 133, - 46, 47, 134, 401, 50, 401, 52, 134, 139, 132, - 401, 5, 132, 59, 132, 132, 141, 419, 122, 123, - 124, 125, 126, 127, 70, 71, 98, 134, 134, 429, - 76, 134, 134, 442, 98, 139, 438, 141, 132, 448, - 442, 101, 134, 132, 446, 0, 448, 134, 450, 95, - 96, 137, 124, 99, 126, 135, 128, 103, 133, 137, - 124, 133, 126, 109, 128, 111, 120, 0, 134, 133, - 116, 117, 139, 122, 123, 124, 125, 126, 127, 3, - 4, 5, 6, 134, 18, 3, 98, 5, 6, 299, - 139, 137, 141, 438, 307, 204, 20, 298, 22, 1, - 1, 1, 187, -1, 28, 203, -1, 242, 32, -1, - -1, -1, 124, 9, 126, -1, 128, -1, 42, -1, - -1, 133, 46, 47, -1, -1, 50, -1, 52, -1, - -1, -1, -1, -1, -1, 59, 32, -1, -1, -1, - -1, 37, -1, -1, 40, -1, 70, 71, -1, -1, - 46, -1, 76, 49, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 64, -1, - -1, 95, 96, -1, 98, 99, 72, -1, -1, 103, - 98, -1, -1, -1, -1, 109, -1, 111, -1, -1, - -1, -1, 116, 117, -1, -1, -1, -1, -1, -1, - 124, 4, 126, -1, 128, -1, 124, 103, 126, 133, - 128, -1, 108, 109, -1, 133, -1, 20, 32, 22, - -1, -1, -1, 37, -1, 28, 40, -1, -1, 32, - -1, -1, 46, -1, -1, 49, 132, -1, -1, 42, - 32, 137, -1, 46, 47, 37, -1, 50, 40, 52, - 64, -1, -1, -1, 46, -1, 59, 49, 72, -1, - -1, -1, -1, -1, -1, 32, -1, 70, 71, -1, - 37, -1, 64, 76, -1, -1, -1, -1, -1, 46, - 72, -1, 49, -1, -1, -1, -1, -1, -1, 103, - -1, -1, 95, 96, 108, 109, 99, 64, -1, -1, - 103, -1, -1, -1, -1, -1, 109, 32, 111, -1, - -1, 103, 37, 116, 117, 32, 108, 109, 132, -1, - 37, 46, 136, 137, 49, -1, -1, -1, -1, 46, - -1, -1, 49, -1, -1, -1, 103, -1, -1, 64, - 132, 108, 109, -1, -1, 137, -1, 64, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 132, -1, -1, -1, 136, - 137, -1, -1, -1, -1, -1, -1, -1, 103, -1, - -1, -1, -1, 108, 109, -1, 103, -1, -1, -1, - -1, 108, 109, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 16, 132, 18, -1, - -1, 136, 137, -1, 24, 132, 26, -1, -1, 136, - 137, -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, -1, - 100, -1, 102, -1, -1, 105, 106, 107, -1, -1, - 110, -1, 112, 113, 114, 115, -1, -1, 118 + 64, 10, 2, 1, 1, 1, 20, 20, 1, 26, + 1, 191, 233, 212, 194, 195, 244, 245, 198, 77, + 200, 38, 32, 230, 134, 40, 356, 10, 11, 9, + 105, 11, 121, 105, 133, 203, 7, 205, 206, 138, + 10, 11, 42, 250, 10, 11, 32, 93, 121, 133, + 139, 3, 29, 5, 6, 235, 28, 72, 138, 121, + 29, 136, 443, 40, 136, 111, 139, 448, 10, 11, + 121, 40, 72, 135, 121, 55, 56, 77, 133, 445, + 138, 10, 11, 413, 135, 451, 121, 59, 135, 257, + 258, 259, 260, 321, 293, 72, 133, 74, 70, 71, + 135, 78, 133, 72, 76, 133, 137, 138, 3, 78, + 5, 6, 7, 51, 52, 136, 54, 127, 182, 183, + 137, 133, 133, 70, 96, 189, 137, 138, 100, 134, + 136, 311, 3, 138, 5, 6, 7, 201, 133, 141, + 142, 140, 370, 141, 142, 141, 142, 99, 141, 142, + 141, 142, 136, 374, 124, 125, 126, 127, 128, 142, + 340, 127, 128, 331, 332, 333, 334, 335, 336, 337, + 338, 339, 142, 125, 133, 127, 142, 129, 406, 3, + 4, 7, 134, 125, 126, 127, 128, 139, 356, 134, + 3, 4, 133, 138, 123, 124, 125, 126, 127, 128, + 142, 136, 216, 216, 99, 433, 135, 207, 208, 3, + 4, 211, 449, 142, 442, 133, 453, 3, 4, 228, + 388, 230, 3, 53, 5, 6, 136, 57, 99, 134, + 125, 134, 127, 242, 129, 134, 234, 4, 234, 134, + 242, 250, 251, 234, 412, 413, 310, 10, 11, 251, + 134, 419, 134, 20, 125, 22, 127, 425, 129, 134, + 260, 28, 134, 134, 134, 32, 434, 3, 4, 10, + 11, 439, 3, 4, 134, 42, 3, 4, 134, 46, + 47, 3, 4, 50, 134, 52, 3, 4, 137, 138, + 137, 138, 59, 134, 134, 134, 134, 134, 295, 299, + 134, 3, 4, 70, 71, 303, 306, 303, 3, 76, + 86, 134, 303, 134, 314, 134, 314, 134, 99, 134, + 134, 385, 7, 141, 136, 325, 136, 136, 135, 96, + 97, 134, 7, 100, 7, 7, 7, 104, 52, 8, + 5, 138, 140, 110, 125, 112, 127, 136, 129, 137, + 117, 118, 4, 134, 141, 10, 11, 121, 60, 121, + 123, 124, 125, 126, 127, 128, 10, 11, 20, 135, + 22, 138, 135, 134, 3, 135, 28, 135, 135, 142, + 32, 135, 123, 124, 125, 126, 127, 128, 135, 135, + 42, 135, 135, 95, 46, 47, 3, 4, 50, 140, + 52, 142, 135, 135, 143, 135, 404, 59, 404, 3, + 135, 5, 6, 404, 116, 135, 135, 135, 70, 71, + 422, 64, 135, 135, 76, 32, 135, 135, 133, 140, + 133, 135, 432, 133, 133, 142, 445, 135, 135, 441, + 5, 135, 451, 445, 96, 97, 133, 449, 100, 451, + 133, 453, 104, 60, 102, 135, 138, 136, 110, 135, + 112, 138, 121, 0, 134, 117, 118, 135, 123, 124, + 125, 126, 127, 128, 3, 4, 5, 6, 140, 123, + 124, 125, 126, 127, 128, 140, 138, 142, 95, 135, + 0, 20, 18, 22, 302, 441, 188, 301, 142, 28, + 1, 1, 1, 32, 310, 99, 9, -1, 243, 116, + -1, -1, 205, 42, 204, -1, -1, 46, 47, -1, + 127, 50, -1, 52, -1, -1, -1, 134, -1, 32, + 59, 125, -1, 127, 37, 129, 4, 40, -1, -1, + 134, 70, 71, 46, -1, 32, 49, 76, -1, -1, + 37, -1, 20, 40, 22, -1, -1, -1, -1, 46, + 28, 64, 49, -1, 32, -1, -1, 96, 97, 72, + 99, 100, -1, -1, 42, 104, -1, 64, 46, 47, + -1, 110, 50, 112, 52, 72, -1, -1, 117, 118, + -1, 59, -1, -1, -1, -1, 125, -1, 127, -1, + 129, 104, 70, 71, -1, 134, 109, 110, 76, -1, + -1, -1, -1, -1, -1, -1, -1, 104, -1, -1, + -1, -1, 109, 110, -1, -1, 32, -1, 96, 97, + 133, 37, 100, -1, 40, 138, 104, -1, -1, -1, + 46, -1, 110, 49, 112, -1, 133, 32, -1, 117, + 118, 138, 37, -1, -1, -1, -1, 32, 64, -1, + -1, 46, 37, -1, 49, -1, 72, 32, -1, -1, + -1, 46, 37, -1, 49, -1, -1, -1, -1, 64, + -1, 46, -1, -1, 49, -1, -1, -1, -1, 64, + -1, -1, -1, -1, -1, -1, -1, -1, 104, 64, + -1, -1, -1, 109, 110, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 104, + -1, -1, -1, -1, 109, 110, -1, 133, -1, 104, + -1, 137, 138, -1, 109, 110, -1, -1, -1, 104, + -1, -1, -1, -1, 109, 110, -1, -1, 133, -1, + -1, -1, 137, 138, -1, -1, -1, 16, 133, 18, + -1, -1, 137, 138, -1, 24, -1, 26, 133, -1, + -1, -1, 137, 138, 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, 95, -1, -1, 98, + -1, -1, 101, -1, 103, -1, -1, 106, 107, 108, + -1, -1, 111, -1, 113, 114, 115, 116, -1, -1, + 119 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/share/bison.simple" @@ -1390,161 +1386,161 @@ yyreduce: switch (yyn) { case 1: -#line 226 "parser.y" +#line 227 "parser.y" { write_proxies(yyvsp[0].ifref); write_client(yyvsp[0].ifref); write_server(yyvsp[0].ifref); ; break;} case 2: -#line 229 "parser.y" +#line 230 "parser.y" { yyval.ifref = NULL; ; break;} case 3: -#line 230 "parser.y" +#line 231 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 4: -#line 231 "parser.y" +#line 232 "parser.y" { yyval.ifref = make_ifref(yyvsp[0].type); LINK(yyval.ifref, yyvsp[-1].ifref); ; break;} case 5: -#line 232 "parser.y" +#line 233 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_coclass(yyvsp[0].clas); ; break;} case 6: -#line 233 "parser.y" +#line 234 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_module(yyvsp[0].type); ; break;} case 7: -#line 234 "parser.y" -{ yyval.ifref = yyvsp[-1].ifref; ; - break;} -case 8: #line 235 "parser.y" +{ yyval.ifref = yyvsp[-1].ifref; ; + break;} +case 8: +#line 236 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 9: -#line 238 "parser.y" +#line 239 "parser.y" {; break;} case 10: -#line 239 "parser.y" -{ if (!parse_only) add_interface(yyvsp[0].type); ; - break;} -case 11: #line 240 "parser.y" { if (!parse_only) add_interface(yyvsp[0].type); ; break;} -case 12: +case 11: #line 241 "parser.y" +{ if (!parse_only) add_interface(yyvsp[0].type); ; + break;} +case 12: +#line 242 "parser.y" { if (!parse_only) add_coclass(yyvsp[0].clas); ; break;} case 13: -#line 242 "parser.y" +#line 243 "parser.y" { if (!parse_only) add_module(yyvsp[0].type); ; break;} case 14: -#line 243 "parser.y" +#line 244 "parser.y" {; break;} case 15: -#line 246 "parser.y" +#line 247 "parser.y" { yyval.func = NULL; ; break;} case 16: -#line 247 "parser.y" +#line 248 "parser.y" { yyval.func = yyvsp[-1].func; LINK(yyval.func, yyvsp[-2].func); ; break;} case 17: -#line 248 "parser.y" +#line 249 "parser.y" { yyval.func = yyvsp[-1].func; ; break;} case 18: -#line 251 "parser.y" +#line 252 "parser.y" {; break;} case 19: -#line 252 "parser.y" +#line 253 "parser.y" { if (!parse_only && do_header) { write_constdef(yyvsp[-1].var); } ; break;} case 20: -#line 253 "parser.y" +#line 254 "parser.y" {; break;} case 21: -#line 254 "parser.y" +#line 255 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 22: -#line 255 "parser.y" +#line 256 "parser.y" { if (!parse_only && do_header) { write_externdef(yyvsp[-1].var); } ; break;} case 23: -#line 256 "parser.y" +#line 257 "parser.y" {; break;} case 24: -#line 257 "parser.y" +#line 258 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 25: -#line 258 "parser.y" +#line 259 "parser.y" {; break;} case 26: -#line 259 "parser.y" +#line 260 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 27: -#line 262 "parser.y" +#line 263 "parser.y" { if (!parse_only && do_header) fprintf(header, "%s\n", yyvsp[-1].str); ; break;} case 28: -#line 264 "parser.y" +#line 265 "parser.y" { assert(yychar == YYEMPTY); if (!do_import(yyvsp[-1].str)) yychar = aEOF; ; break;} case 29: -#line 267 "parser.y" +#line 268 "parser.y" {; break;} case 30: -#line 270 "parser.y" +#line 271 "parser.y" { yyval.str = yyvsp[0].str; ; break;} case 31: -#line 272 "parser.y" +#line 273 "parser.y" { start_typelib(yyvsp[-1].str, yyvsp[-2].attr); ; break;} case 32: -#line 274 "parser.y" +#line 275 "parser.y" { end_typelib(); ; break;} case 33: -#line 277 "parser.y" +#line 278 "parser.y" { yyval.var = NULL; ; break;} case 35: -#line 281 "parser.y" +#line 282 "parser.y" { yyval.var = NULL; ; break;} case 37: -#line 285 "parser.y" +#line 286 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; ; break;} case 39: -#line 290 "parser.y" +#line 291 "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 294 "parser.y" +#line 295 "parser.y" { yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); ; break;} case 41: -#line 297 "parser.y" +#line 298 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1553,7 +1549,7 @@ case 41: ; break;} case 42: -#line 303 "parser.y" +#line 304 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1561,337 +1557,349 @@ case 42: ; break;} case 43: -#line 310 "parser.y" +#line 311 "parser.y" { yyval.expr = NULL; ; break;} case 44: -#line 311 "parser.y" +#line 312 "parser.y" { yyval.expr = yyvsp[-1].expr; ; break;} case 45: -#line 312 "parser.y" +#line 313 "parser.y" { yyval.expr = make_expr(EXPR_VOID); ; break;} case 47: -#line 316 "parser.y" +#line 317 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 48: -#line 317 "parser.y" +#line 318 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-3].expr); yyval.expr = yyvsp[0].expr; ; break;} case 49: -#line 320 "parser.y" +#line 321 "parser.y" { yyval.attr = NULL; ; break;} case 51: -#line 325 "parser.y" +#line 326 "parser.y" { yyval.attr = yyvsp[-1].attr; ; break;} case 53: -#line 329 "parser.y" +#line 330 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-2].attr); yyval.attr = yyvsp[0].attr; ; break;} case 54: -#line 330 "parser.y" +#line 331 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-3].attr); yyval.attr = yyvsp[0].attr; ; break;} case 55: -#line 334 "parser.y" +#line 335 "parser.y" { yyval.attr = make_attr(ATTR_ASYNC); ; break;} case 56: -#line 335 "parser.y" +#line 336 "parser.y" { yyval.attr = make_attr(ATTR_AUTO_HANDLE); ; break;} case 57: -#line 336 "parser.y" +#line 337 "parser.y" { yyval.attr = make_attrp(ATTR_CALLAS, yyvsp[-1].var); ; break;} case 58: -#line 337 "parser.y" +#line 338 "parser.y" { yyval.attr = make_attrp(ATTR_CASE, yyvsp[-1].expr); ; break;} case 59: -#line 338 "parser.y" +#line 339 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); ; break;} case 60: -#line 339 "parser.y" +#line 340 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ ; break;} case 61: -#line 340 "parser.y" +#line 341 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ ; break;} case 62: -#line 341 "parser.y" +#line 342 "parser.y" { yyval.attr = make_attr(ATTR_CONTROL); ; break;} case 63: -#line 342 "parser.y" +#line 343 "parser.y" { yyval.attr = make_attr(ATTR_DEFAULT); ; break;} case 64: -#line 343 "parser.y" +#line 344 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_EXPR, yyvsp[-1].expr); ; break;} case 65: -#line 344 "parser.y" +#line 345 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_STRING, yyvsp[-1].str); ; break;} case 66: -#line 345 "parser.y" +#line 346 "parser.y" { yyval.attr = make_attrp(ATTR_DLLNAME, yyvsp[-1].str); ; break;} case 67: -#line 346 "parser.y" +#line 347 "parser.y" { yyval.attr = make_attr(ATTR_DUAL); ; break;} case 68: -#line 347 "parser.y" +#line 348 "parser.y" { yyval.attr = make_attrp(ATTR_ENDPOINT, yyvsp[-1].str); ; break;} case 69: -#line 348 "parser.y" +#line 349 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_STRING, yyvsp[-1].str); ; break;} case 70: -#line 349 "parser.y" +#line 350 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_ORDINAL, yyvsp[-1].expr); ; break;} case 71: -#line 350 "parser.y" +#line 351 "parser.y" { yyval.attr = make_attr(ATTR_EXPLICIT_HANDLE); ; break;} case 72: -#line 351 "parser.y" +#line 352 "parser.y" { yyval.attr = make_attr(ATTR_HANDLE); ; break;} case 73: -#line 352 "parser.y" +#line 353 "parser.y" { yyval.attr = make_attrp(ATTR_HELPCONTEXT, yyvsp[-1].expr); ; break;} case 74: -#line 353 "parser.y" +#line 354 "parser.y" { yyval.attr = make_attrp(ATTR_HELPFILE, yyvsp[-1].str); ; break;} case 75: -#line 354 "parser.y" +#line 355 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRING, yyvsp[-1].str); ; break;} case 76: -#line 355 "parser.y" +#line 356 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRINGCONTEXT, yyvsp[-1].expr); ; break;} case 77: -#line 356 "parser.y" +#line 357 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRINGDLL, yyvsp[-1].str); ; break;} case 78: -#line 357 "parser.y" +#line 358 "parser.y" { yyval.attr = make_attr(ATTR_HIDDEN); ; break;} case 79: -#line 358 "parser.y" +#line 359 "parser.y" { yyval.attr = make_attrp(ATTR_ID, yyvsp[-1].expr); ; break;} case 80: -#line 359 "parser.y" +#line 360 "parser.y" { yyval.attr = make_attr(ATTR_IDEMPOTENT); ; break;} case 81: -#line 360 "parser.y" +#line 361 "parser.y" { yyval.attr = make_attrp(ATTR_IIDIS, yyvsp[-1].var); ; break;} case 82: -#line 361 "parser.y" +#line 362 "parser.y" { yyval.attr = make_attrp(ATTR_IMPLICIT_HANDLE, yyvsp[-1].str); ; break;} case 83: -#line 362 "parser.y" +#line 363 "parser.y" { yyval.attr = make_attr(ATTR_IN); ; break;} case 84: -#line 363 "parser.y" +#line 364 "parser.y" { yyval.attr = make_attr(ATTR_INPUTSYNC); ; break;} case 85: -#line 364 "parser.y" +#line 365 "parser.y" { yyval.attr = make_attrp(ATTR_LENGTHIS, yyvsp[-1].expr); ; break;} case 86: -#line 365 "parser.y" +#line 366 "parser.y" { yyval.attr = make_attr(ATTR_LOCAL); ; break;} case 87: -#line 366 "parser.y" +#line 367 "parser.y" { yyval.attr = make_attr(ATTR_NONCREATABLE); ; break;} case 88: -#line 367 "parser.y" +#line 368 "parser.y" { yyval.attr = make_attr(ATTR_OBJECT); ; break;} case 89: -#line 368 "parser.y" +#line 369 "parser.y" { yyval.attr = make_attr(ATTR_ODL); ; break;} case 90: -#line 369 "parser.y" +#line 370 "parser.y" { yyval.attr = make_attr(ATTR_OLEAUTOMATION); ; break;} case 91: -#line 370 "parser.y" +#line 371 "parser.y" { yyval.attr = make_attr(ATTR_OPTIONAL); ; break;} case 92: -#line 371 "parser.y" +#line 372 "parser.y" { yyval.attr = make_attr(ATTR_OUT); ; break;} case 93: -#line 372 "parser.y" +#line 373 "parser.y" { yyval.attr = make_attrv(ATTR_POINTERDEFAULT, yyvsp[-1].num); ; break;} case 94: -#line 373 "parser.y" +#line 374 "parser.y" { yyval.attr = make_attr(ATTR_PROPGET); ; break;} case 95: -#line 374 "parser.y" +#line 375 "parser.y" { yyval.attr = make_attr(ATTR_PROPPUT); ; break;} case 96: -#line 375 "parser.y" +#line 376 "parser.y" { yyval.attr = make_attr(ATTR_PROPPUTREF); ; break;} case 97: -#line 376 "parser.y" -{ yyval.attr = make_attr(ATTR_PUBLIC); ; +#line 377 "parser.y" +{ yyval.attr = make_attr(ATTR_PTR); ; break;} case 98: -#line 377 "parser.y" -{ yyval.attr = make_attr(ATTR_READONLY); ; +#line 378 "parser.y" +{ yyval.attr = make_attr(ATTR_PUBLIC); ; break;} case 99: -#line 378 "parser.y" -{ yyval.attr = make_attr(ATTR_RESTRICTED); ; +#line 379 "parser.y" +{ yyval.attr = make_attr(ATTR_READONLY); ; break;} case 100: -#line 379 "parser.y" -{ yyval.attr = make_attr(ATTR_RETVAL); ; +#line 380 "parser.y" +{ yyval.attr = make_attr(ATTR_REF); ; break;} case 101: -#line 380 "parser.y" -{ yyval.attr = make_attrp(ATTR_SIZEIS, yyvsp[-1].expr); ; +#line 381 "parser.y" +{ yyval.attr = make_attr(ATTR_RESTRICTED); ; break;} case 102: -#line 381 "parser.y" -{ yyval.attr = make_attr(ATTR_SOURCE); ; +#line 382 "parser.y" +{ yyval.attr = make_attr(ATTR_RETVAL); ; break;} case 103: -#line 382 "parser.y" -{ yyval.attr = make_attr(ATTR_STRING); ; +#line 383 "parser.y" +{ yyval.attr = make_attrp(ATTR_SIZEIS, yyvsp[-1].expr); ; break;} case 104: -#line 383 "parser.y" -{ yyval.attr = make_attrp(ATTR_SWITCHIS, yyvsp[-1].expr); ; +#line 384 "parser.y" +{ yyval.attr = make_attr(ATTR_SOURCE); ; break;} case 105: -#line 384 "parser.y" -{ yyval.attr = make_attrp(ATTR_SWITCHTYPE, type_ref(yyvsp[-1].tref)); ; +#line 385 "parser.y" +{ yyval.attr = make_attr(ATTR_STRING); ; break;} case 106: -#line 385 "parser.y" -{ yyval.attr = make_attrp(ATTR_TRANSMITAS, type_ref(yyvsp[-1].tref)); ; +#line 386 "parser.y" +{ yyval.attr = make_attrp(ATTR_SWITCHIS, yyvsp[-1].expr); ; break;} case 107: -#line 386 "parser.y" -{ yyval.attr = make_attrp(ATTR_UUID, yyvsp[-1].uuid); ; +#line 387 "parser.y" +{ yyval.attr = make_attrp(ATTR_SWITCHTYPE, type_ref(yyvsp[-1].tref)); ; break;} case 108: -#line 387 "parser.y" -{ yyval.attr = make_attr(ATTR_V1ENUM); ; +#line 388 "parser.y" +{ yyval.attr = make_attrp(ATTR_TRANSMITAS, type_ref(yyvsp[-1].tref)); ; break;} case 109: -#line 388 "parser.y" -{ yyval.attr = make_attr(ATTR_VARARG); ; +#line 389 "parser.y" +{ yyval.attr = make_attr(ATTR_UNIQUE); ; break;} case 110: -#line 389 "parser.y" -{ yyval.attr = make_attrv(ATTR_VERSION, yyvsp[-1].num); ; +#line 390 "parser.y" +{ yyval.attr = make_attrp(ATTR_UUID, yyvsp[-1].uuid); ; break;} case 111: -#line 390 "parser.y" -{ yyval.attr = make_attrp(ATTR_WIREMARSHAL, type_ref(yyvsp[-1].tref)); ; +#line 391 "parser.y" +{ yyval.attr = make_attr(ATTR_V1ENUM); ; break;} case 112: -#line 391 "parser.y" -{ yyval.attr = make_attrv(ATTR_POINTERTYPE, yyvsp[0].num); ; +#line 392 "parser.y" +{ yyval.attr = make_attr(ATTR_VARARG); ; + break;} +case 113: +#line 393 "parser.y" +{ yyval.attr = make_attrv(ATTR_VERSION, yyvsp[-1].num); ; + break;} +case 114: +#line 394 "parser.y" +{ yyval.attr = make_attrp(ATTR_WIREMARSHAL, type_ref(yyvsp[-1].tref)); ; break;} case 115: -#line 398 "parser.y" +#line 395 "parser.y" +{ yyval.attr = make_attrv(ATTR_POINTERTYPE, yyvsp[0].num); ; + break;} +case 118: +#line 402 "parser.y" { yyval.var = NULL; ; break;} -case 116: -#line 399 "parser.y" +case 119: +#line 403 "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 117: -#line 404 "parser.y" +case 120: +#line 408 "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 118: -#line 408 "parser.y" +case 121: +#line 412 "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 119: -#line 414 "parser.y" +case 122: +#line 418 "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 120: -#line 421 "parser.y" +case 123: +#line 425 "parser.y" { yyval.var = NULL; ; break;} -case 121: -#line 422 "parser.y" +case 124: +#line 426 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} -case 124: -#line 427 "parser.y" +case 127: +#line 431 "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 125: -#line 433 "parser.y" +case 128: +#line 437 "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 126: -#line 438 "parser.y" +case 129: +#line 442 "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 127: -#line 444 "parser.y" +case 130: +#line 448 "parser.y" { yyval.type = get_typev(RPC_FC_ENUM16, yyvsp[-3].var, tsENUM); yyval.type->fields = yyvsp[-1].var; yyval.type->defined = TRUE; @@ -1899,135 +1907,135 @@ case 127: add_enum(yyval.type); ; break;} -case 129: -#line 453 "parser.y" -{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; - break;} -case 130: -#line 466 "parser.y" -{ yyval.expr = make_expr(EXPR_VOID); ; - break;} case 132: -#line 470 "parser.y" -{ yyval.expr = make_exprl(EXPR_NUM, yyvsp[0].num); ; +#line 457 "parser.y" +{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 133: -#line 471 "parser.y" -{ yyval.expr = make_exprl(EXPR_HEXNUM, yyvsp[0].num); ; - break;} -case 134: -#line 472 "parser.y" -{ yyval.expr = make_exprs(EXPR_IDENTIFIER, yyvsp[0].str); ; +#line 470 "parser.y" +{ yyval.expr = make_expr(EXPR_VOID); ; break;} case 135: -#line 473 "parser.y" -{ yyval.expr = make_expr3(EXPR_COND, yyvsp[-4].expr, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 474 "parser.y" +{ yyval.expr = make_exprl(EXPR_NUM, yyvsp[0].num); ; break;} case 136: -#line 474 "parser.y" -{ yyval.expr = make_expr2(EXPR_OR , yyvsp[-2].expr, yyvsp[0].expr); ; +#line 475 "parser.y" +{ yyval.expr = make_exprl(EXPR_HEXNUM, yyvsp[0].num); ; break;} case 137: -#line 475 "parser.y" -{ yyval.expr = make_expr2(EXPR_AND, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 476 "parser.y" +{ yyval.expr = make_exprs(EXPR_IDENTIFIER, yyvsp[0].str); ; break;} case 138: -#line 476 "parser.y" -{ yyval.expr = make_expr2(EXPR_ADD, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 477 "parser.y" +{ yyval.expr = make_expr3(EXPR_COND, yyvsp[-4].expr, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 139: -#line 477 "parser.y" -{ yyval.expr = make_expr2(EXPR_SUB, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 478 "parser.y" +{ yyval.expr = make_expr2(EXPR_OR , yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 140: -#line 478 "parser.y" -{ yyval.expr = make_expr2(EXPR_MUL, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 479 "parser.y" +{ yyval.expr = make_expr2(EXPR_AND, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 141: -#line 479 "parser.y" -{ yyval.expr = make_expr2(EXPR_DIV, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 480 "parser.y" +{ yyval.expr = make_expr2(EXPR_ADD, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 142: -#line 480 "parser.y" -{ yyval.expr = make_expr2(EXPR_SHL, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 481 "parser.y" +{ yyval.expr = make_expr2(EXPR_SUB, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 143: -#line 481 "parser.y" -{ yyval.expr = make_expr2(EXPR_SHR, yyvsp[-2].expr, yyvsp[0].expr); ; +#line 482 "parser.y" +{ yyval.expr = make_expr2(EXPR_MUL, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 144: -#line 482 "parser.y" -{ yyval.expr = make_expr1(EXPR_NOT, yyvsp[0].expr); ; +#line 483 "parser.y" +{ yyval.expr = make_expr2(EXPR_DIV, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 145: -#line 483 "parser.y" -{ yyval.expr = make_expr1(EXPR_NEG, yyvsp[0].expr); ; +#line 484 "parser.y" +{ yyval.expr = make_expr2(EXPR_SHL, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 146: -#line 484 "parser.y" -{ yyval.expr = make_expr1(EXPR_PPTR, yyvsp[0].expr); ; +#line 485 "parser.y" +{ yyval.expr = make_expr2(EXPR_SHR, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 147: -#line 485 "parser.y" -{ yyval.expr = make_exprt(EXPR_CAST, yyvsp[-2].tref, yyvsp[0].expr); ; +#line 486 "parser.y" +{ yyval.expr = make_expr1(EXPR_NOT, yyvsp[0].expr); ; break;} case 148: -#line 486 "parser.y" -{ yyval.expr = make_exprt(EXPR_SIZEOF, yyvsp[-1].tref, NULL); ; +#line 487 "parser.y" +{ yyval.expr = make_expr1(EXPR_NEG, yyvsp[0].expr); ; break;} case 149: -#line 487 "parser.y" -{ yyval.expr = yyvsp[-1].expr; ; +#line 488 "parser.y" +{ yyval.expr = make_expr1(EXPR_PPTR, yyvsp[0].expr); ; + break;} +case 150: +#line 489 "parser.y" +{ yyval.expr = make_exprt(EXPR_CAST, yyvsp[-2].tref, yyvsp[0].expr); ; break;} case 151: -#line 491 "parser.y" -{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; +#line 490 "parser.y" +{ yyval.expr = make_exprt(EXPR_SIZEOF, yyvsp[-1].tref, NULL); ; break;} case 152: -#line 494 "parser.y" +#line 491 "parser.y" +{ yyval.expr = yyvsp[-1].expr; ; + break;} +case 154: +#line 495 "parser.y" +{ LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; + break;} +case 155: +#line 498 "parser.y" { yyval.expr = yyvsp[0].expr; if (!yyval.expr->is_const) yyerror("expression is not constant\n"); ; break;} -case 153: -#line 500 "parser.y" +case 156: +#line 504 "parser.y" { yyval.var = yyvsp[0].var; set_type(yyval.var, yyvsp[-1].tref, NULL); ; break;} -case 154: -#line 505 "parser.y" +case 157: +#line 509 "parser.y" { yyval.var = NULL; ; break;} -case 155: -#line 506 "parser.y" +case 158: +#line 510 "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 156: -#line 511 "parser.y" +case 159: +#line 515 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} -case 157: -#line 512 "parser.y" +case 160: +#line 516 "parser.y" { yyval.var = make_var(NULL); yyval.var->type = yyvsp[-1].type; yyval.var->attrs = yyvsp[-2].attr; ; break;} -case 158: -#line 513 "parser.y" +case 161: +#line 517 "parser.y" { yyval.var = make_var(NULL); yyval.var->attrs = yyvsp[-1].attr; ; break;} -case 159: -#line 514 "parser.y" +case 162: +#line 518 "parser.y" { yyval.var = NULL; ; break;} -case 160: -#line 517 "parser.y" +case 163: +#line 521 "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 522 "parser.y" +case 164: +#line 526 "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); @@ -2036,32 +2044,20 @@ case 161: } ; break;} -case 162: -#line 531 "parser.y" -{ yyval.var = NULL; ; - break;} -case 164: +case 165: #line 535 "parser.y" { yyval.var = NULL; ; break;} -case 165: -#line 536 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; - break;} -case 166: -#line 537 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; - break;} case 167: +#line 539 "parser.y" +{ yyval.var = NULL; ; + break;} +case 168: #line 540 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; - break;} -case 168: -#line 542 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 169: -#line 543 "parser.y" +#line 541 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 170: @@ -2069,23 +2065,35 @@ case 170: { yyval.var = make_var(yyvsp[0].str); ; break;} case 171: -#line 545 "parser.y" +#line 546 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 172: -#line 548 "parser.y" -{ yyval.type = make_type(RPC_FC_BYTE, NULL); ; +#line 547 "parser.y" +{ yyval.var = make_var(yyvsp[0].str); ; break;} case 173: +#line 548 "parser.y" +{ yyval.var = make_var(yyvsp[0].str); ; + break;} +case 174: #line 549 "parser.y" -{ yyval.type = make_type(RPC_FC_WCHAR, NULL); ; +{ yyval.var = make_var(yyvsp[0].str); ; break;} case 175: -#line 551 "parser.y" -{ yyval.type = yyvsp[0].type; yyval.type->sign = 1; ; +#line 552 "parser.y" +{ yyval.type = make_type(RPC_FC_BYTE, NULL); ; break;} case 176: -#line 552 "parser.y" +#line 553 "parser.y" +{ yyval.type = make_type(RPC_FC_WCHAR, NULL); ; + break;} +case 178: +#line 555 "parser.y" +{ yyval.type = yyvsp[0].type; yyval.type->sign = 1; ; + break;} +case 179: +#line 556 "parser.y" { yyval.type = yyvsp[0].type; yyval.type->sign = -1; switch (yyval.type->type) { case RPC_FC_CHAR: break; @@ -2099,102 +2107,102 @@ case 176: } ; break;} -case 177: -#line 564 "parser.y" +case 180: +#line 568 "parser.y" { yyval.type = make_type(RPC_FC_ULONG, &std_int); yyval.type->sign = -1; ; break;} -case 178: -#line 566 "parser.y" +case 181: +#line 570 "parser.y" { yyval.type = make_type(RPC_FC_FLOAT, NULL); ; break;} -case 179: -#line 567 "parser.y" +case 182: +#line 571 "parser.y" { yyval.type = make_type(RPC_FC_DOUBLE, NULL); ; break;} -case 180: -#line 568 "parser.y" +case 183: +#line 572 "parser.y" { yyval.type = make_type(RPC_FC_SMALL, &std_bool); ; break;} -case 181: -#line 569 "parser.y" +case 184: +#line 573 "parser.y" { yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); ; break;} -case 182: -#line 570 "parser.y" +case 185: +#line 574 "parser.y" { yyval.type = make_type(RPC_FC_IGNORE, NULL); ; break;} -case 185: -#line 577 "parser.y" +case 188: +#line 581 "parser.y" { yyval.type = make_type(RPC_FC_LONG, &std_int); ; break;} -case 186: -#line 578 "parser.y" +case 189: +#line 582 "parser.y" { yyval.type = make_type(RPC_FC_SMALL, NULL); ; break;} -case 187: -#line 579 "parser.y" +case 190: +#line 583 "parser.y" { yyval.type = make_type(RPC_FC_SHORT, NULL); ; break;} -case 188: -#line 580 "parser.y" +case 191: +#line 584 "parser.y" { yyval.type = make_type(RPC_FC_LONG, NULL); ; break;} -case 189: -#line 581 "parser.y" +case 192: +#line 585 "parser.y" { yyval.type = make_type(RPC_FC_HYPER, NULL); ; break;} -case 190: -#line 582 "parser.y" +case 193: +#line 586 "parser.y" { yyval.type = make_type(RPC_FC_HYPER, &std_int64); ; break;} -case 191: -#line 583 "parser.y" +case 194: +#line 587 "parser.y" { yyval.type = make_type(RPC_FC_CHAR, NULL); ; break;} -case 192: -#line 586 "parser.y" -{ yyval.clas = make_class(yyvsp[0].str); ; - break;} -case 193: -#line 587 "parser.y" -{ yyval.clas = make_class(yyvsp[0].str); ; - break;} -case 194: +case 195: #line 590 "parser.y" +{ yyval.clas = make_class(yyvsp[0].str); ; + break;} +case 196: +#line 591 "parser.y" +{ yyval.clas = make_class(yyvsp[0].str); ; + break;} +case 197: +#line 594 "parser.y" { yyval.clas = yyvsp[0].clas; yyval.clas->attrs = yyvsp[-1].attr; if (!parse_only && do_header) write_coclass(yyval.clas); ; break;} -case 195: -#line 596 "parser.y" +case 198: +#line 600 "parser.y" { yyval.clas = yyvsp[-3].clas; yyval.clas->ifaces = yyvsp[-1].ifref; ; break;} -case 196: -#line 601 "parser.y" +case 199: +#line 605 "parser.y" { yyval.ifref = NULL; ; break;} -case 197: -#line 602 "parser.y" +case 200: +#line 606 "parser.y" { LINK(yyvsp[0].ifref, yyvsp[-1].ifref); yyval.ifref = yyvsp[0].ifref; ; break;} -case 198: -#line 606 "parser.y" +case 201: +#line 610 "parser.y" { yyval.ifref = make_ifref(yyvsp[0].type); yyval.ifref->attrs = yyvsp[-1].attr; ; break;} -case 199: -#line 609 "parser.y" -{ yyval.type = get_type(0, yyvsp[0].str, 0); ; - break;} -case 200: -#line 610 "parser.y" -{ yyval.type = get_type(0, yyvsp[0].str, 0); ; - break;} -case 201: +case 202: #line 613 "parser.y" +{ yyval.type = get_type(0, yyvsp[0].str, 0); ; + break;} +case 203: +#line 614 "parser.y" +{ yyval.type = get_type(0, yyvsp[0].str, 0); ; + break;} +case 204: +#line 617 "parser.y" { yyval.type = yyvsp[0].type; if (yyval.type->defined) yyerror("multiple definition error\n"); yyval.type->attrs = yyvsp[-1].attr; @@ -2206,48 +2214,48 @@ case 201: if (!parse_only && do_header) write_forward(yyval.type); ; break;} -case 202: -#line 625 "parser.y" +case 205: +#line 629 "parser.y" { yyval.var = NULL; ; break;} -case 203: -#line 626 "parser.y" +case 206: +#line 630 "parser.y" { LINK(yyvsp[-1].var, yyvsp[-2].var); yyval.var = yyvsp[-1].var; ; break;} -case 204: -#line 629 "parser.y" +case 207: +#line 633 "parser.y" { yyval.func = NULL; ; break;} -case 205: -#line 630 "parser.y" +case 208: +#line 634 "parser.y" { LINK(yyvsp[-1].func, yyvsp[-2].func); yyval.func = yyvsp[-1].func; ; break;} -case 206: -#line 636 "parser.y" +case 209: +#line 640 "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 207: -#line 648 "parser.y" +case 210: +#line 652 "parser.y" { yyval.type = NULL; ; break;} -case 208: -#line 649 "parser.y" +case 211: +#line 653 "parser.y" { yyval.type = find_type2(yyvsp[0].str, 0); ; break;} -case 209: -#line 652 "parser.y" -{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; - break;} -case 210: -#line 653 "parser.y" -{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; - break;} -case 211: +case 212: #line 656 "parser.y" +{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; + break;} +case 213: +#line 657 "parser.y" +{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; + break;} +case 214: +#line 660 "parser.y" { yyval.type = yyvsp[0].type; if (yyval.type->defined) yyerror("multiple definition error\n"); yyval.type->attrs = yyvsp[-1].attr; @@ -2255,16 +2263,16 @@ case 211: if (!parse_only && do_header) write_forward(yyval.type); ; break;} -case 212: -#line 665 "parser.y" +case 215: +#line 669 "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 213: -#line 673 "parser.y" +case 216: +#line 677 "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); @@ -2272,65 +2280,65 @@ case 213: if (!parse_only && do_header) write_interface(yyval.type); ; break;} -case 214: -#line 679 "parser.y" +case 217: +#line 683 "parser.y" { yyval.type = yyvsp[0].type; ; break;} -case 215: -#line 683 "parser.y" -{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; - break;} -case 216: -#line 684 "parser.y" -{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; - break;} -case 217: -#line 687 "parser.y" -{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; - break;} case 218: -#line 688 "parser.y" -{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; +#line 687 "parser.y" +{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; break;} case 219: +#line 688 "parser.y" +{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; + break;} +case 220: #line 691 "parser.y" +{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; + break;} +case 221: +#line 692 "parser.y" +{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; + break;} +case 222: +#line 695 "parser.y" { yyval.type = yyvsp[0].type; yyval.type->attrs = yyvsp[-1].attr; ; break;} -case 220: -#line 696 "parser.y" +case 223: +#line 700 "parser.y" { yyval.type = yyvsp[-3].type; yyval.type->funcs = yyvsp[-1].func; /* FIXME: if (!parse_only && do_header) write_module($$); */ ; break;} -case 221: -#line 702 "parser.y" +case 224: +#line 706 "parser.y" { yyval.var = yyvsp[0].var; yyval.var->ptr_level++; ; break;} -case 222: -#line 703 "parser.y" +case 225: +#line 707 "parser.y" { yyval.var = yyvsp[0].var; /* FIXME */ ; break;} -case 225: -#line 708 "parser.y" +case 228: +#line 712 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} -case 227: -#line 713 "parser.y" +case 230: +#line 717 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; ; break;} -case 228: -#line 717 "parser.y" +case 231: +#line 721 "parser.y" { yyval.num = RPC_FC_RP; ; break;} -case 229: -#line 718 "parser.y" +case 232: +#line 722 "parser.y" { yyval.num = RPC_FC_UP; ; break;} -case 230: -#line 721 "parser.y" +case 233: +#line 725 "parser.y" { yyval.type = get_typev(RPC_FC_STRUCT, yyvsp[-3].var, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ yyval.type->type = get_struct_type( yyvsp[-1].var ); @@ -2340,48 +2348,48 @@ case 230: add_struct(yyval.type); ; break;} -case 231: -#line 731 "parser.y" +case 234: +#line 735 "parser.y" { yyval.tref = make_tref(NULL, make_type(0, NULL)); ; break;} -case 232: -#line 732 "parser.y" +case 235: +#line 736 "parser.y" { yyval.tref = make_tref(yyvsp[0].str, find_type(yyvsp[0].str, 0)); ; break;} -case 233: -#line 733 "parser.y" -{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; - break;} -case 234: -#line 734 "parser.y" -{ yyval.tref = uniq_tref(yyvsp[0].tref); yyval.tref->ref->is_const = TRUE; ; - break;} -case 235: -#line 735 "parser.y" -{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; - break;} case 236: -#line 736 "parser.y" -{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsENUM)); ; - break;} -case 237: #line 737 "parser.y" { yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} -case 238: +case 237: #line 738 "parser.y" -{ yyval.tref = make_tref(NULL, get_type(RPC_FC_STRUCT, yyvsp[0].str, tsSTRUCT)); ; +{ yyval.tref = uniq_tref(yyvsp[0].tref); yyval.tref->ref->is_const = TRUE; ; break;} -case 239: +case 238: #line 739 "parser.y" { yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} -case 240: +case 239: #line 740 "parser.y" -{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsUNION)); ; +{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsENUM)); ; + break;} +case 240: +#line 741 "parser.y" +{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} case 241: +#line 742 "parser.y" +{ yyval.tref = make_tref(NULL, get_type(RPC_FC_STRUCT, yyvsp[0].str, tsSTRUCT)); ; + break;} +case 242: #line 743 "parser.y" +{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; + break;} +case 243: +#line 744 "parser.y" +{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsUNION)); ; + break;} +case 244: +#line 747 "parser.y" { typeref_t *tref = uniq_tref(yyvsp[-1].tref); yyvsp[0].var->tname = tref->name; tref->name = NULL; @@ -2393,15 +2401,15 @@ case 241: reg_types(yyval.type, yyvsp[0].var, 0); ; break;} -case 242: -#line 755 "parser.y" +case 245: +#line 759 "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 243: -#line 761 "parser.y" +case 246: +#line 765 "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"); @@ -2412,12 +2420,12 @@ case 243: yyval.type->defined = TRUE; ; break;} -case 244: -#line 773 "parser.y" +case 247: +#line 777 "parser.y" { yyval.num = MAKELONG(yyvsp[0].num, 0); ; break;} -case 245: -#line 774 "parser.y" +case 248: +#line 778 "parser.y" { yyval.num = MAKELONG(yyvsp[-2].num, yyvsp[0].num); ; break;} } @@ -2642,7 +2650,7 @@ yyerrhandle: } return 1; } -#line 777 "parser.y" +#line 781 "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 4ae1eb30003..1e3f2af1dd4 100644 --- a/reactos/tools/widl/y.tab.h +++ b/reactos/tools/widl/y.tab.h @@ -98,40 +98,41 @@ typedef union { #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 tSMALL 353 -#define tSOURCE 354 -#define tSTDCALL 355 -#define tSTRING 356 -#define tSTRUCT 357 -#define tSWITCH 358 -#define tSWITCHIS 359 -#define tSWITCHTYPE 360 -#define tTRANSMITAS 361 -#define tTYPEDEF 362 -#define tUNION 363 -#define tUNIQUE 364 -#define tUNSIGNED 365 -#define tUUID 366 -#define tV1ENUM 367 -#define tVARARG 368 -#define tVERSION 369 -#define tVOID 370 -#define tWCHAR 371 -#define tWIREMARSHAL 372 -#define tPOINTERTYPE 373 -#define COND 374 -#define CAST 375 -#define PPTR 376 -#define NEG 377 +#define tPTR 344 +#define tPUBLIC 345 +#define tREADONLY 346 +#define tREF 347 +#define tRESTRICTED 348 +#define tRETVAL 349 +#define tSHORT 350 +#define tSIGNED 351 +#define tSIZEIS 352 +#define tSIZEOF 353 +#define tSMALL 354 +#define tSOURCE 355 +#define tSTDCALL 356 +#define tSTRING 357 +#define tSTRUCT 358 +#define tSWITCH 359 +#define tSWITCHIS 360 +#define tSWITCHTYPE 361 +#define tTRANSMITAS 362 +#define tTYPEDEF 363 +#define tUNION 364 +#define tUNIQUE 365 +#define tUNSIGNED 366 +#define tUUID 367 +#define tV1ENUM 368 +#define tVARARG 369 +#define tVERSION 370 +#define tVOID 371 +#define tWCHAR 372 +#define tWIREMARSHAL 373 +#define tPOINTERTYPE 374 +#define COND 375 +#define CAST 376 +#define PPTR 377 +#define NEG 378 extern YYSTYPE yylval;