Merge commit 'upstream/1.4.8'

Conflicts:
	debian/changelog
	debian/control
	debian/libconfig++9-dev.install
	debian/libconfig8.install
	debian/libconfig9-dev.install
	debian/rules

1 files changed, 31 insertions, 23 deletions

diff --git a/grammar.h b/lib/grammar.h
index e3fd524..2ce199d 100644
--- a/grammar.h
+++ b/lib/grammar.h
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +28,11 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -56,8 +56,9 @@
      TOK_COMMA = 272,
      TOK_GROUP_START = 273,
      TOK_GROUP_END = 274,
-     TOK_END = 275,
-     TOK_GARBAGE = 276
+     TOK_SEMICOLON = 275,
+     TOK_GARBAGE = 276,
+     TOK_ERROR = 277
    };
 #endif
 /* Tokens.  */
@@ -78,28 +79,35 @@
 #define TOK_COMMA 272
 #define TOK_GROUP_START 273
 #define TOK_GROUP_END 274
-#define TOK_END 275
+#define TOK_SEMICOLON 275
 #define TOK_GARBAGE 276
+#define TOK_ERROR 277
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 73 "grammar.y"
 {
-  long ival;
+
+/* Line 1676 of yacc.c  */
+#line 85 "grammar.y"
+
+  int ival;
   long long llval;
   double fval;
   char *sval;
-}
-/* Line 1489 of yacc.c.  */
-#line 98 "grammar.h"
-	YYSTYPE;
+
+
+
+/* Line 1676 of yacc.c  */
+#line 105 "grammar.h"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
+