reverting to a much more simplistic parsing

1 files changed, 93 insertions, 91 deletions

diff --git a/libasn1parser/asn1p_y.h b/libasn1parser/asn1p_y.h
index 3b8d86de..71417b36 100644
--- a/libasn1parser/asn1p_y.h
+++ b/libasn1parser/asn1p_y.h
@@ -37,97 +37,99 @@ typedef union {
 #define	TOK_hstring	261
 #define	TOK_identifier	262
 #define	TOK_number	263
-#define	TOK_number_negative	264
-#define	TOK_typereference	265
-#define	TOK_capitalreference	266
-#define	TOK_typefieldreference	267
-#define	TOK_valuefieldreference	268
-#define	TOK_ABSENT	269
-#define	TOK_ABSTRACT_SYNTAX	270
-#define	TOK_ALL	271
-#define	TOK_ANY	272
-#define	TOK_APPLICATION	273
-#define	TOK_AUTOMATIC	274
-#define	TOK_BEGIN	275
-#define	TOK_BIT	276
-#define	TOK_BMPString	277
-#define	TOK_BOOLEAN	278
-#define	TOK_BY	279
-#define	TOK_CHARACTER	280
-#define	TOK_CHOICE	281
-#define	TOK_CLASS	282
-#define	TOK_COMPONENT	283
-#define	TOK_COMPONENTS	284
-#define	TOK_CONSTRAINED	285
-#define	TOK_CONTAINING	286
-#define	TOK_DEFAULT	287
-#define	TOK_DEFINITIONS	288
-#define	TOK_DEFINED	289
-#define	TOK_EMBEDDED	290
-#define	TOK_ENCODED	291
-#define	TOK_ENCODING_CONTROL	292
-#define	TOK_END	293
-#define	TOK_ENUMERATED	294
-#define	TOK_EXPLICIT	295
-#define	TOK_EXPORTS	296
-#define	TOK_EXTENSIBILITY	297
-#define	TOK_EXTERNAL	298
-#define	TOK_FALSE	299
-#define	TOK_FROM	300
-#define	TOK_GeneralizedTime	301
-#define	TOK_GeneralString	302
-#define	TOK_GraphicString	303
-#define	TOK_IA5String	304
-#define	TOK_IDENTIFIER	305
-#define	TOK_IMPLICIT	306
-#define	TOK_IMPLIED	307
-#define	TOK_IMPORTS	308
-#define	TOK_INCLUDES	309
-#define	TOK_INSTANCE	310
-#define	TOK_INSTRUCTIONS	311
-#define	TOK_INTEGER	312
-#define	TOK_ISO646String	313
-#define	TOK_MAX	314
-#define	TOK_MIN	315
-#define	TOK_MINUS_INFINITY	316
-#define	TOK_NULL	317
-#define	TOK_NumericString	318
-#define	TOK_OBJECT	319
-#define	TOK_ObjectDescriptor	320
-#define	TOK_OCTET	321
-#define	TOK_OF	322
-#define	TOK_OPTIONAL	323
-#define	TOK_PATTERN	324
-#define	TOK_PDV	325
-#define	TOK_PLUS_INFINITY	326
-#define	TOK_PRESENT	327
-#define	TOK_PrintableString	328
-#define	TOK_PRIVATE	329
-#define	TOK_REAL	330
-#define	TOK_RELATIVE_OID	331
-#define	TOK_SEQUENCE	332
-#define	TOK_SET	333
-#define	TOK_SIZE	334
-#define	TOK_STRING	335
-#define	TOK_SYNTAX	336
-#define	TOK_T61String	337
-#define	TOK_TAGS	338
-#define	TOK_TeletexString	339
-#define	TOK_TRUE	340
-#define	TOK_TYPE_IDENTIFIER	341
-#define	TOK_UNIQUE	342
-#define	TOK_UNIVERSAL	343
-#define	TOK_UniversalString	344
-#define	TOK_UTCTime	345
-#define	TOK_UTF8String	346
-#define	TOK_VideotexString	347
-#define	TOK_VisibleString	348
-#define	TOK_WITH	349
-#define	TOK_EXCEPT	350
-#define	TOK_INTERSECTION	351
-#define	TOK_UNION	352
-#define	TOK_TwoDots	353
-#define	TOK_ThreeDots	354
+#define	TOK_tuple	264
+#define	TOK_quadruple	265
+#define	TOK_number_negative	266
+#define	TOK_typereference	267
+#define	TOK_capitalreference	268
+#define	TOK_typefieldreference	269
+#define	TOK_valuefieldreference	270
+#define	TOK_ABSENT	271
+#define	TOK_ABSTRACT_SYNTAX	272
+#define	TOK_ALL	273
+#define	TOK_ANY	274
+#define	TOK_APPLICATION	275
+#define	TOK_AUTOMATIC	276
+#define	TOK_BEGIN	277
+#define	TOK_BIT	278
+#define	TOK_BMPString	279
+#define	TOK_BOOLEAN	280
+#define	TOK_BY	281
+#define	TOK_CHARACTER	282
+#define	TOK_CHOICE	283
+#define	TOK_CLASS	284
+#define	TOK_COMPONENT	285
+#define	TOK_COMPONENTS	286
+#define	TOK_CONSTRAINED	287
+#define	TOK_CONTAINING	288
+#define	TOK_DEFAULT	289
+#define	TOK_DEFINITIONS	290
+#define	TOK_DEFINED	291
+#define	TOK_EMBEDDED	292
+#define	TOK_ENCODED	293
+#define	TOK_ENCODING_CONTROL	294
+#define	TOK_END	295
+#define	TOK_ENUMERATED	296
+#define	TOK_EXPLICIT	297
+#define	TOK_EXPORTS	298
+#define	TOK_EXTENSIBILITY	299
+#define	TOK_EXTERNAL	300
+#define	TOK_FALSE	301
+#define	TOK_FROM	302
+#define	TOK_GeneralizedTime	303
+#define	TOK_GeneralString	304
+#define	TOK_GraphicString	305
+#define	TOK_IA5String	306
+#define	TOK_IDENTIFIER	307
+#define	TOK_IMPLICIT	308
+#define	TOK_IMPLIED	309
+#define	TOK_IMPORTS	310
+#define	TOK_INCLUDES	311
+#define	TOK_INSTANCE	312
+#define	TOK_INSTRUCTIONS	313
+#define	TOK_INTEGER	314
+#define	TOK_ISO646String	315
+#define	TOK_MAX	316
+#define	TOK_MIN	317
+#define	TOK_MINUS_INFINITY	318
+#define	TOK_NULL	319
+#define	TOK_NumericString	320
+#define	TOK_OBJECT	321
+#define	TOK_ObjectDescriptor	322
+#define	TOK_OCTET	323
+#define	TOK_OF	324
+#define	TOK_OPTIONAL	325
+#define	TOK_PATTERN	326
+#define	TOK_PDV	327
+#define	TOK_PLUS_INFINITY	328
+#define	TOK_PRESENT	329
+#define	TOK_PrintableString	330
+#define	TOK_PRIVATE	331
+#define	TOK_REAL	332
+#define	TOK_RELATIVE_OID	333
+#define	TOK_SEQUENCE	334
+#define	TOK_SET	335
+#define	TOK_SIZE	336
+#define	TOK_STRING	337
+#define	TOK_SYNTAX	338
+#define	TOK_T61String	339
+#define	TOK_TAGS	340
+#define	TOK_TeletexString	341
+#define	TOK_TRUE	342
+#define	TOK_TYPE_IDENTIFIER	343
+#define	TOK_UNIQUE	344
+#define	TOK_UNIVERSAL	345
+#define	TOK_UniversalString	346
+#define	TOK_UTCTime	347
+#define	TOK_UTF8String	348
+#define	TOK_VideotexString	349
+#define	TOK_VisibleString	350
+#define	TOK_WITH	351
+#define	TOK_EXCEPT	352
+#define	TOK_INTERSECTION	353
+#define	TOK_UNION	354
+#define	TOK_TwoDots	355
+#define	TOK_ThreeDots	356
 
 
 extern YYSTYPE asn1p_lval;