restructured member variable names
diff --git a/libasn1parser/asn1p_module.c b/libasn1parser/asn1p_module.c
index d430844..0202f0f 100644
--- a/libasn1parser/asn1p_module.c
+++ b/libasn1parser/asn1p_module.c
@@ -27,8 +27,8 @@
if(mod) {
asn1p_expr_t *expr;
- if(mod->Identifier)
- free(mod->Identifier);
+ if(mod->ModuleName)
+ free(mod->ModuleName);
if(mod->module_oid)
asn1p_oid_free(mod->module_oid);
diff --git a/libasn1parser/asn1p_module.h b/libasn1parser/asn1p_module.h
index 7d8bcc6..e34ffde 100644
--- a/libasn1parser/asn1p_module.h
+++ b/libasn1parser/asn1p_module.h
@@ -36,9 +36,9 @@
char *source_file_name;
/*
- * Human-readable module identifier.
+ * Human-readable module reference.
*/
- char *Identifier; /* Module name */
+ char *ModuleName;
/*
* Unique module identifier, OID.
diff --git a/libasn1parser/asn1p_xports.c b/libasn1parser/asn1p_xports.c
index cfc9fa4..abe1232 100644
--- a/libasn1parser/asn1p_xports.c
+++ b/libasn1parser/asn1p_xports.c
@@ -25,10 +25,10 @@
void
asn1p_xports_free(asn1p_xports_t *xp) {
if(xp) {
- if(xp->from)
- free(xp->from);
- if(xp->from_oid)
- asn1p_oid_free(xp->from_oid);
+ if(xp->fromModuleName)
+ free(xp->fromModuleName);
+ if(xp->identifier.oid)
+ asn1p_oid_free(xp->identifier.oid);
free(xp);
}
}
diff --git a/libasn1parser/asn1p_xports.h b/libasn1parser/asn1p_xports.h
index 8f4fade..da90de5 100644
--- a/libasn1parser/asn1p_xports.h
+++ b/libasn1parser/asn1p_xports.h
@@ -17,8 +17,11 @@
/*
* Module name and optional OID, occur after FROM.
*/
- char *from; /* Name of the module */
- asn1p_oid_t *from_oid; /* Optional OID of the module */
+ char *fromModuleName; /* Name of the module */
+ struct AssignedIdentifier {
+ asn1p_oid_t *oid; /* Optional OID of the module */
+ asn1p_value_t *value; /* DefinedValue */
+ } identifier;
/*
* Number of entities to import.
diff --git a/libasn1parser/asn1p_y.c b/libasn1parser/asn1p_y.c
index 9656f17..6c4e9ff 100644
--- a/libasn1parser/asn1p_y.c
+++ b/libasn1parser/asn1p_y.c
@@ -138,36 +138,41 @@
#define yylineno asn1p_lineno
extern int asn1p_lineno;
+/*
+ * This temporary variable is used to solve the shortcomings of 1-lookahead
+ * parser.
+ */
+static struct AssignedIdentifier *saved_aid;
static asn1p_value_t *
_convert_bitstring2binary(char *str, int base);
-#define checkmem(ptr) do { \
- if(!(ptr)) \
- return yyerror("Memory failure"); \
+#define checkmem(ptr) do { \
+ if(!(ptr)) \
+ return yyerror("Memory failure"); \
} while(0)
-#define CONSTRAINT_INSERT(root, constr_type, arg1, arg2) do { \
- if(arg1->type != constr_type) { \
- int __ret; \
- root = asn1p_constraint_new(yylineno); \
- checkmem(root); \
- root->type = constr_type; \
- __ret = asn1p_constraint_insert(root, \
- arg1); \
- checkmem(__ret == 0); \
- } else { \
- root = arg1; \
- } \
- if(arg2) { \
- int __ret \
- = asn1p_constraint_insert(root, arg2); \
- checkmem(__ret == 0); \
- } \
+#define CONSTRAINT_INSERT(root, constr_type, arg1, arg2) do { \
+ if(arg1->type != constr_type) { \
+ int __ret; \
+ root = asn1p_constraint_new(yylineno); \
+ checkmem(root); \
+ root->type = constr_type; \
+ __ret = asn1p_constraint_insert(root, \
+ arg1); \
+ checkmem(__ret == 0); \
+ } else { \
+ root = arg1; \
+ } \
+ if(arg2) { \
+ int __ret \
+ = asn1p_constraint_insert(root, arg2); \
+ checkmem(__ret == 0); \
+ } \
} while(0)
-#line 62 "asn1p_y.y"
+#line 67 "asn1p_y.y"
typedef union {
asn1p_t *a_grammar;
asn1p_module_flags_e a_module_flags;
@@ -177,6 +182,7 @@
asn1p_constraint_t *a_constr; /* Constraint */
enum asn1p_constraint_type_e a_ctype;/* Constraint type */
asn1p_xports_t *a_xports; /* IMports/EXports */
+ struct AssignedIdentifier a_aid; /* Assigned Identifier */
asn1p_oid_t *a_oid; /* Object Identifier */
asn1p_oid_arc_t a_oid_arc; /* Single OID's arc */
struct asn1p_type_tag_s a_tag; /* A tag */
@@ -210,11 +216,11 @@
-#define YYFINAL 425
+#define YYFINAL 426
#define YYFLAG -32768
#define YYNTBASE 118
-#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 220)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 221)
static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -260,145 +266,145 @@
0, 2, 4, 7, 16, 17, 19, 23, 26, 28,
31, 33, 38, 40, 41, 43, 45, 48, 51, 54,
57, 60, 63, 64, 66, 68, 71, 73, 75, 77,
- 79, 81, 82, 86, 88, 92, 95, 97, 100, 105,
- 107, 111, 113, 117, 119, 123, 127, 130, 132, 136,
- 138, 142, 144, 145, 152, 154, 156, 161, 165, 169,
- 176, 178, 182, 184, 188, 192, 196, 198, 202, 204,
- 206, 207, 209, 211, 215, 219, 223, 225, 227, 231,
- 234, 236, 242, 243, 245, 247, 251, 254, 259, 264,
- 265, 267, 268, 275, 277, 280, 282, 284, 286, 290,
- 294, 298, 300, 305, 310, 315, 322, 329, 331, 336,
- 341, 343, 347, 349, 353, 357, 361, 363, 367, 369,
- 373, 375, 377, 379, 381, 386, 390, 391, 395, 397,
- 399, 401, 403, 405, 407, 409, 411, 413, 417, 419,
- 421, 423, 425, 428, 430, 432, 434, 436, 439, 442,
- 444, 446, 449, 452, 454, 456, 458, 460, 462, 465,
- 467, 470, 472, 474, 476, 478, 480, 482, 484, 486,
- 488, 490, 492, 494, 496, 498, 500, 502, 504, 506,
- 508, 509, 511, 513, 518, 522, 527, 529, 533, 539,
- 541, 545, 549, 553, 557, 562, 566, 568, 570, 574,
- 578, 582, 586, 588, 590, 591, 597, 599, 602, 605,
- 609, 611, 613, 615, 617, 619, 621, 623, 625, 629,
- 635, 637, 641, 643, 647, 648, 650, 652, 654, 656,
- 658, 660, 664, 669, 671, 675, 678, 682, 684, 688,
- 689, 691, 693, 696, 699, 703, 705, 709, 711, 716,
- 721, 723, 725, 727, 729, 730, 732, 735, 740, 741,
- 743, 745, 747, 748, 750, 752, 754, 756, 758, 759,
- 761
+ 79, 81, 82, 86, 88, 92, 95, 97, 100, 101,
+ 103, 108, 110, 114, 116, 120, 122, 126, 130, 133,
+ 135, 139, 141, 145, 147, 148, 155, 157, 159, 164,
+ 168, 172, 179, 181, 185, 187, 191, 195, 199, 201,
+ 205, 207, 209, 210, 212, 214, 218, 222, 226, 228,
+ 230, 234, 237, 239, 245, 246, 248, 250, 254, 257,
+ 262, 267, 268, 270, 271, 278, 280, 283, 285, 287,
+ 289, 293, 297, 301, 303, 308, 313, 318, 325, 332,
+ 334, 339, 344, 346, 350, 352, 356, 360, 364, 366,
+ 370, 372, 376, 378, 380, 382, 384, 389, 393, 394,
+ 398, 400, 402, 404, 406, 408, 410, 412, 414, 416,
+ 420, 422, 424, 426, 428, 431, 433, 435, 437, 439,
+ 442, 445, 447, 449, 452, 455, 457, 459, 461, 463,
+ 465, 468, 470, 473, 475, 477, 479, 481, 483, 485,
+ 487, 489, 491, 493, 495, 497, 499, 501, 503, 505,
+ 507, 509, 511, 512, 514, 516, 521, 525, 530, 532,
+ 536, 542, 544, 548, 552, 556, 560, 565, 569, 571,
+ 573, 577, 581, 585, 589, 591, 593, 594, 600, 602,
+ 605, 608, 612, 614, 616, 618, 620, 622, 624, 626,
+ 628, 632, 638, 640, 644, 646, 650, 651, 653, 655,
+ 657, 659, 661, 663, 667, 672, 674, 678, 681, 685,
+ 687, 691, 692, 694, 696, 699, 702, 706, 708, 712,
+ 714, 719, 724, 726, 728, 730, 732, 733, 735, 738,
+ 743, 744, 746, 748, 750, 751, 753, 755, 757, 759,
+ 761, 762, 764
};
static const short yyrhs[] = { 119,
- 0, 120, 0, 119, 120, 0, 216, 121, 36, 125,
+ 0, 120, 0, 119, 120, 0, 217, 121, 36, 125,
3, 23, 128, 41, 0, 0, 122, 0, 105, 123,
106, 0, 105, 106, 0, 124, 0, 123, 124, 0,
- 219, 0, 219, 107, 9, 108, 0, 9, 0, 0,
+ 220, 0, 220, 107, 9, 108, 0, 9, 0, 0,
126, 0, 127, 0, 126, 127, 0, 43, 86, 0,
54, 86, 0, 22, 86, 0, 45, 55, 0, 14,
59, 0, 0, 129, 0, 130, 0, 129, 130, 0,
- 132, 0, 137, 0, 143, 0, 170, 0, 140, 0,
- 0, 40, 14, 131, 0, 179, 0, 56, 133, 109,
- 0, 56, 48, 0, 134, 0, 133, 134, 0, 135,
- 48, 216, 121, 0, 136, 0, 135, 110, 136, 0,
- 216, 0, 216, 105, 106, 0, 219, 0, 44, 138,
- 109, 0, 44, 19, 109, 0, 44, 109, 0, 139,
- 0, 138, 110, 139, 0, 216, 0, 216, 105, 106,
- 0, 219, 0, 0, 216, 142, 3, 105, 141, 175,
- 0, 165, 0, 176, 0, 216, 3, 211, 89, 0,
- 216, 3, 163, 0, 216, 3, 153, 0, 216, 105,
- 144, 106, 3, 163, 0, 145, 0, 144, 110, 145,
- 0, 216, 0, 216, 111, 219, 0, 216, 111, 216,
- 0, 176, 111, 219, 0, 147, 0, 146, 110, 147,
- 0, 163, 0, 219, 0, 0, 149, 0, 150, 0,
- 149, 110, 150, 0, 219, 163, 205, 0, 32, 70,
- 163, 0, 162, 0, 152, 0, 151, 110, 152, 0,
- 219, 163, 0, 162, 0, 30, 105, 155, 106, 157,
- 0, 0, 90, 0, 156, 0, 155, 110, 156, 0,
- 168, 205, 0, 168, 163, 154, 205, 0, 168, 168,
- 154, 205, 0, 0, 158, 0, 0, 97, 84, 105,
- 159, 160, 106, 0, 161, 0, 160, 161, 0, 4,
- 0, 168, 0, 104, 0, 104, 112, 173, 0, 104,
- 112, 210, 0, 211, 164, 183, 0, 178, 0, 29,
- 105, 151, 106, 0, 80, 105, 148, 106, 0, 81,
- 105, 148, 106, 0, 80, 183, 70, 218, 211, 164,
- 0, 81, 183, 70, 218, 211, 164, 0, 20, 0,
- 20, 37, 27, 219, 0, 216, 105, 146, 106, 0,
- 165, 0, 58, 70, 165, 0, 13, 0, 13, 113,
- 216, 0, 217, 113, 216, 0, 13, 113, 219, 0,
- 217, 0, 217, 113, 166, 0, 167, 0, 166, 113,
- 167, 0, 169, 0, 169, 0, 15, 0, 16, 0,
- 219, 142, 3, 171, 0, 219, 111, 171, 0, 0,
- 105, 172, 175, 0, 65, 0, 47, 0, 88, 0,
- 5, 0, 7, 0, 174, 0, 210, 0, 173, 0,
- 219, 0, 216, 113, 219, 0, 6, 0, 10, 0,
- 11, 0, 4, 0, 175, 4, 0, 26, 0, 65,
- 0, 78, 0, 177, 0, 69, 83, 0, 67, 53,
- 0, 79, 0, 46, 0, 38, 73, 0, 28, 83,
- 0, 93, 0, 49, 0, 179, 0, 60, 0, 42,
- 0, 24, 83, 0, 176, 0, 177, 207, 0, 25,
- 0, 50, 0, 51, 0, 52, 0, 61, 0, 66,
- 0, 76, 0, 85, 0, 87, 0, 92, 0, 94,
- 0, 95, 0, 96, 0, 68, 0, 101, 0, 102,
- 0, 99, 0, 100, 0, 98, 0, 0, 184, 0,
- 185, 0, 82, 107, 186, 108, 0, 107, 186, 108,
- 0, 185, 107, 186, 108, 0, 187, 0, 187, 110,
- 104, 0, 187, 110, 104, 110, 187, 0, 188, 0,
- 19, 98, 188, 0, 187, 180, 188, 0, 187, 181,
- 188, 0, 188, 182, 188, 0, 191, 107, 186, 108,
- 0, 107, 186, 108, 0, 192, 0, 193, 0, 192,
- 190, 192, 0, 63, 190, 192, 0, 192, 190, 62,
- 0, 63, 190, 62, 0, 199, 0, 194, 0, 0,
- 33, 27, 105, 189, 175, 0, 103, 0, 103, 114,
- 0, 114, 103, 0, 114, 103, 114, 0, 82, 0,
- 48, 0, 47, 0, 88, 0, 210, 0, 174, 0,
- 219, 0, 216, 0, 97, 31, 185, 0, 97, 32,
- 105, 195, 106, 0, 196, 0, 195, 110, 196, 0,
- 104, 0, 219, 183, 197, 0, 0, 198, 0, 75,
- 0, 17, 0, 71, 0, 200, 0, 201, 0, 105,
- 216, 106, 0, 200, 105, 202, 106, 0, 203, 0,
- 202, 110, 203, 0, 115, 204, 0, 115, 113, 204,
- 0, 219, 0, 204, 113, 219, 0, 0, 206, 0,
- 71, 0, 35, 171, 0, 105, 106, 0, 105, 208,
- 106, 0, 209, 0, 208, 110, 209, 0, 219, 0,
- 219, 107, 210, 108, 0, 219, 107, 173, 108, 0,
- 210, 0, 104, 0, 9, 0, 12, 0, 0, 212,
- 0, 213, 215, 0, 116, 214, 9, 117, 0, 0,
- 91, 0, 21, 0, 77, 0, 0, 54, 0, 43,
- 0, 13, 0, 14, 0, 14, 0, 0, 219, 0,
- 8, 0
+ 132, 0, 138, 0, 144, 0, 171, 0, 141, 0,
+ 0, 40, 14, 131, 0, 180, 0, 56, 133, 109,
+ 0, 56, 48, 0, 135, 0, 133, 135, 0, 0,
+ 122, 0, 136, 48, 217, 134, 0, 137, 0, 136,
+ 110, 137, 0, 217, 0, 217, 105, 106, 0, 220,
+ 0, 44, 139, 109, 0, 44, 19, 109, 0, 44,
+ 109, 0, 140, 0, 139, 110, 140, 0, 217, 0,
+ 217, 105, 106, 0, 220, 0, 0, 217, 143, 3,
+ 105, 142, 176, 0, 166, 0, 177, 0, 217, 3,
+ 212, 89, 0, 217, 3, 164, 0, 217, 3, 154,
+ 0, 217, 105, 145, 106, 3, 164, 0, 146, 0,
+ 145, 110, 146, 0, 217, 0, 217, 111, 220, 0,
+ 217, 111, 217, 0, 177, 111, 220, 0, 148, 0,
+ 147, 110, 148, 0, 164, 0, 220, 0, 0, 150,
+ 0, 151, 0, 150, 110, 151, 0, 220, 164, 206,
+ 0, 32, 70, 164, 0, 163, 0, 153, 0, 152,
+ 110, 153, 0, 220, 164, 0, 163, 0, 30, 105,
+ 156, 106, 158, 0, 0, 90, 0, 157, 0, 156,
+ 110, 157, 0, 169, 206, 0, 169, 164, 155, 206,
+ 0, 169, 169, 155, 206, 0, 0, 159, 0, 0,
+ 97, 84, 105, 160, 161, 106, 0, 162, 0, 161,
+ 162, 0, 4, 0, 169, 0, 104, 0, 104, 112,
+ 174, 0, 104, 112, 211, 0, 212, 165, 184, 0,
+ 179, 0, 29, 105, 152, 106, 0, 80, 105, 149,
+ 106, 0, 81, 105, 149, 106, 0, 80, 184, 70,
+ 219, 212, 165, 0, 81, 184, 70, 219, 212, 165,
+ 0, 20, 0, 20, 37, 27, 220, 0, 217, 105,
+ 147, 106, 0, 166, 0, 58, 70, 166, 0, 13,
+ 0, 13, 113, 217, 0, 218, 113, 217, 0, 13,
+ 113, 220, 0, 218, 0, 218, 113, 167, 0, 168,
+ 0, 167, 113, 168, 0, 170, 0, 170, 0, 15,
+ 0, 16, 0, 220, 143, 3, 172, 0, 220, 111,
+ 172, 0, 0, 105, 173, 176, 0, 65, 0, 47,
+ 0, 88, 0, 5, 0, 7, 0, 175, 0, 211,
+ 0, 174, 0, 220, 0, 217, 113, 220, 0, 6,
+ 0, 10, 0, 11, 0, 4, 0, 176, 4, 0,
+ 26, 0, 65, 0, 78, 0, 178, 0, 69, 83,
+ 0, 67, 53, 0, 79, 0, 46, 0, 38, 73,
+ 0, 28, 83, 0, 93, 0, 49, 0, 180, 0,
+ 60, 0, 42, 0, 24, 83, 0, 177, 0, 178,
+ 208, 0, 25, 0, 50, 0, 51, 0, 52, 0,
+ 61, 0, 66, 0, 76, 0, 85, 0, 87, 0,
+ 92, 0, 94, 0, 95, 0, 96, 0, 68, 0,
+ 101, 0, 102, 0, 99, 0, 100, 0, 98, 0,
+ 0, 185, 0, 186, 0, 82, 107, 187, 108, 0,
+ 107, 187, 108, 0, 186, 107, 187, 108, 0, 188,
+ 0, 188, 110, 104, 0, 188, 110, 104, 110, 188,
+ 0, 189, 0, 19, 98, 189, 0, 188, 181, 189,
+ 0, 188, 182, 189, 0, 189, 183, 189, 0, 192,
+ 107, 187, 108, 0, 107, 187, 108, 0, 193, 0,
+ 194, 0, 193, 191, 193, 0, 63, 191, 193, 0,
+ 193, 191, 62, 0, 63, 191, 62, 0, 200, 0,
+ 195, 0, 0, 33, 27, 105, 190, 176, 0, 103,
+ 0, 103, 114, 0, 114, 103, 0, 114, 103, 114,
+ 0, 82, 0, 48, 0, 47, 0, 88, 0, 211,
+ 0, 175, 0, 220, 0, 217, 0, 97, 31, 186,
+ 0, 97, 32, 105, 196, 106, 0, 197, 0, 196,
+ 110, 197, 0, 104, 0, 220, 184, 198, 0, 0,
+ 199, 0, 75, 0, 17, 0, 71, 0, 201, 0,
+ 202, 0, 105, 217, 106, 0, 201, 105, 203, 106,
+ 0, 204, 0, 203, 110, 204, 0, 115, 205, 0,
+ 115, 113, 205, 0, 220, 0, 205, 113, 220, 0,
+ 0, 207, 0, 71, 0, 35, 172, 0, 105, 106,
+ 0, 105, 209, 106, 0, 210, 0, 209, 110, 210,
+ 0, 220, 0, 220, 107, 211, 108, 0, 220, 107,
+ 174, 108, 0, 211, 0, 104, 0, 9, 0, 12,
+ 0, 0, 213, 0, 214, 216, 0, 116, 215, 9,
+ 117, 0, 0, 91, 0, 21, 0, 77, 0, 0,
+ 54, 0, 43, 0, 13, 0, 14, 0, 14, 0,
+ 0, 220, 0, 8, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 306, 312, 318, 334, 359, 361, 364, 368, 373, 380,
- 388, 393, 397, 406, 408, 416, 420, 428, 432, 435,
- 438, 442, 462, 464, 472, 476, 508, 512, 521, 528,
- 541, 548, 550, 562, 575, 582, 587, 593, 599, 608,
- 614, 620, 627, 633, 641, 645, 648, 655, 661, 667,
- 674, 680, 689, 691, 700, 708, 722, 734, 740, 756,
- 765, 775, 785, 790, 797, 804, 814, 820, 826, 830,
- 853, 855, 857, 863, 869, 876, 883, 888, 894, 900,
- 906, 911, 921, 923, 926, 934, 940, 949, 955, 972,
- 974, 979, 983, 988, 993, 999, 1003, 1014, 1023, 1032,
- 1043, 1065, 1069, 1075, 1081, 1087, 1097, 1107, 1113, 1127,
- 1151, 1158, 1172, 1181, 1191, 1201, 1211, 1219, 1240, 1249,
- 1258, 1259, 1261, 1268, 1280, 1290, 1298, 1298, 1303, 1308,
- 1313, 1318, 1322, 1326, 1329, 1332, 1337, 1349, 1366, 1371,
- 1376, 1409, 1419, 1433, 1435, 1436, 1437, 1438, 1439, 1440,
- 1441, 1442, 1443, 1444, 1445, 1446, 1452, 1454, 1455, 1458,
- 1465, 1477, 1479, 1483, 1487, 1488, 1489, 1490, 1491, 1495,
- 1496, 1497, 1498, 1502, 1503, 1510, 1510, 1511, 1511, 1512,
- 1514, 1516, 1521, 1525, 1534, 1538, 1543, 1547, 1553, 1563,
- 1567, 1570, 1573, 1576, 1581, 1590, 1598, 1604, 1610, 1617,
- 1625, 1633, 1642, 1645, 1648, 1649, 1659, 1661, 1662, 1663,
- 1666, 1670, 1675, 1681, 1686, 1689, 1692, 1705, 1719, 1723,
- 1728, 1732, 1737, 1744, 1757, 1759, 1762, 1766, 1769, 1774,
- 1778, 1786, 1801, 1807, 1814, 1827, 1839, 1854, 1858, 1875,
- 1880, 1883, 1888, 1910, 1915, 1920, 1926, 1932, 1940, 1948,
- 1956, 1963, 1973, 1978, 2008, 2010, 2013, 2020, 2026, 2028,
- 2029, 2030, 2033, 2035, 2036, 2039, 2044, 2051, 2058, 2060,
- 2065
+ 313, 319, 325, 341, 366, 368, 371, 375, 380, 387,
+ 395, 400, 404, 413, 415, 423, 427, 435, 439, 442,
+ 445, 449, 469, 471, 479, 483, 515, 519, 528, 535,
+ 548, 555, 557, 569, 582, 593, 598, 604, 610, 612,
+ 615, 626, 632, 638, 645, 651, 659, 663, 666, 673,
+ 679, 685, 692, 698, 707, 709, 718, 726, 740, 752,
+ 758, 774, 783, 793, 803, 808, 815, 822, 832, 838,
+ 844, 848, 871, 873, 875, 881, 887, 894, 901, 906,
+ 912, 918, 924, 929, 939, 941, 944, 952, 958, 967,
+ 973, 990, 992, 997, 1001, 1006, 1011, 1017, 1021, 1032,
+ 1041, 1050, 1061, 1083, 1087, 1093, 1099, 1105, 1115, 1125,
+ 1131, 1145, 1169, 1176, 1190, 1199, 1209, 1219, 1229, 1237,
+ 1258, 1267, 1276, 1277, 1279, 1286, 1298, 1308, 1316, 1316,
+ 1321, 1326, 1331, 1336, 1340, 1344, 1347, 1350, 1355, 1367,
+ 1384, 1389, 1394, 1427, 1437, 1451, 1453, 1454, 1455, 1456,
+ 1457, 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1470, 1472,
+ 1473, 1476, 1483, 1495, 1497, 1501, 1505, 1506, 1507, 1508,
+ 1509, 1513, 1514, 1515, 1516, 1520, 1521, 1528, 1528, 1529,
+ 1529, 1530, 1532, 1534, 1539, 1543, 1552, 1556, 1561, 1565,
+ 1571, 1581, 1585, 1588, 1591, 1594, 1599, 1608, 1616, 1622,
+ 1628, 1635, 1643, 1651, 1660, 1663, 1666, 1667, 1677, 1679,
+ 1680, 1681, 1684, 1688, 1693, 1699, 1704, 1707, 1710, 1723,
+ 1737, 1741, 1746, 1750, 1755, 1762, 1775, 1777, 1780, 1784,
+ 1787, 1792, 1796, 1804, 1819, 1825, 1832, 1845, 1857, 1872,
+ 1876, 1893, 1898, 1901, 1906, 1928, 1933, 1938, 1944, 1950,
+ 1958, 1966, 1974, 1981, 1991, 1996, 2026, 2028, 2031, 2038,
+ 2044, 2046, 2047, 2048, 2051, 2053, 2054, 2057, 2062, 2069,
+ 2076, 2078, 2083
};
#endif
@@ -429,14 +435,14 @@
"ModuleSpecification","optObjectIdentifier","ObjectIdentifier","ObjectIdentifierBody",
"ObjectIdentifierElement","optModuleSpecificationFlags","ModuleSpecificationFlags",
"ModuleSpecificationFlag","optModuleSpecificationBody","ModuleSpecificationBody",
-"ModuleSpecificationElement","@1","ImportsDefinition","ImportsBundleSet","ImportsBundle",
-"ImportsList","ImportsElement","ExportsDefinition","ExportsBody","ExportsElement",
-"ValueSetDefinition","@2","DefinedTypeRef","DataTypeReference","ParameterArgumentList",
-"ParameterArgumentName","ActualParameterList","ActualParameter","optComponentTypeLists",
-"ComponentTypeLists","ComponentType","AlternativeTypeLists","AlternativeType",
-"ClassDeclaration","optUnique","ClassFieldList","ClassField","optWithSyntax",
-"WithSyntax","@3","WithSyntaxFormat","WithSyntaxFormatToken","ExtensionAndException",
-"Type","TypeDeclaration","ComplexTypeReference","ComplexTypeReferenceAmpList",
+"ModuleSpecificationElement","@1","ImportsDefinition","ImportsBundleSet","AssignedIdentifier",
+"ImportsBundle","ImportsList","ImportsElement","ExportsDefinition","ExportsBody",
+"ExportsElement","ValueSetDefinition","@2","DefinedTypeRef","DataTypeReference",
+"ParameterArgumentList","ParameterArgumentName","ActualParameterList","ActualParameter",
+"optComponentTypeLists","ComponentTypeLists","ComponentType","AlternativeTypeLists",
+"AlternativeType","ClassDeclaration","optUnique","ClassFieldList","ClassField",
+"optWithSyntax","WithSyntax","@3","WithSyntaxFormat","WithSyntaxFormatToken",
+"ExtensionAndException","Type","TypeDeclaration","ComplexTypeReference","ComplexTypeReferenceAmpList",
"ComplexTypeReferenceElement","ClassFieldIdentifier","ClassFieldName","ValueDefinition",
"Value","@4","DefinedValue","RestrictedCharacterStringValue","Opaque","BasicTypeId",
"BasicTypeId_UniverationCompatible","BasicType","BasicString","Union","Intersection",
@@ -455,358 +461,358 @@
118, 119, 119, 120, 121, 121, 122, 122, 123, 123,
124, 124, 124, 125, 125, 126, 126, 127, 127, 127,
127, 127, 128, 128, 129, 129, 130, 130, 130, 130,
- 130, 131, 130, 130, 132, 132, 133, 133, 134, 135,
- 135, 136, 136, 136, 137, 137, 137, 138, 138, 139,
- 139, 139, 141, 140, 142, 142, 143, 143, 143, 143,
- 144, 144, 145, 145, 145, 145, 146, 146, 147, 147,
- 148, 148, 149, 149, 150, 150, 150, 151, 151, 152,
- 152, 153, 154, 154, 155, 155, 156, 156, 156, 157,
- 157, 159, 158, 160, 160, 161, 161, 162, 162, 162,
- 163, 164, 164, 164, 164, 164, 164, 164, 164, 164,
- 164, 164, 165, 165, 165, 165, 165, 165, 166, 166,
- 167, 168, 169, 169, 170, 171, 172, 171, 171, 171,
- 171, 171, 171, 171, 171, 171, 173, 173, 174, 174,
- 174, 175, 175, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 177, 177, 177, 178,
- 178, 179, 179, 179, 179, 179, 179, 179, 179, 179,
- 179, 179, 179, 179, 179, 180, 180, 181, 181, 182,
- 183, 183, 184, 184, 185, 185, 186, 186, 186, 187,
- 187, 187, 187, 187, 188, 188, 188, 188, 188, 188,
- 188, 188, 188, 188, 189, 188, 190, 190, 190, 190,
- 191, 191, 192, 192, 192, 192, 192, 193, 194, 194,
- 195, 195, 196, 196, 197, 197, 198, 198, 198, 199,
- 199, 200, 201, 202, 202, 203, 203, 204, 204, 205,
- 205, 206, 206, 207, 207, 208, 208, 209, 209, 209,
- 209, 209, 210, 210, 211, 211, 212, 213, 214, 214,
- 214, 214, 215, 215, 215, 216, 216, 217, 218, 218,
- 219
+ 130, 131, 130, 130, 132, 132, 133, 133, 134, 134,
+ 135, 136, 136, 137, 137, 137, 138, 138, 138, 139,
+ 139, 140, 140, 140, 142, 141, 143, 143, 144, 144,
+ 144, 144, 145, 145, 146, 146, 146, 146, 147, 147,
+ 148, 148, 149, 149, 150, 150, 151, 151, 151, 152,
+ 152, 153, 153, 154, 155, 155, 156, 156, 157, 157,
+ 157, 158, 158, 160, 159, 161, 161, 162, 162, 163,
+ 163, 163, 164, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 165, 166, 166, 166, 166, 166, 166,
+ 167, 167, 168, 169, 170, 170, 171, 172, 173, 172,
+ 172, 172, 172, 172, 172, 172, 172, 172, 174, 174,
+ 175, 175, 175, 176, 176, 177, 177, 177, 177, 177,
+ 177, 177, 177, 177, 177, 177, 177, 177, 178, 178,
+ 178, 179, 179, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 181, 181, 182,
+ 182, 183, 184, 184, 185, 185, 186, 186, 187, 187,
+ 187, 188, 188, 188, 188, 188, 189, 189, 189, 189,
+ 189, 189, 189, 189, 189, 189, 190, 189, 191, 191,
+ 191, 191, 192, 192, 193, 193, 193, 193, 193, 194,
+ 195, 195, 196, 196, 197, 197, 198, 198, 199, 199,
+ 199, 200, 200, 201, 202, 203, 203, 204, 204, 205,
+ 205, 206, 206, 207, 207, 208, 208, 209, 209, 210,
+ 210, 210, 210, 210, 211, 211, 212, 212, 213, 214,
+ 215, 215, 215, 215, 216, 216, 216, 217, 217, 218,
+ 219, 219, 220
};
static const short yyr2[] = { 0,
1, 1, 2, 8, 0, 1, 3, 2, 1, 2,
1, 4, 1, 0, 1, 1, 2, 2, 2, 2,
2, 2, 0, 1, 1, 2, 1, 1, 1, 1,
- 1, 0, 3, 1, 3, 2, 1, 2, 4, 1,
- 3, 1, 3, 1, 3, 3, 2, 1, 3, 1,
- 3, 1, 0, 6, 1, 1, 4, 3, 3, 6,
- 1, 3, 1, 3, 3, 3, 1, 3, 1, 1,
- 0, 1, 1, 3, 3, 3, 1, 1, 3, 2,
- 1, 5, 0, 1, 1, 3, 2, 4, 4, 0,
- 1, 0, 6, 1, 2, 1, 1, 1, 3, 3,
- 3, 1, 4, 4, 4, 6, 6, 1, 4, 4,
- 1, 3, 1, 3, 3, 3, 1, 3, 1, 3,
- 1, 1, 1, 1, 4, 3, 0, 3, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 3, 1, 1,
- 1, 1, 2, 1, 1, 1, 1, 2, 2, 1,
- 1, 2, 2, 1, 1, 1, 1, 1, 2, 1,
- 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 0, 3, 1, 3, 2, 1, 2, 0, 1,
+ 4, 1, 3, 1, 3, 1, 3, 3, 2, 1,
+ 3, 1, 3, 1, 0, 6, 1, 1, 4, 3,
+ 3, 6, 1, 3, 1, 3, 3, 3, 1, 3,
+ 1, 1, 0, 1, 1, 3, 3, 3, 1, 1,
+ 3, 2, 1, 5, 0, 1, 1, 3, 2, 4,
+ 4, 0, 1, 0, 6, 1, 2, 1, 1, 1,
+ 3, 3, 3, 1, 4, 4, 4, 6, 6, 1,
+ 4, 4, 1, 3, 1, 3, 3, 3, 1, 3,
+ 1, 3, 1, 1, 1, 1, 4, 3, 0, 3,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 3,
+ 1, 1, 1, 1, 2, 1, 1, 1, 1, 2,
+ 2, 1, 1, 2, 2, 1, 1, 1, 1, 1,
+ 2, 1, 2, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 1, 4, 3, 4, 1, 3, 5, 1,
- 3, 3, 3, 3, 4, 3, 1, 1, 3, 3,
- 3, 3, 1, 1, 0, 5, 1, 2, 2, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 3, 5,
- 1, 3, 1, 3, 0, 1, 1, 1, 1, 1,
- 1, 3, 4, 1, 3, 2, 3, 1, 3, 0,
- 1, 1, 2, 2, 3, 1, 3, 1, 4, 4,
- 1, 1, 1, 1, 0, 1, 2, 4, 0, 1,
- 1, 1, 0, 1, 1, 1, 1, 1, 0, 1,
- 1
+ 1, 1, 0, 1, 1, 4, 3, 4, 1, 3,
+ 5, 1, 3, 3, 3, 3, 4, 3, 1, 1,
+ 3, 3, 3, 3, 1, 1, 0, 5, 1, 2,
+ 2, 3, 1, 1, 1, 1, 1, 1, 1, 1,
+ 3, 5, 1, 3, 1, 3, 0, 1, 1, 1,
+ 1, 1, 1, 3, 4, 1, 3, 2, 3, 1,
+ 3, 0, 1, 1, 2, 2, 3, 1, 3, 1,
+ 4, 4, 1, 1, 1, 1, 0, 1, 2, 4,
+ 0, 1, 1, 1, 0, 1, 1, 1, 1, 1,
+ 0, 1, 1
};
static const short yydefact[] = { 0,
- 266, 267, 1, 2, 5, 3, 0, 0, 6, 271,
+ 268, 269, 1, 2, 5, 3, 0, 0, 6, 273,
13, 8, 0, 9, 11, 14, 7, 10, 0, 0,
0, 0, 0, 0, 0, 15, 16, 0, 22, 20,
- 18, 21, 19, 0, 17, 12, 23, 162, 0, 0,
- 163, 164, 165, 0, 166, 167, 175, 168, 169, 170,
- 171, 172, 173, 174, 0, 24, 25, 27, 28, 31,
- 29, 30, 34, 0, 0, 32, 0, 47, 0, 48,
- 50, 52, 36, 0, 37, 0, 40, 42, 44, 4,
- 26, 255, 113, 268, 0, 144, 0, 0, 158, 151,
- 155, 157, 145, 0, 0, 146, 150, 154, 0, 0,
- 55, 56, 147, 156, 117, 0, 33, 46, 45, 0,
- 0, 35, 38, 0, 0, 0, 0, 259, 59, 58,
- 0, 256, 263, 0, 159, 153, 152, 149, 148, 0,
- 61, 0, 63, 0, 0, 0, 49, 51, 5, 41,
- 43, 0, 261, 262, 260, 0, 113, 268, 108, 0,
- 0, 181, 181, 57, 181, 111, 160, 147, 102, 0,
- 265, 264, 257, 114, 116, 0, 0, 0, 0, 53,
- 123, 124, 118, 119, 121, 115, 132, 139, 133, 253,
- 140, 141, 254, 130, 129, 131, 127, 125, 136, 134,
- 135, 0, 137, 39, 0, 85, 255, 122, 0, 0,
- 0, 0, 0, 71, 0, 0, 182, 183, 71, 0,
- 101, 0, 161, 255, 255, 62, 66, 65, 64, 0,
- 0, 0, 0, 0, 90, 0, 0, 242, 83, 83,
- 87, 241, 0, 258, 0, 98, 0, 78, 81, 255,
- 112, 0, 0, 0, 72, 73, 77, 255, 0, 0,
- 213, 212, 0, 211, 214, 0, 0, 0, 216, 0,
- 187, 190, 0, 197, 198, 204, 203, 230, 231, 215,
- 218, 217, 269, 0, 0, 269, 252, 244, 0, 246,
- 251, 248, 0, 67, 69, 70, 60, 142, 54, 120,
- 128, 138, 126, 0, 82, 91, 86, 243, 84, 240,
- 240, 109, 0, 103, 0, 80, 0, 255, 104, 0,
- 240, 0, 0, 207, 0, 0, 0, 0, 0, 0,
- 185, 178, 179, 176, 177, 0, 0, 0, 180, 0,
- 0, 0, 0, 255, 270, 0, 105, 255, 245, 0,
- 0, 110, 255, 143, 0, 88, 89, 99, 100, 137,
- 79, 184, 76, 74, 75, 191, 205, 208, 209, 202,
- 200, 219, 0, 232, 196, 188, 192, 193, 194, 0,
- 201, 199, 0, 0, 234, 0, 186, 0, 247, 0,
- 0, 68, 92, 0, 210, 223, 0, 221, 181, 0,
- 195, 0, 236, 238, 233, 0, 106, 107, 250, 249,
- 0, 206, 220, 0, 225, 189, 237, 0, 235, 96,
- 0, 94, 97, 222, 228, 229, 227, 224, 226, 239,
- 93, 95, 0, 0, 0
+ 18, 21, 19, 0, 17, 12, 23, 164, 0, 0,
+ 165, 166, 167, 0, 168, 169, 177, 170, 171, 172,
+ 173, 174, 175, 176, 0, 24, 25, 27, 28, 31,
+ 29, 30, 34, 0, 0, 32, 0, 49, 0, 50,
+ 52, 54, 36, 0, 37, 0, 42, 44, 46, 4,
+ 26, 257, 115, 270, 0, 146, 0, 0, 160, 153,
+ 157, 159, 147, 0, 0, 148, 152, 156, 0, 0,
+ 57, 58, 149, 158, 119, 0, 33, 48, 47, 0,
+ 0, 35, 38, 0, 0, 0, 0, 261, 61, 60,
+ 0, 258, 265, 0, 161, 155, 154, 151, 150, 0,
+ 63, 0, 65, 0, 0, 0, 51, 53, 39, 43,
+ 45, 0, 263, 264, 262, 0, 115, 270, 110, 0,
+ 0, 183, 183, 59, 183, 113, 162, 149, 104, 0,
+ 267, 266, 259, 116, 118, 0, 0, 0, 0, 55,
+ 125, 126, 120, 121, 123, 117, 134, 141, 135, 255,
+ 142, 143, 256, 132, 131, 133, 129, 127, 138, 136,
+ 137, 0, 139, 40, 41, 0, 87, 257, 124, 0,
+ 0, 0, 0, 0, 73, 0, 0, 184, 185, 73,
+ 0, 103, 0, 163, 257, 257, 64, 68, 67, 66,
+ 0, 0, 0, 0, 0, 92, 0, 0, 244, 85,
+ 85, 89, 243, 0, 260, 0, 100, 0, 80, 83,
+ 257, 114, 0, 0, 0, 74, 75, 79, 257, 0,
+ 0, 215, 214, 0, 213, 216, 0, 0, 0, 218,
+ 0, 189, 192, 0, 199, 200, 206, 205, 232, 233,
+ 217, 220, 219, 271, 0, 0, 271, 254, 246, 0,
+ 248, 253, 250, 0, 69, 71, 72, 62, 144, 56,
+ 122, 130, 140, 128, 0, 84, 93, 88, 245, 86,
+ 242, 242, 111, 0, 105, 0, 82, 0, 257, 106,
+ 0, 242, 0, 0, 209, 0, 0, 0, 0, 0,
+ 0, 187, 180, 181, 178, 179, 0, 0, 0, 182,
+ 0, 0, 0, 0, 257, 272, 0, 107, 257, 247,
+ 0, 0, 112, 257, 145, 0, 90, 91, 101, 102,
+ 139, 81, 186, 78, 76, 77, 193, 207, 210, 211,
+ 204, 202, 221, 0, 234, 198, 190, 194, 195, 196,
+ 0, 203, 201, 0, 0, 236, 0, 188, 0, 249,
+ 0, 0, 70, 94, 0, 212, 225, 0, 223, 183,
+ 0, 197, 0, 238, 240, 235, 0, 108, 109, 252,
+ 251, 0, 208, 222, 0, 227, 191, 239, 0, 237,
+ 98, 0, 96, 99, 224, 230, 231, 229, 226, 228,
+ 241, 95, 97, 0, 0, 0
};
-static const short yydefgoto[] = { 423,
+static const short yydefgoto[] = { 424,
3, 4, 8, 9, 13, 14, 25, 26, 27, 55,
- 56, 57, 107, 58, 74, 75, 76, 77, 59, 69,
- 70, 60, 220, 100, 61, 130, 131, 283, 284, 244,
- 245, 246, 237, 238, 119, 300, 195, 196, 295, 296,
- 401, 411, 412, 247, 285, 155, 156, 173, 174, 197,
- 198, 62, 188, 222, 189, 259, 289, 157, 103, 159,
- 104, 327, 328, 330, 206, 207, 208, 260, 261, 262,
- 384, 316, 263, 264, 265, 266, 387, 388, 418, 419,
- 267, 268, 269, 374, 375, 393, 231, 232, 213, 279,
- 280, 270, 233, 122, 123, 146, 163, 271, 105, 334,
- 272
+ 56, 57, 107, 58, 74, 195, 75, 76, 77, 59,
+ 69, 70, 60, 221, 100, 61, 130, 131, 284, 285,
+ 245, 246, 247, 238, 239, 119, 301, 196, 197, 296,
+ 297, 402, 412, 413, 248, 286, 155, 156, 173, 174,
+ 198, 199, 62, 188, 223, 189, 260, 290, 157, 103,
+ 159, 104, 328, 329, 331, 207, 208, 209, 261, 262,
+ 263, 385, 317, 264, 265, 266, 267, 388, 389, 419,
+ 420, 268, 269, 270, 375, 376, 394, 232, 233, 214,
+ 280, 281, 271, 234, 122, 123, 146, 163, 272, 105,
+ 335, 273
};
-static const short yypact[] = { 228,
--32768,-32768, 228,-32768, -83,-32768, 30, 43,-32768,-32768,
--32768,-32768, 36,-32768, -14, 181,-32768,-32768, 132, 85,
- 68, 73, 109, 95, 193, 181,-32768, 93,-32768,-32768,
--32768,-32768,-32768, 189,-32768,-32768, 429,-32768, 209, 21,
--32768,-32768,-32768, 144,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768, 184, 429,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 354, 658,-32768, 118,-32768, 190,-32768,
- 134,-32768,-32768, 18,-32768, -27,-32768, 156,-32768,-32768,
--32768, -12, 150,-32768, 182,-32768, 204, 195,-32768,-32768,
--32768,-32768,-32768, 236, 212,-32768,-32768,-32768, 733, 299,
--32768,-32768,-32768,-32768, 205, 316,-32768,-32768,-32768, 185,
- 216,-32768,-32768, 228, 185, 217, 219, 25,-32768,-32768,
- 506,-32768, 117, 185,-32768,-32768,-32768,-32768,-32768, -55,
--32768, 210, 214, 223, 266, 63,-32768,-32768, -83,-32768,
--32768, 268,-32768,-32768,-32768, 321, 34, 226, 295, 232,
- 269, -18, -17,-32768, -2,-32768,-32768, 233,-32768, 235,
--32768,-32768,-32768,-32768,-32768, 338, 733, 334, 185,-32768,
--32768,-32768, 234,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+static const short yypact[] = { 87,
+-32768,-32768, 87,-32768, -69,-32768, 35, 82,-32768,-32768,
+-32768,-32768, 37,-32768, -78, 156,-32768,-32768, 114, -6,
+ 89, 108, 147, 125, 151, 156,-32768, 106,-32768,-32768,
+-32768,-32768,-32768, 196,-32768,-32768, 430,-32768, 213, 44,
+-32768,-32768,-32768, 56,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768, 193, 430,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 355, 659,-32768, 137,-32768, -86,-32768,
+ 159,-32768,-32768, 18,-32768, -23,-32768, 161,-32768,-32768,
+-32768, 32, 168,-32768, 199,-32768, 200, 215,-32768,-32768,
+-32768,-32768,-32768, 232, 207,-32768,-32768,-32768, 734, 293,
+-32768,-32768,-32768,-32768, 187, 298,-32768,-32768,-32768, 212,
+ 197,-32768,-32768, 87, 212, 203, 205, 14,-32768,-32768,
+ 507,-32768, 112, 212,-32768,-32768,-32768,-32768,-32768, -8,
+-32768, 204, 218, 221, 304, 68,-32768,-32768, -69,-32768,
+-32768, 122,-32768,-32768,-32768, 302, 55, 226, 295, 233,
+ 263, 58, 75,-32768, -14,-32768,-32768, 234,-32768, 235,
+-32768,-32768,-32768,-32768,-32768, 338, 734, 334, 212,-32768,
+-32768,-32768, 230,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 237, 242,-32768, 81,-32768, 27,-32768, 231, 322,
- 11, 240, 247, 49, 238, 285,-32768, 251, 49, 289,
--32768, 44,-32768, 7, 244,-32768,-32768,-32768,-32768, 358,
- 268, 358, 334, 63, 267, 268, 63,-32768, 273, 273,
--32768,-32768, 583,-32768, 334, 253, 98,-32768,-32768, 244,
--32768, 238, 302, 270, 263,-32768,-32768, 244, 276, 348,
--32768,-32768, 64,-32768,-32768, 275, 228, 238,-32768, 279,
- 130, 283, 277, 64,-32768,-32768,-32768, 272,-32768,-32768,
--32768,-32768, 334, 238, 284, 334,-32768,-32768, 100,-32768,
--32768, 286, 105,-32768,-32768,-32768,-32768,-32768, 379,-32768,
- 379,-32768,-32768, 305,-32768,-32768,-32768,-32768,-32768, -10,
- -10,-32768, 296,-32768, 11,-32768, 287, 244,-32768, 49,
- -10, 264, 293, 280, 288, 174, 292, 297, 301, 300,
--32768,-32768,-32768,-32768,-32768, 306, 264, 264,-32768, 264,
- 238, 282, 294, 244,-32768, 303,-32768, 244,-32768, 51,
- 296,-32768, 7,-32768, 307,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 304,-32768,
--32768, 251, 28,-32768,-32768, 314,-32768,-32768,-32768, 308,
--32768,-32768, 6, 112,-32768, 583,-32768, 583,-32768, 309,
- 317,-32768,-32768, 358,-32768,-32768, 154,-32768, -2, 238,
--32768, 334, 313,-32768,-32768, 294,-32768,-32768,-32768,-32768,
- 159, 379,-32768, 28, 24, 215, 313, 334,-32768,-32768,
- 12,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, 413, 427,-32768
+-32768, 236, 237,-32768,-32768, 61,-32768, 26,-32768, 238,
+ 323, 7, 241, 244, 40, 239, 284,-32768, 249, 40,
+ 289,-32768, 77,-32768, 6, 245,-32768,-32768,-32768,-32768,
+ 356, 122, 356, 334, 68, 266, 122, 68,-32768, 274,
+ 274,-32768,-32768, 584,-32768, 334, 253, 78,-32768,-32768,
+ 245,-32768, 239, 296, 267, 264,-32768,-32768, 245, 277,
+ 349,-32768,-32768, -20,-32768,-32768, 231, 87, 239,-32768,
+ 269, 206, 280, 275, -20,-32768,-32768,-32768, 279,-32768,
+-32768,-32768,-32768, 334, 239, 282, 334,-32768,-32768, 94,
+-32768,-32768, 278, 99,-32768,-32768,-32768,-32768,-32768, 386,
+-32768, 386,-32768,-32768, 307,-32768,-32768,-32768,-32768,-32768,
+ 64, 64,-32768, 228,-32768, 7,-32768, 286, 245,-32768,
+ 40, 64, 265, 287, 281, 297, 181, 292, 291, 303,
+ 300,-32768,-32768,-32768,-32768,-32768, 299, 265, 265,-32768,
+ 265, 239, 283, 310, 245,-32768, 305,-32768, 245,-32768,
+ 47, 228,-32768, 6,-32768, 306,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 312,
+-32768,-32768, 249, 12,-32768,-32768, 308,-32768,-32768,-32768,
+ 309,-32768,-32768, 13, 155,-32768, 584,-32768, 584,-32768,
+ 311, 319,-32768,-32768, 356,-32768,-32768, 174,-32768, -14,
+ 239,-32768, 334, 301,-32768,-32768, 310,-32768,-32768,-32768,
+-32768, 143, 386,-32768, 12, 17, 223, 301, 334,-32768,
+-32768, 24,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 410, 412,-32768
};
static const short yypgoto[] = {-32768,
--32768, 425, 290,-32768,-32768, 418,-32768,-32768, 408,-32768,
--32768, 380,-32768,-32768,-32768, 361,-32768, 323,-32768,-32768,
- 330,-32768,-32768, 386,-32768,-32768, 278,-32768, 101, 243,
--32768, 143,-32768, 151,-32768, 225,-32768, 239,-32768,-32768,
--32768,-32768, 46, -184, -75, -284, -53,-32768, 241, -192,
- -115,-32768, -89,-32768, -255, -58, -214, -41, -120,-32768,
- 45,-32768,-32768,-32768, -151,-32768, 141, -86, 70, -216,
--32768, 197,-32768, -225,-32768,-32768,-32768, 59,-32768,-32768,
--32768,-32768,-32768,-32768, 71, 72, -111,-32768,-32768,-32768,
- 126, -127, -79,-32768,-32768,-32768,-32768, 10,-32768, 192,
- -7
+-32768, 425,-32768, 290,-32768, 417,-32768,-32768, 406,-32768,
+-32768, 379,-32768,-32768,-32768,-32768, 362,-32768, 322,-32768,
+-32768, 329,-32768,-32768, 376,-32768,-32768, 285,-32768, 101,
+ 243,-32768, 135,-32768, 148,-32768, 225,-32768, 240,-32768,
+-32768,-32768,-32768, 45, -193, -77, -203, -53,-32768, 242,
+ -190, -116,-32768, -12,-32768, -277, -76, -216, -48, -120,
+-32768, 34,-32768,-32768,-32768, -151,-32768, 140, -147, 70,
+ -98,-32768, 194,-32768, -295,-32768,-32768,-32768, 57,-32768,
+-32768,-32768,-32768,-32768,-32768, 66, 72, -105,-32768,-32768,
+-32768, 127, -118, -79,-32768,-32768,-32768,-32768, 10,-32768,
+ 189, -7
};
-#define YYLAST 829
+#define YYLAST 830
static const short yytable[] = { 15,
- 158, 210, 121, 211, 230, 15, 120, 291, 191, 5,
- 101, 101, 5, 10, 10, 410, 239, 117, 10, 175,
- 114, 7, 102, 102, 227, 10, 171, 172, 10, 65,
- 1, 2, 72, 1, 2, 10, 79, 10, 11, 67,
- 415, 171, 172, 10, 11, 143, 64, 348, 65, 71,
- 166, 10, 180, 78, 167, 183, 10, 132, 10, 180,
- 228, 227, 183, 203, 203, 64, 79, 177, 178, 179,
- 10, 180, 181, 182, 183, 1, 2, 190, 16, 203,
- 243, 63, 115, 78, 281, 380, 204, 209, 205, 205,
- 361, 397, 19, 398, 416, 356, 191, 228, 417, 191,
- 63, 144, 72, 118, 205, 175, 372, 79, 133, 184,
- 367, 368, 158, 369, 236, 145, 165, 421, 392, 71,
- 239, 229, 118, 139, 78, 132, 112, 185, 193, 68,
- 160, 386, -240, 164, 293, 12, -240, 298, -266, 287,
- 28, 17, 118, 29, 176, 192, 124, 277, 241, 278,
- 186, 10, 236, 30, 277, 307, 1, 2, 31, 161,
- 217, 219, 410, 32, 306, 190, 314, 187, 190, 402,
- 162, 320, 311, 171, 172, 349, 133, 315, 218, 178,
- 33, 10, 180, 181, 182, 183, 225, 336, 346, 347,
- 226, 73, 10, 240, 20, 34, 248, 1, 2, 355,
- 36, 248, 21, 304, 282, 339, 286, 305, 413, 340,
- 342, 37, 281, 381, 343, 292, 193, 395, 413, 193,
- 251, 396, 66, 22, 80, 23, 108, 302, 322, 323,
- 324, 325, 353, 192, 24, 360, 192, 405, 111, 326,
- 1, 2, 160, 178, 370, 10, 180, 181, 182, 183,
- 1, 2, 83, 84, 376, 158, 249, 158, 378, 403,
- 116, 255, 124, 404, 125, 335, 319, 127, 335, 178,
- 250, 10, 180, 181, 182, 183, 1, 2, 1, 2,
- 171, 172, 171, 172, 251, 252, 126, 178, 128, 10,
- 180, 181, 182, 183, 129, 350, 250, 240, 109, 110,
- 253, 134, 248, 10, 180, 317, 318, 183, 1, 2,
- 251, 252, 192, 322, 323, 324, 325, 135, 136, 254,
- 168, 138, 141, 142, 169, 255, 253, 170, 251, 199,
- -267, 200, 282, 350, 256, 286, 201, 212, 202, 214,
- 215, 10, 257, 371, 258, 254, 221, 234, 235, 223,
- 192, 255, 224, 242, 273, 389, 82, 274, 276, 118,
- 256, 288, 299, 294, 303, 394, 83, 84, 257, 255,
- 258, 308, 310, 312, 313, 309, 333, 85, 38, 86,
- 329, 87, 344, 331, 394, 160, 321, 160, 345, 337,
- 359, 88, 341, 358, 352, 89, 389, 357, 205, 90,
- 420, 363, 91, 41, 42, 43, 364, 365, 373, 366,
- 377, 383, 424, 92, 45, 391, 399, 385, 93, 46,
- 94, 47, 95, 390, 400, 408, 425, 6, 194, 48,
- 18, 96, 97, 35, 113, 81, 10, 140, 49, 137,
- 50, 1, 2, 382, 216, 51, 98, 52, 53, 54,
- 106, 275, 354, 38, 301, 351, 422, 362, 99, 406,
- 332, 290, 414, 407, 297, 379, 409, 338, 39, 0,
- 0, 0, 40, 0, 0, 0, 0, 0, 41, 42,
- 43, 0, 0, 0, 44, 0, 0, 0, 0, 45,
- 0, 0, 0, 0, 46, 0, 47, 0, 0, 0,
- 0, 0, 0, 0, 48, 0, 0, 0, 0, 0,
- 0, 0, 0, 49, 0, 50, 0, 0, 147, 148,
- 51, 0, 52, 53, 54, 149, 0, 0, 0, 85,
- 38, 86, 0, 87, 150, 0, 0, 0, 0, 0,
- 0, 0, 0, 88, 0, 0, 0, 89, 0, 0,
- 0, 90, 0, 0, 91, 41, 42, 43, 0, 0,
- 0, 0, 0, 151, 0, 92, 45, 0, 0, 0,
- 93, 46, 94, 47, 95, 0, 0, 0, 0, 0,
- 0, 48, 0, 96, 97, 152, 153, 0, 0, 0,
- 49, 0, 50, 0, 154, 147, 148, 51, 98, 52,
- 53, 54, 149, 0, 0, 0, 85, 38, 86, 0,
- 87, 150, 0, 0, 0, 0, 0, 0, 0, 0,
- 88, 0, 0, 0, 89, 0, 0, 0, 90, 0,
- 0, 91, 41, 42, 43, 0, 0, 0, 0, 0,
- 151, 0, 92, 45, 0, 0, 0, 93, 46, 94,
- 47, 95, 0, 0, 0, 0, 0, 0, 48, 0,
- 96, 97, 152, 153, 0, 0, 0, 49, 0, 50,
- 83, 84, 0, 0, 51, 98, 52, 53, 54, 0,
- 0, 85, 38, 86, 0, 87, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 88, 0, 0, 0, 89,
- 0, 0, 0, 90, 0, 0, 91, 41, 42, 43,
- 0, 0, 0, 0, 0, 0, 0, 92, 45, 0,
- 0, 0, 93, 46, 94, 47, 95, 0, 0, 0,
- 0, 0, 0, 48, 0, 96, 97, 0, 0, 0,
- 0, 0, 49, 0, 50, 1, 2, 0, 0, 51,
- 98, 52, 53, 54, 0, 0, 85, 38, 86, 0,
- 87, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 88, 0, 0, 0, 89, 0, 0, 0, 90, 0,
- 0, 91, 41, 42, 43, 0, 0, 0, 0, 0,
- 0, 0, 92, 45, 0, 0, 0, 93, 46, 94,
- 47, 95, 0, 0, 0, 0, 0, 0, 48, 0,
- 96, 97, 0, 0, 0, 0, 0, 49, 0, 50,
- 0, 0, 0, 0, 51, 98, 52, 53, 54
+ 158, 211, 121, 212, 120, 15, 292, 231, 240, 5,
+ 101, 101, 5, 10, 10, 102, 102, 191, 175, 10,
+ 10, 362, 109, 110, 114, 10, 349, 411, 19, 65,
+ 1, 2, 72, 416, 143, 7, 79, 373, 171, 172,
+ 171, 172, 10, 11, 10, 11, 64, 10, 65, 71,
+ 132, 10, 29, 78, 10, 180, 1, 2, 183, 190,
+ 228, 117, 67, 10, 381, 64, 79, 204, 1, 2,
+ 63, 244, 177, 178, 179, 10, 180, 181, 182, 183,
+ 1, 2, 315, 78, 10, 180, 115, 417, 183, 63,
+ 144, 418, 206, 316, 282, 308, 229, 166, 228, 1,
+ 2, 167, 72, 73, 145, 175, 191, 79, 133, 191,
+ 237, 321, 240, 158, 184, 387, 165, 16, 132, 71,
+ 230, 118, 28, 139, 78, 393, 112, 337, 193, 422,
+ 160, -242, 185, 164, 229, -242, 171, 172, 288, 204,
+ 12, 118, 17, 237, 176, 192, 411, 118, 190, 242,
+ 278, 190, 68, 34, 161, 186, 204, 171, 172, -268,
+ 218, 220, 205, 307, 206, 162, 226, 124, 403, 20,
+ 227, 312, 187, 398, 30, 399, 133, 21, 219, 210,
+ 278, 206, 279, 305, 371, 350, 178, 306, 10, 180,
+ 181, 182, 183, 31, 241, 347, 348, 249, 22, 340,
+ 23, 32, 249, 341, 343, 283, 356, 287, 344, 24,
+ 33, 414, 294, 36, 357, 299, 293, 193, 37, 10,
+ 193, 414, 282, 382, 1, 2, 66, 252, 303, 368,
+ 369, 354, 370, 80, 192, 10, 180, 192, 406, 183,
+ 1, 2, 361, 160, 178, 108, 10, 180, 181, 182,
+ 183, 1, 2, 83, 84, 377, 158, 250, 158, 379,
+ 396, 318, 319, 111, 397, 116, 336, 320, 256, 336,
+ 178, 251, 10, 180, 181, 182, 183, 1, 2, 404,
+ 124, 125, 126, 405, 128, 252, 253, 127, 178, 129,
+ 10, 180, 181, 182, 183, 134, 351, 251, 241, 135,
+ 136, 254, 138, 249, 323, 324, 325, 326, 141, 142,
+ 200, 252, 253, 192, 168, 327, 1, 2, 171, 172,
+ 255, 323, 324, 325, 326, 170, 256, 254, 169, 252,
+ -269, 201, 203, 283, 351, 257, 287, 202, 213, 215,
+ 216, 10, 222, 258, 372, 259, 255, 225, 224, 236,
+ 243, 192, 256, 274, 235, 275, 390, 82, 277, 289,
+ 118, 257, 295, 300, 304, 309, 395, 83, 84, 258,
+ 256, 259, 310, 311, 313, 314, 322, 330, 85, 38,
+ 86, 332, 87, 334, 342, 395, 160, 338, 160, 345,
+ 346, 358, 88, 353, 359, 364, 89, 390, 206, 360,
+ 90, 421, 367, 91, 41, 42, 43, 366, 365, 425,
+ 384, 426, 378, 409, 92, 45, 392, 391, 400, 93,
+ 46, 94, 47, 95, 374, 386, 401, 6, 194, 18,
+ 48, 35, 96, 97, 81, 113, 140, 10, 137, 49,
+ 106, 50, 1, 2, 383, 355, 51, 98, 52, 53,
+ 54, 217, 276, 352, 38, 302, 423, 363, 333, 99,
+ 407, 415, 410, 291, 408, 339, 298, 380, 0, 39,
+ 0, 0, 0, 40, 0, 0, 0, 0, 0, 41,
+ 42, 43, 0, 0, 0, 44, 0, 0, 0, 0,
+ 45, 0, 0, 0, 0, 46, 0, 47, 0, 0,
+ 0, 0, 0, 0, 0, 48, 0, 0, 0, 0,
+ 0, 0, 0, 0, 49, 0, 50, 0, 0, 147,
+ 148, 51, 0, 52, 53, 54, 149, 0, 0, 0,
+ 85, 38, 86, 0, 87, 150, 0, 0, 0, 0,
+ 0, 0, 0, 0, 88, 0, 0, 0, 89, 0,
+ 0, 0, 90, 0, 0, 91, 41, 42, 43, 0,
+ 0, 0, 0, 0, 151, 0, 92, 45, 0, 0,
+ 0, 93, 46, 94, 47, 95, 0, 0, 0, 0,
+ 0, 0, 48, 0, 96, 97, 152, 153, 0, 0,
+ 0, 49, 0, 50, 0, 154, 147, 148, 51, 98,
+ 52, 53, 54, 149, 0, 0, 0, 85, 38, 86,
+ 0, 87, 150, 0, 0, 0, 0, 0, 0, 0,
+ 0, 88, 0, 0, 0, 89, 0, 0, 0, 90,
+ 0, 0, 91, 41, 42, 43, 0, 0, 0, 0,
+ 0, 151, 0, 92, 45, 0, 0, 0, 93, 46,
+ 94, 47, 95, 0, 0, 0, 0, 0, 0, 48,
+ 0, 96, 97, 152, 153, 0, 0, 0, 49, 0,
+ 50, 83, 84, 0, 0, 51, 98, 52, 53, 54,
+ 0, 0, 85, 38, 86, 0, 87, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 88, 0, 0, 0,
+ 89, 0, 0, 0, 90, 0, 0, 91, 41, 42,
+ 43, 0, 0, 0, 0, 0, 0, 0, 92, 45,
+ 0, 0, 0, 93, 46, 94, 47, 95, 0, 0,
+ 0, 0, 0, 0, 48, 0, 96, 97, 0, 0,
+ 0, 0, 0, 49, 0, 50, 1, 2, 0, 0,
+ 51, 98, 52, 53, 54, 0, 0, 85, 38, 86,
+ 0, 87, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 88, 0, 0, 0, 89, 0, 0, 0, 90,
+ 0, 0, 91, 41, 42, 43, 0, 0, 0, 0,
+ 0, 0, 0, 92, 45, 0, 0, 0, 93, 46,
+ 94, 47, 95, 0, 0, 0, 0, 0, 0, 48,
+ 0, 96, 97, 0, 0, 0, 0, 0, 49, 0,
+ 50, 0, 0, 0, 0, 51, 98, 52, 53, 54
};
static const short yycheck[] = { 7,
- 121, 153, 82, 155, 197, 13, 82, 222, 136, 0,
- 64, 65, 3, 8, 8, 4, 201, 30, 8, 135,
- 48, 105, 64, 65, 35, 8, 15, 16, 8, 37,
- 13, 14, 40, 13, 14, 8, 44, 8, 9, 19,
- 17, 15, 16, 8, 9, 21, 37, 303, 56, 40,
- 106, 8, 9, 44, 110, 12, 8, 99, 8, 9,
- 71, 35, 12, 82, 82, 56, 74, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 136, 36, 82,
- 32, 37, 110, 74, 212, 341, 105, 105, 107, 107,
- 316, 376, 107, 378, 71, 312, 224, 71, 75, 227,
- 56, 77, 110, 116, 107, 221, 332, 115, 99, 47,
- 327, 328, 233, 330, 104, 91, 124, 106, 113, 110,
- 305, 197, 116, 114, 115, 167, 109, 65, 136, 109,
- 121, 104, 106, 124, 224, 106, 110, 227, 105, 215,
- 9, 106, 116, 59, 135, 136, 113, 104, 202, 106,
- 88, 8, 104, 86, 104, 242, 13, 14, 86, 43,
- 168, 169, 4, 55, 240, 224, 103, 105, 227, 384,
- 54, 258, 248, 15, 16, 303, 167, 114, 169, 6,
- 86, 8, 9, 10, 11, 12, 106, 274, 300, 301,
- 110, 48, 8, 201, 14, 3, 204, 13, 14, 311,
- 108, 209, 22, 106, 212, 106, 214, 110, 401, 110,
- 106, 23, 340, 341, 110, 223, 224, 106, 411, 227,
- 47, 110, 14, 43, 41, 45, 109, 235, 99, 100,
- 101, 102, 308, 224, 54, 62, 227, 389, 105, 110,
- 13, 14, 233, 6, 331, 8, 9, 10, 11, 12,
- 13, 14, 13, 14, 334, 376, 19, 378, 338, 106,
- 105, 88, 113, 110, 83, 273, 257, 73, 276, 6,
- 33, 8, 9, 10, 11, 12, 13, 14, 13, 14,
- 15, 16, 15, 16, 47, 48, 83, 6, 53, 8,
- 9, 10, 11, 12, 83, 303, 33, 305, 109, 110,
- 63, 3, 310, 8, 9, 31, 32, 12, 13, 14,
- 47, 48, 303, 99, 100, 101, 102, 113, 3, 82,
- 111, 106, 106, 105, 111, 88, 63, 105, 47, 9,
- 105, 37, 340, 341, 97, 343, 105, 105, 70, 105,
- 3, 8, 105, 62, 107, 82, 113, 117, 27, 113,
- 341, 88, 111, 107, 70, 363, 3, 107, 70, 116,
- 97, 4, 90, 97, 112, 373, 13, 14, 105, 88,
- 107, 70, 110, 98, 27, 106, 105, 24, 25, 26,
- 98, 28, 4, 107, 392, 376, 108, 378, 84, 106,
- 103, 38, 107, 114, 108, 42, 404, 105, 107, 46,
- 408, 105, 49, 50, 51, 52, 106, 108, 115, 104,
- 108, 105, 0, 60, 61, 108, 108, 114, 65, 66,
- 67, 68, 69, 110, 108, 113, 0, 3, 139, 76,
- 13, 78, 79, 26, 74, 56, 8, 115, 85, 110,
- 87, 13, 14, 343, 167, 92, 93, 94, 95, 96,
- 65, 209, 310, 25, 230, 305, 411, 317, 105, 390,
- 264, 221, 404, 392, 226, 340, 396, 276, 40, -1,
- -1, -1, 44, -1, -1, -1, -1, -1, 50, 51,
- 52, -1, -1, -1, 56, -1, -1, -1, -1, 61,
- -1, -1, -1, -1, 66, -1, 68, -1, -1, -1,
- -1, -1, -1, -1, 76, -1, -1, -1, -1, -1,
- -1, -1, -1, 85, -1, 87, -1, -1, 13, 14,
- 92, -1, 94, 95, 96, 20, -1, -1, -1, 24,
- 25, 26, -1, 28, 29, -1, -1, -1, -1, -1,
- -1, -1, -1, 38, -1, -1, -1, 42, -1, -1,
- -1, 46, -1, -1, 49, 50, 51, 52, -1, -1,
- -1, -1, -1, 58, -1, 60, 61, -1, -1, -1,
- 65, 66, 67, 68, 69, -1, -1, -1, -1, -1,
- -1, 76, -1, 78, 79, 80, 81, -1, -1, -1,
- 85, -1, 87, -1, 89, 13, 14, 92, 93, 94,
- 95, 96, 20, -1, -1, -1, 24, 25, 26, -1,
- 28, 29, -1, -1, -1, -1, -1, -1, -1, -1,
- 38, -1, -1, -1, 42, -1, -1, -1, 46, -1,
- -1, 49, 50, 51, 52, -1, -1, -1, -1, -1,
- 58, -1, 60, 61, -1, -1, -1, 65, 66, 67,
- 68, 69, -1, -1, -1, -1, -1, -1, 76, -1,
- 78, 79, 80, 81, -1, -1, -1, 85, -1, 87,
- 13, 14, -1, -1, 92, 93, 94, 95, 96, -1,
- -1, 24, 25, 26, -1, 28, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 38, -1, -1, -1, 42,
- -1, -1, -1, 46, -1, -1, 49, 50, 51, 52,
- -1, -1, -1, -1, -1, -1, -1, 60, 61, -1,
- -1, -1, 65, 66, 67, 68, 69, -1, -1, -1,
- -1, -1, -1, 76, -1, 78, 79, -1, -1, -1,
- -1, -1, 85, -1, 87, 13, 14, -1, -1, 92,
- 93, 94, 95, 96, -1, -1, 24, 25, 26, -1,
- 28, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 38, -1, -1, -1, 42, -1, -1, -1, 46, -1,
- -1, 49, 50, 51, 52, -1, -1, -1, -1, -1,
- -1, -1, 60, 61, -1, -1, -1, 65, 66, 67,
- 68, 69, -1, -1, -1, -1, -1, -1, 76, -1,
- 78, 79, -1, -1, -1, -1, -1, 85, -1, 87,
- -1, -1, -1, -1, 92, 93, 94, 95, 96
+ 121, 153, 82, 155, 82, 13, 223, 198, 202, 0,
+ 64, 65, 3, 8, 8, 64, 65, 136, 135, 8,
+ 8, 317, 109, 110, 48, 8, 304, 4, 107, 37,
+ 13, 14, 40, 17, 21, 105, 44, 333, 15, 16,
+ 15, 16, 8, 9, 8, 9, 37, 8, 56, 40,
+ 99, 8, 59, 44, 8, 9, 13, 14, 12, 136,
+ 35, 30, 19, 8, 342, 56, 74, 82, 13, 14,
+ 37, 32, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 103, 74, 8, 9, 110, 71, 12, 56,
+ 77, 75, 107, 114, 213, 243, 71, 106, 35, 13,
+ 14, 110, 110, 48, 91, 222, 225, 115, 99, 228,
+ 104, 259, 306, 234, 47, 104, 124, 36, 167, 110,
+ 198, 116, 9, 114, 115, 113, 109, 275, 136, 106,
+ 121, 106, 65, 124, 71, 110, 15, 16, 216, 82,
+ 106, 116, 106, 104, 135, 136, 4, 116, 225, 203,
+ 104, 228, 109, 3, 43, 88, 82, 15, 16, 105,
+ 168, 169, 105, 241, 107, 54, 106, 113, 385, 14,
+ 110, 249, 105, 377, 86, 379, 167, 22, 169, 105,
+ 104, 107, 106, 106, 332, 304, 6, 110, 8, 9,
+ 10, 11, 12, 86, 202, 301, 302, 205, 43, 106,
+ 45, 55, 210, 110, 106, 213, 312, 215, 110, 54,
+ 86, 402, 225, 108, 313, 228, 224, 225, 23, 8,
+ 228, 412, 341, 342, 13, 14, 14, 47, 236, 328,
+ 329, 309, 331, 41, 225, 8, 9, 228, 390, 12,
+ 13, 14, 62, 234, 6, 109, 8, 9, 10, 11,
+ 12, 13, 14, 13, 14, 335, 377, 19, 379, 339,
+ 106, 31, 32, 105, 110, 105, 274, 258, 88, 277,
+ 6, 33, 8, 9, 10, 11, 12, 13, 14, 106,
+ 113, 83, 83, 110, 53, 47, 48, 73, 6, 83,
+ 8, 9, 10, 11, 12, 3, 304, 33, 306, 113,
+ 3, 63, 106, 311, 99, 100, 101, 102, 106, 105,
+ 9, 47, 48, 304, 111, 110, 13, 14, 15, 16,
+ 82, 99, 100, 101, 102, 105, 88, 63, 111, 47,
+ 105, 37, 70, 341, 342, 97, 344, 105, 105, 105,
+ 3, 8, 113, 105, 62, 107, 82, 111, 113, 27,
+ 107, 342, 88, 70, 117, 107, 364, 3, 70, 4,
+ 116, 97, 97, 90, 112, 70, 374, 13, 14, 105,
+ 88, 107, 106, 110, 98, 27, 108, 98, 24, 25,
+ 26, 107, 28, 105, 107, 393, 377, 106, 379, 4,
+ 84, 105, 38, 108, 114, 105, 42, 405, 107, 103,
+ 46, 409, 104, 49, 50, 51, 52, 108, 106, 0,
+ 105, 0, 108, 113, 60, 61, 108, 110, 108, 65,
+ 66, 67, 68, 69, 115, 114, 108, 3, 139, 13,
+ 76, 26, 78, 79, 56, 74, 115, 8, 110, 85,
+ 65, 87, 13, 14, 344, 311, 92, 93, 94, 95,
+ 96, 167, 210, 306, 25, 231, 412, 318, 265, 105,
+ 391, 405, 397, 222, 393, 277, 227, 341, -1, 40,
+ -1, -1, -1, 44, -1, -1, -1, -1, -1, 50,
+ 51, 52, -1, -1, -1, 56, -1, -1, -1, -1,
+ 61, -1, -1, -1, -1, 66, -1, 68, -1, -1,
+ -1, -1, -1, -1, -1, 76, -1, -1, -1, -1,
+ -1, -1, -1, -1, 85, -1, 87, -1, -1, 13,
+ 14, 92, -1, 94, 95, 96, 20, -1, -1, -1,
+ 24, 25, 26, -1, 28, 29, -1, -1, -1, -1,
+ -1, -1, -1, -1, 38, -1, -1, -1, 42, -1,
+ -1, -1, 46, -1, -1, 49, 50, 51, 52, -1,
+ -1, -1, -1, -1, 58, -1, 60, 61, -1, -1,
+ -1, 65, 66, 67, 68, 69, -1, -1, -1, -1,
+ -1, -1, 76, -1, 78, 79, 80, 81, -1, -1,
+ -1, 85, -1, 87, -1, 89, 13, 14, 92, 93,
+ 94, 95, 96, 20, -1, -1, -1, 24, 25, 26,
+ -1, 28, 29, -1, -1, -1, -1, -1, -1, -1,
+ -1, 38, -1, -1, -1, 42, -1, -1, -1, 46,
+ -1, -1, 49, 50, 51, 52, -1, -1, -1, -1,
+ -1, 58, -1, 60, 61, -1, -1, -1, 65, 66,
+ 67, 68, 69, -1, -1, -1, -1, -1, -1, 76,
+ -1, 78, 79, 80, 81, -1, -1, -1, 85, -1,
+ 87, 13, 14, -1, -1, 92, 93, 94, 95, 96,
+ -1, -1, 24, 25, 26, -1, 28, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 38, -1, -1, -1,
+ 42, -1, -1, -1, 46, -1, -1, 49, 50, 51,
+ 52, -1, -1, -1, -1, -1, -1, -1, 60, 61,
+ -1, -1, -1, 65, 66, 67, 68, 69, -1, -1,
+ -1, -1, -1, -1, 76, -1, 78, 79, -1, -1,
+ -1, -1, -1, 85, -1, 87, 13, 14, -1, -1,
+ 92, 93, 94, 95, 96, -1, -1, 24, 25, 26,
+ -1, 28, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 38, -1, -1, -1, 42, -1, -1, -1, 46,
+ -1, -1, 49, 50, 51, 52, -1, -1, -1, -1,
+ -1, -1, -1, 60, 61, -1, -1, -1, 65, 66,
+ 67, 68, 69, -1, -1, -1, -1, -1, -1, 76,
+ -1, 78, 79, -1, -1, -1, -1, -1, 85, -1,
+ 87, -1, -1, -1, -1, 92, 93, 94, 95, 96
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/share/bison.simple"
@@ -1352,13 +1358,13 @@
switch (yyn) {
case 1:
-#line 307 "asn1p_y.y"
+#line 314 "asn1p_y.y"
{
*(void **)param = yyvsp[0].a_grammar;
;
break;}
case 2:
-#line 313 "asn1p_y.y"
+#line 320 "asn1p_y.y"
{
yyval.a_grammar = asn1p_new();
checkmem(yyval.a_grammar);
@@ -1366,14 +1372,14 @@
;
break;}
case 3:
-#line 318 "asn1p_y.y"
+#line 325 "asn1p_y.y"
{
yyval.a_grammar = yyvsp[-1].a_grammar;
TQ_ADD(&(yyval.a_grammar->modules), yyvsp[0].a_module, mod_next);
;
break;}
case 4:
-#line 339 "asn1p_y.y"
+#line 346 "asn1p_y.y"
{
if(yyvsp[-1].a_module) {
@@ -1384,33 +1390,33 @@
}
checkmem(yyval.a_module);
- yyval.a_module->Identifier = yyvsp[-7].tv_str;
+ yyval.a_module->ModuleName = yyvsp[-7].tv_str;
yyval.a_module->module_oid = yyvsp[-6].a_oid;
yyval.a_module->module_flags = yyvsp[-4].a_module_flags;
;
break;}
case 5:
-#line 360 "asn1p_y.y"
+#line 367 "asn1p_y.y"
{ yyval.a_oid = 0; ;
break;}
case 6:
-#line 361 "asn1p_y.y"
+#line 368 "asn1p_y.y"
{ yyval.a_oid = yyvsp[0].a_oid; ;
break;}
case 7:
-#line 365 "asn1p_y.y"
+#line 372 "asn1p_y.y"
{
yyval.a_oid = yyvsp[-1].a_oid;
;
break;}
case 8:
-#line 368 "asn1p_y.y"
+#line 375 "asn1p_y.y"
{
yyval.a_oid = 0;
;
break;}
case 9:
-#line 374 "asn1p_y.y"
+#line 381 "asn1p_y.y"
{
yyval.a_oid = asn1p_oid_new();
asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc);
@@ -1419,7 +1425,7 @@
;
break;}
case 10:
-#line 380 "asn1p_y.y"
+#line 387 "asn1p_y.y"
{
yyval.a_oid = yyvsp[-1].a_oid;
asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc);
@@ -1428,74 +1434,74 @@
;
break;}
case 11:
-#line 389 "asn1p_y.y"
+#line 396 "asn1p_y.y"
{ /* iso */
yyval.a_oid_arc.name = yyvsp[0].tv_str;
yyval.a_oid_arc.number = -1;
;
break;}
case 12:
-#line 393 "asn1p_y.y"
+#line 400 "asn1p_y.y"
{ /* iso(1) */
yyval.a_oid_arc.name = yyvsp[-3].tv_str;
yyval.a_oid_arc.number = yyvsp[-1].a_int;
;
break;}
case 13:
-#line 397 "asn1p_y.y"
+#line 404 "asn1p_y.y"
{ /* 1 */
yyval.a_oid_arc.name = 0;
yyval.a_oid_arc.number = yyvsp[0].a_int;
;
break;}
case 14:
-#line 407 "asn1p_y.y"
+#line 414 "asn1p_y.y"
{ yyval.a_module_flags = MSF_NOFLAGS; ;
break;}
case 15:
-#line 408 "asn1p_y.y"
+#line 415 "asn1p_y.y"
{
yyval.a_module_flags = yyvsp[0].a_module_flags;
;
break;}
case 16:
-#line 417 "asn1p_y.y"
+#line 424 "asn1p_y.y"
{
yyval.a_module_flags = yyvsp[0].a_module_flags;
;
break;}
case 17:
-#line 420 "asn1p_y.y"
+#line 427 "asn1p_y.y"
{
yyval.a_module_flags = yyvsp[-1].a_module_flags | yyvsp[0].a_module_flags;
;
break;}
case 18:
-#line 429 "asn1p_y.y"
+#line 436 "asn1p_y.y"
{
yyval.a_module_flags = MSF_EXPLICIT_TAGS;
;
break;}
case 19:
-#line 432 "asn1p_y.y"
+#line 439 "asn1p_y.y"
{
yyval.a_module_flags = MSF_IMPLICIT_TAGS;
;
break;}
case 20:
-#line 435 "asn1p_y.y"
+#line 442 "asn1p_y.y"
{
yyval.a_module_flags = MSF_AUTOMATIC_TAGS;
;
break;}
case 21:
-#line 438 "asn1p_y.y"
+#line 445 "asn1p_y.y"
{
yyval.a_module_flags = MSF_EXTENSIBILITY_IMPLIED;
;
break;}
case 22:
-#line 442 "asn1p_y.y"
+#line 449 "asn1p_y.y"
{
/* X.680Amd1 specifies TAG and XER */
if(strcmp(yyvsp[-1].tv_str, "TAG") == 0) {
@@ -1513,23 +1519,23 @@
;
break;}
case 23:
-#line 463 "asn1p_y.y"
+#line 470 "asn1p_y.y"
{ yyval.a_module = 0; ;
break;}
case 24:
-#line 464 "asn1p_y.y"
+#line 471 "asn1p_y.y"
{
yyval.a_module = yyvsp[0].a_module;
;
break;}
case 25:
-#line 473 "asn1p_y.y"
+#line 480 "asn1p_y.y"
{
yyval.a_module = yyvsp[0].a_module;
;
break;}
case 26:
-#line 476 "asn1p_y.y"
+#line 483 "asn1p_y.y"
{
yyval.a_module = yyvsp[-1].a_module;
@@ -1559,13 +1565,13 @@
;
break;}
case 27:
-#line 509 "asn1p_y.y"
+#line 516 "asn1p_y.y"
{
yyval.a_module = yyvsp[0].a_module;
;
break;}
case 28:
-#line 512 "asn1p_y.y"
+#line 519 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1577,16 +1583,6 @@
;
break;}
case 29:
-#line 521 "asn1p_y.y"
-{
- yyval.a_module = asn1p_module_new();
- checkmem(yyval.a_module);
- assert(yyvsp[0].a_expr->expr_type != A1TC_INVALID);
- assert(yyvsp[0].a_expr->meta_type != AMT_INVALID);
- TQ_ADD(&(yyval.a_module->members), yyvsp[0].a_expr, next);
- ;
- break;}
-case 30:
#line 528 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
@@ -1596,8 +1592,18 @@
TQ_ADD(&(yyval.a_module->members), yyvsp[0].a_expr, next);
;
break;}
+case 30:
+#line 535 "asn1p_y.y"
+{
+ yyval.a_module = asn1p_module_new();
+ checkmem(yyval.a_module);
+ assert(yyvsp[0].a_expr->expr_type != A1TC_INVALID);
+ assert(yyvsp[0].a_expr->meta_type != AMT_INVALID);
+ TQ_ADD(&(yyval.a_module->members), yyvsp[0].a_expr, next);
+ ;
+ break;}
case 31:
-#line 541 "asn1p_y.y"
+#line 548 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1607,11 +1613,11 @@
;
break;}
case 32:
-#line 549 "asn1p_y.y"
+#line 556 "asn1p_y.y"
{ asn1p_lexer_hack_push_encoding_control(); ;
break;}
case 33:
-#line 550 "asn1p_y.y"
+#line 557 "asn1p_y.y"
{
fprintf(stderr,
"WARNING: ENCODING-CONTROL %s "
@@ -1622,7 +1628,7 @@
;
break;}
case 34:
-#line 562 "asn1p_y.y"
+#line 569 "asn1p_y.y"
{
return yyerror(
"Attempt to redefine a standard basic type, "
@@ -1631,19 +1637,23 @@
;
break;}
case 35:
-#line 576 "asn1p_y.y"
+#line 583 "asn1p_y.y"
{
+ if(!saved_aid && 0)
+ return yyerror("Unterminated IMPORTS FROM, "
+ "expected semicolon ';'");
+ saved_aid = 0;
yyval.a_module = yyvsp[-1].a_module;
;
break;}
case 36:
-#line 582 "asn1p_y.y"
+#line 593 "asn1p_y.y"
{
return yyerror("Empty IMPORTS list");
;
break;}
case 37:
-#line 588 "asn1p_y.y"
+#line 599 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1651,56 +1661,48 @@
;
break;}
case 38:
-#line 593 "asn1p_y.y"
+#line 604 "asn1p_y.y"
{
yyval.a_module = yyvsp[-1].a_module;
TQ_ADD(&(yyval.a_module->imports), yyvsp[0].a_xports, xp_next);
;
break;}
case 39:
-#line 600 "asn1p_y.y"
+#line 611 "asn1p_y.y"
+{ memset(&yyval.a_aid, 0, sizeof(yyval.a_aid)); ;
+ break;}
+case 40:
+#line 612 "asn1p_y.y"
+{ yyval.a_aid.oid = yyvsp[0].a_oid; ;
+ break;}
+case 41:
+#line 616 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-3].a_xports;
- yyval.a_xports->from = yyvsp[-1].tv_str;
- yyval.a_xports->from_oid = yyvsp[0].a_oid;
+ yyval.a_xports->fromModuleName = yyvsp[-1].tv_str;
+ yyval.a_xports->identifier = yyvsp[0].a_aid;
+ /* This stupid thing is used for look-back hack. */
+ saved_aid = yyval.a_xports->identifier.oid ? 0 : &(yyval.a_xports->identifier);
checkmem(yyval.a_xports);
;
break;}
-case 40:
-#line 609 "asn1p_y.y"
+case 42:
+#line 627 "asn1p_y.y"
{
yyval.a_xports = asn1p_xports_new();
checkmem(yyval.a_xports);
TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next);
;
break;}
-case 41:
-#line 614 "asn1p_y.y"
+case 43:
+#line 632 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-2].a_xports;
TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next);
;
break;}
-case 42:
-#line 621 "asn1p_y.y"
-{
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->Identifier = yyvsp[0].tv_str;
- yyval.a_expr->expr_type = A1TC_REFERENCE;
- ;
- break;}
-case 43:
-#line 627 "asn1p_y.y"
-{ /* Completely equivalent to above */
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->Identifier = yyvsp[-2].tv_str;
- yyval.a_expr->expr_type = A1TC_REFERENCE;
- ;
- break;}
case 44:
-#line 633 "asn1p_y.y"
+#line 639 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1709,60 +1711,60 @@
;
break;}
case 45:
-#line 642 "asn1p_y.y"
+#line 645 "asn1p_y.y"
+{ /* Completely equivalent to above */
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->Identifier = yyvsp[-2].tv_str;
+ yyval.a_expr->expr_type = A1TC_REFERENCE;
+ ;
+ break;}
+case 46:
+#line 651 "asn1p_y.y"
+{
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->Identifier = yyvsp[0].tv_str;
+ yyval.a_expr->expr_type = A1TC_REFERENCE;
+ ;
+ break;}
+case 47:
+#line 660 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-1].a_xports;
;
break;}
-case 46:
-#line 645 "asn1p_y.y"
+case 48:
+#line 663 "asn1p_y.y"
{
yyval.a_xports = 0;
;
break;}
-case 47:
-#line 648 "asn1p_y.y"
+case 49:
+#line 666 "asn1p_y.y"
{
/* Empty EXPORTS clause effectively prohibits export. */
yyval.a_xports = asn1p_xports_new();
checkmem(yyval.a_xports);
;
break;}
-case 48:
-#line 656 "asn1p_y.y"
+case 50:
+#line 674 "asn1p_y.y"
{
yyval.a_xports = asn1p_xports_new();
assert(yyval.a_xports);
TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next);
;
break;}
-case 49:
-#line 661 "asn1p_y.y"
+case 51:
+#line 679 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-2].a_xports;
TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next);
;
break;}
-case 50:
-#line 668 "asn1p_y.y"
-{
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->Identifier = yyvsp[0].tv_str;
- yyval.a_expr->expr_type = A1TC_EXPORTVAR;
- ;
- break;}
-case 51:
-#line 674 "asn1p_y.y"
-{
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->Identifier = yyvsp[-2].tv_str;
- yyval.a_expr->expr_type = A1TC_EXPORTVAR;
- ;
- break;}
case 52:
-#line 680 "asn1p_y.y"
+#line 686 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1771,11 +1773,29 @@
;
break;}
case 53:
-#line 691 "asn1p_y.y"
-{ asn1p_lexer_hack_push_opaque_state(); ;
+#line 692 "asn1p_y.y"
+{
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->Identifier = yyvsp[-2].tv_str;
+ yyval.a_expr->expr_type = A1TC_EXPORTVAR;
+ ;
break;}
case 54:
-#line 691 "asn1p_y.y"
+#line 698 "asn1p_y.y"
+{
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->Identifier = yyvsp[0].tv_str;
+ yyval.a_expr->expr_type = A1TC_EXPORTVAR;
+ ;
+ break;}
+case 55:
+#line 709 "asn1p_y.y"
+{ asn1p_lexer_hack_push_opaque_state(); ;
+ break;}
+case 56:
+#line 709 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-4].a_expr;
assert(yyval.a_expr->Identifier == 0);
@@ -1784,8 +1804,8 @@
// take care of ValueSet body
;
break;}
-case 55:
-#line 701 "asn1p_y.y"
+case 57:
+#line 719 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1794,8 +1814,8 @@
yyval.a_expr->meta_type = AMT_TYPEREF;
;
break;}
-case 56:
-#line 708 "asn1p_y.y"
+case 58:
+#line 726 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1803,8 +1823,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 57:
-#line 726 "asn1p_y.y"
+case 59:
+#line 744 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1814,8 +1834,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 58:
-#line 734 "asn1p_y.y"
+case 60:
+#line 752 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
yyval.a_expr->Identifier = yyvsp[-2].tv_str;
@@ -1823,8 +1843,8 @@
assert(yyval.a_expr->meta_type);
;
break;}
-case 59:
-#line 740 "asn1p_y.y"
+case 61:
+#line 758 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
yyval.a_expr->Identifier = yyvsp[-2].tv_str;
@@ -1832,8 +1852,8 @@
assert(yyval.a_expr->meta_type == AMT_OBJECT);
;
break;}
-case 60:
-#line 756 "asn1p_y.y"
+case 62:
+#line 774 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
assert(yyval.a_expr->Identifier == 0);
@@ -1842,8 +1862,8 @@
yyval.a_expr->meta_type = AMT_PARAMTYPE;
;
break;}
-case 61:
-#line 766 "asn1p_y.y"
+case 63:
+#line 784 "asn1p_y.y"
{
int ret;
yyval.a_plist = asn1p_paramlist_new(yylineno);
@@ -1854,8 +1874,8 @@
if(yyvsp[0].a_parg.argument) free(yyvsp[0].a_parg.argument);
;
break;}
-case 62:
-#line 775 "asn1p_y.y"
+case 64:
+#line 793 "asn1p_y.y"
{
int ret;
yyval.a_plist = yyvsp[-2].a_plist;
@@ -1865,35 +1885,35 @@
if(yyvsp[0].a_parg.argument) free(yyvsp[0].a_parg.argument);
;
break;}
-case 63:
-#line 786 "asn1p_y.y"
+case 65:
+#line 804 "asn1p_y.y"
{
yyval.a_parg.governor = NULL;
yyval.a_parg.argument = yyvsp[0].tv_str;
;
break;}
-case 64:
-#line 790 "asn1p_y.y"
-{
- int ret;
- yyval.a_parg.governor = asn1p_ref_new(yylineno);
- ret = asn1p_ref_add_component(yyval.a_parg.governor, yyvsp[-2].tv_str, 0);
- checkmem(ret == 0);
- yyval.a_parg.argument = yyvsp[0].tv_str;
- ;
- break;}
-case 65:
-#line 797 "asn1p_y.y"
-{
- int ret;
- yyval.a_parg.governor = asn1p_ref_new(yylineno);
- ret = asn1p_ref_add_component(yyval.a_parg.governor, yyvsp[-2].tv_str, 0);
- checkmem(ret == 0);
- yyval.a_parg.argument = yyvsp[0].tv_str;
- ;
- break;}
case 66:
-#line 804 "asn1p_y.y"
+#line 808 "asn1p_y.y"
+{
+ int ret;
+ yyval.a_parg.governor = asn1p_ref_new(yylineno);
+ ret = asn1p_ref_add_component(yyval.a_parg.governor, yyvsp[-2].tv_str, 0);
+ checkmem(ret == 0);
+ yyval.a_parg.argument = yyvsp[0].tv_str;
+ ;
+ break;}
+case 67:
+#line 815 "asn1p_y.y"
+{
+ int ret;
+ yyval.a_parg.governor = asn1p_ref_new(yylineno);
+ ret = asn1p_ref_add_component(yyval.a_parg.governor, yyvsp[-2].tv_str, 0);
+ checkmem(ret == 0);
+ yyval.a_parg.argument = yyvsp[0].tv_str;
+ ;
+ break;}
+case 68:
+#line 822 "asn1p_y.y"
{
int ret;
yyval.a_parg.governor = asn1p_ref_new(yylineno);
@@ -1903,29 +1923,29 @@
yyval.a_parg.argument = yyvsp[0].tv_str;
;
break;}
-case 67:
-#line 815 "asn1p_y.y"
+case 69:
+#line 833 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 68:
-#line 820 "asn1p_y.y"
+case 70:
+#line 838 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 69:
-#line 827 "asn1p_y.y"
+case 71:
+#line 845 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 70:
-#line 830 "asn1p_y.y"
+case 72:
+#line 848 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1934,31 +1954,31 @@
yyval.a_expr->meta_type = AMT_VALUE;
;
break;}
-case 71:
-#line 854 "asn1p_y.y"
+case 73:
+#line 872 "asn1p_y.y"
{ yyval.a_expr = asn1p_expr_new(yylineno); ;
break;}
-case 72:
-#line 855 "asn1p_y.y"
+case 74:
+#line 873 "asn1p_y.y"
{ yyval.a_expr = yyvsp[0].a_expr; ;
break;}
-case 73:
-#line 858 "asn1p_y.y"
+case 75:
+#line 876 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 74:
-#line 863 "asn1p_y.y"
+case 76:
+#line 881 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 75:
-#line 870 "asn1p_y.y"
+case 77:
+#line 888 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->Identifier == 0);
@@ -1966,8 +1986,8 @@
yyval.a_expr->marker = yyvsp[0].a_marker;
;
break;}
-case 76:
-#line 876 "asn1p_y.y"
+case 78:
+#line 894 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1976,43 +1996,43 @@
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 77:
-#line 883 "asn1p_y.y"
+case 79:
+#line 901 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 78:
-#line 889 "asn1p_y.y"
+case 80:
+#line 907 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 79:
-#line 894 "asn1p_y.y"
+case 81:
+#line 912 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 80:
-#line 901 "asn1p_y.y"
+case 82:
+#line 919 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
assert(yyval.a_expr->Identifier == 0);
yyval.a_expr->Identifier = yyvsp[-1].tv_str;
;
break;}
-case 81:
-#line 906 "asn1p_y.y"
+case 83:
+#line 924 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 82:
-#line 912 "asn1p_y.y"
+case 84:
+#line 930 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
checkmem(yyval.a_expr);
@@ -2021,16 +2041,16 @@
assert(yyval.a_expr->meta_type == AMT_OBJECT);
;
break;}
-case 83:
-#line 922 "asn1p_y.y"
+case 85:
+#line 940 "asn1p_y.y"
{ yyval.a_int = 0; ;
break;}
-case 84:
-#line 923 "asn1p_y.y"
+case 86:
+#line 941 "asn1p_y.y"
{ yyval.a_int = 1; ;
break;}
-case 85:
-#line 927 "asn1p_y.y"
+case 87:
+#line 945 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2039,15 +2059,15 @@
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 86:
-#line 934 "asn1p_y.y"
+case 88:
+#line 952 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 87:
-#line 941 "asn1p_y.y"
+case 89:
+#line 959 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2057,8 +2077,8 @@
yyval.a_expr->marker = yyvsp[0].a_marker;
;
break;}
-case 88:
-#line 949 "asn1p_y.y"
+case 90:
+#line 967 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
yyval.a_expr->Identifier = yyvsp[-3].a_refcomp.name;
@@ -2066,8 +2086,8 @@
yyval.a_expr->unique = yyvsp[-1].a_int;
;
break;}
-case 89:
-#line 955 "asn1p_y.y"
+case 91:
+#line 973 "asn1p_y.y"
{
int ret;
yyval.a_expr = asn1p_expr_new(yylineno);
@@ -2084,48 +2104,48 @@
yyval.a_expr->unique = yyvsp[-1].a_int;
;
break;}
-case 90:
-#line 973 "asn1p_y.y"
+case 92:
+#line 991 "asn1p_y.y"
{ yyval.a_wsynt = 0; ;
break;}
-case 91:
-#line 974 "asn1p_y.y"
+case 93:
+#line 992 "asn1p_y.y"
{
yyval.a_wsynt = yyvsp[0].a_wsynt;
;
break;}
-case 92:
-#line 981 "asn1p_y.y"
+case 94:
+#line 999 "asn1p_y.y"
{ asn1p_lexer_hack_enable_with_syntax(); ;
break;}
-case 93:
-#line 983 "asn1p_y.y"
+case 95:
+#line 1001 "asn1p_y.y"
{
yyval.a_wsynt = yyvsp[-1].a_wsynt;
;
break;}
-case 94:
-#line 989 "asn1p_y.y"
+case 96:
+#line 1007 "asn1p_y.y"
{
yyval.a_wsynt = asn1p_wsyntx_new();
TQ_ADD(&(yyval.a_wsynt->chunks), yyvsp[0].a_wchunk, next);
;
break;}
-case 95:
-#line 993 "asn1p_y.y"
+case 97:
+#line 1011 "asn1p_y.y"
{
yyval.a_wsynt = yyvsp[-1].a_wsynt;
TQ_ADD(&(yyval.a_wsynt->chunks), yyvsp[0].a_wchunk, next);
;
break;}
-case 96:
-#line 1000 "asn1p_y.y"
+case 98:
+#line 1018 "asn1p_y.y"
{
yyval.a_wchunk = asn1p_wsyntx_chunk_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0);
;
break;}
-case 97:
-#line 1003 "asn1p_y.y"
+case 99:
+#line 1021 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -2136,43 +2156,43 @@
yyval.a_wchunk = asn1p_wsyntx_chunk_fromref(ref, 0);
;
break;}
-case 98:
-#line 1015 "asn1p_y.y"
-{
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->Identifier = strdup("...");
- checkmem(yyval.a_expr->Identifier);
- yyval.a_expr->expr_type = A1TC_EXTENSIBLE;
- yyval.a_expr->meta_type = AMT_TYPE;
- ;
- break;}
-case 99:
-#line 1023 "asn1p_y.y"
-{
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->Identifier = strdup("...");
- checkmem(yyval.a_expr->Identifier);
- yyval.a_expr->value = yyvsp[0].a_value;
- yyval.a_expr->expr_type = A1TC_EXTENSIBLE;
- yyval.a_expr->meta_type = AMT_TYPE;
- ;
- break;}
case 100:
-#line 1032 "asn1p_y.y"
+#line 1033 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
yyval.a_expr->Identifier = strdup("...");
- yyval.a_expr->value = yyvsp[0].a_value;
checkmem(yyval.a_expr->Identifier);
yyval.a_expr->expr_type = A1TC_EXTENSIBLE;
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
case 101:
-#line 1044 "asn1p_y.y"
+#line 1041 "asn1p_y.y"
+{
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->Identifier = strdup("...");
+ checkmem(yyval.a_expr->Identifier);
+ yyval.a_expr->value = yyvsp[0].a_value;
+ yyval.a_expr->expr_type = A1TC_EXTENSIBLE;
+ yyval.a_expr->meta_type = AMT_TYPE;
+ ;
+ break;}
+case 102:
+#line 1050 "asn1p_y.y"
+{
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->Identifier = strdup("...");
+ yyval.a_expr->value = yyvsp[0].a_value;
+ checkmem(yyval.a_expr->Identifier);
+ yyval.a_expr->expr_type = A1TC_EXTENSIBLE;
+ yyval.a_expr->meta_type = AMT_TYPE;
+ ;
+ break;}
+case 103:
+#line 1062 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
yyval.a_expr->tag = yyvsp[-2].a_tag;
@@ -2193,14 +2213,14 @@
}
;
break;}
-case 102:
-#line 1066 "asn1p_y.y"
+case 104:
+#line 1084 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 103:
-#line 1069 "asn1p_y.y"
+case 105:
+#line 1087 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->expr_type == A1TC_INVALID);
@@ -2208,8 +2228,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 104:
-#line 1075 "asn1p_y.y"
+case 106:
+#line 1093 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->expr_type == A1TC_INVALID);
@@ -2217,8 +2237,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 105:
-#line 1081 "asn1p_y.y"
+case 107:
+#line 1099 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->expr_type == A1TC_INVALID);
@@ -2226,8 +2246,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 106:
-#line 1087 "asn1p_y.y"
+case 108:
+#line 1105 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2239,8 +2259,8 @@
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 107:
-#line 1097 "asn1p_y.y"
+case 109:
+#line 1115 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2252,8 +2272,8 @@
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 108:
-#line 1107 "asn1p_y.y"
+case 110:
+#line 1125 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2261,8 +2281,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 109:
-#line 1113 "asn1p_y.y"
+case 111:
+#line 1131 "asn1p_y.y"
{
int ret;
yyval.a_expr = asn1p_expr_new(yylineno);
@@ -2275,8 +2295,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 110:
-#line 1127 "asn1p_y.y"
+case 112:
+#line 1145 "asn1p_y.y"
{
int ret;
yyval.a_expr = yyvsp[-1].a_expr;
@@ -2292,8 +2312,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 111:
-#line 1151 "asn1p_y.y"
+case 113:
+#line 1169 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2302,8 +2322,8 @@
yyval.a_expr->meta_type = AMT_TYPEREF;
;
break;}
-case 112:
-#line 1158 "asn1p_y.y"
+case 114:
+#line 1176 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2312,8 +2332,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 113:
-#line 1173 "asn1p_y.y"
+case 115:
+#line 1191 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2323,34 +2343,34 @@
free(yyvsp[0].tv_str);
;
break;}
-case 114:
-#line 1181 "asn1p_y.y"
-{
- int ret;
- yyval.a_ref = asn1p_ref_new(yylineno);
- checkmem(yyval.a_ref);
- ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[-2].tv_str, RLT_UNKNOWN);
- checkmem(ret == 0);
- ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[0].tv_str, RLT_UNKNOWN);
- checkmem(ret == 0);
- free(yyvsp[-2].tv_str);
- ;
- break;}
-case 115:
-#line 1191 "asn1p_y.y"
-{
- int ret;
- yyval.a_ref = asn1p_ref_new(yylineno);
- checkmem(yyval.a_ref);
- ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[-2].tv_str, RLT_UNKNOWN);
- checkmem(ret == 0);
- ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[0].tv_str, RLT_UNKNOWN);
- checkmem(ret == 0);
- free(yyvsp[-2].tv_str);
- ;
- break;}
case 116:
-#line 1201 "asn1p_y.y"
+#line 1199 "asn1p_y.y"
+{
+ int ret;
+ yyval.a_ref = asn1p_ref_new(yylineno);
+ checkmem(yyval.a_ref);
+ ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[-2].tv_str, RLT_UNKNOWN);
+ checkmem(ret == 0);
+ ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[0].tv_str, RLT_UNKNOWN);
+ checkmem(ret == 0);
+ free(yyvsp[-2].tv_str);
+ ;
+ break;}
+case 117:
+#line 1209 "asn1p_y.y"
+{
+ int ret;
+ yyval.a_ref = asn1p_ref_new(yylineno);
+ checkmem(yyval.a_ref);
+ ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[-2].tv_str, RLT_UNKNOWN);
+ checkmem(ret == 0);
+ ret = asn1p_ref_add_component(yyval.a_ref, yyvsp[0].tv_str, RLT_UNKNOWN);
+ checkmem(ret == 0);
+ free(yyvsp[-2].tv_str);
+ ;
+ break;}
+case 118:
+#line 1219 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2362,8 +2382,8 @@
free(yyvsp[-2].tv_str);
;
break;}
-case 117:
-#line 1211 "asn1p_y.y"
+case 119:
+#line 1229 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2373,8 +2393,8 @@
checkmem(ret == 0);
;
break;}
-case 118:
-#line 1219 "asn1p_y.y"
+case 120:
+#line 1237 "asn1p_y.y"
{
int ret;
yyval.a_ref = yyvsp[0].a_ref;
@@ -2395,8 +2415,8 @@
}
;
break;}
-case 119:
-#line 1241 "asn1p_y.y"
+case 121:
+#line 1259 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2406,8 +2426,8 @@
checkmem(ret == 0);
;
break;}
-case 120:
-#line 1249 "asn1p_y.y"
+case 122:
+#line 1267 "asn1p_y.y"
{
int ret;
yyval.a_ref = yyvsp[-2].a_ref;
@@ -2416,22 +2436,22 @@
checkmem(ret == 0);
;
break;}
-case 123:
-#line 1263 "asn1p_y.y"
+case 125:
+#line 1281 "asn1p_y.y"
{
yyval.a_refcomp.lex_type = RLT_AmpUppercase;
yyval.a_refcomp.name = yyvsp[0].tv_str;
;
break;}
-case 124:
-#line 1268 "asn1p_y.y"
+case 126:
+#line 1286 "asn1p_y.y"
{
yyval.a_refcomp.lex_type = RLT_Amplowercase;
yyval.a_refcomp.name = yyvsp[0].tv_str;
;
break;}
-case 125:
-#line 1281 "asn1p_y.y"
+case 127:
+#line 1299 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
assert(yyval.a_expr->Identifier == NULL);
@@ -2440,8 +2460,8 @@
yyval.a_expr->value = yyvsp[0].a_value;
;
break;}
-case 126:
-#line 1291 "asn1p_y.y"
+case 128:
+#line 1309 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
@@ -2450,76 +2470,76 @@
yyval.a_value->value.choice_identifier.value = yyvsp[0].a_value;
;
break;}
-case 127:
-#line 1298 "asn1p_y.y"
+case 129:
+#line 1316 "asn1p_y.y"
{ asn1p_lexer_hack_push_opaque_state(); ;
break;}
-case 128:
-#line 1298 "asn1p_y.y"
+case 130:
+#line 1316 "asn1p_y.y"
{
yyval.a_value = asn1p_value_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_UNPARSED;
;
break;}
-case 129:
-#line 1303 "asn1p_y.y"
+case 131:
+#line 1321 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_NULL;
;
break;}
-case 130:
-#line 1308 "asn1p_y.y"
+case 132:
+#line 1326 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_FALSE;
;
break;}
-case 131:
-#line 1313 "asn1p_y.y"
+case 133:
+#line 1331 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_TRUE;
;
break;}
-case 132:
-#line 1318 "asn1p_y.y"
+case 134:
+#line 1336 "asn1p_y.y"
{
yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'B');
checkmem(yyval.a_value);
;
break;}
-case 133:
-#line 1322 "asn1p_y.y"
+case 135:
+#line 1340 "asn1p_y.y"
{
yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'H');
checkmem(yyval.a_value);
;
break;}
-case 134:
-#line 1326 "asn1p_y.y"
+case 136:
+#line 1344 "asn1p_y.y"
{
yyval.a_value = yyval.a_value;
;
break;}
-case 135:
-#line 1329 "asn1p_y.y"
-{
- yyval.a_value = yyvsp[0].a_value;
- ;
- break;}
-case 136:
-#line 1332 "asn1p_y.y"
-{
- yyval.a_value = yyvsp[0].a_value;
- ;
- break;}
case 137:
-#line 1338 "asn1p_y.y"
+#line 1347 "asn1p_y.y"
+{
+ yyval.a_value = yyvsp[0].a_value;
+ ;
+ break;}
+case 138:
+#line 1350 "asn1p_y.y"
+{
+ yyval.a_value = yyvsp[0].a_value;
+ ;
+ break;}
+case 139:
+#line 1356 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -2532,8 +2552,8 @@
free(yyvsp[0].tv_str);
;
break;}
-case 138:
-#line 1349 "asn1p_y.y"
+case 140:
+#line 1367 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -2549,31 +2569,31 @@
free(yyvsp[0].tv_str);
;
break;}
-case 139:
-#line 1367 "asn1p_y.y"
+case 141:
+#line 1385 "asn1p_y.y"
{
yyval.a_value = asn1p_value_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0);
checkmem(yyval.a_value);
;
break;}
-case 140:
-#line 1371 "asn1p_y.y"
+case 142:
+#line 1389 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_TUPLE;
;
break;}
-case 141:
-#line 1376 "asn1p_y.y"
+case 143:
+#line 1394 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_QUADRUPLE;
;
break;}
-case 142:
-#line 1410 "asn1p_y.y"
+case 144:
+#line 1428 "asn1p_y.y"
{
yyval.tv_opaque.len = yyvsp[0].tv_opaque.len + 1;
yyval.tv_opaque.buf = malloc(yyval.tv_opaque.len + 1);
@@ -2584,8 +2604,8 @@
free(yyvsp[0].tv_opaque.buf);
;
break;}
-case 143:
-#line 1419 "asn1p_y.y"
+case 145:
+#line 1437 "asn1p_y.y"
{
int newsize = yyvsp[-1].tv_opaque.len + yyvsp[0].tv_opaque.len;
char *p = malloc(newsize + 1);
@@ -2599,72 +2619,72 @@
yyval.tv_opaque.len = newsize;
;
break;}
-case 144:
-#line 1434 "asn1p_y.y"
+case 146:
+#line 1452 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_BOOLEAN; ;
break;}
-case 145:
-#line 1435 "asn1p_y.y"
+case 147:
+#line 1453 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_NULL; ;
break;}
-case 146:
-#line 1436 "asn1p_y.y"
+case 148:
+#line 1454 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_REAL; ;
break;}
-case 147:
-#line 1437 "asn1p_y.y"
-{ yyval.a_type = yyvsp[0].a_type; ;
- break;}
-case 148:
-#line 1438 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_OCTET_STRING; ;
- break;}
case 149:
-#line 1439 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_OBJECT_IDENTIFIER; ;
+#line 1455 "asn1p_y.y"
+{ yyval.a_type = yyvsp[0].a_type; ;
break;}
case 150:
-#line 1440 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_RELATIVE_OID; ;
+#line 1456 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_OCTET_STRING; ;
break;}
case 151:
-#line 1441 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_EXTERNAL; ;
+#line 1457 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_OBJECT_IDENTIFIER; ;
break;}
case 152:
-#line 1442 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_EMBEDDED_PDV; ;
+#line 1458 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_RELATIVE_OID; ;
break;}
case 153:
-#line 1443 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_CHARACTER_STRING; ;
+#line 1459 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_EXTERNAL; ;
break;}
case 154:
-#line 1444 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_UTCTime; ;
+#line 1460 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_EMBEDDED_PDV; ;
break;}
case 155:
-#line 1445 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_GeneralizedTime; ;
+#line 1461 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_CHARACTER_STRING; ;
break;}
case 156:
-#line 1446 "asn1p_y.y"
-{ yyval.a_type = yyvsp[0].a_type; ;
+#line 1462 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_UTCTime; ;
break;}
case 157:
-#line 1453 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_INTEGER; ;
+#line 1463 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_GeneralizedTime; ;
break;}
case 158:
-#line 1454 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_ENUMERATED; ;
+#line 1464 "asn1p_y.y"
+{ yyval.a_type = yyvsp[0].a_type; ;
break;}
case 159:
-#line 1455 "asn1p_y.y"
-{ yyval.a_type = ASN_BASIC_BIT_STRING; ;
+#line 1471 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_INTEGER; ;
break;}
case 160:
-#line 1459 "asn1p_y.y"
+#line 1472 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_ENUMERATED; ;
+ break;}
+case 161:
+#line 1473 "asn1p_y.y"
+{ yyval.a_type = ASN_BASIC_BIT_STRING; ;
+ break;}
+case 162:
+#line 1477 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2672,8 +2692,8 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 161:
-#line 1465 "asn1p_y.y"
+case 163:
+#line 1483 "asn1p_y.y"
{
if(yyvsp[0].a_expr) {
yyval.a_expr = yyvsp[0].a_expr;
@@ -2685,92 +2705,92 @@
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 162:
-#line 1478 "asn1p_y.y"
+case 164:
+#line 1496 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_BMPString; ;
break;}
-case 163:
-#line 1479 "asn1p_y.y"
+case 165:
+#line 1497 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_GeneralString;
fprintf(stderr, "WARNING: GeneralString is not fully supported\n");
;
break;}
-case 164:
-#line 1483 "asn1p_y.y"
+case 166:
+#line 1501 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_GraphicString;
fprintf(stderr, "WARNING: GraphicString is not fully supported\n");
;
break;}
-case 165:
-#line 1487 "asn1p_y.y"
+case 167:
+#line 1505 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_IA5String; ;
break;}
-case 166:
-#line 1488 "asn1p_y.y"
+case 168:
+#line 1506 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_ISO646String; ;
break;}
-case 167:
-#line 1489 "asn1p_y.y"
+case 169:
+#line 1507 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_NumericString; ;
break;}
-case 168:
-#line 1490 "asn1p_y.y"
+case 170:
+#line 1508 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_PrintableString; ;
break;}
-case 169:
-#line 1491 "asn1p_y.y"
+case 171:
+#line 1509 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_T61String;
fprintf(stderr, "WARNING: T61String is not fully supported\n");
;
break;}
-case 170:
-#line 1495 "asn1p_y.y"
+case 172:
+#line 1513 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_TeletexString; ;
break;}
-case 171:
-#line 1496 "asn1p_y.y"
+case 173:
+#line 1514 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_UniversalString; ;
break;}
-case 172:
-#line 1497 "asn1p_y.y"
+case 174:
+#line 1515 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_UTF8String; ;
break;}
-case 173:
-#line 1498 "asn1p_y.y"
+case 175:
+#line 1516 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_VideotexString;
fprintf(stderr, "WARNING: VideotexString is not fully supported\n");
;
break;}
-case 174:
-#line 1502 "asn1p_y.y"
+case 176:
+#line 1520 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_VisibleString; ;
break;}
-case 175:
-#line 1503 "asn1p_y.y"
+case 177:
+#line 1521 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_ObjectDescriptor; ;
break;}
-case 181:
-#line 1515 "asn1p_y.y"
+case 183:
+#line 1533 "asn1p_y.y"
{ yyval.a_constr = 0; ;
break;}
-case 182:
-#line 1516 "asn1p_y.y"
+case 184:
+#line 1534 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 183:
-#line 1522 "asn1p_y.y"
+case 185:
+#line 1540 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[0].a_constr, 0);
;
break;}
-case 184:
-#line 1525 "asn1p_y.y"
+case 186:
+#line 1543 "asn1p_y.y"
{
/*
* This is a special case, for compatibility purposes.
@@ -2779,26 +2799,26 @@
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_SIZE, yyvsp[-1].a_constr, 0);
;
break;}
-case 185:
-#line 1535 "asn1p_y.y"
+case 187:
+#line 1553 "asn1p_y.y"
{
yyval.a_constr = yyvsp[-1].a_constr;
;
break;}
-case 186:
-#line 1538 "asn1p_y.y"
+case 188:
+#line 1556 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[-3].a_constr, yyvsp[-1].a_constr);
;
break;}
-case 187:
-#line 1544 "asn1p_y.y"
+case 189:
+#line 1562 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 188:
-#line 1547 "asn1p_y.y"
+case 190:
+#line 1565 "asn1p_y.y"
{
asn1p_constraint_t *ct;
ct = asn1p_constraint_new(yylineno);
@@ -2806,8 +2826,8 @@
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct);
;
break;}
-case 189:
-#line 1553 "asn1p_y.y"
+case 191:
+#line 1571 "asn1p_y.y"
{
asn1p_constraint_t *ct;
ct = asn1p_constraint_new(yylineno);
@@ -2817,38 +2837,38 @@
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, ct, yyvsp[0].a_constr);
;
break;}
-case 190:
-#line 1564 "asn1p_y.y"
+case 192:
+#line 1582 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 191:
-#line 1567 "asn1p_y.y"
+case 193:
+#line 1585 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_AEX, yyvsp[0].a_constr, 0);
;
break;}
-case 192:
-#line 1570 "asn1p_y.y"
+case 194:
+#line 1588 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_UNI, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 193:
-#line 1573 "asn1p_y.y"
+case 195:
+#line 1591 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_INT, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 194:
-#line 1576 "asn1p_y.y"
+case 196:
+#line 1594 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_EXC, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 195:
-#line 1582 "asn1p_y.y"
+case 197:
+#line 1600 "asn1p_y.y"
{
int ret;
yyval.a_constr = asn1p_constraint_new(yylineno);
@@ -2858,8 +2878,8 @@
checkmem(ret == 0);
;
break;}
-case 196:
-#line 1590 "asn1p_y.y"
+case 198:
+#line 1608 "asn1p_y.y"
{
int ret;
yyval.a_constr = asn1p_constraint_new(yylineno);
@@ -2869,8 +2889,8 @@
checkmem(ret == 0);
;
break;}
-case 197:
-#line 1598 "asn1p_y.y"
+case 199:
+#line 1616 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2878,8 +2898,8 @@
yyval.a_constr->value = yyvsp[0].a_value;
;
break;}
-case 198:
-#line 1604 "asn1p_y.y"
+case 200:
+#line 1622 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2887,40 +2907,40 @@
yyval.a_constr->containedSubtype = yyvsp[0].a_value;
;
break;}
-case 199:
-#line 1610 "asn1p_y.y"
-{
- yyval.a_constr = asn1p_constraint_new(yylineno);
- checkmem(yyval.a_constr);
- yyval.a_constr->type = yyvsp[-1].a_ctype;
- yyval.a_constr->range_start = yyvsp[-2].a_value;
- yyval.a_constr->range_stop = yyvsp[0].a_value;
- ;
- break;}
-case 200:
-#line 1617 "asn1p_y.y"
-{
- yyval.a_constr = asn1p_constraint_new(yylineno);
- checkmem(yyval.a_constr);
- yyval.a_constr->type = yyvsp[-1].a_ctype;
- yyval.a_constr->range_start = asn1p_value_fromint(-123);
- yyval.a_constr->range_stop = yyvsp[0].a_value;
- yyval.a_constr->range_start->type = ATV_MIN;
- ;
- break;}
case 201:
-#line 1625 "asn1p_y.y"
+#line 1628 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
yyval.a_constr->type = yyvsp[-1].a_ctype;
yyval.a_constr->range_start = yyvsp[-2].a_value;
- yyval.a_constr->range_stop = asn1p_value_fromint(321);
- yyval.a_constr->range_stop->type = ATV_MAX;
+ yyval.a_constr->range_stop = yyvsp[0].a_value;
;
break;}
case 202:
-#line 1633 "asn1p_y.y"
+#line 1635 "asn1p_y.y"
+{
+ yyval.a_constr = asn1p_constraint_new(yylineno);
+ checkmem(yyval.a_constr);
+ yyval.a_constr->type = yyvsp[-1].a_ctype;
+ yyval.a_constr->range_start = asn1p_value_fromint(-123);
+ yyval.a_constr->range_stop = yyvsp[0].a_value;
+ yyval.a_constr->range_start->type = ATV_MIN;
+ ;
+ break;}
+case 203:
+#line 1643 "asn1p_y.y"
+{
+ yyval.a_constr = asn1p_constraint_new(yylineno);
+ checkmem(yyval.a_constr);
+ yyval.a_constr->type = yyvsp[-1].a_ctype;
+ yyval.a_constr->range_start = yyvsp[-2].a_value;
+ yyval.a_constr->range_stop = asn1p_value_fromint(321);
+ yyval.a_constr->range_stop->type = ATV_MAX;
+ ;
+ break;}
+case 204:
+#line 1651 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2931,24 +2951,24 @@
yyval.a_constr->range_stop->type = ATV_MAX;
;
break;}
-case 203:
-#line 1642 "asn1p_y.y"
-{
- yyval.a_constr = yyvsp[0].a_constr;
- ;
- break;}
-case 204:
-#line 1645 "asn1p_y.y"
-{
- yyval.a_constr = yyvsp[0].a_constr;
- ;
- break;}
case 205:
-#line 1649 "asn1p_y.y"
-{ asn1p_lexer_hack_push_opaque_state(); ;
+#line 1660 "asn1p_y.y"
+{
+ yyval.a_constr = yyvsp[0].a_constr;
+ ;
break;}
case 206:
-#line 1649 "asn1p_y.y"
+#line 1663 "asn1p_y.y"
+{
+ yyval.a_constr = yyvsp[0].a_constr;
+ ;
+ break;}
+case 207:
+#line 1667 "asn1p_y.y"
+{ asn1p_lexer_hack_push_opaque_state(); ;
+ break;}
+case 208:
+#line 1667 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2958,64 +2978,64 @@
yyval.a_constr->value->type = ATV_UNPARSED;
;
break;}
-case 207:
-#line 1660 "asn1p_y.y"
+case 209:
+#line 1678 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_RANGE; ;
break;}
-case 208:
-#line 1661 "asn1p_y.y"
+case 210:
+#line 1679 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_RLRANGE; ;
break;}
-case 209:
-#line 1662 "asn1p_y.y"
+case 211:
+#line 1680 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_LLRANGE; ;
break;}
-case 210:
-#line 1663 "asn1p_y.y"
+case 212:
+#line 1681 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_ULRANGE; ;
break;}
-case 211:
-#line 1667 "asn1p_y.y"
+case 213:
+#line 1685 "asn1p_y.y"
{
yyval.a_ctype = ACT_CT_SIZE;
;
break;}
-case 212:
-#line 1670 "asn1p_y.y"
+case 214:
+#line 1688 "asn1p_y.y"
{
yyval.a_ctype = ACT_CT_FROM;
;
break;}
-case 213:
-#line 1676 "asn1p_y.y"
+case 215:
+#line 1694 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_FALSE;
;
break;}
-case 214:
-#line 1681 "asn1p_y.y"
+case 216:
+#line 1699 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(1);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_TRUE;
;
break;}
-case 215:
-#line 1686 "asn1p_y.y"
-{
- yyval.a_value = yyvsp[0].a_value;
- ;
- break;}
-case 216:
-#line 1689 "asn1p_y.y"
-{
- yyval.a_value = yyvsp[0].a_value;
- ;
- break;}
case 217:
-#line 1692 "asn1p_y.y"
+#line 1704 "asn1p_y.y"
+{
+ yyval.a_value = yyvsp[0].a_value;
+ ;
+ break;}
+case 218:
+#line 1707 "asn1p_y.y"
+{
+ yyval.a_value = yyvsp[0].a_value;
+ ;
+ break;}
+case 219:
+#line 1710 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -3028,8 +3048,8 @@
free(yyvsp[0].tv_str);
;
break;}
-case 218:
-#line 1706 "asn1p_y.y"
+case 220:
+#line 1724 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -3042,32 +3062,32 @@
free(yyvsp[0].tv_str);
;
break;}
-case 219:
-#line 1720 "asn1p_y.y"
+case 221:
+#line 1738 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMP, yyvsp[0].a_constr, 0);
;
break;}
-case 220:
-#line 1723 "asn1p_y.y"
+case 222:
+#line 1741 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-1].a_constr, 0);
;
break;}
-case 221:
-#line 1729 "asn1p_y.y"
+case 223:
+#line 1747 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 222:
-#line 1732 "asn1p_y.y"
+case 224:
+#line 1750 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 223:
-#line 1738 "asn1p_y.y"
+case 225:
+#line 1756 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -3075,8 +3095,8 @@
yyval.a_constr->value = asn1p_value_frombuf("...", 3, 0);
;
break;}
-case 224:
-#line 1744 "asn1p_y.y"
+case 226:
+#line 1762 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -3086,46 +3106,46 @@
if(yyvsp[-1].a_constr) asn1p_constraint_insert(yyval.a_constr, yyvsp[-1].a_constr);
;
break;}
-case 225:
-#line 1758 "asn1p_y.y"
+case 227:
+#line 1776 "asn1p_y.y"
{ yyval.a_pres = ACPRES_DEFAULT; ;
break;}
-case 226:
-#line 1759 "asn1p_y.y"
+case 228:
+#line 1777 "asn1p_y.y"
{ yyval.a_pres = yyvsp[0].a_pres; ;
break;}
-case 227:
-#line 1763 "asn1p_y.y"
+case 229:
+#line 1781 "asn1p_y.y"
{
yyval.a_pres = ACPRES_PRESENT;
;
break;}
-case 228:
-#line 1766 "asn1p_y.y"
+case 230:
+#line 1784 "asn1p_y.y"
{
yyval.a_pres = ACPRES_ABSENT;
;
break;}
-case 229:
-#line 1769 "asn1p_y.y"
+case 231:
+#line 1787 "asn1p_y.y"
{
yyval.a_pres = ACPRES_OPTIONAL;
;
break;}
-case 230:
-#line 1775 "asn1p_y.y"
-{
- yyval.a_constr = yyvsp[0].a_constr;
- ;
- break;}
-case 231:
-#line 1778 "asn1p_y.y"
-{
- yyval.a_constr = yyvsp[0].a_constr;
- ;
- break;}
case 232:
-#line 1787 "asn1p_y.y"
+#line 1793 "asn1p_y.y"
+{
+ yyval.a_constr = yyvsp[0].a_constr;
+ ;
+ break;}
+case 233:
+#line 1796 "asn1p_y.y"
+{
+ yyval.a_constr = yyvsp[0].a_constr;
+ ;
+ break;}
+case 234:
+#line 1805 "asn1p_y.y"
{
asn1p_ref_t *ref = asn1p_ref_new(yylineno);
asn1p_constraint_t *ct;
@@ -3139,14 +3159,14 @@
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, ct, 0);
;
break;}
-case 233:
-#line 1802 "asn1p_y.y"
+case 235:
+#line 1820 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, yyvsp[-3].a_constr, yyvsp[-1].a_constr);
;
break;}
-case 234:
-#line 1808 "asn1p_y.y"
+case 236:
+#line 1826 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -3154,8 +3174,8 @@
yyval.a_constr->value = asn1p_value_fromref(yyvsp[0].a_ref, 0);
;
break;}
-case 235:
-#line 1814 "asn1p_y.y"
+case 237:
+#line 1832 "asn1p_y.y"
{
asn1p_constraint_t *ct;
ct = asn1p_constraint_new(yylineno);
@@ -3165,8 +3185,8 @@
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct);
;
break;}
-case 236:
-#line 1828 "asn1p_y.y"
+case 238:
+#line 1846 "asn1p_y.y"
{
char *p = malloc(strlen(yyvsp[0].tv_str) + 2);
int ret;
@@ -3179,8 +3199,8 @@
free(yyvsp[0].tv_str);
;
break;}
-case 237:
-#line 1839 "asn1p_y.y"
+case 239:
+#line 1857 "asn1p_y.y"
{
char *p = malloc(strlen(yyvsp[0].tv_str) + 3);
int ret;
@@ -3194,14 +3214,14 @@
free(yyvsp[0].tv_str);
;
break;}
-case 238:
-#line 1855 "asn1p_y.y"
+case 240:
+#line 1873 "asn1p_y.y"
{
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
-case 239:
-#line 1858 "asn1p_y.y"
+case 241:
+#line 1876 "asn1p_y.y"
{
int l1 = strlen(yyvsp[-2].tv_str);
int l3 = strlen(yyvsp[0].tv_str);
@@ -3212,61 +3232,61 @@
yyval.tv_str[l1 + 1 + l3] = '\0';
;
break;}
-case 240:
-#line 1876 "asn1p_y.y"
+case 242:
+#line 1894 "asn1p_y.y"
{
yyval.a_marker.flags = EM_NOMARK;
yyval.a_marker.default_value = 0;
;
break;}
-case 241:
-#line 1880 "asn1p_y.y"
+case 243:
+#line 1898 "asn1p_y.y"
{ yyval.a_marker = yyvsp[0].a_marker; ;
break;}
-case 242:
-#line 1884 "asn1p_y.y"
+case 244:
+#line 1902 "asn1p_y.y"
{
yyval.a_marker.flags = EM_OPTIONAL;
yyval.a_marker.default_value = 0;
;
break;}
-case 243:
-#line 1888 "asn1p_y.y"
+case 245:
+#line 1906 "asn1p_y.y"
{
yyval.a_marker.flags = EM_DEFAULT;
yyval.a_marker.default_value = yyvsp[0].a_value;
;
break;}
-case 244:
-#line 1911 "asn1p_y.y"
+case 246:
+#line 1929 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
;
break;}
-case 245:
-#line 1915 "asn1p_y.y"
+case 247:
+#line 1933 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
;
break;}
-case 246:
-#line 1921 "asn1p_y.y"
+case 248:
+#line 1939 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 247:
-#line 1926 "asn1p_y.y"
+case 249:
+#line 1944 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 248:
-#line 1933 "asn1p_y.y"
+case 250:
+#line 1951 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3275,30 +3295,30 @@
yyval.a_expr->Identifier = yyvsp[0].tv_str;
;
break;}
-case 249:
-#line 1940 "asn1p_y.y"
-{
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->expr_type = A1TC_UNIVERVAL;
- yyval.a_expr->meta_type = AMT_VALUE;
- yyval.a_expr->Identifier = yyvsp[-3].tv_str;
- yyval.a_expr->value = yyvsp[-1].a_value;
- ;
- break;}
-case 250:
-#line 1948 "asn1p_y.y"
-{
- yyval.a_expr = asn1p_expr_new(yylineno);
- checkmem(yyval.a_expr);
- yyval.a_expr->expr_type = A1TC_UNIVERVAL;
- yyval.a_expr->meta_type = AMT_VALUE;
- yyval.a_expr->Identifier = yyvsp[-3].tv_str;
- yyval.a_expr->value = yyvsp[-1].a_value;
- ;
- break;}
case 251:
-#line 1956 "asn1p_y.y"
+#line 1958 "asn1p_y.y"
+{
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->expr_type = A1TC_UNIVERVAL;
+ yyval.a_expr->meta_type = AMT_VALUE;
+ yyval.a_expr->Identifier = yyvsp[-3].tv_str;
+ yyval.a_expr->value = yyvsp[-1].a_value;
+ ;
+ break;}
+case 252:
+#line 1966 "asn1p_y.y"
+{
+ yyval.a_expr = asn1p_expr_new(yylineno);
+ checkmem(yyval.a_expr);
+ yyval.a_expr->expr_type = A1TC_UNIVERVAL;
+ yyval.a_expr->meta_type = AMT_VALUE;
+ yyval.a_expr->Identifier = yyvsp[-3].tv_str;
+ yyval.a_expr->value = yyvsp[-1].a_value;
+ ;
+ break;}
+case 253:
+#line 1974 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3307,8 +3327,8 @@
yyval.a_expr->value = yyvsp[0].a_value;
;
break;}
-case 252:
-#line 1963 "asn1p_y.y"
+case 254:
+#line 1981 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3318,103 +3338,103 @@
yyval.a_expr->meta_type = AMT_VALUE;
;
break;}
-case 253:
-#line 1974 "asn1p_y.y"
-{
- yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
- checkmem(yyval.a_value);
- ;
- break;}
-case 254:
-#line 1978 "asn1p_y.y"
-{
- yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
- checkmem(yyval.a_value);
- ;
- break;}
case 255:
-#line 2009 "asn1p_y.y"
-{ memset(&yyval.a_tag, 0, sizeof(yyval.a_tag)); ;
+#line 1992 "asn1p_y.y"
+{
+ yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
+ checkmem(yyval.a_value);
+ ;
break;}
case 256:
-#line 2010 "asn1p_y.y"
-{ yyval.a_tag = yyvsp[0].a_tag; ;
+#line 1996 "asn1p_y.y"
+{
+ yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
+ checkmem(yyval.a_value);
+ ;
break;}
case 257:
-#line 2014 "asn1p_y.y"
+#line 2027 "asn1p_y.y"
+{ memset(&yyval.a_tag, 0, sizeof(yyval.a_tag)); ;
+ break;}
+case 258:
+#line 2028 "asn1p_y.y"
+{ yyval.a_tag = yyvsp[0].a_tag; ;
+ break;}
+case 259:
+#line 2032 "asn1p_y.y"
{
yyval.a_tag = yyvsp[-1].a_tag;
yyval.a_tag.tag_mode = yyvsp[0].a_tag.tag_mode;
;
break;}
-case 258:
-#line 2021 "asn1p_y.y"
+case 260:
+#line 2039 "asn1p_y.y"
{
yyval.a_tag = yyvsp[-2].a_tag;
yyval.a_tag.tag_value = yyvsp[-1].a_int;
;
break;}
-case 259:
-#line 2027 "asn1p_y.y"
+case 261:
+#line 2045 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_CONTEXT_SPECIFIC; ;
break;}
-case 260:
-#line 2028 "asn1p_y.y"
+case 262:
+#line 2046 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_UNIVERSAL; ;
break;}
-case 261:
-#line 2029 "asn1p_y.y"
+case 263:
+#line 2047 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_APPLICATION; ;
break;}
-case 262:
-#line 2030 "asn1p_y.y"
+case 264:
+#line 2048 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_PRIVATE; ;
break;}
-case 263:
-#line 2034 "asn1p_y.y"
+case 265:
+#line 2052 "asn1p_y.y"
{ yyval.a_tag.tag_mode = TM_DEFAULT; ;
break;}
-case 264:
-#line 2035 "asn1p_y.y"
+case 266:
+#line 2053 "asn1p_y.y"
{ yyval.a_tag.tag_mode = TM_IMPLICIT; ;
break;}
-case 265:
-#line 2036 "asn1p_y.y"
+case 267:
+#line 2054 "asn1p_y.y"
{ yyval.a_tag.tag_mode = TM_EXPLICIT; ;
break;}
-case 266:
-#line 2040 "asn1p_y.y"
-{
- checkmem(yyvsp[0].tv_str);
- yyval.tv_str = yyvsp[0].tv_str;
- ;
- break;}
-case 267:
-#line 2044 "asn1p_y.y"
-{
- checkmem(yyvsp[0].tv_str);
- yyval.tv_str = yyvsp[0].tv_str;
- ;
- break;}
case 268:
-#line 2052 "asn1p_y.y"
+#line 2058 "asn1p_y.y"
{
checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
case 269:
-#line 2059 "asn1p_y.y"
-{ yyval.tv_str = 0; ;
+#line 2062 "asn1p_y.y"
+{
+ checkmem(yyvsp[0].tv_str);
+ yyval.tv_str = yyvsp[0].tv_str;
+ ;
break;}
case 270:
-#line 2060 "asn1p_y.y"
+#line 2070 "asn1p_y.y"
{
+ checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
case 271:
-#line 2066 "asn1p_y.y"
+#line 2077 "asn1p_y.y"
+{ yyval.tv_str = 0; ;
+ break;}
+case 272:
+#line 2078 "asn1p_y.y"
+{
+ yyval.tv_str = yyvsp[0].tv_str;
+ ;
+ break;}
+case 273:
+#line 2084 "asn1p_y.y"
{
checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str;
@@ -3642,7 +3662,7 @@
}
return 1;
}
-#line 2072 "asn1p_y.y"
+#line 2090 "asn1p_y.y"
diff --git a/libasn1parser/asn1p_y.h b/libasn1parser/asn1p_y.h
index 71417b3..2862195 100644
--- a/libasn1parser/asn1p_y.h
+++ b/libasn1parser/asn1p_y.h
@@ -7,6 +7,7 @@
asn1p_constraint_t *a_constr; /* Constraint */
enum asn1p_constraint_type_e a_ctype;/* Constraint type */
asn1p_xports_t *a_xports; /* IMports/EXports */
+ struct AssignedIdentifier a_aid; /* Assigned Identifier */
asn1p_oid_t *a_oid; /* Object Identifier */
asn1p_oid_arc_t a_oid_arc; /* Single OID's arc */
struct asn1p_type_tag_s a_tag; /* A tag */