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

Fix #2149523 - Incorrect line number reporting in errors after parsing macros. Remove extraneous extra line in preprocessed output which would sometimes lead to error/warning messages two lines after the end of the file

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12211 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2010-09-10 06:08:45 +00:00
commit 122bc852f9
6 changed files with 73 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Preprocessor/cpp.c
View file

@ -1445,15 +1445,14 @@ String *Preprocessor_parse(String *s) {
state = 43;
}
break;
case 46:
case 46: /* in C++ comment */
if (c == '\n') {
Ungetc(c, s);
cpp_lines++;
state = 50;
} else
Putc(c, comment);
break;
case 47:
case 47: /* in C comment */
if (c == '*')
state = 48;
else
@ -1638,7 +1637,7 @@ String *Preprocessor_parse(String *s) {
}
s2 = Preprocessor_parse(s1);
addline(ns, s2, allow);
Append(ns, "\n]");
Append(ns, "]");
if (dirname) {
Swig_pop_directory();
}
@ -1784,7 +1783,7 @@ String *Preprocessor_parse(String *s) {
pop_imported();
}
addline(ns, s2, allow);
Append(ns, "\n]");
Append(ns, "]");
Delete(s2);
Delete(s1);
}
@ -1845,7 +1844,6 @@ String *Preprocessor_parse(String *s) {
Seek(value, 0, SEEK_SET);
Preprocessor_define(value, 1);
}
/* Putc('\n',ns); */
addline(ns, value, 0);
state = 0;
}
@ -1884,6 +1882,5 @@ String *Preprocessor_parse(String *s) {
Delete(comment);
Delete(chunk);
/* fprintf(stderr,"cpp: %d\n", Len(Getattr(cpp,"symbols"))); */
return ns;
}