From a6d6b56960fcab387f544f163359c20b4aa5495b Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Thu, 24 Feb 2005 16:48:16 +0000 Subject: [PATCH] Support remaining basic types (float, double, small, wchar_t and handle_t). svn path=/trunk/; revision=13733 --- reactos/include/wine/rpcfc.h | 2 +- reactos/tools/widl/ChangeLog | 11 + reactos/tools/widl/client.c | 123 ++- reactos/tools/widl/header.c | 11 +- reactos/tools/widl/lex.yy.c | 1 + reactos/tools/widl/parser.l | 1 + reactos/tools/widl/parser.y | 8 +- reactos/tools/widl/server.c | 96 ++- reactos/tools/widl/y.tab.c | 1524 +++++++++++++++++----------------- reactos/tools/widl/y.tab.h | 49 +- 10 files changed, 971 insertions(+), 855 deletions(-) create mode 100644 reactos/tools/widl/ChangeLog diff --git a/reactos/include/wine/rpcfc.h b/reactos/include/wine/rpcfc.h index 073f32b1e34..803ae2bbbb9 100644 --- a/reactos/include/wine/rpcfc.h +++ b/reactos/include/wine/rpcfc.h @@ -21,7 +21,7 @@ #define RPC_FC_DOUBLE 0x0c #define RPC_FC_ENUM16 0x0d #define RPC_FC_ENUM32 0x0e - +#define RPC_FC_IGNORE 0x0f /* handle_t */ #define RPC_FC_ERROR_STATUS_T 0x10 /* other stuff */ diff --git a/reactos/tools/widl/ChangeLog b/reactos/tools/widl/ChangeLog new file mode 100644 index 00000000000..cff8668647b --- /dev/null +++ b/reactos/tools/widl/ChangeLog @@ -0,0 +1,11 @@ +ChangeLog + +2005-02-24 ekohl + include/wine/rpcfc.h + tools/widl/client.c + tools/widl/header.c + tools/widl/parser.l + tools/widl/parser.y + tools/widl/server.c + +Support remaining basic types (float, double, small, wchar_t and handle_t). diff --git a/reactos/tools/widl/client.c b/reactos/tools/widl/client.c index 1be77f68658..e3a01bc51b4 100644 --- a/reactos/tools/widl/client.c +++ b/reactos/tools/widl/client.c @@ -82,38 +82,49 @@ static void write_procformatstring(type_t *iface) { case RPC_FC_BYTE: print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_BYTE */\n", var->type->type); + print_client("0x%02x, /* FC_BYTE */\n", RPC_FC_BYTE); break; case RPC_FC_CHAR: print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_CHAR */\n", var->type->type); + print_client("0x%02x, /* FC_CHAR */\n", RPC_FC_CHAR); break; case RPC_FC_WCHAR: print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_WCHAR */\n", var->type->type); + print_client("0x%02x, /* FC_WCHAR */\n", RPC_FC_WCHAR); break; case RPC_FC_USHORT: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_USHORT */\n", var->type->type); - break; case RPC_FC_SHORT: print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_SHORT */\n", var->type->type); + print_client("0x%02x, /* FC_USHORT */\n", RPC_FC_SHORT); break; case RPC_FC_ULONG: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_ULONG */\n", var->type->type); - break; case RPC_FC_LONG: print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_LONG */\n", var->type->type); + print_client("0x%02x, /* FC_LONG */\n", RPC_FC_LONG); break; case RPC_FC_HYPER: print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_HYPER */\n", var->type->type); + print_client("0x%02x, /* FC_HYPER */\n", RPC_FC_HYPER); + break; + case RPC_FC_IGNORE: + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_IGNORE */\n", RPC_FC_IGNORE); + break; + case RPC_FC_SMALL: + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); + break; + case RPC_FC_FLOAT: + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); + break; + case RPC_FC_DOUBLE: + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); break; default: error("Unknown/unsupported type\n"); + return; } var = PREV_LINK(var); @@ -133,38 +144,51 @@ static void write_procformatstring(type_t *iface) { case RPC_FC_BYTE: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_BYTE */\n", var->type->type); + print_client("0x%02x, /* FC_BYTE */\n", var->type->type); break; case RPC_FC_CHAR: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_CHAR */\n", var->type->type); + print_client("0x%02x, /* FC_CHAR */\n", var->type->type); break; case RPC_FC_WCHAR: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_WCHAR */\n", var->type->type); + print_client("0x%02x, /* FC_WCHAR */\n", var->type->type); break; case RPC_FC_USHORT: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_USHORT */\n", var->type->type); + print_client("0x%02x, /* FC_USHORT */\n", var->type->type); break; case RPC_FC_SHORT: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_SHORT */\n", var->type->type); + print_client("0x%02x, /* FC_SHORT */\n", var->type->type); break; case RPC_FC_ULONG: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_ULONG */\n", var->type->type); + print_client("0x%02x, /* FC_ULONG */\n", var->type->type); break; case RPC_FC_LONG: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_LONG */\n", var->type->type); + print_client("0x%02x, /* FC_LONG */\n", var->type->type); break; case RPC_FC_HYPER: print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* RPC_FC_HYPER */\n", var->type->type); + print_client("0x%02x, /* FC_HYPER */\n", var->type->type); + break; + case RPC_FC_SMALL: + print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); + break; + case RPC_FC_FLOAT: + print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); + break; + case RPC_FC_DOUBLE: + print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); break; default: error("Unknown/unsupported type\n"); + return; } } @@ -220,6 +244,7 @@ static void print_message_buffer_size(func_t *func) { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_SMALL: size = 1; alignment = 0; break; @@ -234,26 +259,42 @@ static void print_message_buffer_size(func_t *func) 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("Unknown/unsupported type!"); } - if (last_size != 0) - fprintf(client, " +"); - fprintf(client, " %uU", size + alignment); + if (size == 0) + { + if (last_size != 0) + fprintf(client, " +"); + fprintf(client, " 0U"); + } + else + { + if (last_size != 0) + fprintf(client, " +"); + fprintf(client, " %uU", size + alignment); - last_size = size; + last_size = size; + } + var = PREV_LINK(var); } @@ -279,6 +320,7 @@ static void marshall_arguments(func_t *func) { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_SMALL: size = 1; alignment = 0; break; @@ -293,32 +335,41 @@ static void marshall_arguments(func_t *func) 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("Unknown/unsupported type!"); } - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); + if (size != 0) + { + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); - print_client("*(("); - write_type(client, var->type, var, var->tname); - fprintf(client, " __RPC_FAR*)_StubMsg.Buffer)++ = "); - write_name(client, var); - fprintf(client, ";\n"); - fprintf(client, "\n"); + print_client("*(("); + write_type(client, var->type, var, var->tname); + fprintf(client, " __RPC_FAR*)_StubMsg.Buffer)++ = "); + write_name(client, var); + fprintf(client, ";\n"); + fprintf(client, "\n"); - last_size = size; + last_size = size; + } var = PREV_LINK(var); } @@ -328,6 +379,7 @@ static void marshall_arguments(func_t *func) static void write_function_stubs(type_t *iface) { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explitit_handle = is_attr(iface->attrs, ATTR_IMPLICIT_HANDLE); func_t *func = iface->funcs; var_t* var; int method_count = 0; @@ -343,10 +395,7 @@ static void write_function_stubs(type_t *iface) write_name(client, def); fprintf(client, "(\n"); indent++; - if (func->args) - write_args(client, func->args, iface->name, 0, TRUE); - else - print_client("void"); + write_args(client, func->args, iface->name, 0, TRUE); fprintf(client, ")\n"); indent--; diff --git a/reactos/tools/widl/header.c b/reactos/tools/widl/header.c index f64f3f9f8ee..f8db95661ec 100644 --- a/reactos/tools/widl/header.c +++ b/reactos/tools/widl/header.c @@ -245,7 +245,7 @@ void write_type(FILE *h, type_t *t, var_t *v, char *n) if (t->ref) fprintf(h, t->ref->name); else fprintf(h, "error_status_t"); break; - case RPC_FC_BIND_PRIMITIVE: + case RPC_FC_IGNORE: if (t->ref) fprintf(h, t->ref->name); else fprintf(h, "handle_t"); break; @@ -511,6 +511,10 @@ void write_args(FILE *h, var_t *arg, char *name, int method, int do_indent) fprintf(h, "%s* This", name); count++; } + if (arg == NULL && method == 0) { + fprintf(h, "void"); + return; + } while (arg) { if (count) { if (do_indent) @@ -668,10 +672,7 @@ static void write_function_proto(type_t *iface) fprintf(header, " "); write_name(header, def); fprintf(header, "(\n"); - if (cur->args) - write_args(header, cur->args, iface->name, 0, TRUE); - else - fprintf(header, " void"); + write_args(header, cur->args, iface->name, 0, TRUE); fprintf(header, ");\n"); cur = PREV_LINK(cur); diff --git a/reactos/tools/widl/lex.yy.c b/reactos/tools/widl/lex.yy.c index f0a0a3453a9..419d7576c26 100644 --- a/reactos/tools/widl/lex.yy.c +++ b/reactos/tools/widl/lex.yy.c @@ -4568,6 +4568,7 @@ static struct keyword { {"size_is", tSIZEIS}, {"sizeof", tSIZEOF}, /* ... */ + {"small", tSMALL}, {"source", tSOURCE}, /* ... */ {"string", tSTRING}, diff --git a/reactos/tools/widl/parser.l b/reactos/tools/widl/parser.l index f943cf0a160..f41af6bff25 100644 --- a/reactos/tools/widl/parser.l +++ b/reactos/tools/widl/parser.l @@ -288,6 +288,7 @@ static struct keyword { {"size_is", tSIZEIS}, {"sizeof", tSIZEOF}, /* ... */ + {"small", tSMALL}, {"source", tSOURCE}, /* ... */ {"string", tSTRING}, diff --git a/reactos/tools/widl/parser.y b/reactos/tools/widl/parser.y index ff97fe691a6..f0f3af9f4dd 100644 --- a/reactos/tools/widl/parser.y +++ b/reactos/tools/widl/parser.y @@ -172,6 +172,7 @@ static type_t std_uhyper = { "MIDL_uhyper" }; %token tSHORT %token tSIGNED %token tSIZEIS tSIZEOF +%token tSMALL %token tSOURCE %token tSTDCALL %token tSTRING tSTRUCT @@ -553,7 +554,7 @@ base_type: tBYTE { $$ = make_type(RPC_FC_BYTE, NULL); } | tSIGNED int_std { $$ = $2; $$->sign = 1; } | tUNSIGNED int_std { $$ = $2; $$->sign = -1; switch ($$->type) { - case RPC_FC_CHAR: $$->type = RPC_FC_BYTE; $$->sign = 0; break; + case RPC_FC_CHAR: break; case RPC_FC_SMALL: $$->type = RPC_FC_USMALL; break; case RPC_FC_SHORT: $$->type = RPC_FC_USHORT; break; case RPC_FC_LONG: $$->type = RPC_FC_ULONG; break; @@ -565,9 +566,9 @@ base_type: tBYTE { $$ = make_type(RPC_FC_BYTE, NULL); } } | tFLOAT { $$ = make_type(RPC_FC_FLOAT, NULL); } | tDOUBLE { $$ = make_type(RPC_FC_DOUBLE, NULL); } - | tBOOLEAN { $$ = make_type(RPC_FC_BYTE, &std_bool); /* ? */ } + | tBOOLEAN { $$ = make_type(RPC_FC_SMALL, &std_bool); } | tERRORSTATUST { $$ = make_type(RPC_FC_ERROR_STATUS_T, NULL); } - | tHANDLET { $$ = make_type(RPC_FC_BIND_PRIMITIVE, NULL); /* ? */ } + | tHANDLET { $$ = make_type(RPC_FC_IGNORE, NULL); } ; m_int: @@ -575,6 +576,7 @@ m_int: ; int_std: tINT { $$ = make_type(RPC_FC_LONG, &std_int); } /* win32 only */ + | tSMALL m_int { $$ = make_type(RPC_FC_SMALL, NULL); } | tSHORT m_int { $$ = make_type(RPC_FC_SHORT, NULL); } | tLONG m_int { $$ = make_type(RPC_FC_LONG, NULL); } | tHYPER m_int { $$ = make_type(RPC_FC_HYPER, NULL); } diff --git a/reactos/tools/widl/server.c b/reactos/tools/widl/server.c index 7a542b4f2c8..2520a3b191c 100644 --- a/reactos/tools/widl/server.c +++ b/reactos/tools/widl/server.c @@ -87,35 +87,51 @@ static void write_procformatstring(type_t *iface) { case RPC_FC_BYTE: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_BYTE */\n", var->type->type); + print_server("0x%02x, /* FC_BYTE */\n", var->type->type); break; case RPC_FC_CHAR: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_CHAR */\n", var->type->type); + print_server("0x%02x, /* FC_CHAR */\n", var->type->type); break; case RPC_FC_WCHAR: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_WCHAR */\n", var->type->type); + print_server("0x%02x, /* FC_WCHAR */\n", var->type->type); break; case RPC_FC_USHORT: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_USHORT */\n", var->type->type); + print_server("0x%02x, /* FC_USHORT */\n", var->type->type); break; case RPC_FC_SHORT: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_SHORT */\n", var->type->type); + print_server("0x%02x, /* FC_SHORT */\n", var->type->type); break; case RPC_FC_ULONG: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_ULONG */\n", var->type->type); + print_server("0x%02x, /* FC_ULONG */\n", var->type->type); break; case RPC_FC_LONG: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_LONG */\n", var->type->type); + print_server("0x%02x, /* FC_LONG */\n", var->type->type); break; case RPC_FC_HYPER: print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_HYPER */\n", var->type->type); + print_server("0x%02x, /* FC_HYPER */\n", var->type->type); + break; + case RPC_FC_IGNORE: + print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_IGNORE */\n", var->type->type); + break; + case RPC_FC_SMALL: + print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); + break; + case RPC_FC_FLOAT: + print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); + break; + case RPC_FC_DOUBLE: + print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); break; default: error("Unknown/unsupported type\n"); @@ -138,35 +154,47 @@ static void write_procformatstring(type_t *iface) { case RPC_FC_BYTE: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_BYTE */\n", var->type->type); + print_server("0x%02x, /* FC_BYTE */\n", var->type->type); break; case RPC_FC_CHAR: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_CHAR */\n", var->type->type); + print_server("0x%02x, /* FC_CHAR */\n", var->type->type); break; case RPC_FC_WCHAR: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_WCHAR */\n", var->type->type); + print_server("0x%02x, /* FC_WCHAR */\n", var->type->type); break; case RPC_FC_USHORT: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_USHORT */\n", var->type->type); + print_server("0x%02x, /* FC_USHORT */\n", var->type->type); break; case RPC_FC_SHORT: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_SHORT */\n", var->type->type); + print_server("0x%02x, /* FC_SHORT */\n", var->type->type); break; case RPC_FC_ULONG: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_ULONG */\n", var->type->type); + print_server("0x%02x, /* FC_ULONG */\n", var->type->type); break; case RPC_FC_LONG: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_LONG */\n", var->type->type); + print_server("0x%02x, /* FC_LONG */\n", var->type->type); break; case RPC_FC_HYPER: print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* RPC_FC_HYPER */\n", var->type->type); + print_server("0x%02x, /* FC_HYPER */\n", var->type->type); + break; + case RPC_FC_SMALL: + print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); + break; + case RPC_FC_FLOAT: + print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); + break; + case RPC_FC_DOUBLE: + print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); break; default: error("Unknown/unsupported type\n"); @@ -208,17 +236,23 @@ unsigned int get_required_buffer_size(type_t *type) switch(type->type) { case RPC_FC_BYTE: + case RPC_FC_SMALL: case RPC_FC_CHAR: case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: case RPC_FC_ULONG: case RPC_FC_LONG: + case RPC_FC_FLOAT: return 4; - case RPC_FC_HYPER: + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: return 8; + case RPC_FC_IGNORE: + return 0; + default: error("Unknown/unsupported type: %s\n", type->name); } @@ -244,6 +278,7 @@ static void unmarshall_arguments(func_t *func) { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_SMALL: size = 1; alignment = 0; break; @@ -258,32 +293,41 @@ static void unmarshall_arguments(func_t *func) 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("Unknown/unsupported type!"); } - if (alignment != 0) - print_server("_StubMsg.Buffer += %u;\n", alignment); + 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, var, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); - fprintf(server, "\n"); + print_server(""); + write_name(server, var); + fprintf(server, " = *(("); + write_type(server, var->type, var, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); + fprintf(server, "\n"); - last_size = size; + last_size = size; + } var = PREV_LINK(var); } diff --git a/reactos/tools/widl/y.tab.c b/reactos/tools/widl/y.tab.c index 6f40b48abc8..ac3867ecb4c 100644 --- a/reactos/tools/widl/y.tab.c +++ b/reactos/tools/widl/y.tab.c @@ -100,30 +100,31 @@ #define tSIGNED 350 #define tSIZEIS 351 #define tSIZEOF 352 -#define tSOURCE 353 -#define tSTDCALL 354 -#define tSTRING 355 -#define tSTRUCT 356 -#define tSWITCH 357 -#define tSWITCHIS 358 -#define tSWITCHTYPE 359 -#define tTRANSMITAS 360 -#define tTYPEDEF 361 -#define tUNION 362 -#define tUNIQUE 363 -#define tUNSIGNED 364 -#define tUUID 365 -#define tV1ENUM 366 -#define tVARARG 367 -#define tVERSION 368 -#define tVOID 369 -#define tWCHAR 370 -#define tWIREMARSHAL 371 -#define tPOINTERTYPE 372 -#define COND 373 -#define CAST 374 -#define PPTR 375 -#define NEG 376 +#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 #line 1 "parser.y" @@ -258,26 +259,26 @@ typedef union { -#define YYFINAL 457 +#define YYFINAL 459 #define YYFLAG -32768 -#define YYNTBASE 142 +#define YYNTBASE 143 -#define YYTRANSLATE(x) ((unsigned)(x) <= 376 ? yytranslate[x] : 214) +#define YYTRANSLATE(x) ((unsigned)(x) <= 377 ? yytranslate[x] : 215) 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, 122, 2, 132, - 133, 125, 124, 119, 123, 141, 126, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 138, 131, 2, - 139, 2, 140, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 136, 2, 137, 2, 2, 2, 2, 2, 2, 2, + 137, 2, 138, 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, 134, 121, 135, 127, 2, 2, 2, 2, + 2, 2, 135, 122, 136, 128, 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, @@ -302,7 +303,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, 120, 128, 129, 130 + 117, 118, 119, 121, 129, 130, 131 }; #if YYDEBUG != 0 @@ -325,123 +326,124 @@ static const short yyprhs[] = { 0, 482, 486, 488, 493, 494, 497, 500, 504, 507, 509, 514, 522, 523, 525, 526, 528, 530, 532, 534, 536, 538, 540, 542, 544, 546, 549, 552, 554, 556, 558, - 560, 562, 563, 565, 567, 570, 573, 576, 578, 580, - 583, 586, 589, 594, 595, 598, 601, 604, 607, 610, - 613, 617, 620, 624, 630, 631, 634, 637, 640, 643, - 649, 657, 659, 662, 665, 668, 671, 674, 679, 682, - 685, 687, 689, 693, 695, 699, 701, 703, 709, 711, - 713, 715, 718, 720, 723, 725, 728, 730, 733, 738, - 744, 755, 757 + 560, 562, 563, 565, 567, 570, 573, 576, 579, 581, + 583, 586, 589, 592, 597, 598, 601, 604, 607, 610, + 613, 616, 620, 623, 627, 633, 634, 637, 640, 643, + 646, 652, 660, 662, 665, 668, 671, 674, 677, 682, + 685, 688, 690, 692, 696, 698, 702, 704, 706, 712, + 714, 716, 718, 721, 723, 726, 728, 731, 733, 736, + 741, 747, 758, 760 }; -static const short yyrhs[] = { 143, - 0, 0, 143, 201, 0, 143, 200, 0, 143, 189, - 0, 143, 204, 0, 143, 152, 0, 143, 146, 0, - 0, 144, 201, 0, 144, 200, 0, 144, 189, 0, - 144, 204, 0, 144, 146, 0, 0, 145, 180, 131, - 0, 145, 146, 0, 131, 0, 166, 131, 0, 147, - 0, 170, 131, 0, 176, 131, 0, 149, 0, 209, - 131, 0, 211, 131, 0, 212, 131, 0, 37, 132, - 7, 133, 0, 64, 7, 131, 0, 148, 144, 9, - 0, 74, 3, 0, 160, 150, 134, 0, 151, 144, - 135, 0, 0, 155, 0, 115, 0, 156, 0, 155, - 119, 156, 0, 154, 0, 160, 210, 206, 157, 0, - 210, 206, 157, 0, 160, 210, 206, 132, 153, 133, - 0, 210, 206, 132, 153, 133, 0, 0, 136, 158, - 137, 0, 136, 125, 137, 0, 172, 0, 158, 119, - 173, 0, 158, 137, 136, 173, 0, 0, 160, 0, - 136, 161, 137, 0, 162, 0, 161, 119, 162, 0, - 161, 137, 136, 162, 0, 16, 0, 18, 0, 24, - 132, 183, 133, 0, 26, 132, 174, 133, 0, 33, +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, 0, 34, 0, 35, 0, 36, 0, 38, 0, 39, - 132, 175, 133, 0, 39, 132, 7, 133, 0, 41, - 132, 7, 133, 0, 43, 0, 44, 132, 7, 133, - 0, 45, 132, 7, 133, 0, 45, 132, 175, 133, - 0, 48, 0, 51, 0, 53, 132, 175, 133, 0, - 54, 132, 7, 133, 0, 55, 132, 7, 133, 0, - 56, 132, 175, 133, 0, 57, 132, 7, 133, 0, - 58, 0, 60, 132, 175, 133, 0, 61, 0, 62, - 132, 183, 133, 0, 63, 132, 52, 3, 133, 0, - 66, 0, 69, 0, 73, 132, 171, 133, 0, 75, + 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, 0, 79, 0, 80, 0, 81, 0, 82, 0, 83, - 0, 84, 0, 85, 132, 208, 133, 0, 87, 0, + 0, 84, 0, 85, 133, 209, 134, 0, 87, 0, 88, 0, 89, 0, 90, 0, 91, 0, 93, 0, - 94, 0, 97, 132, 171, 133, 0, 99, 0, 101, - 0, 104, 132, 173, 133, 0, 105, 132, 210, 133, - 0, 106, 132, 210, 133, 0, 111, 132, 8, 133, - 0, 112, 0, 113, 0, 114, 132, 213, 133, 0, - 117, 132, 210, 133, 0, 208, 0, 0, 100, 0, - 0, 164, 165, 0, 26, 173, 138, 178, 0, 38, - 138, 178, 0, 32, 210, 183, 139, 175, 0, 0, - 168, 119, 0, 168, 0, 169, 0, 168, 119, 169, - 0, 183, 139, 175, 0, 183, 0, 46, 182, 134, - 167, 135, 0, 172, 0, 171, 119, 172, 0, 0, - 173, 0, 5, 0, 6, 0, 3, 0, 173, 140, - 173, 138, 173, 0, 173, 121, 173, 0, 173, 122, - 173, 0, 173, 124, 173, 0, 173, 123, 173, 0, - 173, 125, 173, 0, 173, 126, 173, 0, 173, 10, - 173, 0, 173, 11, 173, 0, 127, 173, 0, 123, - 173, 0, 125, 173, 0, 132, 210, 133, 173, 0, - 98, 132, 210, 133, 0, 132, 173, 133, 0, 175, - 0, 174, 119, 175, 0, 173, 0, 49, 32, 210, - 183, 0, 0, 177, 178, 0, 179, 131, 0, 159, - 212, 131, 0, 160, 131, 0, 131, 0, 159, 210, - 206, 157, 0, 159, 210, 163, 206, 132, 153, 133, - 0, 0, 183, 0, 0, 3, 0, 4, 0, 3, - 0, 4, 0, 60, 0, 94, 0, 114, 0, 22, - 0, 116, 0, 186, 0, 96, 186, 0, 110, 186, + 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, 50, 0, 42, 0, 20, 0, 47, 0, 52, - 0, 0, 70, 0, 70, 0, 95, 185, 0, 76, - 185, 0, 59, 185, 0, 71, 0, 28, 0, 29, - 3, 0, 29, 4, 0, 160, 187, 0, 188, 134, - 190, 135, 0, 0, 190, 191, 0, 159, 201, 0, - 40, 3, 0, 40, 4, 0, 160, 192, 0, 86, - 138, 0, 194, 179, 131, 0, 77, 138, 0, 195, - 180, 131, 0, 193, 134, 194, 195, 135, 0, 0, - 138, 4, 0, 72, 3, 0, 72, 4, 0, 160, - 198, 0, 199, 197, 134, 145, 135, 0, 199, 138, - 3, 134, 149, 145, 135, 0, 196, 0, 198, 131, - 0, 192, 131, 0, 78, 3, 0, 78, 4, 0, - 160, 202, 0, 203, 134, 145, 135, 0, 125, 206, - 0, 32, 205, 0, 183, 0, 205, 0, 132, 206, - 133, 0, 206, 0, 207, 119, 206, 0, 92, 0, - 109, 0, 102, 182, 134, 177, 135, 0, 115, 0, - 4, 0, 184, 0, 32, 210, 0, 170, 0, 46, - 3, 0, 209, 0, 102, 3, 0, 212, 0, 108, - 3, 0, 107, 159, 210, 207, 0, 108, 182, 134, - 177, 135, 0, 108, 182, 103, 132, 179, 133, 181, - 134, 164, 135, 0, 5, 0, 5, 141, 5, 0 + 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 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 228, 231, 232, 233, 234, 235, 236, 237, 240, 241, - 242, 243, 244, 245, 248, 249, 250, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 264, 266, 269, 272, - 274, 276, 279, 280, 283, 286, 287, 288, 292, 296, - 299, 305, 312, 313, 314, 317, 318, 319, 322, 323, - 326, 330, 331, 332, 335, 337, 338, 339, 340, 341, - 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, - 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, - 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, - 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, - 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, - 392, 393, 396, 397, 400, 401, 406, 410, 416, 423, - 424, 425, 428, 429, 435, 440, 446, 454, 455, 468, - 469, 472, 473, 474, 475, 476, 477, 478, 479, 480, - 481, 482, 483, 484, 485, 486, 487, 488, 489, 492, - 493, 496, 502, 507, 508, 513, 514, 515, 516, 519, - 522, 533, 534, 537, 538, 539, 542, 544, 545, 546, - 547, 550, 551, 552, 553, 554, 566, 567, 568, 569, - 570, 573, 574, 577, 578, 579, 580, 581, 582, 585, - 586, 589, 595, 600, 601, 604, 608, 609, 612, 624, - 625, 628, 629, 632, 647, 648, 651, 652, 655, 663, - 671, 678, 681, 683, 686, 687, 690, 695, 701, 702, - 705, 706, 707, 710, 712, 715, 717, 720, 730, 731, - 732, 733, 734, 735, 736, 737, 738, 739, 742, 754, - 758, 771, 773 + 229, 232, 233, 234, 235, 236, 237, 238, 241, 242, + 243, 244, 245, 246, 249, 250, 251, 254, 255, 256, + 257, 258, 259, 260, 261, 262, 265, 267, 270, 273, + 275, 277, 280, 281, 284, 287, 288, 289, 293, 297, + 300, 306, 313, 314, 315, 318, 319, 320, 323, 324, + 327, 331, 332, 333, 336, 338, 339, 340, 341, 342, + 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, + 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, + 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, + 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, + 393, 394, 397, 398, 401, 402, 407, 411, 417, 424, + 425, 426, 429, 430, 436, 441, 447, 455, 456, 469, + 470, 473, 474, 475, 476, 477, 478, 479, 480, 481, + 482, 483, 484, 485, 486, 487, 488, 489, 490, 493, + 494, 497, 503, 508, 509, 514, 515, 516, 517, 520, + 523, 534, 535, 538, 539, 540, 543, 545, 546, 547, + 548, 551, 552, 553, 554, 555, 567, 568, 569, 570, + 571, 574, 575, 578, 579, 580, 581, 582, 583, 584, + 587, 588, 591, 597, 602, 603, 606, 610, 611, 614, + 626, 627, 630, 631, 634, 649, 650, 653, 654, 657, + 665, 673, 680, 683, 685, 688, 689, 692, 697, 703, + 704, 707, 708, 709, 712, 714, 717, 719, 722, 732, + 733, 734, 735, 736, 737, 738, 739, 740, 741, 744, + 756, 760, 773, 775 }; #endif @@ -462,50 +464,50 @@ static const char * const yytname[] = { "$","error","$undefined.","aIDENTIFIER "tLONG","tMETHODS","tMODULE","tNONCREATABLE","tOBJECT","tODL","tOLEAUTOMATION", "tOPTIONAL","tOUT","tPOINTERDEFAULT","tPROPERTIES","tPROPGET","tPROPPUT","tPROPPUTREF", "tPUBLIC","tREADONLY","tREF","tRESTRICTED","tRETVAL","tSHORT","tSIGNED","tSIZEIS", -"tSIZEOF","tSOURCE","tSTDCALL","tSTRING","tSTRUCT","tSWITCH","tSWITCHIS","tSWITCHTYPE", -"tTRANSMITAS","tTYPEDEF","tUNION","tUNIQUE","tUNSIGNED","tUUID","tV1ENUM","tVARARG", -"tVERSION","tVOID","tWCHAR","tWIREMARSHAL","tPOINTERTYPE","','","COND","'|'", -"'&'","'-'","'+'","'*'","'/'","'~'","CAST","PPTR","NEG","';'","'('","')'","'{'", -"'}'","'['","']'","':'","'='","'?'","'.'","input","gbl_statements","imp_statements", -"int_statements","statement","cppquote","import_start","import","libraryhdr", -"library_start","librarydef","m_args","no_args","args","arg","array","array_list", -"m_attributes","attributes","attrib_list","attribute","callconv","cases","case", -"constdef","enums","enum_list","enum","enumdef","m_exprs","m_expr","expr","expr_list_const", -"expr_const","externdef","fields","field","s_field","funcdef","m_ident","t_ident", -"ident","base_type","m_int","int_std","coclass","coclasshdr","coclassdef","coclass_ints", -"coclass_int","dispinterface","dispinterfacehdr","dispint_props","dispint_meths", -"dispinterfacedef","inherit","interface","interfacehdr","interfacedef","interfacedec", -"module","modulehdr","moduledef","p_ident","pident","pident_list","pointer_type", -"structdef","type","typedef","uniondef","version", NULL +"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", +"libraryhdr","library_start","librarydef","m_args","no_args","args","arg","array", +"array_list","m_attributes","attributes","attrib_list","attribute","callconv", +"cases","case","constdef","enums","enum_list","enum","enumdef","m_exprs","m_expr", +"expr","expr_list_const","expr_const","externdef","fields","field","s_field", +"funcdef","m_ident","t_ident","ident","base_type","m_int","int_std","coclass", +"coclasshdr","coclassdef","coclass_ints","coclass_int","dispinterface","dispinterfacehdr", +"dispint_props","dispint_meths","dispinterfacedef","inherit","interface","interfacehdr", +"interfacedef","interfacedec","module","modulehdr","moduledef","p_ident","pident", +"pident_list","pointer_type","structdef","type","typedef","uniondef","version", NULL }; #endif static const short yyr1[] = { 0, - 142, 143, 143, 143, 143, 143, 143, 143, 144, 144, - 144, 144, 144, 144, 145, 145, 145, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 147, 148, 149, 150, - 151, 152, 153, 153, 154, 155, 155, 155, 156, 156, - 156, 156, 157, 157, 157, 158, 158, 158, 159, 159, - 160, 161, 161, 161, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 163, 163, 164, 164, 165, 165, 166, 167, - 167, 167, 168, 168, 169, 169, 170, 171, 171, 172, - 172, 173, 173, 173, 173, 173, 173, 173, 173, 173, - 173, 173, 173, 173, 173, 173, 173, 173, 173, 174, - 174, 175, 176, 177, 177, 178, 178, 178, 178, 179, - 180, 181, 181, 182, 182, 182, 183, 183, 183, 183, - 183, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 185, 185, 186, 186, 186, 186, 186, 186, 187, - 187, 188, 189, 190, 190, 191, 192, 192, 193, 194, - 194, 195, 195, 196, 197, 197, 198, 198, 199, 200, - 200, 200, 201, 201, 202, 202, 203, 204, 205, 205, - 206, 206, 206, 207, 207, 208, 208, 209, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 211, 212, - 212, 213, 213 + 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, 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 }; static const short yyr2[] = { 0, @@ -527,325 +529,325 @@ static const short yyr2[] = { 0, 3, 1, 4, 0, 2, 2, 3, 2, 1, 4, 7, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, - 1, 0, 1, 1, 2, 2, 2, 1, 1, 2, - 2, 2, 4, 0, 2, 2, 2, 2, 2, 2, - 3, 2, 3, 5, 0, 2, 2, 2, 2, 5, - 7, 1, 2, 2, 2, 2, 2, 4, 2, 2, - 1, 1, 3, 1, 3, 1, 1, 5, 1, 1, - 1, 2, 1, 2, 1, 2, 1, 2, 4, 5, - 10, 1, 3 + 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, 212, 0, 205, - 4, 3, 0, 6, 0, 0, 0, 230, 179, 172, - 189, 0, 178, 164, 180, 177, 181, 182, 184, 188, - 182, 182, 0, 164, 164, 0, 229, 173, 233, 231, - 174, 235, 0, 237, 0, 197, 198, 165, 166, 0, - 0, 0, 207, 208, 0, 0, 50, 0, 55, 56, - 0, 0, 59, 60, 61, 62, 63, 0, 0, 67, - 0, 0, 71, 72, 0, 0, 0, 0, 0, 78, - 0, 80, 0, 0, 83, 84, 0, 86, 87, 88, - 89, 90, 91, 92, 0, 94, 95, 96, 97, 98, - 226, 99, 100, 0, 102, 103, 0, 0, 0, 227, - 0, 108, 109, 0, 0, 0, 52, 112, 0, 0, - 0, 0, 0, 0, 192, 199, 209, 217, 19, 21, - 22, 194, 214, 0, 213, 0, 0, 15, 24, 25, - 26, 232, 234, 183, 187, 186, 185, 175, 236, 238, - 176, 167, 168, 169, 170, 171, 0, 0, 120, 0, - 28, 154, 0, 0, 154, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, - 0, 130, 0, 0, 0, 0, 0, 0, 0, 51, - 29, 14, 0, 12, 11, 10, 13, 32, 190, 191, - 30, 215, 216, 31, 49, 0, 49, 0, 206, 15, - 49, 0, 27, 0, 122, 123, 126, 153, 49, 0, - 0, 0, 221, 222, 224, 239, 49, 49, 0, 134, - 132, 133, 0, 0, 0, 0, 0, 152, 0, 150, + 0, 0, 0, 0, 5, 0, 0, 213, 0, 206, + 4, 3, 0, 6, 0, 0, 0, 231, 179, 172, + 190, 0, 178, 164, 180, 177, 181, 182, 184, 189, + 182, 182, 0, 182, 164, 164, 0, 230, 173, 234, + 232, 174, 236, 0, 238, 0, 198, 199, 165, 166, + 0, 0, 0, 208, 209, 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, 227, 99, 100, 0, 102, 103, 0, 0, 0, + 228, 0, 108, 109, 0, 0, 0, 52, 112, 0, + 0, 0, 0, 0, 0, 193, 200, 210, 218, 19, + 21, 22, 195, 215, 0, 214, 0, 0, 15, 24, + 25, 26, 233, 235, 183, 188, 187, 186, 175, 185, + 237, 239, 176, 167, 168, 169, 170, 171, 0, 0, + 120, 0, 28, 154, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 128, 131, 0, 0, 0, - 0, 0, 0, 242, 0, 0, 53, 0, 193, 0, - 195, 200, 0, 0, 0, 49, 0, 49, 218, 17, - 0, 0, 119, 127, 121, 0, 159, 228, 0, 50, - 155, 0, 220, 219, 0, 0, 0, 240, 57, 0, - 145, 146, 144, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 58, 65, 64, 66, 68, - 69, 70, 73, 74, 75, 76, 77, 79, 81, 0, - 130, 85, 93, 101, 104, 105, 106, 107, 0, 110, - 111, 54, 196, 202, 0, 201, 204, 0, 15, 210, - 113, 16, 124, 125, 237, 158, 156, 223, 225, 162, - 0, 149, 0, 142, 143, 136, 137, 139, 138, 140, - 141, 0, 151, 82, 129, 243, 43, 203, 49, 114, - 0, 157, 0, 163, 148, 147, 0, 130, 160, 211, - 0, 115, 135, 0, 0, 46, 33, 0, 45, 0, - 44, 229, 0, 38, 34, 36, 0, 0, 0, 0, - 241, 116, 47, 0, 161, 0, 0, 43, 0, 49, - 48, 37, 43, 33, 40, 49, 118, 33, 39, 0, - 117, 0, 42, 41, 0, 0, 0 + 0, 130, 0, 130, 0, 0, 0, 0, 0, 0, + 0, 51, 29, 14, 0, 12, 11, 10, 13, 32, + 191, 192, 30, 216, 217, 31, 49, 0, 49, 0, + 207, 15, 49, 0, 27, 0, 122, 123, 126, 153, + 49, 0, 0, 0, 222, 223, 225, 240, 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, 243, 0, 0, 53, 0, + 194, 0, 196, 201, 0, 0, 0, 49, 0, 49, + 219, 17, 0, 0, 119, 127, 121, 0, 159, 229, + 0, 50, 155, 0, 221, 220, 0, 0, 0, 241, + 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, 197, 203, 0, 202, 205, 0, + 15, 211, 113, 16, 124, 125, 238, 158, 156, 224, + 226, 162, 0, 149, 0, 142, 143, 136, 137, 139, + 138, 140, 141, 0, 151, 82, 129, 244, 43, 204, + 49, 114, 0, 157, 0, 163, 148, 147, 0, 130, + 160, 212, 0, 115, 135, 0, 0, 46, 33, 0, + 45, 0, 44, 230, 0, 38, 34, 36, 0, 0, + 0, 0, 242, 116, 47, 0, 161, 0, 0, 43, + 0, 49, 48, 37, 43, 33, 40, 49, 118, 33, + 39, 0, 117, 0, 42, 41, 0, 0, 0 }; -static const short yydefgoto[] = { 455, - 1, 139, 231, 300, 15, 16, 17, 144, 18, 19, - 423, 424, 425, 426, 409, 415, 301, 77, 136, 137, - 401, 418, 432, 21, 234, 235, 236, 59, 275, 276, - 258, 259, 260, 23, 239, 311, 312, 302, 403, 70, - 243, 60, 165, 61, 145, 24, 214, 225, 291, 26, - 27, 227, 296, 28, 157, 29, 30, 215, 216, 148, - 33, 217, 244, 245, 246, 138, 62, 428, 36, 64, - 285 +static const short 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 yypact[] = {-32768, - 634, 592, -72, 85, 119, 88, 130, 176, 119, 12, - 119,-32768, 788,-32768,-32768,-32768,-32768,-32768,-32768, 239, - 42, 73, 76, 63,-32768, 82, 84,-32768, 93, 92, --32768,-32768, 112,-32768, 95, 118, 134,-32768,-32768,-32768, --32768, 592,-32768, 186,-32768,-32768,-32768, 189,-32768,-32768, - 189, 189, 8, 208, 212, 8,-32768,-32768,-32768,-32768, --32768,-32768, 16,-32768, 139,-32768,-32768,-32768,-32768, 133, - 592, 138,-32768,-32768, 147, 592,-32768, -61,-32768,-32768, - 150, 151,-32768,-32768,-32768,-32768,-32768, 152, 164,-32768, - 165, 173,-32768,-32768, 174, 177, 183, 184, 187,-32768, - 190,-32768, 193, 194,-32768,-32768, 195,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 197,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 199,-32768,-32768, 200, 201, 202,-32768, - 203,-32768,-32768, 205, 209, -78,-32768,-32768, 546, 603, - 218, 337, 249, 214,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 260,-32768, 258, 216,-32768,-32768,-32768, --32768,-32768, 217,-32768,-32768,-32768,-32768,-32768, 217, -47, --32768,-32768,-32768,-32768,-32768,-32768, 213, 220, 16, 16, --32768,-32768, 282, 223,-32768, 16, 110, 222, 349, 351, - 414, 110, 352, 355, 110, 356, 110, 16, 320, 110, - -35, 110, 110, 592, 592, 366, 373, 592, 788, 243, --32768,-32768, 299,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, -87, 242, -54, 252,-32768,-32768, - -2, 110,-32768, 248, 274,-32768, 255,-32768, -24, -11, - 282, 282,-32768,-32768,-32768, 278, 12, -10, 265,-32768, --32768,-32768, 269, 110, 110, 110, 474, 266, -95,-32768, - 275, 277, 280, 285, 289, 292, 293, 294, 297, 298, - 300, 307, 308, 408, -58,-32768, 266, 309, -48, 70, - 311, 313, 317, 310, 319, 321,-32768, 788,-32768, -6, --32768,-32768, 315, 592, 284, 128, 392, 667,-32768,-32768, - 592, 326,-32768,-32768, 16, 110,-32768,-32768, 592, 327, --32768, 328,-32768,-32768, 329, 282, 331,-32768,-32768, 592, - 325, 325, 325, 167, 333, 110, 110, 110, 110, 110, - 110, 110, 110, 110, 110,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 334, - 110,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 455,-32768, --32768,-32768,-32768,-32768, 282,-32768,-32768, 339,-32768,-32768, - 381,-32768,-32768,-32768, 354,-32768,-32768,-32768,-32768, 16, - 358,-32768, 110, 325, 325, 35, 59, 15, 15, 22, - 22, 244,-32768,-32768,-32768,-32768, 346,-32768, 680,-32768, - 282,-32768, 359,-32768,-32768, 325, 110, 431,-32768,-32768, - 360,-32768, 266, 49, -69,-32768, 228, -16,-32768, 110, - 347, -36, 362,-32768, 365,-32768, 592, 282, 110, 348, --32768,-32768, 266, 110,-32768, 353, 282, -4, 350, -41, - 266,-32768, 66, 228,-32768, -41,-32768, 228,-32768, 364, --32768, 367,-32768,-32768, 487, 498,-32768 + 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, +-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 }; static const short yypgoto[] = {-32768, --32768, 481, -215, 13,-32768,-32768, 204,-32768,-32768,-32768, - -313,-32768,-32768, 67, -339,-32768, -8, -1,-32768, -192, --32768,-32768,-32768,-32768,-32768,-32768, 206, 5, 302, -322, - -163,-32768, -179,-32768, 322, -382, -196, 219,-32768, 54, - -62,-32768, 221, 45,-32768,-32768, 504,-32768,-32768, -13, --32768,-32768,-32768,-32768,-32768, -12,-32768, 507, 4,-32768, --32768, 508, 270, -214,-32768, 312, 10, 1,-32768, 3, +-32768, 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 }; -#define YYLAST 905 +#define YYLAST 909 static const short yytable[] = { 20, - 177, 76, 63, 37, 32, 22, 146, 147, 262, 429, - 35, 266, 267, 14, 298, 270, 287, 272, 172, 173, - 240, 430, 293, 335, 326, 327, 314, 315, 395, 2, - 295, 326, 327, 4, 3, 41, 277, 336, 277, 280, - 209, 184, 162, 5, 326, 327, 6, 289, 13, 420, - 317, 250, 303, 251, 252, -165, 121, 447, 210, 65, - 351, 7, 75, 451, 78, 8, 48, 421, 326, 327, - 351, 180, 185, 130, 352, 174, 183, 49, 50, 326, - 327, 13, -35, 51, 354, 416, -165, 66, 67, 307, - 321, 322, 323, 324, 13, 362, -35, 168, 445, 9, - 171, 379, 52, 449, 10, 11, 307, 75, 78, 175, - 308, 13, 250, 241, 251, 252, 237, 238, 431, 71, - 307, 68, 69, 249, 318, 13, 374, 444, 12, 176, - 450, 408, 299, 13, 452, 273, 72, 213, 213, 332, - 333, 37, 37, 22, 22, 178, 253, 13, 35, 35, - 397, 212, 212, 399, 334, 393, 329, 330, 331, 332, - 333, 334, 384, 385, 386, 387, 388, 389, 390, 391, - 392, 254, 149, 255, 334, 256, 326, 327, 73, 74, - 257, 330, 331, 332, 333, 419, 411, 277, 163, 69, - 328, 329, 330, 331, 332, 333, 152, 448, 334, 146, - 147, 408, 355, 150, 281, 282, 151, 253, 286, 334, - 169, 69, 153, 438, 170, 69, 290, 154, 294, 406, - 219, 220, 443, 155, 250, 159, 251, 252, 261, 156, - 309, 38, 254, 37, 255, 22, 256, 310, 294, 309, - 35, 257, 237, 413, 277, 158, 310, 39, 160, 40, - 322, 222, 223, 326, 327, 41, 433, 325, 164, 42, - 228, 229, 367, 13, 161, 439, 179, 141, 181, 43, - 441, 166, 167, 44, 45, 326, 327, 46, 4, 47, - 182, 186, 187, 188, 172, 173, 48, 328, 329, 330, - 331, 332, 333, 363, 365, 189, 190, 49, 50, 382, - 37, 371, 22, 51, 191, 192, 334, 35, 193, 365, - 8, 375, 142, 240, 194, 195, 143, 404, 196, 253, - 381, 197, 52, 53, 198, 199, 200, 141, 201, 54, - 202, 203, 204, 205, 206, 55, 207, 56, 4, 221, - 208, 174, 422, 58, 254, 226, 255, 224, 256, 230, - -165, 232, 233, 257, 247, 263, 38, 264, 268, 326, - 327, 269, 271, 13, 328, 329, 330, 331, 332, 333, - 8, 274, 39, 283, 40, 175, 143, 284, 288, 292, - 41, 407, 304, 334, 42, 297, 328, 329, 330, 331, - 332, 333, 305, 306, 43, 176, 316, 319, 44, 45, - 320, 37, 46, 22, 47, 334, 241, 337, 35, 338, - 350, 48, 339, 242, 366, 427, 250, 340, 251, 252, - 265, 341, 49, 50, 342, 343, 344, 437, 51, 345, - 346, 309, 347, 250, 427, 251, 252, 309, 310, 348, - 349, 353, 427, 356, 310, 357, 427, 52, 53, 358, - 359, 360, 364, 361, 54, 7, 372, 376, 377, 396, - 55, 378, 56, 380, 334, 383, 394, 57, 58, 398, - 328, 329, 330, 331, 332, 333, 250, 38, 251, 252, - 400, 408, 434, 436, 402, 440, 456, 446, 13, 334, - 405, 417, 412, 39, 435, 40, 453, 457, 140, 454, - 369, 41, 442, 279, 25, 42, 248, 31, 34, 313, - 373, 253, 278, 0, 368, 43, 0, 0, 0, 44, - 45, 0, 0, 46, 0, 47, 0, 0, 253, 0, - 0, 0, 48, 0, 0, 0, 254, 0, 255, 0, - 256, 0, 0, 49, 50, 257, 0, 0, 0, 51, - 0, 0, 0, 254, 211, 414, 0, 256, 0, 0, - 0, 0, 257, 0, 0, 0, 0, 0, 52, 53, - 0, 253, 0, 0, 0, 54, 0, 2, 0, 0, - 0, 55, 3, 56, 0, 4, 0, 0, 57, 58, - 0, 5, 0, 0, 6, 38, 254, 0, 255, 0, - 256, 0, 0, 0, 0, 257, 0, 0, 0, 7, - 0, 39, 0, 40, 0, 0, 0, 8, 0, 41, - 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 43, 2, 0, 0, 44, 45, 3, - 0, 46, 4, 47, 0, 0, 0, 9, 5, 0, - 48, 6, 10, 11, 0, 0, 0, 0, 0, 0, - 0, 49, 50, 0, 0, 2, 7, 51, 0, 0, - 3, 0, 0, 4, 8, 0, 12, 0, 0, 5, - 0, 13, 6, 0, 0, 0, 52, 53, 0, 0, - 0, 0, 0, 54, 0, 0, 0, 7, 2, 55, - 0, 56, 0, 3, 9, 8, 57, 58, 0, 10, - 11, 2, 5, 0, 0, 6, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 0, 0, 6, 0, - 7, 0, 0, 12, 0, 9, 0, 218, 13, 0, - 10, 11, 0, 7, 0, 0, 0, 0, 0, 0, + 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, 12, 0, 0, 0, 9, 13, - 0, 0, 0, 10, 11, 0, 0, 0, 0, 0, - 0, 9, 0, 0, 0, 0, 10, 11, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, - 0, 370, 13, 79, 0, 80, 0, 0, 0, 0, - 12, 81, 0, 82, 410, 13, 0, 0, 0, 0, - 83, 84, 85, 86, 0, 87, 88, 0, 89, 0, - 90, 91, 92, 0, 0, 93, 0, 0, 94, 0, - 95, 96, 97, 98, 99, 100, 0, 101, 102, 103, - 104, 0, 0, 105, 0, 0, 106, 0, 0, 0, - 107, 0, 108, 0, 0, 0, 109, 110, 111, 112, - 113, 114, 115, 0, 116, 117, 118, 119, 120, 121, - 122, 123, 0, 0, 124, 0, 125, 0, 126, 0, - 0, 127, 128, 129, 0, 0, 130, 0, 131, 132, - 133, 134, 0, 0, 135 + 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 }; static const short yycheck[] = { 1, - 63, 10, 2, 1, 1, 1, 20, 20, 188, 26, - 1, 191, 192, 1, 230, 195, 209, 197, 3, 4, - 32, 38, 77, 119, 10, 11, 241, 242, 351, 32, - 227, 10, 11, 40, 37, 28, 200, 133, 202, 203, - 119, 103, 42, 46, 10, 11, 49, 135, 136, 119, - 247, 3, 232, 5, 6, 103, 92, 440, 137, 132, - 119, 64, 9, 446, 11, 72, 59, 137, 10, 11, - 119, 71, 134, 109, 133, 60, 76, 70, 71, 10, - 11, 136, 119, 76, 133, 408, 134, 3, 4, 131, - 254, 255, 256, 257, 136, 288, 133, 53, 438, 102, - 56, 316, 95, 443, 107, 108, 131, 54, 55, 94, - 135, 136, 3, 125, 5, 6, 179, 180, 135, 32, - 131, 3, 4, 186, 135, 136, 306, 132, 131, 114, - 444, 136, 135, 136, 448, 198, 7, 139, 140, 125, - 126, 139, 140, 139, 140, 7, 98, 136, 139, 140, - 365, 139, 140, 369, 140, 335, 122, 123, 124, 125, - 126, 140, 326, 327, 328, 329, 330, 331, 332, 333, - 334, 123, 131, 125, 140, 127, 10, 11, 3, 4, - 132, 123, 124, 125, 126, 137, 401, 351, 3, 4, - 121, 122, 123, 124, 125, 126, 134, 132, 140, 213, - 213, 136, 133, 131, 204, 205, 131, 98, 208, 140, - 3, 4, 131, 428, 3, 4, 225, 134, 227, 383, - 3, 4, 437, 131, 3, 131, 5, 6, 7, 138, - 239, 4, 123, 231, 125, 231, 127, 239, 247, 248, - 231, 132, 305, 407, 408, 134, 248, 20, 131, 22, - 414, 3, 4, 10, 11, 28, 420, 257, 70, 32, - 3, 4, 135, 136, 131, 429, 134, 29, 131, 42, - 434, 51, 52, 46, 47, 10, 11, 50, 40, 52, - 134, 132, 132, 132, 3, 4, 59, 121, 122, 123, - 124, 125, 126, 290, 294, 132, 132, 70, 71, 133, - 298, 301, 298, 76, 132, 132, 140, 298, 132, 309, - 72, 309, 74, 32, 132, 132, 78, 380, 132, 98, - 320, 132, 95, 96, 132, 132, 132, 29, 132, 102, - 132, 132, 132, 132, 132, 108, 132, 110, 40, 3, - 132, 60, 115, 116, 123, 86, 125, 134, 127, 134, - 134, 139, 133, 132, 132, 7, 4, 7, 7, 10, - 11, 7, 7, 136, 121, 122, 123, 124, 125, 126, - 72, 52, 20, 8, 22, 94, 78, 5, 136, 138, - 28, 138, 135, 140, 32, 134, 121, 122, 123, 124, - 125, 126, 119, 139, 42, 114, 119, 133, 46, 47, - 132, 399, 50, 399, 52, 140, 125, 133, 399, 133, - 3, 59, 133, 132, 131, 417, 3, 133, 5, 6, - 7, 133, 70, 71, 133, 133, 133, 427, 76, 133, - 133, 440, 133, 3, 436, 5, 6, 446, 440, 133, - 133, 133, 444, 133, 446, 133, 448, 95, 96, 133, - 141, 133, 138, 133, 102, 64, 131, 131, 131, 5, - 108, 133, 110, 133, 140, 133, 133, 115, 116, 131, - 121, 122, 123, 124, 125, 126, 3, 4, 5, 6, - 100, 136, 136, 119, 131, 138, 0, 138, 136, 140, - 133, 132, 134, 20, 133, 22, 133, 0, 18, 133, - 297, 28, 436, 202, 1, 32, 185, 1, 1, 240, - 305, 98, 201, -1, 296, 42, -1, -1, -1, 46, - 47, -1, -1, 50, -1, 52, -1, -1, 98, -1, - -1, -1, 59, -1, -1, -1, 123, -1, 125, -1, - 127, -1, -1, 70, 71, 132, -1, -1, -1, 76, - -1, -1, -1, 123, 9, 125, -1, 127, -1, -1, - -1, -1, 132, -1, -1, -1, -1, -1, 95, 96, - -1, 98, -1, -1, -1, 102, -1, 32, -1, -1, - -1, 108, 37, 110, -1, 40, -1, -1, 115, 116, - -1, 46, -1, -1, 49, 4, 123, -1, 125, -1, - 127, -1, -1, -1, -1, 132, -1, -1, -1, 64, - -1, 20, -1, 22, -1, -1, -1, 72, -1, 28, - -1, -1, -1, 32, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 42, 32, -1, -1, 46, 47, 37, - -1, 50, 40, 52, -1, -1, -1, 102, 46, -1, - 59, 49, 107, 108, -1, -1, -1, -1, -1, -1, - -1, 70, 71, -1, -1, 32, 64, 76, -1, -1, - 37, -1, -1, 40, 72, -1, 131, -1, -1, 46, - -1, 136, 49, -1, -1, -1, 95, 96, -1, -1, - -1, -1, -1, 102, -1, -1, -1, 64, 32, 108, - -1, 110, -1, 37, 102, 72, 115, 116, -1, 107, - 108, 32, 46, -1, -1, 49, 37, -1, -1, -1, - -1, -1, -1, -1, -1, 46, -1, -1, 49, -1, - 64, -1, -1, 131, -1, 102, -1, 135, 136, -1, - 107, 108, -1, 64, -1, -1, -1, -1, -1, -1, + 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, 131, -1, -1, -1, 102, 136, - -1, -1, -1, 107, 108, -1, -1, -1, -1, -1, - -1, 102, -1, -1, -1, -1, 107, 108, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 131, -1, -1, - -1, 135, 136, 16, -1, 18, -1, -1, -1, -1, - 131, 24, -1, 26, 135, 136, -1, -1, -1, -1, - 33, 34, 35, 36, -1, 38, 39, -1, 41, -1, - 43, 44, 45, -1, -1, 48, -1, -1, 51, -1, - 53, 54, 55, 56, 57, 58, -1, 60, 61, 62, - 63, -1, -1, 66, -1, -1, 69, -1, -1, -1, - 73, -1, 75, -1, -1, -1, 79, 80, 81, 82, - 83, 84, 85, -1, 87, 88, 89, 90, 91, 92, - 93, 94, -1, -1, 97, -1, 99, -1, 101, -1, - -1, 104, 105, 106, -1, -1, 109, -1, 111, 112, - 113, 114, -1, -1, 117 + -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 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/share/bison.simple" @@ -1391,161 +1393,161 @@ yyreduce: switch (yyn) { case 1: -#line 228 "parser.y" +#line 229 "parser.y" { write_proxies(yyvsp[0].ifref); write_client(yyvsp[0].ifref); write_server(yyvsp[0].ifref); ; break;} case 2: -#line 231 "parser.y" +#line 232 "parser.y" { yyval.ifref = NULL; ; break;} case 3: -#line 232 "parser.y" +#line 233 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 4: -#line 233 "parser.y" +#line 234 "parser.y" { yyval.ifref = make_ifref(yyvsp[0].type); LINK(yyval.ifref, yyvsp[-1].ifref); ; break;} case 5: -#line 234 "parser.y" +#line 235 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_coclass(yyvsp[0].clas); ; break;} case 6: -#line 235 "parser.y" +#line 236 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_module(yyvsp[0].type); ; break;} case 7: -#line 236 "parser.y" -{ yyval.ifref = yyvsp[-1].ifref; ; - break;} -case 8: #line 237 "parser.y" +{ yyval.ifref = yyvsp[-1].ifref; ; + break;} +case 8: +#line 238 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 9: -#line 240 "parser.y" +#line 241 "parser.y" {; break;} case 10: -#line 241 "parser.y" -{ if (!parse_only) add_interface(yyvsp[0].type); ; - break;} -case 11: #line 242 "parser.y" { if (!parse_only) add_interface(yyvsp[0].type); ; break;} -case 12: +case 11: #line 243 "parser.y" +{ if (!parse_only) add_interface(yyvsp[0].type); ; + break;} +case 12: +#line 244 "parser.y" { if (!parse_only) add_coclass(yyvsp[0].clas); ; break;} case 13: -#line 244 "parser.y" +#line 245 "parser.y" { if (!parse_only) add_module(yyvsp[0].type); ; break;} case 14: -#line 245 "parser.y" +#line 246 "parser.y" {; break;} case 15: -#line 248 "parser.y" +#line 249 "parser.y" { yyval.func = NULL; ; break;} case 16: -#line 249 "parser.y" +#line 250 "parser.y" { yyval.func = yyvsp[-1].func; LINK(yyval.func, yyvsp[-2].func); ; break;} case 17: -#line 250 "parser.y" +#line 251 "parser.y" { yyval.func = yyvsp[-1].func; ; break;} case 18: -#line 253 "parser.y" +#line 254 "parser.y" {; break;} case 19: -#line 254 "parser.y" +#line 255 "parser.y" { if (!parse_only && do_header) { write_constdef(yyvsp[-1].var); } ; break;} case 20: -#line 255 "parser.y" +#line 256 "parser.y" {; break;} case 21: -#line 256 "parser.y" +#line 257 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 22: -#line 257 "parser.y" +#line 258 "parser.y" { if (!parse_only && do_header) { write_externdef(yyvsp[-1].var); } ; break;} case 23: -#line 258 "parser.y" +#line 259 "parser.y" {; break;} case 24: -#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 25: -#line 260 "parser.y" +#line 261 "parser.y" {; break;} case 26: -#line 261 "parser.y" +#line 262 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 27: -#line 264 "parser.y" +#line 265 "parser.y" { if (!parse_only && do_header) fprintf(header, "%s\n", yyvsp[-1].str); ; break;} case 28: -#line 266 "parser.y" +#line 267 "parser.y" { assert(yychar == YYEMPTY); if (!do_import(yyvsp[-1].str)) yychar = aEOF; ; break;} case 29: -#line 269 "parser.y" +#line 270 "parser.y" {; break;} case 30: -#line 272 "parser.y" +#line 273 "parser.y" { yyval.str = yyvsp[0].str; ; break;} case 31: -#line 274 "parser.y" +#line 275 "parser.y" { start_typelib(yyvsp[-1].str, yyvsp[-2].attr); ; break;} case 32: -#line 276 "parser.y" +#line 277 "parser.y" { end_typelib(); ; break;} case 33: -#line 279 "parser.y" +#line 280 "parser.y" { yyval.var = NULL; ; break;} case 35: -#line 283 "parser.y" +#line 284 "parser.y" { yyval.var = NULL; ; break;} case 37: -#line 287 "parser.y" +#line 288 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; ; break;} case 39: -#line 292 "parser.y" +#line 293 "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 296 "parser.y" +#line 297 "parser.y" { yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); ; break;} case 41: -#line 299 "parser.y" +#line 300 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1554,7 +1556,7 @@ case 41: ; break;} case 42: -#line 305 "parser.y" +#line 306 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1562,299 +1564,299 @@ case 42: ; break;} case 43: -#line 312 "parser.y" +#line 313 "parser.y" { yyval.expr = NULL; ; break;} case 44: -#line 313 "parser.y" +#line 314 "parser.y" { yyval.expr = yyvsp[-1].expr; ; break;} case 45: -#line 314 "parser.y" +#line 315 "parser.y" { yyval.expr = make_expr(EXPR_VOID); ; break;} case 47: -#line 318 "parser.y" +#line 319 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 48: -#line 319 "parser.y" +#line 320 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-3].expr); yyval.expr = yyvsp[0].expr; ; break;} case 49: -#line 322 "parser.y" +#line 323 "parser.y" { yyval.attr = NULL; ; break;} case 51: -#line 327 "parser.y" +#line 328 "parser.y" { yyval.attr = yyvsp[-1].attr; ; break;} case 53: -#line 331 "parser.y" +#line 332 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-2].attr); yyval.attr = yyvsp[0].attr; ; break;} case 54: -#line 332 "parser.y" +#line 333 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-3].attr); yyval.attr = yyvsp[0].attr; ; break;} case 55: -#line 336 "parser.y" +#line 337 "parser.y" { yyval.attr = make_attr(ATTR_ASYNC); ; break;} case 56: -#line 337 "parser.y" +#line 338 "parser.y" { yyval.attr = make_attr(ATTR_AUTO_HANDLE); ; break;} case 57: -#line 338 "parser.y" +#line 339 "parser.y" { yyval.attr = make_attrp(ATTR_CALLAS, yyvsp[-1].var); ; break;} case 58: -#line 339 "parser.y" +#line 340 "parser.y" { yyval.attr = make_attrp(ATTR_CASE, yyvsp[-1].expr); ; break;} case 59: -#line 340 "parser.y" +#line 341 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); ; break;} case 60: -#line 341 "parser.y" +#line 342 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ ; break;} case 61: -#line 342 "parser.y" +#line 343 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ ; break;} case 62: -#line 343 "parser.y" +#line 344 "parser.y" { yyval.attr = make_attr(ATTR_CONTROL); ; break;} case 63: -#line 344 "parser.y" +#line 345 "parser.y" { yyval.attr = make_attr(ATTR_DEFAULT); ; break;} case 64: -#line 345 "parser.y" +#line 346 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_EXPR, yyvsp[-1].expr); ; break;} case 65: -#line 346 "parser.y" +#line 347 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_STRING, yyvsp[-1].str); ; break;} case 66: -#line 347 "parser.y" +#line 348 "parser.y" { yyval.attr = make_attrp(ATTR_DLLNAME, yyvsp[-1].str); ; break;} case 67: -#line 348 "parser.y" +#line 349 "parser.y" { yyval.attr = make_attr(ATTR_DUAL); ; break;} case 68: -#line 349 "parser.y" +#line 350 "parser.y" { yyval.attr = make_attrp(ATTR_ENDPOINT, yyvsp[-1].str); ; break;} case 69: -#line 350 "parser.y" +#line 351 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_STRING, yyvsp[-1].str); ; break;} case 70: -#line 351 "parser.y" +#line 352 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_ORDINAL, yyvsp[-1].expr); ; break;} case 71: -#line 352 "parser.y" +#line 353 "parser.y" { yyval.attr = make_attr(ATTR_EXPLICIT_HANDLE); ; break;} case 72: -#line 353 "parser.y" +#line 354 "parser.y" { yyval.attr = make_attr(ATTR_HANDLE); ; break;} case 73: -#line 354 "parser.y" +#line 355 "parser.y" { yyval.attr = make_attrp(ATTR_HELPCONTEXT, yyvsp[-1].expr); ; break;} case 74: -#line 355 "parser.y" +#line 356 "parser.y" { yyval.attr = make_attrp(ATTR_HELPFILE, yyvsp[-1].str); ; break;} case 75: -#line 356 "parser.y" +#line 357 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRING, yyvsp[-1].str); ; break;} case 76: -#line 357 "parser.y" +#line 358 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRINGCONTEXT, yyvsp[-1].expr); ; break;} case 77: -#line 358 "parser.y" +#line 359 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRINGDLL, yyvsp[-1].str); ; break;} case 78: -#line 359 "parser.y" +#line 360 "parser.y" { yyval.attr = make_attr(ATTR_HIDDEN); ; break;} case 79: -#line 360 "parser.y" +#line 361 "parser.y" { yyval.attr = make_attrp(ATTR_ID, yyvsp[-1].expr); ; break;} case 80: -#line 361 "parser.y" +#line 362 "parser.y" { yyval.attr = make_attr(ATTR_IDEMPOTENT); ; break;} case 81: -#line 362 "parser.y" +#line 363 "parser.y" { yyval.attr = make_attrp(ATTR_IIDIS, yyvsp[-1].var); ; break;} case 82: -#line 363 "parser.y" +#line 364 "parser.y" { yyval.attr = make_attrp(ATTR_IMPLICIT_HANDLE, yyvsp[-1].str); ; break;} case 83: -#line 364 "parser.y" +#line 365 "parser.y" { yyval.attr = make_attr(ATTR_IN); ; break;} case 84: -#line 365 "parser.y" +#line 366 "parser.y" { yyval.attr = make_attr(ATTR_INPUTSYNC); ; break;} case 85: -#line 366 "parser.y" +#line 367 "parser.y" { yyval.attr = make_attrp(ATTR_LENGTHIS, yyvsp[-1].expr); ; break;} case 86: -#line 367 "parser.y" +#line 368 "parser.y" { yyval.attr = make_attr(ATTR_LOCAL); ; break;} case 87: -#line 368 "parser.y" +#line 369 "parser.y" { yyval.attr = make_attr(ATTR_NONCREATABLE); ; break;} case 88: -#line 369 "parser.y" +#line 370 "parser.y" { yyval.attr = make_attr(ATTR_OBJECT); ; break;} case 89: -#line 370 "parser.y" +#line 371 "parser.y" { yyval.attr = make_attr(ATTR_ODL); ; break;} case 90: -#line 371 "parser.y" +#line 372 "parser.y" { yyval.attr = make_attr(ATTR_OLEAUTOMATION); ; break;} case 91: -#line 372 "parser.y" +#line 373 "parser.y" { yyval.attr = make_attr(ATTR_OPTIONAL); ; break;} case 92: -#line 373 "parser.y" +#line 374 "parser.y" { yyval.attr = make_attr(ATTR_OUT); ; break;} case 93: -#line 374 "parser.y" +#line 375 "parser.y" { yyval.attr = make_attrv(ATTR_POINTERDEFAULT, yyvsp[-1].num); ; break;} case 94: -#line 375 "parser.y" +#line 376 "parser.y" { yyval.attr = make_attr(ATTR_PROPGET); ; break;} case 95: -#line 376 "parser.y" +#line 377 "parser.y" { yyval.attr = make_attr(ATTR_PROPPUT); ; break;} case 96: -#line 377 "parser.y" +#line 378 "parser.y" { yyval.attr = make_attr(ATTR_PROPPUTREF); ; break;} case 97: -#line 378 "parser.y" +#line 379 "parser.y" { yyval.attr = make_attr(ATTR_PUBLIC); ; break;} case 98: -#line 379 "parser.y" +#line 380 "parser.y" { yyval.attr = make_attr(ATTR_READONLY); ; break;} case 99: -#line 380 "parser.y" +#line 381 "parser.y" { yyval.attr = make_attr(ATTR_RESTRICTED); ; break;} case 100: -#line 381 "parser.y" +#line 382 "parser.y" { yyval.attr = make_attr(ATTR_RETVAL); ; break;} case 101: -#line 382 "parser.y" +#line 383 "parser.y" { yyval.attr = make_attrp(ATTR_SIZEIS, yyvsp[-1].expr); ; break;} case 102: -#line 383 "parser.y" +#line 384 "parser.y" { yyval.attr = make_attr(ATTR_SOURCE); ; break;} case 103: -#line 384 "parser.y" +#line 385 "parser.y" { yyval.attr = make_attr(ATTR_STRING); ; break;} case 104: -#line 385 "parser.y" +#line 386 "parser.y" { yyval.attr = make_attrp(ATTR_SWITCHIS, yyvsp[-1].expr); ; break;} case 105: -#line 386 "parser.y" +#line 387 "parser.y" { yyval.attr = make_attrp(ATTR_SWITCHTYPE, type_ref(yyvsp[-1].tref)); ; break;} case 106: -#line 387 "parser.y" +#line 388 "parser.y" { yyval.attr = make_attrp(ATTR_TRANSMITAS, type_ref(yyvsp[-1].tref)); ; break;} case 107: -#line 388 "parser.y" +#line 389 "parser.y" { yyval.attr = make_attrp(ATTR_UUID, yyvsp[-1].uuid); ; break;} case 108: -#line 389 "parser.y" +#line 390 "parser.y" { yyval.attr = make_attr(ATTR_V1ENUM); ; break;} case 109: -#line 390 "parser.y" +#line 391 "parser.y" { yyval.attr = make_attr(ATTR_VARARG); ; break;} case 110: -#line 391 "parser.y" +#line 392 "parser.y" { yyval.attr = make_attrv(ATTR_VERSION, yyvsp[-1].num); ; break;} case 111: -#line 392 "parser.y" +#line 393 "parser.y" { yyval.attr = make_attrp(ATTR_WIREMARSHAL, type_ref(yyvsp[-1].tref)); ; break;} case 112: -#line 393 "parser.y" +#line 394 "parser.y" { yyval.attr = make_attrv(ATTR_POINTERTYPE, yyvsp[0].num); ; break;} case 115: -#line 400 "parser.y" +#line 401 "parser.y" { yyval.var = NULL; ; break;} case 116: -#line 401 "parser.y" +#line 402 "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 406 "parser.y" +#line 407 "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 410 "parser.y" +#line 411 "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 416 "parser.y" +#line 417 "parser.y" { yyval.var = reg_const(yyvsp[-2].var); set_type(yyval.var, yyvsp[-3].tref, NULL); yyval.var->eval = yyvsp[0].expr; @@ -1862,22 +1864,22 @@ case 119: ; break;} case 120: -#line 423 "parser.y" +#line 424 "parser.y" { yyval.var = NULL; ; break;} case 121: -#line 424 "parser.y" +#line 425 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} case 124: -#line 429 "parser.y" +#line 430 "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 435 "parser.y" +#line 436 "parser.y" { yyval.var = reg_const(yyvsp[-2].var); yyval.var->eval = yyvsp[0].expr; yyval.var->lval = yyvsp[0].expr->cval; @@ -1885,14 +1887,14 @@ case 125: ; break;} case 126: -#line 440 "parser.y" +#line 441 "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 446 "parser.y" +#line 447 "parser.y" { yyval.type = get_typev(RPC_FC_ENUM16, yyvsp[-3].var, tsENUM); yyval.type->fields = yyvsp[-1].var; yyval.type->defined = TRUE; @@ -1901,134 +1903,134 @@ case 127: ; break;} case 129: -#line 455 "parser.y" +#line 456 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 130: -#line 468 "parser.y" +#line 469 "parser.y" { yyval.expr = make_expr(EXPR_VOID); ; break;} case 132: -#line 472 "parser.y" +#line 473 "parser.y" { yyval.expr = make_exprl(EXPR_NUM, yyvsp[0].num); ; break;} case 133: -#line 473 "parser.y" +#line 474 "parser.y" { yyval.expr = make_exprl(EXPR_HEXNUM, yyvsp[0].num); ; break;} case 134: -#line 474 "parser.y" +#line 475 "parser.y" { yyval.expr = make_exprs(EXPR_IDENTIFIER, yyvsp[0].str); ; break;} case 135: -#line 475 "parser.y" +#line 476 "parser.y" { yyval.expr = make_expr3(EXPR_COND, yyvsp[-4].expr, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 136: -#line 476 "parser.y" +#line 477 "parser.y" { yyval.expr = make_expr2(EXPR_OR , yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 137: -#line 477 "parser.y" +#line 478 "parser.y" { yyval.expr = make_expr2(EXPR_AND, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 138: -#line 478 "parser.y" +#line 479 "parser.y" { yyval.expr = make_expr2(EXPR_ADD, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 139: -#line 479 "parser.y" +#line 480 "parser.y" { yyval.expr = make_expr2(EXPR_SUB, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 140: -#line 480 "parser.y" +#line 481 "parser.y" { yyval.expr = make_expr2(EXPR_MUL, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 141: -#line 481 "parser.y" +#line 482 "parser.y" { yyval.expr = make_expr2(EXPR_DIV, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 142: -#line 482 "parser.y" +#line 483 "parser.y" { yyval.expr = make_expr2(EXPR_SHL, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 143: -#line 483 "parser.y" +#line 484 "parser.y" { yyval.expr = make_expr2(EXPR_SHR, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 144: -#line 484 "parser.y" +#line 485 "parser.y" { yyval.expr = make_expr1(EXPR_NOT, yyvsp[0].expr); ; break;} case 145: -#line 485 "parser.y" +#line 486 "parser.y" { yyval.expr = make_expr1(EXPR_NEG, yyvsp[0].expr); ; break;} case 146: -#line 486 "parser.y" +#line 487 "parser.y" { yyval.expr = make_expr1(EXPR_PPTR, yyvsp[0].expr); ; break;} case 147: -#line 487 "parser.y" +#line 488 "parser.y" { yyval.expr = make_exprt(EXPR_CAST, yyvsp[-2].tref, yyvsp[0].expr); ; break;} case 148: -#line 488 "parser.y" +#line 489 "parser.y" { yyval.expr = make_exprt(EXPR_SIZEOF, yyvsp[-1].tref, NULL); ; break;} case 149: -#line 489 "parser.y" +#line 490 "parser.y" { yyval.expr = yyvsp[-1].expr; ; break;} case 151: -#line 493 "parser.y" +#line 494 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 152: -#line 496 "parser.y" +#line 497 "parser.y" { yyval.expr = yyvsp[0].expr; if (!yyval.expr->is_const) yyerror("expression is not constant\n"); ; break;} case 153: -#line 502 "parser.y" +#line 503 "parser.y" { yyval.var = yyvsp[0].var; set_type(yyval.var, yyvsp[-1].tref, NULL); ; break;} case 154: -#line 507 "parser.y" +#line 508 "parser.y" { yyval.var = NULL; ; break;} case 155: -#line 508 "parser.y" +#line 509 "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 513 "parser.y" +#line 514 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} case 157: -#line 514 "parser.y" +#line 515 "parser.y" { yyval.var = make_var(NULL); yyval.var->type = yyvsp[-1].type; yyval.var->attrs = yyvsp[-2].attr; ; break;} case 158: -#line 515 "parser.y" +#line 516 "parser.y" { yyval.var = make_var(NULL); yyval.var->attrs = yyvsp[-1].attr; ; break;} case 159: -#line 516 "parser.y" +#line 517 "parser.y" { yyval.var = NULL; ; break;} case 160: -#line 519 "parser.y" +#line 520 "parser.y" { yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); yyval.var->attrs = yyvsp[-3].attr; ; break;} case 161: -#line 524 "parser.y" +#line 525 "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); @@ -2038,58 +2040,58 @@ case 161: ; break;} case 162: -#line 533 "parser.y" +#line 534 "parser.y" { yyval.var = NULL; ; break;} case 164: -#line 537 "parser.y" +#line 538 "parser.y" { yyval.var = NULL; ; break;} case 165: -#line 538 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; - break;} -case 166: #line 539 "parser.y" +{ yyval.var = make_var(yyvsp[0].str); ; + break;} +case 166: +#line 540 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 167: -#line 542 "parser.y" +#line 543 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 168: -#line 544 "parser.y" -{ yyval.var = make_var(yyvsp[0].str); ; - break;} -case 169: #line 545 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} -case 170: +case 169: #line 546 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} -case 171: +case 170: #line 547 "parser.y" +{ yyval.var = make_var(yyvsp[0].str); ; + break;} +case 171: +#line 548 "parser.y" { yyval.var = make_var(yyvsp[0].str); ; break;} case 172: -#line 550 "parser.y" +#line 551 "parser.y" { yyval.type = make_type(RPC_FC_BYTE, NULL); ; break;} case 173: -#line 551 "parser.y" +#line 552 "parser.y" { yyval.type = make_type(RPC_FC_WCHAR, NULL); ; break;} case 175: -#line 553 "parser.y" +#line 554 "parser.y" { yyval.type = yyvsp[0].type; yyval.type->sign = 1; ; break;} case 176: -#line 554 "parser.y" +#line 555 "parser.y" { yyval.type = yyvsp[0].type; yyval.type->sign = -1; switch (yyval.type->type) { - case RPC_FC_CHAR: yyval.type->type = RPC_FC_BYTE; yyval.type->sign = 0; break; + case RPC_FC_CHAR: break; case RPC_FC_SMALL: yyval.type->type = RPC_FC_USMALL; break; case RPC_FC_SHORT: yyval.type->type = RPC_FC_USHORT; break; case RPC_FC_LONG: yyval.type->type = RPC_FC_ULONG; break; @@ -2101,92 +2103,96 @@ case 176: ; break;} case 177: -#line 566 "parser.y" +#line 567 "parser.y" { yyval.type = make_type(RPC_FC_FLOAT, NULL); ; break;} case 178: -#line 567 "parser.y" +#line 568 "parser.y" { yyval.type = make_type(RPC_FC_DOUBLE, NULL); ; break;} case 179: -#line 568 "parser.y" -{ yyval.type = make_type(RPC_FC_BYTE, &std_bool); /* ? */ ; +#line 569 "parser.y" +{ yyval.type = make_type(RPC_FC_SMALL, &std_bool); ; break;} case 180: -#line 569 "parser.y" +#line 570 "parser.y" { yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); ; break;} case 181: -#line 570 "parser.y" -{ yyval.type = make_type(RPC_FC_BIND_PRIMITIVE, NULL); /* ? */ ; +#line 571 "parser.y" +{ yyval.type = make_type(RPC_FC_IGNORE, NULL); ; break;} case 184: -#line 577 "parser.y" +#line 578 "parser.y" { yyval.type = make_type(RPC_FC_LONG, &std_int); ; break;} case 185: -#line 578 "parser.y" -{ yyval.type = make_type(RPC_FC_SHORT, NULL); ; +#line 579 "parser.y" +{ yyval.type = make_type(RPC_FC_SMALL, NULL); ; break;} case 186: -#line 579 "parser.y" -{ yyval.type = make_type(RPC_FC_LONG, NULL); ; +#line 580 "parser.y" +{ yyval.type = make_type(RPC_FC_SHORT, NULL); ; break;} case 187: -#line 580 "parser.y" -{ yyval.type = make_type(RPC_FC_HYPER, NULL); ; +#line 581 "parser.y" +{ yyval.type = make_type(RPC_FC_LONG, NULL); ; break;} case 188: -#line 581 "parser.y" -{ yyval.type = make_type(RPC_FC_HYPER, &std_int64); ; +#line 582 "parser.y" +{ yyval.type = make_type(RPC_FC_HYPER, NULL); ; break;} case 189: -#line 582 "parser.y" -{ yyval.type = make_type(RPC_FC_CHAR, NULL); ; +#line 583 "parser.y" +{ yyval.type = make_type(RPC_FC_HYPER, &std_int64); ; break;} case 190: -#line 585 "parser.y" -{ yyval.clas = make_class(yyvsp[0].str); ; +#line 584 "parser.y" +{ yyval.type = make_type(RPC_FC_CHAR, NULL); ; break;} case 191: -#line 586 "parser.y" +#line 587 "parser.y" { yyval.clas = make_class(yyvsp[0].str); ; break;} case 192: -#line 589 "parser.y" +#line 588 "parser.y" +{ yyval.clas = make_class(yyvsp[0].str); ; + break;} +case 193: +#line 591 "parser.y" { yyval.clas = yyvsp[0].clas; yyval.clas->attrs = yyvsp[-1].attr; if (!parse_only && do_header) write_coclass(yyval.clas); ; break;} -case 193: -#line 595 "parser.y" +case 194: +#line 597 "parser.y" { yyval.clas = yyvsp[-3].clas; yyval.clas->ifaces = yyvsp[-1].ifref; ; break;} -case 194: -#line 600 "parser.y" +case 195: +#line 602 "parser.y" { yyval.ifref = NULL; ; break;} -case 195: -#line 601 "parser.y" +case 196: +#line 603 "parser.y" { LINK(yyvsp[0].ifref, yyvsp[-1].ifref); yyval.ifref = yyvsp[0].ifref; ; break;} -case 196: -#line 605 "parser.y" +case 197: +#line 607 "parser.y" { yyval.ifref = make_ifref(yyvsp[0].type); yyval.ifref->attrs = yyvsp[-1].attr; ; break;} -case 197: -#line 608 "parser.y" -{ yyval.type = get_type(0, yyvsp[0].str, 0); ; - break;} case 198: -#line 609 "parser.y" +#line 610 "parser.y" { yyval.type = get_type(0, yyvsp[0].str, 0); ; break;} case 199: -#line 612 "parser.y" +#line 611 "parser.y" +{ yyval.type = get_type(0, yyvsp[0].str, 0); ; + break;} +case 200: +#line 614 "parser.y" { yyval.type = yyvsp[0].type; if (yyval.type->defined) yyerror("multiple definition error\n"); yyval.type->attrs = yyvsp[-1].attr; @@ -2198,48 +2204,48 @@ case 199: if (!parse_only && do_header) write_forward(yyval.type); ; break;} -case 200: -#line 624 "parser.y" +case 201: +#line 626 "parser.y" { yyval.var = NULL; ; break;} -case 201: -#line 625 "parser.y" +case 202: +#line 627 "parser.y" { LINK(yyvsp[-1].var, yyvsp[-2].var); yyval.var = yyvsp[-1].var; ; break;} -case 202: -#line 628 "parser.y" +case 203: +#line 630 "parser.y" { yyval.func = NULL; ; break;} -case 203: -#line 629 "parser.y" +case 204: +#line 631 "parser.y" { LINK(yyvsp[-1].func, yyvsp[-2].func); yyval.func = yyvsp[-1].func; ; break;} -case 204: -#line 635 "parser.y" +case 205: +#line 637 "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 205: -#line 647 "parser.y" +case 206: +#line 649 "parser.y" { yyval.type = NULL; ; break;} -case 206: -#line 648 "parser.y" +case 207: +#line 650 "parser.y" { yyval.type = find_type2(yyvsp[0].str, 0); ; break;} -case 207: -#line 651 "parser.y" -{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; - break;} case 208: -#line 652 "parser.y" +#line 653 "parser.y" { yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; break;} case 209: -#line 655 "parser.y" +#line 654 "parser.y" +{ yyval.type = get_type(RPC_FC_IP, yyvsp[0].str, 0); ; + break;} +case 210: +#line 657 "parser.y" { yyval.type = yyvsp[0].type; if (yyval.type->defined) yyerror("multiple definition error\n"); yyval.type->attrs = yyvsp[-1].attr; @@ -2247,16 +2253,16 @@ case 209: if (!parse_only && do_header) write_forward(yyval.type); ; break;} -case 210: -#line 664 "parser.y" +case 211: +#line 666 "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 211: -#line 672 "parser.y" +case 212: +#line 674 "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); @@ -2264,65 +2270,65 @@ case 211: if (!parse_only && do_header) write_interface(yyval.type); ; break;} -case 212: -#line 678 "parser.y" +case 213: +#line 680 "parser.y" { yyval.type = yyvsp[0].type; ; break;} -case 213: -#line 682 "parser.y" -{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; - break;} case 214: -#line 683 "parser.y" +#line 684 "parser.y" { yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; break;} case 215: -#line 686 "parser.y" -{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; +#line 685 "parser.y" +{ yyval.type = yyvsp[-1].type; if (!parse_only && do_header) write_forward(yyval.type); ; break;} case 216: -#line 687 "parser.y" +#line 688 "parser.y" { yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; break;} case 217: -#line 690 "parser.y" +#line 689 "parser.y" +{ yyval.type = make_type(0, NULL); yyval.type->name = yyvsp[0].str; ; + break;} +case 218: +#line 692 "parser.y" { yyval.type = yyvsp[0].type; yyval.type->attrs = yyvsp[-1].attr; ; break;} -case 218: -#line 695 "parser.y" +case 219: +#line 697 "parser.y" { yyval.type = yyvsp[-3].type; yyval.type->funcs = yyvsp[-1].func; /* FIXME: if (!parse_only && do_header) write_module($$); */ ; break;} -case 219: -#line 701 "parser.y" +case 220: +#line 703 "parser.y" { yyval.var = yyvsp[0].var; yyval.var->ptr_level++; ; break;} -case 220: -#line 702 "parser.y" +case 221: +#line 704 "parser.y" { yyval.var = yyvsp[0].var; /* FIXME */ ; break;} -case 223: -#line 707 "parser.y" +case 224: +#line 709 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} -case 225: -#line 712 "parser.y" +case 226: +#line 714 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; ; break;} -case 226: -#line 716 "parser.y" +case 227: +#line 718 "parser.y" { yyval.num = RPC_FC_RP; ; break;} -case 227: -#line 717 "parser.y" +case 228: +#line 719 "parser.y" { yyval.num = RPC_FC_UP; ; break;} -case 228: -#line 720 "parser.y" +case 229: +#line 722 "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 ); @@ -2332,48 +2338,48 @@ case 228: add_struct(yyval.type); ; break;} -case 229: -#line 730 "parser.y" +case 230: +#line 732 "parser.y" { yyval.tref = make_tref(NULL, make_type(0, NULL)); ; break;} -case 230: -#line 731 "parser.y" +case 231: +#line 733 "parser.y" { yyval.tref = make_tref(yyvsp[0].str, find_type(yyvsp[0].str, 0)); ; break;} -case 231: -#line 732 "parser.y" -{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; - break;} case 232: -#line 733 "parser.y" -{ yyval.tref = uniq_tref(yyvsp[0].tref); yyval.tref->ref->is_const = TRUE; ; - break;} -case 233: #line 734 "parser.y" { yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} -case 234: +case 233: #line 735 "parser.y" -{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsENUM)); ; +{ yyval.tref = uniq_tref(yyvsp[0].tref); yyval.tref->ref->is_const = TRUE; ; break;} -case 235: +case 234: #line 736 "parser.y" { yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} -case 236: +case 235: #line 737 "parser.y" -{ yyval.tref = make_tref(NULL, get_type(RPC_FC_STRUCT, yyvsp[0].str, tsSTRUCT)); ; +{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsENUM)); ; break;} -case 237: +case 236: #line 738 "parser.y" { yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} -case 238: +case 237: #line 739 "parser.y" -{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsUNION)); ; +{ yyval.tref = make_tref(NULL, get_type(RPC_FC_STRUCT, yyvsp[0].str, tsSTRUCT)); ; + break;} +case 238: +#line 740 "parser.y" +{ yyval.tref = make_tref(NULL, yyvsp[0].type); ; break;} case 239: -#line 742 "parser.y" +#line 741 "parser.y" +{ yyval.tref = make_tref(NULL, find_type2(yyvsp[0].str, tsUNION)); ; + break;} +case 240: +#line 744 "parser.y" { typeref_t *tref = uniq_tref(yyvsp[-1].tref); yyvsp[0].var->tname = tref->name; tref->name = NULL; @@ -2385,15 +2391,15 @@ case 239: reg_types(yyval.type, yyvsp[0].var, 0); ; break;} -case 240: -#line 754 "parser.y" +case 241: +#line 756 "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 241: -#line 760 "parser.y" +case 242: +#line 762 "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"); @@ -2404,12 +2410,12 @@ case 241: yyval.type->defined = TRUE; ; break;} -case 242: -#line 772 "parser.y" +case 243: +#line 774 "parser.y" { yyval.num = MAKELONG(yyvsp[0].num, 0); ; break;} -case 243: -#line 773 "parser.y" +case 244: +#line 775 "parser.y" { yyval.num = MAKELONG(yyvsp[-2].num, yyvsp[0].num); ; break;} } @@ -2634,7 +2640,7 @@ yyerrhandle: } return 1; } -#line 776 "parser.y" +#line 778 "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 72763e4f937..4ae1eb30003 100644 --- a/reactos/tools/widl/y.tab.h +++ b/reactos/tools/widl/y.tab.h @@ -107,30 +107,31 @@ typedef union { #define tSIGNED 350 #define tSIZEIS 351 #define tSIZEOF 352 -#define tSOURCE 353 -#define tSTDCALL 354 -#define tSTRING 355 -#define tSTRUCT 356 -#define tSWITCH 357 -#define tSWITCHIS 358 -#define tSWITCHTYPE 359 -#define tTRANSMITAS 360 -#define tTYPEDEF 361 -#define tUNION 362 -#define tUNIQUE 363 -#define tUNSIGNED 364 -#define tUUID 365 -#define tV1ENUM 366 -#define tVARARG 367 -#define tVERSION 368 -#define tVOID 369 -#define tWCHAR 370 -#define tWIREMARSHAL 371 -#define tPOINTERTYPE 372 -#define COND 373 -#define CAST 374 -#define PPTR 375 -#define NEG 376 +#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 extern YYSTYPE yylval;