6 Jul
2005
6 Jul
'05
10:16 p.m.
Sync to Wine-20050628:
Robert Shearman <rob(a)codeweavers.com>
- Add more struct types for TLB generation.
Stefan Huehner <stefan(a)huehner.org>
- Fix some -Wmissing-declarations by making functions static.
Huw Davies <huw(a)codeweavers.com>
- Add comments describing the first DWORD in an import table entry.
Alexandre Julliard <julliard(a)winehq.org>
- Workaround to allow using the async keyword as method name.
Modified: trunk/reactos/tools/widl/header.c
Modified: trunk/reactos/tools/widl/parser.y
Modified: trunk/reactos/tools/widl/proxy.c
Modified: trunk/reactos/tools/widl/typelib.c
Modified: trunk/reactos/tools/widl/typelib_struct.h
Modified: trunk/reactos/tools/widl/write_msft.c
Modified: trunk/reactos/tools/widl/y.tab.c
_____
Modified: trunk/reactos/tools/widl/header.c
--- trunk/reactos/tools/widl/header.c 2005-07-06 21:40:07 UTC (rev
16469)
+++ trunk/reactos/tools/widl/header.c 2005-07-06 22:16:28 UTC (rev
16470)
@@ -748,7 +748,7 @@
}
}
-void write_guid(const char *guid_prefix, const char *name, UUID *uuid)
+static void write_guid(const char *guid_prefix, const char *name, UUID
*uuid)
{
if (!uuid) return;
fprintf(header, "DEFINE_GUID(%s_%s, 0x%08lx, 0x%04x, 0x%04x,
0x%02x,0x%02x, 0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x);\n",
@@ -756,25 +756,25 @@
uuid->Data4[2], uuid->Data4[3], uuid->Data4[4],
uuid->Data4[5], uuid->Data4[6], uuid->Data4[7]);
}
-void write_iface_guid(type_t *iface)
+static void write_iface_guid(type_t *iface)
{
UUID *uuid = get_attrp(iface->attrs, ATTR_UUID);
write_guid("IID", iface->name, uuid);
}
-void write_dispiface_guid(type_t *iface)
+static void write_dispiface_guid(type_t *iface)
{
UUID *uuid = get_attrp(iface->attrs, ATTR_UUID);
write_guid("DIID", iface->name, uuid);
}
-void write_coclass_guid(class_t *cocl)
+static void write_coclass_guid(class_t *cocl)
{
UUID *uuid = get_attrp(cocl->attrs, ATTR_UUID);
write_guid("CLSID", cocl->name, uuid);
}
-void write_com_interface(type_t *iface)
+static void write_com_interface(type_t *iface)
{
if (!iface->funcs && !iface->ref) {
yywarning("%s has no methods", iface->name);
@@ -836,7 +836,7 @@
fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n",
iface->name);
}
-void write_rpc_interface(type_t *iface)
+static void write_rpc_interface(type_t *iface)
{
unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION);
char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE);
_____
Modified: trunk/reactos/tools/widl/parser.y
--- trunk/reactos/tools/widl/parser.y 2005-07-06 21:40:07 UTC (rev
16469)
+++ trunk/reactos/tools/widl/parser.y 2005-07-06 22:16:28 UTC (rev
16470)
@@ -545,6 +545,7 @@
ident: aIDENTIFIER { $$ = make_var($1); }
/* some "reserved words" used in attributes are also used as field
names in some MS IDL files */
| aKNOWNTYPE { $$ =
make_var($<str>1); }
+ | tASYNC { $$ =
make_var($<str>1); }
| tID { $$ =
make_var($<str>1); }
| tRETVAL { $$ =
make_var($<str>1); }
| tVERSION { $$ =
make_var($<str>1); }
_____
Modified: trunk/reactos/tools/widl/proxy.c
--- trunk/reactos/tools/widl/proxy.c 2005-07-06 21:40:07 UTC (rev
16469)
+++ trunk/reactos/tools/widl/proxy.c 2005-07-06 22:16:28 UTC (rev
16470)
@@ -141,7 +141,7 @@
print_proxy( "\n");
}
-static void init_proxy()
+static void init_proxy(void)
{
if (proxy) return;
if(!(proxy = fopen(proxy_name, "w")))
_____
Modified: trunk/reactos/tools/widl/typelib.c
--- trunk/reactos/tools/widl/typelib.c 2005-07-06 21:40:07 UTC (rev
16469)
+++ trunk/reactos/tools/widl/typelib.c 2005-07-06 22:16:28 UTC (rev
16470)
@@ -148,13 +148,18 @@
case RPC_FC_ENUM16:
case RPC_FC_STRUCT:
case RPC_FC_PSTRUCT:
+ case RPC_FC_CSTRUCT:
+ case RPC_FC_CPSTRUCT:
+ case RPC_FC_CVSTRUCT:
+ case RPC_FC_BOGUS_STRUCT:
+
return VT_USERDEFINED;
case 0:
if(t->attrs)
return VT_USERDEFINED;
return 0;
default:
- error("get_type_vt: unknown-type: %d\n", t->type);
+ error("get_type_vt: unknown type: 0x%02x\n", t->type);
}
return 0;
}
_____
Modified: trunk/reactos/tools/widl/typelib_struct.h
--- trunk/reactos/tools/widl/typelib_struct.h 2005-07-06 21:40:07 UTC
(rev 16469)
+++ trunk/reactos/tools/widl/typelib_struct.h 2005-07-06 22:16:28 UTC
(rev 16470)
@@ -157,9 +157,12 @@
/* layout of an entry with information on imported types */
typedef struct tagMSFT_ImpInfo {
- INT res0; /* unknown */
- INT oImpFile; /* offset inthe Import File table */
- INT oGuid; /* offset in Guid table */
+ INT res0; /* bits 0 - 15: count */
+ /* bit 16: if set oGuid is an offset
to Guid */
+ /* if clear oGuid is a
typeinfo index in the specified typelib */
+ /* bits 24 - 31: TKIND of reference */
+ INT oImpFile; /* offset in the Import File table */
+ INT oGuid; /* offset in Guid table or typeinfo index
(see bit 16 of res0) */
} MSFT_ImpInfo;
/* function description data */
_____
Modified: trunk/reactos/tools/widl/write_msft.c
--- trunk/reactos/tools/widl/write_msft.c 2005-07-06 21:40:07 UTC
(rev 16469)
+++ trunk/reactos/tools/widl/write_msft.c 2005-07-06 22:16:28 UTC
(rev 16470)
@@ -875,6 +875,11 @@
chat("encode_type: trying to ref not added type\n");
switch(type->type) {
case RPC_FC_STRUCT:
+ case RPC_FC_PSTRUCT:
+ case RPC_FC_CSTRUCT:
+ case RPC_FC_CPSTRUCT:
+ case RPC_FC_CVSTRUCT:
+ case RPC_FC_BOGUS_STRUCT:
add_structure_typeinfo(typelib, type);
break;
case RPC_FC_IP:
_____
Modified: trunk/reactos/tools/widl/y.tab.c
--- trunk/reactos/tools/widl/y.tab.c 2005-07-06 21:40:07 UTC (rev
16469)
+++ trunk/reactos/tools/widl/y.tab.c 2005-07-06 22:16:28 UTC (rev
16470)
@@ -257,7 +257,7 @@
-#define YYFINAL 463
+#define YYFINAL 464
#define YYFLAG -32768
#define YYNTBASE 145
@@ -327,14 +327,15 @@
435, 439, 443, 447, 451, 455, 459, 463, 466,
469,
472, 477, 482, 486, 488, 492, 494, 499, 500,
503,
506, 510, 513, 515, 520, 528, 529, 531, 532,
534,
- 536, 538, 540, 542, 544, 546, 548, 550, 552,
555,
- 558, 560, 562, 564, 566, 568, 570, 572, 573,
575,
- 577, 580, 583, 586, 589, 591, 593, 596, 599,
602,
- 607, 608, 611, 614, 617, 620, 623, 626, 630,
633,
- 637, 643, 644, 647, 650, 653, 656, 662, 670,
672,
- 675, 678, 681, 684, 687, 692, 695, 698, 700,
702,
- 706, 708, 712, 714, 716, 722, 724, 726, 728,
731,
- 733, 736, 738, 741, 743, 746, 751, 757, 768, 770
+ 536, 538, 540, 542, 544, 546, 548, 550, 552,
554,
+ 557, 560, 562, 564, 566, 568, 570, 572, 574,
575,
+ 577, 579, 582, 585, 588, 591, 593, 595, 598,
601,
+ 604, 609, 610, 613, 616, 619, 622, 625, 628,
632,
+ 635, 639, 645, 646, 649, 652, 655, 658, 664,
672,
+ 674, 677, 680, 683, 686, 689, 694, 697, 700,
702,
+ 704, 708, 710, 714, 716, 718, 724, 726, 728,
730,
+ 733, 735, 738, 740, 743, 745, 748, 753, 759,
770,
+ 772
};
static const short yyrhs[] =
{
@@ -392,30 +393,30 @@
163, 134, 0, 134, 0, 162, 213, 209, 160,
0,
162, 213, 166, 209, 135, 156, 136, 0, 0,
186,
0, 0, 3, 0, 4, 0, 3, 0, 4,
0,
- 60, 0, 95, 0, 117, 0, 22, 0, 119,
0,
- 189, 0, 97, 189, 0, 113, 189, 0, 113,
0,
- 50, 0, 98, 0, 42, 0, 20, 0, 47,
0,
- 52, 0, 0, 70, 0, 70, 0, 101, 188,
0,
- 96, 188, 0, 76, 188, 0, 59, 188, 0,
71,
- 0, 28, 0, 29, 3, 0, 29, 4, 0,
163,
- 190, 0, 191, 137, 193, 138, 0, 0, 193,
194,
- 0, 162, 204, 0, 40, 3, 0, 40, 4,
0,
- 163, 195, 0, 86, 141, 0, 197, 182, 134,
0,
- 77, 141, 0, 198, 183, 134, 0, 196, 137,
197,
- 198, 138, 0, 0, 141, 4, 0, 72, 3,
0,
- 72, 4, 0, 163, 201, 0, 202, 200, 137,
148,
- 138, 0, 202, 141, 3, 137, 152, 148, 138,
0,
- 199, 0, 201, 134, 0, 195, 134, 0, 78,
3,
- 0, 78, 4, 0, 163, 205, 0, 206, 137,
148,
- 138, 0, 128, 209, 0, 32, 208, 0, 186,
0,
- 208, 0, 135, 209, 136, 0, 209, 0, 210,
122,
- 209, 0, 93, 0, 112, 0, 105, 185, 137,
180,
- 138, 0, 118, 0, 4, 0, 187, 0, 32,
213,
- 0, 173, 0, 46, 3, 0, 212, 0, 105,
3,
- 0, 215, 0, 111, 3, 0, 110, 162, 213,
210,
- 0, 111, 185, 137, 180, 138, 0, 111, 185,
106,
- 135, 182, 136, 184, 137, 167, 138, 0, 5,
0,
- 5, 144, 5, 0
+ 16, 0, 60, 0, 95, 0, 117, 0, 22,
0,
+ 119, 0, 189, 0, 97, 189, 0, 113, 189,
0,
+ 113, 0, 50, 0, 98, 0, 42, 0, 20,
0,
+ 47, 0, 52, 0, 0, 70, 0, 70, 0,
101,
+ 188, 0, 96, 188, 0, 76, 188, 0, 59,
188,
+ 0, 71, 0, 28, 0, 29, 3, 0, 29,
4,
+ 0, 163, 190, 0, 191, 137, 193, 138, 0,
0,
+ 193, 194, 0, 162, 204, 0, 40, 3, 0,
40,
+ 4, 0, 163, 195, 0, 86, 141, 0, 197,
182,
+ 134, 0, 77, 141, 0, 198, 183, 134, 0,
196,
+ 137, 197, 198, 138, 0, 0, 141, 4, 0,
72,
+ 3, 0, 72, 4, 0, 163, 201, 0, 202,
200,
+ 137, 148, 138, 0, 202, 141, 3, 137, 152,
148,
+ 138, 0, 199, 0, 201, 134, 0, 195, 134,
0,
+ 78, 3, 0, 78, 4, 0, 163, 205, 0,
206,
+ 137, 148, 138, 0, 128, 209, 0, 32, 208,
0,
+ 186, 0, 208, 0, 135, 209, 136, 0, 209,
0,
+ 210, 122, 209, 0, 93, 0, 112, 0, 105,
185,
+ 137, 180, 138, 0, 118, 0, 4, 0, 187,
0,
+ 32, 213, 0, 173, 0, 46, 3, 0, 212,
0,
+ 105, 3, 0, 215, 0, 111, 3, 0, 110,
162,
+ 213, 210, 0, 111, 185, 137, 180, 138, 0,
111,
+ 185, 106, 135, 182, 136, 184, 137, 167, 138,
0,
+ 5, 0, 5, 144, 5, 0
};
#endif
@@ -441,14 +442,15 @@
480, 481, 482, 483, 484, 485, 486, 487, 488,
489,
490, 491, 492, 495, 496, 499, 505, 510, 511,
516,
517, 518, 519, 522, 525, 536, 537, 540, 541,
542,
- 545, 547, 548, 549, 550, 553, 554, 555, 556,
557,
- 569, 570, 571, 572, 573, 574, 575, 578, 579,
582,
- 583, 584, 585, 586, 587, 588, 591, 592, 595,
602,
- 607, 608, 611, 615, 616, 619, 631, 632, 635,
636,
- 639, 654, 655, 658, 659, 662, 670, 678, 685,
688,
- 690, 693, 694, 697, 702, 708, 709, 712, 713,
714,
- 717, 719, 722, 724, 727, 737, 738, 739, 740,
741,
- 742, 743, 744, 745, 746, 749, 762, 766, 779, 781
+ 545, 547, 548, 549, 550, 551, 554, 555, 556,
557,
+ 558, 570, 571, 572, 573, 574, 575, 576, 579,
580,
+ 583, 584, 585, 586, 587, 588, 589, 592, 593,
596,
+ 603, 608, 609, 612, 616, 617, 620, 632, 633,
636,
+ 637, 640, 655, 656, 659, 660, 663, 671, 679,
686,
+ 689, 691, 694, 695, 698, 703, 709, 710, 713,
714,
+ 715, 718, 720, 723, 725, 728, 738, 739, 740,
741,
+ 742, 743, 744, 745, 746, 747, 750, 763, 767,
780,
+ 782
};
#endif
@@ -520,14 +522,15 @@
176, 176, 176, 176, 176, 176, 176, 176, 176,
176,
176, 176, 176, 177, 177, 178, 179, 180, 180,
181,
181, 181, 181, 182, 183, 184, 184, 185, 185,
185,
- 186, 186, 186, 186, 186, 187, 187, 187, 187,
187,
- 187, 187, 187, 187, 187, 187, 187, 188, 188,
189,
- 189, 189, 189, 189, 189, 189, 190, 190, 191,
192,
- 193, 193, 194, 195, 195, 196, 197, 197, 198,
198,
- 199, 200, 200, 201, 201, 202, 203, 203, 203,
204,
- 204, 205, 205, 206, 207, 208, 208, 209, 209,
209,
- 210, 210, 211, 211, 212, 213, 213, 213, 213,
213,
- 213, 213, 213, 213, 213, 214, 215, 215, 216, 216
+ 186, 186, 186, 186, 186, 186, 187, 187, 187,
187,
+ 187, 187, 187, 187, 187, 187, 187, 187, 188,
188,
+ 189, 189, 189, 189, 189, 189, 189, 190, 190,
191,
+ 192, 193, 193, 194, 195, 195, 196, 197, 197,
198,
+ 198, 199, 200, 200, 201, 201, 202, 203, 203,
203,
+ 204, 204, 205, 205, 206, 207, 208, 208, 209,
209,
+ 209, 210, 210, 211, 211, 212, 213, 213, 213,
213,
+ 213, 213, 213, 213, 213, 213, 214, 215, 215,
216,
+ 216
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule
YYN. */
@@ -550,14 +553,15 @@
3, 3, 3, 3, 3, 3, 3, 2, 2,
2,
4, 4, 3, 1, 3, 1, 4, 0, 2,
2,
3, 2, 1, 4, 7, 0, 1, 0, 1,
1,
- 1, 1, 1, 1, 1, 1, 1, 1, 2,
2,
- 1, 1, 1, 1, 1, 1, 1, 0, 1,
1,
- 2, 2, 2, 2, 1, 1, 2, 2, 2,
4,
- 0, 2, 2, 2, 2, 2, 2, 3, 2,
3,
- 5, 0, 2, 2, 2, 2, 5, 7, 1,
2,
- 2, 2, 2, 2, 4, 2, 2, 1, 1,
3,
- 1, 3, 1, 1, 5, 1, 1, 1, 2,
1,
- 2, 1, 2, 1, 2, 4, 5, 10, 1, 3
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
2,
+ 2, 1, 1, 1, 1, 1, 1, 1, 0,
1,
+ 1, 2, 2, 2, 2, 1, 1, 2, 2,
2,
+ 4, 0, 2, 2, 2, 2, 2, 2, 3,
2,
+ 3, 5, 0, 2, 2, 2, 2, 5, 7,
1,
+ 2, 2, 2, 2, 2, 4, 2, 2, 1,
1,
+ 3, 1, 3, 1, 1, 5, 1, 1, 1,
2,
+ 1, 2, 1, 2, 1, 2, 4, 5, 10,
1,
+ 3
};
/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
@@ -567,318 +571,326 @@
{
2, 1, 0, 0, 0, 167, 0, 0, 0,
167,
49, 167, 18, 0, 8, 20, 9, 23, 9,
7,
- 0, 0, 0, 0, 0, 5, 0, 0, 218,
0,
- 211, 4, 3, 0, 6, 0, 0, 0, 236,
184,
- 175, 195, 0, 183, 167, 185, 181, 186, 187,
189,
- 194, 187, 187, 0, 182, 187, 167, 167, 180,
235,
- 176, 239, 237, 177, 241, 0, 243, 0, 203,
204,
- 168, 169, 0, 0, 0, 213, 214, 0, 0,
50,
+ 0, 0, 0, 0, 0, 5, 0, 0, 219,
0,
+ 212, 4, 3, 0, 6, 0, 0, 0, 237,
185,
+ 176, 196, 0, 184, 167, 186, 182, 187, 188,
190,
+ 195, 188, 188, 0, 183, 188, 167, 167, 181,
236,
+ 177, 240, 238, 178, 242, 0, 244, 0, 204,
205,
+ 168, 169, 0, 0, 0, 214, 215, 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, 99, 100, 101, 102, 0, 104,
105,
0, 0, 0, 109, 0, 111, 112, 0, 0,
0,
- 52, 115, 0, 0, 0, 0, 0, 0, 198,
205,
- 215, 223, 19, 21, 22, 200, 220, 0, 219,
0,
- 0, 15, 24, 25, 26, 238, 240, 188, 193,
192,
- 191, 178, 190, 242, 244, 179, 170, 171, 172,
173,
- 174, 0, 0, 123, 0, 28, 157, 0, 0,
157,
+ 52, 115, 0, 0, 0, 0, 0, 0, 199,
206,
+ 216, 224, 19, 21, 22, 201, 221, 0, 220,
0,
+ 0, 15, 24, 25, 26, 239, 241, 189, 194,
193,
+ 192, 179, 191, 243, 245, 180, 170, 171, 172,
173,
+ 174, 175, 0, 0, 123, 0, 28, 157, 0,
0,
+ 157, 0, 0, 0, 0, 0, 0, 0, 0,
0,
+ 0, 0, 0, 0, 0, 133, 0, 133, 0,
0,
+ 0, 0, 0, 0, 0, 51, 29, 14, 0,
12,
+ 11, 10, 13, 32, 197, 198, 30, 222, 223,
31,
+ 49, 0, 49, 0, 213, 15, 49, 0, 27,
0,
+ 125, 126, 129, 156, 49, 0, 0, 0, 228,
229,
+ 231, 246, 49, 49, 0, 137, 135, 136, 0,
0,
+ 0, 0, 0, 155, 0, 153, 0, 0, 0,
0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
- 0, 0, 0, 0, 133, 0, 133, 0, 0,
0,
- 0, 0, 0, 0, 51, 29, 14, 0, 12,
11,
- 10, 13, 32, 196, 197, 30, 221, 222, 31,
49,
- 0, 49, 0, 212, 15, 49, 0, 27, 0,
125,
- 126, 129, 156, 49, 0, 0, 0, 227, 228,
230,
- 245, 49, 49, 0, 137, 135, 136, 0, 0,
0,
- 0, 0, 155, 0, 153, 0, 0, 0, 0,
0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
- 131, 134, 232, 233, 0, 0, 0, 0, 0,
0,
- 248, 0, 0, 53, 0, 199, 0, 201, 206,
0,
- 0, 0, 49, 0, 49, 224, 17, 0, 0,
122,
- 130, 124, 0, 162, 234, 0, 50, 158, 0,
226,
- 225, 0, 0, 0, 246, 57, 0, 148, 149,
147,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
- 0, 0, 58, 65, 64, 66, 68, 69, 70,
73,
- 74, 75, 76, 77, 79, 81, 0, 133, 85,
93,
- 103, 106, 107, 108, 110, 0, 113, 114, 54,
202,
- 208, 0, 207, 210, 0, 15, 216, 116, 16,
127,
- 128, 243, 161, 159, 229, 231, 165, 0, 152,
0,
- 145, 146, 139, 140, 142, 141, 143, 144, 0,
154,
- 82, 132, 249, 43, 209, 49, 117, 0, 160,
0,
- 166, 151, 150, 0, 133, 163, 217, 0, 118,
138,
- 0, 0, 46, 33, 0, 45, 0, 44, 235,
0,
- 38, 34, 36, 0, 0, 0, 0, 247, 119,
47,
- 0, 164, 0, 0, 43, 0, 49, 48, 37,
43,
- 33, 40, 49, 121, 33, 39, 0, 120, 0,
42,
- 41, 0, 0, 0
+ 0, 131, 134, 233, 234, 0, 0, 0, 0,
0,
+ 0, 249, 0, 0, 53, 0, 200, 0, 202,
207,
+ 0, 0, 0, 49, 0, 49, 225, 17, 0,
0,
+ 122, 130, 124, 0, 162, 235, 0, 50, 158,
0,
+ 227, 226, 0, 0, 0, 247, 57, 0, 148,
149,
+ 147, 0, 0, 0, 0, 0, 0, 0, 0,
0,
+ 0, 0, 0, 58, 65, 64, 66, 68, 69,
70,
+ 73, 74, 75, 76, 77, 79, 81, 0, 133,
85,
+ 93, 103, 106, 107, 108, 110, 0, 113, 114,
54,
+ 203, 209, 0, 208, 211, 0, 15, 217, 116,
16,
+ 127, 128, 244, 161, 159, 230, 232, 165, 0,
152,
+ 0, 145, 146, 139, 140, 142, 141, 143, 144,
0,
+ 154, 82, 132, 250, 43, 210, 49, 117, 0,
160,
+ 0, 166, 151, 150, 0, 133, 163, 218, 0,
118,
+ 138, 0, 0, 46, 33, 0, 45, 0, 44,
236,
+ 0, 38, 34, 36, 0, 0, 0, 0, 248,
119,
+ 47, 0, 164, 0, 0, 43, 0, 49, 48,
37,
+ 43, 33, 40, 49, 121, 33, 39, 0, 120,
0,
+ 42, 41, 0, 0, 0
};
static const short yydefgoto[] =
{
- 461, 1, 142, 235, 306, 15, 16, 17, 147,
18,
- 19, 429, 430, 431, 432, 415, 421, 307, 79,
139,
- 140, 407, 424, 438, 21, 238, 239, 240, 61,
279,
- 280, 262, 263, 264, 23, 243, 317, 318, 308,
409,
- 72, 247, 62, 168, 63, 148, 24, 218, 229,
297,
- 26, 27, 231, 302, 28, 160, 29, 30, 219,
220,
- 151, 33, 221, 248, 249, 250, 141, 64, 434,
36,
- 66, 291
+ 462, 1, 142, 236, 307, 15, 16, 17, 147,
18,
+ 19, 430, 431, 432, 433, 416, 422, 308, 79,
139,
+ 140, 408, 425, 439, 21, 239, 240, 241, 61,
280,
+ 281, 263, 264, 265, 23, 244, 318, 319, 309,
410,
+ 72, 248, 62, 168, 63, 148, 24, 219, 230,
298,
+ 26, 27, 232, 303, 28, 160, 29, 30, 220,
221,
+ 151, 33, 222, 249, 250, 251, 141, 64, 435,
36,
+ 66, 292
};
static const short yypact[] =
{
- -32768, 613, 602, -100, 104, 112, 13, 48, 140,
112,
- -67, 112,-32768,
772,-32768,-32768,-32768,-32768,-32768,-32768,
- 11, -37, -34, 25, -47,-32768, 32, -10,-32768,
47,
- -9,-32768,-32768, 2,-32768, 49, 51,
59,-32768,-32768,
- -32768,-32768, 602,-32768, 153,-32768,-32768,-32768,
60,-32768,
- -32768, 60, 60, 296,-32768, 60, 187, 222,
296,-32768,
- -32768,-32768,-32768,-32768,-32768, 17,-32768,
181,-32768,-32768,
- -32768,-32768, 69, 602, 68,-32768,-32768, 74,
602,-32768,
- -75,-32768,-32768, 87,
98,-32768,-32768,-32768,-32768,-32768,
- 106, 122,-32768, 134, 143,-32768,-32768, 144, 146,
150,
- 151, 152,-32768, 154,-32768, 155, 163,-32768,-32768,
164,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768,
168,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768,
169,-32768,-32768,
- 170, 171, 176,-32768, 177,-32768,-32768, 182, 184,
-84,
- -32768,-32768, 450, 532, 233, 205, 268,
102,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768, 202,-32768,
270,
- 165,-32768,-32768,-32768,-32768,-32768,
183,-32768,-32768,-32768,
- -32768,-32768,-32768, 183,
-74,-32768,-32768,-32768,-32768,-32768,
- -32768, 186, 190, 17, 17,-32768,-32768, 353,
188,-32768,
- 17, 328, 247, 322, 323, 253, 328, 325, 329,
328,
- 330, 328, 17, 286, 328, -60, 328, 328, 602,
602,
- 333, 337, 602, 772, 207,-32768,-32768,
8,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
138,
- 203, -51, 211,-32768,-32768, 644, 328,-32768, 212,
227,
- -32768, 209,-32768, -35, -7, 353,
353,-32768,-32768,-32768,
- 232, -67, -29, 223,-32768,-32768,-32768, 225, 328,
328,
- 328, 497, 167, -78,-32768, 229, 234, 235, 238,
240,
- 242, 244, 248, 250, 251, 257, 259, 260, 355,
-72,
- -32768, 167,-32768,-32768, 263, -49, 71, 264, 265,
266,
- 224, 267, 269,-32768, 772,-32768, -11,-32768,-32768,
273,
- 602, 275, 145, 343, 655,-32768,-32768, 602,
282,-32768,
- -32768, 17, 328,-32768,-32768, 602, 283,-32768,
284,-32768,
- -32768, 285, 353, 287,-32768,-32768, 602, 277, 277,
277,
- 91, 288, 328, 328, 328, 328, 328, 328, 328,
328,
- 328,
328,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768, 289,
328,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,
421,-32768,-32768,-32768,-32768,
- -32768, 353,-32768,-32768, 295,-32768,-32768,
324,-32768,-32768,
- -32768, 297,-32768,-32768,-32768,-32768, 17, 294,-32768,
328,
- 277, 277, 103, 36, 58, 58, 12, 12,
139,-32768,
- -32768,-32768,-32768, 300,-32768, 665,-32768, 353,-32768,
299,
- -32768,-32768, 277, 328, 503,-32768,-32768, 298,-32768,
167,
- 54, -73,-32768, 293, -2,-32768, 328, 301, -44,
306,
- -32768, 338,-32768, 602, 353, 328, 305,-32768,-32768,
167,
- 328,-32768, 415, 353, -69, 351, -28, 167,-32768,
-4,
- 293,-32768, -28,-32768, 293,-32768, 314,-32768,
316,-32768,
- -32768, 455, 464,-32768
+ -32768, 686, 644, -99, 30, 93, 13, 51, 119,
93,
+ -32, 93,-32768,
814,-32768,-32768,-32768,-32768,-32768,-32768,
+ 11, -6, 6, 9, -25,-32768, 34, 7,-32768,
36,
+ 43,-32768,-32768, 14,-32768, 52, 54,
56,-32768,-32768,
+ -32768,-32768, 644,-32768, 146,-32768,-32768,-32768,
2,-32768,
+ -32768, 2, 2, 35,-32768, 2, 197, 199,
35,-32768,
+ -32768,-32768,-32768,-32768,-32768, 21,-32768,
186,-32768,-32768,
+ -32768,-32768, 61, 644, 70,-32768,-32768, 69,
644,-32768,
+ -76,-32768,-32768, 74,
80,-32768,-32768,-32768,-32768,-32768,
+ 88, 99,-32768, 107, 116,-32768,-32768, 120, 122,
124,
+ 130, 132,-32768, 134,-32768, 135, 136,-32768,-32768,
137,
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768,
138,-32768,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768,
139,-32768,-32768,
+ 141, 142, 150,-32768, 152,-32768,-32768, 154, 155,
-81,
+ -32768,-32768, 568, 655, 209, 224, 222,
144,-32768,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768, 205,-32768,
234,
+ 157,-32768,-32768,-32768,-32768,-32768,
160,-32768,-32768,-32768,
+ -32768,-32768,-32768, 160,
-71,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768, 156, 163, 21, 21,-32768,-32768, 327,
165,
+ -32768, 21, 423, 469, 285, 296, 527, 423, 297,
298,
+ 423, 306, 423, 21, 262, 423, -62, 423, 423,
644,
+ 644, 308, 313, 644, 814, 181,-32768,-32768,
46,-32768,
+
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 111, 180, -59, 185,-32768,-32768, 247, 423,-32768,
187,
+ 202,-32768, 184,-32768, -47, -9, 327,
327,-32768,-32768,
+ -32768, 207, -32, -30, 191,-32768,-32768,-32768, 200,
423,
+ 423, 423, 515, 38, -69,-32768, 203, 204, 206,
208,
+ 210, 212, 214, 215, 217, 220, 225, 226, 227,
333,
+ -67,-32768, 38,-32768,-32768, 229, -65, 92, 230,
233,
+ 235, 194, 240, 241,-32768, 814,-32768,
-18,-32768,-32768,
+ 219, 644, 211, 123, 314, 697,-32768,-32768, 644,
238,
+ -32768,-32768, 21, 423,-32768,-32768, 644, 245,-32768,
249,
+ -32768,-32768, 248, 327, 253,-32768,-32768, 644, 252,
252,
+ 252, 357, 254, 423, 423, 423, 423, 423, 423,
423,
+ 423, 423,
423,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768, 255,
423,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768,
365,-32768,-32768,-32768,
+ -32768,-32768, 327,-32768,-32768, 263,-32768,-32768,
293,-32768,
+ -32768,-32768, 266,-32768,-32768,-32768,-32768, 21,
265,-32768,
+ 423, 252, 252, 388, 104, 28, 28, 17, 17,
363,
+ -32768,-32768,-32768,-32768, 264,-32768, 707,-32768,
327,-32768,
+ 267,-32768,-32768, 252, 423, 535,-32768,-32768,
270,-32768,
+ 38, 59, -80,-32768, 236, -12,-32768, 423, 269,
-54,
+ 277,-32768, 292,-32768, 644, 327, 423,
274,-32768,-32768,
+ 38, 423,-32768, 360, 327, -22, 383, -61,
38,-32768,
+ -5, 236,-32768, -61,-32768, 236,-32768, 281,-32768,
282,
+ -32768,-32768, 420, 421,-32768
};
static const short yypgoto[] =
{
- -32768,-32768, 448, -224, 18,-32768,-32768,
166,-32768,-32768,
- -32768, -317,-32768,-32768, 26, -327,-32768, -8,
-1,-32768,
- -196,-32768,-32768,-32768,-32768,-32768,-32768, 160, 5,
278,
- -330, -165,-32768, -183,-32768, 304, -381, -197,
193,-32768,
- 19, -64,-32768, 73, 65,-32768,-32768,
471,-32768,-32768,
- -13,-32768,-32768,-32768,-32768,-32768, -12,-32768, 472,
4,
- -32768,-32768, 482, 245, -231,-32768, 292, 10,
1,-32768,
+ -32768,-32768, 406, -218, 12,-32768,-32768,
121,-32768,-32768,
+ -32768, -326,-32768,-32768, -16, -357,-32768, -8,
-1,-32768,
+ -185,-32768,-32768,-32768,-32768,-32768,-32768, 125, 5,
231,
+ -338, -161,-32768, -181,-32768, 242, -377, -200,
131,-32768,
+ 126, -64,-32768, 140, 37,-32768,-32768,
432,-32768,-32768,
+ -11,-32768,-32768,-32768,-32768,-32768, -10,-32768, 439,
4,
+ -32768,-32768, 440, 198, -239,-32768, 243, 10,
1,-32768,
3,-32768
};
-#define YYLAST 892
+#define YYLAST 934
static const short yytable[] =
{
- 20, 181, 78, 65, 37, 32, 22, 149, 150,
266,
- 304, 35, 270, 271, 320, 321, 274, 293, 276,
14,
- 176, 177, 332, 333, 435, 244, 299, 401, 77,
4,
- 80, 188, -168, 282, 301, 67, 436, 144, 213,
281,
- 144, 281, 286, 165, 341, 73, 332, 333, 4,
426,
- 357, 4, 283, 309, 323, 74, 214, 254, 342,
255,
- 256, 8, 189, -168, 358, 453, 450, 427, 332,
333,
- 414, 457, 13, 357, 184, 77, 80, 178, -35,
187,
- 8, 332, 333, 8, 422, 145, 146, 360, 13,
146,
- 155, 385, -35, 327, 328, 329, 330, 152, 368,
313,
- 153, 332, 333, 314, 13, 313, 313, 68, 69,
324,
- 13, 13, 179, 332, 333, 70, 71, 451, 171,
241,
- 242, 245, 455, 175, 169, 170, 253, 157, 172,
380,
- 167, 454, 159, 456, 180, 414, 437, 458, 277,
161,
- 403, 217, 217, 75, 76, 37, 37, 22, 22,
332,
- 333, 405, 35, 35, 257, 340, 166, 71, 399,
154,
- 216, 216, 336, 337, 338, 339, 156, 390, 391,
392,
- 393, 394, 395, 396, 397, 398, 417, 332, 333,
340,
- 258, 158, 259, 162, 260, 163, 338, 339, 182,
261,
- 173, 71, 281, 164, 425, 334, 335, 336, 337,
338,
- 339, 340, 185, 444, 149, 150, 183, 361, 225,
287,
- 288, 186, 449, 292, 340, 334, 335, 336, 337,
338,
- 339, 296, 190, 300, 412, 174, 71, 388, 335,
336,
- 337, 338, 339, 191, 340, 315, 223, 224, 37,
228,
- 22, 192, 316, 300, 315, 35, 340, 241, 419,
281,
- 254, 316, 255, 256, 265, 328, 254, 193, 255,
256,
- 269, 439, 331, 334, 335, 336, 337, 338, 339,
194,
- 445, 226, 227, 232, 233, 447, 295, 13, 195,
196,
- 413, 197, 340, 373, 13, 198, 199, 200, 230,
201,
- 202, 334, 335, 336, 337, 338, 339, 38, 203,
204,
- 369, 371, 234, 205, 206, 207, 208, 37, 377,
22,
- 340, 209, 210, 39, 35, 40, 371, 211, 381,
212,
- -168, 41, 410, 251, 41, 42, 237, 387, 236,
267,
- 268, 254, 272, 255, 256, 43, 273, 275, 278,
44,
- 45, 289, 290, 46, 298, 47, 294, 257, 303,
311,
- 310, 312, 48, 257, 322, 48, 176, 177, 356,
325,
- 326, 332, 333, 49, 50, 343, 49, 50, 365,
51,
- 344, 345, 51, 258, 346, 259, 347, 260, 348,
258,
- 349, 259, 261, 260, 350, 244, 351, 352, 261,
52,
- 53, 54, 52, 353, 55, 354, 355, 55, 56,
359,
- 362, 363, 364, 366, 57, 367, 58, 7, 37,
372,
- 22, 428, 60, 178, 370, 35, 378, 382, 383,
38,
- 340, 384, 433, 386, 389, 400, 402, 406, 257,
404,
- 411, 408, 13, 423, 443, 39, 418, 40, 315,
414,
- 440, 433, 441, 41, 315, 316, 446, 42, 179,
433,
- 459, 316, 460, 433, 258, 462, 259, 43, 260,
215,
- 442, 44, 45, 261, 463, 46, 143, 47, 448,
375,
- 180, 379, 25, 31, 48, 334, 335, 336, 337,
338,
- 339, 245, 2, 34, 285, 49, 50, 3, 246,
319,
- 4, 51, 452, 252, 340, 374, 5, 284, 0,
6,
- 254, 38, 255, 256, 0, 0, 254, 0, 255,
256,
- 0, 52, 53, 54, 7, 0, 55, 39, 0,
40,
- 56, 0, 8, 0, 0, 41, 57, 0, 58,
42,
- 0, 0, 0, 59, 60, 0, 0, 0, 0,
43,
- 0, 0, 0, 44, 45, 0, 0, 46, 0,
47,
- 0, 0, 0, 0, 13, 9, 48, 0, 0,
0,
- 10, 11, 0, 0, 2, 0, 0, 49, 50,
3,
- 0, 0, 4, 51, 0, 0, 0, 0, 5,
0,
- 0, 6, 0, 0, 12, 0, 0, 0, 0,
13,
- 0, 0, 0, 52, 53, 54, 7, 257, 55,
0,
- 0, 0, 56, 257, 8, 0, 38, 0, 57,
0,
- 58, 0, 0, 0, 0, 59, 60, 0, 0,
0,
- 0, 0, 39, 258, 40, 259, 0, 260, 0,
258,
- 41, 420, 261, 260, 42, 0, 0, 9, 261,
0,
- 0, 0, 10, 11, 43, 2, 0, 0, 44,
45,
- 3, 0, 46, 4, 47, 0, 0, 0, 0,
5,
- 0, 48, 6, 0, 0, 0, 12, 0, 0,
0,
- 222, 13, 49, 50, 0, 0, 2, 7, 51,
0,
- 0, 3, 0, 0, 0, 8, 0, 2, 0,
0,
- 5, 0, 3, 6, 0, 0, 0, 2, 52,
53,
- 54, 5, 3, 55, 6, 0, 0, 56, 7,
0,
- 0, 5, 0, 57, 6, 58, 0, 0, 9,
7,
- 59, 60, 0, 10, 11, 0, 0, 0, 0,
7,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,
- 0, 0, 0, 0, 0, 0, 0, 12, 0,
9,
- 0, 0, 13, 0, 10, 11, 0, 0, 0,
0,
- 9, 0, 0, 0, 0, 10, 11, 0, 0,
0,
- 9, 0, 0, 0, 0, 10, 11, 0, 12,
0,
- 0, 0, 305, 13, 0, 0, 0, 0, 81,
12,
- 82, 0, 0, 376, 13, 0, 83, 0, 84,
12,
- 0, 0, 0, 416, 13, 85, 86, 87, 88,
0,
- 89, 90, 0, 91, 0, 92, 93, 94, 0,
0,
- 95, 0, 0, 96, 0, 97, 98, 99, 100,
101,
- 102, 0, 103, 104, 105, 106, 0, 0, 107,
0,
- 0, 108, 0, 0, 0, 109, 0, 110, 0,
0,
- 0, 111, 112, 113, 114, 115, 116, 117, 0,
118,
- 119, 120, 121, 122, 123, 124, 125, 126, 0,
0,
- 0, 127, 0, 0, 128, 0, 129, 0, 0,
130,
- 131, 132, 0, 0, 133, 0, 134, 135, 136,
137,
- 0, 0, 138
+ 20, 182, 78, 65, 37, 32, 22, 321, 322,
149,
+ 150, 35, 267, 14, 436, 271, 272, 305, 300,
275,
+ 402, 277, 4, 245, 176, 177, 437, 333, 334,
294,
+ 189, 283, 302, 68, 69, -168, 67, 178, 333,
334,
+ 144, 214, 427, 165, 282, 73, 282, 287, 333,
334,
+ 284, 4, 324, 342, 8, 358, 310, 358, 74,
215,
+ 428, 190, 255, 41, 256, 257, -168, 343, -35,
359,
+ 454, 361, 167, 314, 185, 144, 458, 423, 13,
188,
+ 13, 179, -35, 8, 386, 145, 4, 314, 452,
146,
+ 171, 315, 13, 456, 48, 175, 70, 71, 328,
329,
+ 330, 331, 333, 334, 314, 49, 50, 13, 325,
13,
+ 369, 51, 155, 451, 333, 334, 180, 415, 8,
246,
+ 242, 243, 75, 76, 146, 457, 438, 254, 152,
459,
+ 455, 52, 381, 404, 415, 77, 55, 80, 181,
278,
+ 153, 218, 218, 154, 157, 37, 37, 22, 22,
166,
+ 71, 161, 35, 35, 217, 217, 339, 340, 406,
258,
+ 341, 400, 335, 336, 337, 338, 339, 340, 156,
418,
+ 158, 341, 391, 392, 393, 394, 395, 396, 397,
398,
+ 399, 341, 77, 80, 159, 259, 162, 260, 163,
261,
+ 164, 169, 170, 183, 262, 172, 445, 282, 184,
426,
+ 173, 71, 174, 71, 186, 450, 187, 149, 150,
191,
+ 288, 289, 224, 225, 293, 192, 335, 336, 337,
338,
+ 339, 340, 297, 193, 301, 227, 228, 226, 362,
413,
+ 337, 338, 339, 340, 194, 341, 316, 233, 234,
37,
+ 38, 22, 195, 317, 301, 316, 35, 341, 242,
296,
+ 13, 196, 317, 420, 282, 197, 39, 198, 40,
199,
+ 329, 374, 13, 332, 41, 200, 440, 201, 42,
202,
+ 203, 204, 205, 206, 207, 446, 208, 209, 43,
2,
+ 448, 229, 44, 45, 3, 210, 46, 211, 47,
212,
+ 213, 231, 268, 5, 235, 48, 6, -168, 237,
238,
+ 252, 370, 372, 269, 273, 274, 49, 50, 37,
378,
+ 22, 7, 51, 276, 279, 35, 290, 372, 291,
382,
+ 295, 299, 304, 411, 312, 311, 313, 326, 388,
323,
+ 176, 177, 52, 53, 54, 327, 357, 55, 366,
344,
+ 345, 56, 346, 178, 347, 373, 348, 57, 349,
58,
+ 350, 351, 9, 352, 429, 60, 353, 10, 11,
245,
+ 371, 354, 355, 356, 38, 360, 363, 333, 334,
364,
+ 403, 365, 379, 333, 334, 13, 367, 368, 7,
383,
+ 39, 12, 40, 384, 385, 306, 13, 179, 41,
387,
+ 390, 401, 42, 333, 334, 341, 407, 405, 333,
334,
+ 409, 412, 43, 415, 419, 424, 44, 45, 441,
37,
+ 46, 22, 47, 442, 443, 447, 35, 460, 461,
48,
+ 463, 464, 180, 434, 143, 376, 255, 449, 256,
257,
+ 49, 50, 253, 25, 375, 444, 51, 380, 286,
316,
+ 31, 34, 434, 320, 181, 316, 317, 0, 0,
285,
+ 434, 0, 317, 0, 434, 246, 52, 53, 54,
0,
+ 0, 55, 247, 0, 0, 56, 0, 0, 0,
0,
+ 0, 57, 255, 58, 256, 257, 266, 0, 59,
60,
+ 0, 335, 336, 337, 338, 339, 340, 335, 336,
337,
+ 338, 339, 340, 389, 0, 0, 0, 0, 0,
13,
+ 341, 0, 0, 0, 414, 0, 341, 335, 336,
337,
+ 338, 339, 340, 336, 337, 338, 339, 340, 255,
38,
+ 256, 257, 0, 258, 453, 0, 341, 0, 0,
0,
+ 255, 341, 256, 257, 270, 39, 0, 40, 255,
0,
+ 256, 257, 0, 41, 0, 0, 0, 42, 0,
259,
+ 0, 260, 0, 261, 0, 0, 0, 43, 262,
0,
+ 0, 44, 45, 0, 0, 46, 0, 47, 0,
258,
+ 0, 0, 0, 0, 48, 0, 0, 216, 0,
0,
+ 0, 0, 0, 0, 0, 49, 50, 0, 0,
0,
+ 0, 51, 0, 0, 0, 259, 0, 260, 0,
261,
+ 2, 0, 0, 0, 262, 3, 0, 0, 4,
0,
+ 0, 52, 53, 54, 5, 258, 55, 6, 0,
0,
+ 56, 0, 0, 0, 0, 0, 57, 258, 58,
0,
+ 0, 0, 7, 59, 60, 258, 0, 0, 0,
0,
+ 8, 259, 0, 260, 0, 261, 0, 0, 38,
0,
+ 262, 0, 0, 259, 0, 260, 0, 261, 0,
0,
+ 0, 259, 262, 421, 39, 261, 40, 0, 0,
0,
+ 262, 0, 41, 9, 0, 0, 42, 0, 10,
11,
+ 0, 0, 0, 0, 0, 0, 43, 2, 0,
0,
+ 44, 45, 3, 0, 46, 4, 47, 0, 0,
0,
+ 0, 5, 12, 48, 6, 0, 0, 13, 0,
0,
+ 0, 0, 0, 0, 49, 50, 0, 0, 2,
7,
+ 51, 0, 0, 3, 0, 0, 4, 8, 0,
2,
+ 0, 0, 5, 0, 3, 6, 0, 0, 0,
2,
+ 52, 53, 54, 5, 3, 55, 6, 0, 0,
56,
+ 7, 0, 0, 5, 0, 57, 6, 58, 8,
0,
+ 9, 7, 59, 60, 0, 10, 11, 0, 0,
0,
+ 0, 7, 0, 0, 0, 0, 0, 0, 0,
0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
12,
+ 0, 9, 0, 223, 13, 0, 10, 11, 0,
0,
+ 0, 0, 9, 0, 0, 0, 0, 10, 11,
0,
+ 0, 0, 9, 0, 0, 0, 0, 10, 11,
0,
+ 12, 0, 0, 0, 0, 13, 0, 0, 0,
0,
+ 81, 12, 82, 0, 0, 377, 13, 0, 83,
0,
+ 84, 12, 0, 0, 0, 417, 13, 85, 86,
87,
+ 88, 0, 89, 90, 0, 91, 0, 92, 93,
94,
+ 0, 0, 95, 0, 0, 96, 0, 97, 98,
99,
+ 100, 101, 102, 0, 103, 104, 105, 106, 0,
0,
+ 107, 0, 0, 108, 0, 0, 0, 109, 0,
110,
+ 0, 0, 0, 111, 112, 113, 114, 115, 116,
117,
+ 0, 118, 119, 120, 121, 122, 123, 124, 125,
126,
+ 0, 0, 0, 127, 0, 0, 128, 0, 129,
0,
+ 0, 130, 131, 132, 0, 0, 133, 0, 134,
135,
+ 136, 137, 0, 0, 138
};
static const short yycheck[] =
{
- 1, 65, 10, 2, 1, 1, 1, 20, 20,
192,
- 234, 1, 195, 196, 245, 246, 199, 213, 201,
1,
- 3, 4, 10, 11, 26, 32, 77, 357, 9,
40,
- 11, 106, 106, 93, 231, 135, 38, 29, 122,
204,
- 29, 206, 207, 42, 122, 32, 10, 11, 40,
122,
- 122, 40, 112, 236, 251, 7, 140, 3, 136,
5,
- 6, 72, 137, 137, 136, 446, 135, 140, 10,
11,
- 139, 452, 139, 122, 73, 56, 57, 60, 122,
78,
- 72, 10, 11, 72, 414, 74, 78, 136, 139,
78,
- 137, 322, 136, 258, 259, 260, 261, 134, 294,
134,
- 134, 10, 11, 138, 139, 134, 134, 3, 4,
138,
- 139, 139, 95, 10, 11, 3, 4, 444, 53,
183,
- 184, 128, 449, 58, 51, 52, 190, 137, 55,
312,
- 70, 135, 141, 450, 117, 139, 138, 454, 202,
137,
- 371, 142, 143, 3, 4, 142, 143, 142, 143,
10,
- 11, 375, 142, 143, 100, 143, 3, 4, 341,
134,
- 142, 143, 126, 127, 128, 129, 134, 332, 333,
334,
- 335, 336, 337, 338, 339, 340, 407, 10, 11,
143,
- 126, 134, 128, 134, 130, 134, 128, 129, 7,
135,
- 3, 4, 357, 134, 140, 124, 125, 126, 127,
128,
- 129, 143, 134, 434, 217, 217, 137, 136, 3,
208,
- 209, 137, 443, 212, 143, 124, 125, 126, 127,
128,
- 129, 229, 135, 231, 389, 3, 4, 136, 125,
126,
- 127, 128, 129, 135, 143, 243, 3, 4, 235,
137,
- 235, 135, 243, 251, 252, 235, 143, 311, 413,
414,
- 3, 252, 5, 6, 7, 420, 3, 135, 5,
6,
- 7, 426, 261, 124, 125, 126, 127, 128, 129,
135,
- 435, 3, 4, 3, 4, 440, 138, 139, 135,
135,
- 141, 135, 143, 138, 139, 135, 135, 135, 86,
135,
- 135, 124, 125, 126, 127, 128, 129, 4, 135,
135,
- 296, 300, 137, 135, 135, 135, 135, 304, 307,
304,
- 143, 135, 135, 20, 304, 22, 315, 135, 315,
135,
- 137, 28, 386, 135, 28, 32, 136, 326, 142,
7,
- 7, 3, 7, 5, 6, 42, 7, 7, 52,
46,
- 47, 8, 5, 50, 141, 52, 139, 100, 137,
122,
- 138, 142, 59, 100, 122, 59, 3, 4, 3,
136,
- 135, 10, 11, 70, 71, 136, 70, 71, 144,
76,
- 136, 136, 76, 126, 136, 128, 136, 130, 136,
126,
- 136, 128, 135, 130, 136, 32, 136, 136, 135,
96,
- 97, 98, 96, 136, 101, 136, 136, 101, 105,
136,
- 136, 136, 136, 136, 111, 136, 113, 64, 405,
134,
- 405, 118, 119, 60, 141, 405, 134, 134, 134,
4,
- 143, 136, 423, 136, 136, 136, 5, 103, 100,
134,
- 136, 134, 139, 135, 433, 20, 137, 22, 446,
139,
- 139, 442, 136, 28, 452, 446, 141, 32, 95,
450,
- 136, 452, 136, 454, 126, 0, 128, 42, 130,
9,
- 122, 46, 47, 135, 0, 50, 18, 52, 442,
303,
- 117, 311, 1, 1, 59, 124, 125, 126, 127,
128,
- 129, 128, 32, 1, 206, 70, 71, 37, 135,
244,
- 40, 76, 141, 189, 143, 302, 46, 205, -1,
49,
- 3, 4, 5, 6, -1, -1, 3, -1, 5,
6,
- -1, 96, 97, 98, 64, -1, 101, 20, -1,
22,
- 105, -1, 72, -1, -1, 28, 111, -1, 113,
32,
- -1, -1, -1, 118, 119, -1, -1, -1, -1,
42,
- -1, -1, -1, 46, 47, -1, -1, 50, -1,
52,
- -1, -1, -1, -1, 139, 105, 59, -1, -1,
-1,
- 110, 111, -1, -1, 32, -1, -1, 70, 71,
37,
- -1, -1, 40, 76, -1, -1, -1, -1, 46,
-1,
- -1, 49, -1, -1, 134, -1, -1, -1, -1,
139,
- -1, -1, -1, 96, 97, 98, 64, 100, 101,
-1,
- -1, -1, 105, 100, 72, -1, 4, -1, 111,
-1,
- 113, -1, -1, -1, -1, 118, 119, -1, -1,
-1,
- -1, -1, 20, 126, 22, 128, -1, 130, -1,
126,
- 28, 128, 135, 130, 32, -1, -1, 105, 135,
-1,
- -1, -1, 110, 111, 42, 32, -1, -1, 46,
47,
- 37, -1, 50, 40, 52, -1, -1, -1, -1,
46,
- -1, 59, 49, -1, -1, -1, 134, -1, -1,
-1,
- 138, 139, 70, 71, -1, -1, 32, 64, 76,
-1,
- -1, 37, -1, -1, -1, 72, -1, 32, -1,
-1,
- 46, -1, 37, 49, -1, -1, -1, 32, 96,
97,
- 98, 46, 37, 101, 49, -1, -1, 105, 64,
-1,
- -1, 46, -1, 111, 49, 113, -1, -1, 105,
64,
- 118, 119, -1, 110, 111, -1, -1, -1, -1,
64,
- -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1,
- -1, -1, -1, -1, -1, -1, -1, 134, -1,
105,
- -1, -1, 139, -1, 110, 111, -1, -1, -1,
-1,
- 105, -1, -1, -1, -1, 110, 111, -1, -1,
-1,
- 105, -1, -1, -1, -1, 110, 111, -1, 134,
-1,
- -1, -1, 138, 139, -1, -1, -1, -1, 16,
134,
- 18, -1, -1, 138, 139, -1, 24, -1, 26,
134,
- -1, -1, -1, 138, 139, 33, 34, 35, 36,
-1,
- 38, 39, -1, 41, -1, 43, 44, 45, -1,
-1,
- 48, -1, -1, 51, -1, 53, 54, 55, 56,
57,
- 58, -1, 60, 61, 62, 63, -1, -1, 66,
-1,
- -1, 69, -1, -1, -1, 73, -1, 75, -1,
-1,
- -1, 79, 80, 81, 82, 83, 84, 85, -1,
87,
- 88, 89, 90, 91, 92, 93, 94, 95, -1,
-1,
- -1, 99, -1, -1, 102, -1, 104, -1, -1,
107,
- 108, 109, -1, -1, 112, -1, 114, 115, 116,
117,
- -1, -1, 120
+ 1, 65, 10, 2, 1, 1, 1, 246, 247,
20,
+ 20, 1, 193, 1, 26, 196, 197, 235, 77,
200,
+ 358, 202, 40, 32, 3, 4, 38, 10, 11,
214,
+ 106, 93, 232, 3, 4, 106, 135, 16, 10,
11,
+ 29, 122, 122, 42, 205, 32, 207, 208, 10,
11,
+ 112, 40, 252, 122, 72, 122, 237, 122, 7,
140,
+ 140, 137, 3, 28, 5, 6, 137, 136, 122,
136,
+ 447, 136, 70, 134, 73, 29, 453, 415, 139,
78,
+ 139, 60, 136, 72, 323, 74, 40, 134, 445,
78,
+ 53, 138, 139, 450, 59, 58, 3, 4, 259,
260,
+ 261, 262, 10, 11, 134, 70, 71, 139, 138,
139,
+ 295, 76, 137, 135, 10, 11, 95, 139, 72,
128,
+ 184, 185, 3, 4, 78, 451, 138, 191, 134,
455,
+ 135, 96, 313, 372, 139, 9, 101, 11, 117,
203,
+ 134, 142, 143, 134, 137, 142, 143, 142, 143,
3,
+ 4, 137, 142, 143, 142, 143, 128, 129, 376,
100,
+ 143, 342, 124, 125, 126, 127, 128, 129, 134,
408,
+ 134, 143, 333, 334, 335, 336, 337, 338, 339,
340,
+ 341, 143, 56, 57, 141, 126, 134, 128, 134,
130,
+ 134, 51, 52, 7, 135, 55, 435, 358, 137,
140,
+ 3, 4, 3, 4, 134, 444, 137, 218, 218,
135,
+ 209, 210, 3, 4, 213, 135, 124, 125, 126,
127,
+ 128, 129, 230, 135, 232, 3, 4, 3, 136,
390,
+ 126, 127, 128, 129, 135, 143, 244, 3, 4,
236,
+ 4, 236, 135, 244, 252, 253, 236, 143, 312,
138,
+ 139, 135, 253, 414, 415, 135, 20, 135, 22,
135,
+ 421, 138, 139, 262, 28, 135, 427, 135, 32,
135,
+ 135, 135, 135, 135, 135, 436, 135, 135, 42,
32,
+ 441, 137, 46, 47, 37, 135, 50, 135, 52,
135,
+ 135, 86, 7, 46, 137, 59, 49, 137, 142,
136,
+ 135, 297, 301, 7, 7, 7, 70, 71, 305,
308,
+ 305, 64, 76, 7, 52, 305, 8, 316, 5,
316,
+ 139, 141, 137, 387, 122, 138, 142, 136, 327,
122,
+ 3, 4, 96, 97, 98, 135, 3, 101, 144,
136,
+ 136, 105, 136, 16, 136, 134, 136, 111, 136,
113,
+ 136, 136, 105, 136, 118, 119, 136, 110, 111,
32,
+ 141, 136, 136, 136, 4, 136, 136, 10, 11,
136,
+ 5, 136, 134, 10, 11, 139, 136, 136, 64,
134,
+ 20, 134, 22, 134, 136, 138, 139, 60, 28,
136,
+ 136, 136, 32, 10, 11, 143, 103, 134, 10,
11,
+ 134, 136, 42, 139, 137, 135, 46, 47, 139,
406,
+ 50, 406, 52, 136, 122, 141, 406, 136, 136,
59,
+ 0, 0, 95, 424, 18, 304, 3, 443, 5,
6,
+ 70, 71, 190, 1, 303, 434, 76, 312, 207,
447,
+ 1, 1, 443, 245, 117, 453, 447, -1, -1,
206,
+ 451, -1, 453, -1, 455, 128, 96, 97, 98,
-1,
+ -1, 101, 135, -1, -1, 105, -1, -1, -1,
-1,
+ -1, 111, 3, 113, 5, 6, 7, -1, 118,
119,
+ -1, 124, 125, 126, 127, 128, 129, 124, 125,
126,
+ 127, 128, 129, 136, -1, -1, -1, -1, -1,
139,
+ 143, -1, -1, -1, 141, -1, 143, 124, 125,
126,
+ 127, 128, 129, 125, 126, 127, 128, 129, 3,
4,
+ 5, 6, -1, 100, 141, -1, 143, -1, -1,
-1,
+ 3, 143, 5, 6, 7, 20, -1, 22, 3,
-1,
+ 5, 6, -1, 28, -1, -1, -1, 32, -1,
126,
+ -1, 128, -1, 130, -1, -1, -1, 42, 135,
-1,
+ -1, 46, 47, -1, -1, 50, -1, 52, -1,
100,
+ -1, -1, -1, -1, 59, -1, -1, 9, -1,
-1,
+ -1, -1, -1, -1, -1, 70, 71, -1, -1,
-1,
+ -1, 76, -1, -1, -1, 126, -1, 128, -1,
130,
+ 32, -1, -1, -1, 135, 37, -1, -1, 40,
-1,
+ -1, 96, 97, 98, 46, 100, 101, 49, -1,
-1,
+ 105, -1, -1, -1, -1, -1, 111, 100, 113,
-1,
+ -1, -1, 64, 118, 119, 100, -1, -1, -1,
-1,
+ 72, 126, -1, 128, -1, 130, -1, -1, 4,
-1,
+ 135, -1, -1, 126, -1, 128, -1, 130, -1,
-1,
+ -1, 126, 135, 128, 20, 130, 22, -1, -1,
-1,
+ 135, -1, 28, 105, -1, -1, 32, -1, 110,
111,
+ -1, -1, -1, -1, -1, -1, 42, 32, -1,
-1,
+ 46, 47, 37, -1, 50, 40, 52, -1, -1,
-1,
+ -1, 46, 134, 59, 49, -1, -1, 139, -1,
-1,
+ -1, -1, -1, -1, 70, 71, -1, -1, 32,
64,
+ 76, -1, -1, 37, -1, -1, 40, 72, -1,
32,
+ -1, -1, 46, -1, 37, 49, -1, -1, -1,
32,
+ 96, 97, 98, 46, 37, 101, 49, -1, -1,
105,
+ 64, -1, -1, 46, -1, 111, 49, 113, 72,
-1,
+ 105, 64, 118, 119, -1, 110, 111, -1, -1,
-1,
+ -1, 64, -1, -1, -1, -1, -1, -1, -1,
-1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1,
134,
+ -1, 105, -1, 138, 139, -1, 110, 111, -1,
-1,
+ -1, -1, 105, -1, -1, -1, -1, 110, 111,
-1,
+ -1, -1, 105, -1, -1, -1, -1, 110, 111,
-1,
+ 134, -1, -1, -1, -1, 139, -1, -1, -1,
-1,
+ 16, 134, 18, -1, -1, 138, 139, -1, 24,
-1,
+ 26, 134, -1, -1, -1, 138, 139, 33, 34,
35,
+ 36, -1, 38, 39, -1, 41, -1, 43, 44,
45,
+ -1, -1, 48, -1, -1, 51, -1, 53, 54,
55,
+ 56, 57, 58, -1, 60, 61, 62, 63, -1,
-1,
+ 66, -1, -1, 69, -1, -1, -1, 73, -1,
75,
+ -1, -1, -1, 79, 80, 81, 82, 83, 84,
85,
+ -1, 87, 88, 89, 90, 91, 92, 93, 94,
95,
+ -1, -1, -1, 99, -1, -1, 102, -1, 104,
-1,
+ -1, 107, 108, 109, -1, -1, 112, -1, 114,
115,
+ 116, 117, -1, -1, 120
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/share/bison/bison.simple"
@@ -2283,19 +2295,23 @@
{ yyval.var = make_var(yyvsp[0].str); }
break;
case 175:
-#line 553 "./parser.y"
-{ yyval.type = make_type(RPC_FC_BYTE, NULL); }
+#line 551 "./parser.y"
+{ yyval.var = make_var(yyvsp[0].str); }
break;
case 176:
#line 554 "./parser.y"
+{ yyval.type = make_type(RPC_FC_BYTE, NULL); }
+ break;
+case 177:
+#line 555 "./parser.y"
{ yyval.type = make_type(RPC_FC_WCHAR, NULL); }
break;
-case 178:
-#line 556 "./parser.y"
+case 179:
+#line 557 "./parser.y"
{ yyval.type = yyvsp[0].type; yyval.type->sign = 1; }
break;
-case 179:
-#line 557 "./parser.y"
+case 180:
+#line 558 "./parser.y"
{ yyval.type = yyvsp[0].type; yyval.type->sign = -1;
switch
(yyval.type->type) {
case RPC_FC_CHAR:
break;
@@ -2309,13 +2325,9 @@
}
}
break;
-case 180:
-#line 569 "./parser.y"
-{ yyval.type = make_type(RPC_FC_ULONG, &std_int); yyval.type->sign =
-1; }
- break;
case 181:
#line 570 "./parser.y"
-{ yyval.type = make_type(RPC_FC_FLOAT, NULL); }
+{ yyval.type = make_type(RPC_FC_ULONG, &std_int); yyval.type->sign =
-1; }
break;
case 182:
#line 571 "./parser.y"
@@ -2323,92 +2335,96 @@
break;
case 183:
#line 572 "./parser.y"
-{ yyval.type = make_type(RPC_FC_DOUBLE, NULL); }
+{ yyval.type = make_type(RPC_FC_FLOAT, NULL); }
break;
case 184:
#line 573 "./parser.y"
-{ yyval.type = make_type(RPC_FC_SMALL, &std_bool); }
+{ yyval.type = make_type(RPC_FC_DOUBLE, NULL); }
break;
case 185:
#line 574 "./parser.y"
-{ yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); }
+{ yyval.type = make_type(RPC_FC_SMALL, &std_bool); }
break;
case 186:
#line 575 "./parser.y"
+{ yyval.type = make_type(RPC_FC_ERROR_STATUS_T, NULL); }
+ break;
+case 187:
+#line 576 "./parser.y"
{ yyval.type = make_type(RPC_FC_IGNORE, NULL); }
break;
-case 189:
-#line 582 "./parser.y"
-{ yyval.type = make_type(RPC_FC_LONG, &std_int); }
- break;
case 190:
#line 583 "./parser.y"
-{ yyval.type = make_type(RPC_FC_SMALL, NULL); }
+{ yyval.type = make_type(RPC_FC_LONG, &std_int); }
break;
case 191:
#line 584 "./parser.y"
-{ yyval.type = make_type(RPC_FC_SHORT, NULL); }
+{ yyval.type = make_type(RPC_FC_SMALL, NULL); }
break;
case 192:
#line 585 "./parser.y"
-{ yyval.type = make_type(RPC_FC_LONG, NULL); }
+{ yyval.type = make_type(RPC_FC_SHORT, NULL); }
break;
case 193:
#line 586 "./parser.y"
[truncated at 1000 lines; 366 more skipped]