Improve testing of etags

* test/manual/etags/y-src/cccp.c:
* test/manual/etags/y-src/parse.c: Correct #line directives to
allow testing invalidate_nodes in etags.c.
* test/manual/etags/ETAGS.good_1:
* test/manual/etags/ETAGS.good_2:
* test/manual/etags/ETAGS.good_3:
* test/manual/etags/ETAGS.good_4:
* test/manual/etags/ETAGS.good_5:
* test/manual/etags/ETAGS.good_6:
* test/manual/etags/CTAGS.good: Adapt to changes in test files.

1 files changed, 1 insertions, 162 deletions

diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index f5e0ad4407f..35bb97986c0 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -5074,59 +5074,7 @@ y-src/parse.c,520
 # define	L_NE	26,492
 # define	L_GE	27,510
 
-parse.y,1464
-#define obstack_chunk_alloc 46,
-#define obstack_chunk_free 47,
-int yylex 57,
-void yyerror 59,
-void yyerror 61,
-VOIDSTAR parse_hash;63,
-extern VOIDSTAR hash_find(64,
-unsigned char fnin[fnin
67,
-#define YYSTYPE 71,
-typedef struct node *YYSTYPE;YYSTYPE
72,
-YYSTYPE parse_return;73,
-YYSTYPE make_list 75,
-YYSTYPE make_list 77,
-char *instr;instr
80,
-int parse_error 81,
-extern struct obstack tmp_mem;82,
-#define YYSTYPE 85,
-# define YYDEBUG 88,
-#define	YYFINAL	93,
-#define	YYFLAG	94,
-#define	YYNTBASE	95,
-#define YYTRANSLATE(98,
-static const char yytranslate[yytranslate
101,
-static const short yyprhs[yyprhs
134,
-static const short yyrhs[yyrhs
142,
-static const short yyrline[yyrline
171,
-static const char *const yytname[yytname
185,
-static const short yyr1[yyr1
197,
-static const short yyr2[yyr2
207,
-static const short yydefact[yydefact
219,
-static const short yydefgoto[yydefgoto
237,
-static const short yypact[yypact
242,
-static const short yypgoto[yypgoto
260,
-#define	YYLAST	266,
-static const short yytable[yytable
269,
-static const short yycheck[yycheck
330,
-yyerror FUN1(285,
-make_list FUN2(292,
-#define ERROR 303,
-extern struct node *yylval;yylval
305,
-unsigned char parse_cell_or_range 308,
-unsigned char parse_cell_or_range 310,
-yylex FUN0(314,
-parse_cell_or_range FUN2(586,
-#define CK_ABS_R(670,
-#define CK_REL_R(674,
-#define CK_ABS_C(679,
-#define CK_REL_C(683,
-#define MAYBEREL(688,
-str_to_col FUN1(846,
-
-/usr/share/bison/bison.simple,2238
+/usr/share/bison/bison.simple,1787
 # define YYSTD(40,
 # define YYSTD(42,
 #  define YYSTACK_ALLOC 50,
@@ -5198,30 +5146,6 @@ yyparse 403,
 # define YYPOPSTACK 445,
 # define YYPOPSTACK 447,
 # undef YYSTACK_RELOCATE548,
-  *++yyvsp yyvsp
746,
-  *++yylsp yylsp
748,
-  yyn 755,
-  yystate 757,
-    yystate 761,
-  goto yynewstate;763,
-  goto yyerrlab1;823,
-  yyerrstatus 846,
-  goto yyerrhandle;848,
-  yyn 861,
-  yystate 875,
-  yyn 895,
-  yyn 903,
-  YYDPRINTF 917,
-  *++yyvsp yyvsp
919,
-  *++yylsp yylsp
921,
-  yystate 924,
-  goto yynewstate;925,
-  yyresult 932,
-  goto yyreturn;933,
-  yyresult 939,
-  goto yyreturn;940,
-  yyerror 946,
-  yyresult 947,
 
 y-src/atest.y,9
 exp	2,3
@@ -5242,91 +5166,6 @@ y-src/cccp.c,303
 # define	RSH	17,310
 # define	UNARY	18,327
 
-cccp.y,2532
-typedef unsigned char U_CHAR;38,
-struct arglist 41,
-  struct arglist *next;next
42,
-  U_CHAR *name;name
43,
-  int length;44,
-  int argno;45,
-#define NULL 51,
-#define GENERIC_PTR 56,
-#define GENERIC_PTR 58,
-#define NULL_PTR 63,
-int yylex 66,
-void yyerror 67,
-int expression_value;68,
-static jmp_buf parse_return_error;70,
-static int keyword_parsing 73,
-extern unsigned char is_idstart[is_idstart
76,
-extern unsigned char is_idstart[], is_idchar[is_idchar
76,
-extern unsigned char is_idstart[], is_idchar[], is_hor_space[is_hor_space
76,
-extern char *xmalloc xmalloc
78,
-extern int pedantic;81,
-extern int traditional;84,
-#define CHAR_TYPE_SIZE 87,
-#define INT_TYPE_SIZE 91,
-#define LONG_TYPE_SIZE 95,
-#define WCHAR_TYPE_SIZE 99,
-#define possible_sum_sign(104,
-static void integer_overflow 106,
-static long left_shift 107,
-static long right_shift 108,
-  struct constant 113,
-  struct constant {long value;113,
-  struct constant {long value; int unsignedp;113,
-  struct constant {long value; int unsignedp;} integer;113,
-  struct name 114,
-  struct name {U_CHAR *address;address
114,
-  struct name {U_CHAR *address; int length;114,
-  struct name {U_CHAR *address; int length;} name;114,
-  struct arglist *keywords;keywords
115,
-  int voidval;116,
-  char *sval;sval
117,
-} yystype;118,
-# define YYSTYPE 119,
-# define YYDEBUG 122,
-#define	YYFINAL	127,
-#define	YYFLAG	128,
-#define	YYNTBASE	129,
-#define YYTRANSLATE(132,
-static const char yytranslate[yytranslate
135,
-static const short yyprhs[yyprhs
167,
-static const short yyrhs[yyrhs
174,
-static const short yyrline[yyrline
195,
-static const char *const yytname[yytname
208,
-static const short yyr1[yyr1
219,
-static const short yyr2[yyr2
228,
-static const short yydefact[yydefact
239,
-static const short yydefgoto[yydefgoto
251,
-static const short yypact[yypact
256,
-static const short yypgoto[yypgoto
268,
-#define	YYLAST	274,
-static const short yytable[yytable
277,
-static const short yycheck[yycheck
301,
-static char *lexptr;lexptr
332,
-parse_number 341,
-struct token 437,
-  char *operator;operator
438,
-  int token;439,
-static struct token tokentab2[tokentab2
442,
-yylex 459,
-parse_escape 740,
-yyerror 836,
-integer_overflow 844,
-left_shift 851,
-right_shift 873,
-parse_c_expression 893,
-extern int yydebug;919,
-main 923,
-unsigned char is_idchar[is_idchar
948,
-unsigned char is_idstart[is_idstart
950,
-char is_hor_space[is_hor_space
953,
-initialize_random_junk 958,
-error 988,
-warning 993,
-lookup 999,
-
 /usr/share/bison/bison.simple,2238
 # define YYSTD(41,
 # define YYSTD(43,