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

Fix incorrect line number reporting in errors/warnings after parsing macro invocations with parameters given over more than one line.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12214 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2010-09-10 23:44:27 +00:00
commit f82811dbcd
5 changed files with 50 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.1 (in progress)
===========================
2010-09-11: wsfulton
Fix incorrect line number reporting in errors/warnings after parsing
macro invocations with parameters given over more than one line.
2010-09-10: wsfulton
Remove extraneous extra line in preprocessed output after including files
which would sometimes lead to error/warning messages two lines after the

6
Examples/test-suite/errors/expected.log
View file

@ -106,6 +106,12 @@ pp_macro_defined_unterminated.i:4: Error: Unterminated call to 'defined'
:::::::::::::::::::::::::::::::: pp_macro_expansion.i :::::::::::::::::::::::::::::::::::
pp_macro_expansion.i:9: Error: Macro 'MACRO2' expects 2 arguments
:::::::::::::::::::::::::::::::: pp_macro_expansion_multiline.i :::::::::::::::::::::::::::::::::::
pp_macro_expansion_multiline.i:13: Warning 509: Overloaded method foo(int const *) effectively ignored,
pp_macro_expansion_multiline.i:12: Warning 509: as it is shadowed by foo(int *).
pp_macro_expansion_multiline.i:31: Warning 509: Overloaded method bar(int const *) effectively ignored,
pp_macro_expansion_multiline.i:30: Warning 509: as it is shadowed by bar(int *).
:::::::::::::::::::::::::::::::: pp_macro_inline_unterminated.i :::::::::::::::::::::::::::::::::::
pp_macro_inline_unterminated.i:9: Error: Unterminated call invoking macro 'foo'
pp_macro_inline_unterminated.i:12: Error: Syntax error in input(3).

1
Examples/test-suite/errors/make.sh
View file

@ -34,6 +34,7 @@ pp_macro_args
pp_macro_badchar
pp_macro_defined_unterminated
pp_macro_expansion
pp_macro_expansion_multiline
pp_macro_inline_unterminated
pp_macro_nargs
pp_macro_redef

32
Examples/test-suite/errors/pp_macro_expansion_multiline.i Normal file
View file

@ -0,0 +1,32 @@
%module xxx
// Testing macros split over multiple lines - ensure the warning message for the ignored functions contain the correct line numbering
#define MYMACRO(NAME, A, B, C) void NAME(int A, int B, int C);
MYMACRO(funk, x,
y,
z
)
void foo(int *);
void foo(const int *);
%define MYSWIGMACRO(A, B, C)
MYMACRO(funk1,
AA,
BB,
CC)
MYMACRO(funk2,
AA,
BB,
CC)
%enddef
MYSWIGMACRO(xx,
yy,
zz)
void bar(int *);
void bar(const int *);

7
Source/Preprocessor/cpp.c
View file

@ -1075,10 +1075,14 @@ static DOH *Preprocessor_replace(DOH *s) {
/* See if the macro is defined in the preprocessor symbol table */
DOH *args = 0;
DOH *e;
int macro_additional_lines = 0;
/* See if the macro expects arguments */
if (Getattr(m, kpp_args)) {
/* Yep. We need to go find the arguments and do a substitution */
int line = Getline(s);
args = find_args(s, 1, id);
macro_additional_lines = Getline(s) - line;
assert(macro_additional_lines >= 0);
if (!Len(args)) {
Delete(args);
args = 0;
@ -1090,6 +1094,9 @@ static DOH *Preprocessor_replace(DOH *s) {
if (e) {
Append(ns, e);
}
while (macro_additional_lines--) {
Putc('\n', ns);
}
Delete(e);
Delete(args);
} else {