jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When reporting an error for a construct which hasn't been terminated

Browse source 
when the end of the file is reached, report it at the start line rather
than "EOF" as then tools like editors and IDEs will take you to a
generally more useful place for fixing the problem.
This commit is contained in:
Olly Betts 2015-01-08 13:19:17 +13:00
commit ce90ff6a77
10 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.current
View file

@ -5,6 +5,13 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.4 (in progress)
===========================
2015-01-08: olly
When reporting an error for a construct which hasn't been
terminated when the end of the file is reached, report it at the
start line rather than "EOF" as then tools like editors and IDEs
will take you to a generally more useful place for fixing the
problem.
2015-01-08: olly
Improve error message for extraneous '%}'.

2
Examples/test-suite/errors/pp_missing_enddef.stderr
View file

@ -1 +1 @@
pp_missing_enddef.i:EOF: Error: Missing %enddef for macro starting on line 3
pp_missing_enddef.i:3: Error: Missing %enddef for macro starting here

2
Examples/test-suite/errors/pp_missing_endif.stderr
View file

@ -1 +1 @@
pp_missing_endif.i:EOF: Error: Missing #endif for conditional starting on line 3
pp_missing_endif.i:3: Error: Missing #endif for conditional starting here

7
Examples/test-suite/errors/pp_missing_endoffile.i Normal file
View file

@ -0,0 +1,7 @@
%module xxx
/* %beginfile and %endoffile are internal directives inserted when %include is
* used. Users should never use them directly, but test coverage for this
* error message still seems useful to have.
*/
%includefile "dummy.i" %beginfile

1
Examples/test-suite/errors/pp_missing_endoffile.stderr Normal file
View file

@ -0,0 +1 @@
pp_missing_endoffile.i:6: Error: Missing %endoffile for file inclusion block starting here

2
Examples/test-suite/errors/pp_missing_rblock.stderr
View file

@ -1 +1 @@
pp_missing_rblock.i:EOF: Error: Unterminated %{ ... %} block starting on line 3
pp_missing_rblock.i:3: Error: Unterminated %{ ... %} block

2
Examples/test-suite/errors/pp_unterm_char.stderr
View file

@ -1 +1 @@
pp_unterm_char.i:EOF: Error: Unterminated character constant starting at line 4
pp_unterm_char.i:4: Error: Unterminated character constant

2
Examples/test-suite/errors/pp_unterm_comment.stderr
View file

@ -1 +1 @@
pp_unterm_comment.i:EOF: Error: Unterminated comment starting on line 3
pp_unterm_comment.i:3: Error: Unterminated comment

2
Examples/test-suite/errors/pp_unterm_string.stderr
View file

@ -1 +1 @@
pp_unterm_string.i:EOF: Error: Unterminated string constant starting at line 4
pp_unterm_string.i:4: Error: Unterminated string constant

14
Source/Preprocessor/cpp.c
View file

@ -1376,12 +1376,12 @@ String *Preprocessor_parse(String *s) {
else if (c == '\"') {
start_line = Getline(s);
if (skip_tochar(s, '\"', chunk) < 0) {
Swig_error(Getfile(s), -1, "Unterminated string constant starting at line %d\n", start_line);
Swig_error(Getfile(s), start_line, "Unterminated string constant\n");
}
} else if (c == '\'') {
start_line = Getline(s);
if (skip_tochar(s, '\'', chunk) < 0) {
Swig_error(Getfile(s), -1, "Unterminated character constant starting at line %d\n", start_line);
Swig_error(Getfile(s), start_line, "Unterminated character constant\n");
}
} else if (c == '/')
state = 30; /* Comment */
@ -2008,21 +2008,21 @@ String *Preprocessor_parse(String *s) {
}
}
while (level > 0) {
Swig_error(Getfile(s), -1, "Missing #endif for conditional starting on line %d\n", cond_lines[level - 1]);
Swig_error(Getfile(s), cond_lines[level - 1], "Missing #endif for conditional starting here\n");
level--;
}
if (state == 120) {
Swig_error(Getfile(s), -1, "Missing %%endoffile for file inclusion block starting on line %d\n", start_line);
Swig_error(Getfile(s), start_line, "Missing %%endoffile for file inclusion block starting here\n");
}
if (state == 150) {
Seek(value, 0, SEEK_SET);
Swig_error(Getfile(s), -1, "Missing %%enddef for macro starting on line %d\n", Getline(value));
Swig_error(Getfile(s), Getline(value), "Missing %%enddef for macro starting here\n", Getline(value));
}
if ((state >= 105) && (state < 107)) {
Swig_error(Getfile(s), -1, "Unterminated %%{ ... %%} block starting on line %d\n", start_line);
Swig_error(Getfile(s), start_line, "Unterminated %%{ ... %%} block\n");
}
if ((state >= 30) && (state < 40)) {
Swig_error(Getfile(s), -1, "Unterminated comment starting on line %d\n", start_line);
Swig_error(Getfile(s), start_line, "Unterminated comment\n");
}
copy_location(s, chunk);