ignore UTF-8 byte order mark
diff --git a/libasn1parser/asn1p_y.c b/libasn1parser/asn1p_y.c
index e3c8505..79a44e7 100644
--- a/libasn1parser/asn1p_y.c
+++ b/libasn1parser/asn1p_y.c
@@ -1,21 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -26,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7.12-4996"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -52,133 +55,18 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse         asn1p_parse
-#define yylex           asn1p_lex
-#define yyerror         asn1p_error
-#define yydebug         asn1p_debug
-#define yynerrs         asn1p_nerrs
+#define yyparse asn1p_parse
+#define yylex   asn1p_lex
+#define yyerror asn1p_error
+#define yylval  asn1p_lval
+#define yychar  asn1p_char
+#define yydebug asn1p_debug
+#define yynerrs asn1p_nerrs
 
-#define yylval          asn1p_lval
-#define yychar          asn1p_char
-
-/* Copy the first part of user declarations.  */
-/* Line 371 of yacc.c  */
-#line 1 "asn1p_y.y"
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "asn1parser.h"
-
-#define YYPARSE_PARAM	param
-#define YYPARSE_PARAM_TYPE	void **
-#define YYERROR_VERBOSE
-
-int yylex(void);
-int yyerror(const char *msg);
-#ifdef	YYBYACC
-int yyparse(void **param);	/* byacc does not produce a prototype */
-#endif
-void asn1p_lexer_hack_push_opaque_state(void);
-void asn1p_lexer_hack_enable_with_syntax(void);
-void asn1p_lexer_hack_push_encoding_control(void);
-#define	yylineno	asn1p_lineno
-extern int asn1p_lineno;
-
-/*
- * Process directives as <ASN1C:RepresentAsPointer>
- */
-extern int asn1p_as_pointer;
-
-/*
- * 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);
-static void _fixup_anonymous_identifier(asn1p_expr_t *expr);
-
-static asn1p_module_t *currentModule;
-#define	NEW_EXPR()	(asn1p_expr_new(yylineno, currentModule))
-
-#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, currentModule);	\
-			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)
-
-#ifdef	AL_IMPORT
-#error	AL_IMPORT DEFINED ELSEWHERE!
-#endif
-#define	AL_IMPORT(to,where,from,field)	do {				\
-		if(!(from)) break;					\
-		while(TQ_FIRST(&((from)->where))) {			\
-			TQ_ADD(&((to)->where),				\
-				TQ_REMOVE(&((from)->where), field),	\
-				field);					\
-		}							\
-		assert(TQ_FIRST(&((from)->where)) == 0);		\
-	} while(0)
-
-
-/* Line 371 of yacc.c  */
-#line 149 "asn1p_y.y"
-
-# ifndef YY_NULL
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
-#  else
-#   define YY_NULL 0
-#  endif
-# endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -286,11 +174,12 @@
      TOK_VideotexString = 355,
      TOK_VisibleString = 356,
      TOK_WITH = 357,
-     TOK_EXCEPT = 358,
-     TOK_INTERSECTION = 359,
-     TOK_UNION = 360,
-     TOK_TwoDots = 361,
-     TOK_ThreeDots = 362
+     UTF8_BOM = 358,
+     TOK_EXCEPT = 359,
+     TOK_INTERSECTION = 360,
+     TOK_UNION = 361,
+     TOK_TwoDots = 362,
+     TOK_ThreeDots = 363
    };
 #endif
 /* Tokens.  */
@@ -394,20 +283,121 @@
 #define TOK_VideotexString 355
 #define TOK_VisibleString 356
 #define TOK_WITH 357
-#define TOK_EXCEPT 358
-#define TOK_INTERSECTION 359
-#define TOK_UNION 360
-#define TOK_TwoDots 361
-#define TOK_ThreeDots 362
+#define UTF8_BOM 358
+#define TOK_EXCEPT 359
+#define TOK_INTERSECTION 360
+#define TOK_UNION 361
+#define TOK_TwoDots 362
+#define TOK_ThreeDots 363
 
 
 
+
+/* Copy the first part of user declarations.  */
+#line 1 "asn1p_y.y"
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "asn1parser.h"
+
+#define YYPARSE_PARAM	param
+#define YYPARSE_PARAM_TYPE	void **
+#define YYERROR_VERBOSE
+
+int yylex(void);
+int yyerror(const char *msg);
+#ifdef	YYBYACC
+int yyparse(void **param);	/* byacc does not produce a prototype */
+#endif
+void asn1p_lexer_hack_push_opaque_state(void);
+void asn1p_lexer_hack_enable_with_syntax(void);
+void asn1p_lexer_hack_push_encoding_control(void);
+#define	yylineno	asn1p_lineno
+extern int asn1p_lineno;
+
+/*
+ * Process directives as <ASN1C:RepresentAsPointer>
+ */
+extern int asn1p_as_pointer;
+
+/*
+ * 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);
+static void _fixup_anonymous_identifier(asn1p_expr_t *expr);
+
+static asn1p_module_t *currentModule;
+#define	NEW_EXPR()	(asn1p_expr_new(yylineno, currentModule))
+
+#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, currentModule);	\
+			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)
+
+#ifdef	AL_IMPORT
+#error	AL_IMPORT DEFINED ELSEWHERE!
+#endif
+#define	AL_IMPORT(to,where,from,field)	do {				\
+		if(!(from)) break;					\
+		while(TQ_FIRST(&((from)->where))) {			\
+			TQ_ADD(&((to)->where),				\
+				TQ_REMOVE(&((from)->where), field),	\
+				field);					\
+		}							\
+		assert(TQ_FIRST(&((from)->where)) == 0);		\
+	} while(0)
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
-/* Line 387 of yacc.c  */
 #line 88 "asn1p_y.y"
-
+{
 	asn1p_t			*a_grammar;
 	asn1p_module_flags_e	 a_module_flags;
 	asn1p_module_t		*a_module;
@@ -440,38 +430,22 @@
 		char *name;
 		struct asn1p_type_tag_s tag;
 	} tv_nametag;
-
-
-/* Line 387 of yacc.c  */
-#line 439 "asn1p_y.y"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 193 of yacc.c.  */
+#line 436 "asn1p_y.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-extern YYSTYPE yylval;
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
 
 
 /* Copy the second part of user declarations.  */
 
-/* Line 390 of yacc.c  */
-#line 467 "asn1p_y.y"
+
+/* Line 216 of yacc.c.  */
+#line 449 "asn1p_y.c"
 
 #ifdef short
 # undef short
@@ -524,45 +498,36 @@
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if (! defined __GNUC__ || __GNUC__ < 2 \
-      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-#  define __attribute__(Spec) /* empty */
+#  define YY_(msgid) msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
+# define YYUSE(e) ((void) (e))
 #else
-# define YYUSE(E) /* empty */
+# define YYUSE(e) /* empty */
 #endif
 
-
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(N) (N)
+# define YYID(n) (n)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -583,12 +548,11 @@
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -611,24 +575,24 @@
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -644,9 +608,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -657,19 +621,35 @@
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -677,43 +657,23 @@
 
 #endif
 
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  7
+#define YYFINAL  9
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   873
+#define YYLAST   812
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  123
+#define YYNTOKENS  124
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  124
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  316
+#define YYNRULES  317
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  477
+#define YYNSTATES  479
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   362
+#define YYMAXUTOK   363
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -724,16 +684,16 @@
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   119,     2,     2,     2,     2,     2,     2,
-     112,   113,     2,     2,   115,     2,   120,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   116,   114,
-     121,     2,     2,     2,   122,     2,     2,     2,     2,     2,
+       2,     2,     2,   120,     2,     2,     2,     2,     2,     2,
+     113,   114,     2,     2,   116,     2,   121,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   117,   115,
+     122,     2,     2,     2,   123,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   117,     2,   118,   104,     2,     2,     2,     2,     2,
+       2,   118,     2,   119,   105,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   110,   106,   111,     2,     2,     2,     2,
+       2,     2,     2,   111,   107,   112,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -756,8 +716,8 @@
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   105,
-     107,   108,   109
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     106,   108,   109,   110
 };
 
 #if YYDEBUG
@@ -765,172 +725,173 @@
    YYRHS.  */
 static const yytype_uint16 yyprhs[] =
 {
-       0,     0,     3,     5,     7,    10,    11,    21,    22,    24,
-      28,    31,    33,    36,    38,    43,    45,    46,    48,    50,
-      53,    56,    59,    62,    65,    68,    69,    71,    75,    77,
-      80,    82,    84,    86,    87,    91,    93,    94,    96,   100,
-     103,   104,   106,   108,   111,   112,   114,   119,   121,   125,
-     127,   131,   133,   134,   136,   140,   144,   147,   149,   153,
-     155,   159,   161,   165,   170,   172,   174,   179,   183,   187,
-     194,   201,   203,   207,   209,   213,   217,   221,   225,   227,
-     231,   233,   235,   237,   239,   240,   242,   244,   248,   254,
-     258,   261,   265,   267,   269,   273,   276,   278,   280,   286,
-     287,   289,   291,   295,   298,   303,   307,   311,   315,   319,
-     323,   324,   326,   327,   334,   336,   339,   341,   343,   345,
-     349,   351,   355,   359,   363,   364,   367,   369,   374,   379,
-     384,   391,   398,   400,   405,   409,   411,   415,   419,   423,
-     425,   429,   431,   435,   437,   439,   441,   443,   447,   451,
-     453,   458,   460,   462,   466,   467,   471,   473,   475,   477,
-     479,   481,   483,   485,   487,   491,   493,   495,   497,   499,
-     502,   504,   506,   508,   510,   513,   516,   518,   520,   523,
-     526,   528,   530,   532,   534,   536,   539,   541,   544,   546,
-     548,   550,   552,   554,   556,   558,   560,   562,   564,   566,
-     568,   570,   572,   574,   576,   578,   580,   581,   583,   585,
-     587,   592,   596,   601,   603,   605,   607,   609,   613,   619,
-     621,   625,   627,   631,   633,   637,   639,   643,   648,   652,
-     654,   656,   660,   664,   668,   672,   674,   676,   677,   681,
-     684,   687,   689,   691,   693,   695,   697,   699,   701,   703,
-     705,   707,   709,   713,   719,   721,   725,   727,   731,   732,
-     734,   736,   738,   740,   742,   744,   746,   747,   753,   756,
-     758,   761,   764,   768,   770,   772,   776,   781,   783,   787,
-     790,   794,   796,   800,   801,   803,   805,   808,   811,   815,
-     817,   821,   823,   828,   833,   835,   837,   839,   841,   843,
-     845,   846,   848,   851,   856,   857,   859,   861,   863,   864,
-     866,   868,   870,   872,   874,   875,   877
+       0,     0,     3,     6,     8,    10,    13,    14,    24,    25,
+      27,    31,    34,    36,    39,    41,    46,    48,    49,    51,
+      53,    56,    59,    62,    65,    68,    71,    72,    74,    78,
+      80,    83,    85,    87,    89,    90,    94,    96,    97,    99,
+     103,   106,   107,   109,   111,   114,   115,   117,   122,   124,
+     128,   130,   134,   136,   137,   139,   143,   147,   150,   152,
+     156,   158,   162,   164,   168,   173,   175,   177,   182,   186,
+     190,   197,   204,   206,   210,   212,   216,   220,   224,   228,
+     230,   234,   236,   238,   240,   242,   243,   245,   247,   251,
+     257,   261,   264,   268,   270,   272,   276,   279,   281,   283,
+     289,   290,   292,   294,   298,   301,   306,   310,   314,   318,
+     322,   326,   327,   329,   330,   337,   339,   342,   344,   346,
+     348,   352,   354,   358,   362,   366,   367,   370,   372,   377,
+     382,   387,   394,   401,   403,   408,   412,   414,   418,   422,
+     426,   428,   432,   434,   438,   440,   442,   444,   446,   450,
+     454,   456,   461,   463,   465,   469,   470,   474,   476,   478,
+     480,   482,   484,   486,   488,   490,   494,   496,   498,   500,
+     502,   505,   507,   509,   511,   513,   516,   519,   521,   523,
+     526,   529,   531,   533,   535,   537,   539,   542,   544,   547,
+     549,   551,   553,   555,   557,   559,   561,   563,   565,   567,
+     569,   571,   573,   575,   577,   579,   581,   583,   584,   586,
+     588,   590,   595,   599,   604,   606,   608,   610,   612,   616,
+     622,   624,   628,   630,   634,   636,   640,   642,   646,   651,
+     655,   657,   659,   663,   667,   671,   675,   677,   679,   680,
+     684,   687,   690,   692,   694,   696,   698,   700,   702,   704,
+     706,   708,   710,   712,   716,   722,   724,   728,   730,   734,
+     735,   737,   739,   741,   743,   745,   747,   749,   750,   756,
+     759,   761,   764,   767,   771,   773,   775,   779,   784,   786,
+     790,   793,   797,   799,   803,   804,   806,   808,   811,   814,
+     818,   820,   824,   826,   831,   836,   838,   840,   842,   844,
+     846,   848,   849,   851,   854,   859,   860,   862,   864,   866,
+     867,   869,   871,   873,   875,   877,   878,   880
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     124,     0,    -1,   125,    -1,   126,    -1,   125,   126,    -1,
-      -1,   243,   127,   128,    41,   132,     3,    28,   135,    46,
-      -1,    -1,   129,    -1,   110,   130,   111,    -1,   110,   111,
-      -1,   131,    -1,   130,   131,    -1,   246,    -1,   246,   112,
-      12,   113,    -1,    12,    -1,    -1,   133,    -1,   134,    -1,
-     133,   134,    -1,    48,    91,    -1,    59,    91,    -1,    27,
-      91,    -1,    50,    60,    -1,    18,    64,    -1,    -1,   136,
-      -1,   148,   140,   137,    -1,   138,    -1,   137,   138,    -1,
-     155,    -1,   185,    -1,   153,    -1,    -1,    45,    18,   139,
-      -1,   195,    -1,    -1,   141,    -1,    61,   142,   114,    -1,
-      61,    53,    -1,    -1,   143,    -1,   145,    -1,   143,   145,
-      -1,    -1,   129,    -1,   146,    53,   243,   144,    -1,   147,
-      -1,   146,   115,   147,    -1,   243,    -1,   243,   110,   111,
-      -1,   246,    -1,    -1,   149,    -1,    49,   150,   114,    -1,
-      49,    24,   114,    -1,    49,   114,    -1,   151,    -1,   150,
-     115,   151,    -1,   243,    -1,   243,   110,   111,    -1,   246,
-      -1,   110,   203,   111,    -1,   243,   154,     3,   152,    -1,
-     194,    -1,   179,    -1,   179,   110,   158,   111,    -1,   243,
-       3,   175,    -1,   243,     3,   165,    -1,   243,   110,   156,
-     111,     3,   175,    -1,   243,   110,   156,   111,     3,   165,
-      -1,   157,    -1,   156,   115,   157,    -1,   243,    -1,   243,
-     116,   246,    -1,   243,   116,   243,    -1,   192,   116,   246,
-      -1,   192,   116,   243,    -1,   159,    -1,   158,   115,   159,
-      -1,   175,    -1,   188,    -1,   246,    -1,   152,    -1,    -1,
-     161,    -1,   162,    -1,   161,   115,   162,    -1,   161,   115,
-       4,   161,     5,    -1,   246,   175,   231,    -1,   175,   231,
-      -1,    37,    75,   175,    -1,   174,    -1,   164,    -1,   163,
-     115,   164,    -1,   246,   175,    -1,   174,    -1,   175,    -1,
-      35,   110,   167,   111,   169,    -1,    -1,    95,    -1,   168,
-      -1,   167,   115,   168,    -1,    19,   231,    -1,    20,   175,
-     166,   231,    -1,    20,   183,   231,    -1,    20,   184,   231,
-      -1,    19,   183,   231,    -1,    19,   175,   231,    -1,    19,
-     184,   231,    -1,    -1,   170,    -1,    -1,   102,    89,   110,
-     171,   172,   111,    -1,   173,    -1,   172,   173,    -1,     6,
-      -1,    21,    -1,   182,    -1,   117,   172,   118,    -1,   109,
-      -1,   109,   119,   189,    -1,   109,   119,   236,    -1,   238,
-     177,   198,    -1,    -1,   176,   178,    -1,   154,    -1,    34,
-     110,   163,   111,    -1,    85,   110,   160,   111,    -1,    86,
-     110,   160,   111,    -1,    85,   198,    75,   245,   238,   177,
-      -1,    86,   198,    75,   245,   238,   177,    -1,    25,    -1,
-      25,    42,    32,   246,    -1,    63,    75,   179,    -1,    17,
-      -1,    17,   120,   243,    -1,   244,   120,   243,    -1,    17,
-     120,   246,    -1,   244,    -1,   244,   120,   180,    -1,   181,
-      -1,   180,   120,   181,    -1,   182,    -1,    19,    -1,    20,
-      -1,    19,    -1,   183,   120,    19,    -1,   183,   120,    20,
-      -1,    18,    -1,   246,   175,     3,   186,    -1,   188,    -1,
-     189,    -1,   246,   116,   186,    -1,    -1,   110,   187,   191,
-      -1,    70,    -1,    52,    -1,    93,    -1,     8,    -1,    10,
-      -1,   190,    -1,   236,    -1,   246,    -1,   243,   120,   246,
-      -1,     9,    -1,    15,    -1,    16,    -1,     7,    -1,   191,
-       7,    -1,    31,    -1,    70,    -1,    83,    -1,   193,    -1,
-      74,    88,    -1,    72,    58,    -1,    84,    -1,    51,    -1,
-      43,    78,    -1,    33,    88,    -1,    98,    -1,    54,    -1,
-     195,    -1,    65,    -1,    47,    -1,    29,    88,    -1,   192,
-      -1,   193,   233,    -1,    30,    -1,    55,    -1,    56,    -1,
-      57,    -1,    66,    -1,    71,    -1,    81,    -1,    90,    -1,
-      92,    -1,    97,    -1,    99,    -1,   100,    -1,   101,    -1,
-      73,    -1,   106,    -1,   107,    -1,   104,    -1,   105,    -1,
-      -1,   199,    -1,   200,    -1,   201,    -1,    87,   112,   202,
-     113,    -1,   112,   202,   113,    -1,   201,   112,   202,   113,
-      -1,   203,    -1,   220,    -1,   109,    -1,   204,    -1,   204,
-     115,   109,    -1,   204,   115,   109,   115,   204,    -1,   205,
-      -1,    24,   103,   208,    -1,   206,    -1,   205,   196,   206,
-      -1,   207,    -1,   206,   197,   207,    -1,   208,    -1,   208,
-     103,   208,    -1,   211,   112,   203,   113,    -1,   112,   203,
-     113,    -1,   212,    -1,   214,    -1,   212,   224,   212,    -1,
-      68,   224,   212,    -1,   212,   224,    67,    -1,    68,   224,
-      67,    -1,   215,    -1,   210,    -1,    -1,   110,   209,   191,
-      -1,    77,     9,    -1,    77,   246,    -1,    87,    -1,    53,
-      -1,    52,    -1,    93,    -1,   237,    -1,   190,    -1,   213,
-      -1,   246,    -1,     8,    -1,    10,    -1,   179,    -1,   102,
-      36,   201,    -1,   102,    37,   110,   216,   111,    -1,   217,
-      -1,   216,   115,   217,    -1,   109,    -1,   246,   198,   218,
-      -1,    -1,   219,    -1,    80,    -1,    22,    -1,    76,    -1,
-     221,    -1,   225,    -1,   223,    -1,    -1,    38,    32,   110,
-     222,   191,    -1,    39,   175,    -1,   108,    -1,   108,   121,
-      -1,   121,   108,    -1,   121,   108,   121,    -1,   226,    -1,
-     227,    -1,   110,   243,   111,    -1,   226,   110,   228,   111,
-      -1,   229,    -1,   228,   115,   229,    -1,   122,   230,    -1,
-     122,   120,   230,    -1,   246,    -1,   230,   120,   246,    -1,
-      -1,   232,    -1,    76,    -1,    40,   186,    -1,   110,   111,
-      -1,   110,   234,   111,    -1,   235,    -1,   234,   115,   235,
-      -1,   246,    -1,   246,   112,   236,   113,    -1,   246,   112,
-     189,   113,    -1,   236,    -1,   109,    -1,    12,    -1,    13,
-      -1,   236,    -1,    14,    -1,    -1,   239,    -1,   240,   242,
-      -1,   117,   241,    12,   118,    -1,    -1,    96,    -1,    26,
-      -1,    82,    -1,    -1,    59,    -1,    48,    -1,    17,    -1,
-      18,    -1,    18,    -1,    -1,   246,    -1,    11,    -1
+     125,     0,    -1,   103,   126,    -1,   126,    -1,   127,    -1,
+     126,   127,    -1,    -1,   244,   128,   129,    41,   133,     3,
+      28,   136,    46,    -1,    -1,   130,    -1,   111,   131,   112,
+      -1,   111,   112,    -1,   132,    -1,   131,   132,    -1,   247,
+      -1,   247,   113,    12,   114,    -1,    12,    -1,    -1,   134,
+      -1,   135,    -1,   134,   135,    -1,    48,    91,    -1,    59,
+      91,    -1,    27,    91,    -1,    50,    60,    -1,    18,    64,
+      -1,    -1,   137,    -1,   149,   141,   138,    -1,   139,    -1,
+     138,   139,    -1,   156,    -1,   186,    -1,   154,    -1,    -1,
+      45,    18,   140,    -1,   196,    -1,    -1,   142,    -1,    61,
+     143,   115,    -1,    61,    53,    -1,    -1,   144,    -1,   146,
+      -1,   144,   146,    -1,    -1,   130,    -1,   147,    53,   244,
+     145,    -1,   148,    -1,   147,   116,   148,    -1,   244,    -1,
+     244,   111,   112,    -1,   247,    -1,    -1,   150,    -1,    49,
+     151,   115,    -1,    49,    24,   115,    -1,    49,   115,    -1,
+     152,    -1,   151,   116,   152,    -1,   244,    -1,   244,   111,
+     112,    -1,   247,    -1,   111,   204,   112,    -1,   244,   155,
+       3,   153,    -1,   195,    -1,   180,    -1,   180,   111,   159,
+     112,    -1,   244,     3,   176,    -1,   244,     3,   166,    -1,
+     244,   111,   157,   112,     3,   176,    -1,   244,   111,   157,
+     112,     3,   166,    -1,   158,    -1,   157,   116,   158,    -1,
+     244,    -1,   244,   117,   247,    -1,   244,   117,   244,    -1,
+     193,   117,   247,    -1,   193,   117,   244,    -1,   160,    -1,
+     159,   116,   160,    -1,   176,    -1,   189,    -1,   247,    -1,
+     153,    -1,    -1,   162,    -1,   163,    -1,   162,   116,   163,
+      -1,   162,   116,     4,   162,     5,    -1,   247,   176,   232,
+      -1,   176,   232,    -1,    37,    75,   176,    -1,   175,    -1,
+     165,    -1,   164,   116,   165,    -1,   247,   176,    -1,   175,
+      -1,   176,    -1,    35,   111,   168,   112,   170,    -1,    -1,
+      95,    -1,   169,    -1,   168,   116,   169,    -1,    19,   232,
+      -1,    20,   176,   167,   232,    -1,    20,   184,   232,    -1,
+      20,   185,   232,    -1,    19,   184,   232,    -1,    19,   176,
+     232,    -1,    19,   185,   232,    -1,    -1,   171,    -1,    -1,
+     102,    89,   111,   172,   173,   112,    -1,   174,    -1,   173,
+     174,    -1,     6,    -1,    21,    -1,   183,    -1,   118,   173,
+     119,    -1,   110,    -1,   110,   120,   190,    -1,   110,   120,
+     237,    -1,   239,   178,   199,    -1,    -1,   177,   179,    -1,
+     155,    -1,    34,   111,   164,   112,    -1,    85,   111,   161,
+     112,    -1,    86,   111,   161,   112,    -1,    85,   199,    75,
+     246,   239,   178,    -1,    86,   199,    75,   246,   239,   178,
+      -1,    25,    -1,    25,    42,    32,   247,    -1,    63,    75,
+     180,    -1,    17,    -1,    17,   121,   244,    -1,   245,   121,
+     244,    -1,    17,   121,   247,    -1,   245,    -1,   245,   121,
+     181,    -1,   182,    -1,   181,   121,   182,    -1,   183,    -1,
+      19,    -1,    20,    -1,    19,    -1,   184,   121,    19,    -1,
+     184,   121,    20,    -1,    18,    -1,   247,   176,     3,   187,
+      -1,   189,    -1,   190,    -1,   247,   117,   187,    -1,    -1,
+     111,   188,   192,    -1,    70,    -1,    52,    -1,    93,    -1,
+       8,    -1,    10,    -1,   191,    -1,   237,    -1,   247,    -1,
+     244,   121,   247,    -1,     9,    -1,    15,    -1,    16,    -1,
+       7,    -1,   192,     7,    -1,    31,    -1,    70,    -1,    83,
+      -1,   194,    -1,    74,    88,    -1,    72,    58,    -1,    84,
+      -1,    51,    -1,    43,    78,    -1,    33,    88,    -1,    98,
+      -1,    54,    -1,   196,    -1,    65,    -1,    47,    -1,    29,
+      88,    -1,   193,    -1,   194,   234,    -1,    30,    -1,    55,
+      -1,    56,    -1,    57,    -1,    66,    -1,    71,    -1,    81,
+      -1,    90,    -1,    92,    -1,    97,    -1,    99,    -1,   100,
+      -1,   101,    -1,    73,    -1,   107,    -1,   108,    -1,   105,
+      -1,   106,    -1,    -1,   200,    -1,   201,    -1,   202,    -1,
+      87,   113,   203,   114,    -1,   113,   203,   114,    -1,   202,
+     113,   203,   114,    -1,   204,    -1,   221,    -1,   110,    -1,
+     205,    -1,   205,   116,   110,    -1,   205,   116,   110,   116,
+     205,    -1,   206,    -1,    24,   104,   209,    -1,   207,    -1,
+     206,   197,   207,    -1,   208,    -1,   207,   198,   208,    -1,
+     209,    -1,   209,   104,   209,    -1,   212,   113,   204,   114,
+      -1,   113,   204,   114,    -1,   213,    -1,   215,    -1,   213,
+     225,   213,    -1,    68,   225,   213,    -1,   213,   225,    67,
+      -1,    68,   225,    67,    -1,   216,    -1,   211,    -1,    -1,
+     111,   210,   192,    -1,    77,     9,    -1,    77,   247,    -1,
+      87,    -1,    53,    -1,    52,    -1,    93,    -1,   238,    -1,
+     191,    -1,   214,    -1,   247,    -1,     8,    -1,    10,    -1,
+     180,    -1,   102,    36,   202,    -1,   102,    37,   111,   217,
+     112,    -1,   218,    -1,   217,   116,   218,    -1,   110,    -1,
+     247,   199,   219,    -1,    -1,   220,    -1,    80,    -1,    22,
+      -1,    76,    -1,   222,    -1,   226,    -1,   224,    -1,    -1,
+      38,    32,   111,   223,   192,    -1,    39,   176,    -1,   109,
+      -1,   109,   122,    -1,   122,   109,    -1,   122,   109,   122,
+      -1,   227,    -1,   228,    -1,   111,   244,   112,    -1,   227,
+     111,   229,   112,    -1,   230,    -1,   229,   116,   230,    -1,
+     123,   231,    -1,   123,   121,   231,    -1,   247,    -1,   231,
+     121,   247,    -1,    -1,   233,    -1,    76,    -1,    40,   187,
+      -1,   111,   112,    -1,   111,   235,   112,    -1,   236,    -1,
+     235,   116,   236,    -1,   247,    -1,   247,   113,   237,   114,
+      -1,   247,   113,   190,   114,    -1,   237,    -1,   110,    -1,
+      12,    -1,    13,    -1,   237,    -1,    14,    -1,    -1,   240,
+      -1,   241,   243,    -1,   118,   242,    12,   119,    -1,    -1,
+      96,    -1,    26,    -1,    82,    -1,    -1,    59,    -1,    48,
+      -1,    17,    -1,    18,    -1,    18,    -1,    -1,   247,    -1,
+      11,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   358,   358,   364,   369,   386,   386,   415,   416,   420,
-     423,   429,   435,   444,   448,   452,   462,   463,   472,   475,
-     484,   487,   490,   493,   497,   518,   519,   528,   541,   544,
-     561,   568,   581,   589,   588,   602,   615,   616,   619,   629,
-     635,   636,   639,   644,   651,   652,   656,   667,   672,   679,
-     685,   691,   701,   702,   714,   717,   720,   728,   733,   740,
-     746,   752,   761,   764,   774,   787,   797,   817,   823,   839,
-     845,   853,   862,   873,   877,   885,   893,   901,   912,   917,
-     924,   927,   935,   946,   969,   970,   973,   978,   982,   990,
-     997,  1003,  1010,  1016,  1021,  1028,  1033,  1036,  1043,  1053,
-    1054,  1058,  1065,  1075,  1085,  1096,  1106,  1117,  1127,  1138,
-    1150,  1151,  1158,  1157,  1166,  1170,  1177,  1181,  1184,  1188,
-    1194,  1202,  1211,  1223,  1247,  1254,  1273,  1276,  1282,  1288,
-    1294,  1304,  1314,  1320,  1332,  1347,  1355,  1366,  1377,  1388,
-    1396,  1418,  1426,  1435,  1439,  1444,  1453,  1458,  1463,  1471,
-    1494,  1504,  1505,  1506,  1513,  1513,  1518,  1526,  1531,  1536,
-    1541,  1546,  1549,  1555,  1566,  1584,  1588,  1593,  1601,  1610,
-    1625,  1626,  1627,  1628,  1629,  1630,  1631,  1632,  1633,  1634,
-    1635,  1636,  1637,  1644,  1645,  1646,  1650,  1656,  1669,  1670,
-    1674,  1678,  1679,  1680,  1681,  1682,  1686,  1687,  1688,  1689,
-    1693,  1694,  1701,  1701,  1702,  1702,  1705,  1706,  1712,  1716,
-    1719,  1729,  1732,  1738,  1741,  1747,  1751,  1754,  1760,  1771,
-    1772,  1778,  1779,  1785,  1786,  1793,  1794,  1800,  1808,  1816,
-    1822,  1828,  1835,  1843,  1851,  1860,  1863,  1866,  1866,  1876,
-    1881,  1893,  1896,  1902,  1907,  1912,  1913,  1914,  1915,  1929,
-    1934,  1942,  1962,  1965,  1971,  1974,  1980,  1986,  2000,  2001,
-    2005,  2008,  2011,  2019,  2020,  2021,  2026,  2025,  2037,  2046,
-    2047,  2048,  2049,  2052,  2055,  2064,  2080,  2086,  2092,  2106,
-    2117,  2133,  2136,  2156,  2160,  2164,  2168,  2191,  2195,  2201,
-    2206,  2213,  2220,  2228,  2236,  2243,  2254,  2258,  2265,  2266,
-    2297,  2298,  2302,  2309,  2315,  2316,  2317,  2318,  2322,  2323,
-    2324,  2328,  2332,  2340,  2347,  2348,  2354
+       0,   358,   358,   361,   367,   372,   389,   389,   418,   419,
+     423,   426,   432,   438,   447,   451,   455,   465,   466,   475,
+     478,   487,   490,   493,   496,   500,   521,   522,   531,   544,
+     547,   564,   571,   584,   592,   591,   605,   618,   619,   622,
+     632,   638,   639,   642,   647,   654,   655,   659,   670,   675,
+     682,   688,   694,   704,   705,   717,   720,   723,   731,   736,
+     743,   749,   755,   764,   767,   777,   790,   800,   820,   826,
+     842,   848,   856,   865,   876,   880,   888,   896,   904,   915,
+     920,   927,   930,   938,   949,   972,   973,   976,   981,   985,
+     993,  1000,  1006,  1013,  1019,  1024,  1031,  1036,  1039,  1046,
+    1056,  1057,  1061,  1068,  1078,  1088,  1099,  1109,  1120,  1130,
+    1141,  1153,  1154,  1161,  1160,  1169,  1173,  1180,  1184,  1187,
+    1191,  1197,  1205,  1214,  1226,  1250,  1257,  1276,  1279,  1285,
+    1291,  1297,  1307,  1317,  1323,  1335,  1350,  1358,  1369,  1380,
+    1391,  1399,  1421,  1429,  1438,  1442,  1447,  1456,  1461,  1466,
+    1474,  1497,  1507,  1508,  1509,  1516,  1516,  1521,  1529,  1534,
+    1539,  1544,  1549,  1552,  1558,  1569,  1587,  1591,  1596,  1604,
+    1613,  1628,  1629,  1630,  1631,  1632,  1633,  1634,  1635,  1636,
+    1637,  1638,  1639,  1640,  1647,  1648,  1649,  1653,  1659,  1672,
+    1673,  1677,  1681,  1682,  1683,  1684,  1685,  1689,  1690,  1691,
+    1692,  1696,  1697,  1704,  1704,  1705,  1705,  1708,  1709,  1715,
+    1719,  1722,  1732,  1735,  1741,  1744,  1750,  1754,  1757,  1763,
+    1774,  1775,  1781,  1782,  1788,  1789,  1796,  1797,  1803,  1811,
+    1819,  1825,  1831,  1838,  1846,  1854,  1863,  1866,  1869,  1869,
+    1879,  1884,  1896,  1899,  1905,  1910,  1915,  1916,  1917,  1918,
+    1932,  1937,  1945,  1965,  1968,  1974,  1977,  1983,  1989,  2003,
+    2004,  2008,  2011,  2014,  2022,  2023,  2024,  2029,  2028,  2040,
+    2049,  2050,  2051,  2052,  2055,  2058,  2067,  2083,  2089,  2095,
+    2109,  2120,  2136,  2139,  2159,  2163,  2167,  2171,  2194,  2198,
+    2204,  2209,  2216,  2223,  2231,  2239,  2246,  2257,  2261,  2268,
+    2269,  2300,  2301,  2305,  2312,  2318,  2319,  2320,  2321,  2325,
+    2326,  2327,  2331,  2335,  2343,  2350,  2351,  2357
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -960,46 +921,45 @@
   "TOK_SYNTAX", "TOK_T61String", "TOK_TAGS", "TOK_TeletexString",
   "TOK_TRUE", "TOK_TYPE_IDENTIFIER", "TOK_UNIQUE", "TOK_UNIVERSAL",
   "TOK_UniversalString", "TOK_UTCTime", "TOK_UTF8String",
-  "TOK_VideotexString", "TOK_VisibleString", "TOK_WITH", "TOK_EXCEPT",
-  "'^'", "TOK_INTERSECTION", "'|'", "TOK_UNION", "TOK_TwoDots",
-  "TOK_ThreeDots", "'{'", "'}'", "'('", "')'", "';'", "','", "':'", "'['",
-  "']'", "'!'", "'.'", "'<'", "'@'", "$accept", "ParsedGrammar",
-  "ModuleList", "ModuleDefinition", "$@1", "optObjectIdentifier",
-  "ObjectIdentifier", "ObjectIdentifierBody", "ObjectIdentifierElement",
-  "optModuleDefinitionFlags", "ModuleDefinitionFlags",
-  "ModuleDefinitionFlag", "optModuleBody", "ModuleBody", "AssignmentList",
-  "Assignment", "$@2", "optImports", "ImportsDefinition",
-  "optImportsBundleSet", "ImportsBundleSet", "AssignedIdentifier",
-  "ImportsBundle", "ImportsList", "ImportsElement", "optExports",
-  "ExportsDefinition", "ExportsBody", "ExportsElement", "ValueSet",
-  "ValueSetTypeAssignment", "DefinedType", "DataTypeReference",
+  "TOK_VideotexString", "TOK_VisibleString", "TOK_WITH",
+  "\"UTF-8 byte order mark\"", "TOK_EXCEPT", "'^'", "TOK_INTERSECTION",
+  "'|'", "TOK_UNION", "TOK_TwoDots", "TOK_ThreeDots", "'{'", "'}'", "'('",
+  "')'", "';'", "','", "':'", "'['", "']'", "'!'", "'.'", "'<'", "'@'",
+  "$accept", "ParsedGrammar", "ModuleList", "ModuleDefinition", "@1",
+  "optObjectIdentifier", "ObjectIdentifier", "ObjectIdentifierBody",
+  "ObjectIdentifierElement", "optModuleDefinitionFlags",
+  "ModuleDefinitionFlags", "ModuleDefinitionFlag", "optModuleBody",
+  "ModuleBody", "AssignmentList", "Assignment", "@2", "optImports",
+  "ImportsDefinition", "optImportsBundleSet", "ImportsBundleSet",
+  "AssignedIdentifier", "ImportsBundle", "ImportsList", "ImportsElement",
+  "optExports", "ExportsDefinition", "ExportsBody", "ExportsElement",
+  "ValueSet", "ValueSetTypeAssignment", "DefinedType", "DataTypeReference",
   "ParameterArgumentList", "ParameterArgumentName", "ActualParameterList",
   "ActualParameter", "optComponentTypeLists", "ComponentTypeLists",
   "ComponentType", "AlternativeTypeLists", "AlternativeType",
   "ObjectClass", "optUnique", "FieldSpec", "ClassField", "optWithSyntax",
-  "WithSyntax", "$@3", "WithSyntaxList", "WithSyntaxToken",
+  "WithSyntax", "@3", "WithSyntaxList", "WithSyntaxToken",
   "ExtensionAndException", "Type", "NSTD_IndirectMarker",
   "TypeDeclaration", "TypeDeclarationSet", "ComplexTypeReference",
   "ComplexTypeReferenceAmpList", "ComplexTypeReferenceElement",
   "PrimitiveFieldReference", "FieldName", "DefinedObjectClass",
-  "ValueAssignment", "Value", "$@4", "SimpleValue", "DefinedValue",
+  "ValueAssignment", "Value", "@4", "SimpleValue", "DefinedValue",
   "RestrictedCharacterStringValue", "Opaque", "BasicTypeId",
   "BasicTypeId_UniverationCompatible", "BasicType", "BasicString",
   "UnionMark", "IntersectionMark", "optConstraints", "Constraint",
   "SubtypeConstraint", "SetOfConstraints", "ConstraintSpecs",
   "ElementSetSpecs", "ElementSetSpec", "Unions", "Intersections",
-  "IntersectionElements", "ConstraintSubtypeElement", "$@5",
+  "IntersectionElements", "ConstraintSubtypeElement", "@5",
   "PatternConstraint", "ConstraintSpec", "SingleValue", "BitStringValue",
   "ContainedSubtype", "InnerTypeConstraint", "WithComponentsList",
   "WithComponentsElement", "optPresenceConstraint", "PresenceConstraint",
-  "GeneralConstraint", "UserDefinedConstraint", "$@6",
-  "ContentsConstraint", "ConstraintRangeSpec", "TableConstraint",
-  "SimpleTableConstraint", "ComponentRelationConstraint", "AtNotationList",
-  "AtNotationElement", "ComponentIdList", "optMarker", "Marker",
-  "UniverationDefinition", "UniverationList", "UniverationElement",
-  "SignedNumber", "RealValue", "optTag", "Tag", "TagTypeValue", "TagClass",
-  "TagPlicit", "TypeRefName", "ObjectClassReference", "optIdentifier",
-  "Identifier", YY_NULL
+  "GeneralConstraint", "UserDefinedConstraint", "@6", "ContentsConstraint",
+  "ConstraintRangeSpec", "TableConstraint", "SimpleTableConstraint",
+  "ComponentRelationConstraint", "AtNotationList", "AtNotationElement",
+  "ComponentIdList", "optMarker", "Marker", "UniverationDefinition",
+  "UniverationList", "UniverationElement", "SignedNumber", "RealValue",
+  "optTag", "Tag", "TagTypeValue", "TagClass", "TagPlicit", "TypeRefName",
+  "ObjectClassReference", "optIdentifier", "Identifier", 0
 };
 #endif
 
@@ -1018,478 +978,461 @@
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    94,   359,   124,   360,   361,   362,
-     123,   125,    40,    41,    59,    44,    58,    91,    93,    33,
-      46,    60,    64
+     355,   356,   357,   358,   359,    94,   360,   124,   361,   362,
+     363,   123,   125,    40,    41,    59,    44,    58,    91,    93,
+      33,    46,    60,    64
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   123,   124,   125,   125,   127,   126,   128,   128,   129,
-     129,   130,   130,   131,   131,   131,   132,   132,   133,   133,
-     134,   134,   134,   134,   134,   135,   135,   136,   137,   137,
-     138,   138,   138,   139,   138,   138,   140,   140,   141,   141,
-     142,   142,   143,   143,   144,   144,   145,   146,   146,   147,
-     147,   147,   148,   148,   149,   149,   149,   150,   150,   151,
-     151,   151,   152,   153,   154,   154,   154,   155,   155,   155,
-     155,   156,   156,   157,   157,   157,   157,   157,   158,   158,
-     159,   159,   159,   159,   160,   160,   161,   161,   161,   162,
-     162,   162,   162,   163,   163,   164,   164,   164,   165,   166,
-     166,   167,   167,   168,   168,   168,   168,   168,   168,   168,
-     169,   169,   171,   170,   172,   172,   173,   173,   173,   173,
-     174,   174,   174,   175,   176,   177,   178,   178,   178,   178,
-     178,   178,   178,   178,   178,   179,   179,   179,   179,   179,
-     179,   180,   180,   181,   182,   182,   183,   183,   183,   184,
-     185,   186,   186,   186,   187,   186,   186,   188,   188,   188,
-     188,   188,   188,   189,   189,   190,   190,   190,   191,   191,
-     192,   192,   192,   192,   192,   192,   192,   192,   192,   192,
-     192,   192,   192,   193,   193,   193,   194,   194,   195,   195,
-     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
-     195,   195,   196,   196,   197,   197,   198,   198,   199,   200,
-     200,   201,   201,   202,   202,   203,   203,   203,   203,   204,
-     204,   205,   205,   206,   206,   207,   207,   208,   208,   208,
-     208,   208,   208,   208,   208,   208,   208,   209,   208,   210,
-     210,   211,   211,   212,   212,   212,   212,   212,   212,   213,
-     213,   214,   215,   215,   216,   216,   217,   217,   218,   218,
-     219,   219,   219,   220,   220,   220,   222,   221,   223,   224,
-     224,   224,   224,   225,   225,   226,   227,   228,   228,   229,
-     229,   230,   230,   231,   231,   232,   232,   233,   233,   234,
-     234,   235,   235,   235,   235,   235,   236,   236,   237,   237,
-     238,   238,   239,   240,   241,   241,   241,   241,   242,   242,
-     242,   243,   243,   244,   245,   245,   246
+       0,   124,   125,   125,   126,   126,   128,   127,   129,   129,
+     130,   130,   131,   131,   132,   132,   132,   133,   133,   134,
+     134,   135,   135,   135,   135,   135,   136,   136,   137,   138,
+     138,   139,   139,   139,   140,   139,   139,   141,   141,   142,
+     142,   143,   143,   144,   144,   145,   145,   146,   147,   147,
+     148,   148,   148,   149,   149,   150,   150,   150,   151,   151,
+     152,   152,   152,   153,   154,   155,   155,   155,   156,   156,
+     156,   156,   157,   157,   158,   158,   158,   158,   158,   159,
+     159,   160,   160,   160,   160,   161,   161,   162,   162,   162,
+     163,   163,   163,   163,   164,   164,   165,   165,   165,   166,
+     167,   167,   168,   168,   169,   169,   169,   169,   169,   169,
+     169,   170,   170,   172,   171,   173,   173,   174,   174,   174,
+     174,   175,   175,   175,   176,   177,   178,   179,   179,   179,
+     179,   179,   179,   179,   179,   179,   180,   180,   180,   180,
+     180,   180,   181,   181,   182,   183,   183,   184,   184,   184,
+     185,   186,   187,   187,   187,   188,   187,   187,   189,   189,
+     189,   189,   189,   189,   190,   190,   191,   191,   191,   192,
+     192,   193,   193,   193,   193,   193,   193,   193,   193,   193,
+     193,   193,   193,   193,   194,   194,   194,   195,   195,   196,
+     196,   196,   196,   196,   196,   196,   196,   196,   196,   196,
+     196,   196,   196,   197,   197,   198,   198,   199,   199,   200,
+     201,   201,   202,   202,   203,   203,   204,   204,   204,   204,
+     205,   205,   206,   206,   207,   207,   208,   208,   209,   209,
+     209,   209,   209,   209,   209,   209,   209,   209,   210,   209,
+     211,   211,   212,   212,   213,   213,   213,   213,   213,   213,
+     214,   214,   215,   216,   216,   217,   217,   218,   218,   219,
+     219,   220,   220,   220,   221,   221,   221,   223,   222,   224,
+     225,   225,   225,   225,   226,   226,   227,   228,   229,   229,
+     230,   230,   231,   231,   232,   232,   233,   233,   234,   234,
+     235,   235,   236,   236,   236,   236,   236,   237,   237,   238,
+     238,   239,   239,   240,   241,   242,   242,   242,   242,   243,
+     243,   243,   244,   244,   245,   246,   246,   247
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
-       0,     2,     1,     1,     2,     0,     9,     0,     1,     3,
-       2,     1,     2,     1,     4,     1,     0,     1,     1,     2,
-       2,     2,     2,     2,     2,     0,     1,     3,     1,     2,
-       1,     1,     1,     0,     3,     1,     0,     1,     3,     2,
-       0,     1,     1,     2,     0,     1,     4,     1,     3,     1,
-       3,     1,     0,     1,     3,     3,     2,     1,     3,     1,
-       3,     1,     3,     4,     1,     1,     4,     3,     3,     6,
-       6,     1,     3,     1,     3,     3,     3,     3,     1,     3,
-       1,     1,     1,     1,     0,     1,     1,     3,     5,     3,
-       2,     3,     1,     1,     3,     2,     1,     1,     5,     0,
-       1,     1,     3,     2,     4,     3,     3,     3,     3,     3,
-       0,     1,     0,     6,     1,     2,     1,     1,     1,     3,
-       1,     3,     3,     3,     0,     2,     1,     4,     4,     4,
-       6,     6,     1,     4,     3,     1,     3,     3,     3,     1,
-       3,     1,     3,     1,     1,     1,     1,     3,     3,     1,
-       4,     1,     1,     3,     0,     3,     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,
+       0,     2,     2,     1,     1,     2,     0,     9,     0,     1,
+       3,     2,     1,     2,     1,     4,     1,     0,     1,     1,
+       2,     2,     2,     2,     2,     2,     0,     1,     3,     1,
+       2,     1,     1,     1,     0,     3,     1,     0,     1,     3,
+       2,     0,     1,     1,     2,     0,     1,     4,     1,     3,
+       1,     3,     1,     0,     1,     3,     3,     2,     1,     3,
+       1,     3,     1,     3,     4,     1,     1,     4,     3,     3,
+       6,     6,     1,     3,     1,     3,     3,     3,     3,     1,
+       3,     1,     1,     1,     1,     0,     1,     1,     3,     5,
+       3,     2,     3,     1,     1,     3,     2,     1,     1,     5,
+       0,     1,     1,     3,     2,     4,     3,     3,     3,     3,
+       3,     0,     1,     0,     6,     1,     2,     1,     1,     1,
+       3,     1,     3,     3,     3,     0,     2,     1,     4,     4,
+       4,     6,     6,     1,     4,     3,     1,     3,     3,     3,
+       1,     3,     1,     3,     1,     1,     1,     1,     3,     3,
+       1,     4,     1,     1,     3,     0,     3,     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,     1,
-       4,     3,     4,     1,     1,     1,     1,     3,     5,     1,
-       3,     1,     3,     1,     3,     1,     3,     4,     3,     1,
-       1,     3,     3,     3,     3,     1,     1,     0,     3,     2,
-       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     3,     5,     1,     3,     1,     3,     0,     1,
-       1,     1,     1,     1,     1,     1,     0,     5,     2,     1,
-       2,     2,     3,     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,     1,     1,
-       0,     1,     2,     4,     0,     1,     1,     1,     0,     1,
-       1,     1,     1,     1,     0,     1,     1
+       1,     1,     1,     1,     1,     1,     1,     0,     1,     1,
+       1,     4,     3,     4,     1,     1,     1,     1,     3,     5,
+       1,     3,     1,     3,     1,     3,     1,     3,     4,     3,
+       1,     1,     3,     3,     3,     3,     1,     1,     0,     3,
+       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     3,     5,     1,     3,     1,     3,     0,
+       1,     1,     1,     1,     1,     1,     1,     0,     5,     2,
+       1,     2,     2,     3,     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,     1,
+       1,     0,     1,     2,     4,     0,     1,     1,     1,     0,
+       1,     1,     1,     1,     1,     0,     1,     1
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       0,   311,   312,     0,     2,     3,     5,     1,     4,     7,
-       0,     0,     8,   316,    15,    10,     0,    11,    13,    16,
-       9,    12,     0,     0,     0,     0,     0,     0,     0,    17,
-      18,     0,    24,    22,    20,    23,    21,     0,    19,    14,
-      52,     0,     0,    26,    36,    53,     0,    56,     0,    57,
-      59,    61,     6,    40,     0,    37,    55,    54,     0,     0,
-      39,     0,    41,    42,     0,    47,    49,    51,   188,     0,
-     189,   190,   191,   192,   193,   201,   194,   195,   196,   197,
-     198,   199,   200,    27,    28,    32,    30,    31,    35,     0,
-     300,    58,    60,    38,    43,     0,     0,     0,    33,    29,
-     300,   135,   313,     0,   170,     0,     0,   184,   177,   181,
-     183,   171,     0,     0,   172,   176,   180,     0,     0,    65,
-     186,   173,    64,   182,   139,   304,     0,   124,   301,   308,
-      44,    48,    50,    34,     0,    68,    67,     0,   185,   179,
-     178,   175,   174,     0,    71,     0,   173,    73,     0,   300,
-       0,   187,     0,   306,   307,   305,     0,     0,     0,   206,
-     310,   309,   302,    45,    46,     0,   136,   138,     0,     0,
-       0,     0,     0,    63,   159,   165,   160,   296,   297,   166,
-     167,   157,   158,    83,     0,    78,    80,    81,   161,   162,
-      82,   295,   287,     0,   289,   294,   291,   144,   145,   140,
-     141,   143,   137,     0,   156,   154,   150,   151,   152,     0,
-     163,   132,     0,     0,   206,   206,   126,   125,     0,     0,
-     123,   207,   208,   209,   300,   300,     0,   101,   300,    72,
-      77,    76,    75,    74,   249,   250,   299,     0,   243,   242,
-       0,     0,   241,   244,     0,   215,   237,     0,   251,   246,
-       0,   216,   219,   221,   223,   225,   236,     0,   229,   247,
-     230,   235,   298,   245,   248,    66,   300,   288,     0,     0,
-       0,   303,     0,     0,     0,     0,   300,     0,   300,     0,
-     300,     0,     0,     0,   300,   237,     0,   213,   214,   263,
-     265,   264,   273,   274,     0,   149,   146,     0,   285,   283,
-     283,   283,   103,   284,    99,   283,   283,   110,     0,    70,
-      69,     0,   269,     0,     0,   239,   240,     0,     0,     0,
-       0,    62,     0,   202,   203,     0,   204,   205,     0,     0,
-       0,     0,    79,   290,     0,     0,   163,   142,   168,   155,
-     164,   153,     0,   120,     0,    93,    96,    97,   300,   134,
-       0,     0,    85,    86,    92,   283,   300,   314,     0,   314,
-       0,     0,   268,     0,   211,     0,     0,   286,   108,     0,
-     107,   109,   100,   283,   105,   106,     0,    98,   111,   102,
-     220,   270,   271,   234,   232,   252,     0,   238,   228,   217,
-     222,   224,   226,     0,   233,   231,   293,   292,   169,   133,
-       0,   127,   300,    95,   300,   128,   300,    90,   283,   300,
-     315,   129,   300,   210,   266,   275,     0,     0,   277,   212,
-     147,   148,   104,     0,   272,   256,     0,   254,   206,     0,
-     227,   121,   122,    94,    91,   300,    87,    89,   124,   124,
-       0,     0,   279,   281,   276,     0,   112,   253,     0,   258,
-     218,     0,   130,   131,   267,   280,     0,   278,     0,   255,
-     261,   262,   260,   257,   259,    88,   282,   116,   117,     0,
-       0,   114,   118,     0,   113,   115,   119
+       0,   312,   313,     0,     0,     3,     4,     6,     2,     1,
+       5,     8,     0,     0,     9,   317,    16,    11,     0,    12,
+      14,    17,    10,    13,     0,     0,     0,     0,     0,     0,
+       0,    18,    19,     0,    25,    23,    21,    24,    22,     0,
+      20,    15,    53,     0,     0,    27,    37,    54,     0,    57,
+       0,    58,    60,    62,     7,    41,     0,    38,    56,    55,
+       0,     0,    40,     0,    42,    43,     0,    48,    50,    52,
+     189,     0,   190,   191,   192,   193,   194,   202,   195,   196,
+     197,   198,   199,   200,   201,    28,    29,    33,    31,    32,
+      36,     0,   301,    59,    61,    39,    44,     0,     0,     0,
+      34,    30,   301,   136,   314,     0,   171,     0,     0,   185,
+     178,   182,   184,   172,     0,     0,   173,   177,   181,     0,
+       0,    66,   187,   174,    65,   183,   140,   305,     0,   125,
+     302,   309,    45,    49,    51,    35,     0,    69,    68,     0,
+     186,   180,   179,   176,   175,     0,    72,     0,   174,    74,
+       0,   301,     0,   188,     0,   307,   308,   306,     0,     0,
+       0,   207,   311,   310,   303,    46,    47,     0,   137,   139,
+       0,     0,     0,     0,     0,    64,   160,   166,   161,   297,
+     298,   167,   168,   158,   159,    84,     0,    79,    81,    82,
+     162,   163,    83,   296,   288,     0,   290,   295,   292,   145,
+     146,   141,   142,   144,   138,     0,   157,   155,   151,   152,
+     153,     0,   164,   133,     0,     0,   207,   207,   127,   126,
+       0,     0,   124,   208,   209,   210,   301,   301,     0,   102,
+     301,    73,    78,    77,    76,    75,   250,   251,   300,     0,
+     244,   243,     0,     0,   242,   245,     0,   216,   238,     0,
+     252,   247,     0,   217,   220,   222,   224,   226,   237,     0,
+     230,   248,   231,   236,   299,   246,   249,    67,   301,   289,
+       0,     0,     0,   304,     0,     0,     0,     0,   301,     0,
+     301,     0,   301,     0,     0,     0,   301,   238,     0,   214,
+     215,   264,   266,   265,   274,   275,     0,   150,   147,     0,
+     286,   284,   284,   284,   104,   285,   100,   284,   284,   111,
+       0,    71,    70,     0,   270,     0,     0,   240,   241,     0,
+       0,     0,     0,    63,     0,   203,   204,     0,   205,   206,
+       0,     0,     0,     0,    80,   291,     0,     0,   164,   143,
+     169,   156,   165,   154,     0,   121,     0,    94,    97,    98,
+     301,   135,     0,     0,    86,    87,    93,   284,   301,   315,
+       0,   315,     0,     0,   269,     0,   212,     0,     0,   287,
+     109,     0,   108,   110,   101,   284,   106,   107,     0,    99,
+     112,   103,   221,   271,   272,   235,   233,   253,     0,   239,
+     229,   218,   223,   225,   227,     0,   234,   232,   294,   293,
+     170,   134,     0,   128,   301,    96,   301,   129,   301,    91,
+     284,   301,   316,   130,   301,   211,   267,   276,     0,     0,
+     278,   213,   148,   149,   105,     0,   273,   257,     0,   255,
+     207,     0,   228,   122,   123,    95,    92,   301,    88,    90,
+     125,   125,     0,     0,   280,   282,   277,     0,   113,   254,
+       0,   259,   219,     0,   131,   132,   268,   281,     0,   279,
+       0,   256,   262,   263,   261,   258,   260,    89,   283,   117,
+     118,     0,     0,   115,   119,     0,   114,   116,   120
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     3,     4,     5,     9,    11,    12,    16,    17,    28,
-      29,    30,    42,    43,    83,    84,   133,    54,    55,    61,
-      62,   164,    63,    64,    65,    44,    45,    48,    49,   183,
-      85,   118,    86,   143,   144,   184,   185,   351,   352,   353,
-     344,   345,   135,   373,   226,   227,   377,   378,   458,   470,
-     471,   354,   355,   158,   159,   217,   248,   199,   200,   472,
-     300,   301,    87,   206,   272,   207,   208,   249,   339,   120,
-     121,   122,   123,   325,   328,   220,   221,   222,   223,   286,
-     287,   251,   252,   253,   254,   255,   319,   256,   257,   258,
-     259,   260,   261,   426,   427,   463,   464,   288,   289,   440,
-     290,   314,   291,   292,   293,   417,   418,   442,   302,   303,
-     151,   193,   194,   262,   263,   127,   128,   129,   156,   162,
-     209,   124,   409,   264
+      -1,     4,     5,     6,    11,    13,    14,    18,    19,    30,
+      31,    32,    44,    45,    85,    86,   135,    56,    57,    63,
+      64,   166,    65,    66,    67,    46,    47,    50,    51,   185,
+      87,   120,    88,   145,   146,   186,   187,   353,   354,   355,
+     346,   347,   137,   375,   228,   229,   379,   380,   460,   472,
+     473,   356,   357,   160,   161,   219,   250,   201,   202,   474,
+     302,   303,    89,   208,   274,   209,   210,   251,   341,   122,
+     123,   124,   125,   327,   330,   222,   223,   224,   225,   288,
+     289,   253,   254,   255,   256,   257,   321,   258,   259,   260,
+     261,   262,   263,   428,   429,   465,   466,   290,   291,   442,
+     292,   316,   293,   294,   295,   419,   420,   444,   304,   305,
+     153,   195,   196,   264,   265,   129,   130,   131,   158,   164,
+     211,   126,   411,   266
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -297
+#define YYPACT_NINF -312
 static const yytype_int16 yypact[] =
 {
-     201,  -297,  -297,    30,   201,  -297,  -297,  -297,  -297,   -59,
-      10,    41,  -297,  -297,  -297,  -297,    23,  -297,   -35,   176,
-    -297,  -297,   103,    59,    82,   117,   122,   134,   239,   176,
-    -297,   142,  -297,  -297,  -297,  -297,  -297,   237,  -297,  -297,
-     119,    57,   227,  -297,   206,  -297,   165,  -297,   157,  -297,
-     189,  -297,  -297,   169,   596,  -297,  -297,  -297,   193,   186,
-    -297,   195,   193,  -297,   -26,  -297,   209,  -297,  -297,   298,
-    -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,  -297,   596,  -297,  -297,  -297,  -297,  -297,   271,
-     203,  -297,  -297,  -297,  -297,   201,   193,   212,  -297,  -297,
-      -3,   204,  -297,   241,  -297,   242,   253,  -297,  -297,  -297,
-    -297,  -297,   275,   246,  -297,  -297,  -297,   772,   332,   230,
-    -297,   236,  -297,  -297,   231,   124,   345,  -297,  -297,   110,
-     -59,  -297,  -297,  -297,   240,  -297,  -297,   193,  -297,  -297,
-    -297,  -297,  -297,   -66,  -297,   243,  -297,   244,   247,    97,
-      91,  -297,   258,  -297,  -297,  -297,   341,   228,   696,   105,
-    -297,  -297,  -297,  -297,  -297,   265,  -297,  -297,   353,   772,
-     193,   193,   448,  -297,  -297,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,  -297,  -297,    98,  -297,  -297,  -297,  -297,  -297,
-    -297,  -297,  -297,   101,  -297,  -297,   250,  -297,  -297,   238,
-    -297,  -297,  -297,   248,  -297,  -297,  -297,  -297,  -297,   245,
-     251,   322,   267,   300,   -46,   111,  -297,  -297,   261,   402,
-    -297,  -297,  -297,   270,   263,     7,   136,  -297,    -3,  -297,
-    -297,  -297,  -297,  -297,  -297,  -297,  -297,   276,  -297,  -297,
-     -79,   221,  -297,  -297,   255,  -297,  -297,   448,  -297,  -297,
-     272,   269,   187,   191,  -297,   282,  -297,   274,   -79,  -297,
-    -297,  -297,  -297,  -297,  -297,  -297,    97,  -297,    84,   216,
-     286,  -297,   380,   377,   228,   357,     9,   290,    74,   316,
-      74,   318,   402,   362,   203,   201,   284,  -297,  -297,  -297,
-    -297,  -297,   285,  -297,   402,  -297,  -297,   228,  -297,    -4,
-      44,    -4,  -297,  -297,   303,    44,    -4,   297,   265,  -297,
-    -297,   571,   279,   293,   582,  -297,  -297,   292,   295,   380,
-     289,  -297,   294,  -297,  -297,   571,  -297,  -297,   571,   571,
-     448,   690,  -297,  -297,   296,   308,  -297,  -297,  -297,   400,
-    -297,  -297,   377,   304,   137,  -297,  -297,  -297,   203,  -297,
-     333,   311,   309,  -297,  -297,    -4,   203,   377,   317,   377,
-     314,   319,  -297,   321,  -297,   312,   320,  -297,  -297,   291,
-    -297,  -297,  -297,    -4,  -297,  -297,   346,  -297,  -297,  -297,
-    -297,  -297,   315,  -297,  -297,   270,    69,   400,  -297,   324,
-     191,  -297,  -297,   329,  -297,  -297,  -297,  -297,  -297,  -297,
-     216,  -297,     9,  -297,   203,  -297,    46,  -297,    -4,   203,
-    -297,  -297,   203,  -297,  -297,  -297,    -1,   138,  -297,  -297,
-    -297,  -297,  -297,   327,  -297,  -297,   139,  -297,   105,   553,
-    -297,  -297,  -297,  -297,  -297,    79,  -297,  -297,  -297,  -297,
-     380,   377,   310,  -297,  -297,   312,  -297,  -297,    69,    11,
-    -297,    55,  -297,  -297,   400,   310,   377,  -297,    50,  -297,
-    -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,  -297,    50,
-      18,  -297,  -297,    34,  -297,  -297,  -297
+      97,  -312,  -312,   275,    72,   275,  -312,  -312,   275,  -312,
+    -312,     1,    39,    62,  -312,  -312,  -312,  -312,    83,  -312,
+      51,   343,  -312,  -312,   159,   134,   144,   169,   154,   174,
+     247,   343,  -312,   171,  -312,  -312,  -312,  -312,  -312,   245,
+    -312,  -312,   187,    52,   237,  -312,   240,  -312,   191,  -312,
+       2,  -312,   202,  -312,  -312,   185,   558,  -312,  -312,  -312,
+     228,   208,  -312,   211,   228,  -312,    -8,  -312,   258,  -312,
+    -312,   357,  -312,  -312,  -312,  -312,  -312,  -312,  -312,  -312,
+    -312,  -312,  -312,  -312,  -312,   558,  -312,  -312,  -312,  -312,
+    -312,   224,   230,  -312,  -312,  -312,  -312,   275,   228,   265,
+    -312,  -312,   -11,   262,  -312,   290,  -312,   291,   306,  -312,
+    -312,  -312,  -312,  -312,   327,   298,  -312,  -312,  -312,   711,
+     384,   277,  -312,   278,  -312,  -312,   279,   155,   395,  -312,
+    -312,   181,     1,  -312,  -312,  -312,   288,  -312,  -312,   228,
+    -312,  -312,  -312,  -312,  -312,   -75,  -312,   284,  -312,   286,
+     293,    69,    80,  -312,   292,  -312,  -312,  -312,   393,   584,
+     635,   104,  -312,  -312,  -312,  -312,  -312,   299,  -312,  -312,
+     404,   711,   228,   228,   448,  -312,  -312,  -312,  -312,  -312,
+    -312,  -312,  -312,  -312,  -312,  -312,   100,  -312,  -312,  -312,
+    -312,  -312,  -312,  -312,  -312,   118,  -312,  -312,   295,  -312,
+    -312,   296,  -312,  -312,  -312,   297,  -312,  -312,  -312,  -312,
+    -312,   300,   301,   367,   302,   336,    98,   161,  -312,  -312,
+     307,   342,  -312,  -312,  -312,   309,    92,    47,   131,  -312,
+     -11,  -312,  -312,  -312,  -312,  -312,  -312,  -312,  -312,   308,
+    -312,  -312,   -13,   173,  -312,  -312,   294,  -312,  -312,   448,
+    -312,  -312,   303,   310,   229,   257,  -312,   320,  -312,   314,
+     -13,  -312,  -312,  -312,  -312,  -312,  -312,  -312,    69,  -312,
+      45,   316,   345,  -312,   407,   417,   584,   398,     6,   350,
+      76,   358,    76,   359,   342,   400,   230,   275,   322,  -312,
+    -312,  -312,  -312,  -312,   326,  -312,   342,  -312,  -312,   584,
+    -312,   129,   123,   129,  -312,  -312,   344,   123,   129,   338,
+     299,  -312,  -312,   496,   319,   333,   210,  -312,  -312,   332,
+     337,   407,   329,  -312,   339,  -312,  -312,   496,  -312,  -312,
+     496,   496,   448,   330,  -312,  -312,   340,   353,  -312,  -312,
+    -312,   440,  -312,  -312,   417,   331,   170,  -312,  -312,  -312,
+     230,  -312,   375,   356,   354,  -312,  -312,   129,   230,   417,
+     361,   417,   355,   360,  -312,   362,  -312,   365,   376,  -312,
+    -312,   352,  -312,  -312,  -312,   129,  -312,  -312,   386,  -312,
+    -312,  -312,  -312,  -312,   369,  -312,  -312,   309,    19,   440,
+    -312,   373,   257,  -312,  -312,   378,  -312,  -312,  -312,  -312,
+    -312,  -312,   316,  -312,     6,  -312,   230,  -312,    38,  -312,
+     129,   230,  -312,  -312,   230,  -312,  -312,  -312,     9,   172,
+    -312,  -312,  -312,  -312,  -312,   383,  -312,  -312,   188,  -312,
+     104,   469,  -312,  -312,  -312,  -312,  -312,    60,  -312,  -312,
+    -312,  -312,   407,   417,   374,  -312,  -312,   365,  -312,  -312,
+      19,   152,  -312,    41,  -312,  -312,   440,   374,   417,  -312,
+      15,  -312,  -312,  -312,  -312,  -312,  -312,  -312,  -312,  -312,
+    -312,    15,     8,  -312,  -312,    34,  -312,  -312,  -312
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -297,  -297,  -297,   439,  -297,  -297,   323,  -297,   428,  -297,
-    -297,   416,  -297,  -297,  -297,   364,  -297,  -297,  -297,  -297,
-    -297,  -297,   386,  -297,   354,  -297,  -297,  -297,   391,   325,
-    -297,   313,  -297,  -297,   283,  -297,   185,   188,    32,    63,
-    -297,    72,   249,  -297,  -297,   167,  -297,  -297,  -297,    12,
-    -187,  -259,   -87,  -297,  -126,  -297,   -82,  -297,   208,  -124,
-     257,   259,  -297,  -120,  -297,  -134,  -255,  -141,  -296,   -52,
-      36,  -297,   -36,  -297,  -297,  -213,  -297,  -297,   159,  -110,
-    -168,    51,  -297,   158,   160,  -130,  -297,  -297,  -297,  -253,
-    -297,  -297,  -297,  -297,    37,  -297,  -297,  -297,  -297,  -297,
-    -297,   229,  -297,  -297,  -297,  -297,    45,    52,  -207,  -297,
-    -297,  -297,   218,  -138,  -297,  -152,  -297,  -297,  -297,  -297,
-       5,  -297,   132,   -10
+    -312,  -312,   473,   117,  -312,  -312,   364,  -312,   479,  -312,
+    -312,   467,  -312,  -312,  -312,   414,  -312,  -312,  -312,  -312,
+    -312,  -312,   438,  -312,   405,  -312,  -312,  -312,   455,   368,
+    -312,   363,  -312,  -312,   346,  -312,   251,   238,    87,   119,
+    -312,   122,   304,  -312,  -312,   218,  -312,  -312,  -312,    58,
+    -223,  -255,   -89,  -312,   -67,  -312,   -86,  -312,   259,  -138,
+     305,   311,  -312,   -93,  -312,  -133,  -256,  -140,  -311,   -81,
+     -52,  -312,   -24,  -312,  -312,  -215,  -312,  -312,   214,   -83,
+    -166,    99,  -312,   209,   212,  -225,  -312,  -312,  -312,  -294,
+    -312,  -312,  -312,  -312,    89,  -312,  -312,  -312,  -312,  -312,
+    -312,   280,  -312,  -312,  -312,  -312,    96,   101,  -203,  -312,
+    -312,  -312,   281,  -126,  -312,  -112,  -312,  -312,  -312,  -312,
+       4,  -312,   184,   -12
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -284
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -285
 static const yytype_int16 yytable[] =
 {
-      18,   279,   281,   126,   250,     6,    18,   119,   188,     6,
-      13,   189,   195,   136,   334,   187,   188,   346,    88,   189,
-      13,    13,    14,   387,   467,   295,   296,    95,   201,   312,
-       7,    51,   134,   460,    13,    14,   297,   197,   198,   468,
-     467,   218,   313,    67,    90,   168,    50,    88,    51,   169,
-     435,    10,    67,   197,   198,   468,   467,    13,    66,    89,
-     465,   384,   186,    50,   278,   145,   219,    66,    13,   197,
-     198,   468,   298,    90,     1,     2,   119,    22,   395,   320,
-      13,    46,    19,   350,   297,    13,    67,   461,    89,    96,
-      13,   462,   368,   370,   371,    13,   177,   178,   374,   375,
-     130,    66,    13,   177,   178,   174,   175,   176,    13,   177,
-     178,   350,   179,   180,   125,    31,   350,   145,   343,   441,
-     298,    15,   147,    32,   125,   188,   125,   167,   189,   474,
-     195,   335,   187,   188,    20,   469,   189,   299,   304,   190,
-     196,   310,   166,   346,   454,   431,   201,   210,   407,   181,
-     153,   469,   476,   146,   341,   343,   188,   202,   160,   189,
-     231,   233,   393,   125,   369,   -25,   422,   469,    41,   161,
-     406,    47,   360,    33,   147,   230,   232,   367,   425,   186,
-      13,   380,    35,   343,   366,   -84,     1,     2,   343,   347,
-     182,   125,   218,   191,    23,   349,   125,   362,   218,   392,
-     191,   437,   192,    24,    13,   146,   154,   172,    34,   265,
-       1,     2,   267,   266,   125,   449,   268,   219,     1,     2,
-     155,   280,    60,   219,    25,    36,    26,    13,   177,   178,
-     315,   316,    13,     1,     2,    27,   174,   175,   176,    13,
-     177,   178,    37,   179,   180,     1,     2,   307,   401,   444,
-     447,   308,   402,   445,   448,    39,   190,   438,   196,   336,
-     439,   403,   432,   340,   210,    40,   348,    53,   356,   408,
-     356,    57,    58,    52,   100,     1,     2,   197,   198,    56,
-     181,   295,   296,   475,   224,   225,   475,   210,   101,   102,
-     363,   317,   318,   323,   324,   326,   327,    92,   204,    59,
-     103,    68,   104,   297,   105,   197,   198,   101,   102,    93,
-     420,   421,   452,   453,   106,   347,    98,   434,   107,    97,
-     125,   182,   108,   132,   137,   109,    70,    71,    72,   138,
-     139,   140,   399,   141,   142,   148,   110,    73,   205,   298,
-     149,   111,    74,   112,    75,   113,   150,   410,   157,   410,
-     165,   152,    76,   203,   114,   115,   228,   172,   270,   170,
-     171,    77,   269,    78,   275,   273,   271,   274,    79,   116,
-      80,    81,    82,   282,  -283,   277,   428,   276,  -283,   311,
-     125,   117,   294,   321,   322,   329,   330,   338,    13,   342,
-     336,   357,   348,   359,   361,   365,   356,   364,   372,   376,
-     381,   382,   388,   389,   219,   386,   443,   398,   404,   396,
-     234,   175,   235,    13,   177,   178,   236,   179,   180,   101,
-     102,   397,   405,   400,   406,   356,   237,   413,   411,   414,
-     456,   443,   415,   419,   416,   423,   424,   446,   428,   429,
-     283,   284,   430,     8,    21,    38,   466,    99,    94,    91,
-     131,   332,   229,   163,   238,   239,   234,   175,   235,    13,
-     177,   178,   236,   179,   180,   101,   102,   451,   358,   436,
-     240,   216,   237,   173,   433,   379,   385,   309,   337,   241,
-     450,   473,   305,   390,   306,   459,   333,   331,   391,   242,
-     457,   412,     0,   455,     0,   243,     0,     0,     0,     0,
-     238,   239,     0,     0,   244,     0,     0,     0,     0,     0,
-       0,   245,   285,     0,   247,     0,   240,     0,     0,     0,
-       0,     0,     0,     0,     0,   241,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   242,     0,     0,     0,     0,
-       0,   243,     0,     0,     0,     0,     0,     0,     0,     0,
-     244,     0,     0,     0,     0,     0,     0,   245,   246,     0,
-     247,   234,   175,   235,    13,   177,   178,   236,   179,   180,
-     101,   102,     0,     0,     0,     0,     0,   237,     0,   234,
-     175,   235,    13,   177,   178,   236,   179,   180,   101,   102,
-     234,   175,   235,    13,   177,   178,   236,   179,   180,     0,
-       0,     0,     0,     0,     0,   238,   239,    13,     0,     0,
-       0,     0,     0,     1,     2,     0,     0,     0,     0,     0,
-       0,   240,     0,   238,   239,     0,    68,     0,     0,     0,
-     241,     0,     0,     0,   238,     0,     0,     0,     0,   240,
-     242,    69,     0,     0,     0,     0,   243,     0,   241,   383,
-       0,    70,    71,    72,     0,   244,     0,     0,   242,     0,
-       0,     0,    73,   246,   243,   247,     0,    74,     0,    75,
-       0,     0,     0,   244,     0,   243,     0,    76,     0,     0,
-       0,   246,     0,   247,     0,     0,    77,     0,    78,     0,
-       0,     0,     0,    79,     0,    80,    81,    82,   234,   175,
-     235,    13,   177,   178,   236,   179,   180,     0,     0,     0,
-       0,     0,     0,   101,   102,     0,     0,     0,     0,     0,
-       0,   211,     0,     0,     0,   103,    68,   104,     0,   105,
-     212,     0,     0,     0,     0,     0,     0,     0,     0,   106,
-       0,     0,   238,   107,     0,     0,     0,   108,     0,     0,
-     109,    70,    71,    72,     0,     0,     0,   394,     0,   213,
-       0,   110,    73,     0,     0,     0,   111,    74,   112,    75,
-     113,     0,     0,     0,     0,     0,     0,    76,     0,   114,
-     115,   214,   215,   243,     0,     0,    77,     0,    78,     1,
-       2,     0,     0,    79,   116,    80,    81,    82,     0,     0,
-       0,   103,    68,   104,     0,   105,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   106,     0,     0,     0,   107,
-       0,     0,     0,   108,     0,     0,   109,    70,    71,    72,
-       0,     0,     0,     0,     0,     0,     0,   110,    73,     0,
-       0,     0,   111,    74,   112,    75,   113,     0,     0,     0,
-       0,     0,     0,    76,     0,   114,   115,     0,     0,     0,
-       0,     0,    77,     0,    78,     0,     0,     0,     0,    79,
-     116,    80,    81,    82
+      20,   281,   283,   128,     7,   121,    20,     7,   252,     7,
+     389,   190,     7,   138,   469,   336,   203,    15,   189,   190,
+      15,   469,   386,   348,   136,   191,   197,   199,   200,   470,
+      15,    53,    90,   191,   199,   200,   470,   170,   147,   397,
+     469,   171,   437,    69,    92,    97,   467,    52,    53,    15,
+      15,    16,    69,   199,   200,   470,    15,   179,   180,    68,
+      91,    90,   188,    15,    52,   297,   298,   148,    68,     1,
+       2,    15,     9,    92,   121,   352,    48,   176,   177,   178,
+      15,   179,   180,   322,   181,   182,    69,    15,   382,    91,
+     147,    15,   179,   180,    15,    16,   314,   352,   370,   372,
+     373,   132,    68,    21,   376,   377,   394,   127,    98,   315,
+     297,   298,    12,   352,     1,     2,   345,    59,    60,   148,
+     476,   183,    10,   149,   127,    10,   471,   169,   190,   427,
+     443,   456,   299,   471,   203,   189,   190,   301,   306,   192,
+     198,   312,   191,   168,   197,   337,   433,   212,   345,   348,
+     191,    17,   471,   478,   409,   193,   127,   408,   204,   190,
+     233,   235,   184,   299,    24,   127,   395,    49,   300,   299,
+     345,    33,   424,   191,   462,   149,   232,   234,   127,   188,
+     174,   155,   317,   343,    15,   220,   345,   127,   -85,   349,
+     193,   220,   194,   351,   127,    22,    15,   364,    34,   300,
+       3,   362,     1,     2,  -284,   300,   369,   439,  -284,   280,
+     127,   221,   267,   368,    37,   451,   268,   221,   236,   177,
+     237,    15,   179,   180,   238,   181,   182,   102,   463,   162,
+     269,   318,   464,   -26,   270,    35,    43,   156,    62,    15,
+     163,   103,   104,   309,   371,     1,     2,   310,   220,   477,
+      39,   157,   477,   105,    70,   106,   192,   107,   198,   338,
+      36,   405,   240,   342,   212,    38,   350,   108,   358,   410,
+     358,   109,   282,    42,   221,   110,   434,   385,   111,    72,
+      73,    74,   403,    54,   446,    41,   404,   212,   447,   112,
+      75,   365,     1,     2,   113,    76,   114,    77,   115,   440,
+     449,    55,   441,   245,   450,    78,    58,   116,   117,     1,
+       2,   199,   200,    61,    79,   349,    80,   436,   226,   227,
+      94,    81,   118,    82,    83,    84,    95,    15,   179,   180,
+     319,   320,   401,     1,     2,   119,   325,   326,   236,   177,
+     237,    15,   179,   180,   238,   181,   182,   412,   127,   412,
+     236,   177,   237,    15,   179,   180,   238,   181,   182,   103,
+     104,    25,   328,   329,   199,   200,   239,   103,   104,    99,
+      26,   422,   423,   454,   455,   100,   430,   134,   140,   141,
+     285,   286,   240,   139,   142,   143,   144,   150,   151,   152,
+     338,    27,   350,    28,   240,   241,   358,   396,   159,   167,
+     154,   172,    29,   173,   174,   205,   445,   230,   271,   277,
+     242,   279,   313,   278,   340,   323,   273,   272,   276,   243,
+     284,   275,   296,   245,   331,   358,   324,   332,    15,   244,
+     344,   445,   363,   359,   361,   245,   366,   367,   430,   374,
+     378,   383,   384,   390,   246,   221,   468,   400,   388,   391,
+     406,   402,   247,   287,   398,   249,   236,   177,   237,    15,
+     179,   180,   238,   181,   182,   103,   104,   399,   407,   415,
+     408,   416,   239,   413,   417,   425,     8,   236,   177,   237,
+      15,   179,   180,   238,   181,   182,   103,   104,   418,   431,
+     421,   426,   432,   239,   448,   458,   165,    23,    40,   101,
+     240,   241,    96,   133,   236,   177,   237,    15,   179,   180,
+     238,   181,   182,   103,   104,    93,   242,   231,   175,   334,
+     360,   240,   241,   218,   453,   243,   435,   438,   381,   475,
+     452,   339,   307,   387,   311,   244,   392,   242,   308,   461,
+     333,   245,   393,   459,   457,   414,   243,     0,   240,   241,
+     246,   335,     0,     0,     0,     0,   244,     0,   247,   248,
+       0,   249,   245,     0,   242,     0,     0,     0,     0,    15,
+       0,   246,     0,   243,     0,     1,     2,     0,     0,     0,
+     248,     0,   249,   244,     0,     0,     0,     0,    70,   245,
+       0,     0,   176,   177,   178,    15,   179,   180,   246,   181,
+     182,     1,     2,    71,     0,     0,     0,   248,     0,   249,
+       0,     0,     0,    72,    73,    74,     0,     0,     0,     0,
+       0,     0,     0,     0,    75,     0,     0,     0,     0,    76,
+       0,    77,     0,     0,     0,     0,   183,     0,     0,    78,
+       0,     0,     0,     0,     0,     0,     0,     0,    79,     0,
+      80,     0,   103,   104,   206,    81,     0,    82,    83,    84,
+     213,     0,     0,     0,   105,    70,   106,     0,   107,   214,
+       0,     0,     0,     0,     0,     0,     0,   184,   108,     0,
+       0,     0,   109,     0,     0,     0,   110,     0,     0,   111,
+      72,    73,    74,     0,     0,   207,     0,     0,   215,     0,
+     112,    75,     0,     0,     0,   113,    76,   114,    77,   115,
+       0,     0,     0,     0,     0,     0,    78,     0,   116,   117,
+     216,   217,     0,     0,     0,    79,     0,    80,     1,     2,
+       0,     0,    81,   118,    82,    83,    84,     0,     0,     0,
+     105,    70,   106,     0,   107,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   108,     0,     0,     0,   109,     0,
+       0,     0,   110,     0,     0,   111,    72,    73,    74,     0,
+       0,     0,     0,     0,     0,     0,   112,    75,     0,     0,
+       0,   113,    76,   114,    77,   115,     0,     0,     0,     0,
+       0,     0,    78,     0,   116,   117,     0,     0,     0,     0,
+       0,    79,     0,    80,     0,     0,     0,     0,    81,   118,
+      82,    83,    84
 };
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-297)))
-
-#define yytable_value_is_error(Yytable_value) \
-  YYID (0)
-
 static const yytype_int16 yycheck[] =
 {
-      10,   214,   215,    90,   172,     0,    16,    89,   149,     4,
-      11,   149,   150,   100,   269,   149,   157,   276,    54,   157,
-      11,    11,    12,   319,     6,    18,    19,    53,   152,   108,
-       0,    41,    35,    22,    11,    12,    40,    19,    20,    21,
-       6,    87,   121,    53,    54,   111,    41,    83,    58,   115,
-       4,   110,    62,    19,    20,    21,     6,    11,    53,    54,
-       5,   314,   149,    58,   110,   117,   112,    62,    11,    19,
-      20,    21,    76,    83,    17,    18,   158,   112,   331,   247,
-      11,    24,    41,    37,    40,    11,    96,    76,    83,   115,
-      11,    80,   299,   300,   301,    11,    12,    13,   305,   306,
-      95,    96,    11,    12,    13,     8,     9,    10,    11,    12,
-      13,    37,    15,    16,   117,    12,    37,   169,   109,   120,
-      76,   111,   117,    64,   117,   266,   117,   137,   266,   111,
-     268,   269,   266,   274,   111,   117,   274,   224,   225,   149,
-     150,   228,   137,   402,   440,   400,   270,   157,   355,    52,
-      26,   117,   118,   117,   274,   109,   297,   152,    48,   297,
-     170,   171,   330,   117,   120,    46,   373,   117,    49,    59,
-     115,   114,   282,    91,   169,   170,   171,   297,   109,   266,
-      11,   311,    60,   109,   294,   111,    17,    18,   109,   276,
-      93,   117,    87,   109,    18,   277,   117,   284,    87,   329,
-     109,   408,   111,    27,    11,   169,    82,   110,    91,   111,
-      17,    18,   111,   115,   117,   428,   115,   112,    17,    18,
-      96,   110,    53,   112,    48,    91,    50,    11,    12,    13,
-       9,   241,    11,    17,    18,    59,     8,     9,    10,    11,
-      12,    13,     3,    15,    16,    17,    18,   111,   111,   111,
-     111,   115,   115,   115,   115,   113,   266,   409,   268,   269,
-     412,   348,   400,   273,   274,    28,   276,    61,   278,   356,
-     280,   114,   115,    46,     3,    17,    18,    19,    20,   114,
-      52,    18,    19,   470,    19,    20,   473,   297,    17,    18,
-     285,    36,    37,   106,   107,   104,   105,   111,    70,   110,
-      29,    30,    31,    40,    33,    19,    20,    17,    18,   114,
-      19,    20,   438,   439,    43,   402,    18,   404,    47,   110,
-     117,    93,    51,   111,   120,    54,    55,    56,    57,    88,
-      88,    78,   342,    58,    88,     3,    65,    66,   110,    76,
-     110,    70,    71,    72,    73,    74,   110,   357,     3,   359,
-     110,   120,    81,    12,    83,    84,     3,   110,   120,   116,
-     116,    90,   112,    92,    42,   120,   118,   116,    97,    98,
-      99,   100,   101,   112,   111,    75,   386,   110,   115,   103,
-     117,   110,   112,   111,   115,   103,   112,     7,    11,    32,
-     400,    75,   402,    75,    32,   110,   406,   113,    95,   102,
-     121,   108,   113,   109,   112,   110,   416,     7,    75,   113,
+      12,   216,   217,    92,     0,    91,    18,     3,   174,     5,
+     321,   151,     8,   102,     6,   271,   154,    11,   151,   159,
+      11,     6,   316,   278,    35,   151,   152,    19,    20,    21,
+      11,    43,    56,   159,    19,    20,    21,   112,   119,   333,
+       6,   116,     4,    55,    56,    53,     5,    43,    60,    11,
+      11,    12,    64,    19,    20,    21,    11,    12,    13,    55,
+      56,    85,   151,    11,    60,    18,    19,   119,    64,    17,
+      18,    11,     0,    85,   160,    37,    24,     8,     9,    10,
+      11,    12,    13,   249,    15,    16,    98,    11,   313,    85,
+     171,    11,    12,    13,    11,    12,   109,    37,   301,   302,
+     303,    97,    98,    41,   307,   308,   331,   118,   116,   122,
+      18,    19,   111,    37,    17,    18,   110,   115,   116,   171,
+     112,    52,     5,   119,   118,     8,   118,   139,   268,   110,
+     121,   442,    40,   118,   272,   268,   276,   226,   227,   151,
+     152,   230,   268,   139,   270,   271,   402,   159,   110,   404,
+     276,   112,   118,   119,   357,   110,   118,   116,   154,   299,
+     172,   173,    93,    40,   113,   118,   332,   115,    76,    40,
+     110,    12,   375,   299,    22,   171,   172,   173,   118,   268,
+     111,    26,     9,   276,    11,    87,   110,   118,   112,   278,
+     110,    87,   112,   279,   118,   112,    11,   286,    64,    76,
+     103,   284,    17,    18,   112,    76,   299,   410,   116,   111,
+     118,   113,   112,   296,    60,   430,   116,   113,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,     3,    76,    48,
+     112,   243,    80,    46,   116,    91,    49,    82,    53,    11,
+      59,    17,    18,   112,   121,    17,    18,   116,    87,   472,
+       3,    96,   475,    29,    30,    31,   268,    33,   270,   271,
+      91,   350,    52,   275,   276,    91,   278,    43,   280,   358,
+     282,    47,   111,    28,   113,    51,   402,    67,    54,    55,
+      56,    57,   112,    46,   112,   114,   116,   299,   116,    65,
+      66,   287,    17,    18,    70,    71,    72,    73,    74,   411,
+     112,    61,   414,    93,   116,    81,   115,    83,    84,    17,
+      18,    19,    20,   111,    90,   404,    92,   406,    19,    20,
+     112,    97,    98,    99,   100,   101,   115,    11,    12,    13,
+      36,    37,   344,    17,    18,   111,   107,   108,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,   359,   118,   361,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,   113,   111,   119,   115,   435,    24,   113,   111,   110,
-     120,   441,   111,   113,   122,    89,   121,   110,   448,   115,
-      38,    39,   113,     4,    16,    29,   456,    83,    62,    58,
-      96,   266,   169,   130,    52,    53,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,   435,   280,   406,
-      68,   158,    24,   148,   402,   308,   317,   228,   270,    77,
-     429,   469,   225,   325,   225,   448,   268,   258,   328,    87,
-     445,   359,    -1,   441,    -1,    93,    -1,    -1,    -1,    -1,
-      52,    53,    -1,    -1,   102,    -1,    -1,    -1,    -1,    -1,
-      -1,   109,   110,    -1,   112,    -1,    68,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    77,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    87,    -1,    -1,    -1,    -1,
-      -1,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     102,    -1,    -1,    -1,    -1,    -1,    -1,   109,   110,    -1,
-     112,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    -1,    -1,    -1,    -1,    -1,    24,    -1,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    -1,    -1,    -1,    52,    53,    11,    -1,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
-      -1,    68,    -1,    52,    53,    -1,    30,    -1,    -1,    -1,
-      77,    -1,    -1,    -1,    52,    -1,    -1,    -1,    -1,    68,
-      87,    45,    -1,    -1,    -1,    -1,    93,    -1,    77,    67,
-      -1,    55,    56,    57,    -1,   102,    -1,    -1,    87,    -1,
-      -1,    -1,    66,   110,    93,   112,    -1,    71,    -1,    73,
-      -1,    -1,    -1,   102,    -1,    93,    -1,    81,    -1,    -1,
-      -1,   110,    -1,   112,    -1,    -1,    90,    -1,    92,    -1,
-      -1,    -1,    -1,    97,    -1,    99,   100,   101,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    -1,    -1,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
-      -1,    25,    -1,    -1,    -1,    29,    30,    31,    -1,    33,
-      34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    43,
-      -1,    -1,    52,    47,    -1,    -1,    -1,    51,    -1,    -1,
-      54,    55,    56,    57,    -1,    -1,    -1,    67,    -1,    63,
-      -1,    65,    66,    -1,    -1,    -1,    70,    71,    72,    73,
-      74,    -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    83,
-      84,    85,    86,    93,    -1,    -1,    90,    -1,    92,    17,
-      18,    -1,    -1,    97,    98,    99,   100,   101,    -1,    -1,
-      -1,    29,    30,    31,    -1,    33,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    43,    -1,    -1,    -1,    47,
-      -1,    -1,    -1,    51,    -1,    -1,    54,    55,    56,    57,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,    66,    -1,
-      -1,    -1,    70,    71,    72,    73,    74,    -1,    -1,    -1,
-      -1,    -1,    -1,    81,    -1,    83,    84,    -1,    -1,    -1,
-      -1,    -1,    90,    -1,    92,    -1,    -1,    -1,    -1,    97,
-      98,    99,   100,   101
+      18,    18,   105,   106,    19,    20,    24,    17,    18,   111,
+      27,    19,    20,   440,   441,    18,   388,   112,    88,    88,
+      38,    39,    52,   121,    78,    58,    88,     3,   111,   111,
+     402,    48,   404,    50,    52,    53,   408,    67,     3,   111,
+     121,   117,    59,   117,   111,    12,   418,     3,   113,    42,
+      68,    75,   104,   111,     7,   112,   119,   121,   117,    77,
+     113,   121,   113,    93,   104,   437,   116,   113,    11,    87,
+      32,   443,    32,    75,    75,    93,   114,   111,   450,    95,
+     102,   122,   109,   114,   102,   113,   458,     7,   111,   110,
+      75,   120,   110,   111,   114,   113,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,   114,   112,   114,
+     116,   111,    24,   112,   112,    89,     3,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,   123,   116,
+     114,   122,   114,    24,   111,   121,   132,    18,    31,    85,
+      52,    53,    64,    98,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    60,    68,   171,   150,   268,
+     282,    52,    53,   160,   437,    77,   404,   408,   310,   471,
+     431,   272,   227,   319,   230,    87,   327,    68,   227,   450,
+     260,    93,   330,   447,   443,   361,    77,    -1,    52,    53,
+     102,   270,    -1,    -1,    -1,    -1,    87,    -1,   110,   111,
+      -1,   113,    93,    -1,    68,    -1,    -1,    -1,    -1,    11,
+      -1,   102,    -1,    77,    -1,    17,    18,    -1,    -1,    -1,
+     111,    -1,   113,    87,    -1,    -1,    -1,    -1,    30,    93,
+      -1,    -1,     8,     9,    10,    11,    12,    13,   102,    15,
+      16,    17,    18,    45,    -1,    -1,    -1,   111,    -1,   113,
+      -1,    -1,    -1,    55,    56,    57,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    71,
+      -1,    73,    -1,    -1,    -1,    -1,    52,    -1,    -1,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    -1,
+      92,    -1,    17,    18,    70,    97,    -1,    99,   100,   101,
+      25,    -1,    -1,    -1,    29,    30,    31,    -1,    33,    34,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    93,    43,    -1,
+      -1,    -1,    47,    -1,    -1,    -1,    51,    -1,    -1,    54,
+      55,    56,    57,    -1,    -1,   111,    -1,    -1,    63,    -1,
+      65,    66,    -1,    -1,    -1,    70,    71,    72,    73,    74,
+      -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    83,    84,
+      85,    86,    -1,    -1,    -1,    90,    -1,    92,    17,    18,
+      -1,    -1,    97,    98,    99,   100,   101,    -1,    -1,    -1,
+      29,    30,    31,    -1,    33,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    43,    -1,    -1,    -1,    47,    -1,
+      -1,    -1,    51,    -1,    -1,    54,    55,    56,    57,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    65,    66,    -1,    -1,
+      -1,    70,    71,    72,    73,    74,    -1,    -1,    -1,    -1,
+      -1,    -1,    81,    -1,    83,    84,    -1,    -1,    -1,    -1,
+      -1,    90,    -1,    92,    -1,    -1,    -1,    -1,    97,    98,
+      99,   100,   101
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    17,    18,   124,   125,   126,   243,     0,   126,   127,
-     110,   128,   129,    11,    12,   111,   130,   131,   246,    41,
-     111,   131,   112,    18,    27,    48,    50,    59,   132,   133,
-     134,    12,    64,    91,    91,    60,    91,     3,   134,   113,
-      28,    49,   135,   136,   148,   149,    24,   114,   150,   151,
-     243,   246,    46,    61,   140,   141,   114,   114,   115,   110,
-      53,   142,   143,   145,   146,   147,   243,   246,    30,    45,
-      55,    56,    57,    66,    71,    73,    81,    90,    92,    97,
-      99,   100,   101,   137,   138,   153,   155,   185,   195,   243,
-     246,   151,   111,   114,   145,    53,   115,   110,    18,   138,
-       3,    17,    18,    29,    31,    33,    43,    47,    51,    54,
-      65,    70,    72,    74,    83,    84,    98,   110,   154,   179,
-     192,   193,   194,   195,   244,   117,   175,   238,   239,   240,
-     243,   147,   111,   139,    35,   165,   175,   120,    88,    88,
-      78,    58,    88,   156,   157,   192,   193,   243,     3,   110,
-     110,   233,   120,    26,    82,    96,   241,     3,   176,   177,
-      48,    59,   242,   129,   144,   110,   243,   246,   111,   115,
-     116,   116,   110,   152,     8,     9,    10,    12,    13,    15,
-      16,    52,    93,   152,   158,   159,   175,   188,   190,   236,
-     246,   109,   111,   234,   235,   236,   246,    19,    20,   180,
-     181,   182,   243,    12,    70,   110,   186,   188,   189,   243,
-     246,    25,    34,    63,    85,    86,   154,   178,    87,   112,
-     198,   199,   200,   201,    19,    20,   167,   168,     3,   157,
-     243,   246,   243,   246,     8,    10,    14,    24,    52,    53,
-      68,    77,    87,    93,   102,   109,   110,   112,   179,   190,
-     203,   204,   205,   206,   207,   208,   210,   211,   212,   213,
-     214,   215,   236,   237,   246,   111,   115,   111,   115,   112,
-     120,   118,   187,   120,   116,    42,   110,    75,   110,   198,
-     110,   198,   112,    38,    39,   110,   202,   203,   220,   221,
-     223,   225,   226,   227,   112,    18,    19,    40,    76,   175,
-     183,   184,   231,   232,   175,   183,   184,   111,   115,   165,
-     175,   103,   108,   121,   224,     9,   246,    36,    37,   209,
-     203,   111,   115,   106,   107,   196,   104,   105,   197,   103,
-     112,   224,   159,   235,   189,   236,   246,   181,     7,   191,
-     246,   186,    32,   109,   163,   164,   174,   175,   246,   179,
-      37,   160,   161,   162,   174,   175,   246,    75,   160,    75,
-     202,    32,   175,   243,   113,   110,   202,   186,   231,   120,
-     231,   231,    95,   166,   231,   231,   102,   169,   170,   168,
-     208,   121,   108,    67,   212,   201,   110,   191,   113,   109,
-     206,   207,   208,   203,    67,   212,   113,   113,     7,   246,
-     119,   111,   115,   175,    75,   111,   115,   231,   175,   245,
-     246,   111,   245,   113,   110,   111,   122,   228,   229,   113,
-      19,    20,   231,    89,   121,   109,   216,   217,   246,   115,
-     113,   189,   236,   164,   175,     4,   162,   231,   238,   238,
-     222,   120,   230,   246,   111,   115,   110,   111,   115,   198,
-     204,   161,   177,   177,   191,   230,   120,   229,   171,   217,
-      22,    76,    80,   218,   219,     5,   246,     6,    21,   117,
-     172,   173,   182,   172,   111,   173,   118
+       0,    17,    18,   103,   125,   126,   127,   244,   126,     0,
+     127,   128,   111,   129,   130,    11,    12,   112,   131,   132,
+     247,    41,   112,   132,   113,    18,    27,    48,    50,    59,
+     133,   134,   135,    12,    64,    91,    91,    60,    91,     3,
+     135,   114,    28,    49,   136,   137,   149,   150,    24,   115,
+     151,   152,   244,   247,    46,    61,   141,   142,   115,   115,
+     116,   111,    53,   143,   144,   146,   147,   148,   244,   247,
+      30,    45,    55,    56,    57,    66,    71,    73,    81,    90,
+      92,    97,    99,   100,   101,   138,   139,   154,   156,   186,
+     196,   244,   247,   152,   112,   115,   146,    53,   116,   111,
+      18,   139,     3,    17,    18,    29,    31,    33,    43,    47,
+      51,    54,    65,    70,    72,    74,    83,    84,    98,   111,
+     155,   180,   193,   194,   195,   196,   245,   118,   176,   239,
+     240,   241,   244,   148,   112,   140,    35,   166,   176,   121,
+      88,    88,    78,    58,    88,   157,   158,   193,   194,   244,
+       3,   111,   111,   234,   121,    26,    82,    96,   242,     3,
+     177,   178,    48,    59,   243,   130,   145,   111,   244,   247,
+     112,   116,   117,   117,   111,   153,     8,     9,    10,    12,
+      13,    15,    16,    52,    93,   153,   159,   160,   176,   189,
+     191,   237,   247,   110,   112,   235,   236,   237,   247,    19,
+      20,   181,   182,   183,   244,    12,    70,   111,   187,   189,
+     190,   244,   247,    25,    34,    63,    85,    86,   155,   179,
+      87,   113,   199,   200,   201,   202,    19,    20,   168,   169,
+       3,   158,   244,   247,   244,   247,     8,    10,    14,    24,
+      52,    53,    68,    77,    87,    93,   102,   110,   111,   113,
+     180,   191,   204,   205,   206,   207,   208,   209,   211,   212,
+     213,   214,   215,   216,   237,   238,   247,   112,   116,   112,
+     116,   113,   121,   119,   188,   121,   117,    42,   111,    75,
+     111,   199,   111,   199,   113,    38,    39,   111,   203,   204,
+     221,   222,   224,   226,   227,   228,   113,    18,    19,    40,
+      76,   176,   184,   185,   232,   233,   176,   184,   185,   112,
+     116,   166,   176,   104,   109,   122,   225,     9,   247,    36,
+      37,   210,   204,   112,   116,   107,   108,   197,   105,   106,
+     198,   104,   113,   225,   160,   236,   190,   237,   247,   182,
+       7,   192,   247,   187,    32,   110,   164,   165,   175,   176,
+     247,   180,    37,   161,   162,   163,   175,   176,   247,    75,
+     161,    75,   203,    32,   176,   244,   114,   111,   203,   187,
+     232,   121,   232,   232,    95,   167,   232,   232,   102,   170,
+     171,   169,   209,   122,   109,    67,   213,   202,   111,   192,
+     114,   110,   207,   208,   209,   204,    67,   213,   114,   114,
+       7,   247,   120,   112,   116,   176,    75,   112,   116,   232,
+     176,   246,   247,   112,   246,   114,   111,   112,   123,   229,
+     230,   114,    19,    20,   232,    89,   122,   110,   217,   218,
+     247,   116,   114,   190,   237,   165,   176,     4,   163,   232,
+     239,   239,   223,   121,   231,   247,   112,   116,   111,   112,
+     116,   199,   205,   162,   178,   178,   192,   231,   121,   230,
+     172,   218,    22,    76,    80,   219,   220,     5,   247,     6,
+      21,   118,   173,   174,   183,   173,   112,   174,   119
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1504,50 +1447,78 @@
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
 
-/* Error token number */
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* This macro is provided for backward compatibility. */
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
 #ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (YYLEX_PARAM)
 #else
@@ -1597,8 +1568,6 @@
     YYSTYPE const * const yyvaluep;
 #endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
@@ -1607,7 +1576,11 @@
 # else
   YYUSE (yyoutput);
 # endif
-  YYUSE (yytype);
+  switch (yytype)
+    {
+      default:
+	break;
+    }
 }
 
 
@@ -1644,20 +1617,17 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1691,11 +1661,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1732,6 +1702,7 @@
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -1834,145 +1805,115 @@
 }
 # endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
+  int yyn = yypact[yystate];
 
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
 
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
 }
 #endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1997,31 +1938,44 @@
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  YYUSE (yytype);
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
 }
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
 
 
-
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
 int yynerrs;
 
 
+
 /*----------.
 | yyparse.  |
 `----------*/
@@ -2048,37 +2002,14 @@
 #endif
 #endif
 {
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
+  
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -2086,22 +2017,54 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -2128,6 +2091,7 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -2135,6 +2099,7 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -2157,8 +2122,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -2169,6 +2135,7 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -2178,9 +2145,6 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -2189,16 +2153,16 @@
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -2224,27 +2188,29 @@
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -2281,16 +2247,21 @@
   switch (yyn)
     {
         case 2:
-/* Line 1787 of yacc.c  */
 #line 358 "asn1p_y.y"
     {
+		*(void **)param = (yyvsp[(2) - (2)].a_grammar);
+	}
+    break;
+
+  case 3:
+#line 361 "asn1p_y.y"
+    {
 		*(void **)param = (yyvsp[(1) - (1)].a_grammar);
 	}
     break;
 
-  case 3:
-/* Line 1787 of yacc.c  */
-#line 364 "asn1p_y.y"
+  case 4:
+#line 367 "asn1p_y.y"
     {
 		(yyval.a_grammar) = asn1p_new();
 		checkmem((yyval.a_grammar));
@@ -2298,24 +2269,21 @@
 	}
     break;
 
-  case 4:
-/* Line 1787 of yacc.c  */
-#line 369 "asn1p_y.y"
+  case 5:
+#line 372 "asn1p_y.y"
     {
 		(yyval.a_grammar) = (yyvsp[(1) - (2)].a_grammar);
 		TQ_ADD(&((yyval.a_grammar)->modules), (yyvsp[(2) - (2)].a_module), mod_next);
 	}
     break;
 
-  case 5:
-/* Line 1787 of yacc.c  */
-#line 386 "asn1p_y.y"
+  case 6:
+#line 389 "asn1p_y.y"
     { currentModule = asn1p_module_new(); }
     break;
 
-  case 6:
-/* Line 1787 of yacc.c  */
-#line 391 "asn1p_y.y"
+  case 7:
+#line 394 "asn1p_y.y"
     {
 
 		(yyval.a_module) = currentModule;
@@ -2335,37 +2303,32 @@
 	}
     break;
 
-  case 7:
-/* Line 1787 of yacc.c  */
-#line 415 "asn1p_y.y"
+  case 8:
+#line 418 "asn1p_y.y"
     { (yyval.a_oid) = 0; }
     break;
 
-  case 8:
-/* Line 1787 of yacc.c  */
-#line 416 "asn1p_y.y"
+  case 9:
+#line 419 "asn1p_y.y"
     { (yyval.a_oid) = (yyvsp[(1) - (1)].a_oid); }
     break;
 
-  case 9:
-/* Line 1787 of yacc.c  */
-#line 420 "asn1p_y.y"
+  case 10:
+#line 423 "asn1p_y.y"
     {
 		(yyval.a_oid) = (yyvsp[(2) - (3)].a_oid);
 	}
     break;
 
-  case 10:
-/* Line 1787 of yacc.c  */
-#line 423 "asn1p_y.y"
+  case 11:
+#line 426 "asn1p_y.y"
     {
 		(yyval.a_oid) = 0;
 	}
     break;
 
-  case 11:
-/* Line 1787 of yacc.c  */
-#line 429 "asn1p_y.y"
+  case 12:
+#line 432 "asn1p_y.y"
     {
 		(yyval.a_oid) = asn1p_oid_new();
 		asn1p_oid_add_arc((yyval.a_oid), &(yyvsp[(1) - (1)].a_oid_arc));
@@ -2374,9 +2337,8 @@
 	}
     break;
 
-  case 12:
-/* Line 1787 of yacc.c  */
-#line 435 "asn1p_y.y"
+  case 13:
+#line 438 "asn1p_y.y"
     {
 		(yyval.a_oid) = (yyvsp[(1) - (2)].a_oid);
 		asn1p_oid_add_arc((yyval.a_oid), &(yyvsp[(2) - (2)].a_oid_arc));
@@ -2385,98 +2347,86 @@
 	}
     break;
 
-  case 13:
-/* Line 1787 of yacc.c  */
-#line 444 "asn1p_y.y"
+  case 14:
+#line 447 "asn1p_y.y"
     {					/* iso */
 		(yyval.a_oid_arc).name = (yyvsp[(1) - (1)].tv_str);
 		(yyval.a_oid_arc).number = -1;
 	}
     break;
 
-  case 14:
-/* Line 1787 of yacc.c  */
-#line 448 "asn1p_y.y"
+  case 15:
+#line 451 "asn1p_y.y"
     {		/* iso(1) */
 		(yyval.a_oid_arc).name = (yyvsp[(1) - (4)].tv_str);
 		(yyval.a_oid_arc).number = (yyvsp[(3) - (4)].a_int);
 	}
     break;
 
-  case 15:
-/* Line 1787 of yacc.c  */
-#line 452 "asn1p_y.y"
+  case 16:
+#line 455 "asn1p_y.y"
     {					/* 1 */
 		(yyval.a_oid_arc).name = 0;
 		(yyval.a_oid_arc).number = (yyvsp[(1) - (1)].a_int);
 	}
     break;
 
-  case 16:
-/* Line 1787 of yacc.c  */
-#line 462 "asn1p_y.y"
+  case 17:
+#line 465 "asn1p_y.y"
     { (yyval.a_module_flags) = MSF_NOFLAGS; }
     break;
 
-  case 17:
-/* Line 1787 of yacc.c  */
-#line 463 "asn1p_y.y"
-    {
-		(yyval.a_module_flags) = (yyvsp[(1) - (1)].a_module_flags);
-	}
-    break;
-
   case 18:
-/* Line 1787 of yacc.c  */
-#line 472 "asn1p_y.y"
+#line 466 "asn1p_y.y"
     {
 		(yyval.a_module_flags) = (yyvsp[(1) - (1)].a_module_flags);
 	}
     break;
 
   case 19:
-/* Line 1787 of yacc.c  */
 #line 475 "asn1p_y.y"
     {
+		(yyval.a_module_flags) = (yyvsp[(1) - (1)].a_module_flags);
+	}
+    break;
+
+  case 20:
+#line 478 "asn1p_y.y"
+    {
 		(yyval.a_module_flags) = (yyvsp[(1) - (2)].a_module_flags) | (yyvsp[(2) - (2)].a_module_flags);
 	}
     break;
 
-  case 20:
-/* Line 1787 of yacc.c  */
-#line 484 "asn1p_y.y"
+  case 21:
+#line 487 "asn1p_y.y"
     {
 		(yyval.a_module_flags) = MSF_EXPLICIT_TAGS;
 	}
     break;
 
-  case 21:
-/* Line 1787 of yacc.c  */
-#line 487 "asn1p_y.y"
+  case 22:
+#line 490 "asn1p_y.y"
     {
 		(yyval.a_module_flags) = MSF_IMPLICIT_TAGS;
 	}
     break;
 
-  case 22:
-/* Line 1787 of yacc.c  */
-#line 490 "asn1p_y.y"
+  case 23:
+#line 493 "asn1p_y.y"
     {
 		(yyval.a_module_flags) = MSF_AUTOMATIC_TAGS;
 	}
     break;
 
-  case 23:
-/* Line 1787 of yacc.c  */
-#line 493 "asn1p_y.y"
+  case 24:
+#line 496 "asn1p_y.y"
     {
 		(yyval.a_module_flags) = MSF_EXTENSIBILITY_IMPLIED;
 	}
     break;
 
-  case 24:
-/* Line 1787 of yacc.c  */
-#line 497 "asn1p_y.y"
+  case 25:
+#line 500 "asn1p_y.y"
     {
 		/* X.680Amd1 specifies TAG and XER */
 		if(strcmp((yyvsp[(1) - (2)].tv_str), "TAG") == 0) {
@@ -2494,23 +2444,20 @@
 	}
     break;
 
-  case 25:
-/* Line 1787 of yacc.c  */
-#line 518 "asn1p_y.y"
+  case 26:
+#line 521 "asn1p_y.y"
     { (yyval.a_module) = 0; }
     break;
 
-  case 26:
-/* Line 1787 of yacc.c  */
-#line 519 "asn1p_y.y"
+  case 27:
+#line 522 "asn1p_y.y"
     {
 		(yyval.a_module) = (yyvsp[(1) - (1)].a_module);
 	}
     break;
 
-  case 27:
-/* Line 1787 of yacc.c  */
-#line 528 "asn1p_y.y"
+  case 28:
+#line 531 "asn1p_y.y"
     {
 		(yyval.a_module) = asn1p_module_new();
 		AL_IMPORT((yyval.a_module), exports, (yyvsp[(1) - (3)].a_module), xp_next);
@@ -2523,17 +2470,15 @@
 	}
     break;
 
-  case 28:
-/* Line 1787 of yacc.c  */
-#line 541 "asn1p_y.y"
+  case 29:
+#line 544 "asn1p_y.y"
     {
 		(yyval.a_module) = (yyvsp[(1) - (1)].a_module);
 	}
     break;
 
-  case 29:
-/* Line 1787 of yacc.c  */
-#line 544 "asn1p_y.y"
+  case 30:
+#line 547 "asn1p_y.y"
     {
 		if((yyvsp[(1) - (2)].a_module)) {
 			(yyval.a_module) = (yyvsp[(1) - (2)].a_module);
@@ -2546,21 +2491,8 @@
 	}
     break;
 
-  case 30:
-/* Line 1787 of yacc.c  */
-#line 561 "asn1p_y.y"
-    {
-		(yyval.a_module) = asn1p_module_new();
-		checkmem((yyval.a_module));
-		assert((yyvsp[(1) - (1)].a_expr)->expr_type != A1TC_INVALID);
-		assert((yyvsp[(1) - (1)].a_expr)->meta_type != AMT_INVALID);
-		TQ_ADD(&((yyval.a_module)->members), (yyvsp[(1) - (1)].a_expr), next);
-	}
-    break;
-
   case 31:
-/* Line 1787 of yacc.c  */
-#line 568 "asn1p_y.y"
+#line 564 "asn1p_y.y"
     {
 		(yyval.a_module) = asn1p_module_new();
 		checkmem((yyval.a_module));
@@ -2571,8 +2503,7 @@
     break;
 
   case 32:
-/* Line 1787 of yacc.c  */
-#line 581 "asn1p_y.y"
+#line 571 "asn1p_y.y"
     {
 		(yyval.a_module) = asn1p_module_new();
 		checkmem((yyval.a_module));
@@ -2583,14 +2514,23 @@
     break;
 
   case 33:
-/* Line 1787 of yacc.c  */
-#line 589 "asn1p_y.y"
-    { asn1p_lexer_hack_push_encoding_control(); }
+#line 584 "asn1p_y.y"
+    {
+		(yyval.a_module) = asn1p_module_new();
+		checkmem((yyval.a_module));
+		assert((yyvsp[(1) - (1)].a_expr)->expr_type != A1TC_INVALID);
+		assert((yyvsp[(1) - (1)].a_expr)->meta_type != AMT_INVALID);
+		TQ_ADD(&((yyval.a_module)->members), (yyvsp[(1) - (1)].a_expr), next);
+	}
     break;
 
   case 34:
-/* Line 1787 of yacc.c  */
-#line 590 "asn1p_y.y"
+#line 592 "asn1p_y.y"
+    { asn1p_lexer_hack_push_encoding_control(); }
+    break;
+
+  case 35:
+#line 593 "asn1p_y.y"
     {
 		fprintf(stderr,
 			"WARNING: ENCODING-CONTROL %s "
@@ -2601,9 +2541,8 @@
 	}
     break;
 
-  case 35:
-/* Line 1787 of yacc.c  */
-#line 602 "asn1p_y.y"
+  case 36:
+#line 605 "asn1p_y.y"
     {
 		return yyerror(
 			"Attempt to redefine a standard basic string type, "
@@ -2611,15 +2550,13 @@
 	}
     break;
 
-  case 36:
-/* Line 1787 of yacc.c  */
-#line 615 "asn1p_y.y"
+  case 37:
+#line 618 "asn1p_y.y"
     { (yyval.a_module) = 0; }
     break;
 
-  case 38:
-/* Line 1787 of yacc.c  */
-#line 619 "asn1p_y.y"
+  case 39:
+#line 622 "asn1p_y.y"
     {
 		if(!saved_aid && 0)
 			return yyerror("Unterminated IMPORTS FROM, "
@@ -2629,23 +2566,20 @@
 	}
     break;
 
-  case 39:
-/* Line 1787 of yacc.c  */
-#line 629 "asn1p_y.y"
+  case 40:
+#line 632 "asn1p_y.y"
     {
 		return yyerror("Empty IMPORTS list");
 	}
     break;
 
-  case 40:
-/* Line 1787 of yacc.c  */
-#line 635 "asn1p_y.y"
+  case 41:
+#line 638 "asn1p_y.y"
     { (yyval.a_module) = asn1p_module_new(); }
     break;
 
-  case 42:
-/* Line 1787 of yacc.c  */
-#line 639 "asn1p_y.y"
+  case 43:
+#line 642 "asn1p_y.y"
     {
 		(yyval.a_module) = asn1p_module_new();
 		checkmem((yyval.a_module));
@@ -2653,30 +2587,26 @@
 	}
     break;
 
-  case 43:
-/* Line 1787 of yacc.c  */
-#line 644 "asn1p_y.y"
+  case 44:
+#line 647 "asn1p_y.y"
     {
 		(yyval.a_module) = (yyvsp[(1) - (2)].a_module);
 		TQ_ADD(&((yyval.a_module)->imports), (yyvsp[(2) - (2)].a_xports), xp_next);
 	}
     break;
 
-  case 44:
-/* Line 1787 of yacc.c  */
-#line 651 "asn1p_y.y"
+  case 45:
+#line 654 "asn1p_y.y"
     { memset(&(yyval.a_aid), 0, sizeof((yyval.a_aid))); }
     break;
 
-  case 45:
-/* Line 1787 of yacc.c  */
-#line 652 "asn1p_y.y"
+  case 46:
+#line 655 "asn1p_y.y"
     { (yyval.a_aid).oid = (yyvsp[(1) - (1)].a_oid); }
     break;
 
-  case 46:
-/* Line 1787 of yacc.c  */
-#line 656 "asn1p_y.y"
+  case 47:
+#line 659 "asn1p_y.y"
     {
 		(yyval.a_xports) = (yyvsp[(1) - (4)].a_xports);
 		(yyval.a_xports)->fromModuleName = (yyvsp[(3) - (4)].tv_str);
@@ -2687,9 +2617,8 @@
 	}
     break;
 
-  case 47:
-/* Line 1787 of yacc.c  */
-#line 667 "asn1p_y.y"
+  case 48:
+#line 670 "asn1p_y.y"
     {
 		(yyval.a_xports) = asn1p_xports_new();
 		checkmem((yyval.a_xports));
@@ -2697,18 +2626,16 @@
 	}
     break;
 
-  case 48:
-/* Line 1787 of yacc.c  */
-#line 672 "asn1p_y.y"
+  case 49:
+#line 675 "asn1p_y.y"
     {
 		(yyval.a_xports) = (yyvsp[(1) - (3)].a_xports);
 		TQ_ADD(&((yyval.a_xports)->members), (yyvsp[(3) - (3)].a_expr), next);
 	}
     break;
 
-  case 49:
-/* Line 1787 of yacc.c  */
-#line 679 "asn1p_y.y"
+  case 50:
+#line 682 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2717,9 +2644,8 @@
 	}
     break;
 
-  case 50:
-/* Line 1787 of yacc.c  */
-#line 685 "asn1p_y.y"
+  case 51:
+#line 688 "asn1p_y.y"
     {		/* Completely equivalent to above */
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2728,9 +2654,8 @@
 	}
     break;
 
-  case 51:
-/* Line 1787 of yacc.c  */
-#line 691 "asn1p_y.y"
+  case 52:
+#line 694 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2739,15 +2664,13 @@
 	}
     break;
 
-  case 52:
-/* Line 1787 of yacc.c  */
-#line 701 "asn1p_y.y"
+  case 53:
+#line 704 "asn1p_y.y"
     { (yyval.a_module) = 0; }
     break;
 
-  case 53:
-/* Line 1787 of yacc.c  */
-#line 702 "asn1p_y.y"
+  case 54:
+#line 705 "asn1p_y.y"
     {
 		(yyval.a_module) = asn1p_module_new();
 		checkmem((yyval.a_module));
@@ -2759,25 +2682,22 @@
 	}
     break;
 
-  case 54:
-/* Line 1787 of yacc.c  */
-#line 714 "asn1p_y.y"
+  case 55:
+#line 717 "asn1p_y.y"
     {
 		(yyval.a_xports) = (yyvsp[(2) - (3)].a_xports);
 	}
     break;
 
-  case 55:
-/* Line 1787 of yacc.c  */
-#line 717 "asn1p_y.y"
+  case 56:
+#line 720 "asn1p_y.y"
     {
 		(yyval.a_xports) = 0;
 	}
     break;
 
-  case 56:
-/* Line 1787 of yacc.c  */
-#line 720 "asn1p_y.y"
+  case 57:
+#line 723 "asn1p_y.y"
     {
 		/* Empty EXPORTS clause effectively prohibits export. */
 		(yyval.a_xports) = asn1p_xports_new();
@@ -2785,9 +2705,8 @@
 	}
     break;
 
-  case 57:
-/* Line 1787 of yacc.c  */
-#line 728 "asn1p_y.y"
+  case 58:
+#line 731 "asn1p_y.y"
     {
 		(yyval.a_xports) = asn1p_xports_new();
 		assert((yyval.a_xports));
@@ -2795,18 +2714,16 @@
 	}
     break;
 
-  case 58:
-/* Line 1787 of yacc.c  */
-#line 733 "asn1p_y.y"
+  case 59:
+#line 736 "asn1p_y.y"
     {
 		(yyval.a_xports) = (yyvsp[(1) - (3)].a_xports);
 		TQ_ADD(&((yyval.a_xports)->members), (yyvsp[(3) - (3)].a_expr), next);
 	}
     break;
 
-  case 59:
-/* Line 1787 of yacc.c  */
-#line 740 "asn1p_y.y"
+  case 60:
+#line 743 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2815,9 +2732,8 @@
 	}
     break;
 
-  case 60:
-/* Line 1787 of yacc.c  */
-#line 746 "asn1p_y.y"
+  case 61:
+#line 749 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2826,9 +2742,8 @@
 	}
     break;
 
-  case 61:
-/* Line 1787 of yacc.c  */
-#line 752 "asn1p_y.y"
+  case 62:
+#line 755 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2837,15 +2752,13 @@
 	}
     break;
 
-  case 62:
-/* Line 1787 of yacc.c  */
-#line 761 "asn1p_y.y"
+  case 63:
+#line 764 "asn1p_y.y"
     { (yyval.a_constr) = (yyvsp[(2) - (3)].a_constr); }
     break;
 
-  case 63:
-/* Line 1787 of yacc.c  */
-#line 764 "asn1p_y.y"
+  case 64:
+#line 767 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(2) - (4)].a_expr);
 		assert((yyval.a_expr)->Identifier == 0);
@@ -2855,17 +2768,15 @@
 	}
     break;
 
-  case 64:
-/* Line 1787 of yacc.c  */
-#line 774 "asn1p_y.y"
+  case 65:
+#line 777 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (1)].a_expr);
 	}
     break;
 
-  case 65:
-/* Line 1787 of yacc.c  */
-#line 787 "asn1p_y.y"
+  case 66:
+#line 790 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2875,9 +2786,8 @@
 	}
     break;
 
-  case 66:
-/* Line 1787 of yacc.c  */
-#line 797 "asn1p_y.y"
+  case 67:
+#line 800 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -2888,9 +2798,8 @@
 	}
     break;
 
-  case 67:
-/* Line 1787 of yacc.c  */
-#line 817 "asn1p_y.y"
+  case 68:
+#line 820 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(3) - (3)].a_expr);
 		(yyval.a_expr)->Identifier = (yyvsp[(1) - (3)].tv_str);
@@ -2899,9 +2808,8 @@
 	}
     break;
 
-  case 68:
-/* Line 1787 of yacc.c  */
-#line 823 "asn1p_y.y"
+  case 69:
+#line 826 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(3) - (3)].a_expr);
 		(yyval.a_expr)->Identifier = (yyvsp[(1) - (3)].tv_str);
@@ -2910,19 +2818,8 @@
 	}
     break;
 
-  case 69:
-/* Line 1787 of yacc.c  */
-#line 839 "asn1p_y.y"
-    {
-		(yyval.a_expr) = (yyvsp[(6) - (6)].a_expr);
-		(yyval.a_expr)->Identifier = (yyvsp[(1) - (6)].tv_str);
-		(yyval.a_expr)->lhs_params = (yyvsp[(3) - (6)].a_plist);
-	}
-    break;
-
   case 70:
-/* Line 1787 of yacc.c  */
-#line 845 "asn1p_y.y"
+#line 842 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(6) - (6)].a_expr);
 		(yyval.a_expr)->Identifier = (yyvsp[(1) - (6)].tv_str);
@@ -2931,8 +2828,16 @@
     break;
 
   case 71:
-/* Line 1787 of yacc.c  */
-#line 853 "asn1p_y.y"
+#line 848 "asn1p_y.y"
+    {
+		(yyval.a_expr) = (yyvsp[(6) - (6)].a_expr);
+		(yyval.a_expr)->Identifier = (yyvsp[(1) - (6)].tv_str);
+		(yyval.a_expr)->lhs_params = (yyvsp[(3) - (6)].a_plist);
+	}
+    break;
+
+  case 72:
+#line 856 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_plist) = asn1p_paramlist_new(yylineno);
@@ -2944,9 +2849,8 @@
 	}
     break;
 
-  case 72:
-/* Line 1787 of yacc.c  */
-#line 862 "asn1p_y.y"
+  case 73:
+#line 865 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_plist) = (yyvsp[(1) - (3)].a_plist);
@@ -2957,31 +2861,16 @@
 	}
     break;
 
-  case 73:
-/* Line 1787 of yacc.c  */
-#line 873 "asn1p_y.y"
+  case 74:
+#line 876 "asn1p_y.y"
     {
 		(yyval.a_parg).governor = NULL;
 		(yyval.a_parg).argument = (yyvsp[(1) - (1)].tv_str);
 	}
     break;
 
-  case 74:
-/* Line 1787 of yacc.c  */
-#line 877 "asn1p_y.y"
-    {
-		int ret;
-		(yyval.a_parg).governor = asn1p_ref_new(yylineno, currentModule);
-		ret = asn1p_ref_add_component((yyval.a_parg).governor, (yyvsp[(1) - (3)].tv_str), 0);
-		checkmem(ret == 0);
-		(yyval.a_parg).argument = (yyvsp[(3) - (3)].tv_str);
-		free((yyvsp[(1) - (3)].tv_str));
-	}
-    break;
-
   case 75:
-/* Line 1787 of yacc.c  */
-#line 885 "asn1p_y.y"
+#line 880 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_parg).governor = asn1p_ref_new(yylineno, currentModule);
@@ -2993,21 +2882,19 @@
     break;
 
   case 76:
-/* Line 1787 of yacc.c  */
-#line 893 "asn1p_y.y"
+#line 888 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_parg).governor = asn1p_ref_new(yylineno, currentModule);
-		ret = asn1p_ref_add_component((yyval.a_parg).governor,
-			ASN_EXPR_TYPE2STR((yyvsp[(1) - (3)].a_type)), 1);
+		ret = asn1p_ref_add_component((yyval.a_parg).governor, (yyvsp[(1) - (3)].tv_str), 0);
 		checkmem(ret == 0);
 		(yyval.a_parg).argument = (yyvsp[(3) - (3)].tv_str);
+		free((yyvsp[(1) - (3)].tv_str));
 	}
     break;
 
   case 77:
-/* Line 1787 of yacc.c  */
-#line 901 "asn1p_y.y"
+#line 896 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_parg).governor = asn1p_ref_new(yylineno, currentModule);
@@ -3019,8 +2906,19 @@
     break;
 
   case 78:
-/* Line 1787 of yacc.c  */
-#line 912 "asn1p_y.y"
+#line 904 "asn1p_y.y"
+    {
+		int ret;
+		(yyval.a_parg).governor = asn1p_ref_new(yylineno, currentModule);
+		ret = asn1p_ref_add_component((yyval.a_parg).governor,
+			ASN_EXPR_TYPE2STR((yyvsp[(1) - (3)].a_type)), 1);
+		checkmem(ret == 0);
+		(yyval.a_parg).argument = (yyvsp[(3) - (3)].tv_str);
+	}
+    break;
+
+  case 79:
+#line 915 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3028,26 +2926,23 @@
 	}
     break;
 
-  case 79:
-/* Line 1787 of yacc.c  */
-#line 917 "asn1p_y.y"
+  case 80:
+#line 920 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (3)].a_expr);
 		asn1p_expr_add((yyval.a_expr), (yyvsp[(3) - (3)].a_expr));
 	}
     break;
 
-  case 80:
-/* Line 1787 of yacc.c  */
-#line 924 "asn1p_y.y"
+  case 81:
+#line 927 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (1)].a_expr);
 	}
     break;
 
-  case 81:
-/* Line 1787 of yacc.c  */
-#line 927 "asn1p_y.y"
+  case 82:
+#line 930 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3058,9 +2953,8 @@
 	}
     break;
 
-  case 82:
-/* Line 1787 of yacc.c  */
-#line 935 "asn1p_y.y"
+  case 83:
+#line 938 "asn1p_y.y"
     {
 		asn1p_ref_t *ref;
 		(yyval.a_expr) = NEW_EXPR();
@@ -3074,9 +2968,8 @@
 	}
     break;
 
-  case 83:
-/* Line 1787 of yacc.c  */
-#line 946 "asn1p_y.y"
+  case 84:
+#line 949 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		(yyval.a_expr)->expr_type = A1TC_VALUESET;
@@ -3085,21 +2978,18 @@
 	}
     break;
 
-  case 84:
-/* Line 1787 of yacc.c  */
-#line 969 "asn1p_y.y"
+  case 85:
+#line 972 "asn1p_y.y"
     { (yyval.a_expr) = NEW_EXPR(); }
     break;
 
-  case 85:
-/* Line 1787 of yacc.c  */
-#line 970 "asn1p_y.y"
+  case 86:
+#line 973 "asn1p_y.y"
     { (yyval.a_expr) = (yyvsp[(1) - (1)].a_expr); }
     break;
 
-  case 86:
-/* Line 1787 of yacc.c  */
-#line 973 "asn1p_y.y"
+  case 87:
+#line 976 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3107,18 +2997,16 @@
 	}
     break;
 
-  case 87:
-/* Line 1787 of yacc.c  */
-#line 978 "asn1p_y.y"
+  case 88:
+#line 981 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (3)].a_expr);
 		asn1p_expr_add((yyval.a_expr), (yyvsp[(3) - (3)].a_expr));
 	}
     break;
 
-  case 88:
-/* Line 1787 of yacc.c  */
-#line 982 "asn1p_y.y"
+  case 89:
+#line 985 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (5)].a_expr);
 		asn1p_expr_add_many((yyval.a_expr), (yyvsp[(4) - (5)].a_expr));
@@ -3126,9 +3014,8 @@
 	}
     break;
 
-  case 89:
-/* Line 1787 of yacc.c  */
-#line 990 "asn1p_y.y"
+  case 90:
+#line 993 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(2) - (3)].a_expr);
 		assert((yyval.a_expr)->Identifier == 0);
@@ -3138,9 +3025,8 @@
 	}
     break;
 
-  case 90:
-/* Line 1787 of yacc.c  */
-#line 997 "asn1p_y.y"
+  case 91:
+#line 1000 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (2)].a_expr);
 		(yyvsp[(2) - (2)].a_marker).flags |= (yyval.a_expr)->marker.flags;
@@ -3149,9 +3035,8 @@
 	}
     break;
 
-  case 91:
-/* Line 1787 of yacc.c  */
-#line 1003 "asn1p_y.y"
+  case 92:
+#line 1006 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3161,17 +3046,15 @@
 	}
     break;
 
-  case 92:
-/* Line 1787 of yacc.c  */
-#line 1010 "asn1p_y.y"
+  case 93:
+#line 1013 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (1)].a_expr);
 	}
     break;
 
-  case 93:
-/* Line 1787 of yacc.c  */
-#line 1016 "asn1p_y.y"
+  case 94:
+#line 1019 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3179,18 +3062,16 @@
 	}
     break;
 
-  case 94:
-/* Line 1787 of yacc.c  */
-#line 1021 "asn1p_y.y"
+  case 95:
+#line 1024 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (3)].a_expr);
 		asn1p_expr_add((yyval.a_expr), (yyvsp[(3) - (3)].a_expr));
 	}
     break;
 
-  case 95:
-/* Line 1787 of yacc.c  */
-#line 1028 "asn1p_y.y"
+  case 96:
+#line 1031 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(2) - (2)].a_expr);
 		assert((yyval.a_expr)->Identifier == 0);
@@ -3198,26 +3079,23 @@
 	}
     break;
 
-  case 96:
-/* Line 1787 of yacc.c  */
-#line 1033 "asn1p_y.y"
+  case 97:
+#line 1036 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (1)].a_expr);
 	}
     break;
 
-  case 97:
-/* Line 1787 of yacc.c  */
-#line 1036 "asn1p_y.y"
+  case 98:
+#line 1039 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (1)].a_expr);
 		_fixup_anonymous_identifier((yyval.a_expr));
 	}
     break;
 
-  case 98:
-/* Line 1787 of yacc.c  */
-#line 1043 "asn1p_y.y"
+  case 99:
+#line 1046 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(3) - (5)].a_expr);
 		checkmem((yyval.a_expr));
@@ -3227,21 +3105,18 @@
 	}
     break;
 
-  case 99:
-/* Line 1787 of yacc.c  */
-#line 1053 "asn1p_y.y"
+  case 100:
+#line 1056 "asn1p_y.y"
     { (yyval.a_int) = 0; }
     break;
 
-  case 100:
-/* Line 1787 of yacc.c  */
-#line 1054 "asn1p_y.y"
+  case 101:
+#line 1057 "asn1p_y.y"
     { (yyval.a_int) = 1; }
     break;
 
-  case 101:
-/* Line 1787 of yacc.c  */
-#line 1058 "asn1p_y.y"
+  case 102:
+#line 1061 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3251,18 +3126,16 @@
 	}
     break;
 
-  case 102:
-/* Line 1787 of yacc.c  */
-#line 1065 "asn1p_y.y"
+  case 103:
+#line 1068 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (3)].a_expr);
 		asn1p_expr_add((yyval.a_expr), (yyvsp[(3) - (3)].a_expr));
 	}
     break;
 
-  case 103:
-/* Line 1787 of yacc.c  */
-#line 1075 "asn1p_y.y"
+  case 104:
+#line 1078 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3273,9 +3146,8 @@
 	}
     break;
 
-  case 104:
-/* Line 1787 of yacc.c  */
-#line 1085 "asn1p_y.y"
+  case 105:
+#line 1088 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		(yyval.a_expr)->Identifier = (yyvsp[(1) - (4)].tv_str);
@@ -3287,9 +3159,8 @@
 	}
     break;
 
-  case 105:
-/* Line 1787 of yacc.c  */
-#line 1096 "asn1p_y.y"
+  case 106:
+#line 1099 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		(yyval.a_expr)->Identifier = (yyvsp[(1) - (3)].tv_str);
@@ -3300,9 +3171,8 @@
 	}
     break;
 
-  case 106:
-/* Line 1787 of yacc.c  */
-#line 1106 "asn1p_y.y"
+  case 107:
+#line 1109 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3314,9 +3184,8 @@
 	}
     break;
 
-  case 107:
-/* Line 1787 of yacc.c  */
-#line 1117 "asn1p_y.y"
+  case 108:
+#line 1120 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		(yyval.a_expr)->Identifier = (yyvsp[(1) - (3)].tv_str);
@@ -3327,9 +3196,8 @@
 	}
     break;
 
-  case 108:
-/* Line 1787 of yacc.c  */
-#line 1127 "asn1p_y.y"
+  case 109:
+#line 1130 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3341,9 +3209,8 @@
 	}
     break;
 
-  case 109:
-/* Line 1787 of yacc.c  */
-#line 1138 "asn1p_y.y"
+  case 110:
+#line 1141 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3355,116 +3222,103 @@
 	}
     break;
 
-  case 110:
-/* Line 1787 of yacc.c  */
-#line 1150 "asn1p_y.y"
+  case 111:
+#line 1153 "asn1p_y.y"
     { (yyval.a_wsynt) = 0; }
     break;
 
-  case 111:
-/* Line 1787 of yacc.c  */
-#line 1151 "asn1p_y.y"
+  case 112:
+#line 1154 "asn1p_y.y"
     {
 		(yyval.a_wsynt) = (yyvsp[(1) - (1)].a_wsynt);
 	}
     break;
 
-  case 112:
-/* Line 1787 of yacc.c  */
-#line 1158 "asn1p_y.y"
+  case 113:
+#line 1161 "asn1p_y.y"
     { asn1p_lexer_hack_enable_with_syntax(); }
     break;
 
-  case 113:
-/* Line 1787 of yacc.c  */
-#line 1160 "asn1p_y.y"
+  case 114:
+#line 1163 "asn1p_y.y"
     {
 		(yyval.a_wsynt) = (yyvsp[(5) - (6)].a_wsynt);
 	}
     break;
 
-  case 114:
-/* Line 1787 of yacc.c  */
-#line 1166 "asn1p_y.y"
+  case 115:
+#line 1169 "asn1p_y.y"
     {
 		(yyval.a_wsynt) = asn1p_wsyntx_new();
 		TQ_ADD(&((yyval.a_wsynt)->chunks), (yyvsp[(1) - (1)].a_wchunk), next);
 	}
     break;
 
-  case 115:
-/* Line 1787 of yacc.c  */
-#line 1170 "asn1p_y.y"
+  case 116:
+#line 1173 "asn1p_y.y"
     {
 		(yyval.a_wsynt) = (yyvsp[(1) - (2)].a_wsynt);
 		TQ_ADD(&((yyval.a_wsynt)->chunks), (yyvsp[(2) - (2)].a_wchunk), next);
 	}
     break;
 
-  case 116:
-/* Line 1787 of yacc.c  */
-#line 1177 "asn1p_y.y"
+  case 117:
+#line 1180 "asn1p_y.y"
     {
 		(yyval.a_wchunk) = asn1p_wsyntx_chunk_fromstring((yyvsp[(1) - (1)].tv_opaque).buf, 0);
 		(yyval.a_wchunk)->type = WC_WHITESPACE;
 	}
     break;
 
-  case 117:
-/* Line 1787 of yacc.c  */
-#line 1181 "asn1p_y.y"
+  case 118:
+#line 1184 "asn1p_y.y"
     {
 		(yyval.a_wchunk) = asn1p_wsyntx_chunk_fromstring((yyvsp[(1) - (1)].tv_str), 0);
 	}
     break;
 
-  case 118:
-/* Line 1787 of yacc.c  */
-#line 1184 "asn1p_y.y"
+  case 119:
+#line 1187 "asn1p_y.y"
     {
 		(yyval.a_wchunk) = asn1p_wsyntx_chunk_fromstring((yyvsp[(1) - (1)].a_refcomp).name, 0);
 		(yyval.a_wchunk)->type = WC_FIELD;
 	}
     break;
 
-  case 119:
-/* Line 1787 of yacc.c  */
-#line 1188 "asn1p_y.y"
+  case 120:
+#line 1191 "asn1p_y.y"
     {
 		(yyval.a_wchunk) = asn1p_wsyntx_chunk_fromsyntax((yyvsp[(2) - (3)].a_wsynt));
 	}
     break;
 
-  case 120:
-/* Line 1787 of yacc.c  */
-#line 1194 "asn1p_y.y"
-    {
-		(yyval.a_expr) = NEW_EXPR();
-		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 121:
-/* Line 1787 of yacc.c  */
-#line 1202 "asn1p_y.y"
+#line 1197 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
 		(yyval.a_expr)->Identifier = strdup("...");
 		checkmem((yyval.a_expr)->Identifier);
-		(yyval.a_expr)->value = (yyvsp[(3) - (3)].a_value);
 		(yyval.a_expr)->expr_type = A1TC_EXTENSIBLE;
 		(yyval.a_expr)->meta_type = AMT_TYPE;
 	}
     break;
 
   case 122:
-/* Line 1787 of yacc.c  */
-#line 1211 "asn1p_y.y"
+#line 1205 "asn1p_y.y"
+    {
+		(yyval.a_expr) = NEW_EXPR();
+		checkmem((yyval.a_expr));
+		(yyval.a_expr)->Identifier = strdup("...");
+		checkmem((yyval.a_expr)->Identifier);
+		(yyval.a_expr)->value = (yyvsp[(3) - (3)].a_value);
+		(yyval.a_expr)->expr_type = A1TC_EXTENSIBLE;
+		(yyval.a_expr)->meta_type = AMT_TYPE;
+	}
+    break;
+
+  case 123:
+#line 1214 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3476,9 +3330,8 @@
 	}
     break;
 
-  case 123:
-/* Line 1787 of yacc.c  */
-#line 1223 "asn1p_y.y"
+  case 124:
+#line 1226 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(2) - (3)].a_expr);
 		(yyval.a_expr)->tag = (yyvsp[(1) - (3)].a_tag);
@@ -3502,18 +3355,16 @@
 	}
     break;
 
-  case 124:
-/* Line 1787 of yacc.c  */
-#line 1247 "asn1p_y.y"
+  case 125:
+#line 1250 "asn1p_y.y"
     {
 		(yyval.a_int) = asn1p_as_pointer ? EM_INDIRECT : 0;
 		asn1p_as_pointer = 0;
 	}
     break;
 
-  case 125:
-/* Line 1787 of yacc.c  */
-#line 1254 "asn1p_y.y"
+  case 126:
+#line 1257 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(2) - (2)].a_expr);
 		(yyval.a_expr)->marker.flags |= (yyvsp[(1) - (2)].a_int);
@@ -3532,17 +3383,15 @@
 	}
     break;
 
-  case 126:
-/* Line 1787 of yacc.c  */
-#line 1273 "asn1p_y.y"
+  case 127:
+#line 1276 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (1)].a_expr);
 	}
     break;
 
-  case 127:
-/* Line 1787 of yacc.c  */
-#line 1276 "asn1p_y.y"
+  case 128:
+#line 1279 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(3) - (4)].a_expr);
 		assert((yyval.a_expr)->expr_type == A1TC_INVALID);
@@ -3551,9 +3400,8 @@
 	}
     break;
 
-  case 128:
-/* Line 1787 of yacc.c  */
-#line 1282 "asn1p_y.y"
+  case 129:
+#line 1285 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(3) - (4)].a_expr);
 		assert((yyval.a_expr)->expr_type == A1TC_INVALID);
@@ -3562,9 +3410,8 @@
 	}
     break;
 
-  case 129:
-/* Line 1787 of yacc.c  */
-#line 1288 "asn1p_y.y"
+  case 130:
+#line 1291 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(3) - (4)].a_expr);
 		assert((yyval.a_expr)->expr_type == A1TC_INVALID);
@@ -3573,9 +3420,8 @@
 	}
     break;
 
-  case 130:
-/* Line 1787 of yacc.c  */
-#line 1294 "asn1p_y.y"
+  case 131:
+#line 1297 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3588,9 +3434,8 @@
 	}
     break;
 
-  case 131:
-/* Line 1787 of yacc.c  */
-#line 1304 "asn1p_y.y"
+  case 132:
+#line 1307 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3603,9 +3448,8 @@
 	}
     break;
 
-  case 132:
-/* Line 1787 of yacc.c  */
-#line 1314 "asn1p_y.y"
+  case 133:
+#line 1317 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3614,9 +3458,8 @@
 	}
     break;
 
-  case 133:
-/* Line 1787 of yacc.c  */
-#line 1320 "asn1p_y.y"
+  case 134:
+#line 1323 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_expr) = NEW_EXPR();
@@ -3631,9 +3474,8 @@
 	}
     break;
 
-  case 134:
-/* Line 1787 of yacc.c  */
-#line 1332 "asn1p_y.y"
+  case 135:
+#line 1335 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -3643,9 +3485,8 @@
 	}
     break;
 
-  case 135:
-/* Line 1787 of yacc.c  */
-#line 1347 "asn1p_y.y"
+  case 136:
+#line 1350 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
@@ -3656,25 +3497,8 @@
 	}
     break;
 
-  case 136:
-/* Line 1787 of yacc.c  */
-#line 1355 "asn1p_y.y"
-    {
-		int ret;
-		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
-		checkmem((yyval.a_ref));
-		ret = asn1p_ref_add_component((yyval.a_ref), (yyvsp[(1) - (3)].tv_str), RLT_UNKNOWN);
-		checkmem(ret == 0);
-		ret = asn1p_ref_add_component((yyval.a_ref), (yyvsp[(3) - (3)].tv_str), RLT_UNKNOWN);
-		checkmem(ret == 0);
-		free((yyvsp[(1) - (3)].tv_str));
-		free((yyvsp[(3) - (3)].tv_str));
-	}
-    break;
-
   case 137:
-/* Line 1787 of yacc.c  */
-#line 1366 "asn1p_y.y"
+#line 1358 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
@@ -3689,8 +3513,22 @@
     break;
 
   case 138:
-/* Line 1787 of yacc.c  */
-#line 1377 "asn1p_y.y"
+#line 1369 "asn1p_y.y"
+    {
+		int ret;
+		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
+		checkmem((yyval.a_ref));
+		ret = asn1p_ref_add_component((yyval.a_ref), (yyvsp[(1) - (3)].tv_str), RLT_UNKNOWN);
+		checkmem(ret == 0);
+		ret = asn1p_ref_add_component((yyval.a_ref), (yyvsp[(3) - (3)].tv_str), RLT_UNKNOWN);
+		checkmem(ret == 0);
+		free((yyvsp[(1) - (3)].tv_str));
+		free((yyvsp[(3) - (3)].tv_str));
+	}
+    break;
+
+  case 139:
+#line 1380 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
@@ -3704,9 +3542,8 @@
 	}
     break;
 
-  case 139:
-/* Line 1787 of yacc.c  */
-#line 1388 "asn1p_y.y"
+  case 140:
+#line 1391 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
@@ -3717,9 +3554,8 @@
 	}
     break;
 
-  case 140:
-/* Line 1787 of yacc.c  */
-#line 1396 "asn1p_y.y"
+  case 141:
+#line 1399 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_ref) = (yyvsp[(3) - (3)].a_ref);
@@ -3741,9 +3577,8 @@
 	}
     break;
 
-  case 141:
-/* Line 1787 of yacc.c  */
-#line 1418 "asn1p_y.y"
+  case 142:
+#line 1421 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
@@ -3754,9 +3589,8 @@
 	}
     break;
 
-  case 142:
-/* Line 1787 of yacc.c  */
-#line 1426 "asn1p_y.y"
+  case 143:
+#line 1429 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_ref) = (yyvsp[(1) - (3)].a_ref);
@@ -3766,27 +3600,24 @@
 	}
     break;
 
-  case 144:
-/* Line 1787 of yacc.c  */
-#line 1439 "asn1p_y.y"
+  case 145:
+#line 1442 "asn1p_y.y"
     {
 		(yyval.a_refcomp).lex_type = RLT_AmpUppercase;
 		(yyval.a_refcomp).name = (yyvsp[(1) - (1)].tv_str);
 	}
     break;
 
-  case 145:
-/* Line 1787 of yacc.c  */
-#line 1444 "asn1p_y.y"
+  case 146:
+#line 1447 "asn1p_y.y"
     {
 		(yyval.a_refcomp).lex_type = RLT_Amplowercase;
 		(yyval.a_refcomp).name = (yyvsp[(1) - (1)].tv_str);
 	}
     break;
 
-  case 146:
-/* Line 1787 of yacc.c  */
-#line 1453 "asn1p_y.y"
+  case 147:
+#line 1456 "asn1p_y.y"
     {
 		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
 		asn1p_ref_add_component((yyval.a_ref), (yyvsp[(1) - (1)].tv_str), RLT_AmpUppercase);
@@ -3794,9 +3625,8 @@
 	}
     break;
 
-  case 147:
-/* Line 1787 of yacc.c  */
-#line 1458 "asn1p_y.y"
+  case 148:
+#line 1461 "asn1p_y.y"
     {
 		(yyval.a_ref) = (yyval.a_ref);
 		asn1p_ref_add_component((yyval.a_ref), (yyvsp[(3) - (3)].tv_str), RLT_AmpUppercase);
@@ -3804,9 +3634,8 @@
 	}
     break;
 
-  case 148:
-/* Line 1787 of yacc.c  */
-#line 1463 "asn1p_y.y"
+  case 149:
+#line 1466 "asn1p_y.y"
     {
 		(yyval.a_ref) = (yyval.a_ref);
 		asn1p_ref_add_component((yyval.a_ref), (yyvsp[(3) - (3)].tv_str), RLT_Amplowercase);
@@ -3814,9 +3643,8 @@
 	}
     break;
 
-  case 149:
-/* Line 1787 of yacc.c  */
-#line 1471 "asn1p_y.y"
+  case 150:
+#line 1474 "asn1p_y.y"
     {
 		(yyval.a_ref) = asn1p_ref_new(yylineno, currentModule);
 		asn1p_ref_add_component((yyval.a_ref), (yyvsp[(1) - (1)].tv_str), RLT_CAPITALS);
@@ -3824,9 +3652,8 @@
 	}
     break;
 
-  case 150:
-/* Line 1787 of yacc.c  */
-#line 1494 "asn1p_y.y"
+  case 151:
+#line 1497 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(2) - (4)].a_expr);
 		assert((yyval.a_expr)->Identifier == NULL);
@@ -3836,9 +3663,8 @@
 	}
     break;
 
-  case 153:
-/* Line 1787 of yacc.c  */
-#line 1506 "asn1p_y.y"
+  case 154:
+#line 1509 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint(0);
 		checkmem((yyval.a_value));
@@ -3848,15 +3674,13 @@
 	}
     break;
 
-  case 154:
-/* Line 1787 of yacc.c  */
-#line 1513 "asn1p_y.y"
+  case 155:
+#line 1516 "asn1p_y.y"
     { asn1p_lexer_hack_push_opaque_state(); }
     break;
 
-  case 155:
-/* Line 1787 of yacc.c  */
-#line 1513 "asn1p_y.y"
+  case 156:
+#line 1516 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_frombuf((yyvsp[(3) - (3)].tv_opaque).buf, (yyvsp[(3) - (3)].tv_opaque).len, 0);
 		checkmem((yyval.a_value));
@@ -3864,9 +3688,8 @@
 	}
     break;
 
-  case 156:
-/* Line 1787 of yacc.c  */
-#line 1518 "asn1p_y.y"
+  case 157:
+#line 1521 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint(0);
 		checkmem((yyval.a_value));
@@ -3874,9 +3697,8 @@
 	}
     break;
 
-  case 157:
-/* Line 1787 of yacc.c  */
-#line 1526 "asn1p_y.y"
+  case 158:
+#line 1529 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint(0);
 		checkmem((yyval.a_value));
@@ -3884,9 +3706,8 @@
 	}
     break;
 
-  case 158:
-/* Line 1787 of yacc.c  */
-#line 1531 "asn1p_y.y"
+  case 159:
+#line 1534 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint(0);
 		checkmem((yyval.a_value));
@@ -3894,9 +3715,8 @@
 	}
     break;
 
-  case 159:
-/* Line 1787 of yacc.c  */
-#line 1536 "asn1p_y.y"
+  case 160:
+#line 1539 "asn1p_y.y"
     {
 		(yyval.a_value) = _convert_bitstring2binary((yyvsp[(1) - (1)].tv_str), 'B');
 		checkmem((yyval.a_value));
@@ -3904,9 +3724,8 @@
 	}
     break;
 
-  case 160:
-/* Line 1787 of yacc.c  */
-#line 1541 "asn1p_y.y"
+  case 161:
+#line 1544 "asn1p_y.y"
     {
 		(yyval.a_value) = _convert_bitstring2binary((yyvsp[(1) - (1)].tv_str), 'H');
 		checkmem((yyval.a_value));
@@ -3914,25 +3733,22 @@
 	}
     break;
 
-  case 161:
-/* Line 1787 of yacc.c  */
-#line 1546 "asn1p_y.y"
+  case 162:
+#line 1549 "asn1p_y.y"
     {
 		(yyval.a_value) = (yyval.a_value);
 	}
     break;
 
-  case 162:
-/* Line 1787 of yacc.c  */
-#line 1549 "asn1p_y.y"
+  case 163:
+#line 1552 "asn1p_y.y"
     {
 		(yyval.a_value) = (yyvsp[(1) - (1)].a_value);
 	}
     break;
 
-  case 163:
-/* Line 1787 of yacc.c  */
-#line 1555 "asn1p_y.y"
+  case 164:
+#line 1558 "asn1p_y.y"
     {
 		asn1p_ref_t *ref;
 		int ret;
@@ -3946,9 +3762,8 @@
 	}
     break;
 
-  case 164:
-/* Line 1787 of yacc.c  */
-#line 1566 "asn1p_y.y"
+  case 165:
+#line 1569 "asn1p_y.y"
     {
 		asn1p_ref_t *ref;
 		int ret;
@@ -3965,18 +3780,16 @@
 	}
     break;
 
-  case 165:
-/* Line 1787 of yacc.c  */
-#line 1584 "asn1p_y.y"
+  case 166:
+#line 1587 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_frombuf((yyvsp[(1) - (1)].tv_opaque).buf, (yyvsp[(1) - (1)].tv_opaque).len, 0);
 		checkmem((yyval.a_value));
 	}
     break;
 
-  case 166:
-/* Line 1787 of yacc.c  */
-#line 1588 "asn1p_y.y"
+  case 167:
+#line 1591 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint((yyvsp[(1) - (1)].a_int));
 		checkmem((yyval.a_value));
@@ -3984,9 +3797,8 @@
 	}
     break;
 
-  case 167:
-/* Line 1787 of yacc.c  */
-#line 1593 "asn1p_y.y"
+  case 168:
+#line 1596 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint((yyvsp[(1) - (1)].a_int));
 		checkmem((yyval.a_value));
@@ -3994,9 +3806,8 @@
 	}
     break;
 
-  case 168:
-/* Line 1787 of yacc.c  */
-#line 1601 "asn1p_y.y"
+  case 169:
+#line 1604 "asn1p_y.y"
     {
 		(yyval.tv_opaque).len = (yyvsp[(1) - (1)].tv_opaque).len + 1;
 		(yyval.tv_opaque).buf = malloc((yyval.tv_opaque).len + 1);
@@ -4008,9 +3819,8 @@
 	}
     break;
 
-  case 169:
-/* Line 1787 of yacc.c  */
-#line 1610 "asn1p_y.y"
+  case 170:
+#line 1613 "asn1p_y.y"
     {
 		int newsize = (yyvsp[(1) - (2)].tv_opaque).len + (yyvsp[(2) - (2)].tv_opaque).len;
 		char *p = malloc(newsize + 1);
@@ -4025,105 +3835,88 @@
 	}
     break;
 
-  case 170:
-/* Line 1787 of yacc.c  */
-#line 1625 "asn1p_y.y"
+  case 171:
+#line 1628 "asn1p_y.y"
     { (yyval.a_type) = ASN_BASIC_BOOLEAN; }
     break;
 
-  case 171:
-/* Line 1787 of yacc.c  */
-#line 1626 "asn1p_y.y"
+  case 172:
+#line 1629 "asn1p_y.y"
     { (yyval.a_type) = ASN_BASIC_NULL; }
     break;
 
-  case 172:
-/* Line 1787 of yacc.c  */
-#line 1627 "asn1p_y.y"
+  case 173:
+#line 1630 "asn1p_y.y"
     { (yyval.a_type) = ASN_BASIC_REAL; }
     break;
 
-  case 173:
-/* Line 1787 of yacc.c  */
-#line 1628 "asn1p_y.y"
-    { (yyval.a_type) = (yyvsp[(1) - (1)].a_type); }
-    break;
-
   case 174:
-/* Line 1787 of yacc.c  */
-#line 1629 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_OCTET_STRING; }
+#line 1631 "asn1p_y.y"
+    { (yyval.a_type) = (yyvsp[(1) - (1)].a_type); }
     break;
 
   case 175:
-/* Line 1787 of yacc.c  */
-#line 1630 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_OBJECT_IDENTIFIER; }
+#line 1632 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_OCTET_STRING; }
     break;
 
   case 176:
-/* Line 1787 of yacc.c  */
-#line 1631 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_RELATIVE_OID; }
+#line 1633 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_OBJECT_IDENTIFIER; }
     break;
 
   case 177:
-/* Line 1787 of yacc.c  */
-#line 1632 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_EXTERNAL; }
+#line 1634 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_RELATIVE_OID; }
     break;
 
   case 178:
-/* Line 1787 of yacc.c  */
-#line 1633 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_EMBEDDED_PDV; }
+#line 1635 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_EXTERNAL; }
     break;
 
   case 179:
-/* Line 1787 of yacc.c  */
-#line 1634 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_CHARACTER_STRING; }
+#line 1636 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_EMBEDDED_PDV; }
     break;
 
   case 180:
-/* Line 1787 of yacc.c  */
-#line 1635 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_UTCTime; }
+#line 1637 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_CHARACTER_STRING; }
     break;
 
   case 181:
-/* Line 1787 of yacc.c  */
-#line 1636 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_GeneralizedTime; }
+#line 1638 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_UTCTime; }
     break;
 
   case 182:
-/* Line 1787 of yacc.c  */
-#line 1637 "asn1p_y.y"
-    { (yyval.a_type) = (yyvsp[(1) - (1)].a_type); }
+#line 1639 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_GeneralizedTime; }
     break;
 
   case 183:
-/* Line 1787 of yacc.c  */
-#line 1644 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_INTEGER; }
+#line 1640 "asn1p_y.y"
+    { (yyval.a_type) = (yyvsp[(1) - (1)].a_type); }
     break;
 
   case 184:
-/* Line 1787 of yacc.c  */
-#line 1645 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_ENUMERATED; }
+#line 1647 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_INTEGER; }
     break;
 
   case 185:
-/* Line 1787 of yacc.c  */
-#line 1646 "asn1p_y.y"
-    { (yyval.a_type) = ASN_BASIC_BIT_STRING; }
+#line 1648 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_ENUMERATED; }
     break;
 
   case 186:
-/* Line 1787 of yacc.c  */
-#line 1650 "asn1p_y.y"
+#line 1649 "asn1p_y.y"
+    { (yyval.a_type) = ASN_BASIC_BIT_STRING; }
+    break;
+
+  case 187:
+#line 1653 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -4132,9 +3925,8 @@
 	}
     break;
 
-  case 187:
-/* Line 1787 of yacc.c  */
-#line 1656 "asn1p_y.y"
+  case 188:
+#line 1659 "asn1p_y.y"
     {
 		if((yyvsp[(2) - (2)].a_expr)) {
 			(yyval.a_expr) = (yyvsp[(2) - (2)].a_expr);
@@ -4147,127 +3939,109 @@
 	}
     break;
 
-  case 188:
-/* Line 1787 of yacc.c  */
-#line 1669 "asn1p_y.y"
+  case 189:
+#line 1672 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_BMPString; }
     break;
 
-  case 189:
-/* Line 1787 of yacc.c  */
-#line 1670 "asn1p_y.y"
+  case 190:
+#line 1673 "asn1p_y.y"
     {
 		(yyval.a_type) = ASN_STRING_GeneralString;
 		fprintf(stderr, "WARNING: GeneralString is not fully supported\n");
 	}
     break;
 
-  case 190:
-/* Line 1787 of yacc.c  */
-#line 1674 "asn1p_y.y"
+  case 191:
+#line 1677 "asn1p_y.y"
     {
 		(yyval.a_type) = ASN_STRING_GraphicString;
 		fprintf(stderr, "WARNING: GraphicString is not fully supported\n");
 	}
     break;
 
-  case 191:
-/* Line 1787 of yacc.c  */
-#line 1678 "asn1p_y.y"
+  case 192:
+#line 1681 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_IA5String; }
     break;
 
-  case 192:
-/* Line 1787 of yacc.c  */
-#line 1679 "asn1p_y.y"
+  case 193:
+#line 1682 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_ISO646String; }
     break;
 
-  case 193:
-/* Line 1787 of yacc.c  */
-#line 1680 "asn1p_y.y"
+  case 194:
+#line 1683 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_NumericString; }
     break;
 
-  case 194:
-/* Line 1787 of yacc.c  */
-#line 1681 "asn1p_y.y"
+  case 195:
+#line 1684 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_PrintableString; }
     break;
 
-  case 195:
-/* Line 1787 of yacc.c  */
-#line 1682 "asn1p_y.y"
+  case 196:
+#line 1685 "asn1p_y.y"
     {
 		(yyval.a_type) = ASN_STRING_T61String;
 		fprintf(stderr, "WARNING: T61String is not fully supported\n");
 	}
     break;
 
-  case 196:
-/* Line 1787 of yacc.c  */
-#line 1686 "asn1p_y.y"
+  case 197:
+#line 1689 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_TeletexString; }
     break;
 
-  case 197:
-/* Line 1787 of yacc.c  */
-#line 1687 "asn1p_y.y"
+  case 198:
+#line 1690 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_UniversalString; }
     break;
 
-  case 198:
-/* Line 1787 of yacc.c  */
-#line 1688 "asn1p_y.y"
+  case 199:
+#line 1691 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_UTF8String; }
     break;
 
-  case 199:
-/* Line 1787 of yacc.c  */
-#line 1689 "asn1p_y.y"
+  case 200:
+#line 1692 "asn1p_y.y"
     {
 		(yyval.a_type) = ASN_STRING_VideotexString;
 		fprintf(stderr, "WARNING: VideotexString is not fully supported\n");
 	}
     break;
 
-  case 200:
-/* Line 1787 of yacc.c  */
-#line 1693 "asn1p_y.y"
+  case 201:
+#line 1696 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_VisibleString; }
     break;
 
-  case 201:
-/* Line 1787 of yacc.c  */
-#line 1694 "asn1p_y.y"
+  case 202:
+#line 1697 "asn1p_y.y"
     { (yyval.a_type) = ASN_STRING_ObjectDescriptor; }
     break;
 
-  case 206:
-/* Line 1787 of yacc.c  */
-#line 1705 "asn1p_y.y"
+  case 207:
+#line 1708 "asn1p_y.y"
     { (yyval.a_constr) = 0; }
     break;
 
-  case 207:
-/* Line 1787 of yacc.c  */
-#line 1706 "asn1p_y.y"
+  case 208:
+#line 1709 "asn1p_y.y"
     {
 		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
 	}
     break;
 
-  case 209:
-/* Line 1787 of yacc.c  */
-#line 1716 "asn1p_y.y"
+  case 210:
+#line 1719 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CA_SET, (yyvsp[(1) - (1)].a_constr), 0);
 	}
     break;
 
-  case 210:
-/* Line 1787 of yacc.c  */
-#line 1719 "asn1p_y.y"
+  case 211:
+#line 1722 "asn1p_y.y"
     {
 		/*
 		 * This is a special case, for compatibility purposes.
@@ -4277,32 +4051,21 @@
 	}
     break;
 
-  case 211:
-/* Line 1787 of yacc.c  */
-#line 1729 "asn1p_y.y"
+  case 212:
+#line 1732 "asn1p_y.y"
     {
 		(yyval.a_constr) = (yyvsp[(2) - (3)].a_constr);
 	}
     break;
 
-  case 212:
-/* Line 1787 of yacc.c  */
-#line 1732 "asn1p_y.y"
+  case 213:
+#line 1735 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CA_SET, (yyvsp[(1) - (4)].a_constr), (yyvsp[(3) - (4)].a_constr));
 	}
     break;
 
-  case 213:
-/* Line 1787 of yacc.c  */
-#line 1738 "asn1p_y.y"
-    {
-		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
-	}
-    break;
-
   case 214:
-/* Line 1787 of yacc.c  */
 #line 1741 "asn1p_y.y"
     {
 		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
@@ -4310,25 +4073,29 @@
     break;
 
   case 215:
-/* Line 1787 of yacc.c  */
-#line 1747 "asn1p_y.y"
+#line 1744 "asn1p_y.y"
+    {
+		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
+	}
+    break;
+
+  case 216:
+#line 1750 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		(yyval.a_constr)->type = ACT_EL_EXT;
 	}
     break;
 
-  case 216:
-/* Line 1787 of yacc.c  */
-#line 1751 "asn1p_y.y"
+  case 217:
+#line 1754 "asn1p_y.y"
     {
 		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
 	}
     break;
 
-  case 217:
-/* Line 1787 of yacc.c  */
-#line 1754 "asn1p_y.y"
+  case 218:
+#line 1757 "asn1p_y.y"
     {
 		asn1p_constraint_t *ct;
 		ct = asn1p_constraint_new(yylineno, currentModule);
@@ -4337,9 +4104,8 @@
 	}
     break;
 
-  case 218:
-/* Line 1787 of yacc.c  */
-#line 1760 "asn1p_y.y"
+  case 219:
+#line 1763 "asn1p_y.y"
     {
 		asn1p_constraint_t *ct;
 		ct = asn1p_constraint_new(yylineno, currentModule);
@@ -4350,41 +4116,36 @@
 	}
     break;
 
-  case 220:
-/* Line 1787 of yacc.c  */
-#line 1772 "asn1p_y.y"
+  case 221:
+#line 1775 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CA_AEX, (yyvsp[(3) - (3)].a_constr), 0);
 	}
     break;
 
-  case 222:
-/* Line 1787 of yacc.c  */
-#line 1779 "asn1p_y.y"
+  case 223:
+#line 1782 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CA_UNI, (yyvsp[(1) - (3)].a_constr), (yyvsp[(3) - (3)].a_constr));
 	}
     break;
 
-  case 224:
-/* Line 1787 of yacc.c  */
-#line 1786 "asn1p_y.y"
+  case 225:
+#line 1789 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CA_INT, (yyvsp[(1) - (3)].a_constr), (yyvsp[(3) - (3)].a_constr));
 	}
     break;
 
-  case 226:
-/* Line 1787 of yacc.c  */
-#line 1794 "asn1p_y.y"
+  case 227:
+#line 1797 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CA_EXC, (yyvsp[(1) - (3)].a_constr), (yyvsp[(3) - (3)].a_constr));
 	}
     break;
 
-  case 227:
-/* Line 1787 of yacc.c  */
-#line 1800 "asn1p_y.y"
+  case 228:
+#line 1803 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
@@ -4395,9 +4156,8 @@
 	}
     break;
 
-  case 228:
-/* Line 1787 of yacc.c  */
-#line 1808 "asn1p_y.y"
+  case 229:
+#line 1811 "asn1p_y.y"
     {
 		int ret;
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
@@ -4408,9 +4168,8 @@
 	}
     break;
 
-  case 229:
-/* Line 1787 of yacc.c  */
-#line 1816 "asn1p_y.y"
+  case 230:
+#line 1819 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4419,9 +4178,8 @@
 	}
     break;
 
-  case 230:
-/* Line 1787 of yacc.c  */
-#line 1822 "asn1p_y.y"
+  case 231:
+#line 1825 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4430,9 +4188,8 @@
 	}
     break;
 
-  case 231:
-/* Line 1787 of yacc.c  */
-#line 1828 "asn1p_y.y"
+  case 232:
+#line 1831 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4442,22 +4199,20 @@
 	}
     break;
 
-  case 232:
-/* Line 1787 of yacc.c  */
-#line 1835 "asn1p_y.y"
-    {
-		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
-		checkmem((yyval.a_constr));
-		(yyval.a_constr)->type = (yyvsp[(2) - (3)].a_ctype);
-		(yyval.a_constr)->range_start = asn1p_value_fromint(-123);
-		(yyval.a_constr)->range_stop = (yyvsp[(3) - (3)].a_value);
-		(yyval.a_constr)->range_start->type = ATV_MIN;
-	}
-    break;
-
   case 233:
-/* Line 1787 of yacc.c  */
-#line 1843 "asn1p_y.y"
+#line 1838 "asn1p_y.y"
+    {
+		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
+		checkmem((yyval.a_constr));
+		(yyval.a_constr)->type = (yyvsp[(2) - (3)].a_ctype);
+		(yyval.a_constr)->range_start = asn1p_value_fromint(-123);
+		(yyval.a_constr)->range_stop = (yyvsp[(3) - (3)].a_value);
+		(yyval.a_constr)->range_start->type = ATV_MIN;
+	}
+    break;
+
+  case 234:
+#line 1846 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4468,30 +4223,20 @@
 	}
     break;
 
-  case 234:
-/* Line 1787 of yacc.c  */
-#line 1851 "asn1p_y.y"
-    {
-		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
-		checkmem((yyval.a_constr));
-		(yyval.a_constr)->type = (yyvsp[(2) - (3)].a_ctype);
-		(yyval.a_constr)->range_start = asn1p_value_fromint(-123);
-		(yyval.a_constr)->range_stop = asn1p_value_fromint(321);
-		(yyval.a_constr)->range_start->type = ATV_MIN;
-		(yyval.a_constr)->range_stop->type = ATV_MAX;
-	}
-    break;
-
   case 235:
-/* Line 1787 of yacc.c  */
-#line 1860 "asn1p_y.y"
+#line 1854 "asn1p_y.y"
     {
-		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
+		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
+		checkmem((yyval.a_constr));
+		(yyval.a_constr)->type = (yyvsp[(2) - (3)].a_ctype);
+		(yyval.a_constr)->range_start = asn1p_value_fromint(-123);
+		(yyval.a_constr)->range_stop = asn1p_value_fromint(321);
+		(yyval.a_constr)->range_start->type = ATV_MIN;
+		(yyval.a_constr)->range_stop->type = ATV_MAX;
 	}
     break;
 
   case 236:
-/* Line 1787 of yacc.c  */
 #line 1863 "asn1p_y.y"
     {
 		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
@@ -4499,14 +4244,19 @@
     break;
 
   case 237:
-/* Line 1787 of yacc.c  */
 #line 1866 "asn1p_y.y"
-    { asn1p_lexer_hack_push_opaque_state(); }
+    {
+		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
+	}
     break;
 
   case 238:
-/* Line 1787 of yacc.c  */
-#line 1866 "asn1p_y.y"
+#line 1869 "asn1p_y.y"
+    { asn1p_lexer_hack_push_opaque_state(); }
+    break;
+
+  case 239:
+#line 1869 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4516,9 +4266,8 @@
 	}
     break;
 
-  case 239:
-/* Line 1787 of yacc.c  */
-#line 1876 "asn1p_y.y"
+  case 240:
+#line 1879 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		(yyval.a_constr)->type = ACT_CT_PATTERN;
@@ -4526,9 +4275,8 @@
 	}
     break;
 
-  case 240:
-/* Line 1787 of yacc.c  */
-#line 1881 "asn1p_y.y"
+  case 241:
+#line 1884 "asn1p_y.y"
     {
 		asn1p_ref_t *ref;
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
@@ -4540,25 +4288,22 @@
 	}
     break;
 
-  case 241:
-/* Line 1787 of yacc.c  */
-#line 1893 "asn1p_y.y"
+  case 242:
+#line 1896 "asn1p_y.y"
     {
 		(yyval.a_ctype) = ACT_CT_SIZE;
 	}
     break;
 
-  case 242:
-/* Line 1787 of yacc.c  */
-#line 1896 "asn1p_y.y"
+  case 243:
+#line 1899 "asn1p_y.y"
     {
 		(yyval.a_ctype) = ACT_CT_FROM;
 	}
     break;
 
-  case 243:
-/* Line 1787 of yacc.c  */
-#line 1902 "asn1p_y.y"
+  case 244:
+#line 1905 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint(0);
 		checkmem((yyval.a_value));
@@ -4566,9 +4311,8 @@
 	}
     break;
 
-  case 244:
-/* Line 1787 of yacc.c  */
-#line 1907 "asn1p_y.y"
+  case 245:
+#line 1910 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint(1);
 		checkmem((yyval.a_value));
@@ -4576,9 +4320,8 @@
 	}
     break;
 
-  case 248:
-/* Line 1787 of yacc.c  */
-#line 1915 "asn1p_y.y"
+  case 249:
+#line 1918 "asn1p_y.y"
     {
 		asn1p_ref_t *ref;
 		int ret;
@@ -4592,9 +4335,8 @@
 	}
     break;
 
-  case 249:
-/* Line 1787 of yacc.c  */
-#line 1929 "asn1p_y.y"
+  case 250:
+#line 1932 "asn1p_y.y"
     {
 		(yyval.a_value) = _convert_bitstring2binary((yyvsp[(1) - (1)].tv_str), 'B');
 		checkmem((yyval.a_value));
@@ -4602,9 +4344,8 @@
 	}
     break;
 
-  case 250:
-/* Line 1787 of yacc.c  */
-#line 1934 "asn1p_y.y"
+  case 251:
+#line 1937 "asn1p_y.y"
     {
 		(yyval.a_value) = _convert_bitstring2binary((yyvsp[(1) - (1)].tv_str), 'H');
 		checkmem((yyval.a_value));
@@ -4612,50 +4353,44 @@
 	}
     break;
 
-  case 251:
-/* Line 1787 of yacc.c  */
-#line 1942 "asn1p_y.y"
+  case 252:
+#line 1945 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromref((yyvsp[(1) - (1)].a_ref), 0);
 		checkmem((yyval.a_value));
 	}
     break;
 
-  case 252:
-/* Line 1787 of yacc.c  */
-#line 1962 "asn1p_y.y"
+  case 253:
+#line 1965 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CT_WCOMP, (yyvsp[(3) - (3)].a_constr), 0);
 	}
     break;
 
-  case 253:
-/* Line 1787 of yacc.c  */
-#line 1965 "asn1p_y.y"
+  case 254:
+#line 1968 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CT_WCOMPS, (yyvsp[(4) - (5)].a_constr), 0);
 	}
     break;
 
-  case 254:
-/* Line 1787 of yacc.c  */
-#line 1971 "asn1p_y.y"
+  case 255:
+#line 1974 "asn1p_y.y"
     {
 		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
 	}
     break;
 
-  case 255:
-/* Line 1787 of yacc.c  */
-#line 1974 "asn1p_y.y"
+  case 256:
+#line 1977 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CT_WCOMPS, (yyvsp[(1) - (3)].a_constr), (yyvsp[(3) - (3)].a_constr));
 	}
     break;
 
-  case 256:
-/* Line 1787 of yacc.c  */
-#line 1980 "asn1p_y.y"
+  case 257:
+#line 1983 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4664,9 +4399,8 @@
 	}
     break;
 
-  case 257:
-/* Line 1787 of yacc.c  */
-#line 1986 "asn1p_y.y"
+  case 258:
+#line 1989 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4677,51 +4411,44 @@
 	}
     break;
 
-  case 258:
-/* Line 1787 of yacc.c  */
-#line 2000 "asn1p_y.y"
+  case 259:
+#line 2003 "asn1p_y.y"
     { (yyval.a_pres) = ACPRES_DEFAULT; }
     break;
 
-  case 259:
-/* Line 1787 of yacc.c  */
-#line 2001 "asn1p_y.y"
+  case 260:
+#line 2004 "asn1p_y.y"
     { (yyval.a_pres) = (yyvsp[(1) - (1)].a_pres); }
     break;
 
-  case 260:
-/* Line 1787 of yacc.c  */
-#line 2005 "asn1p_y.y"
+  case 261:
+#line 2008 "asn1p_y.y"
     {
 		(yyval.a_pres) = ACPRES_PRESENT;
 	}
     break;
 
-  case 261:
-/* Line 1787 of yacc.c  */
-#line 2008 "asn1p_y.y"
+  case 262:
+#line 2011 "asn1p_y.y"
     {
 		(yyval.a_pres) = ACPRES_ABSENT;
 	}
     break;
 
-  case 262:
-/* Line 1787 of yacc.c  */
-#line 2011 "asn1p_y.y"
+  case 263:
+#line 2014 "asn1p_y.y"
     {
 		(yyval.a_pres) = ACPRES_OPTIONAL;
 	}
     break;
 
-  case 266:
-/* Line 1787 of yacc.c  */
-#line 2026 "asn1p_y.y"
+  case 267:
+#line 2029 "asn1p_y.y"
     { asn1p_lexer_hack_push_opaque_state(); }
     break;
 
-  case 267:
-/* Line 1787 of yacc.c  */
-#line 2026 "asn1p_y.y"
+  case 268:
+#line 2029 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4732,9 +4459,8 @@
 	}
     break;
 
-  case 268:
-/* Line 1787 of yacc.c  */
-#line 2037 "asn1p_y.y"
+  case 269:
+#line 2040 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		(yyval.a_constr)->type = ACT_CT_CTNG;
@@ -4743,40 +4469,27 @@
 	}
     break;
 
-  case 269:
-/* Line 1787 of yacc.c  */
-#line 2046 "asn1p_y.y"
+  case 270:
+#line 2049 "asn1p_y.y"
     { (yyval.a_ctype) = ACT_EL_RANGE; }
     break;
 
-  case 270:
-/* Line 1787 of yacc.c  */
-#line 2047 "asn1p_y.y"
+  case 271:
+#line 2050 "asn1p_y.y"
     { (yyval.a_ctype) = ACT_EL_RLRANGE; }
     break;
 
-  case 271:
-/* Line 1787 of yacc.c  */
-#line 2048 "asn1p_y.y"
+  case 272:
+#line 2051 "asn1p_y.y"
     { (yyval.a_ctype) = ACT_EL_LLRANGE; }
     break;
 
-  case 272:
-/* Line 1787 of yacc.c  */
-#line 2049 "asn1p_y.y"
+  case 273:
+#line 2052 "asn1p_y.y"
     { (yyval.a_ctype) = ACT_EL_ULRANGE; }
     break;
 
-  case 273:
-/* Line 1787 of yacc.c  */
-#line 2052 "asn1p_y.y"
-    {
-		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
-	}
-    break;
-
   case 274:
-/* Line 1787 of yacc.c  */
 #line 2055 "asn1p_y.y"
     {
 		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
@@ -4784,8 +4497,14 @@
     break;
 
   case 275:
-/* Line 1787 of yacc.c  */
-#line 2064 "asn1p_y.y"
+#line 2058 "asn1p_y.y"
+    {
+		(yyval.a_constr) = (yyvsp[(1) - (1)].a_constr);
+	}
+    break;
+
+  case 276:
+#line 2067 "asn1p_y.y"
     {
 		asn1p_ref_t *ref = asn1p_ref_new(yylineno, currentModule);
 		asn1p_constraint_t *ct;
@@ -4801,17 +4520,15 @@
 	}
     break;
 
-  case 276:
-/* Line 1787 of yacc.c  */
-#line 2080 "asn1p_y.y"
+  case 277:
+#line 2083 "asn1p_y.y"
     {
 		CONSTRAINT_INSERT((yyval.a_constr), ACT_CA_CRC, (yyvsp[(1) - (4)].a_constr), (yyvsp[(3) - (4)].a_constr));
 	}
     break;
 
-  case 277:
-/* Line 1787 of yacc.c  */
-#line 2086 "asn1p_y.y"
+  case 278:
+#line 2089 "asn1p_y.y"
     {
 		(yyval.a_constr) = asn1p_constraint_new(yylineno, currentModule);
 		checkmem((yyval.a_constr));
@@ -4820,9 +4537,8 @@
 	}
     break;
 
-  case 278:
-/* Line 1787 of yacc.c  */
-#line 2092 "asn1p_y.y"
+  case 279:
+#line 2095 "asn1p_y.y"
     {
 		asn1p_constraint_t *ct;
 		ct = asn1p_constraint_new(yylineno, currentModule);
@@ -4833,9 +4549,8 @@
 	}
     break;
 
-  case 279:
-/* Line 1787 of yacc.c  */
-#line 2106 "asn1p_y.y"
+  case 280:
+#line 2109 "asn1p_y.y"
     {
 		char *p = malloc(strlen((yyvsp[(2) - (2)].tv_str)) + 2);
 		int ret;
@@ -4849,9 +4564,8 @@
 	}
     break;
 
-  case 280:
-/* Line 1787 of yacc.c  */
-#line 2117 "asn1p_y.y"
+  case 281:
+#line 2120 "asn1p_y.y"
     {
 		char *p = malloc(strlen((yyvsp[(3) - (3)].tv_str)) + 3);
 		int ret;
@@ -4866,17 +4580,15 @@
 	}
     break;
 
-  case 281:
-/* Line 1787 of yacc.c  */
-#line 2133 "asn1p_y.y"
+  case 282:
+#line 2136 "asn1p_y.y"
     {
 		(yyval.tv_str) = (yyvsp[(1) - (1)].tv_str);
 	}
     break;
 
-  case 282:
-/* Line 1787 of yacc.c  */
-#line 2136 "asn1p_y.y"
+  case 283:
+#line 2139 "asn1p_y.y"
     {
 		int l1 = strlen((yyvsp[(1) - (3)].tv_str));
 		int l3 = strlen((yyvsp[(3) - (3)].tv_str));
@@ -4890,59 +4602,52 @@
 	}
     break;
 
-  case 283:
-/* Line 1787 of yacc.c  */
-#line 2156 "asn1p_y.y"
+  case 284:
+#line 2159 "asn1p_y.y"
     {
 		(yyval.a_marker).flags = EM_NOMARK;
 		(yyval.a_marker).default_value = 0;
 	}
     break;
 
-  case 284:
-/* Line 1787 of yacc.c  */
-#line 2160 "asn1p_y.y"
+  case 285:
+#line 2163 "asn1p_y.y"
     { (yyval.a_marker) = (yyvsp[(1) - (1)].a_marker); }
     break;
 
-  case 285:
-/* Line 1787 of yacc.c  */
-#line 2164 "asn1p_y.y"
+  case 286:
+#line 2167 "asn1p_y.y"
     {
 		(yyval.a_marker).flags = EM_OPTIONAL | EM_INDIRECT;
 		(yyval.a_marker).default_value = 0;
 	}
     break;
 
-  case 286:
-/* Line 1787 of yacc.c  */
-#line 2168 "asn1p_y.y"
+  case 287:
+#line 2171 "asn1p_y.y"
     {
 		(yyval.a_marker).flags = EM_DEFAULT;
 		(yyval.a_marker).default_value = (yyvsp[(2) - (2)].a_value);
 	}
     break;
 
-  case 287:
-/* Line 1787 of yacc.c  */
-#line 2191 "asn1p_y.y"
+  case 288:
+#line 2194 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
 	}
     break;
 
-  case 288:
-/* Line 1787 of yacc.c  */
-#line 2195 "asn1p_y.y"
+  case 289:
+#line 2198 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(2) - (3)].a_expr);
 	}
     break;
 
-  case 289:
-/* Line 1787 of yacc.c  */
-#line 2201 "asn1p_y.y"
+  case 290:
+#line 2204 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -4950,18 +4655,16 @@
 	}
     break;
 
-  case 290:
-/* Line 1787 of yacc.c  */
-#line 2206 "asn1p_y.y"
+  case 291:
+#line 2209 "asn1p_y.y"
     {
 		(yyval.a_expr) = (yyvsp[(1) - (3)].a_expr);
 		asn1p_expr_add((yyval.a_expr), (yyvsp[(3) - (3)].a_expr));
 	}
     break;
 
-  case 291:
-/* Line 1787 of yacc.c  */
-#line 2213 "asn1p_y.y"
+  case 292:
+#line 2216 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -4971,22 +4674,8 @@
 	}
     break;
 
-  case 292:
-/* Line 1787 of yacc.c  */
-#line 2220 "asn1p_y.y"
-    {
-		(yyval.a_expr) = NEW_EXPR();
-		checkmem((yyval.a_expr));
-		(yyval.a_expr)->expr_type = A1TC_UNIVERVAL;
-		(yyval.a_expr)->meta_type = AMT_VALUE;
-		(yyval.a_expr)->Identifier = (yyvsp[(1) - (4)].tv_str);
-		(yyval.a_expr)->value = (yyvsp[(3) - (4)].a_value);
-	}
-    break;
-
   case 293:
-/* Line 1787 of yacc.c  */
-#line 2228 "asn1p_y.y"
+#line 2223 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -4998,8 +4687,19 @@
     break;
 
   case 294:
-/* Line 1787 of yacc.c  */
-#line 2236 "asn1p_y.y"
+#line 2231 "asn1p_y.y"
+    {
+		(yyval.a_expr) = NEW_EXPR();
+		checkmem((yyval.a_expr));
+		(yyval.a_expr)->expr_type = A1TC_UNIVERVAL;
+		(yyval.a_expr)->meta_type = AMT_VALUE;
+		(yyval.a_expr)->Identifier = (yyvsp[(1) - (4)].tv_str);
+		(yyval.a_expr)->value = (yyvsp[(3) - (4)].a_value);
+	}
+    break;
+
+  case 295:
+#line 2239 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -5009,9 +4709,8 @@
 	}
     break;
 
-  case 295:
-/* Line 1787 of yacc.c  */
-#line 2243 "asn1p_y.y"
+  case 296:
+#line 2246 "asn1p_y.y"
     {
 		(yyval.a_expr) = NEW_EXPR();
 		checkmem((yyval.a_expr));
@@ -5022,117 +4721,93 @@
 	}
     break;
 
-  case 296:
-/* Line 1787 of yacc.c  */
-#line 2254 "asn1p_y.y"
-    {
-		(yyval.a_value) = asn1p_value_fromint((yyvsp[(1) - (1)].a_int));
-		checkmem((yyval.a_value));
-	}
-    break;
-
   case 297:
-/* Line 1787 of yacc.c  */
-#line 2258 "asn1p_y.y"
+#line 2257 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromint((yyvsp[(1) - (1)].a_int));
 		checkmem((yyval.a_value));
 	}
     break;
 
-  case 299:
-/* Line 1787 of yacc.c  */
-#line 2266 "asn1p_y.y"
+  case 298:
+#line 2261 "asn1p_y.y"
+    {
+		(yyval.a_value) = asn1p_value_fromint((yyvsp[(1) - (1)].a_int));
+		checkmem((yyval.a_value));
+	}
+    break;
+
+  case 300:
+#line 2269 "asn1p_y.y"
     {
 		(yyval.a_value) = asn1p_value_fromdouble((yyvsp[(1) - (1)].a_dbl));
 		checkmem((yyval.a_value));
 	}
     break;
 
-  case 300:
-/* Line 1787 of yacc.c  */
-#line 2297 "asn1p_y.y"
+  case 301:
+#line 2300 "asn1p_y.y"
     { memset(&(yyval.a_tag), 0, sizeof((yyval.a_tag))); }
     break;
 
-  case 301:
-/* Line 1787 of yacc.c  */
-#line 2298 "asn1p_y.y"
+  case 302:
+#line 2301 "asn1p_y.y"
     { (yyval.a_tag) = (yyvsp[(1) - (1)].a_tag); }
     break;
 
-  case 302:
-/* Line 1787 of yacc.c  */
-#line 2302 "asn1p_y.y"
+  case 303:
+#line 2305 "asn1p_y.y"
     {
 		(yyval.a_tag) = (yyvsp[(1) - (2)].a_tag);
 		(yyval.a_tag).tag_mode = (yyvsp[(2) - (2)].a_tag).tag_mode;
 	}
     break;
 
-  case 303:
-/* Line 1787 of yacc.c  */
-#line 2309 "asn1p_y.y"
+  case 304:
+#line 2312 "asn1p_y.y"
     {
 		(yyval.a_tag) = (yyvsp[(2) - (4)].a_tag);
 		(yyval.a_tag).tag_value = (yyvsp[(3) - (4)].a_int);
 	}
     break;
 
-  case 304:
-/* Line 1787 of yacc.c  */
-#line 2315 "asn1p_y.y"
+  case 305:
+#line 2318 "asn1p_y.y"
     { (yyval.a_tag).tag_class = TC_CONTEXT_SPECIFIC; }
     break;
 
-  case 305:
-/* Line 1787 of yacc.c  */
-#line 2316 "asn1p_y.y"
+  case 306:
+#line 2319 "asn1p_y.y"
     { (yyval.a_tag).tag_class = TC_UNIVERSAL; }
     break;
 
-  case 306:
-/* Line 1787 of yacc.c  */
-#line 2317 "asn1p_y.y"
+  case 307:
+#line 2320 "asn1p_y.y"
     { (yyval.a_tag).tag_class = TC_APPLICATION; }
     break;
 
-  case 307:
-/* Line 1787 of yacc.c  */
-#line 2318 "asn1p_y.y"
+  case 308:
+#line 2321 "asn1p_y.y"
     { (yyval.a_tag).tag_class = TC_PRIVATE; }
     break;
 
-  case 308:
-/* Line 1787 of yacc.c  */
-#line 2322 "asn1p_y.y"
+  case 309:
+#line 2325 "asn1p_y.y"
     { (yyval.a_tag).tag_mode = TM_DEFAULT; }
     break;
 
-  case 309:
-/* Line 1787 of yacc.c  */
-#line 2323 "asn1p_y.y"
+  case 310:
+#line 2326 "asn1p_y.y"
     { (yyval.a_tag).tag_mode = TM_IMPLICIT; }
     break;
 
-  case 310:
-/* Line 1787 of yacc.c  */
-#line 2324 "asn1p_y.y"
+  case 311:
+#line 2327 "asn1p_y.y"
     { (yyval.a_tag).tag_mode = TM_EXPLICIT; }
     break;
 
-  case 311:
-/* Line 1787 of yacc.c  */
-#line 2328 "asn1p_y.y"
-    {
-		checkmem((yyvsp[(1) - (1)].tv_str));
-		(yyval.tv_str) = (yyvsp[(1) - (1)].tv_str);
-	}
-    break;
-
   case 312:
-/* Line 1787 of yacc.c  */
-#line 2332 "asn1p_y.y"
+#line 2331 "asn1p_y.y"
     {
 		checkmem((yyvsp[(1) - (1)].tv_str));
 		(yyval.tv_str) = (yyvsp[(1) - (1)].tv_str);
@@ -5140,8 +4815,7 @@
     break;
 
   case 313:
-/* Line 1787 of yacc.c  */
-#line 2340 "asn1p_y.y"
+#line 2335 "asn1p_y.y"
     {
 		checkmem((yyvsp[(1) - (1)].tv_str));
 		(yyval.tv_str) = (yyvsp[(1) - (1)].tv_str);
@@ -5149,22 +4823,27 @@
     break;
 
   case 314:
-/* Line 1787 of yacc.c  */
-#line 2347 "asn1p_y.y"
-    { (yyval.tv_str) = 0; }
+#line 2343 "asn1p_y.y"
+    {
+		checkmem((yyvsp[(1) - (1)].tv_str));
+		(yyval.tv_str) = (yyvsp[(1) - (1)].tv_str);
+	}
     break;
 
   case 315:
-/* Line 1787 of yacc.c  */
-#line 2348 "asn1p_y.y"
+#line 2350 "asn1p_y.y"
+    { (yyval.tv_str) = 0; }
+    break;
+
+  case 316:
+#line 2351 "asn1p_y.y"
     {
 		(yyval.tv_str) = (yyvsp[(1) - (1)].tv_str);
 	}
     break;
 
-  case 316:
-/* Line 1787 of yacc.c  */
-#line 2354 "asn1p_y.y"
+  case 317:
+#line 2357 "asn1p_y.y"
     {
 		checkmem((yyvsp[(1) - (1)].tv_str));
 		(yyval.tv_str) = (yyvsp[(1) - (1)].tv_str);
@@ -5172,21 +4851,10 @@
     break;
 
 
-/* Line 1787 of yacc.c  */
-#line 5169 "asn1p_y.y"
+/* Line 1267 of yacc.c.  */
+#line 4856 "asn1p_y.c"
       default: break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -5195,6 +4863,7 @@
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -5214,10 +4883,6 @@
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -5225,36 +4890,37 @@
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -5262,7 +4928,7 @@
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -5279,7 +4945,7 @@
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -5313,7 +4979,7 @@
   for (;;)
     {
       yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
+      if (yyn != YYPACT_NINF)
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -5336,9 +5002,10 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -5362,7 +5029,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -5373,14 +5040,9 @@
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -5404,8 +5066,7 @@
 }
 
 
-/* Line 2050 of yacc.c  */
-#line 2360 "asn1p_y.y"
+#line 2363 "asn1p_y.y"
 
 
 
@@ -5555,3 +5216,4 @@
 	return -1;
 }
 
+