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

Change preprocessing error for tokens appearing after #else and #end to warning. Add some missing warning documentation and a couple of warning messages tidy up.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12467 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-02-17 21:54:13 +00:00
commit 0913f41fb4
5 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Preprocessor/cpp.c
View file

@ -1583,7 +1583,7 @@ String *Preprocessor_parse(String *s) {
} else {
cond_lines[level - 1] = Getline(id);
if (Len(value) != 0)
Swig_error(Getfile(s), Getline(id), "Unexpected tokens after #else.\n");
Swig_warning(WARN_PP_UNEXPECTED_TOKENS, Getfile(s), Getline(id), "Unexpected tokens after #else directive.\n");
if (allow) {
allow = 0;
mask = 0;
@ -1599,7 +1599,7 @@ String *Preprocessor_parse(String *s) {
} else {
if (level < start_level) {
if (Len(value) != 0)
Swig_error(Getfile(s), Getline(id), "Unexpected tokens after #endif.\n");
Swig_warning(WARN_PP_UNEXPECTED_TOKENS, Getfile(s), Getline(id), "Unexpected tokens after #endif directive.\n");
allow = 1;
start_level--;
}
@ -1673,7 +1673,7 @@ String *Preprocessor_parse(String *s) {
}
} else if (Equal(id, kpp_warning)) {
if (allow) {
Swig_warning(WARN_PP_CPP_WARNING, Getfile(s), Getline(id), "CPP #warning, %s\n", value);
Swig_warning(WARN_PP_CPP_WARNING, Getfile(s), Getline(id), "CPP #warning, \"%s\".\n", value);
}
} else if (Equal(id, kpp_error)) {
if (allow) {
@ -1691,7 +1691,7 @@ String *Preprocessor_parse(String *s) {
int sysfile = 0;
String *filename_processed;
if (include_all && import_all) {
Swig_warning(WARN_PP_INCLUDEALL_IMPORTALL, Getfile(s), Getline(id), "Both includeall and importall are defined: using includeall\n");
Swig_warning(WARN_PP_INCLUDEALL_IMPORTALL, Getfile(s), Getline(id), "Both includeall and importall are defined: using includeall.\n");
import_all = 0;
}
filename_processed = Preprocessor_replace(value);