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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2009-07-31 02:06:17 +00:00
parent 52b47e825d
commit 42b9b9f630
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2008 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Devel cpp */ /* This file is part of DeforaOS Devel cpp */
/* cpp is not free software; you can redistribute it and/or modify it under the /* cpp is not free software; you can redistribute it and/or modify it under the
* terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 * terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
@ -52,6 +52,7 @@ static int _cpp_error(void);
/* functions */ /* functions */
/* cpp */ /* cpp */
static int _cpp_do(Prefs * prefs, FILE * fp, char const * filename); static int _cpp_do(Prefs * prefs, FILE * fp, char const * filename);
static void _do_print_token(FILE * fp, Token * token);
static int _cpp(Prefs * prefs, int filec, char * filev[]) static int _cpp(Prefs * prefs, int filec, char * filev[])
{ {
@ -81,7 +82,6 @@ static int _cpp_do(Prefs * prefs, FILE * fp, char const * filename)
size_t j; size_t j;
size_t k; size_t k;
Token * token; Token * token;
int code;
memset(&cppprefs, 0, sizeof(cppprefs)); memset(&cppprefs, 0, sizeof(cppprefs));
cppprefs.filename = filename; cppprefs.filename = filename;
@ -109,21 +109,7 @@ static int _cpp_do(Prefs * prefs, FILE * fp, char const * filename)
{ {
if(token == NULL) /* end of file */ if(token == NULL) /* end of file */
break; break;
#ifdef DEBUG _do_print_token(fp, token);
fprintf(stderr, "DEBUG: \"%s\" (%d)\n", token_get_string(token),
token_get_code(token));
#else
if((code = token_get_code(token)) == CPP_CODE_META_ERROR
|| code == CPP_CODE_META_WARNING)
fprintf(stderr, "%s%s%s%s%u%s%s\n",
code == CPP_CODE_META_ERROR
? "Error" : "Warning", " in ",
token_get_filename(token), ":",
token_get_line(token), ": ",
token_get_string(token));
else
fputs(token_get_string(token), fp);
#endif
token_delete(token); token_delete(token);
} }
if(ret != 0) if(ret != 0)
@ -132,6 +118,26 @@ static int _cpp_do(Prefs * prefs, FILE * fp, char const * filename)
return ret; return ret;
} }
static void _do_print_token(FILE * fp, Token * token)
{
CppCode code;
code = token_get_code(token);
#ifdef DEBUG
fprintf(stderr, "DEBUG: \"%s\" (%d)\n", token_get_string(token), code);
#else
if(code != CPP_CODE_META_ERROR && code != CPP_CODE_META_WARNING)
{
fputs(token_get_string(token), fp);
return;
}
fprintf(stderr, "%s%s%s%s%u%s%s\n", code == CPP_CODE_META_ERROR
? "Error" : "Warning", " in ",
token_get_filename(token), ":", token_get_line(token),
": ", token_get_string(token));
#endif
}
/* cpp_error */ /* cpp_error */
static int _cpp_error(void) static int _cpp_error(void)