Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

carets: improve the code

Browse Source 
* src/location.c: Remove duplicate documentations.
(caret_info): Stylistic change.
(location_caret): Many reworks.
This commit is contained in:
Theophile Ranquet
2012-12-06 13:17:55 +01:00
parent edf9a06f27
commit dbda560400
1 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/location.c
View File

@@ -143,15 +143,13 @@ location_print (FILE *out, location loc)
same file all over for each error. */ same file all over for each error. */
struct caret_info struct caret_info
{ {
FILE* source; FILE *source;
size_t line; size_t line;
size_t offset; size_t offset;
}; };
static struct caret_info caret_info = { NULL, 1, 0 }; static struct caret_info caret_info = { NULL, 1, 0 };
/* Free any allocated ressources and close any open file handles that are
left-over by the usage of location_caret. */
void void
cleanup_caret () cleanup_caret ()
{ {
@@ -159,11 +157,10 @@ cleanup_caret ()
fclose (caret_info.source); fclose (caret_info.source);
} }
/* Output to OUT the line and caret corresponding to location LOC. */
void void
location_caret (FILE *out, location loc) location_caret (FILE *out, location loc)
{ {
/* FIXME: find a way to support X-file locations, and only open once each /* FIXME: find a way to support multifile locations, and only open once each
file. That would make the procedure future-proof. */ file. That would make the procedure future-proof. */
if (! (caret_info.source if (! (caret_info.source
|| (caret_info.source = fopen (loc.start.file, "r"))) || (caret_info.source = fopen (loc.start.file, "r")))
@@ -183,41 +180,36 @@ location_caret (FILE *out, location loc)
} }
/* Advance to the line's position, keeping track of the offset. */ /* Advance to the line's position, keeping track of the offset. */
{ while (caret_info.line < loc.start.line)
int i; caret_info.line += fgetc (caret_info.source) == '\n';
for (i = caret_info.line; i < loc.start.line; caret_info.offset++) caret_info.offset = ftell (caret_info.source);
if (fgetc (caret_info.source) == '\n')
++i;
}
caret_info.line = loc.start.line;
/* Read the actual line. Don't update the offset, so that we keep a pointer /* Read the actual line. Don't update the offset, so that we keep a pointer
to the start of the line. */ to the start of the line. */
{ {
ssize_t len = 0;
char *buf = NULL; char *buf = NULL;
if ((len = getline (&buf, (size_t*) &len, caret_info.source)) != -1) size_t size = 0;
ssize_t len = getline (&buf, &size, caret_info.source);
if (0 < len)
{ {
/* The caret of a multiline location ends with the first line. */ /* The caret of a multiline location ends with the first line. */
int end = loc.start.line != loc.end.line ? len : loc.end.column; int end = loc.start.line != loc.end.line ? len : loc.end.column;
if (len) /* Quote the file, indent by a single column. */
{ fputc (' ', out);
int i = loc.start.column; fwrite (buf, 1, len, out);
/* Quote the file, indent by a single column. */
fputc (' ', out);
fwrite (buf, 1, len, out);
/* Print the caret, with the same indent as above. */ /* Print the caret, with the same indent as above. */
fputc (' ', out); fprintf (out, " %*s", loc.start.column - 1, "");
fprintf (out, "%*s", loc.start.column - 1, ""); {
do { int i = loc.start.column;
fputc ('^', out); do
} while (++i < end); fputc ('^', out);
} while (++i < end);
}
fputc ('\n', out); fputc ('\n', out);
free (buf);
} }
free (buf);
} }
} }