* data/bison.simple, data/bison.c++: Be sure to restore the

current #line when returning to the skeleton contents after having
exposed the input file's #line.

ChangeLog

@@ -1,3 +1,9 @@
+2002-06-14  Akim Demaille  <akim@epita.fr>
+
+	* data/bison.simple, data/bison.c++: Be sure to restore the
+	current #line when returning to the skeleton contents after having
+	exposed the input file's #line.
+
 2002-06-12  Akim Demaille  <akim@epita.fr>
 
 	* src/scan-gram.l (SC_BRACED_CODE): Don't use `<.*>', it is too

data/bison.c++

@@ -145,6 +145,9 @@ b4_copyright
 /* Copy the first part of user declarations.  */
 b4_pre_prologue
 
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"
+
 /* Tokens.  */
 b4_token_defines(b4_tokens)
 
@@ -161,7 +164,9 @@ b4_token_defines(b4_tokens)
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-typedef union b4_stype yystype;],
+typedef union b4_stype yystype;
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"],
 [typedef int yystype;])
 # define YYSTYPE yystype
 #endif
@@ -169,6 +174,7 @@ typedef union b4_stype yystype;],
 /* Copy the second part of user declarations.  */
 b4_post_prologue
 
+/* Line __line__ of __file__.  */
 #line __oline__  "__ofile__"
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \

data/bison.simple

@@ -193,7 +193,9 @@ b4_token_defines(b4_tokens)
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-typedef union b4_stype yystype;],
+typedef union b4_stype yystype;
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"],
 [typedef int yystype;])
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1240,7 +1242,9 @@ b4_token_defines(b4_tokens)
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-typedef union b4_stype yystype;],
+typedef union b4_stype yystype;
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"],
 [typedef int yystype;])
 # define YYSTYPE yystype
 #endif

src/parse-gram.h

@@ -1,70 +1,122 @@
 #ifndef BISON_PARSE_GRAM_H
 # define BISON_PARSE_GRAM_H
 
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# if defined (__STDC__) || defined (__cplusplus)
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     GRAM_EOF = 0,
+     STRING = 258,
+     CHARACTER = 259,
+     INT = 260,
+     PERCENT_TOKEN = 261,
+     PERCENT_NTERM = 262,
+     PERCENT_TYPE = 263,
+     PERCENT_UNION = 264,
+     PERCENT_EXPECT = 265,
+     PERCENT_START = 266,
+     PERCENT_LEFT = 267,
+     PERCENT_RIGHT = 268,
+     PERCENT_NONASSOC = 269,
+     PERCENT_PREC = 270,
+     PERCENT_VERBOSE = 271,
+     PERCENT_ERROR_VERBOSE = 272,
+     PERCENT_OUTPUT = 273,
+     PERCENT_FILE_PREFIX = 274,
+     PERCENT_NAME_PREFIX = 275,
+     PERCENT_DEFINE = 276,
+     PERCENT_PURE_PARSER = 277,
+     PERCENT_DEFINES = 278,
+     PERCENT_YACC = 279,
+     PERCENT_DEBUG = 280,
+     PERCENT_LOCATIONS = 281,
+     PERCENT_NO_LINES = 282,
+     PERCENT_SKELETON = 283,
+     PERCENT_TOKEN_TABLE = 284,
+     TYPE = 285,
+     EQUAL = 286,
+     SEMICOLON = 287,
+     COLON = 288,
+     PIPE = 289,
+     ID = 290,
+     PERCENT_PERCENT = 291,
+     PROLOGUE = 292,
+     EPILOGUE = 293,
+     BRACED_CODE = 294
+   };
+# endif
+  /* POSIX requires `int' for tokens in interfaces.  */
+# define YYTOKENTYPE int
+#endif /* !YYTOKENTYPE */
+#define GRAM_EOF 0
+#define STRING 258
+#define CHARACTER 259
+#define INT 260
+#define PERCENT_TOKEN 261
+#define PERCENT_NTERM 262
+#define PERCENT_TYPE 263
+#define PERCENT_UNION 264
+#define PERCENT_EXPECT 265
+#define PERCENT_START 266
+#define PERCENT_LEFT 267
+#define PERCENT_RIGHT 268
+#define PERCENT_NONASSOC 269
+#define PERCENT_PREC 270
+#define PERCENT_VERBOSE 271
+#define PERCENT_ERROR_VERBOSE 272
+#define PERCENT_OUTPUT 273
+#define PERCENT_FILE_PREFIX 274
+#define PERCENT_NAME_PREFIX 275
+#define PERCENT_DEFINE 276
+#define PERCENT_PURE_PARSER 277
+#define PERCENT_DEFINES 278
+#define PERCENT_YACC 279
+#define PERCENT_DEBUG 280
+#define PERCENT_LOCATIONS 281
+#define PERCENT_NO_LINES 282
+#define PERCENT_SKELETON 283
+#define PERCENT_TOKEN_TABLE 284
+#define TYPE 285
+#define EQUAL 286
+#define SEMICOLON 287
+#define COLON 288
+#define PIPE 289
+#define ID 290
+#define PERCENT_PERCENT 291
+#define PROLOGUE 292
+#define EPILOGUE 293
+#define BRACED_CODE 294
+
+
+
+
 #ifndef YYSTYPE
-typedef union
-{
+#line 73 "parse-gram.y"
+typedef union {
   symbol_t *symbol;
   int integer;
   char *string;
   associativity assoc;
 } yystype;
 # define YYSTYPE yystype
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
+
+
 #ifndef YYLTYPE
 typedef struct yyltype
 {
   int first_line;
   int first_column;
-
   int last_line;
   int last_column;
 } yyltype;
-
 # define YYLTYPE yyltype
-# define YYLTYPE_IS_TRIVIAL 1
 #endif
 
-# define	GRAM_EOF	0
-# define	STRING	257
-# define	CHARACTER	258
-# define	INT	259
-# define	PERCENT_TOKEN	260
-# define	PERCENT_NTERM	261
-# define	PERCENT_TYPE	262
-# define	PERCENT_UNION	263
-# define	PERCENT_EXPECT	264
-# define	PERCENT_START	265
-# define	PERCENT_LEFT	266
-# define	PERCENT_RIGHT	267
-# define	PERCENT_NONASSOC	268
-# define	PERCENT_PREC	269
-# define	PERCENT_VERBOSE	270
-# define	PERCENT_ERROR_VERBOSE	271
-# define	PERCENT_OUTPUT	272
-# define	PERCENT_FILE_PREFIX	273
-# define	PERCENT_NAME_PREFIX	274
-# define	PERCENT_DEFINE	275
-# define	PERCENT_PURE_PARSER	276
-# define	PERCENT_DEFINES	277
-# define	PERCENT_YACC	278
-# define	PERCENT_DEBUG	279
-# define	PERCENT_LOCATIONS	280
-# define	PERCENT_NO_LINES	281
-# define	PERCENT_SKELETON	282
-# define	PERCENT_TOKEN_TABLE	283
-# define	TYPE	284
-# define	EQUAL	285
-# define	SEMICOLON	286
-# define	COLON	287
-# define	PIPE	288
-# define	ID	289
-# define	PERCENT_PERCENT	290
-# define	PROLOGUE	291
-# define	EPILOGUE	292
-# define	BRACED_CODE	293
 
 
 #endif /* not BISON_PARSE_GRAM_H */
+