Re: [Xen-devel] [PATCH 4.4 1/2] libxl: Rerun bison and flex

2016-01-12 Thread Ian Jackson 
Ian Campbell writes ("Re: [PATCH 4.4 1/2] libxl: Rerun bison and flex"):
> On Mon, 2016-01-04 at 14:50 +, Ian Jackson wrote:
> > We are going to want to cherry pick a change to the bison input, which
> > will involve rerunning bison.
> > 
> > So firstly, update the bison and flex output to that from current
> > Debian wheezy (i386; 1:2.5.dfsg-2.1 and 2.5.35-10.1 respectively).
> > 
> > There should be no functional change since there is no change to the
> > source file, but we will inherit bugfixes and behavioural changes from
> > the new version of bison.  So this is more a matter of hope than
> > knowledge.
> 
> This one isn't a cherry pick, but rather a manual rerun of the tools with a
> cargo-culted commit message from another such occasion, right?

Yes.

Ian.

___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

[Xen-devel] [PATCH 4.4 1/2] libxl: Rerun bison and flex

2016-01-04 Thread Ian Jackson 
We are going to want to cherry pick a change to the bison input, which
will involve rerunning bison.

So firstly, update the bison and flex output to that from current
Debian wheezy (i386; 1:2.5.dfsg-2.1 and 2.5.35-10.1 respectively).

There should be no functional change since there is no change to the
source file, but we will inherit bugfixes and behavioural changes from
the new version of bison.  So this is more a matter of hope than
knowledge.

Signed-off-by: Ian Jackson 
---
 tools/libxl/libxlu_cfg_y.c |  538 
 tools/libxl/libxlu_cfg_y.h |   14 +-
 2 files changed, 304 insertions(+), 248 deletions(-)

diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libxl/libxlu_cfg_y.c
index 218933e..4437e05 100644
--- a/tools/libxl/libxlu_cfg_y.c
+++ b/tools/libxl/libxlu_cfg_y.c
@@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C

-  Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+  Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -46,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -75,7 +73,7 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
+/* Line 268 of yacc.c  */
 #line 19 "libxlu_cfg_y.y"
 
 #define YYLEX_PARAM ctx->scanner
@@ -83,8 +81,8 @@
 #include "libxlu_cfg_l.h"
 
 
-/* Line 189 of yacc.c  */
-#line 88 "libxlu_cfg_y.c"
+/* Line 268 of yacc.c  */
+#line 86 "libxlu_cfg_y.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -124,7 +122,7 @@
 typedef union YYSTYPE
 {
 
-/* Line 214 of yacc.c  */
+/* Line 293 of yacc.c  */
 #line 25 "libxlu_cfg_y.y"
 
   char *string;
@@ -132,8 +130,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 214 of yacc.c  */
-#line 137 "libxlu_cfg_y.c"
+/* Line 293 of yacc.c  */
+#line 135 "libxlu_cfg_y.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -157,8 +155,8 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 162 "libxlu_cfg_y.c"
+/* Line 343 of yacc.c  */
+#line 160 "libxlu_cfg_y.c"
 
 #ifdef short
 # undef short
@@ -208,7 +206,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include  /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -261,11 +259,11 @@ YYID (yyi)
 #define alloca _alloca
 #   else
 #define YYSTACK_ALLOC alloca
-#if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || 
defined __C99__FUNC__ \
+#if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || 
defined __C99__FUNC__ \
  || defined __cplusplus || defined _MSC_VER)
 # include  /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-#  define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+#  define EXIT_SUCCESS 0
 # endif
 #endif
 #   endif
@@ -288,24 +286,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
 && (defined YYFREE || defined free)))
 #   include  /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined 
__C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || 
defined __C99__FUNC__ \
  || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined 
__C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || 
defined __C99__FUNC__ \
  || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -336,23 +334,7 @@ union yyalloc
  ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
   + 2 * YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef

Re: [Xen-devel] [PATCH 4.4 1/2] libxl: Rerun bison and flex

2016-01-04 Thread Ian Campbell 
On Mon, 2016-01-04 at 14:50 +, Ian Jackson wrote:
> We are going to want to cherry pick a change to the bison input, which
> will involve rerunning bison.
> 
> So firstly, update the bison and flex output to that from current
> Debian wheezy (i386; 1:2.5.dfsg-2.1 and 2.5.35-10.1 respectively).
> 
> There should be no functional change since there is no change to the
> source file, but we will inherit bugfixes and behavioural changes from
> the new version of bison.  So this is more a matter of hope than
> knowledge.

This one isn't a cherry pick, but rather a manual rerun of the tools with a
cargo-culted commit message from another such occasion, right?

> 
> Signed-off-by: Ian Jackson 
> ---
>  tools/libxl/libxlu_cfg_y.c |  538 
> 
>  tools/libxl/libxlu_cfg_y.h |   14 +-
>  2 files changed, 304 insertions(+), 248 deletions(-)
> 
> diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libxl/libxlu_cfg_y.c
> index 218933e..4437e05 100644
> --- a/tools/libxl/libxlu_cfg_y.c
> +++ b/tools/libxl/libxlu_cfg_y.c
> @@ -1,10 +1,8 @@
> +/* A Bison parser, made by GNU Bison 2.5.  */
>  
> -/* A Bison parser, made by GNU Bison 2.4.1.  */
> -
> -/* Skeleton implementation for Bison's Yacc-like parsers in C
> +/* Bison implementation for Yacc-like parsers in C
> 
> -  Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004,
> 2005, 2006
> -   Free Software Foundation, Inc.
> +  Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation,
> Inc.
> 
> This program is free software: you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -46,7 +44,7 @@
>  #define YYBISON 1
>  
>  /* Bison version.  */
> -#define YYBISON_VERSION "2.4.1"
> +#define YYBISON_VERSION "2.5"
>  
>  /* Skeleton name.  */
>  #define YYSKELETON_NAME "yacc.c"
> @@ -75,7 +73,7 @@
>  
>  /* Copy the first part of user declarations.  */
>  
> -/* Line 189 of yacc.c  */
> +/* Line 268 of yacc.c  */
>  #line 19 "libxlu_cfg_y.y"
>  
>  #define YYLEX_PARAM ctx->scanner
> @@ -83,8 +81,8 @@
>  #include "libxlu_cfg_l.h"
>  
>  
> -/* Line 189 of yacc.c  */
> -#line 88 "libxlu_cfg_y.c"
> +/* Line 268 of yacc.c  */
> +#line 86 "libxlu_cfg_y.c"
>  
>  /* Enabling traces.  */
>  #ifndef YYDEBUG
> @@ -124,7 +122,7 @@
>  typedef union YYSTYPE
>  {
>  
> -/* Line 214 of yacc.c  */
> +/* Line 293 of yacc.c  */
>  #line 25 "libxlu_cfg_y.y"
>  
>    char *string;
> @@ -132,8 +130,8 @@ typedef union YYSTYPE
>  
>  
>  
> -/* Line 214 of yacc.c  */
> -#line 137 "libxlu_cfg_y.c"
> +/* Line 293 of yacc.c  */
> +#line 135 "libxlu_cfg_y.c"
>  } YYSTYPE;
>  # define YYSTYPE_IS_TRIVIAL 1
>  # define yystype YYSTYPE /* obsolescent; will be withdrawn */
> @@ -157,8 +155,8 @@ typedef struct YYLTYPE
>  /* Copy the second part of user declarations.  */
>  
>  
> -/* Line 264 of yacc.c  */
> -#line 162 "libxlu_cfg_y.c"
> +/* Line 343 of yacc.c  */
> +#line 160 "libxlu_cfg_y.c"
>  
>  #ifdef short
>  # undef short
> @@ -208,7 +206,7 @@ typedef short int yytype_int16;
>  #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
>  
>  #ifndef YY_
> -# if YYENABLE_NLS
> +# if defined YYENABLE_NLS && YYENABLE_NLS
>  #  if ENABLE_NLS
>  #   include  /* INFRINGES ON USER NAME SPACE */
>  #   define YY_(msgid) dgettext ("bison-runtime", msgid)
> @@ -261,11 +259,11 @@ YYID (yyi)
>  #define alloca _alloca
>  #   else
>  #define YYSTACK_ALLOC alloca
> -#if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__
> || defined __C99__FUNC__ \
> +#if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined
> __STDC__ || defined __C99__FUNC__ \
>   || defined __cplusplus || defined _MSC_VER)
>  # include  /* INFRINGES ON USER NAME SPACE */
> -# ifndef _STDLIB_H
> -#  define _STDLIB_H 1
> +# ifndef EXIT_SUCCESS
> +#  define EXIT_SUCCESS 0
>  # endif
>  #endif
>  #   endif
> @@ -288,24 +286,24 @@ YYID (yyi)
>  #  ifndef YYSTACK_ALLOC_MAXIMUM
>  #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
>  #  endif
> -#  if (defined __cplusplus && ! defined _STDLIB_H \
> +#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
> && ! ((defined YYMALLOC || defined malloc) \
>    && (defined YYFREE || defined free)))
>  #   include  /* INFRINGES ON USER NAME SPACE */
> -#   ifndef _STDLIB_H
> -#define _STDLIB_H 1
> +#   ifndef EXIT_SUCCESS
> +#define EXIT_SUCCESS 0
>  #   endif
>  #  endif
>  #  ifndef YYMALLOC
>  #   define YYMALLOC malloc
> -#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ ||
> defined __C99__FUNC__ \
> +#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__
> || defined __C99__FUNC__ \
>   || defined __cplusplus || defined _MSC_VER)
>  void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
>  #   endif
>  #  endif
>  #  ifndef YYFREE
>  #   define YYFREE free
> -#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ ||
>