From a73eaf90e0de265853df81ed96011c9cd061e545 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 23 Jul 2013 16:18:02 +0200 Subject: [PATCH] bug #2093: Parsers compiled with latest changes (cherry picked from commit 8d02a71c3cb9ef6387e9e4a9e4efdcf43a91b126) --- src/template/template_syntax.cc | 42 ++++++++--------- src/template/template_syntax.h | 8 ++-- src/vm/vm_file_var_syntax.cc | 80 ++++++++++++++++++++------------- src/vm/vm_file_var_syntax.h | 10 ++--- src/xml/expr_arith.cc | 54 +++++++++++----------- src/xml/expr_arith.h | 8 ++-- src/xml/expr_bool.cc | 64 +++++++++++++------------- src/xml/expr_bool.h | 8 ++-- 8 files changed, 147 insertions(+), 127 deletions(-) diff --git a/src/template/template_syntax.cc b/src/template/template_syntax.cc index 341db2a4fd..1345d65449 100644 --- a/src/template/template_syntax.cc +++ b/src/template/template_syntax.cc @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7" +#define YYBISON_VERSION "2.7.12-4996" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -282,6 +282,14 @@ typedef short int yytype_int16; # endif #endif +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -289,6 +297,7 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif + /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint # define YYID(N) (N) @@ -809,11 +818,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, mc, tmpl, error_ # else YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1221,12 +1226,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, mc, tmpl, error_msg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YYUSE (yytype); } @@ -1552,7 +1552,7 @@ yyreduce: switch (yyn) { case 6: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 103 "template_syntax.y" { Attribute * pattr; @@ -1566,7 +1566,7 @@ yyreduce: break; case 7: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 113 "template_syntax.y" { Attribute * pattr; @@ -1583,7 +1583,7 @@ yyreduce: break; case 8: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 126 "template_syntax.y" { Attribute * pattr; @@ -1597,7 +1597,7 @@ yyreduce: break; case 9: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 138 "template_syntax.y" { map* vattr; @@ -1614,7 +1614,7 @@ yyreduce: break; case 10: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 151 "template_syntax.y" { string name((yyvsp[(3) - (5)].val_str)); @@ -1631,7 +1631,7 @@ yyreduce: break; -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 1636 "template_syntax.cc" default: break; } @@ -1870,7 +1870,7 @@ yyreturn: } -/* Line 2055 of yacc.c */ +/* Line 2050 of yacc.c */ #line 164 "template_syntax.y" diff --git a/src/template/template_syntax.h b/src/template/template_syntax.h index a026114762..55ed0e45da 100644 --- a/src/template/template_syntax.h +++ b/src/template/template_syntax.h @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -60,14 +60,14 @@ extern int template__debug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 2058 of yacc.c */ +/* Line 2053 of yacc.c */ #line 74 "template_syntax.y" char * val_str; void * val_attr; -/* Line 2058 of yacc.c */ +/* Line 2053 of yacc.c */ #line 72 "template_syntax.hh" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 diff --git a/src/vm/vm_file_var_syntax.cc b/src/vm/vm_file_var_syntax.cc index a4775069d3..b532e52859 100644 --- a/src/vm/vm_file_var_syntax.cc +++ b/src/vm/vm_file_var_syntax.cc @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7" +#define YYBISON_VERSION "2.7.12-4996" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -175,6 +175,17 @@ int get_image_path(VirtualMachine * vm, } img = ipool->get(val1, uid, true); + + if ( img == 0 ) + { + ostringstream oss; + oss << "User " << uid << " does not own an image with name: " << val1 + << " . Set IMAGE_UNAME or IMAGE_UID of owner."; + + error_str = oss.str(); + + return -1; + } } else if ( var1 == "IMAGE_ID" ) { @@ -184,11 +195,20 @@ int get_image_path(VirtualMachine * vm, { img = ipool->get(iid, true); } - } - if ( img == 0 ) + if ( img == 0 ) + { + ostringstream oss; + oss << "Image with ID: " << iid << " does not exist"; + + error_str = oss.str(); + + return -1; + } + } + else { - error_str = "Cannot get image (check name/ID or try IMAGE_UNAME or IMAGE_UID)."; + error_str = "Cannot get image, set IMAGE_ID or IMAGE."; return -1; } @@ -218,7 +238,7 @@ int get_image_path(VirtualMachine * vm, /* Line 371 of yacc.c */ -#line 222 "vm_file_var_syntax.cc" +#line 242 "vm_file_var_syntax.cc" # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -271,7 +291,7 @@ extern int vm_file_var__debug; typedef union YYSTYPE { /* Line 387 of yacc.c */ -#line 170 "vm_file_var_syntax.y" +#line 190 "vm_file_var_syntax.y" char * val_str; int val_int; @@ -279,7 +299,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 283 "vm_file_var_syntax.cc" +#line 303 "vm_file_var_syntax.cc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -319,7 +339,7 @@ int vm_file_var__parse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 323 "vm_file_var_syntax.cc" +#line 343 "vm_file_var_syntax.cc" #ifdef short # undef short @@ -380,6 +400,14 @@ typedef short int yytype_int16; # endif #endif +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -387,6 +415,7 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif + /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint # define YYID(N) (N) @@ -610,7 +639,7 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 194, 194, 195, 199, 217 + 0, 214, 214, 215, 219, 237 }; #endif @@ -905,11 +934,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, mc, vm, img_ids, # else YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1321,12 +1346,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, mc, vm, img_ids, errmsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YYUSE (yytype); } @@ -1653,8 +1673,8 @@ yyreduce: switch (yyn) { case 4: -/* Line 1792 of yacc.c */ -#line 200 "vm_file_var_syntax.y" +/* Line 1787 of yacc.c */ +#line 220 "vm_file_var_syntax.y" { string file((yyvsp[(1) - (7)].val_str)); string var1((yyvsp[(3) - (7)].val_str)); @@ -1675,8 +1695,8 @@ yyreduce: break; case 5: -/* Line 1792 of yacc.c */ -#line 218 "vm_file_var_syntax.y" +/* Line 1787 of yacc.c */ +#line 238 "vm_file_var_syntax.y" { string file((yyvsp[(1) - (11)].val_str)); string var1((yyvsp[(3) - (11)].val_str)); @@ -1700,8 +1720,8 @@ yyreduce: break; -/* Line 1792 of yacc.c */ -#line 1705 "vm_file_var_syntax.cc" +/* Line 1787 of yacc.c */ +#line 1725 "vm_file_var_syntax.cc" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1939,8 +1959,8 @@ yyreturn: } -/* Line 2055 of yacc.c */ -#line 239 "vm_file_var_syntax.y" +/* Line 2050 of yacc.c */ +#line 259 "vm_file_var_syntax.y" extern "C" void vm_file_var__error( diff --git a/src/vm/vm_file_var_syntax.h b/src/vm/vm_file_var_syntax.h index 900eaabbb4..ba21e884af 100644 --- a/src/vm/vm_file_var_syntax.h +++ b/src/vm/vm_file_var_syntax.h @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -62,15 +62,15 @@ extern int vm_file_var__debug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 2058 of yacc.c */ -#line 170 "vm_file_var_syntax.y" +/* Line 2053 of yacc.c */ +#line 190 "vm_file_var_syntax.y" char * val_str; int val_int; char val_char; -/* Line 2058 of yacc.c */ +/* Line 2053 of yacc.c */ #line 75 "vm_file_var_syntax.hh" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 diff --git a/src/xml/expr_arith.cc b/src/xml/expr_arith.cc index bd58413981..6870d4c135 100644 --- a/src/xml/expr_arith.cc +++ b/src/xml/expr_arith.cc @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7" +#define YYBISON_VERSION "2.7.12-4996" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -282,6 +282,14 @@ typedef short int yytype_int16; # endif #endif +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -289,6 +297,7 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif + /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint # define YYID(N) (N) @@ -813,11 +822,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, mc, oxml, result # else YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1229,12 +1234,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, mc, oxml, result, error_msg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YYUSE (yytype); } @@ -1561,19 +1561,19 @@ yyreduce: switch (yyn) { case 2: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 100 "expr_arith.y" { result = static_cast((yyvsp[(1) - (1)].val_float));} break; case 3: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 101 "expr_arith.y" { result = 0; } break; case 4: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 104 "expr_arith.y" { float val = 0.0; @@ -1606,55 +1606,55 @@ yyreduce: break; case 5: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 132 "expr_arith.y" { (yyval.val_float) = (yyvsp[(1) - (1)].val_float); } break; case 6: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 133 "expr_arith.y" { (yyval.val_float) = static_cast((yyvsp[(1) - (1)].val_int)); } break; case 7: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 134 "expr_arith.y" { (yyval.val_float) = (yyvsp[(1) - (3)].val_float) + (yyvsp[(3) - (3)].val_float);} break; case 8: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 135 "expr_arith.y" { (yyval.val_float) = (yyvsp[(1) - (3)].val_float) - (yyvsp[(3) - (3)].val_float);} break; case 9: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 136 "expr_arith.y" { (yyval.val_float) = (yyvsp[(1) - (3)].val_float) * (yyvsp[(3) - (3)].val_float);} break; case 10: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 137 "expr_arith.y" { (yyval.val_float) = (yyvsp[(1) - (3)].val_float) / (yyvsp[(3) - (3)].val_float);} break; case 11: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 138 "expr_arith.y" { (yyval.val_float) = - (yyvsp[(2) - (2)].val_float);} break; case 12: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 139 "expr_arith.y" { (yyval.val_float) = (yyvsp[(2) - (3)].val_float);} break; -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 1659 "expr_arith.cc" default: break; } @@ -1893,7 +1893,7 @@ yyreturn: } -/* Line 2055 of yacc.c */ +/* Line 2050 of yacc.c */ #line 142 "expr_arith.y" diff --git a/src/xml/expr_arith.h b/src/xml/expr_arith.h index 7779dd0a38..1465fae072 100644 --- a/src/xml/expr_arith.h +++ b/src/xml/expr_arith.h @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -56,7 +56,7 @@ extern int expr_arith__debug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 2058 of yacc.c */ +/* Line 2053 of yacc.c */ #line 78 "expr_arith.y" char * val_str; @@ -64,7 +64,7 @@ typedef union YYSTYPE float val_float; -/* Line 2058 of yacc.c */ +/* Line 2053 of yacc.c */ #line 69 "expr_arith.hh" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 diff --git a/src/xml/expr_bool.cc b/src/xml/expr_bool.cc index 1fd54b7b30..f4e943bad7 100644 --- a/src/xml/expr_bool.cc +++ b/src/xml/expr_bool.cc @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7" +#define YYBISON_VERSION "2.7.12-4996" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -292,6 +292,14 @@ typedef short int yytype_int16; # endif #endif +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -299,6 +307,7 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif + /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint # define YYID(N) (N) @@ -829,11 +838,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, mc, oxml, result # else YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1245,12 +1250,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, mc, oxml, result, error_msg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YYUSE (yytype); } @@ -1577,19 +1577,19 @@ yyreduce: switch (yyn) { case 2: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 108 "expr_bool.y" { result=(yyvsp[(1) - (1)].val_int); } break; case 3: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 109 "expr_bool.y" { result=true; } break; case 4: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 112 "expr_bool.y" { int val, rc; @@ -1609,7 +1609,7 @@ yyreduce: break; case 5: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 128 "expr_bool.y" { int val, rc; @@ -1629,7 +1629,7 @@ yyreduce: break; case 6: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 144 "expr_bool.y" { int val, rc; @@ -1638,7 +1638,7 @@ yyreduce: break; case 7: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 149 "expr_bool.y" { int val, rc; @@ -1647,7 +1647,7 @@ yyreduce: break; case 8: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 154 "expr_bool.y" { float val, rc; @@ -1656,7 +1656,7 @@ yyreduce: break; case 9: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 159 "expr_bool.y" { float val, rc; @@ -1665,7 +1665,7 @@ yyreduce: break; case 10: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 164 "expr_bool.y" { float val, rc; @@ -1674,7 +1674,7 @@ yyreduce: break; case 11: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 169 "expr_bool.y" { float val, rc; @@ -1683,7 +1683,7 @@ yyreduce: break; case 12: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 174 "expr_bool.y" { string val; int rc; @@ -1692,7 +1692,7 @@ yyreduce: break; case 13: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 179 "expr_bool.y" { string val; int rc; @@ -1701,31 +1701,31 @@ yyreduce: break; case 14: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 184 "expr_bool.y" { (yyval.val_int) = (yyvsp[(1) - (3)].val_int) && (yyvsp[(3) - (3)].val_int); } break; case 15: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 185 "expr_bool.y" { (yyval.val_int) = (yyvsp[(1) - (3)].val_int) || (yyvsp[(3) - (3)].val_int); } break; case 16: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 186 "expr_bool.y" { (yyval.val_int) = ! (yyvsp[(2) - (2)].val_int); } break; case 17: -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 187 "expr_bool.y" { (yyval.val_int) = (yyvsp[(2) - (3)].val_int); } break; -/* Line 1792 of yacc.c */ +/* Line 1787 of yacc.c */ #line 1730 "expr_bool.cc" default: break; } @@ -1964,7 +1964,7 @@ yyreturn: } -/* Line 2055 of yacc.c */ +/* Line 2050 of yacc.c */ #line 190 "expr_bool.y" diff --git a/src/xml/expr_bool.h b/src/xml/expr_bool.h index 8cd82f901b..9d23f479c4 100644 --- a/src/xml/expr_bool.h +++ b/src/xml/expr_bool.h @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -56,7 +56,7 @@ extern int expr_bool__debug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 2058 of yacc.c */ +/* Line 2053 of yacc.c */ #line 88 "expr_bool.y" char * val_str; @@ -64,7 +64,7 @@ typedef union YYSTYPE float val_float; -/* Line 2058 of yacc.c */ +/* Line 2053 of yacc.c */ #line 69 "expr_bool.hh" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1