summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@debian.org>2016-01-25 15:39:34 -0800
committerManoj Srivastava <srivasta@debian.org>2016-01-25 16:31:41 -0800
commita23a4523ef7367eeb79ce6e720a4825c7a20cee8 (patch)
treef54de89d400c54367e9bcd7ec64c3094498abc03
parent5b92463bae2e4b90521a78784eeda8bcce593d2a (diff)
Revert "[fix-off-by-one-error]: generatred line numbers are off by one"
This reverts commit d78a3072cf6268d48110735485f163e1588c23aa. The error seems to have been independently fixed.
-rw-r--r--src/gen.c6
-rw-r--r--src/scan.c3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/gen.c b/src/gen.c
index cee8a66..81e7c27 100644
--- a/src/gen.c
+++ b/src/gen.c
@@ -1106,7 +1106,7 @@ void gentabs (void)
out_str_dec (long_align ? get_int32_decl () :
get_int16_decl (), "yy_acclist", MAX (numas,
1) + 1);
-
+
buf_prints (&yydmap_buf,
"\t{YYTD_ID_ACCLIST, (void**)&yy_acclist, sizeof(%s)},\n",
long_align ? "flex_int32_t" : "flex_int16_t");
@@ -1114,7 +1114,7 @@ void gentabs (void)
yyacclist_tbl = (struct yytbl_data*)calloc(1,sizeof(struct yytbl_data));
yytbl_data_init (yyacclist_tbl, YYTD_ID_ACCLIST);
yyacclist_tbl->td_lolen = MAX(numas,1) + 1;
- yyacclist_tbl->td_data = yyacclist_data =
+ yyacclist_tbl->td_data = yyacclist_data =
(flex_int32_t *) calloc (yyacclist_tbl->td_lolen, sizeof (flex_int32_t));
yyacclist_curr = 1;
@@ -2184,7 +2184,7 @@ void make_tables (void)
skelout ();
/* Copy remainder of input to output. */
- linenum--;
+
line_directive_out (stdout, 1);
if (sectnum == 3) {
diff --git a/src/scan.c b/src/scan.c
index 4bcfcb8..b55df2d 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -1,6 +1,5 @@
-#line 2 "scan.c"
-#line 4 "scan.c"
+#line 3 "scan.c"
#define YY_INT_ALIGNED short int