aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2002-05-11 20:00:54 +0000
committerDaniel Jacobowitz <drow@false.org>2002-05-11 20:00:54 +0000
commite202cab970dbb29d3ddaba585e8aa2750fa09964 (patch)
tree433ee3a329459c0978938f69a37a6fadc8b7afe4
parent60d46bdbee0479168ccd85274cbf040b78176920 (diff)
downloadgdb-e202cab970dbb29d3ddaba585e8aa2750fa09964.zip
gdb-e202cab970dbb29d3ddaba585e8aa2750fa09964.tar.gz
gdb-e202cab970dbb29d3ddaba585e8aa2750fa09964.tar.bz2
Update generated files.
Diffstat
-rw-r--r--bfd/doc/archures.texi8
-rw-r--r--bfd/doc/libbfd.texi2
-rw-r--r--bfd/doc/reloc.texi98
-rw-r--r--binutils/arparse.c185
-rw-r--r--binutils/arparse.h1
-rw-r--r--binutils/doc/binutils.info62
-rw-r--r--binutils/doc/binutils.info-14
-rw-r--r--binutils/doc/binutils.info-22
-rw-r--r--binutils/doc/binutils.info-32
-rw-r--r--binutils/rclex.c18
-rw-r--r--binutils/rcparse.c2032
-rw-r--r--binutils/rcparse.h1
-rw-r--r--gas/doc/as.info808
-rw-r--r--gas/doc/as.info-14
-rw-r--r--gas/doc/as.info-102
-rw-r--r--gas/doc/as.info-22
-rw-r--r--gas/doc/as.info-32
-rw-r--r--gas/doc/as.info-42
-rw-r--r--gas/doc/as.info-52
-rw-r--r--gas/doc/as.info-62
-rw-r--r--gas/doc/as.info-72
-rw-r--r--gas/doc/as.info-82
-rw-r--r--gas/doc/as.info-92
-rw-r--r--gas/doc/gasver.texi2
-rw-r--r--ld/ld.12
-rw-r--r--ld/ld.info148
-rw-r--r--ld/ld.info-16
-rw-r--r--ld/ld.info-24
-rw-r--r--ld/ld.info-36
-rw-r--r--ld/ld.info-44
-rw-r--r--ld/ld.info-54
-rw-r--r--ld/ld.info-64
-rw-r--r--ld/ldver.texi2
33 files changed, 1742 insertions, 1685 deletions
diff --git a/bfd/doc/archures.texi b/bfd/doc/archures.texi
index dcdaff9..eb4d180 100644
--- a/bfd/doc/archures.texi
+++ b/bfd/doc/archures.texi
@@ -225,8 +225,8 @@ enum bfd_architecture
#define bfd_mach_avr5 5
bfd_arch_cris, /* Axis CRIS */
bfd_arch_s390, /* IBM s390 */
-#define bfd_mach_s390_esa 0
-#define bfd_mach_s390_esame 1
+#define bfd_mach_s390_31 0
+#define bfd_mach_s390_64 1
bfd_arch_openrisc, /* OpenRISC */
bfd_arch_mmix, /* Donald Knuth's educational processor. */
bfd_arch_xstormy16,
@@ -253,7 +253,9 @@ typedef struct bfd_arch_info
const char *arch_name;
const char *printable_name;
unsigned int section_align_power;
- /* True if this is the default machine for the architecture. */
+ /* True if this is the default machine for the architecture.
+ The default arch should be the first entry for an arch so that
+ all the entries for that arch can be accessed via @code{next}. */
boolean the_default;
const struct bfd_arch_info * (*compatible)
PARAMS ((const struct bfd_arch_info *a,
diff --git a/bfd/doc/libbfd.texi b/bfd/doc/libbfd.texi
index 0c20a07..b28650f 100644
--- a/bfd/doc/libbfd.texi
+++ b/bfd/doc/libbfd.texi
@@ -10,7 +10,7 @@ completeness.
@subsubsection @code{bfd_write_bigendian_4byte_int}
@strong{Synopsis}
@example
-void bfd_write_bigendian_4byte_int (bfd *, unsigned int);
+boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
@end example
@strong{Description}@*
Write a 4 byte integer @var{i} to the output BFD @var{abfd}, in big
diff --git a/bfd/doc/reloc.texi b/bfd/doc/reloc.texi
index 2b449d3..2f462fd 100644
--- a/bfd/doc/reloc.texi
+++ b/bfd/doc/reloc.texi
@@ -768,55 +768,6 @@ Relocation against a MIPS literal section.
@deffnx {} BFD_RELOC_MIPS_REL16
@deffnx {} BFD_RELOC_MIPS_RELGOT
@deffnx {} BFD_RELOC_MIPS_JALR
-@deffnx {} BFD_RELOC_SH_GOT_LOW16
-@deffnx {} BFD_RELOC_SH_GOT_MEDLOW16
-@deffnx {} BFD_RELOC_SH_GOT_MEDHI16
-@deffnx {} BFD_RELOC_SH_GOT_HI16
-@deffnx {} BFD_RELOC_SH_GOTPLT_LOW16
-@deffnx {} BFD_RELOC_SH_GOTPLT_MEDLOW16
-@deffnx {} BFD_RELOC_SH_GOTPLT_MEDHI16
-@deffnx {} BFD_RELOC_SH_GOTPLT_HI16
-@deffnx {} BFD_RELOC_SH_PLT_LOW16
-@deffnx {} BFD_RELOC_SH_PLT_MEDLOW16
-@deffnx {} BFD_RELOC_SH_PLT_MEDHI16
-@deffnx {} BFD_RELOC_SH_PLT_HI16
-@deffnx {} BFD_RELOC_SH_GOTOFF_LOW16
-@deffnx {} BFD_RELOC_SH_GOTOFF_MEDLOW16
-@deffnx {} BFD_RELOC_SH_GOTOFF_MEDHI16
-@deffnx {} BFD_RELOC_SH_GOTOFF_HI16
-@deffnx {} BFD_RELOC_SH_GOTPC_LOW16
-@deffnx {} BFD_RELOC_SH_GOTPC_MEDLOW16
-@deffnx {} BFD_RELOC_SH_GOTPC_MEDHI16
-@deffnx {} BFD_RELOC_SH_GOTPC_HI16
-@deffnx {} BFD_RELOC_SH_COPY64
-@deffnx {} BFD_RELOC_SH_GLOB_DAT64
-@deffnx {} BFD_RELOC_SH_JMP_SLOT64
-@deffnx {} BFD_RELOC_SH_RELATIVE64
-@deffnx {} BFD_RELOC_SH_GOT10BY4
-@deffnx {} BFD_RELOC_SH_GOT10BY8
-@deffnx {} BFD_RELOC_SH_GOTPLT10BY4
-@deffnx {} BFD_RELOC_SH_GOTPLT10BY8
-@deffnx {} BFD_RELOC_SH_GOTPLT32
-@deffnx {} BFD_RELOC_SH_SHMEDIA_CODE
-@deffnx {} BFD_RELOC_SH_IMMU5
-@deffnx {} BFD_RELOC_SH_IMMS6
-@deffnx {} BFD_RELOC_SH_IMMS6BY32
-@deffnx {} BFD_RELOC_SH_IMMU6
-@deffnx {} BFD_RELOC_SH_IMMS10
-@deffnx {} BFD_RELOC_SH_IMMS10BY2
-@deffnx {} BFD_RELOC_SH_IMMS10BY4
-@deffnx {} BFD_RELOC_SH_IMMS10BY8
-@deffnx {} BFD_RELOC_SH_IMMS16
-@deffnx {} BFD_RELOC_SH_IMMU16
-@deffnx {} BFD_RELOC_SH_IMM_LOW16
-@deffnx {} BFD_RELOC_SH_IMM_LOW16_PCREL
-@deffnx {} BFD_RELOC_SH_IMM_MEDLOW16
-@deffnx {} BFD_RELOC_SH_IMM_MEDLOW16_PCREL
-@deffnx {} BFD_RELOC_SH_IMM_MEDHI16
-@deffnx {} BFD_RELOC_SH_IMM_MEDHI16_PCREL
-@deffnx {} BFD_RELOC_SH_IMM_HI16
-@deffnx {} BFD_RELOC_SH_IMM_HI16_PCREL
-@deffnx {} BFD_RELOC_SH_PT_16
MIPS ELF relocations.
@end deffn
@deffn {} BFD_RELOC_386_GOT32
@@ -996,6 +947,55 @@ These relocs are only used within the ARM assembler. They are not
@deffnx {} BFD_RELOC_SH_JMP_SLOT
@deffnx {} BFD_RELOC_SH_RELATIVE
@deffnx {} BFD_RELOC_SH_GOTPC
+@deffnx {} BFD_RELOC_SH_GOT_LOW16
+@deffnx {} BFD_RELOC_SH_GOT_MEDLOW16
+@deffnx {} BFD_RELOC_SH_GOT_MEDHI16
+@deffnx {} BFD_RELOC_SH_GOT_HI16
+@deffnx {} BFD_RELOC_SH_GOTPLT_LOW16
+@deffnx {} BFD_RELOC_SH_GOTPLT_MEDLOW16
+@deffnx {} BFD_RELOC_SH_GOTPLT_MEDHI16
+@deffnx {} BFD_RELOC_SH_GOTPLT_HI16
+@deffnx {} BFD_RELOC_SH_PLT_LOW16
+@deffnx {} BFD_RELOC_SH_PLT_MEDLOW16
+@deffnx {} BFD_RELOC_SH_PLT_MEDHI16
+@deffnx {} BFD_RELOC_SH_PLT_HI16
+@deffnx {} BFD_RELOC_SH_GOTOFF_LOW16
+@deffnx {} BFD_RELOC_SH_GOTOFF_MEDLOW16
+@deffnx {} BFD_RELOC_SH_GOTOFF_MEDHI16
+@deffnx {} BFD_RELOC_SH_GOTOFF_HI16
+@deffnx {} BFD_RELOC_SH_GOTPC_LOW16
+@deffnx {} BFD_RELOC_SH_GOTPC_MEDLOW16
+@deffnx {} BFD_RELOC_SH_GOTPC_MEDHI16
+@deffnx {} BFD_RELOC_SH_GOTPC_HI16
+@deffnx {} BFD_RELOC_SH_COPY64
+@deffnx {} BFD_RELOC_SH_GLOB_DAT64
+@deffnx {} BFD_RELOC_SH_JMP_SLOT64
+@deffnx {} BFD_RELOC_SH_RELATIVE64
+@deffnx {} BFD_RELOC_SH_GOT10BY4
+@deffnx {} BFD_RELOC_SH_GOT10BY8
+@deffnx {} BFD_RELOC_SH_GOTPLT10BY4
+@deffnx {} BFD_RELOC_SH_GOTPLT10BY8
+@deffnx {} BFD_RELOC_SH_GOTPLT32
+@deffnx {} BFD_RELOC_SH_SHMEDIA_CODE
+@deffnx {} BFD_RELOC_SH_IMMU5
+@deffnx {} BFD_RELOC_SH_IMMS6
+@deffnx {} BFD_RELOC_SH_IMMS6BY32
+@deffnx {} BFD_RELOC_SH_IMMU6
+@deffnx {} BFD_RELOC_SH_IMMS10
+@deffnx {} BFD_RELOC_SH_IMMS10BY2
+@deffnx {} BFD_RELOC_SH_IMMS10BY4
+@deffnx {} BFD_RELOC_SH_IMMS10BY8
+@deffnx {} BFD_RELOC_SH_IMMS16
+@deffnx {} BFD_RELOC_SH_IMMU16
+@deffnx {} BFD_RELOC_SH_IMM_LOW16
+@deffnx {} BFD_RELOC_SH_IMM_LOW16_PCREL
+@deffnx {} BFD_RELOC_SH_IMM_MEDLOW16
+@deffnx {} BFD_RELOC_SH_IMM_MEDLOW16_PCREL
+@deffnx {} BFD_RELOC_SH_IMM_MEDHI16
+@deffnx {} BFD_RELOC_SH_IMM_MEDHI16_PCREL
+@deffnx {} BFD_RELOC_SH_IMM_HI16
+@deffnx {} BFD_RELOC_SH_IMM_HI16_PCREL
+@deffnx {} BFD_RELOC_SH_PT_16
Hitachi SH relocs. Not all of these appear in object files.
@end deffn
@deffn {} BFD_RELOC_THUMB_PCREL_BRANCH9
diff --git a/binutils/arparse.c b/binutils/arparse.c
index 60fe8fa..8762257 100644
--- a/binutils/arparse.c
+++ b/binutils/arparse.c
@@ -1,5 +1,5 @@
/* A Bison parser, made from arparse.y
- by GNU bison 1.33. */
+ by GNU bison 1.35. */
#define YYBISON 1 /* Identify Bison output. */
@@ -65,6 +65,7 @@ struct list *list ;
} yystype;
# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
#endif
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -141,11 +142,11 @@ static const short yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const short yyrline[] =
{
- 0, 66, 66, 70, 72, 75, 78, 80, 81, 82,
- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 98, 103, 108, 113, 117, 122, 127, 134,
- 139, 145, 149, 156, 159, 162, 165, 169, 176, 180,
- 182, 186
+ 0, 66, 66, 70, 72, 75, 79, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 99, 104, 109, 114, 118, 123, 128, 135,
+ 140, 146, 150, 157, 160, 163, 166, 170, 177, 181,
+ 183, 187
};
#endif
@@ -163,7 +164,7 @@ static const char *const yytname[] =
"addmod_command", "list_command", "save_command", "open_command",
"create_command", "addlib_command", "directory_command",
"optional_filename", "modulelist", "modulename", "optcomma",
- "verbose_command", NULL
+ "verbose_command", 0
};
#endif
@@ -283,12 +284,6 @@ static const short yycheck[] =
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
-#ifdef __cplusplus
-# define YYSTD(x) std::x
-#else
-# define YYSTD(x) x
-#endif
-
#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -311,18 +306,19 @@ static const short yycheck[] =
/* Pacify GCC's `empty if-body' warning. */
# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# else
-# ifdef __cplusplus
-# include <cstdlib> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T std::size_t
-# else
-# ifdef __STDC__
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
# endif
-# define YYSTACK_ALLOC YYSTD (malloc)
-# define YYSTACK_FREE YYSTD (free)
+# define YYSTACK_ALLOC malloc
+# define YYSTACK_FREE free
# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+
+
+#if (! defined (yyoverflow) \
+ && (! defined (__cplusplus) \
+ || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -349,24 +345,41 @@ union yyalloc
+ YYSTACK_GAP_MAX)
# endif
-/* Relocate the TYPE STACK from its old location to the new one. The
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ register YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (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(Type, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- yymemcpy ((char *) yyptr, (char *) (Stack), \
- yysize * (YYSIZE_T) sizeof (Type)); \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (Type) + YYSTACK_GAP_MAX; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
while (0)
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+#endif
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -376,14 +389,9 @@ union yyalloc
# define YYSIZE_T size_t
#endif
#if ! defined (YYSIZE_T)
-# ifdef __cplusplus
-# include <cstddef> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T std::size_t
-# else
-# ifdef __STDC__
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
# endif
#endif
#if ! defined (YYSIZE_T)
@@ -462,12 +470,8 @@ while (0)
#if YYDEBUG
# ifndef YYFPRINTF
-# ifdef __cplusplus
-# include <cstdio> /* INFRINGES ON USER NAME SPACE */
-# else
-# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-# endif
-# define YYFPRINTF YYSTD (fprintf)
+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+# define YYFPRINTF fprintf
# endif
# define YYDPRINTF(Args) \
@@ -475,10 +479,8 @@ do { \
if (yydebug) \
YYFPRINTF Args; \
} while (0)
-/* Nonzero means print parse trace. [The following comment makes no
- sense to me. Could someone clarify it? --akim] Since this is
- uninitialized, it does not stop multiple parsers from coexisting.
- */
+/* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
int yydebug;
#else /* !YYDEBUG */
# define YYDPRINTF(Args)
@@ -504,33 +506,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-#if ! defined (yyoverflow) && ! defined (yymemcpy)
-# if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
-# define yymemcpy __builtin_memcpy
-# else /* not GNU C or C++ */
-
-/* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
-static void
-# if defined (__STDC__) || defined (__cplusplus)
-yymemcpy (char *yyto, const char *yyfrom, YYSIZE_T yycount)
-# else
-yymemcpy (yyto, yyfrom, yycount)
- char *yyto;
- const char *yyfrom;
- YYSIZE_T yycount;
-# endif
-{
- register const char *yyf = yyfrom;
- register char *yyt = yyto;
- register YYSIZE_T yyi = yycount;
-
- while (yyi-- != 0)
- *yyt++ = *yyf++;
-}
-# endif
-#endif
-
#ifdef YYERROR_VERBOSE
# ifndef yystrlen
@@ -583,7 +558,7 @@ yystpcpy (yydest, yysrc)
# endif
#endif
-#line 341 "/usr/share/bison/bison.simple"
+#line 315 "/usr/share/bison/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
@@ -593,13 +568,13 @@ yystpcpy (yydest, yysrc)
to the proper pointer type. */
#ifdef YYPARSE_PARAM
-# ifdef __cplusplus
+# if defined (__STDC__) || defined (__cplusplus)
# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
# define YYPARSE_PARAM_DECL
-# else /* !__cplusplus */
+# else
# define YYPARSE_PARAM_ARG YYPARSE_PARAM
# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif /* !__cplusplus */
+# endif
#else /* !YYPARSE_PARAM */
# define YYPARSE_PARAM_ARG
# define YYPARSE_PARAM_DECL
@@ -773,6 +748,9 @@ yyparse (YYPARSE_PARAM_ARG)
yyvs = yyvs1;
}
#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+ goto yyoverflowlab;
+# else
/* Extend the stack our own way. */
if (yystacksize >= YYMAXDEPTH)
goto yyoverflowlab;
@@ -786,15 +764,16 @@ yyparse (YYPARSE_PARAM_ARG)
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyoverflowlab;
- YYSTACK_RELOCATE (short, yyss);
- YYSTACK_RELOCATE (YYSTYPE, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
# if YYLSP_NEEDED
- YYSTACK_RELOCATE (YYLTYPE, yyls);
+ YYSTACK_RELOCATE (yyls);
# endif
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
}
+# endif
#endif /* no yyoverflow */
yyssp = yyss + yysize - 1;
@@ -981,75 +960,75 @@ case 5:
{ prompt(); }
break;
case 18:
-#line 91 "arparse.y"
+#line 92 "arparse.y"
{ ar_end(); return 0; }
break;
case 20:
-#line 93 "arparse.y"
+#line 94 "arparse.y"
{ yyerror("foo"); }
break;
case 22:
-#line 100 "arparse.y"
+#line 101 "arparse.y"
{ ar_extract(yyvsp[0].list); }
break;
case 23:
-#line 105 "arparse.y"
+#line 106 "arparse.y"
{ ar_replace(yyvsp[0].list); }
break;
case 24:
-#line 110 "arparse.y"
+#line 111 "arparse.y"
{ ar_clear(); }
break;
case 25:
-#line 115 "arparse.y"
+#line 116 "arparse.y"
{ ar_delete(yyvsp[0].list); }
break;
case 26:
-#line 119 "arparse.y"
+#line 120 "arparse.y"
{ ar_addmod(yyvsp[0].list); }
break;
case 27:
-#line 124 "arparse.y"
+#line 125 "arparse.y"
{ ar_list(); }
break;
case 28:
-#line 129 "arparse.y"
+#line 130 "arparse.y"
{ ar_save(); }
break;
case 29:
-#line 136 "arparse.y"
+#line 137 "arparse.y"
{ ar_open(yyvsp[0].name,0); }
break;
case 30:
-#line 141 "arparse.y"
+#line 142 "arparse.y"
{ ar_open(yyvsp[0].name,1); }
break;
case 31:
-#line 147 "arparse.y"
+#line 148 "arparse.y"
{ ar_addlib(yyvsp[-1].name,yyvsp[0].list); }
break;
case 32:
-#line 151 "arparse.y"
+#line 152 "arparse.y"
{ ar_directory(yyvsp[-2].name, yyvsp[-1].list, yyvsp[0].name); }
break;
case 33:
-#line 158 "arparse.y"
+#line 159 "arparse.y"
{ yyval.name = yyvsp[0].name; }
break;
case 34:
-#line 159 "arparse.y"
+#line 160 "arparse.y"
{ yyval.name = 0; }
break;
case 35:
-#line 164 "arparse.y"
+#line 165 "arparse.y"
{ yyval.list = yyvsp[-1].list; }
break;
case 36:
-#line 166 "arparse.y"
+#line 167 "arparse.y"
{ yyval.list = 0; }
break;
case 37:
-#line 171 "arparse.y"
+#line 172 "arparse.y"
{ struct list *n = (struct list *) malloc(sizeof(struct list));
n->next = yyvsp[-2].list;
n->name = yyvsp[0].name;
@@ -1057,16 +1036,16 @@ case 37:
}
break;
case 38:
-#line 176 "arparse.y"
+#line 177 "arparse.y"
{ yyval.list = 0; }
break;
case 41:
-#line 188 "arparse.y"
+#line 189 "arparse.y"
{ verbose = !verbose; }
break;
}
-#line 727 "/usr/share/bison/bison.simple"
+#line 705 "/usr/share/bison/bison.simple"
yyvsp -= yylen;
@@ -1297,7 +1276,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 192 "arparse.y"
+#line 193 "arparse.y"
static int
diff --git a/binutils/arparse.h b/binutils/arparse.h
index 6fb4a39..0b9c3fd 100644
--- a/binutils/arparse.h
+++ b/binutils/arparse.h
@@ -8,6 +8,7 @@ struct list *list ;
} yystype;
# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
#endif
# define NEWLINE 257
# define VERBOSE 258
diff --git a/binutils/doc/binutils.info b/binutils/doc/binutils.info
index 63772ca..f9b72ee 100644
--- a/binutils/doc/binutils.info
+++ b/binutils/doc/binutils.info
@@ -1,4 +1,4 @@
-This is binutils.info, produced by makeinfo version 4.0f from
+This is binutils.info, produced by makeinfo version 4.1 from
binutils.texi.
START-INFO-DIR-ENTRY
@@ -32,38 +32,38 @@ Free Documentation License".

Indirect:
-binutils.info-1: 1670
-binutils.info-2: 44149
-binutils.info-3: 92226
+binutils.info-1: 1669
+binutils.info-2: 44150
+binutils.info-3: 92227

Tag Table:
(Indirect)
-Node: Top1670
-Node: ar3167
-Node: ar cmdline5341
-Node: ar scripts13473
-Node: nm19152
-Node: objcopy26561
-Node: objdump44149
-Node: ranlib55750
-Node: size56501
-Node: strings59364
-Node: strip61663
-Node: c++filt64653
-Ref: c++filt-Footnote-167595
-Node: addr2line67701
-Node: nlmconv70294
-Node: windres72897
-Node: dlltool77949
-Node: readelf87397
-Node: Selecting The Target System91209
-Node: Target Selection92226
-Node: Architecture Selection94927
-Node: Linker Emulation Selection96172
-Node: Reporting Bugs97050
-Node: Bug Criteria97826
-Node: Bug Reporting98372
-Node: GNU Free Documentation License105399
-Node: Index123827
+Node: Top1669
+Node: ar3168
+Node: ar cmdline5342
+Node: ar scripts13474
+Node: nm19153
+Node: objcopy26562
+Node: objdump44150
+Node: ranlib55751
+Node: size56502
+Node: strings59365
+Node: strip61664
+Node: c++filt64654
+Ref: c++filt-Footnote-167596
+Node: addr2line67702
+Node: nlmconv70295
+Node: windres72898
+Node: dlltool77950
+Node: readelf87398
+Node: Selecting The Target System91210
+Node: Target Selection92227
+Node: Architecture Selection94928
+Node: Linker Emulation Selection96173
+Node: Reporting Bugs97051
+Node: Bug Criteria97827
+Node: Bug Reporting98373
+Node: GNU Free Documentation License105400
+Node: Index123828

End Tag Table
diff --git a/binutils/doc/binutils.info-1 b/binutils/doc/binutils.info-1
index f4503be..cb2d697 100644
--- a/binutils/doc/binutils.info-1
+++ b/binutils/doc/binutils.info-1
@@ -1,4 +1,4 @@
-This is binutils.info, produced by makeinfo version 4.0f from
+This is binutils.info, produced by makeinfo version 4.1 from
binutils.texi.
START-INFO-DIR-ENTRY
@@ -37,7 +37,7 @@ Introduction
************
This brief manual contains preliminary documentation for the GNU
-binary utilities (collectively version 2.12):
+binary utilities (collectively version 2.12.1):
This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the
diff --git a/binutils/doc/binutils.info-2 b/binutils/doc/binutils.info-2
index ae1164e..f498d51 100644
--- a/binutils/doc/binutils.info-2
+++ b/binutils/doc/binutils.info-2
@@ -1,4 +1,4 @@
-This is binutils.info, produced by makeinfo version 4.0f from
+This is binutils.info, produced by makeinfo version 4.1 from
binutils.texi.
START-INFO-DIR-ENTRY
diff --git a/binutils/doc/binutils.info-3 b/binutils/doc/binutils.info-3
index 673b1e6..d4b3590 100644
--- a/binutils/doc/binutils.info-3
+++ b/binutils/doc/binutils.info-3
@@ -1,4 +1,4 @@
-This is binutils.info, produced by makeinfo version 4.0f from
+This is binutils.info, produced by makeinfo version 4.1 from
binutils.texi.
START-INFO-DIR-ENTRY
diff --git a/binutils/rclex.c b/binutils/rclex.c
index 4ba3c0c..0de2f28 100644
--- a/binutils/rclex.c
+++ b/binutils/rclex.c
@@ -22,7 +22,7 @@
#ifdef __cplusplus
#include <stdlib.h>
-#ifndef _Win32
+#ifndef _WIN32
#include <unistd.h>
#else
#ifndef YY_ALWAYS_INTERACTIVE
@@ -643,7 +643,7 @@ char *yytext;
#line 1 "rclex.l"
#define INITIAL 0
#line 2 "rclex.l"
-/* Copyright 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
+/* Copyright 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of GNU Binutils.
@@ -2022,7 +2022,7 @@ YY_BUFFER_STATE b;
}
-#ifndef _Win32
+#ifndef _WIN32
#include <unistd.h>
#else
#ifndef YY_ALWAYS_INTERACTIVE
@@ -2400,11 +2400,11 @@ cpp_line (s)
if (!initial_fn)
{
initial_fn = xmalloc (strlen (fn) + 1);
- strcpy(initial_fn, fn);
+ strcpy (initial_fn, fn);
}
/* Allow the initial file, regardless of name. Suppress all other
- files if they end in ".h" (this allows included "*.rc") */
+ files if they end in ".h" (this allows included "*.rc"). */
if (strcmp (initial_fn, fn) == 0
|| strcmp (fn + strlen (fn) - 2, ".h") != 0)
suppress_cpp_data = 0;
@@ -2447,7 +2447,7 @@ handle_quotes (input, len)
break;
case 'a':
- *s++ = ESCAPE_A;
+ *s++ = ESCAPE_B; /* Strange, but true... */
++t;
break;
@@ -2510,9 +2510,9 @@ handle_quotes (input, len)
if (*t >= '0' && *t <= '9')
ch = (ch << 4) | (*t - '0');
else if (*t >= 'a' && *t <= 'f')
- ch = (ch << 4) | (*t - 'a');
+ ch = (ch << 4) | (*t - 'a' + 10);
else if (*t >= 'A' && *t <= 'F')
- ch = (ch << 4) | (*t - 'A');
+ ch = (ch << 4) | (*t - 'A' + 10);
else
break;
++t;
@@ -2568,7 +2568,7 @@ get_string (len)
as->s = xmalloc (len);
as->next = strings;
- strings = as->next;
+ strings = as;
return as->s;
}
diff --git a/binutils/rcparse.c b/binutils/rcparse.c
index 90af526..9add78f 100644
--- a/binutils/rcparse.c
+++ b/binutils/rcparse.c
@@ -1,5 +1,5 @@
/* A Bison parser, made from rcparse.y
- by GNU bison 1.33. */
+ by GNU bison 1.35. */
#define YYBISON 1 /* Identify Bison output. */
@@ -89,7 +89,7 @@
#line 1 "rcparse.y"
/* rcparse.y -- parser for Windows rc files
- Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of GNU Binutils.
@@ -186,6 +186,7 @@ typedef union
} ss;
} yystype;
# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
#endif
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -198,7 +199,7 @@ typedef union
#define YYNTBASE 99
/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 339 ? yytranslate[x] : 191)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 339 ? yytranslate[x] : 189)
/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
static const char yytranslate[] =
@@ -242,126 +243,126 @@ static const char yytranslate[] =
#if YYDEBUG
static const short yyprhs[] =
{
- 0, 0, 1, 5, 9, 13, 17, 21, 25, 29,
- 33, 37, 41, 45, 49, 53, 57, 61, 62, 69,
- 70, 73, 76, 81, 83, 85, 87, 91, 94, 96,
- 98, 100, 102, 104, 106, 111, 116, 117, 131, 132,
- 146, 147, 162, 163, 167, 168, 172, 176, 177, 182,
- 186, 192, 200, 204, 208, 213, 217, 218, 221, 222,
- 226, 227, 231, 232, 236, 237, 241, 242, 246, 247,
- 251, 263, 276, 289, 303, 304, 308, 309, 313, 314,
- 318, 319, 323, 324, 328, 335, 344, 355, 367, 368,
- 372, 373, 377, 378, 382, 383, 387, 388, 392, 393,
- 397, 398, 402, 403, 407, 408, 412, 413, 430, 438,
- 448, 459, 460, 462, 465, 466, 470, 471, 475, 476,
- 480, 481, 485, 490, 495, 499, 506, 507, 510, 515,
- 518, 525, 526, 530, 533, 535, 537, 539, 541, 543,
- 545, 552, 553, 556, 559, 563, 569, 572, 578, 585,
- 593, 603, 608, 615, 616, 619, 620, 622, 624, 626,
- 630, 634, 635, 642, 643, 647, 652, 659, 664, 671,
- 672, 679, 686, 690, 694, 698, 702, 706, 707, 716,
- 724, 725, 731, 732, 736, 738, 740, 742, 745, 748,
- 751, 753, 754, 757, 761, 766, 770, 771, 774, 775,
- 778, 780, 782, 784, 786, 788, 790, 792, 794, 796,
- 798, 801, 805, 810, 812, 816, 817, 819, 822, 824,
- 826, 830, 833, 836, 840, 844, 848, 852, 856, 860,
- 864, 868, 871, 873, 875, 879, 882, 886, 890, 894,
- 898, 902, 906, 910
+ 0, 0, 1, 4, 7, 10, 13, 16, 19, 22,
+ 25, 28, 31, 34, 37, 40, 43, 46, 53, 54,
+ 57, 60, 65, 67, 69, 71, 75, 78, 80, 82,
+ 84, 86, 88, 90, 95, 100, 101, 115, 116, 130,
+ 131, 146, 147, 151, 152, 156, 160, 164, 168, 172,
+ 178, 185, 193, 202, 206, 210, 215, 219, 220, 223,
+ 224, 228, 229, 233, 234, 238, 239, 243, 244, 248,
+ 249, 253, 265, 278, 291, 305, 306, 310, 311, 315,
+ 316, 320, 321, 325, 326, 330, 337, 346, 357, 369,
+ 370, 374, 375, 379, 380, 384, 385, 389, 390, 394,
+ 395, 399, 400, 404, 405, 409, 410, 414, 415, 432,
+ 440, 450, 461, 462, 464, 467, 468, 472, 473, 477,
+ 478, 482, 483, 487, 492, 497, 501, 508, 509, 512,
+ 517, 520, 527, 528, 532, 535, 537, 539, 541, 543,
+ 545, 547, 554, 555, 558, 561, 565, 571, 574, 580,
+ 587, 595, 605, 610, 617, 618, 621, 622, 624, 626,
+ 628, 632, 636, 637, 644, 645, 649, 654, 661, 666,
+ 673, 674, 681, 688, 692, 696, 700, 704, 708, 709,
+ 718, 726, 727, 733, 734, 738, 740, 742, 744, 747,
+ 750, 753, 755, 756, 759, 763, 768, 772, 773, 776,
+ 777, 780, 782, 784, 786, 788, 790, 792, 794, 796,
+ 798, 800, 803, 807, 812, 814, 818, 819, 821, 824,
+ 826, 828, 832, 835, 838, 842, 846, 850, 854, 858,
+ 862, 866, 870, 873, 875, 877, 881, 884, 888, 892,
+ 896, 900, 904, 908, 912
};
static const short yyrhs[] =
{
- -1, 99, 100, 101, 0, 99, 100, 107, 0, 99,
- 100, 108, 0, 99, 100, 109, 0, 99, 100, 148,
- 0, 99, 100, 149, 0, 99, 100, 150, 0, 99,
- 100, 151, 0, 99, 100, 156, 0, 99, 100, 159,
- 0, 99, 100, 160, 0, 99, 100, 165, 0, 99,
- 100, 168, 0, 99, 100, 169, 0, 99, 100, 84,
- 0, 0, 174, 5, 177, 3, 102, 4, 0, 0,
- 102, 103, 0, 104, 188, 0, 104, 188, 95, 105,
- 0, 80, 0, 189, 0, 106, 0, 105, 95, 106,
- 0, 105, 106, 0, 6, 0, 7, 0, 8, 0,
- 9, 0, 10, 0, 11, 0, 174, 12, 179, 181,
- 0, 174, 13, 178, 181, 0, 0, 174, 14, 179,
- 113, 189, 185, 185, 185, 110, 114, 3, 116, 4,
- 0, 0, 174, 15, 179, 113, 189, 185, 185, 185,
- 111, 114, 3, 116, 4, 0, 0, 174, 15, 179,
- 113, 189, 185, 185, 185, 185, 112, 114, 3, 116,
- 4, 0, 0, 16, 96, 186, 0, 0, 114, 17,
- 80, 0, 114, 18, 174, 0, 0, 114, 19, 115,
- 182, 0, 114, 16, 186, 0, 114, 41, 186, 95,
- 80, 0, 114, 41, 186, 95, 80, 185, 185, 0,
- 114, 46, 174, 0, 114, 44, 186, 0, 114, 43,
- 186, 185, 0, 114, 45, 186, 0, 0, 116, 117,
- 0, 0, 20, 118, 139, 0, 0, 21, 119, 139,
- 0, 0, 22, 120, 139, 0, 0, 38, 121, 139,
- 0, 0, 23, 122, 139, 0, 0, 24, 123, 139,
- 0, 10, 140, 186, 185, 142, 185, 185, 185, 185,
- 184, 141, 0, 10, 140, 186, 185, 142, 185, 185,
- 185, 185, 185, 185, 141, 0, 10, 140, 186, 95,
- 80, 142, 185, 185, 185, 185, 184, 141, 0, 10,
- 140, 186, 95, 80, 142, 185, 185, 185, 185, 185,
- 185, 141, 0, 0, 25, 124, 139, 0, 0, 26,
- 125, 139, 0, 0, 27, 126, 139, 0, 0, 28,
- 127, 139, 0, 0, 39, 128, 139, 0, 42, 176,
- 186, 185, 185, 141, 0, 42, 176, 186, 185, 185,
- 185, 185, 141, 0, 42, 176, 186, 185, 185, 185,
- 185, 144, 184, 141, 0, 42, 176, 186, 185, 185,
- 185, 185, 144, 185, 185, 141, 0, 0, 40, 129,
- 139, 0, 0, 29, 130, 139, 0, 0, 30, 131,
- 139, 0, 0, 31, 132, 139, 0, 0, 32, 133,
- 139, 0, 0, 33, 134, 139, 0, 0, 34, 135,
- 139, 0, 0, 35, 136, 139, 0, 0, 36, 137,
- 139, 0, 0, 37, 80, 95, 186, 95, 186, 95,
- 186, 95, 186, 95, 186, 95, 138, 182, 184, 0,
- 140, 186, 185, 185, 185, 185, 141, 0, 140, 186,
- 185, 185, 185, 185, 146, 184, 141, 0, 140, 186,
- 185, 185, 185, 185, 146, 185, 185, 141, 0, 0,
- 80, 0, 80, 95, 0, 0, 3, 161, 4, 0,
- 0, 95, 143, 182, 0, 0, 95, 145, 182, 0,
- 0, 95, 147, 182, 0, 174, 41, 178, 181, 0,
- 174, 42, 178, 181, 0, 43, 186, 185, 0, 174,
- 46, 177, 3, 152, 4, 0, 0, 152, 153, 0,
- 48, 80, 185, 154, 0, 48, 49, 0, 50, 80,
- 154, 3, 152, 4, 0, 0, 154, 95, 155, 0,
- 154, 155, 0, 51, 0, 52, 0, 53, 0, 54,
- 0, 55, 0, 56, 0, 174, 47, 177, 3, 157,
- 4, 0, 0, 157, 158, 0, 48, 80, 0, 48,
- 80, 185, 0, 48, 80, 185, 185, 184, 0, 48,
- 49, 0, 50, 80, 3, 157, 4, 0, 50, 80,
- 185, 3, 157, 4, 0, 50, 80, 185, 185, 3,
- 157, 4, 0, 50, 80, 185, 185, 185, 184, 3,
- 157, 4, 0, 174, 57, 179, 181, 0, 174, 58,
- 177, 3, 161, 4, 0, 0, 162, 163, 0, 0,
- 164, 0, 83, 0, 187, 0, 164, 95, 83, 0,
- 164, 95, 187, 0, 0, 59, 177, 3, 166, 167,
- 4, 0, 0, 167, 186, 80, 0, 167, 186, 95,
- 80, 0, 174, 174, 177, 3, 161, 4, 0, 174,
- 174, 177, 181, 0, 174, 60, 170, 3, 171, 4,
- 0, 0, 170, 61, 186, 185, 185, 185, 0, 170,
- 62, 186, 185, 185, 185, 0, 170, 63, 186, 0,
- 170, 64, 186, 0, 170, 65, 186, 0, 170, 66,
- 186, 0, 170, 67, 186, 0, 0, 171, 68, 3,
- 71, 3, 172, 4, 4, 0, 171, 69, 3, 70,
- 80, 173, 4, 0, 0, 172, 70, 80, 95, 80,
- 0, 0, 173, 185, 185, 0, 189, 0, 81, 0,
- 80, 0, 80, 95, 0, 81, 95, 0, 189, 95,
- 0, 175, 0, 0, 177, 180, 0, 177, 44, 186,
- 0, 177, 43, 186, 185, 0, 177, 45, 186, 0,
- 0, 178, 180, 0, 0, 179, 180, 0, 72, 0,
- 73, 0, 74, 0, 75, 0, 76, 0, 77, 0,
- 78, 0, 80, 0, 81, 0, 183, 0, 79, 183,
- 0, 182, 85, 183, 0, 182, 85, 79, 183, 0,
- 82, 0, 97, 186, 98, 0, 0, 185, 0, 95,
- 186, 0, 187, 0, 82, 0, 97, 187, 98, 0,
- 93, 187, 0, 89, 187, 0, 187, 90, 187, 0,
- 187, 91, 187, 0, 187, 92, 187, 0, 187, 88,
- 187, 0, 187, 89, 187, 0, 187, 87, 187, 0,
- 187, 86, 187, 0, 187, 85, 187, 0, 95, 189,
- 0, 190, 0, 82, 0, 97, 187, 98, 0, 93,
- 187, 0, 190, 90, 187, 0, 190, 91, 187, 0,
- 190, 92, 187, 0, 190, 88, 187, 0, 190, 89,
- 187, 0, 190, 87, 187, 0, 190, 86, 187, 0,
- 190, 85, 187, 0
+ -1, 99, 100, 0, 99, 106, 0, 99, 107, 0,
+ 99, 108, 0, 99, 146, 0, 99, 147, 0, 99,
+ 148, 0, 99, 149, 0, 99, 154, 0, 99, 157,
+ 0, 99, 158, 0, 99, 163, 0, 99, 166, 0,
+ 99, 167, 0, 99, 84, 0, 172, 5, 175, 3,
+ 101, 4, 0, 0, 101, 102, 0, 103, 186, 0,
+ 103, 186, 95, 104, 0, 80, 0, 187, 0, 105,
+ 0, 104, 95, 105, 0, 104, 105, 0, 6, 0,
+ 7, 0, 8, 0, 9, 0, 10, 0, 11, 0,
+ 172, 12, 177, 179, 0, 172, 13, 176, 179, 0,
+ 0, 172, 14, 177, 112, 187, 183, 183, 183, 109,
+ 113, 3, 114, 4, 0, 0, 172, 15, 177, 112,
+ 187, 183, 183, 183, 110, 113, 3, 114, 4, 0,
+ 0, 172, 15, 177, 112, 187, 183, 183, 183, 183,
+ 111, 113, 3, 114, 4, 0, 0, 16, 96, 184,
+ 0, 0, 113, 17, 80, 0, 113, 18, 172, 0,
+ 113, 19, 180, 0, 113, 16, 184, 0, 113, 18,
+ 80, 0, 113, 41, 184, 95, 80, 0, 113, 41,
+ 184, 95, 80, 183, 0, 113, 41, 184, 95, 80,
+ 183, 183, 0, 113, 41, 184, 95, 80, 183, 183,
+ 183, 0, 113, 46, 172, 0, 113, 44, 184, 0,
+ 113, 43, 184, 183, 0, 113, 45, 184, 0, 0,
+ 114, 115, 0, 0, 20, 116, 137, 0, 0, 21,
+ 117, 137, 0, 0, 22, 118, 137, 0, 0, 38,
+ 119, 137, 0, 0, 23, 120, 137, 0, 0, 24,
+ 121, 137, 0, 10, 138, 184, 183, 140, 183, 183,
+ 183, 183, 182, 139, 0, 10, 138, 184, 183, 140,
+ 183, 183, 183, 183, 183, 183, 139, 0, 10, 138,
+ 184, 95, 80, 140, 183, 183, 183, 183, 182, 139,
+ 0, 10, 138, 184, 95, 80, 140, 183, 183, 183,
+ 183, 183, 183, 139, 0, 0, 25, 122, 137, 0,
+ 0, 26, 123, 137, 0, 0, 27, 124, 137, 0,
+ 0, 28, 125, 137, 0, 0, 39, 126, 137, 0,
+ 42, 174, 184, 183, 183, 139, 0, 42, 174, 184,
+ 183, 183, 183, 183, 139, 0, 42, 174, 184, 183,
+ 183, 183, 183, 142, 182, 139, 0, 42, 174, 184,
+ 183, 183, 183, 183, 142, 183, 183, 139, 0, 0,
+ 40, 127, 137, 0, 0, 29, 128, 137, 0, 0,
+ 30, 129, 137, 0, 0, 31, 130, 137, 0, 0,
+ 32, 131, 137, 0, 0, 33, 132, 137, 0, 0,
+ 34, 133, 137, 0, 0, 35, 134, 137, 0, 0,
+ 36, 135, 137, 0, 0, 37, 80, 95, 184, 95,
+ 184, 95, 184, 95, 184, 95, 184, 95, 136, 180,
+ 182, 0, 138, 184, 183, 183, 183, 183, 139, 0,
+ 138, 184, 183, 183, 183, 183, 144, 182, 139, 0,
+ 138, 184, 183, 183, 183, 183, 144, 183, 183, 139,
+ 0, 0, 80, 0, 80, 95, 0, 0, 3, 159,
+ 4, 0, 0, 95, 141, 180, 0, 0, 95, 143,
+ 180, 0, 0, 95, 145, 180, 0, 172, 41, 176,
+ 179, 0, 172, 42, 176, 179, 0, 43, 184, 183,
+ 0, 172, 46, 175, 3, 150, 4, 0, 0, 150,
+ 151, 0, 48, 80, 183, 152, 0, 48, 49, 0,
+ 50, 80, 152, 3, 150, 4, 0, 0, 152, 95,
+ 153, 0, 152, 153, 0, 51, 0, 52, 0, 53,
+ 0, 54, 0, 55, 0, 56, 0, 172, 47, 175,
+ 3, 155, 4, 0, 0, 155, 156, 0, 48, 80,
+ 0, 48, 80, 183, 0, 48, 80, 183, 183, 182,
+ 0, 48, 49, 0, 50, 80, 3, 155, 4, 0,
+ 50, 80, 183, 3, 155, 4, 0, 50, 80, 183,
+ 183, 3, 155, 4, 0, 50, 80, 183, 183, 183,
+ 182, 3, 155, 4, 0, 172, 57, 177, 179, 0,
+ 172, 58, 175, 3, 159, 4, 0, 0, 160, 161,
+ 0, 0, 162, 0, 83, 0, 185, 0, 162, 95,
+ 83, 0, 162, 95, 185, 0, 0, 59, 175, 3,
+ 164, 165, 4, 0, 0, 165, 184, 80, 0, 165,
+ 184, 95, 80, 0, 172, 172, 175, 3, 159, 4,
+ 0, 172, 172, 175, 179, 0, 172, 60, 168, 3,
+ 169, 4, 0, 0, 168, 61, 184, 183, 183, 183,
+ 0, 168, 62, 184, 183, 183, 183, 0, 168, 63,
+ 184, 0, 168, 64, 184, 0, 168, 65, 184, 0,
+ 168, 66, 184, 0, 168, 67, 184, 0, 0, 169,
+ 68, 3, 71, 3, 170, 4, 4, 0, 169, 69,
+ 3, 70, 80, 171, 4, 0, 0, 170, 70, 80,
+ 95, 80, 0, 0, 171, 183, 183, 0, 187, 0,
+ 81, 0, 80, 0, 80, 95, 0, 81, 95, 0,
+ 187, 95, 0, 173, 0, 0, 175, 178, 0, 175,
+ 44, 184, 0, 175, 43, 184, 183, 0, 175, 45,
+ 184, 0, 0, 176, 178, 0, 0, 177, 178, 0,
+ 72, 0, 73, 0, 74, 0, 75, 0, 76, 0,
+ 77, 0, 78, 0, 80, 0, 81, 0, 181, 0,
+ 79, 181, 0, 180, 85, 181, 0, 180, 85, 79,
+ 181, 0, 82, 0, 97, 184, 98, 0, 0, 183,
+ 0, 95, 184, 0, 185, 0, 82, 0, 97, 185,
+ 98, 0, 93, 185, 0, 89, 185, 0, 185, 90,
+ 185, 0, 185, 91, 185, 0, 185, 92, 185, 0,
+ 185, 88, 185, 0, 185, 89, 185, 0, 185, 87,
+ 185, 0, 185, 86, 185, 0, 185, 85, 185, 0,
+ 95, 187, 0, 188, 0, 82, 0, 97, 185, 98,
+ 0, 93, 185, 0, 188, 90, 185, 0, 188, 91,
+ 185, 0, 188, 92, 185, 0, 188, 88, 185, 0,
+ 188, 89, 185, 0, 188, 87, 185, 0, 188, 86,
+ 185, 0, 188, 85, 185, 0
};
#endif
@@ -371,30 +372,30 @@ static const short yyrhs[] =
static const short yyrline[] =
{
0, 154, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 165, 166, 167, 168, 169, 170, 173, 182, 189,
- 194, 214, 220, 231, 253, 262, 267, 272, 278, 283,
- 288, 292, 296, 300, 308, 317, 326, 326, 348, 348,
- 371, 371, 397, 402, 408, 410, 414, 418, 418, 424,
- 428, 434, 447, 451, 455, 459, 465, 467, 477, 477,
- 488, 488, 498, 498, 508, 508, 521, 521, 531, 531,
- 541, 552, 561, 574, 585, 585, 595, 595, 605, 605,
- 615, 615, 625, 625, 638, 643, 649, 655, 661, 661,
- 674, 674, 684, 684, 694, 694, 704, 704, 714, 714,
- 724, 724, 734, 734, 744, 744, 754, 754, 771, 784,
- 795, 806, 811, 815, 821, 826, 834, 834, 840, 840,
- 846, 846, 854, 863, 873, 882, 889, 894, 910, 915,
- 919, 925, 930, 934, 940, 945, 949, 953, 957, 961,
- 969, 976, 981, 997, 1002, 1006, 1010, 1014, 1018, 1022,
- 1026, 1035, 1044, 1054, 1054, 1065, 1071, 1077, 1086, 1094,
- 1103, 1116, 1116, 1122, 1124, 1128, 1137, 1142, 1150, 1157,
- 1164, 1170, 1176, 1181, 1186, 1191, 1196, 1209, 1214, 1218,
- 1224, 1229, 1235, 1240, 1248, 1254, 1269, 1274, 1278, 1285,
- 1291, 1307, 1315, 1321, 1326, 1331, 1340, 1347, 1357, 1364,
- 1375, 1381, 1386, 1391, 1396, 1401, 1406, 1415, 1420, 1436,
- 1441, 1445, 1449, 1455, 1460, 1468, 1473, 1481, 1490, 1499,
- 1504, 1508, 1513, 1518, 1523, 1528, 1533, 1538, 1543, 1548,
- 1553, 1563, 1572, 1583, 1588, 1592, 1597, 1602, 1607, 1612,
- 1617, 1622, 1627, 1632
+ 164, 165, 166, 167, 168, 169, 170, 175, 185, 190,
+ 210, 216, 227, 249, 258, 263, 268, 274, 279, 284,
+ 288, 292, 296, 304, 316, 328, 328, 354, 354, 381,
+ 381, 411, 416, 422, 424, 430, 434, 439, 443, 447,
+ 460, 475, 490, 505, 509, 513, 517, 523, 525, 535,
+ 535, 546, 546, 556, 556, 566, 566, 579, 579, 589,
+ 589, 599, 610, 619, 632, 643, 643, 653, 653, 663,
+ 663, 673, 673, 683, 683, 696, 701, 707, 713, 719,
+ 719, 732, 732, 742, 742, 752, 752, 762, 762, 772,
+ 772, 782, 782, 792, 792, 802, 802, 812, 812, 829,
+ 842, 853, 864, 869, 873, 879, 884, 892, 892, 898,
+ 898, 904, 904, 912, 924, 937, 946, 956, 961, 977,
+ 982, 986, 992, 997, 1001, 1007, 1012, 1016, 1020, 1024,
+ 1028, 1036, 1046, 1051, 1067, 1072, 1076, 1080, 1084, 1088,
+ 1092, 1096, 1105, 1117, 1130, 1130, 1141, 1147, 1153, 1162,
+ 1170, 1179, 1192, 1192, 1198, 1200, 1207, 1219, 1227, 1238,
+ 1248, 1255, 1261, 1267, 1272, 1277, 1282, 1287, 1300, 1305,
+ 1309, 1315, 1320, 1326, 1331, 1339, 1345, 1360, 1365, 1369,
+ 1376, 1382, 1398, 1406, 1412, 1417, 1422, 1431, 1438, 1448,
+ 1455, 1466, 1472, 1477, 1482, 1487, 1492, 1497, 1506, 1511,
+ 1527, 1532, 1536, 1540, 1546, 1551, 1559, 1564, 1572, 1581,
+ 1590, 1595, 1599, 1604, 1609, 1614, 1619, 1624, 1629, 1634,
+ 1639, 1644, 1654, 1663, 1674, 1679, 1683, 1688, 1693, 1698,
+ 1703, 1708, 1713, 1718, 1723
};
#endif
@@ -420,22 +421,22 @@ static const char *const yytname[] =
"IMPURE", "PRELOAD", "LOADONCALL", "DISCARDABLE", "NOT", "QUOTEDSTRING",
"STRING", "NUMBER", "SIZEDSTRING", "IGNORED_TOKEN", "'|'", "'^'", "'&'",
"'+'", "'-'", "'*'", "'/'", "'%'", "'~'", "NEG", "','", "'='", "'('",
- "')'", "input", "newcmd", "accelerator", "acc_entries", "acc_entry",
- "acc_event", "acc_options", "acc_option", "bitmap", "cursor", "dialog",
- "@1", "@2", "@3", "exstyle", "styles", "@4", "controls", "control",
- "@5", "@6", "@7", "@8", "@9", "@10", "@11", "@12", "@13", "@14", "@15",
- "@16", "@17", "@18", "@19", "@20", "@21", "@22", "@23", "@24", "@25",
+ "')'", "input", "accelerator", "acc_entries", "acc_entry", "acc_event",
+ "acc_options", "acc_option", "bitmap", "cursor", "dialog", "@1", "@2",
+ "@3", "exstyle", "styles", "controls", "control", "@4", "@5", "@6",
+ "@7", "@8", "@9", "@10", "@11", "@12", "@13", "@14", "@15", "@16",
+ "@17", "@18", "@19", "@20", "@21", "@22", "@23", "@24",
"control_params", "optstringc", "opt_control_data", "control_styleexpr",
- "@26", "icon_styleexpr", "@27", "control_params_styleexpr", "@28",
+ "@25", "icon_styleexpr", "@26", "control_params_styleexpr", "@27",
"font", "icon", "language", "menu", "menuitems", "menuitem",
"menuitem_flags", "menuitem_flag", "menuex", "menuexitems",
- "menuexitem", "messagetable", "rcdata", "optrcdata_data", "@29",
- "optrcdata_data_int", "rcdata_data", "stringtable", "@30",
+ "menuexitem", "messagetable", "rcdata", "optrcdata_data", "@28",
+ "optrcdata_data_int", "rcdata_data", "stringtable", "@29",
"string_data", "user", "versioninfo", "fixedverinfo", "verblocks",
"vervals", "vertrans", "id", "resname", "resref", "suboptions",
"memflags_move_discard", "memflags_move", "memflag", "file_name",
"styleexpr", "parennumber", "optcnumexpr", "cnumexpr", "numexpr",
- "sizednumexpr", "cposnumexpr", "posnumexpr", "sizedposnumexpr", NULL
+ "sizednumexpr", "cposnumexpr", "posnumexpr", "sizedposnumexpr", 0
};
#endif
@@ -443,60 +444,60 @@ static const char *const yytname[] =
static const short yyr1[] =
{
0, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 100, 101, 102,
- 102, 103, 103, 104, 104, 105, 105, 105, 106, 106,
- 106, 106, 106, 106, 107, 108, 110, 109, 111, 109,
- 112, 109, 113, 113, 114, 114, 114, 115, 114, 114,
- 114, 114, 114, 114, 114, 114, 116, 116, 118, 117,
- 119, 117, 120, 117, 121, 117, 122, 117, 123, 117,
- 117, 117, 117, 117, 124, 117, 125, 117, 126, 117,
- 127, 117, 128, 117, 117, 117, 117, 117, 129, 117,
- 130, 117, 131, 117, 132, 117, 133, 117, 134, 117,
- 135, 117, 136, 117, 137, 117, 138, 117, 139, 139,
- 139, 140, 140, 140, 141, 141, 143, 142, 145, 144,
- 147, 146, 148, 149, 150, 151, 152, 152, 153, 153,
- 153, 154, 154, 154, 155, 155, 155, 155, 155, 155,
- 156, 157, 157, 158, 158, 158, 158, 158, 158, 158,
- 158, 159, 160, 162, 161, 163, 163, 164, 164, 164,
- 164, 166, 165, 167, 167, 167, 168, 168, 169, 170,
- 170, 170, 170, 170, 170, 170, 170, 171, 171, 171,
- 172, 172, 173, 173, 174, 174, 175, 175, 175, 176,
- 176, 177, 177, 177, 177, 177, 178, 178, 179, 179,
- 180, 180, 180, 180, 180, 180, 180, 181, 181, 182,
- 182, 182, 182, 183, 183, 184, 184, 185, 186, 187,
- 187, 187, 187, 187, 187, 187, 187, 187, 187, 187,
- 187, 188, 189, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190
+ 99, 99, 99, 99, 99, 99, 99, 100, 101, 101,
+ 102, 102, 103, 103, 104, 104, 104, 105, 105, 105,
+ 105, 105, 105, 106, 107, 109, 108, 110, 108, 111,
+ 108, 112, 112, 113, 113, 113, 113, 113, 113, 113,
+ 113, 113, 113, 113, 113, 113, 113, 114, 114, 116,
+ 115, 117, 115, 118, 115, 119, 115, 120, 115, 121,
+ 115, 115, 115, 115, 115, 122, 115, 123, 115, 124,
+ 115, 125, 115, 126, 115, 115, 115, 115, 115, 127,
+ 115, 128, 115, 129, 115, 130, 115, 131, 115, 132,
+ 115, 133, 115, 134, 115, 135, 115, 136, 115, 137,
+ 137, 137, 138, 138, 138, 139, 139, 141, 140, 143,
+ 142, 145, 144, 146, 147, 148, 149, 150, 150, 151,
+ 151, 151, 152, 152, 152, 153, 153, 153, 153, 153,
+ 153, 154, 155, 155, 156, 156, 156, 156, 156, 156,
+ 156, 156, 157, 158, 160, 159, 161, 161, 162, 162,
+ 162, 162, 164, 163, 165, 165, 165, 166, 166, 167,
+ 168, 168, 168, 168, 168, 168, 168, 168, 169, 169,
+ 169, 170, 170, 171, 171, 172, 172, 173, 173, 173,
+ 174, 174, 175, 175, 175, 175, 175, 176, 176, 177,
+ 177, 178, 178, 178, 178, 178, 178, 178, 179, 179,
+ 180, 180, 180, 180, 181, 181, 182, 182, 183, 184,
+ 185, 185, 185, 185, 185, 185, 185, 185, 185, 185,
+ 185, 185, 186, 187, 188, 188, 188, 188, 188, 188,
+ 188, 188, 188, 188, 188
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const short yyr2[] =
{
- 0, 0, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 0, 6, 0,
- 2, 2, 4, 1, 1, 1, 3, 2, 1, 1,
- 1, 1, 1, 1, 4, 4, 0, 13, 0, 13,
- 0, 14, 0, 3, 0, 3, 3, 0, 4, 3,
- 5, 7, 3, 3, 4, 3, 0, 2, 0, 3,
- 0, 3, 0, 3, 0, 3, 0, 3, 0, 3,
- 11, 12, 12, 13, 0, 3, 0, 3, 0, 3,
- 0, 3, 0, 3, 6, 8, 10, 11, 0, 3,
- 0, 3, 0, 3, 0, 3, 0, 3, 0, 3,
- 0, 3, 0, 3, 0, 3, 0, 16, 7, 9,
- 10, 0, 1, 2, 0, 3, 0, 3, 0, 3,
- 0, 3, 4, 4, 3, 6, 0, 2, 4, 2,
- 6, 0, 3, 2, 1, 1, 1, 1, 1, 1,
- 6, 0, 2, 2, 3, 5, 2, 5, 6, 7,
- 9, 4, 6, 0, 2, 0, 1, 1, 1, 3,
- 3, 0, 6, 0, 3, 4, 6, 4, 6, 0,
- 6, 6, 3, 3, 3, 3, 3, 0, 8, 7,
- 0, 5, 0, 3, 1, 1, 1, 2, 2, 2,
- 1, 0, 2, 3, 4, 3, 0, 2, 0, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 3, 4, 1, 3, 0, 1, 2, 1, 1,
- 3, 2, 2, 3, 3, 3, 3, 3, 3, 3,
- 3, 2, 1, 1, 3, 2, 3, 3, 3, 3,
- 3, 3, 3, 3
+ 0, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 6, 0, 2,
+ 2, 4, 1, 1, 1, 3, 2, 1, 1, 1,
+ 1, 1, 1, 4, 4, 0, 13, 0, 13, 0,
+ 14, 0, 3, 0, 3, 3, 3, 3, 3, 5,
+ 6, 7, 8, 3, 3, 4, 3, 0, 2, 0,
+ 3, 0, 3, 0, 3, 0, 3, 0, 3, 0,
+ 3, 11, 12, 12, 13, 0, 3, 0, 3, 0,
+ 3, 0, 3, 0, 3, 6, 8, 10, 11, 0,
+ 3, 0, 3, 0, 3, 0, 3, 0, 3, 0,
+ 3, 0, 3, 0, 3, 0, 3, 0, 16, 7,
+ 9, 10, 0, 1, 2, 0, 3, 0, 3, 0,
+ 3, 0, 3, 4, 4, 3, 6, 0, 2, 4,
+ 2, 6, 0, 3, 2, 1, 1, 1, 1, 1,
+ 1, 6, 0, 2, 2, 3, 5, 2, 5, 6,
+ 7, 9, 4, 6, 0, 2, 0, 1, 1, 1,
+ 3, 3, 0, 6, 0, 3, 4, 6, 4, 6,
+ 0, 6, 6, 3, 3, 3, 3, 3, 0, 8,
+ 7, 0, 5, 0, 3, 1, 1, 1, 2, 2,
+ 2, 1, 0, 2, 3, 4, 3, 0, 2, 0,
+ 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 3, 4, 1, 3, 0, 1, 2, 1,
+ 1, 3, 2, 2, 3, 3, 3, 3, 3, 3,
+ 3, 3, 2, 1, 1, 3, 2, 3, 3, 3,
+ 3, 3, 3, 3, 3
};
/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
@@ -504,290 +505,290 @@ static const short yyr2[] =
error. */
static const short yydefact[] =
{
- 1, 17, 0, 0, 191, 185, 233, 16, 0, 0,
- 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 14, 15, 0, 184, 232, 219, 0, 0,
- 0, 0, 218, 0, 235, 0, 191, 198, 196, 198,
- 198, 196, 196, 191, 191, 198, 191, 169, 191, 0,
- 0, 0, 0, 0, 0, 0, 0, 222, 221, 0,
- 0, 124, 0, 0, 0, 0, 0, 0, 0, 0,
- 161, 0, 0, 0, 200, 201, 202, 203, 204, 205,
- 206, 192, 234, 0, 0, 0, 42, 42, 0, 0,
- 0, 0, 0, 0, 0, 0, 243, 242, 241, 239,
- 240, 236, 237, 238, 220, 217, 230, 229, 228, 226,
- 227, 223, 224, 225, 163, 0, 193, 195, 19, 207,
- 208, 199, 34, 197, 35, 0, 0, 0, 122, 123,
- 126, 141, 151, 153, 177, 0, 0, 0, 0, 0,
- 0, 0, 153, 167, 0, 194, 0, 0, 0, 0,
- 0, 0, 0, 155, 0, 0, 0, 172, 173, 174,
- 175, 176, 0, 162, 0, 18, 23, 20, 0, 24,
- 43, 0, 0, 125, 0, 0, 127, 140, 0, 0,
- 142, 152, 157, 154, 156, 158, 168, 0, 0, 0,
- 0, 166, 164, 0, 0, 21, 0, 0, 129, 0,
- 131, 146, 143, 0, 0, 0, 0, 0, 0, 165,
- 231, 0, 36, 38, 131, 0, 144, 141, 0, 159,
- 160, 0, 0, 170, 171, 28, 29, 30, 31, 32,
- 33, 22, 25, 44, 44, 40, 128, 126, 134, 135,
- 136, 137, 138, 139, 0, 133, 215, 0, 141, 0,
- 180, 182, 0, 27, 0, 0, 44, 0, 132, 145,
- 216, 147, 0, 141, 215, 0, 0, 26, 56, 0,
- 0, 0, 47, 0, 0, 0, 0, 0, 56, 0,
- 130, 148, 0, 0, 0, 0, 179, 0, 0, 49,
- 45, 46, 0, 0, 0, 53, 55, 52, 0, 56,
- 149, 141, 178, 0, 183, 37, 111, 58, 60, 62,
- 66, 68, 74, 76, 78, 80, 90, 92, 94, 96,
- 98, 100, 102, 104, 0, 64, 82, 88, 0, 57,
- 0, 213, 0, 48, 209, 0, 54, 39, 0, 0,
- 0, 112, 0, 111, 111, 111, 111, 111, 111, 111,
- 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
- 0, 111, 111, 111, 186, 0, 190, 0, 0, 210,
- 0, 0, 50, 41, 150, 181, 113, 0, 59, 0,
- 61, 63, 67, 69, 75, 77, 79, 81, 91, 93,
- 95, 97, 99, 101, 103, 105, 0, 65, 83, 89,
- 187, 188, 0, 189, 214, 0, 211, 0, 0, 0,
- 0, 0, 0, 212, 51, 0, 116, 0, 0, 0,
- 114, 0, 0, 0, 0, 0, 153, 84, 0, 0,
- 117, 0, 0, 0, 0, 114, 0, 0, 114, 0,
- 115, 118, 85, 215, 0, 215, 120, 108, 215, 0,
- 0, 114, 216, 215, 114, 216, 0, 114, 216, 0,
- 119, 86, 114, 114, 216, 70, 114, 121, 109, 114,
- 0, 87, 72, 114, 71, 110, 0, 73, 106, 0,
- 215, 107, 0, 0
+ 1, 0, 0, 192, 186, 234, 16, 0, 0, 2,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 0, 185, 233, 220, 0, 0, 0,
+ 0, 219, 0, 236, 0, 192, 199, 197, 199, 199,
+ 197, 197, 192, 192, 199, 192, 170, 192, 0, 0,
+ 0, 0, 0, 0, 0, 0, 223, 222, 0, 0,
+ 125, 0, 0, 0, 0, 0, 0, 0, 0, 162,
+ 0, 0, 0, 201, 202, 203, 204, 205, 206, 207,
+ 193, 235, 0, 0, 0, 41, 41, 0, 0, 0,
+ 0, 0, 0, 0, 0, 244, 243, 242, 240, 241,
+ 237, 238, 239, 221, 218, 231, 230, 229, 227, 228,
+ 224, 225, 226, 164, 0, 194, 196, 18, 208, 209,
+ 200, 33, 198, 34, 0, 0, 0, 123, 124, 127,
+ 142, 152, 154, 178, 0, 0, 0, 0, 0, 0,
+ 0, 154, 168, 0, 195, 0, 0, 0, 0, 0,
+ 0, 0, 156, 0, 0, 0, 173, 174, 175, 176,
+ 177, 0, 163, 0, 17, 22, 19, 0, 23, 42,
+ 0, 0, 126, 0, 0, 128, 141, 0, 0, 143,
+ 153, 158, 155, 157, 159, 169, 0, 0, 0, 0,
+ 167, 165, 0, 0, 20, 0, 0, 130, 0, 132,
+ 147, 144, 0, 0, 0, 0, 0, 0, 166, 232,
+ 0, 35, 37, 132, 0, 145, 142, 0, 160, 161,
+ 0, 0, 171, 172, 27, 28, 29, 30, 31, 32,
+ 21, 24, 43, 43, 39, 129, 127, 135, 136, 137,
+ 138, 139, 140, 0, 134, 216, 0, 142, 0, 181,
+ 183, 0, 26, 0, 0, 43, 0, 133, 146, 217,
+ 148, 0, 142, 216, 0, 0, 25, 57, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 57, 0, 131,
+ 149, 0, 0, 0, 0, 180, 0, 0, 47, 44,
+ 48, 45, 0, 214, 0, 46, 210, 0, 0, 54,
+ 56, 53, 0, 57, 150, 142, 179, 0, 184, 36,
+ 112, 59, 61, 63, 67, 69, 75, 77, 79, 81,
+ 91, 93, 95, 97, 99, 101, 103, 105, 0, 65,
+ 83, 89, 0, 58, 211, 0, 0, 0, 55, 38,
+ 0, 0, 0, 113, 0, 112, 112, 112, 112, 112,
+ 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
+ 112, 112, 0, 112, 112, 112, 187, 0, 191, 0,
+ 0, 215, 0, 212, 49, 40, 151, 182, 114, 0,
+ 60, 0, 62, 64, 68, 70, 76, 78, 80, 82,
+ 92, 94, 96, 98, 100, 102, 104, 106, 0, 66,
+ 84, 90, 188, 189, 0, 190, 213, 50, 0, 0,
+ 0, 0, 0, 51, 0, 117, 0, 0, 0, 115,
+ 52, 0, 0, 0, 0, 0, 154, 85, 0, 0,
+ 118, 0, 0, 0, 0, 115, 0, 0, 115, 0,
+ 116, 119, 86, 216, 0, 216, 121, 109, 216, 0,
+ 0, 115, 217, 216, 115, 217, 0, 115, 217, 0,
+ 120, 87, 115, 115, 217, 71, 115, 122, 110, 115,
+ 0, 88, 73, 115, 72, 111, 0, 74, 107, 0,
+ 216, 108, 0, 0
};
static const short yydefgoto[] =
{
- 1, 2, 10, 146, 167, 168, 231, 232, 11, 12,
- 13, 233, 234, 256, 126, 254, 292, 288, 329, 343,
- 344, 345, 361, 346, 347, 348, 349, 350, 351, 362,
- 363, 352, 353, 354, 355, 356, 357, 358, 359, 479,
- 378, 379, 427, 417, 422, 443, 450, 448, 456, 14,
- 15, 16, 17, 150, 176, 215, 245, 18, 151, 180,
- 19, 20, 152, 153, 183, 184, 21, 114, 144, 22,
- 23, 94, 154, 265, 266, 24, 366, 367, 33, 85,
- 84, 81, 122, 333, 334, 259, 260, 105, 32, 195,
- 25, 26
+ 1, 9, 145, 166, 167, 230, 231, 10, 11, 12,
+ 232, 233, 255, 125, 253, 287, 333, 345, 346, 347,
+ 363, 348, 349, 350, 351, 352, 353, 364, 365, 354,
+ 355, 356, 357, 358, 359, 360, 361, 479, 380, 381,
+ 427, 416, 422, 443, 450, 448, 456, 13, 14, 15,
+ 16, 149, 175, 214, 244, 17, 150, 179, 18, 19,
+ 151, 152, 182, 183, 20, 113, 143, 21, 22, 93,
+ 153, 264, 265, 23, 368, 369, 32, 84, 83, 80,
+ 121, 295, 296, 258, 259, 104, 31, 194, 24, 25
};
static const short yypact[] =
{
- -32768, 31, 240, 241,-32768,-32768,-32768,-32768, 241, 241,
+ -32768, 13, 412,-32768,-32768,-32768,-32768, 412, 412,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768, 68,-32768, 578,-32768, 241, 241,
- 241, -73, 586, 169,-32768, 388,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 241,
- 241, 241, 241, 241, 241, 241, 241,-32768,-32768, 513,
- 241,-32768, 241, 241, 241, 241, 241, 241, 241, 241,
- -32768, 241, 241, 241,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768, 215, 581, 581, 268, 268, 581, 581,
- 232, 275, 581, 283, 250, 156, 593, 599, 616, 98,
- 98,-32768,-32768,-32768,-32768,-32768, 593, 599, 616, 98,
- 98,-32768,-32768,-32768,-32768, -73,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768, -61, 290, 290,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768, 241, 241, 241, 241, 241,
- 241, 241,-32768,-32768, 4,-32768, 5, 241, -73, -73,
- 9, 92, 32, 309, 10, -73, -73,-32768,-32768,-32768,
- -32768,-32768, 54,-32768, -57,-32768,-32768,-32768, -20,-32768,
- -32768, -73, -73,-32768, 39, -9,-32768,-32768, 40, 11,
- -32768,-32768,-32768,-32768, 36, 586,-32768, 145, 151, -73,
- -73,-32768,-32768, 78, 290, 79, -73, -73,-32768, -73,
- -32768,-32768, -73, 16, 365, 106, 108, -73, -73,-32768,
- -32768, 686,-32768, -73,-32768, 52, -73,-32768, 17,-32768,
- 586, 178, 128,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768, 34,-32768,-32768,-32768,-32768, 314,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768, 647,-32768, -73, 95,-32768, 18,
- -32768,-32768, 686,-32768, 150, 378,-32768, 112,-32768,-32768,
- -32768,-32768, 123,-32768, -73, 6, 29,-32768,-32768, 241,
- 129, 281,-32768, 241, 241, 241, 241, 281,-32768, 452,
- -32768,-32768, 135, 200, 213, 143,-32768, -73, 479,-32768,
- -32768,-32768, 182, 91, -73,-32768,-32768,-32768, 516,-32768,
- -32768,-32768,-32768, 130,-32768,-32768, 147,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768, 158,-32768,-32768,-32768, 170,-32768,
- 73,-32768, 241, 154,-32768, 160,-32768,-32768, 553, 172,
- 168, 161, 241, 147, 147, 147, 147, 147, 147, 147,
- 147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
- 173, 147, 147, 147, 174, 186,-32768, 241, 187,-32768,
- 196, 183, -73,-32768,-32768,-32768,-32768, 201,-32768, 241,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768, 241,-32768,-32768,-32768,
- -32768,-32768, -73,-32768,-32768, 73,-32768, -73, 293, 202,
- -73, 203, -73,-32768,-32768, 202,-32768, -73, -73, 241,
- 22, -73, 182, -73, -73, 205,-32768,-32768, -73, -73,
- 154, -73, -73, 241, 297, 26, -73, -73, 27, 208,
- -32768,-32768,-32768, -73, -73, -73,-32768,-32768, -73, 241,
- 182, 251, -73, -73, 251, -73, 182, 251, -73, 230,
- 154,-32768, 251, 251, -73,-32768, 251, 154,-32768, 251,
- 241,-32768,-32768, 251,-32768,-32768, 236,-32768,-32768, 182,
- -11,-32768, 332,-32768
+ -32768,-32768,-32768, 111,-32768, 511,-32768, 412, 412, 412,
+ -79, 600, 244,-32768, 562,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 412, 412,
+ 412, 412, 412, 412, 412, 412,-32768,-32768, 576, 412,
+ -32768, 412, 412, 412, 412, 412, 412, 412, 412,-32768,
+ 412, 412, 412,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768, 256, 603, 603, 297, 297, 603, 603, 280,
+ 337, 603, 345, 100, 231, 607, 613, 567, 172, 172,
+ -32768,-32768,-32768,-32768,-32768, 607, 613, 567, 172, 172,
+ -32768,-32768,-32768,-32768, -79,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768,-32768, -60, 63, 63,-32768,-32768,-32768,
+ -32768,-32768,-32768,-32768, 412, 412, 412, 412, 412, 412,
+ 412,-32768,-32768, 7,-32768, 5, 412, -79, -79, 33,
+ 34, 35, 254, 51, -79, -79,-32768,-32768,-32768,-32768,
+ -32768, 36,-32768, 60,-32768,-32768,-32768, -38,-32768,-32768,
+ -79, -79,-32768, -39, 11,-32768,-32768, 59, 25,-32768,
+ -32768,-32768,-32768, 27, 600,-32768, 127, 144, -79, -79,
+ -32768,-32768, 74, 63, 87, -79, -79,-32768, -79,-32768,
+ -32768, -79, 12, 294, 118, 128, -79, -79,-32768,-32768,
+ 700,-32768, -79,-32768, 22, -79,-32768, 14,-32768, 600,
+ 194, 121,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 23,-32768,-32768,-32768,-32768, 309,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768, 661,-32768, -79, 38,-32768, 16,-32768,
+ -32768, 700,-32768, 383, 472,-32768, 42,-32768,-32768,-32768,
+ -32768, 124,-32768, -79, 10, 4,-32768,-32768, 412, 126,
+ 187, 99, 412, 412, 412, 412, 200,-32768, 480,-32768,
+ -32768, 125, 204, 207, 135,-32768, -79, 510,-32768,-32768,
+ -32768,-32768, 49,-32768, 412, 136,-32768, 133, -79,-32768,
+ -32768,-32768, 547,-32768,-32768,-32768,-32768, 134,-32768,-32768,
+ 152,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 153,-32768,
+ -32768,-32768, 374,-32768,-32768, 140, 112, 157,-32768,-32768,
+ 584, 138, 160, 148, 412, 152, 152, 152, 152, 152,
+ 152, 152, 152, 152, 152, 152, 152, 152, 152, 152,
+ 152, 152, 158, 152, 152, 152, 161, 163,-32768, 412,
+ 165,-32768, 49,-32768, -79,-32768,-32768,-32768,-32768, 170,
+ -32768, 412,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 412,-32768,
+ -32768,-32768,-32768,-32768, -79,-32768,-32768, -79, 123, 183,
+ -79, 184, -79, -79, 183,-32768, -79, -79, 412, 17,
+ -32768, -79, 99, -79, -79, 190,-32768,-32768, -79, -79,
+ 136, -79, -79, 412, 248, 18, -79, -79, 19, 195,
+ -32768,-32768,-32768, -79, -79, -79,-32768,-32768, -79, 412,
+ 99, 245, -79, -79, 245, -79, 99, 245, -79, 196,
+ 136,-32768, 245, 245, -79,-32768, 245, 136,-32768, 245,
+ 412,-32768,-32768, 245,-32768,-32768, 201,-32768,-32768, 99,
+ 64,-32768, 295,-32768
};
static const short yypgoto[] =
{
- -32768,-32768,-32768,-32768,-32768,-32768,-32768, -220,-32768,-32768,
- -32768,-32768,-32768,-32768, 248, -222,-32768, -262,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768,-32768,-32768,-32768, -206,-32768,-32768,-32768,
+ -32768,-32768,-32768, 212, -85, -259,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 289, 30, 159, -44,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768, 117,-32768, 163, 140,-32768, -171,-32768,
- -32768,-32768, -141,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- -32768,-32768,-32768,-32768,-32768, -22,-32768,-32768, 486, -24,
- 55, 480, 316, -304, -315, -261, 8, -3, -2,-32768,
- -122,-32768
+ -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 281, -8,
+ -212, -104,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -32768, 78,-32768, 113, 92,-32768, -204,-32768,-32768,-32768,
+ -140,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -32768,-32768,-32768, -21,-32768,-32768, 350, 139, 175, 475,
+ 416, -329, -257, -258, 29, -2, -1,-32768, -122,-32768
};
-#define YYLAST 708
+#define YYLAST 717
static const short yytable[] =
{
- 31, 162, 48, 283, 148, 149, 34, 35, 163, 165,
- 284, 253, 255, 173, 186, 369, 298, 88, 89, 217,
- 248, 263, 60, 192, 169, 426, 57, 58, 59, 426,
- 426, 482, 267, 286, 279, 147, 181, 338, 193, 61,
- 225, 226, 227, 228, 229, 230, 247, 96, 97, 98,
- 99, 100, 101, 102, 103, 237, 406, 174, 191, 175,
- 106, 107, 108, 109, 110, 111, 112, 113, 115, 116,
- 117, 200, 210, 36, 371, 194, 285, 262, 187, 188,
- 37, 38, 39, 40, 60, 166, 27, 6, 198, 201,
- 413, 203, 282, 28, 86, 87, 177, 29, 8, 261,
- 92, 30, 9, 238, 239, 240, 241, 242, 243, 41,
- 42, 60, 60, 60, 43, 44, 280, 60, 430, 199,
- 202, 441, 446, 145, 60, 45, 46, 281, 47, 252,
- 339, 204, 155, 156, 157, 158, 159, 160, 161, 300,
- 178, 164, 179, 178, 170, 179, 460, 244, 205, 5,
- 6, 185, 467, 268, 206, 331, 171, 172, 209, 142,
- 174, 8, 175, 189, 190, 9, 269, 270, 271, 272,
- 332, 178, 70, 179, 211, 480, 374, 221, 222, 196,
- 197, 250, 451, 178, 454, 179, 335, 457, 67, 68,
- 69, 273, 463, 274, 275, 276, 277, 207, 208, 71,
- 72, 73, 220, 301, 212, 213, 368, 214, 251, 290,
- 216, 218, 71, 72, 73, 223, 224, 302, 118, 481,
- 178, 235, 179, 303, 246, 340, 249, 341, 74, 75,
- 76, 77, 78, 79, 80, 130, 119, 120, 360, 371,
- 372, 74, 75, 76, 77, 78, 79, 80, 375, 291,
- 364, 365, 6, 134, 426, 297, 376, 264, 71, 72,
- 73, 330, 405, 8, 331, 331, 289, 9, 396, 400,
- 293, 294, 295, 296, 287, 71, 72, 73, 131, 332,
- 332, 401, 403, 3, 125, 434, 133, 74, 75, 76,
- 77, 78, 79, 80, 404, 304, 408, 416, 419, 4,
- 433, 440, 336, 449, 74, 75, 76, 77, 78, 79,
- 80, 135, 136, 137, 138, 139, 140, 141, 71, 72,
- 73, 5, 6, 27, 7, 470, 71, 72, 73, 370,
- 28, 478, 483, 8, 29, 127, 342, 9, 30, 377,
- 74, 75, 76, 77, 78, 79, 80, 74, 75, 76,
- 77, 78, 79, 80, 257, 74, 75, 76, 77, 78,
- 79, 80, 5, 6, 402, 238, 239, 240, 241, 242,
- 243, 421, 6, 415, 8, 27, 410, 236, 9, 0,
- 407, 278, 28, 8, 258, 409, 29, 9, 0, 0,
- 30, 27, 182, 411, 269, 270, 271, 272, 28, 0,
- 0, 124, 29, 0, 128, 129, 30, 0, 132, 244,
- 412, 143, 0, 0, 0, 414, 425, 0, 418, 273,
- 420, 274, 275, 276, 277, 423, 424, 0, 428, 429,
- 439, 431, 432, 0, 0, 0, 435, 436, 0, 437,
- 438, 0, 0, 0, 444, 445, 459, 27, 219, 0,
- 0, 452, 453, 455, 28, 299, 458, 0, 29, 0,
- 462, 464, 30, 466, 0, 0, 469, 476, 269, 270,
- 271, 272, 473, 62, 63, 64, 65, 66, 67, 68,
- 69, 0, 0, 305, 0, 0, 82, 0, 0, 306,
- 0, 0, 0, 273, 0, 274, 275, 276, 277, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 320, 321, 322, 323, 324, 325, 326, 327,
- 337, 328, 83, 0, 0, 0, 306, 0, 0, 90,
- 91, 0, 93, 0, 95, 0, 307, 308, 309, 310,
+ 30, 161, 47, 147, 148, 282, 33, 34, 285, 164,
+ 197, 162, 246, 482, 283, 216, 59, 247, 302, 262,
+ 426, 426, 426, 168, 252, 236, 56, 57, 58, 224,
+ 225, 226, 227, 228, 229, 334, 146, 172, 176, 180,
+ 190, 198, 260, 261, 340, 266, 279, 95, 96, 97,
+ 98, 99, 100, 101, 102, 185, 2, 193, 281, 60,
+ 105, 106, 107, 108, 109, 110, 111, 112, 114, 115,
+ 116, 209, 3, 237, 238, 239, 240, 241, 242, 373,
+ 284, 173, 177, 174, 178, 165, 177, 5, 178, 26,
+ 173, 199, 174, 430, 4, 5, 27, 6, 7, 59,
+ 28, 341, 8, 133, 29, 202, 7, 59, 200, 59,
+ 8, 59, 59, 441, 446, 406, 35, 243, 251, 186,
+ 187, 460, 203, 36, 37, 38, 39, 467, 280, 304,
+ 204, 293, 154, 155, 156, 157, 158, 159, 160, 201,
+ 191, 163, 376, 144, 169, 5, 294, 205, 254, 336,
+ 480, 184, 40, 41, 208, 192, 7, 42, 43, 59,
+ 8, 134, 135, 136, 137, 138, 139, 140, 44, 45,
+ 278, 46, 177, 177, 178, 178, 170, 171, 292, 87,
+ 88, 293, 210, 188, 189, 451, 177, 454, 178, 220,
+ 457, 372, 4, 5, 293, 463, 294, 249, 221, 195,
+ 196, 250, 219, 414, 7, 26, 289, 305, 8, 294,
+ 370, 306, 27, 85, 86, 307, 28, 206, 207, 91,
+ 29, 336, 481, 442, 211, 212, 447, 213, 337, 342,
+ 215, 217, 343, 362, 141, 222, 223, 374, 371, 461,
+ 377, 234, 465, 378, 245, 468, 248, 69, 426, 291,
+ 471, 472, 440, 398, 474, 301, 402, 475, 403, 117,
+ 405, 477, 66, 67, 68, 408, 288, 290, 4, 5,
+ 297, 298, 299, 300, 70, 71, 72, 263, 415, 418,
+ 7, 4, 5, 129, 8, 433, 434, 70, 71, 72,
+ 449, 470, 335, 7, 286, 483, 478, 8, 126, 70,
+ 71, 72, 344, 73, 74, 75, 76, 77, 78, 79,
+ 421, 118, 119, 124, 256, 308, 73, 74, 75, 76,
+ 77, 78, 79, 70, 71, 72, 235, 338, 73, 74,
+ 75, 76, 77, 78, 79, 257, 26, 181, 0, 0,
+ 130, 0, 379, 27, 0, 0, 0, 28, 132, 0,
+ 0, 29, 73, 74, 75, 76, 77, 78, 79, 0,
+ 237, 238, 239, 240, 241, 242, 0, 404, 0, 73,
+ 74, 75, 76, 77, 78, 79, 26, 218, 0, 410,
+ 70, 71, 72, 27, 0, 82, 267, 28, 70, 71,
+ 72, 29, 89, 90, 0, 92, 411, 94, 0, 268,
+ 269, 270, 271, 407, 243, 0, 0, 0, 409, 73,
+ 74, 75, 76, 77, 78, 79, 425, 73, 74, 75,
+ 76, 77, 78, 79, 272, 0, 273, 274, 275, 276,
+ 0, 439, 0, 412, 0, 0, 413, 0, 0, 417,
+ 0, 419, 420, 0, 0, 423, 424, 459, 428, 0,
+ 429, 0, 431, 432, 366, 367, 5, 435, 436, 0,
+ 437, 438, 0, 0, 0, 444, 445, 7, 476, 0,
+ 0, 8, 452, 453, 455, 277, 0, 458, 0, 0,
+ 0, 462, 464, 303, 466, 0, 0, 469, 268, 269,
+ 270, 271, 0, 473, 26, 0, 268, 269, 270, 271,
+ 123, 27, 0, 127, 128, 28, 0, 131, 0, 29,
+ 142, 0, 0, 272, 309, 273, 274, 275, 276, 0,
+ 310, 272, 0, 273, 274, 275, 276, 0, 0, 0,
311, 312, 313, 314, 315, 316, 317, 318, 319, 320,
- 321, 322, 323, 324, 325, 326, 327, 373, 328, 0,
- 0, 0, 0, 306, 121, 123, 121, 121, 123, 123,
- 0, 0, 121, 307, 308, 309, 310, 311, 312, 313,
+ 321, 322, 323, 324, 325, 326, 327, 328, 329, 330,
+ 331, 339, 332, 0, 0, 0, 0, 310, 120, 122,
+ 120, 120, 122, 122, 0, 0, 120, 311, 312, 313,
314, 315, 316, 317, 318, 319, 320, 321, 322, 323,
- 324, 325, 326, 327, 442, 328, 0, 447, 62, 63,
- 64, 65, 66, 67, 68, 69, 0, 0, 0, 0,
- 461, 104, 0, 465, 0, 0, 468, 0, 0, 0,
- 0, 471, 472, 0, 0, 474, 0, 0, 475, 0,
- 0, 0, 477, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 391, 392, 393, 394, 395, 0,
- 397, 398, 399, 74, 75, 76, 77, 78, 79, 80,
- 0, 119, 120, 49, 50, 51, 52, 53, 54, 55,
- 56, 62, 63, 64, 65, 66, 67, 68, 69, 63,
- 64, 65, 66, 67, 68, 69, 64, 65, 66, 67,
- 68, 69, 225, 226, 227, 228, 229, 230, 238, 239,
- 240, 241, 242, 243, 65, 66, 67, 68, 69
+ 324, 325, 326, 327, 328, 329, 330, 331, 375, 332,
+ 0, 0, 0, 0, 310, 0, 48, 49, 50, 51,
+ 52, 53, 54, 55, 311, 312, 313, 314, 315, 316,
+ 317, 318, 319, 320, 321, 322, 323, 324, 325, 326,
+ 327, 328, 329, 330, 331, 0, 332, 382, 383, 384,
+ 385, 386, 387, 388, 389, 390, 391, 392, 393, 394,
+ 395, 396, 397, 0, 399, 400, 401, 61, 62, 63,
+ 64, 65, 66, 67, 68, 64, 65, 66, 67, 68,
+ 81, 61, 62, 63, 64, 65, 66, 67, 68, 0,
+ 0, 0, 0, 0, 103, 73, 74, 75, 76, 77,
+ 78, 79, 0, 118, 119, 61, 62, 63, 64, 65,
+ 66, 67, 68, 62, 63, 64, 65, 66, 67, 68,
+ 63, 64, 65, 66, 67, 68, 224, 225, 226, 227,
+ 228, 229, 237, 238, 239, 240, 241, 242
};
static const short yycheck[] =
{
- 3, 142, 24, 264, 126, 127, 8, 9, 4, 4,
- 4, 231, 234, 4, 4, 330, 278, 41, 42, 3,
- 3, 3, 95, 80, 146, 3, 28, 29, 30, 3,
- 3, 0, 252, 4, 256, 96, 4, 299, 95, 31,
- 6, 7, 8, 9, 10, 11, 217, 49, 50, 51,
- 52, 53, 54, 55, 56, 3, 371, 48, 4, 50,
- 62, 63, 64, 65, 66, 67, 68, 69, 71, 72,
- 73, 80, 194, 5, 85, 95, 70, 248, 68, 69,
- 12, 13, 14, 15, 95, 80, 82, 82, 49, 49,
- 405, 80, 263, 89, 39, 40, 4, 93, 93, 4,
- 45, 97, 97, 51, 52, 53, 54, 55, 56, 41,
- 42, 95, 95, 95, 46, 47, 4, 95, 422, 80,
- 80, 95, 95, 115, 95, 57, 58, 4, 60, 95,
- 301, 95, 135, 136, 137, 138, 139, 140, 141, 4,
- 48, 144, 50, 48, 147, 50, 450, 95, 3, 81,
- 82, 153, 456, 3, 3, 82, 148, 149, 80, 3,
- 48, 93, 50, 155, 156, 97, 16, 17, 18, 19,
- 97, 48, 3, 50, 95, 479, 4, 71, 70, 171,
- 172, 3, 443, 48, 445, 50, 95, 448, 90, 91,
- 92, 41, 453, 43, 44, 45, 46, 189, 190, 43,
- 44, 45, 204, 3, 196, 197, 328, 199, 80, 80,
- 202, 203, 43, 44, 45, 207, 208, 4, 3, 480,
- 48, 213, 50, 80, 216, 95, 218, 80, 72, 73,
- 74, 75, 76, 77, 78, 3, 80, 81, 80, 85,
- 80, 72, 73, 74, 75, 76, 77, 78, 80, 271,
- 80, 81, 82, 3, 3, 277, 95, 249, 43, 44,
- 45, 79, 79, 93, 82, 82, 269, 97, 95, 95,
- 273, 274, 275, 276, 266, 43, 44, 45, 3, 97,
- 97, 95, 95, 43, 16, 426, 3, 72, 73, 74,
- 75, 76, 77, 78, 98, 287, 95, 95, 95, 59,
- 95, 4, 294, 95, 72, 73, 74, 75, 76, 77,
- 78, 61, 62, 63, 64, 65, 66, 67, 43, 44,
- 45, 81, 82, 82, 84, 95, 43, 44, 45, 332,
- 89, 95, 0, 93, 93, 87, 306, 97, 97, 342,
- 72, 73, 74, 75, 76, 77, 78, 72, 73, 74,
- 75, 76, 77, 78, 237, 72, 73, 74, 75, 76,
- 77, 78, 81, 82, 367, 51, 52, 53, 54, 55,
- 56, 415, 82, 80, 93, 82, 379, 214, 97, -1,
- 372, 3, 89, 93, 244, 377, 93, 97, -1, -1,
- 97, 82, 83, 396, 16, 17, 18, 19, 89, -1,
- -1, 85, 93, -1, 88, 89, 97, -1, 92, 95,
- 402, 95, -1, -1, -1, 407, 419, -1, 410, 41,
- 412, 43, 44, 45, 46, 417, 418, -1, 420, 421,
- 433, 423, 424, -1, -1, -1, 428, 429, -1, 431,
- 432, -1, -1, -1, 436, 437, 449, 82, 83, -1,
- -1, 443, 444, 445, 89, 3, 448, -1, 93, -1,
- 452, 453, 97, 455, -1, -1, 458, 470, 16, 17,
- 18, 19, 464, 85, 86, 87, 88, 89, 90, 91,
- 92, -1, -1, 4, -1, -1, 98, -1, -1, 10,
- -1, -1, -1, 41, -1, 43, 44, 45, 46, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 4, 42, 36, -1, -1, -1, 10, -1, -1, 43,
- 44, -1, 46, -1, 48, -1, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 4, 42, -1,
- -1, -1, -1, 10, 84, 85, 86, 87, 88, 89,
- -1, -1, 92, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 435, 42, -1, 438, 85, 86,
- 87, 88, 89, 90, 91, 92, -1, -1, -1, -1,
- 451, 98, -1, 454, -1, -1, 457, -1, -1, -1,
- -1, 462, 463, -1, -1, 466, -1, -1, 469, -1,
- -1, -1, 473, 344, 345, 346, 347, 348, 349, 350,
- 351, 352, 353, 354, 355, 356, 357, 358, 359, -1,
- 361, 362, 363, 72, 73, 74, 75, 76, 77, 78,
- -1, 80, 81, 85, 86, 87, 88, 89, 90, 91,
- 92, 85, 86, 87, 88, 89, 90, 91, 92, 86,
- 87, 88, 89, 90, 91, 92, 87, 88, 89, 90,
- 91, 92, 6, 7, 8, 9, 10, 11, 51, 52,
- 53, 54, 55, 56, 88, 89, 90, 91, 92
+ 2, 141, 23, 125, 126, 263, 7, 8, 4, 4,
+ 49, 4, 216, 0, 4, 3, 95, 3, 277, 3,
+ 3, 3, 3, 145, 230, 3, 27, 28, 29, 6,
+ 7, 8, 9, 10, 11, 292, 96, 4, 4, 4,
+ 4, 80, 4, 247, 303, 251, 4, 48, 49, 50,
+ 51, 52, 53, 54, 55, 4, 43, 95, 262, 30,
+ 61, 62, 63, 64, 65, 66, 67, 68, 70, 71,
+ 72, 193, 59, 51, 52, 53, 54, 55, 56, 336,
+ 70, 48, 48, 50, 50, 80, 48, 82, 50, 82,
+ 48, 80, 50, 422, 81, 82, 89, 84, 93, 95,
+ 93, 305, 97, 3, 97, 80, 93, 95, 49, 95,
+ 97, 95, 95, 95, 95, 372, 5, 95, 95, 68,
+ 69, 450, 95, 12, 13, 14, 15, 456, 4, 4,
+ 3, 82, 134, 135, 136, 137, 138, 139, 140, 80,
+ 80, 143, 4, 114, 146, 82, 97, 3, 233, 85,
+ 479, 152, 41, 42, 80, 95, 93, 46, 47, 95,
+ 97, 61, 62, 63, 64, 65, 66, 67, 57, 58,
+ 255, 60, 48, 48, 50, 50, 147, 148, 79, 40,
+ 41, 82, 95, 154, 155, 443, 48, 445, 50, 71,
+ 448, 79, 81, 82, 82, 453, 97, 3, 70, 170,
+ 171, 80, 203, 80, 93, 82, 80, 3, 97, 97,
+ 332, 4, 89, 38, 39, 80, 93, 188, 189, 44,
+ 97, 85, 480, 435, 195, 196, 438, 198, 95, 95,
+ 201, 202, 80, 80, 3, 206, 207, 80, 98, 451,
+ 80, 212, 454, 95, 215, 457, 217, 3, 3, 270,
+ 462, 463, 4, 95, 466, 276, 95, 469, 95, 3,
+ 95, 473, 90, 91, 92, 95, 268, 80, 81, 82,
+ 272, 273, 274, 275, 43, 44, 45, 248, 95, 95,
+ 93, 81, 82, 3, 97, 95, 426, 43, 44, 45,
+ 95, 95, 294, 93, 265, 0, 95, 97, 86, 43,
+ 44, 45, 310, 72, 73, 74, 75, 76, 77, 78,
+ 414, 80, 81, 16, 236, 286, 72, 73, 74, 75,
+ 76, 77, 78, 43, 44, 45, 213, 298, 72, 73,
+ 74, 75, 76, 77, 78, 243, 82, 83, -1, -1,
+ 3, -1, 344, 89, -1, -1, -1, 93, 3, -1,
+ -1, 97, 72, 73, 74, 75, 76, 77, 78, -1,
+ 51, 52, 53, 54, 55, 56, -1, 369, -1, 72,
+ 73, 74, 75, 76, 77, 78, 82, 83, -1, 381,
+ 43, 44, 45, 89, -1, 35, 3, 93, 43, 44,
+ 45, 97, 42, 43, -1, 45, 398, 47, -1, 16,
+ 17, 18, 19, 374, 95, -1, -1, -1, 379, 72,
+ 73, 74, 75, 76, 77, 78, 418, 72, 73, 74,
+ 75, 76, 77, 78, 41, -1, 43, 44, 45, 46,
+ -1, 433, -1, 404, -1, -1, 407, -1, -1, 410,
+ -1, 412, 413, -1, -1, 416, 417, 449, 419, -1,
+ 421, -1, 423, 424, 80, 81, 82, 428, 429, -1,
+ 431, 432, -1, -1, -1, 436, 437, 93, 470, -1,
+ -1, 97, 443, 444, 445, 3, -1, 448, -1, -1,
+ -1, 452, 453, 3, 455, -1, -1, 458, 16, 17,
+ 18, 19, -1, 464, 82, -1, 16, 17, 18, 19,
+ 84, 89, -1, 87, 88, 93, -1, 91, -1, 97,
+ 94, -1, -1, 41, 4, 43, 44, 45, 46, -1,
+ 10, 41, -1, 43, 44, 45, 46, -1, -1, -1,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 4, 42, -1, -1, -1, -1, 10, 83, 84,
+ 85, 86, 87, 88, -1, -1, 91, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 4, 42,
+ -1, -1, -1, -1, 10, -1, 85, 86, 87, 88,
+ 89, 90, 91, 92, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, -1, 42, 346, 347, 348,
+ 349, 350, 351, 352, 353, 354, 355, 356, 357, 358,
+ 359, 360, 361, -1, 363, 364, 365, 85, 86, 87,
+ 88, 89, 90, 91, 92, 88, 89, 90, 91, 92,
+ 98, 85, 86, 87, 88, 89, 90, 91, 92, -1,
+ -1, -1, -1, -1, 98, 72, 73, 74, 75, 76,
+ 77, 78, -1, 80, 81, 85, 86, 87, 88, 89,
+ 90, 91, 92, 86, 87, 88, 89, 90, 91, 92,
+ 87, 88, 89, 90, 91, 92, 6, 7, 8, 9,
+ 10, 11, 51, 52, 53, 54, 55, 56
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/share/bison/bison.simple"
@@ -829,12 +830,6 @@ static const short yycheck[] =
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
-#ifdef __cplusplus
-# define YYSTD(x) std::x
-#else
-# define YYSTD(x) x
-#endif
-
#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -857,18 +852,19 @@ static const short yycheck[] =
/* Pacify GCC's `empty if-body' warning. */
# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# else
-# ifdef __cplusplus
-# include <cstdlib> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T std::size_t
-# else
-# ifdef __STDC__
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
# endif
-# define YYSTACK_ALLOC YYSTD (malloc)
-# define YYSTACK_FREE YYSTD (free)
+# define YYSTACK_ALLOC malloc
+# define YYSTACK_FREE free
# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+
+
+#if (! defined (yyoverflow) \
+ && (! defined (__cplusplus) \
+ || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -895,24 +891,41 @@ union yyalloc
+ YYSTACK_GAP_MAX)
# endif
-/* Relocate the TYPE STACK from its old location to the new one. The
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ register YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (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(Type, Stack) \
+# define YYSTACK_RELOCATE(Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- yymemcpy ((char *) yyptr, (char *) (Stack), \
- yysize * (YYSIZE_T) sizeof (Type)); \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (Type) + YYSTACK_GAP_MAX; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
while (0)
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+#endif
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -922,14 +935,9 @@ union yyalloc
# define YYSIZE_T size_t
#endif
#if ! defined (YYSIZE_T)
-# ifdef __cplusplus
-# include <cstddef> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T std::size_t
-# else
-# ifdef __STDC__
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
# endif
#endif
#if ! defined (YYSIZE_T)
@@ -1008,12 +1016,8 @@ while (0)
#if YYDEBUG
# ifndef YYFPRINTF
-# ifdef __cplusplus
-# include <cstdio> /* INFRINGES ON USER NAME SPACE */
-# else
-# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-# endif
-# define YYFPRINTF YYSTD (fprintf)
+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+# define YYFPRINTF fprintf
# endif
# define YYDPRINTF(Args) \
@@ -1021,10 +1025,8 @@ do { \
if (yydebug) \
YYFPRINTF Args; \
} while (0)
-/* Nonzero means print parse trace. [The following comment makes no
- sense to me. Could someone clarify it? --akim] Since this is
- uninitialized, it does not stop multiple parsers from coexisting.
- */
+/* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
int yydebug;
#else /* !YYDEBUG */
# define YYDPRINTF(Args)
@@ -1050,33 +1052,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-#if ! defined (yyoverflow) && ! defined (yymemcpy)
-# if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
-# define yymemcpy __builtin_memcpy
-# else /* not GNU C or C++ */
-
-/* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
-static void
-# if defined (__STDC__) || defined (__cplusplus)
-yymemcpy (char *yyto, const char *yyfrom, YYSIZE_T yycount)
-# else
-yymemcpy (yyto, yyfrom, yycount)
- char *yyto;
- const char *yyfrom;
- YYSIZE_T yycount;
-# endif
-{
- register const char *yyf = yyfrom;
- register char *yyt = yyto;
- register YYSIZE_T yyi = yycount;
-
- while (yyi-- != 0)
- *yyt++ = *yyf++;
-}
-# endif
-#endif
-
#ifdef YYERROR_VERBOSE
# ifndef yystrlen
@@ -1129,7 +1104,7 @@ yystpcpy (yydest, yysrc)
# endif
#endif
-#line 341 "/usr/share/bison/bison.simple"
+#line 315 "/usr/share/bison/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
@@ -1139,13 +1114,13 @@ yystpcpy (yydest, yysrc)
to the proper pointer type. */
#ifdef YYPARSE_PARAM
-# ifdef __cplusplus
+# if defined (__STDC__) || defined (__cplusplus)
# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
# define YYPARSE_PARAM_DECL
-# else /* !__cplusplus */
+# else
# define YYPARSE_PARAM_ARG YYPARSE_PARAM
# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif /* !__cplusplus */
+# endif
#else /* !YYPARSE_PARAM */
# define YYPARSE_PARAM_ARG
# define YYPARSE_PARAM_DECL
@@ -1319,6 +1294,9 @@ yyparse (YYPARSE_PARAM_ARG)
yyvs = yyvs1;
}
#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+ goto yyoverflowlab;
+# else
/* Extend the stack our own way. */
if (yystacksize >= YYMAXDEPTH)
goto yyoverflowlab;
@@ -1332,15 +1310,16 @@ yyparse (YYPARSE_PARAM_ARG)
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyoverflowlab;
- YYSTACK_RELOCATE (short, yyss);
- YYSTACK_RELOCATE (YYSTYPE, yyvs);
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
# if YYLSP_NEEDED
- YYSTACK_RELOCATE (YYLTYPE, yyls);
+ YYSTACK_RELOCATE (yyls);
# endif
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
}
+# endif
#endif /* no yyoverflow */
yyssp = yyss + yysize - 1;
@@ -1519,26 +1498,23 @@ yyreduce:
switch (yyn) {
case 17:
-#line 175 "rcparse.y"
+#line 177 "rcparse.y"
{
+ define_accelerator (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].pacc);
+ if (yychar != YYEMPTY)
+ YYERROR;
rcparse_discard_strings ();
}
break;
case 18:
-#line 184 "rcparse.y"
+#line 187 "rcparse.y"
{
- define_accelerator (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].pacc);
+ yyval.pacc = NULL;
}
break;
case 19:
#line 191 "rcparse.y"
{
- yyval.pacc = NULL;
- }
- break;
-case 20:
-#line 195 "rcparse.y"
-{
struct accelerator *a;
a = (struct accelerator *) res_alloc (sizeof *a);
@@ -1556,15 +1532,15 @@ case 20:
}
}
break;
-case 21:
-#line 216 "rcparse.y"
+case 20:
+#line 212 "rcparse.y"
{
yyval.acc = yyvsp[-1].acc;
yyval.acc.id = yyvsp[0].il;
}
break;
-case 22:
-#line 221 "rcparse.y"
+case 21:
+#line 217 "rcparse.y"
{
yyval.acc = yyvsp[-3].acc;
yyval.acc.id = yyvsp[-2].il;
@@ -1574,8 +1550,8 @@ case 22:
rcparse_warning (_("inappropriate modifiers for non-VIRTKEY"));
}
break;
-case 23:
-#line 233 "rcparse.y"
+case 22:
+#line 229 "rcparse.y"
{
const char *s = yyvsp[0].s;
char ch;
@@ -1597,8 +1573,8 @@ case 23:
rcparse_warning (_("accelerator should only be one character"));
}
break;
-case 24:
-#line 254 "rcparse.y"
+case 23:
+#line 250 "rcparse.y"
{
yyval.acc.next = NULL;
yyval.acc.flags = 0;
@@ -1606,75 +1582,81 @@ case 24:
yyval.acc.key = yyvsp[0].il;
}
break;
+case 24:
+#line 260 "rcparse.y"
+{
+ yyval.is = yyvsp[0].is;
+ }
+ break;
case 25:
#line 264 "rcparse.y"
{
- yyval.is = yyvsp[0].is;
+ yyval.is = yyvsp[-2].is | yyvsp[0].is;
}
break;
case 26:
-#line 268 "rcparse.y"
+#line 269 "rcparse.y"
{
- yyval.is = yyvsp[-2].is | yyvsp[0].is;
+ yyval.is = yyvsp[-1].is | yyvsp[0].is;
}
break;
case 27:
-#line 273 "rcparse.y"
+#line 276 "rcparse.y"
{
- yyval.is = yyvsp[-1].is | yyvsp[0].is;
+ yyval.is = ACC_VIRTKEY;
}
break;
case 28:
#line 280 "rcparse.y"
{
- yyval.is = ACC_VIRTKEY;
+ /* This is just the absence of VIRTKEY. */
+ yyval.is = 0;
}
break;
case 29:
-#line 284 "rcparse.y"
+#line 285 "rcparse.y"
{
- /* This is just the absence of VIRTKEY. */
- yyval.is = 0;
+ yyval.is = ACC_NOINVERT;
}
break;
case 30:
#line 289 "rcparse.y"
{
- yyval.is = ACC_NOINVERT;
+ yyval.is = ACC_SHIFT;
}
break;
case 31:
#line 293 "rcparse.y"
{
- yyval.is = ACC_SHIFT;
+ yyval.is = ACC_CONTROL;
}
break;
case 32:
#line 297 "rcparse.y"
{
- yyval.is = ACC_CONTROL;
- }
- break;
-case 33:
-#line 301 "rcparse.y"
-{
yyval.is = ACC_ALT;
}
break;
-case 34:
-#line 310 "rcparse.y"
+case 33:
+#line 306 "rcparse.y"
{
define_bitmap (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 35:
-#line 319 "rcparse.y"
+case 34:
+#line 318 "rcparse.y"
{
define_cursor (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 36:
-#line 329 "rcparse.y"
+case 35:
+#line 331 "rcparse.y"
{
memset (&dialog, 0, sizeof dialog);
dialog.x = yyvsp[-3].il;
@@ -1689,16 +1671,20 @@ case 36:
dialog.ex = NULL;
dialog.controls = NULL;
sub_res_info = yyvsp[-5].res_info;
+ style = 0;
}
break;
-case 37:
-#line 345 "rcparse.y"
+case 36:
+#line 348 "rcparse.y"
{
define_dialog (yyvsp[-12].id, &sub_res_info, &dialog);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 38:
-#line 350 "rcparse.y"
+case 37:
+#line 356 "rcparse.y"
{
memset (&dialog, 0, sizeof dialog);
dialog.x = yyvsp[-3].il;
@@ -1715,16 +1701,20 @@ case 38:
memset (dialog.ex, 0, sizeof (struct dialog_ex));
dialog.controls = NULL;
sub_res_info = yyvsp[-5].res_info;
+ style = 0;
}
break;
-case 39:
-#line 368 "rcparse.y"
+case 38:
+#line 375 "rcparse.y"
{
define_dialog (yyvsp[-12].id, &sub_res_info, &dialog);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 40:
-#line 373 "rcparse.y"
+case 39:
+#line 383 "rcparse.y"
{
memset (&dialog, 0, sizeof dialog);
dialog.x = yyvsp[-4].il;
@@ -1742,66 +1732,99 @@ case 40:
dialog.ex->help = yyvsp[0].il;
dialog.controls = NULL;
sub_res_info = yyvsp[-6].res_info;
+ style = 0;
}
break;
-case 41:
-#line 392 "rcparse.y"
+case 40:
+#line 403 "rcparse.y"
{
define_dialog (yyvsp[-13].id, &sub_res_info, &dialog);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 42:
-#line 399 "rcparse.y"
+case 41:
+#line 413 "rcparse.y"
{
yyval.il = 0;
}
break;
-case 43:
-#line 403 "rcparse.y"
+case 42:
+#line 417 "rcparse.y"
{
yyval.il = yyvsp[0].il;
}
break;
-case 45:
-#line 411 "rcparse.y"
+case 44:
+#line 425 "rcparse.y"
{
+ dialog.style |= WS_CAPTION;
+ style |= WS_CAPTION;
unicode_from_ascii ((int *) NULL, &dialog.caption, yyvsp[0].s);
}
break;
-case 46:
-#line 415 "rcparse.y"
+case 45:
+#line 431 "rcparse.y"
{
dialog.class = yyvsp[0].id;
}
break;
+case 46:
+#line 436 "rcparse.y"
+{
+ dialog.style = style;
+ }
+ break;
case 47:
-#line 419 "rcparse.y"
-{ style = dialog.style; }
+#line 440 "rcparse.y"
+{
+ dialog.exstyle = yyvsp[0].il;
+ }
break;
case 48:
-#line 421 "rcparse.y"
+#line 444 "rcparse.y"
{
- dialog.style = style;
+ res_string_to_id (& dialog.class, yyvsp[0].s);
}
break;
case 49:
-#line 425 "rcparse.y"
+#line 448 "rcparse.y"
{
- dialog.exstyle = yyvsp[0].il;
+ dialog.style |= DS_SETFONT;
+ style |= DS_SETFONT;
+ dialog.pointsize = yyvsp[-2].il;
+ unicode_from_ascii ((int *) NULL, &dialog.font, yyvsp[0].s);
+ if (dialog.ex != NULL)
+ {
+ dialog.ex->weight = 0;
+ dialog.ex->italic = 0;
+ dialog.ex->charset = 1;
+ }
}
break;
case 50:
-#line 429 "rcparse.y"
+#line 461 "rcparse.y"
{
dialog.style |= DS_SETFONT;
- dialog.pointsize = yyvsp[-2].il;
- unicode_from_ascii ((int *) NULL, &dialog.font, yyvsp[0].s);
+ style |= DS_SETFONT;
+ dialog.pointsize = yyvsp[-3].il;
+ unicode_from_ascii ((int *) NULL, &dialog.font, yyvsp[-1].s);
+ if (dialog.ex == NULL)
+ rcparse_warning (_("extended FONT requires DIALOGEX"));
+ else
+ {
+ dialog.ex->weight = yyvsp[0].il;
+ dialog.ex->italic = 0;
+ dialog.ex->charset = 1;
+ }
}
break;
case 51:
-#line 435 "rcparse.y"
+#line 476 "rcparse.y"
{
dialog.style |= DS_SETFONT;
+ style |= DS_SETFONT;
dialog.pointsize = yyvsp[-4].il;
unicode_from_ascii ((int *) NULL, &dialog.font, yyvsp[-2].s);
if (dialog.ex == NULL)
@@ -1810,35 +1833,53 @@ case 51:
{
dialog.ex->weight = yyvsp[-1].il;
dialog.ex->italic = yyvsp[0].il;
+ dialog.ex->charset = 1;
}
}
break;
case 52:
-#line 448 "rcparse.y"
+#line 491 "rcparse.y"
{
- dialog.menu = yyvsp[0].id;
+ dialog.style |= DS_SETFONT;
+ style |= DS_SETFONT;
+ dialog.pointsize = yyvsp[-5].il;
+ unicode_from_ascii ((int *) NULL, &dialog.font, yyvsp[-3].s);
+ if (dialog.ex == NULL)
+ rcparse_warning (_("extended FONT requires DIALOGEX"));
+ else
+ {
+ dialog.ex->weight = yyvsp[-2].il;
+ dialog.ex->italic = yyvsp[-1].il;
+ dialog.ex->charset = yyvsp[0].il;
+ }
}
break;
case 53:
-#line 452 "rcparse.y"
+#line 506 "rcparse.y"
{
- sub_res_info.characteristics = yyvsp[0].il;
+ dialog.menu = yyvsp[0].id;
}
break;
case 54:
-#line 456 "rcparse.y"
+#line 510 "rcparse.y"
{
- sub_res_info.language = yyvsp[-1].il | (yyvsp[0].il << SUBLANG_SHIFT);
+ sub_res_info.characteristics = yyvsp[0].il;
}
break;
case 55:
-#line 460 "rcparse.y"
+#line 514 "rcparse.y"
+{
+ sub_res_info.language = yyvsp[-1].il | (yyvsp[0].il << SUBLANG_SHIFT);
+ }
+ break;
+case 56:
+#line 518 "rcparse.y"
{
sub_res_info.version = yyvsp[0].il;
}
break;
-case 57:
-#line 468 "rcparse.y"
+case 58:
+#line 526 "rcparse.y"
{
struct dialog_control **pp;
@@ -1847,95 +1888,95 @@ case 57:
*pp = yyvsp[0].dialog_control;
}
break;
-case 58:
-#line 479 "rcparse.y"
+case 59:
+#line 537 "rcparse.y"
{
default_style = BS_AUTO3STATE | WS_TABSTOP;
base_style = BS_AUTO3STATE;
class = CTL_BUTTON;
}
break;
-case 59:
-#line 485 "rcparse.y"
+case 60:
+#line 543 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 60:
-#line 489 "rcparse.y"
+case 61:
+#line 547 "rcparse.y"
{
default_style = BS_AUTOCHECKBOX | WS_TABSTOP;
base_style = BS_AUTOCHECKBOX;
class = CTL_BUTTON;
}
break;
-case 61:
-#line 495 "rcparse.y"
+case 62:
+#line 553 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 62:
-#line 499 "rcparse.y"
+case 63:
+#line 557 "rcparse.y"
{
default_style = BS_AUTORADIOBUTTON | WS_TABSTOP;
base_style = BS_AUTORADIOBUTTON;
class = CTL_BUTTON;
}
break;
-case 63:
-#line 505 "rcparse.y"
+case 64:
+#line 563 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 64:
-#line 509 "rcparse.y"
+case 65:
+#line 567 "rcparse.y"
{
default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
class = CTL_EDIT;
}
break;
-case 65:
-#line 515 "rcparse.y"
+case 66:
+#line 573 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
if (dialog.ex == NULL)
- rcparse_warning (_("IEDIT requires DIALOGEX"));
+ rcparse_warning (_("BEDIT requires DIALOGEX"));
res_string_to_id (&yyval.dialog_control->class, "BEDIT");
}
break;
-case 66:
-#line 522 "rcparse.y"
+case 67:
+#line 580 "rcparse.y"
{
default_style = BS_CHECKBOX | WS_TABSTOP;
base_style = BS_CHECKBOX | WS_TABSTOP;
class = CTL_BUTTON;
}
break;
-case 67:
-#line 528 "rcparse.y"
+case 68:
+#line 586 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 68:
-#line 532 "rcparse.y"
+case 69:
+#line 590 "rcparse.y"
{
default_style = CBS_SIMPLE | WS_TABSTOP;
base_style = 0;
class = CTL_COMBOBOX;
}
break;
-case 69:
-#line 538 "rcparse.y"
+case 70:
+#line 596 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 70:
-#line 543 "rcparse.y"
+case 71:
+#line 601 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-9].s, yyvsp[-8].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-7].il, style, yyvsp[-1].il);
if (yyvsp[0].rcdata_item != NULL)
@@ -1946,8 +1987,8 @@ case 70:
}
}
break;
-case 71:
-#line 554 "rcparse.y"
+case 72:
+#line 612 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-10].s, yyvsp[-9].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-8].il, style, yyvsp[-2].il);
if (dialog.ex == NULL)
@@ -1956,8 +1997,8 @@ case 71:
yyval.dialog_control->data = yyvsp[0].rcdata_item;
}
break;
-case 72:
-#line 563 "rcparse.y"
+case 73:
+#line 621 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-10].s, yyvsp[-9].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, 0, style, yyvsp[-1].il);
if (yyvsp[0].rcdata_item != NULL)
@@ -1967,11 +2008,11 @@ case 72:
yyval.dialog_control->data = yyvsp[0].rcdata_item;
}
yyval.dialog_control->class.named = 1;
- unicode_from_ascii(&yyval.dialog_control->class.u.n.length, &yyval.dialog_control->class.u.n.name, yyvsp[-7].s);
+ unicode_from_ascii (&yyval.dialog_control->class.u.n.length, &yyval.dialog_control->class.u.n.name, yyvsp[-7].s);
}
break;
-case 73:
-#line 576 "rcparse.y"
+case 74:
+#line 634 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-11].s, yyvsp[-10].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, 0, style, yyvsp[-2].il);
if (dialog.ex == NULL)
@@ -1979,75 +2020,75 @@ case 73:
yyval.dialog_control->help = yyvsp[-1].il;
yyval.dialog_control->data = yyvsp[0].rcdata_item;
yyval.dialog_control->class.named = 1;
- unicode_from_ascii(&yyval.dialog_control->class.u.n.length, &yyval.dialog_control->class.u.n.name, yyvsp[-8].s);
+ unicode_from_ascii (&yyval.dialog_control->class.u.n.length, &yyval.dialog_control->class.u.n.name, yyvsp[-8].s);
}
break;
-case 74:
-#line 586 "rcparse.y"
+case 75:
+#line 644 "rcparse.y"
{
default_style = SS_CENTER | WS_GROUP;
base_style = SS_CENTER;
class = CTL_STATIC;
}
break;
-case 75:
-#line 592 "rcparse.y"
+case 76:
+#line 650 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 76:
-#line 596 "rcparse.y"
+case 77:
+#line 654 "rcparse.y"
{
default_style = BS_DEFPUSHBUTTON | WS_TABSTOP;
base_style = BS_DEFPUSHBUTTON | WS_TABSTOP;
class = CTL_BUTTON;
}
break;
-case 77:
-#line 602 "rcparse.y"
+case 78:
+#line 660 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 78:
-#line 606 "rcparse.y"
+case 79:
+#line 664 "rcparse.y"
{
default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
class = CTL_EDIT;
}
break;
-case 79:
-#line 612 "rcparse.y"
+case 80:
+#line 670 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 80:
-#line 616 "rcparse.y"
+case 81:
+#line 674 "rcparse.y"
{
default_style = BS_GROUPBOX;
base_style = BS_GROUPBOX;
class = CTL_BUTTON;
}
break;
-case 81:
-#line 622 "rcparse.y"
+case 82:
+#line 680 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 82:
-#line 626 "rcparse.y"
+case 83:
+#line 684 "rcparse.y"
{
default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
class = CTL_EDIT;
}
break;
-case 83:
-#line 632 "rcparse.y"
+case 84:
+#line 690 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
if (dialog.ex == NULL)
@@ -2055,44 +2096,44 @@ case 83:
res_string_to_id (&yyval.dialog_control->class, "HEDIT");
}
break;
-case 84:
-#line 639 "rcparse.y"
+case 85:
+#line 697 "rcparse.y"
{
yyval.dialog_control = define_icon_control (yyvsp[-4].id, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-1].il, 0, 0, 0, yyvsp[0].rcdata_item,
dialog.ex);
}
break;
-case 85:
-#line 645 "rcparse.y"
+case 86:
+#line 703 "rcparse.y"
{
yyval.dialog_control = define_icon_control (yyvsp[-6].id, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, 0, 0, 0, yyvsp[0].rcdata_item,
dialog.ex);
}
break;
-case 86:
-#line 651 "rcparse.y"
+case 87:
+#line 709 "rcparse.y"
{
yyval.dialog_control = define_icon_control (yyvsp[-8].id, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, style, yyvsp[-1].il, 0, yyvsp[0].rcdata_item,
dialog.ex);
}
break;
-case 87:
-#line 657 "rcparse.y"
+case 88:
+#line 715 "rcparse.y"
{
yyval.dialog_control = define_icon_control (yyvsp[-9].id, yyvsp[-8].il, yyvsp[-7].il, yyvsp[-6].il, style, yyvsp[-2].il, yyvsp[-1].il, yyvsp[0].rcdata_item,
dialog.ex);
}
break;
-case 88:
-#line 662 "rcparse.y"
+case 89:
+#line 720 "rcparse.y"
{
default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
class = CTL_EDIT;
}
break;
-case 89:
-#line 668 "rcparse.y"
+case 90:
+#line 726 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
if (dialog.ex == NULL)
@@ -2100,131 +2141,131 @@ case 89:
res_string_to_id (&yyval.dialog_control->class, "IEDIT");
}
break;
-case 90:
-#line 675 "rcparse.y"
+case 91:
+#line 733 "rcparse.y"
{
default_style = LBS_NOTIFY | WS_BORDER;
base_style = LBS_NOTIFY | WS_BORDER;
class = CTL_LISTBOX;
}
break;
-case 91:
-#line 681 "rcparse.y"
+case 92:
+#line 739 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 92:
-#line 685 "rcparse.y"
+case 93:
+#line 743 "rcparse.y"
{
default_style = SS_LEFT | WS_GROUP;
base_style = SS_LEFT;
class = CTL_STATIC;
}
break;
-case 93:
-#line 691 "rcparse.y"
+case 94:
+#line 749 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 94:
-#line 695 "rcparse.y"
+case 95:
+#line 753 "rcparse.y"
{
default_style = BS_PUSHBOX | WS_TABSTOP;
base_style = BS_PUSHBOX;
class = CTL_BUTTON;
}
break;
-case 95:
-#line 701 "rcparse.y"
+case 96:
+#line 759 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 96:
-#line 705 "rcparse.y"
+case 97:
+#line 763 "rcparse.y"
{
default_style = BS_PUSHBUTTON | WS_TABSTOP;
base_style = BS_PUSHBUTTON | WS_TABSTOP;
class = CTL_BUTTON;
}
break;
-case 97:
-#line 711 "rcparse.y"
+case 98:
+#line 769 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 98:
-#line 715 "rcparse.y"
+case 99:
+#line 773 "rcparse.y"
{
default_style = BS_RADIOBUTTON | WS_TABSTOP;
base_style = BS_RADIOBUTTON;
class = CTL_BUTTON;
}
break;
-case 99:
-#line 721 "rcparse.y"
+case 100:
+#line 779 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 100:
-#line 725 "rcparse.y"
+case 101:
+#line 783 "rcparse.y"
{
default_style = SS_RIGHT | WS_GROUP;
base_style = SS_RIGHT;
class = CTL_STATIC;
}
break;
-case 101:
-#line 731 "rcparse.y"
+case 102:
+#line 789 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 102:
-#line 735 "rcparse.y"
+case 103:
+#line 793 "rcparse.y"
{
default_style = SBS_HORZ;
base_style = 0;
class = CTL_SCROLLBAR;
}
break;
-case 103:
-#line 741 "rcparse.y"
+case 104:
+#line 799 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 104:
-#line 745 "rcparse.y"
+case 105:
+#line 803 "rcparse.y"
{
default_style = BS_3STATE | WS_TABSTOP;
base_style = BS_3STATE;
class = CTL_BUTTON;
}
break;
-case 105:
-#line 751 "rcparse.y"
+case 106:
+#line 809 "rcparse.y"
{
yyval.dialog_control = yyvsp[0].dialog_control;
}
break;
-case 106:
-#line 756 "rcparse.y"
+case 107:
+#line 814 "rcparse.y"
{ style = WS_CHILD | WS_VISIBLE; }
break;
-case 107:
-#line 758 "rcparse.y"
+case 108:
+#line 816 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-14].s, yyvsp[-12].il, yyvsp[-10].il, yyvsp[-8].il, yyvsp[-6].il, yyvsp[-4].il, CTL_BUTTON,
style, yyvsp[0].il);
}
break;
-case 108:
-#line 774 "rcparse.y"
+case 109:
+#line 832 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-6].s, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-1].il, class,
default_style | WS_CHILD | WS_VISIBLE, 0);
@@ -2236,8 +2277,8 @@ case 108:
}
}
break;
-case 109:
-#line 786 "rcparse.y"
+case 110:
+#line 844 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-8].s, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, class, style, yyvsp[-1].il);
if (yyvsp[0].rcdata_item != NULL)
@@ -2248,8 +2289,8 @@ case 109:
}
}
break;
-case 110:
-#line 797 "rcparse.y"
+case 111:
+#line 855 "rcparse.y"
{
yyval.dialog_control = define_control (yyvsp[-9].s, yyvsp[-8].il, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, class, style, yyvsp[-2].il);
if (dialog.ex == NULL)
@@ -2258,80 +2299,89 @@ case 110:
yyval.dialog_control->data = yyvsp[0].rcdata_item;
}
break;
-case 111:
-#line 808 "rcparse.y"
+case 112:
+#line 866 "rcparse.y"
{
yyval.s = NULL;
}
break;
-case 112:
-#line 812 "rcparse.y"
+case 113:
+#line 870 "rcparse.y"
{
yyval.s = yyvsp[0].s;
}
break;
-case 113:
-#line 816 "rcparse.y"
+case 114:
+#line 874 "rcparse.y"
{
yyval.s = yyvsp[-1].s;
}
break;
-case 114:
-#line 823 "rcparse.y"
+case 115:
+#line 881 "rcparse.y"
{
yyval.rcdata_item = NULL;
}
break;
-case 115:
-#line 827 "rcparse.y"
+case 116:
+#line 885 "rcparse.y"
{
yyval.rcdata_item = yyvsp[-1].rcdata.first;
}
break;
-case 116:
-#line 836 "rcparse.y"
+case 117:
+#line 894 "rcparse.y"
{ style = WS_CHILD | WS_VISIBLE; }
break;
-case 118:
-#line 842 "rcparse.y"
+case 119:
+#line 900 "rcparse.y"
{ style = SS_ICON | WS_CHILD | WS_VISIBLE; }
break;
-case 120:
-#line 848 "rcparse.y"
+case 121:
+#line 906 "rcparse.y"
{ style = base_style | WS_CHILD | WS_VISIBLE; }
break;
-case 122:
-#line 856 "rcparse.y"
+case 123:
+#line 914 "rcparse.y"
{
define_font (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 123:
-#line 865 "rcparse.y"
+case 124:
+#line 926 "rcparse.y"
{
define_icon (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 124:
-#line 875 "rcparse.y"
+case 125:
+#line 939 "rcparse.y"
{
language = yyvsp[-1].il | (yyvsp[0].il << SUBLANG_SHIFT);
}
break;
-case 125:
-#line 884 "rcparse.y"
+case 126:
+#line 948 "rcparse.y"
{
define_menu (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].menuitem);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 126:
-#line 891 "rcparse.y"
+case 127:
+#line 958 "rcparse.y"
{
yyval.menuitem = NULL;
}
break;
-case 127:
-#line 895 "rcparse.y"
+case 128:
+#line 962 "rcparse.y"
{
if (yyvsp[-1].menuitem == NULL)
yyval.menuitem = yyvsp[0].menuitem;
@@ -2346,92 +2396,95 @@ case 127:
}
}
break;
-case 128:
-#line 912 "rcparse.y"
+case 129:
+#line 979 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-2].s, yyvsp[-1].il, yyvsp[0].is, 0, 0, NULL);
}
break;
-case 129:
-#line 916 "rcparse.y"
+case 130:
+#line 983 "rcparse.y"
{
yyval.menuitem = define_menuitem (NULL, 0, 0, 0, 0, NULL);
}
break;
-case 130:
-#line 920 "rcparse.y"
+case 131:
+#line 987 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-4].s, 0, yyvsp[-3].is, 0, 0, yyvsp[-1].menuitem);
}
break;
-case 131:
-#line 927 "rcparse.y"
+case 132:
+#line 994 "rcparse.y"
{
yyval.is = 0;
}
break;
-case 132:
-#line 931 "rcparse.y"
+case 133:
+#line 998 "rcparse.y"
{
yyval.is = yyvsp[-2].is | yyvsp[0].is;
}
break;
-case 133:
-#line 935 "rcparse.y"
+case 134:
+#line 1002 "rcparse.y"
{
yyval.is = yyvsp[-1].is | yyvsp[0].is;
}
break;
-case 134:
-#line 942 "rcparse.y"
+case 135:
+#line 1009 "rcparse.y"
{
yyval.is = MENUITEM_CHECKED;
}
break;
-case 135:
-#line 946 "rcparse.y"
+case 136:
+#line 1013 "rcparse.y"
{
yyval.is = MENUITEM_GRAYED;
}
break;
-case 136:
-#line 950 "rcparse.y"
+case 137:
+#line 1017 "rcparse.y"
{
yyval.is = MENUITEM_HELP;
}
break;
-case 137:
-#line 954 "rcparse.y"
+case 138:
+#line 1021 "rcparse.y"
{
yyval.is = MENUITEM_INACTIVE;
}
break;
-case 138:
-#line 958 "rcparse.y"
+case 139:
+#line 1025 "rcparse.y"
{
yyval.is = MENUITEM_MENUBARBREAK;
}
break;
-case 139:
-#line 962 "rcparse.y"
+case 140:
+#line 1029 "rcparse.y"
{
yyval.is = MENUITEM_MENUBREAK;
}
break;
-case 140:
-#line 971 "rcparse.y"
+case 141:
+#line 1038 "rcparse.y"
{
define_menu (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].menuitem);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 141:
-#line 978 "rcparse.y"
+case 142:
+#line 1048 "rcparse.y"
{
yyval.menuitem = NULL;
}
break;
-case 142:
-#line 982 "rcparse.y"
+case 143:
+#line 1052 "rcparse.y"
{
if (yyvsp[-1].menuitem == NULL)
yyval.menuitem = yyvsp[0].menuitem;
@@ -2446,94 +2499,100 @@ case 142:
}
}
break;
-case 143:
-#line 999 "rcparse.y"
+case 144:
+#line 1069 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[0].s, 0, 0, 0, 0, NULL);
}
break;
-case 144:
-#line 1003 "rcparse.y"
+case 145:
+#line 1073 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-1].s, yyvsp[0].il, 0, 0, 0, NULL);
}
break;
-case 145:
-#line 1007 "rcparse.y"
+case 146:
+#line 1077 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-3].s, yyvsp[-2].il, yyvsp[-1].il, yyvsp[0].il, 0, NULL);
}
break;
-case 146:
-#line 1011 "rcparse.y"
+case 147:
+#line 1081 "rcparse.y"
{
yyval.menuitem = define_menuitem (NULL, 0, 0, 0, 0, NULL);
}
break;
-case 147:
-#line 1015 "rcparse.y"
+case 148:
+#line 1085 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-3].s, 0, 0, 0, 0, yyvsp[-1].menuitem);
}
break;
-case 148:
-#line 1019 "rcparse.y"
+case 149:
+#line 1089 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-4].s, yyvsp[-3].il, 0, 0, 0, yyvsp[-1].menuitem);
}
break;
-case 149:
-#line 1023 "rcparse.y"
+case 150:
+#line 1093 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-5].s, yyvsp[-4].il, yyvsp[-3].il, 0, 0, yyvsp[-1].menuitem);
}
break;
-case 150:
-#line 1028 "rcparse.y"
+case 151:
+#line 1098 "rcparse.y"
{
yyval.menuitem = define_menuitem (yyvsp[-7].s, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-1].menuitem);
}
break;
-case 151:
-#line 1037 "rcparse.y"
+case 152:
+#line 1107 "rcparse.y"
{
define_messagetable (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 152:
-#line 1046 "rcparse.y"
+case 153:
+#line 1119 "rcparse.y"
{
define_rcdata (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].rcdata.first);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 153:
-#line 1055 "rcparse.y"
+case 154:
+#line 1131 "rcparse.y"
{
rcparse_rcdata ();
}
break;
-case 154:
-#line 1059 "rcparse.y"
+case 155:
+#line 1135 "rcparse.y"
{
rcparse_normal ();
yyval.rcdata = yyvsp[0].rcdata;
}
break;
-case 155:
-#line 1067 "rcparse.y"
+case 156:
+#line 1143 "rcparse.y"
{
yyval.rcdata.first = NULL;
yyval.rcdata.last = NULL;
}
break;
-case 156:
-#line 1072 "rcparse.y"
+case 157:
+#line 1148 "rcparse.y"
{
yyval.rcdata = yyvsp[0].rcdata;
}
break;
-case 157:
-#line 1079 "rcparse.y"
+case 158:
+#line 1155 "rcparse.y"
{
struct rcdata_item *ri;
@@ -2542,8 +2601,8 @@ case 157:
yyval.rcdata.last = ri;
}
break;
-case 158:
-#line 1087 "rcparse.y"
+case 159:
+#line 1163 "rcparse.y"
{
struct rcdata_item *ri;
@@ -2552,8 +2611,8 @@ case 158:
yyval.rcdata.last = ri;
}
break;
-case 159:
-#line 1095 "rcparse.y"
+case 160:
+#line 1171 "rcparse.y"
{
struct rcdata_item *ri;
@@ -2563,8 +2622,8 @@ case 159:
yyval.rcdata.last = ri;
}
break;
-case 160:
-#line 1104 "rcparse.y"
+case 161:
+#line 1180 "rcparse.y"
{
struct rcdata_item *ri;
@@ -2574,150 +2633,165 @@ case 160:
yyval.rcdata.last = ri;
}
break;
-case 161:
-#line 1118 "rcparse.y"
+case 162:
+#line 1194 "rcparse.y"
{ sub_res_info = yyvsp[-1].res_info; }
break;
-case 164:
-#line 1125 "rcparse.y"
+case 165:
+#line 1201 "rcparse.y"
{
define_stringtable (&sub_res_info, yyvsp[-1].il, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 165:
-#line 1129 "rcparse.y"
+case 166:
+#line 1208 "rcparse.y"
{
define_stringtable (&sub_res_info, yyvsp[-2].il, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 166:
-#line 1139 "rcparse.y"
+case 167:
+#line 1221 "rcparse.y"
{
define_user_data (yyvsp[-5].id, yyvsp[-4].id, &yyvsp[-3].res_info, yyvsp[-1].rcdata.first);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 167:
-#line 1143 "rcparse.y"
+case 168:
+#line 1228 "rcparse.y"
{
define_user_file (yyvsp[-3].id, yyvsp[-2].id, &yyvsp[-1].res_info, yyvsp[0].s);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 168:
-#line 1152 "rcparse.y"
+case 169:
+#line 1240 "rcparse.y"
{
define_versioninfo (yyvsp[-5].id, language, yyvsp[-3].fixver, yyvsp[-1].verinfo);
+ if (yychar != YYEMPTY)
+ YYERROR;
+ rcparse_discard_strings ();
}
break;
-case 169:
-#line 1159 "rcparse.y"
+case 170:
+#line 1250 "rcparse.y"
{
yyval.fixver = ((struct fixed_versioninfo *)
res_alloc (sizeof (struct fixed_versioninfo)));
memset (yyval.fixver, 0, sizeof (struct fixed_versioninfo));
}
break;
-case 170:
-#line 1165 "rcparse.y"
+case 171:
+#line 1256 "rcparse.y"
{
yyvsp[-5].fixver->file_version_ms = (yyvsp[-3].il << 16) | yyvsp[-2].il;
yyvsp[-5].fixver->file_version_ls = (yyvsp[-1].il << 16) | yyvsp[0].il;
yyval.fixver = yyvsp[-5].fixver;
}
break;
-case 171:
-#line 1171 "rcparse.y"
+case 172:
+#line 1262 "rcparse.y"
{
yyvsp[-5].fixver->product_version_ms = (yyvsp[-3].il << 16) | yyvsp[-2].il;
yyvsp[-5].fixver->product_version_ls = (yyvsp[-1].il << 16) | yyvsp[0].il;
yyval.fixver = yyvsp[-5].fixver;
}
break;
-case 172:
-#line 1177 "rcparse.y"
+case 173:
+#line 1268 "rcparse.y"
{
yyvsp[-2].fixver->file_flags_mask = yyvsp[0].il;
yyval.fixver = yyvsp[-2].fixver;
}
break;
-case 173:
-#line 1182 "rcparse.y"
+case 174:
+#line 1273 "rcparse.y"
{
yyvsp[-2].fixver->file_flags = yyvsp[0].il;
yyval.fixver = yyvsp[-2].fixver;
}
break;
-case 174:
-#line 1187 "rcparse.y"
+case 175:
+#line 1278 "rcparse.y"
{
yyvsp[-2].fixver->file_os = yyvsp[0].il;
yyval.fixver = yyvsp[-2].fixver;
}
break;
-case 175:
-#line 1192 "rcparse.y"
+case 176:
+#line 1283 "rcparse.y"
{
yyvsp[-2].fixver->file_type = yyvsp[0].il;
yyval.fixver = yyvsp[-2].fixver;
}
break;
-case 176:
-#line 1197 "rcparse.y"
+case 177:
+#line 1288 "rcparse.y"
{
yyvsp[-2].fixver->file_subtype = yyvsp[0].il;
yyval.fixver = yyvsp[-2].fixver;
}
break;
-case 177:
-#line 1211 "rcparse.y"
+case 178:
+#line 1302 "rcparse.y"
{
yyval.verinfo = NULL;
}
break;
-case 178:
-#line 1215 "rcparse.y"
+case 179:
+#line 1306 "rcparse.y"
{
yyval.verinfo = append_ver_stringfileinfo (yyvsp[-7].verinfo, yyvsp[-4].s, yyvsp[-2].verstring);
}
break;
-case 179:
-#line 1219 "rcparse.y"
+case 180:
+#line 1310 "rcparse.y"
{
yyval.verinfo = append_ver_varfileinfo (yyvsp[-6].verinfo, yyvsp[-2].s, yyvsp[-1].vervar);
}
break;
-case 180:
-#line 1226 "rcparse.y"
+case 181:
+#line 1317 "rcparse.y"
{
yyval.verstring = NULL;
}
break;
-case 181:
-#line 1230 "rcparse.y"
+case 182:
+#line 1321 "rcparse.y"
{
yyval.verstring = append_verval (yyvsp[-4].verstring, yyvsp[-2].s, yyvsp[0].s);
}
break;
-case 182:
-#line 1237 "rcparse.y"
+case 183:
+#line 1328 "rcparse.y"
{
yyval.vervar = NULL;
}
break;
-case 183:
-#line 1241 "rcparse.y"
+case 184:
+#line 1332 "rcparse.y"
{
yyval.vervar = append_vertrans (yyvsp[-2].vervar, yyvsp[-1].il, yyvsp[0].il);
}
break;
-case 184:
-#line 1250 "rcparse.y"
+case 185:
+#line 1341 "rcparse.y"
{
yyval.id.named = 0;
yyval.id.u.id = yyvsp[0].il;
}
break;
-case 185:
-#line 1255 "rcparse.y"
+case 186:
+#line 1346 "rcparse.y"
{
char *copy, *s;
@@ -2729,33 +2803,33 @@ case 185:
free (copy);
}
break;
-case 186:
-#line 1271 "rcparse.y"
+case 187:
+#line 1362 "rcparse.y"
{
yyval.s = yyvsp[0].s;
}
break;
-case 187:
-#line 1275 "rcparse.y"
+case 188:
+#line 1366 "rcparse.y"
{
yyval.s = yyvsp[-1].s;
}
break;
-case 188:
-#line 1279 "rcparse.y"
+case 189:
+#line 1370 "rcparse.y"
{
yyval.s = yyvsp[-1].s;
}
break;
-case 189:
-#line 1287 "rcparse.y"
+case 190:
+#line 1378 "rcparse.y"
{
yyval.id.named = 0;
yyval.id.u.id = yyvsp[-1].il;
}
break;
-case 190:
-#line 1292 "rcparse.y"
+case 191:
+#line 1383 "rcparse.y"
{
char *copy, *s;
@@ -2767,361 +2841,361 @@ case 190:
free (copy);
}
break;
-case 191:
-#line 1309 "rcparse.y"
+case 192:
+#line 1400 "rcparse.y"
{
memset (&yyval.res_info, 0, sizeof (struct res_res_info));
yyval.res_info.language = language;
/* FIXME: Is this the right default? */
- yyval.res_info.memflags = MEMFLAG_MOVEABLE;
+ yyval.res_info.memflags = MEMFLAG_MOVEABLE | MEMFLAG_PURE | MEMFLAG_DISCARDABLE;
}
break;
-case 192:
-#line 1316 "rcparse.y"
+case 193:
+#line 1407 "rcparse.y"
{
yyval.res_info = yyvsp[-1].res_info;
yyval.res_info.memflags |= yyvsp[0].memflags.on;
yyval.res_info.memflags &=~ yyvsp[0].memflags.off;
}
break;
-case 193:
-#line 1322 "rcparse.y"
+case 194:
+#line 1413 "rcparse.y"
{
yyval.res_info = yyvsp[-2].res_info;
yyval.res_info.characteristics = yyvsp[0].il;
}
break;
-case 194:
-#line 1327 "rcparse.y"
+case 195:
+#line 1418 "rcparse.y"
{
yyval.res_info = yyvsp[-3].res_info;
yyval.res_info.language = yyvsp[-1].il | (yyvsp[0].il << SUBLANG_SHIFT);
}
break;
-case 195:
-#line 1332 "rcparse.y"
+case 196:
+#line 1423 "rcparse.y"
{
yyval.res_info = yyvsp[-2].res_info;
yyval.res_info.version = yyvsp[0].il;
}
break;
-case 196:
-#line 1342 "rcparse.y"
+case 197:
+#line 1433 "rcparse.y"
{
memset (&yyval.res_info, 0, sizeof (struct res_res_info));
yyval.res_info.language = language;
yyval.res_info.memflags = MEMFLAG_MOVEABLE | MEMFLAG_DISCARDABLE;
}
break;
-case 197:
-#line 1348 "rcparse.y"
+case 198:
+#line 1439 "rcparse.y"
{
yyval.res_info = yyvsp[-1].res_info;
yyval.res_info.memflags |= yyvsp[0].memflags.on;
yyval.res_info.memflags &=~ yyvsp[0].memflags.off;
}
break;
-case 198:
-#line 1359 "rcparse.y"
+case 199:
+#line 1450 "rcparse.y"
{
memset (&yyval.res_info, 0, sizeof (struct res_res_info));
yyval.res_info.language = language;
- yyval.res_info.memflags = MEMFLAG_MOVEABLE;
+ yyval.res_info.memflags = MEMFLAG_MOVEABLE | MEMFLAG_PURE | MEMFLAG_DISCARDABLE;
}
break;
-case 199:
-#line 1365 "rcparse.y"
+case 200:
+#line 1456 "rcparse.y"
{
yyval.res_info = yyvsp[-1].res_info;
yyval.res_info.memflags |= yyvsp[0].memflags.on;
yyval.res_info.memflags &=~ yyvsp[0].memflags.off;
}
break;
-case 200:
-#line 1377 "rcparse.y"
+case 201:
+#line 1468 "rcparse.y"
{
yyval.memflags.on = MEMFLAG_MOVEABLE;
yyval.memflags.off = 0;
}
break;
-case 201:
-#line 1382 "rcparse.y"
+case 202:
+#line 1473 "rcparse.y"
{
yyval.memflags.on = 0;
yyval.memflags.off = MEMFLAG_MOVEABLE;
}
break;
-case 202:
-#line 1387 "rcparse.y"
+case 203:
+#line 1478 "rcparse.y"
{
yyval.memflags.on = MEMFLAG_PURE;
yyval.memflags.off = 0;
}
break;
-case 203:
-#line 1392 "rcparse.y"
+case 204:
+#line 1483 "rcparse.y"
{
yyval.memflags.on = 0;
yyval.memflags.off = MEMFLAG_PURE;
}
break;
-case 204:
-#line 1397 "rcparse.y"
+case 205:
+#line 1488 "rcparse.y"
{
yyval.memflags.on = MEMFLAG_PRELOAD;
yyval.memflags.off = 0;
}
break;
-case 205:
-#line 1402 "rcparse.y"
+case 206:
+#line 1493 "rcparse.y"
{
yyval.memflags.on = 0;
yyval.memflags.off = MEMFLAG_PRELOAD;
}
break;
-case 206:
-#line 1407 "rcparse.y"
+case 207:
+#line 1498 "rcparse.y"
{
yyval.memflags.on = MEMFLAG_DISCARDABLE;
yyval.memflags.off = 0;
}
break;
-case 207:
-#line 1417 "rcparse.y"
+case 208:
+#line 1508 "rcparse.y"
{
yyval.s = yyvsp[0].s;
}
break;
-case 208:
-#line 1421 "rcparse.y"
+case 209:
+#line 1512 "rcparse.y"
{
yyval.s = yyvsp[0].s;
}
break;
-case 209:
-#line 1438 "rcparse.y"
+case 210:
+#line 1529 "rcparse.y"
{
style |= yyvsp[0].il;
}
break;
-case 210:
-#line 1442 "rcparse.y"
+case 211:
+#line 1533 "rcparse.y"
{
style &=~ yyvsp[0].il;
}
break;
-case 211:
-#line 1446 "rcparse.y"
+case 212:
+#line 1537 "rcparse.y"
{
style |= yyvsp[0].il;
}
break;
-case 212:
-#line 1450 "rcparse.y"
+case 213:
+#line 1541 "rcparse.y"
{
style &=~ yyvsp[0].il;
}
break;
-case 213:
-#line 1457 "rcparse.y"
+case 214:
+#line 1548 "rcparse.y"
{
yyval.il = yyvsp[0].i.val;
}
break;
-case 214:
-#line 1461 "rcparse.y"
+case 215:
+#line 1552 "rcparse.y"
{
yyval.il = yyvsp[-1].il;
}
break;
-case 215:
-#line 1470 "rcparse.y"
+case 216:
+#line 1561 "rcparse.y"
{
yyval.il = 0;
}
break;
-case 216:
-#line 1474 "rcparse.y"
+case 217:
+#line 1565 "rcparse.y"
{
yyval.il = yyvsp[0].il;
}
break;
-case 217:
-#line 1483 "rcparse.y"
+case 218:
+#line 1574 "rcparse.y"
{
yyval.il = yyvsp[0].il;
}
break;
-case 218:
-#line 1492 "rcparse.y"
+case 219:
+#line 1583 "rcparse.y"
{
yyval.il = yyvsp[0].i.val;
}
break;
-case 219:
-#line 1501 "rcparse.y"
+case 220:
+#line 1592 "rcparse.y"
{
yyval.i = yyvsp[0].i;
}
break;
-case 220:
-#line 1505 "rcparse.y"
+case 221:
+#line 1596 "rcparse.y"
{
yyval.i = yyvsp[-1].i;
}
break;
-case 221:
-#line 1509 "rcparse.y"
+case 222:
+#line 1600 "rcparse.y"
{
yyval.i.val = ~ yyvsp[0].i.val;
yyval.i.dword = yyvsp[0].i.dword;
}
break;
-case 222:
-#line 1514 "rcparse.y"
+case 223:
+#line 1605 "rcparse.y"
{
yyval.i.val = - yyvsp[0].i.val;
yyval.i.dword = yyvsp[0].i.dword;
}
break;
-case 223:
-#line 1519 "rcparse.y"
+case 224:
+#line 1610 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val * yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 224:
-#line 1524 "rcparse.y"
+case 225:
+#line 1615 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val / yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 225:
-#line 1529 "rcparse.y"
+case 226:
+#line 1620 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val % yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 226:
-#line 1534 "rcparse.y"
+case 227:
+#line 1625 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val + yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 227:
-#line 1539 "rcparse.y"
+case 228:
+#line 1630 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val - yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 228:
-#line 1544 "rcparse.y"
+case 229:
+#line 1635 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val & yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 229:
-#line 1549 "rcparse.y"
+case 230:
+#line 1640 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val ^ yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 230:
-#line 1554 "rcparse.y"
+case 231:
+#line 1645 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val | yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 231:
-#line 1565 "rcparse.y"
+case 232:
+#line 1656 "rcparse.y"
{
yyval.il = yyvsp[0].il;
}
break;
-case 232:
-#line 1574 "rcparse.y"
+case 233:
+#line 1665 "rcparse.y"
{
yyval.il = yyvsp[0].i.val;
}
break;
-case 233:
-#line 1585 "rcparse.y"
+case 234:
+#line 1676 "rcparse.y"
{
yyval.i = yyvsp[0].i;
}
break;
-case 234:
-#line 1589 "rcparse.y"
+case 235:
+#line 1680 "rcparse.y"
{
yyval.i = yyvsp[-1].i;
}
break;
-case 235:
-#line 1593 "rcparse.y"
+case 236:
+#line 1684 "rcparse.y"
{
yyval.i.val = ~ yyvsp[0].i.val;
yyval.i.dword = yyvsp[0].i.dword;
}
break;
-case 236:
-#line 1598 "rcparse.y"
+case 237:
+#line 1689 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val * yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 237:
-#line 1603 "rcparse.y"
+case 238:
+#line 1694 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val / yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 238:
-#line 1608 "rcparse.y"
+case 239:
+#line 1699 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val % yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 239:
-#line 1613 "rcparse.y"
+case 240:
+#line 1704 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val + yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 240:
-#line 1618 "rcparse.y"
+case 241:
+#line 1709 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val - yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 241:
-#line 1623 "rcparse.y"
+case 242:
+#line 1714 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val & yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 242:
-#line 1628 "rcparse.y"
+case 243:
+#line 1719 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val ^ yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
}
break;
-case 243:
-#line 1633 "rcparse.y"
+case 244:
+#line 1724 "rcparse.y"
{
yyval.i.val = yyvsp[-2].i.val | yyvsp[0].i.val;
yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword;
@@ -3129,7 +3203,7 @@ case 243:
break;
}
-#line 727 "/usr/share/bison/bison.simple"
+#line 705 "/usr/share/bison/bison.simple"
yyvsp -= yylen;
@@ -3360,7 +3434,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 1639 "rcparse.y"
+#line 1730 "rcparse.y"
/* Set the language from the command line. */
diff --git a/binutils/rcparse.h b/binutils/rcparse.h
index 7fc8ad4..3ad5fd3 100644
--- a/binutils/rcparse.h
+++ b/binutils/rcparse.h
@@ -42,6 +42,7 @@ typedef union
} ss;
} yystype;
# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
#endif
# define BEG 257
# define END 258
diff --git a/gas/doc/as.info b/gas/doc/as.info
index 14881b0..596f3f5 100644
--- a/gas/doc/as.info
+++ b/gas/doc/as.info
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
@@ -19,411 +19,411 @@ Free Documentation License".

Indirect:
-as.info-1: 747
-as.info-2: 50358
-as.info-3: 100149
-as.info-4: 149856
-as.info-5: 199764
-as.info-6: 249184
-as.info-7: 298854
-as.info-8: 348734
-as.info-9: 398558
-as.info-10: 444194
+as.info-1: 746
+as.info-2: 50359
+as.info-3: 100150
+as.info-4: 149857
+as.info-5: 199765
+as.info-6: 249185
+as.info-7: 298855
+as.info-8: 348735
+as.info-9: 398559
+as.info-10: 444195

Tag Table:
(Indirect)
-Node: Top747
-Node: Overview1667
-Node: Manual18856
-Node: GNU Assembler19795
-Node: Object Formats20961
-Node: Command Line21408
-Node: Input Files22490
-Node: Object24469
-Node: Errors25416
-Node: Invoking26606
-Node: a28512
-Node: D30271
-Node: f30491
-Node: I30994
-Node: K31533
-Node: L31832
-Node: listing32664
-Node: M34250
-Node: MD38646
-Node: o39065
-Node: R39513
-Node: statistics40529
-Node: traditional-format40929
-Node: v41395
-Node: W41663
-Node: Z42563
-Node: Syntax43078
-Node: Preprocessing43668
-Node: Whitespace45228
-Node: Comments45618
-Node: Symbol Intro47761
-Node: Statements48444
-Node: Constants50358
-Node: Characters50984
-Node: Strings51477
-Node: Chars53630
-Node: Numbers54371
-Node: Integers54902
-Node: Bignums55545
-Node: Flonums55888
-Node: Sections57621
-Node: Secs Background57995
-Node: Ld Sections63021
-Node: As Sections65417
-Node: Sub-Sections66322
-Node: bss69321
-Node: Symbols70266
-Node: Labels70913
-Node: Setting Symbols71639
-Node: Symbol Names72004
-Node: Dot76477
-Node: Symbol Attributes76919
-Node: Symbol Value77651
-Node: Symbol Type78687
-Node: a.out Symbols79066
-Node: Symbol Desc79316
-Node: Symbol Other79598
-Node: COFF Symbols79754
-Node: SOM Symbols80383
-Node: Expressions80816
-Node: Empty Exprs81564
-Node: Integer Exprs81906
-Node: Arguments82296
-Node: Operators83393
-Node: Prefix Ops83719
-Node: Infix Ops84038
-Node: Pseudo Ops86426
-Node: Abort91245
-Node: ABORT91646
-Node: Align91908
-Node: Ascii94097
-Node: Asciz94398
-Node: Balign94638
-Node: Byte96496
-Node: Comm96729
-Node: Data98088
-Node: Def98398
-Node: Desc98766
-Node: Dim99259
-Node: Double99650
-Node: Eject99981
-Node: Else100149
-Node: Elseif100439
-Node: End100723
-Node: Endef100931
-Node: Endfunc101254
-Node: Endif101422
-Node: Equ101675
-Node: Equiv101978
-Node: Err102374
-Node: Exitm102677
-Node: Extern102837
-Node: Fail103091
-Node: File103529
-Node: Fill104138
-Node: Float105095
-Node: Func105429
-Node: Global106009
-Node: Hidden106752
-Node: hword107321
-Node: Ident107642
-Node: If107942
-Node: Incbin110533
-Node: Include111221
-Node: Int111765
-Node: Internal112139
-Node: Irp112774
-Node: Irpc113573
-Node: Lcomm114392
-Node: Lflags115133
-Node: Line115320
-Node: Linkonce116343
-Node: Ln117563
-Node: MRI117711
-Node: List118038
-Node: Long118641
-Node: Macro118811
-Node: Nolist121195
-Node: Octa121611
-Node: Org121937
-Node: P2align123212
-Node: Previous125133
-Node: PopSection125820
-Node: Print126321
-Node: Protected126543
-Node: Psize127180
-Node: Purgem127857
-Node: PushSection128071
-Node: Quad128654
-Node: Rept129100
-Node: Sbttl129506
-Node: Scl129864
-Node: Section130360
-Node: Set134058
-Node: Short134610
-Node: Single134923
-Node: Size135260
-Node: Sleb128135997
-Node: Skip136312
-Node: Space136627
-Node: Stab137512
-Node: String139507
-Node: Struct139926
-Node: SubSection140642
-Node: Symver141196
-Node: Tag143580
-Node: Text144088
-Node: Title144400
-Node: Type144772
-Node: Uleb128145879
-Node: Val146194
-Node: Version146555
-Node: VTableEntry146821
-Node: VTableInherit147102
-Node: Weak147536
-Node: Word147797
-Node: Deprecated149631
-Node: Machine Dependencies149856
-Node: AMD29K-Dependent152332
-Node: AMD29K Options152715
-Node: AMD29K Syntax152889
-Node: AMD29K-Macros153153
-Node: AMD29K-Chars153404
-Node: AMD29K-Regs153667
-Node: AMD29K Floating Point154931
-Node: AMD29K Directives155137
-Node: AMD29K Opcodes156545
-Node: Alpha-Dependent156881
-Node: Alpha Notes157312
-Node: Alpha Options157584
-Node: Alpha Syntax159734
-Node: Alpha-Chars160194
-Node: Alpha-Regs160412
-Node: Alpha-Relocs160783
-Node: Alpha Floating Point164818
-Node: Alpha Directives165031
-Node: Alpha Opcodes170057
-Node: ARC-Dependent170343
-Node: ARC Options170718
-Node: ARC Syntax171770
-Node: ARC-Chars171990
-Node: ARC-Regs172109
-Node: ARC Floating Point172220
-Node: ARC Directives172522
-Node: ARC Opcodes173804
-Node: ARM-Dependent174004
-Node: ARM Options174378
-Node: ARM Syntax179513
-Node: ARM-Chars179733
-Node: ARM-Regs180244
-Node: ARM Floating Point180416
-Node: ARM Directives180606
-Node: ARM Opcodes182673
-Node: CRIS-Dependent184723
-Node: CRIS-Opts185025
-Node: CRIS-Expand186763
-Node: CRIS-Syntax187588
-Node: CRIS-Chars187914
-Node: CRIS-Pic188452
-Ref: crispic188635
-Node: CRIS-Regs192150
-Node: CRIS-Pseudos192554
-Ref: crisnous193317
-Node: D10V-Dependent194379
-Node: D10V-Opts194722
-Node: D10V-Syntax195676
-Node: D10V-Size196196
-Node: D10V-Subs197156
-Node: D10V-Chars198178
-Node: D10V-Regs199764
-Node: D10V-Addressing200795
-Node: D10V-Word201468
-Node: D10V-Float201969
-Node: D10V-Opcodes202271
-Node: D30V-Dependent202655
-Node: D30V-Opts203000
-Node: D30V-Syntax203666
-Node: D30V-Size204189
-Node: D30V-Subs205147
-Node: D30V-Chars206169
-Node: D30V-Guarded208454
-Node: D30V-Regs209122
-Node: D30V-Addressing210248
-Node: D30V-Float210903
-Node: D30V-Opcodes211205
-Node: H8/300-Dependent211589
-Node: H8/300 Options211993
-Node: H8/300 Syntax212174
-Node: H8/300-Chars212461
-Node: H8/300-Regs212745
-Node: H8/300-Addressing213649
-Node: H8/300 Floating Point214675
-Node: H8/300 Directives214991
-Node: H8/300 Opcodes215511
-Node: H8/500-Dependent223864
-Node: H8/500 Options224268
-Node: H8/500 Syntax224449
-Node: H8/500-Chars224736
-Node: H8/500-Regs225027
-Node: H8/500-Addressing225783
-Node: H8/500 Floating Point226400
-Node: H8/500 Directives226716
-Node: H8/500 Opcodes227035
-Node: HPPA-Dependent232148
-Node: HPPA Notes232573
-Node: HPPA Options233320
-Node: HPPA Syntax233504
-Node: HPPA Floating Point234763
-Node: HPPA Directives234958
-Node: HPPA Opcodes241549
-Node: ESA/390-Dependent241797
-Node: ESA/390 Notes242247
-Node: ESA/390 Options243027
-Node: ESA/390 Syntax243226
-Node: ESA/390 Floating Point245387
-Node: ESA/390 Directives245656
-Node: ESA/390 Opcodes248933
-Node: i386-Dependent249184
-Node: i386-Options250242
-Node: i386-Syntax250853
-Node: i386-Mnemonics253256
-Node: i386-Regs255710
-Node: i386-Prefixes257744
-Node: i386-Memory260492
-Node: i386-Jumps263418
-Node: i386-Float264528
-Node: i386-SIMD266346
-Node: i386-16bit267444
-Node: i386-Bugs269469
-Node: i386-Arch270208
-Node: i386-Notes272072
-Node: i860-Dependent272917
-Node: Notes-i860273303
-Node: Options-i860273797
-Node: Directives-i860274802
-Node: Opcodes for i860275464
-Node: i960-Dependent277583
-Node: Options-i960277975
-Node: Floating Point-i960281856
-Node: Directives-i960282113
-Node: Opcodes for i960284133
-Node: callj-i960284739
-Node: Compare-and-branch-i960285214
-Node: M32R-Dependent287103
-Node: M32R-Opts287366
-Node: M32R-Warnings289118
-Node: M68K-Dependent292106
-Node: M68K-Opts292563
-Node: M68K-Syntax298854
-Node: M68K-Moto-Syntax300682
-Node: M68K-Float303260
-Node: M68K-Directives303769
-Node: M68K-opcodes304364
-Node: M68K-Branch304576
-Node: M68K-Chars308762
-Node: M68HC11-Dependent309157
-Node: M68HC11-Opts309560
-Node: M68HC11-Syntax312263
-Node: M68HC11-Float313079
-Node: M68HC11-opcodes313592
-Node: M68HC11-Branch313760
-Node: M88K-Dependent316267
-Node: M88K Directives316508
-Node: MIPS-Dependent318016
-Node: MIPS Opts318917
-Node: MIPS Object324498
-Node: MIPS Stabs326053
-Node: MIPS ISA326764
-Node: MIPS autoextend327894
-Node: MIPS insn328605
-Node: MIPS option stack329091
-Node: MMIX-Dependent329804
-Node: MMIX-Opts330170
-Node: MMIX-Expand332989
-Node: MMIX-Syntax334293
-Ref: mmixsite334432
-Node: MMIX-Chars335480
-Node: MMIX-Symbols336119
-Node: MMIX-Regs338172
-Node: MMIX-Pseudos339182
-Ref: MMIX-loc339305
-Ref: MMIX-local340385
-Ref: MMIX-is340917
-Ref: MMIX-greg341188
-Ref: GREG-base341480
-Ref: MMIX-byte343424
-Ref: MMIX-constants343895
-Ref: MMIX-prefix344540
-Ref: MMIX-spec344914
-Node: MMIX-mmixal345248
-Node: PDP-11-Dependent348734
-Node: PDP-11-Options349113
-Node: PDP-11-Pseudos354110
-Node: PDP-11-Syntax354444
-Node: PDP-11-Mnemonics355184
-Node: PDP-11-Synthetic355475
-Node: PJ-Dependent355682
-Node: PJ Options355897
-Node: PPC-Dependent356164
-Node: PowerPC-Opts356380
-Node: SH-Dependent358232
-Node: SH Options358614
-Node: SH Syntax359046
-Node: SH-Chars359305
-Node: SH-Regs359584
-Node: SH-Addressing360183
-Node: SH Floating Point361077
-Node: SH Directives361373
-Node: SH Opcodes361729
-Node: SH64-Dependent365976
-Node: SH64 Options366331
-Node: SH64 Syntax367756
-Node: SH64-Chars368025
-Node: SH64-Regs368310
-Node: SH64-Addressing369391
-Node: SH64 Directives370559
-Node: SH64 Opcodes371656
-Node: Sparc-Dependent372360
-Node: Sparc-Opts372733
-Node: Sparc-Aligned-Data374979
-Node: Sparc-Float375823
-Node: Sparc-Directives376013
-Node: Z8000-Dependent377962
-Node: Z8000 Options378921
-Node: Z8000 Syntax379096
-Node: Z8000-Chars379372
-Node: Z8000-Regs379590
-Node: Z8000-Addressing380380
-Node: Z8000 Directives381323
-Node: Z8000 Opcodes382921
-Node: Vax-Dependent392857
-Node: VAX-Opts393364
-Node: VAX-float397088
-Node: VAX-directives397709
-Node: VAX-opcodes398558
-Node: VAX-branch398936
-Node: VAX-operands401432
-Node: VAX-no402184
-Node: V850-Dependent402410
-Node: V850 Options402796
-Node: V850 Syntax404609
-Node: V850-Chars404835
-Node: V850-Regs404985
-Node: V850 Floating Point406522
-Node: V850 Directives406717
-Node: V850 Opcodes407617
-Node: Reporting Bugs412902
-Node: Bug Criteria413625
-Node: Bug Reporting414385
-Node: Acknowledgements420953
-Ref: Acknowledgements-Footnote-1425744
-Node: GNU Free Documentation License425770
-Node: Index444194
+Node: Top746
+Node: Overview1668
+Node: Manual18857
+Node: GNU Assembler19796
+Node: Object Formats20962
+Node: Command Line21409
+Node: Input Files22491
+Node: Object24470
+Node: Errors25417
+Node: Invoking26607
+Node: a28513
+Node: D30272
+Node: f30492
+Node: I30995
+Node: K31534
+Node: L31833
+Node: listing32665
+Node: M34251
+Node: MD38647
+Node: o39066
+Node: R39514
+Node: statistics40530
+Node: traditional-format40930
+Node: v41396
+Node: W41664
+Node: Z42564
+Node: Syntax43079
+Node: Preprocessing43669
+Node: Whitespace45229
+Node: Comments45619
+Node: Symbol Intro47762
+Node: Statements48445
+Node: Constants50359
+Node: Characters50985
+Node: Strings51478
+Node: Chars53631
+Node: Numbers54372
+Node: Integers54903
+Node: Bignums55546
+Node: Flonums55889
+Node: Sections57622
+Node: Secs Background57996
+Node: Ld Sections63022
+Node: As Sections65418
+Node: Sub-Sections66323
+Node: bss69322
+Node: Symbols70267
+Node: Labels70914
+Node: Setting Symbols71640
+Node: Symbol Names72005
+Node: Dot76478
+Node: Symbol Attributes76920
+Node: Symbol Value77652
+Node: Symbol Type78688
+Node: a.out Symbols79067
+Node: Symbol Desc79317
+Node: Symbol Other79599
+Node: COFF Symbols79755
+Node: SOM Symbols80384
+Node: Expressions80817
+Node: Empty Exprs81565
+Node: Integer Exprs81907
+Node: Arguments82297
+Node: Operators83394
+Node: Prefix Ops83720
+Node: Infix Ops84039
+Node: Pseudo Ops86427
+Node: Abort91246
+Node: ABORT91647
+Node: Align91909
+Node: Ascii94098
+Node: Asciz94399
+Node: Balign94639
+Node: Byte96497
+Node: Comm96730
+Node: Data98089
+Node: Def98399
+Node: Desc98767
+Node: Dim99260
+Node: Double99651
+Node: Eject99982
+Node: Else100150
+Node: Elseif100440
+Node: End100724
+Node: Endef100932
+Node: Endfunc101255
+Node: Endif101423
+Node: Equ101676
+Node: Equiv101979
+Node: Err102375
+Node: Exitm102678
+Node: Extern102838
+Node: Fail103092
+Node: File103530
+Node: Fill104139
+Node: Float105096
+Node: Func105430
+Node: Global106010
+Node: Hidden106753
+Node: hword107322
+Node: Ident107643
+Node: If107943
+Node: Incbin110534
+Node: Include111222
+Node: Int111766
+Node: Internal112140
+Node: Irp112775
+Node: Irpc113574
+Node: Lcomm114393
+Node: Lflags115134
+Node: Line115321
+Node: Linkonce116344
+Node: Ln117564
+Node: MRI117712
+Node: List118039
+Node: Long118642
+Node: Macro118812
+Node: Nolist121196
+Node: Octa121612
+Node: Org121938
+Node: P2align123213
+Node: Previous125134
+Node: PopSection125821
+Node: Print126322
+Node: Protected126544
+Node: Psize127181
+Node: Purgem127858
+Node: PushSection128072
+Node: Quad128655
+Node: Rept129101
+Node: Sbttl129507
+Node: Scl129865
+Node: Section130361
+Node: Set134059
+Node: Short134611
+Node: Single134924
+Node: Size135261
+Node: Sleb128135998
+Node: Skip136313
+Node: Space136628
+Node: Stab137513
+Node: String139508
+Node: Struct139927
+Node: SubSection140643
+Node: Symver141197
+Node: Tag143581
+Node: Text144089
+Node: Title144401
+Node: Type144773
+Node: Uleb128145880
+Node: Val146195
+Node: Version146556
+Node: VTableEntry146822
+Node: VTableInherit147103
+Node: Weak147537
+Node: Word147798
+Node: Deprecated149632
+Node: Machine Dependencies149857
+Node: AMD29K-Dependent152333
+Node: AMD29K Options152716
+Node: AMD29K Syntax152890
+Node: AMD29K-Macros153154
+Node: AMD29K-Chars153405
+Node: AMD29K-Regs153668
+Node: AMD29K Floating Point154932
+Node: AMD29K Directives155138
+Node: AMD29K Opcodes156546
+Node: Alpha-Dependent156882
+Node: Alpha Notes157313
+Node: Alpha Options157585
+Node: Alpha Syntax159735
+Node: Alpha-Chars160195
+Node: Alpha-Regs160413
+Node: Alpha-Relocs160784
+Node: Alpha Floating Point164819
+Node: Alpha Directives165032
+Node: Alpha Opcodes170058
+Node: ARC-Dependent170344
+Node: ARC Options170719
+Node: ARC Syntax171771
+Node: ARC-Chars171991
+Node: ARC-Regs172110
+Node: ARC Floating Point172221
+Node: ARC Directives172523
+Node: ARC Opcodes173805
+Node: ARM-Dependent174005
+Node: ARM Options174379
+Node: ARM Syntax179514
+Node: ARM-Chars179734
+Node: ARM-Regs180245
+Node: ARM Floating Point180417
+Node: ARM Directives180607
+Node: ARM Opcodes182674
+Node: CRIS-Dependent184724
+Node: CRIS-Opts185026
+Node: CRIS-Expand186764
+Node: CRIS-Syntax187589
+Node: CRIS-Chars187915
+Node: CRIS-Pic188453
+Ref: crispic188636
+Node: CRIS-Regs192151
+Node: CRIS-Pseudos192555
+Ref: crisnous193318
+Node: D10V-Dependent194380
+Node: D10V-Opts194723
+Node: D10V-Syntax195677
+Node: D10V-Size196197
+Node: D10V-Subs197157
+Node: D10V-Chars198179
+Node: D10V-Regs199765
+Node: D10V-Addressing200796
+Node: D10V-Word201469
+Node: D10V-Float201970
+Node: D10V-Opcodes202272
+Node: D30V-Dependent202656
+Node: D30V-Opts203001
+Node: D30V-Syntax203667
+Node: D30V-Size204190
+Node: D30V-Subs205148
+Node: D30V-Chars206170
+Node: D30V-Guarded208455
+Node: D30V-Regs209123
+Node: D30V-Addressing210249
+Node: D30V-Float210904
+Node: D30V-Opcodes211206
+Node: H8/300-Dependent211590
+Node: H8/300 Options211994
+Node: H8/300 Syntax212175
+Node: H8/300-Chars212462
+Node: H8/300-Regs212746
+Node: H8/300-Addressing213650
+Node: H8/300 Floating Point214676
+Node: H8/300 Directives214992
+Node: H8/300 Opcodes215512
+Node: H8/500-Dependent223865
+Node: H8/500 Options224269
+Node: H8/500 Syntax224450
+Node: H8/500-Chars224737
+Node: H8/500-Regs225028
+Node: H8/500-Addressing225784
+Node: H8/500 Floating Point226401
+Node: H8/500 Directives226717
+Node: H8/500 Opcodes227036
+Node: HPPA-Dependent232149
+Node: HPPA Notes232574
+Node: HPPA Options233321
+Node: HPPA Syntax233505
+Node: HPPA Floating Point234764
+Node: HPPA Directives234959
+Node: HPPA Opcodes241550
+Node: ESA/390-Dependent241798
+Node: ESA/390 Notes242248
+Node: ESA/390 Options243028
+Node: ESA/390 Syntax243227
+Node: ESA/390 Floating Point245388
+Node: ESA/390 Directives245657
+Node: ESA/390 Opcodes248934
+Node: i386-Dependent249185
+Node: i386-Options250243
+Node: i386-Syntax250854
+Node: i386-Mnemonics253257
+Node: i386-Regs255711
+Node: i386-Prefixes257745
+Node: i386-Memory260493
+Node: i386-Jumps263419
+Node: i386-Float264529
+Node: i386-SIMD266347
+Node: i386-16bit267445
+Node: i386-Bugs269470
+Node: i386-Arch270209
+Node: i386-Notes272073
+Node: i860-Dependent272918
+Node: Notes-i860273304
+Node: Options-i860273798
+Node: Directives-i860274803
+Node: Opcodes for i860275465
+Node: i960-Dependent277584
+Node: Options-i960277976
+Node: Floating Point-i960281857
+Node: Directives-i960282114
+Node: Opcodes for i960284134
+Node: callj-i960284740
+Node: Compare-and-branch-i960285215
+Node: M32R-Dependent287104
+Node: M32R-Opts287367
+Node: M32R-Warnings289119
+Node: M68K-Dependent292107
+Node: M68K-Opts292564
+Node: M68K-Syntax298855
+Node: M68K-Moto-Syntax300683
+Node: M68K-Float303261
+Node: M68K-Directives303770
+Node: M68K-opcodes304365
+Node: M68K-Branch304577
+Node: M68K-Chars308763
+Node: M68HC11-Dependent309158
+Node: M68HC11-Opts309561
+Node: M68HC11-Syntax312264
+Node: M68HC11-Float313080
+Node: M68HC11-opcodes313593
+Node: M68HC11-Branch313761
+Node: M88K-Dependent316268
+Node: M88K Directives316509
+Node: MIPS-Dependent318017
+Node: MIPS Opts318918
+Node: MIPS Object324499
+Node: MIPS Stabs326054
+Node: MIPS ISA326765
+Node: MIPS autoextend327895
+Node: MIPS insn328606
+Node: MIPS option stack329092
+Node: MMIX-Dependent329805
+Node: MMIX-Opts330171
+Node: MMIX-Expand332990
+Node: MMIX-Syntax334294
+Ref: mmixsite334433
+Node: MMIX-Chars335481
+Node: MMIX-Symbols336120
+Node: MMIX-Regs338173
+Node: MMIX-Pseudos339183
+Ref: MMIX-loc339306
+Ref: MMIX-local340386
+Ref: MMIX-is340918
+Ref: MMIX-greg341189
+Ref: GREG-base341481
+Ref: MMIX-byte343425
+Ref: MMIX-constants343896
+Ref: MMIX-prefix344541
+Ref: MMIX-spec344915
+Node: MMIX-mmixal345249
+Node: PDP-11-Dependent348735
+Node: PDP-11-Options349114
+Node: PDP-11-Pseudos354111
+Node: PDP-11-Syntax354445
+Node: PDP-11-Mnemonics355185
+Node: PDP-11-Synthetic355476
+Node: PJ-Dependent355683
+Node: PJ Options355898
+Node: PPC-Dependent356165
+Node: PowerPC-Opts356381
+Node: SH-Dependent358233
+Node: SH Options358615
+Node: SH Syntax359047
+Node: SH-Chars359306
+Node: SH-Regs359585
+Node: SH-Addressing360184
+Node: SH Floating Point361078
+Node: SH Directives361374
+Node: SH Opcodes361730
+Node: SH64-Dependent365977
+Node: SH64 Options366332
+Node: SH64 Syntax367757
+Node: SH64-Chars368026
+Node: SH64-Regs368311
+Node: SH64-Addressing369392
+Node: SH64 Directives370560
+Node: SH64 Opcodes371657
+Node: Sparc-Dependent372361
+Node: Sparc-Opts372734
+Node: Sparc-Aligned-Data374980
+Node: Sparc-Float375824
+Node: Sparc-Directives376014
+Node: Z8000-Dependent377963
+Node: Z8000 Options378922
+Node: Z8000 Syntax379097
+Node: Z8000-Chars379373
+Node: Z8000-Regs379591
+Node: Z8000-Addressing380381
+Node: Z8000 Directives381324
+Node: Z8000 Opcodes382922
+Node: Vax-Dependent392858
+Node: VAX-Opts393365
+Node: VAX-float397089
+Node: VAX-directives397710
+Node: VAX-opcodes398559
+Node: VAX-branch398937
+Node: VAX-operands401433
+Node: VAX-no402185
+Node: V850-Dependent402411
+Node: V850 Options402797
+Node: V850 Syntax404610
+Node: V850-Chars404836
+Node: V850-Regs404986
+Node: V850 Floating Point406523
+Node: V850 Directives406718
+Node: V850 Opcodes407618
+Node: Reporting Bugs412903
+Node: Bug Criteria413626
+Node: Bug Reporting414386
+Node: Acknowledgements420954
+Ref: Acknowledgements-Footnote-1425745
+Node: GNU Free Documentation License425771
+Node: Index444195

End Tag Table
diff --git a/gas/doc/as.info-1 b/gas/doc/as.info-1
index 90a8295..580ff2e 100644
--- a/gas/doc/as.info-1
+++ b/gas/doc/as.info-1
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
@@ -23,7 +23,7 @@ File: as.info, Node: Top, Next: Overview, Up: (dir)
Using as
********
- This file is a user guide to the GNU assembler `as' version 2.12.
+ This file is a user guide to the GNU assembler `as' version 2.12.1.
This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the
diff --git a/gas/doc/as.info-10 b/gas/doc/as.info-10
index fb0fb67..a89f817 100644
--- a/gas/doc/as.info-10
+++ b/gas/doc/as.info-10
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-2 b/gas/doc/as.info-2
index 02fb584..f00625f 100644
--- a/gas/doc/as.info-2
+++ b/gas/doc/as.info-2
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-3 b/gas/doc/as.info-3
index 697296a..7bc42d0 100644
--- a/gas/doc/as.info-3
+++ b/gas/doc/as.info-3
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-4 b/gas/doc/as.info-4
index ac4ede0..b9c6f58 100644
--- a/gas/doc/as.info-4
+++ b/gas/doc/as.info-4
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-5 b/gas/doc/as.info-5
index e3f6d75..1affb67 100644
--- a/gas/doc/as.info-5
+++ b/gas/doc/as.info-5
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-6 b/gas/doc/as.info-6
index 299ac92..7cc24d4 100644
--- a/gas/doc/as.info-6
+++ b/gas/doc/as.info-6
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-7 b/gas/doc/as.info-7
index 54a3dbd..80794fc 100644
--- a/gas/doc/as.info-7
+++ b/gas/doc/as.info-7
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-8 b/gas/doc/as.info-8
index efbb908..7b159ea 100644
--- a/gas/doc/as.info-8
+++ b/gas/doc/as.info-8
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/as.info-9 b/gas/doc/as.info-9
index 161675d..be1361f 100644
--- a/gas/doc/as.info-9
+++ b/gas/doc/as.info-9
@@ -1,4 +1,4 @@
-This is as.info, produced by makeinfo version 4.0f from as.texinfo.
+This is as.info, produced by makeinfo version 4.1 from as.texinfo.
START-INFO-DIR-ENTRY
* As: (as). The GNU assembler.
diff --git a/gas/doc/gasver.texi b/gas/doc/gasver.texi
index 9c419c5..8a5d583 100644
--- a/gas/doc/gasver.texi
+++ b/gas/doc/gasver.texi
@@ -1 +1 @@
-@set VERSION 2.12
+@set VERSION 2.12.1
diff --git a/ld/ld.1 b/ld/ld.1
index 1c8f858..272a133 100644
--- a/ld/ld.1
+++ b/ld/ld.1
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "LD 1"
-.TH LD 1 "2002-03-08" "binutils-2.12" "GNU Development Tools"
+.TH LD 1 "2002-05-11" "binutils-2.12.1" "GNU Development Tools"
.UC
.SH "NAME"
ld \- Using \s-1LD\s0, the \s-1GNU\s0 linker
diff --git a/ld/ld.info b/ld/ld.info
index 32d5ef3..430face 100644
--- a/ld/ld.info
+++ b/ld/ld.info
@@ -1,90 +1,90 @@
-This is ld.info, produced by makeinfo version 4.0f from ./ld.texinfo.
+This is ld.info, produced by makeinfo version 4.1 from ./ld.texinfo.
START-INFO-DIR-ENTRY
* Ld: (ld). The GNU linker.
END-INFO-DIR-ENTRY
- This file documents the GNU linker LD version 2.12.
+ This file documents the GNU linker LD version 2.12.1.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.

Indirect:
-ld.info-1: 322
-ld.info-2: 2607
-ld.info-3: 63274
-ld.info-4: 112228
-ld.info-5: 159256
-ld.info-6: 194784
+ld.info-1: 323
+ld.info-2: 2610
+ld.info-3: 63277
+ld.info-4: 112232
+ld.info-5: 159260
+ld.info-6: 194788

Tag Table:
(Indirect)
-Node: Top322
-Node: Overview1087
-Node: Invocation2200
-Node: Options2607
-Node: Environment63274
-Node: Scripts65029
-Node: Basic Script Concepts66762
-Node: Script Format69464
-Node: Simple Example70322
-Node: Simple Commands73412
-Node: Entry Point73858
-Node: File Commands74608
-Node: Format Commands77661
-Node: Miscellaneous Commands79617
-Node: Assignments81838
-Node: Simple Assignments82170
-Node: PROVIDE83866
-Node: SECTIONS85039
-Node: Output Section Description86925
-Node: Output Section Name87910
-Node: Output Section Address88777
-Node: Input Section90411
-Node: Input Section Basics91203
-Node: Input Section Wildcards93538
-Node: Input Section Common96345
-Node: Input Section Keep97814
-Node: Input Section Example98283
-Node: Output Section Data99240
-Node: Output Section Keywords101996
-Node: Output Section Discarding105428
-Node: Output Section Attributes106373
-Node: Output Section Type107207
-Node: Output Section LMA108348
-Node: Output Section Region110452
-Node: Output Section Phdr110865
-Node: Output Section Fill111516
-Node: Overlay Description112228
-Node: MEMORY116467
-Node: PHDRS120544
-Node: VERSION125583
-Node: Expressions132519
-Node: Constants133353
-Node: Symbols133909
-Node: Location Counter134641
-Node: Operators136954
-Node: Evaluation137865
-Node: Expression Section139219
-Node: Builtin Functions140695
-Node: Implicit Linker Scripts145697
-Node: Machine Dependent146465
-Node: H8/300147052
-Node: i960147848
-Node: ARM149528
-Node: HPPA ELF32150682
-Node: MMIX152300
-Node: TI COFF153511
-Node: BFD154013
-Node: BFD outline155467
-Node: BFD information loss156748
-Node: Canonical format159256
-Node: Reporting Bugs163602
-Node: Bug Criteria164295
-Node: Bug Reporting164989
-Node: MRI171749
-Node: GNU Free Documentation License176373
-Node: Index194784
+Node: Top323
+Node: Overview1090
+Node: Invocation2203
+Node: Options2610
+Node: Environment63277
+Node: Scripts65032
+Node: Basic Script Concepts66765
+Node: Script Format69467
+Node: Simple Example70325
+Node: Simple Commands73415
+Node: Entry Point73861
+Node: File Commands74611
+Node: Format Commands77664
+Node: Miscellaneous Commands79621
+Node: Assignments81842
+Node: Simple Assignments82174
+Node: PROVIDE83870
+Node: SECTIONS85043
+Node: Output Section Description86929
+Node: Output Section Name87914
+Node: Output Section Address88781
+Node: Input Section90415
+Node: Input Section Basics91207
+Node: Input Section Wildcards93542
+Node: Input Section Common96349
+Node: Input Section Keep97818
+Node: Input Section Example98287
+Node: Output Section Data99244
+Node: Output Section Keywords102000
+Node: Output Section Discarding105432
+Node: Output Section Attributes106377
+Node: Output Section Type107211
+Node: Output Section LMA108352
+Node: Output Section Region110456
+Node: Output Section Phdr110869
+Node: Output Section Fill111520
+Node: Overlay Description112232
+Node: MEMORY116471
+Node: PHDRS120548
+Node: VERSION125587
+Node: Expressions132523
+Node: Constants133357
+Node: Symbols133913
+Node: Location Counter134645
+Node: Operators136958
+Node: Evaluation137869
+Node: Expression Section139223
+Node: Builtin Functions140699
+Node: Implicit Linker Scripts145701
+Node: Machine Dependent146469
+Node: H8/300147056
+Node: i960147852
+Node: ARM149532
+Node: HPPA ELF32150686
+Node: MMIX152304
+Node: TI COFF153515
+Node: BFD154017
+Node: BFD outline155471
+Node: BFD information loss156752
+Node: Canonical format159260
+Node: Reporting Bugs163606
+Node: Bug Criteria164299
+Node: Bug Reporting164993
+Node: MRI171753
+Node: GNU Free Documentation License176377
+Node: Index194788

End Tag Table
diff --git a/ld/ld.info-1 b/ld/ld.info-1
index a1f55fd..47038ad 100644
--- a/ld/ld.info-1
+++ b/ld/ld.info-1
@@ -1,10 +1,10 @@
-This is ld.info, produced by makeinfo version 4.0f from ./ld.texinfo.
+This is ld.info, produced by makeinfo version 4.1 from ./ld.texinfo.
START-INFO-DIR-ENTRY
* Ld: (ld). The GNU linker.
END-INFO-DIR-ENTRY
- This file documents the GNU linker LD version 2.12.
+ This file documents the GNU linker LD version 2.12.1.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.
@@ -15,7 +15,7 @@ File: ld.info, Node: Top, Next: Overview, Up: (dir)
Using ld
********
- This file documents the GNU linker ld version 2.12.
+ This file documents the GNU linker ld version 2.12.1.
This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the
diff --git a/ld/ld.info-2 b/ld/ld.info-2
index baf84c4..607062d 100644
--- a/ld/ld.info-2
+++ b/ld/ld.info-2
@@ -1,10 +1,10 @@
-This is ld.info, produced by makeinfo version 4.0f from ./ld.texinfo.
+This is ld.info, produced by makeinfo version 4.1 from ./ld.texinfo.
START-INFO-DIR-ENTRY
* Ld: (ld). The GNU linker.
END-INFO-DIR-ENTRY
- This file documents the GNU linker LD version 2.12.
+ This file documents the GNU linker LD version 2.12.1.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.
diff --git a/ld/ld.info-3 b/ld/ld.info-3
index 16a80e7..7d3dbf5 100644
--- a/ld/ld.info-3
+++ b/ld/ld.info-3
@@ -1,10 +1,10 @@
-This is ld.info, produced by makeinfo version 4.0f from ./ld.texinfo.
+This is ld.info, produced by makeinfo version 4.1 from ./ld.texinfo.
START-INFO-DIR-ENTRY
* Ld: (ld). The GNU linker.
END-INFO-DIR-ENTRY
- This file documents the GNU linker LD version 2.12.
+ This file documents the GNU linker LD version 2.12.1.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.
@@ -358,7 +358,7 @@ Commands dealing with object file formats
`OUTPUT_FORMAT(DEFAULT, BIG, LITTLE)'
The `OUTPUT_FORMAT' command names the BFD format to use for the
output file (*note BFD::). Using `OUTPUT_FORMAT(BFDNAME)' is
- exactly like using `-oformat BFDNAME' on the command line (*note
+ exactly like using `--oformat BFDNAME' on the command line (*note
Command Line Options: Options.). If both are used, the command
line option takes precedence.
diff --git a/ld/ld.info-4 b/ld/ld.info-4
index c3a827d..cac1d59 100644
--- a/ld/ld.info-4
+++ b/ld/ld.info-4
@@ -1,10 +1,10 @@
-This is ld.info, produced by makeinfo version 4.0f from ./ld.texinfo.
+This is ld.info, produced by makeinfo version 4.1 from ./ld.texinfo.
START-INFO-DIR-ENTRY
* Ld: (ld). The GNU linker.
END-INFO-DIR-ENTRY
- This file documents the GNU linker LD version 2.12.
+ This file documents the GNU linker LD version 2.12.1.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.
diff --git a/ld/ld.info-5 b/ld/ld.info-5
index b508f76..d5df627 100644
--- a/ld/ld.info-5
+++ b/ld/ld.info-5
@@ -1,10 +1,10 @@
-This is ld.info, produced by makeinfo version 4.0f from ./ld.texinfo.
+This is ld.info, produced by makeinfo version 4.1 from ./ld.texinfo.
START-INFO-DIR-ENTRY
* Ld: (ld). The GNU linker.
END-INFO-DIR-ENTRY
- This file documents the GNU linker LD version 2.12.
+ This file documents the GNU linker LD version 2.12.1.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.
diff --git a/ld/ld.info-6 b/ld/ld.info-6
index 3744a9f..7169a2c 100644
--- a/ld/ld.info-6
+++ b/ld/ld.info-6
@@ -1,10 +1,10 @@
-This is ld.info, produced by makeinfo version 4.0f from ./ld.texinfo.
+This is ld.info, produced by makeinfo version 4.1 from ./ld.texinfo.
START-INFO-DIR-ENTRY
* Ld: (ld). The GNU linker.
END-INFO-DIR-ENTRY
- This file documents the GNU linker LD version 2.12.
+ This file documents the GNU linker LD version 2.12.1.
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.
diff --git a/ld/ldver.texi b/ld/ldver.texi
index 9c419c5..8a5d583 100644
--- a/ld/ldver.texi
+++ b/ld/ldver.texi
@@ -1 +1 @@
-@set VERSION 2.12
+@set VERSION 2.12.1
generated by cgit v1.1 at 2025-01-30 09:29:32 +0000