DeforaOS/CPP
DeforaOS/CPP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer filtering white-spaces by default

Browse Source
This commit is contained in:
Pierre Pronchery 2010-12-17 02:22:17 +00:00
parent fb54f0d478
commit d4d7f58c04
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.c
View File

@ -41,6 +41,7 @@ typedef struct _Prefs
size_t undefines_cnt; size_t undefines_cnt;
} Prefs; } Prefs;
#define PREFS_t 0x1 #define PREFS_t 0x1
#define PREFS_w 0x2
/* prototypes */ /* prototypes */
@ -84,9 +85,11 @@ static int _cpp_do(Prefs * prefs, FILE * fp, char const * filename)
memset(&cppprefs, 0, sizeof(cppprefs)); memset(&cppprefs, 0, sizeof(cppprefs));
cppprefs.filename = filename; cppprefs.filename = filename;
cppprefs.filters = CPP_FILTER_WHITESPACE | CPP_FILTER_COMMENT; cppprefs.filters = CPP_FILTER_COMMENT;
if(prefs->flags & PREFS_t) if(prefs->flags & PREFS_t)
cppprefs.filters |= CPP_FILTER_TRIGRAPH; cppprefs.filters |= CPP_FILTER_TRIGRAPH;
if(prefs->flags & PREFS_w)
cppprefs.filters |= CPP_FILTER_WHITESPACE;
if((cpp = cpp_new(&cppprefs)) == NULL) if((cpp = cpp_new(&cppprefs)) == NULL)
return _cpp_error(); return _cpp_error();
for(i = 0; i < prefs->paths_cnt; i++) for(i = 0; i < prefs->paths_cnt; i++)
@ -154,7 +157,8 @@ static int _usage(void)
" -I Add a directory to the search path\n" " -I Add a directory to the search path\n"
" -o Write output to a file\n" " -o Write output to a file\n"
" -t Convert trigraphs\n" " -t Convert trigraphs\n"
" -U Remove a substitution\n", stderr); " -U Remove a substitution\n"
" -w Filter whitespaces\n", stderr);
return 1; return 1;
} }
@ -171,7 +175,7 @@ int main(int argc, char * argv[])
int o; int o;
memset(&prefs, 0, sizeof(prefs)); memset(&prefs, 0, sizeof(prefs));
while((o = getopt(argc, argv, "D:I:o:tU:")) != -1) while((o = getopt(argc, argv, "D:I:o:tU:w")) != -1)
switch(o) switch(o)
{ {
case 'D': case 'D':
@ -192,6 +196,9 @@ int main(int argc, char * argv[])
if(_main_add_undefine(&prefs, optarg) != 0) if(_main_add_undefine(&prefs, optarg) != 0)
return 2; return 2;
break; break;
case 'w':
prefs.flags |= PREFS_w;
break;
default: default:
return _usage(); return _usage();
} }