[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] scanner: reintroduce unput for missing end tokens
From: |
Théophile Ranquet |
Subject: |
Re: [PATCH] scanner: reintroduce unput for missing end tokens |
Date: |
Fri, 28 Dec 2012 13:50:15 +0100 |
I have installed the unput patch, as well as the following:
commit e15af359588013c043b36f74fec6da4465184120
Author: Theophile Ranquet <address@hidden>
Date: Thu Dec 13 11:28:11 2012 +0100
carets: properly display when no line feed is present
* src/location.c (location_caret): finish the line with one
whether or not it
is present in input. Rewrite code without getline.
(cleanup_caret): Reset the caret_info global.
* bootstrap.conf: No longer require getline.
diff --git a/bootstrap.conf b/bootstrap.conf
index feff5ff..d634313 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -21,7 +21,6 @@ gnulib_modules='
configmake
dirname
error extensions fdl fopen-safer
- getline
getopt-gnu
gettext git-version-gen gitlog-to-changelog
gpl-3.0 hash inttypes isnan javacomp-script
diff --git a/lib/.gitignore b/lib/.gitignore
index ff35920..94b5db2 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -267,8 +267,6 @@
/xstrndup.h
/binary-io.c
/xsize.c
-/getdelim.c
-/getline.c
/bitrotate.c
/math.c
/sig-handler.c
diff --git a/m4/.gitignore b/m4/.gitignore
index 242ac2a..2f440bf 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -180,6 +180,4 @@
/obstack-printf.m4
/extern-inline.m4
/non-recursive-gnulib-prefix-hack.m4
-/getdelim.m4
-/getline.m4
/inline.m4
diff --git a/src/location.c b/src/location.c
index d48a0a1..66b9ffa 100644
--- a/src/location.c
+++ b/src/location.c
@@ -155,6 +155,9 @@ cleanup_caret ()
{
if (caret_info.source)
fclose (caret_info.source);
+ caret_info.source = NULL;
+ caret_info.line = 1;
+ caret_info.offset = 0;
}
void
@@ -168,8 +171,8 @@ location_caret (FILE *out, location loc)
return;
/* If the line we want to quote is seekable (the same line as the previous
- location), just seek it. If it was before, we lost track of it, so
- return to the start of file. */
+ location), just seek it. If it was a previous line, we lost track of it,
+ so return to the start of file. */
if (caret_info.line <= loc.start.line)
fseek (caret_info.source, caret_info.offset, SEEK_SET);
else
@@ -181,35 +184,36 @@ location_caret (FILE *out, location loc)
/* Advance to the line's position, keeping track of the offset. */
while (caret_info.line < loc.start.line)
- caret_info.line += fgetc (caret_info.source) == '\n';
+ caret_info.line += getc (caret_info.source) == '\n';
caret_info.offset = ftell (caret_info.source);
/* Read the actual line. Don't update the offset, so that we keep a pointer
to the start of the line. */
{
- char *buf = NULL;
- size_t size = 0;
- ssize_t len = getline (&buf, &size, caret_info.source);
- if (0 < len)
+ char c = getc (caret_info.source);
+ if (c != EOF)
{
- /* The caret of a multiline location ends with the first line. */
- int end = loc.start.line != loc.end.line ? len : loc.end.column;
-
/* Quote the file, indent by a single column. */
- fputc (' ', out);
- fwrite (buf, 1, len, out);
+ putc (' ', out);
+ do
+ putc (c, out);
+ while ((c = getc (caret_info.source)) != EOF && c != '\n');
+ putc ('\n', out);
- /* Print the caret, with the same indent as above. */
- fprintf (out, " %*s", loc.start.column - 1, "");
{
- int i = loc.start.column;
- do
- fputc ('^', out);
- while (++i < end);
- }
- fputc ('\n', out);
+ /* The caret of a multiline location ends with the first line. */
+ size_t len = loc.start.line != loc.end.line
+ ? ftell (caret_info.source) - caret_info.offset
+ : loc.end.column;
+ int i;
+
+ /* Print the carets (at least one), with the same indent as above.*/
+ fprintf (out, " %*s", loc.start.column - 1, "");
+ for (i = loc.start.column; i == loc.start.column || i < len; ++i)
+ putc ('^', out);
+ }
+ putc ('\n', out);
}
- free (buf);
}
}