projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid double parentheses when AST printing sizeof expressions.
[cparser]
/
token.c
diff --git
a/token.c
b/token.c
index
fd589e9
..
94ac183
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-109,10
+109,10
@@
void print_token_type(FILE *f, token_type_t token_type)
const symbol_t *symbol = token_symbols[token_type];
if(symbol != NULL) {
const symbol_t *symbol = token_symbols[token_type];
if(symbol != NULL) {
- fp
rintf(f, "%s", symbol->string
);
+ fp
uts(symbol->string, f
);
} else {
if(token_type >= 0 && token_type < 256) {
} else {
if(token_type >= 0 && token_type < 256) {
- fp
rintf(f, "%c", token_type
);
+ fp
utc(token_type, f
);
return;
}
fputs("unknown token", f);
return;
}
fputs("unknown token", f);
@@
-123,19
+123,21
@@
void print_token(FILE *f, const token_t *token)
{
switch(token->type) {
case T_IDENTIFIER:
{
switch(token->type) {
case T_IDENTIFIER:
- fprintf(f, "
symbol %s
", token->v.symbol->string);
+ fprintf(f, "
identifier '%s'
", token->v.symbol->string);
break;
case T_INTEGER:
break;
case T_INTEGER:
- fprintf(f, "integer number
%lld
", token->v.intvalue);
+ fprintf(f, "integer number
'%lld'
", token->v.intvalue);
break;
case T_FLOATINGPOINT:
break;
case T_FLOATINGPOINT:
- fprintf(f, "floating
pointer number %LF
", token->v.floatvalue);
+ fprintf(f, "floating
-point number '%LF'
", token->v.floatvalue);
break;
case T_STRING_LITERAL:
fprintf(f, "string \"%s\"", token->v.string.begin);
break;
default:
break;
case T_STRING_LITERAL:
fprintf(f, "string \"%s\"", token->v.string.begin);
break;
default:
+ fputc('\'', f);
print_token_type(f, (token_type_t)token->type);
print_token_type(f, (token_type_t)token->type);
+ fputc('\'', f);
break;
}
}
break;
}
}
@@
-159,10
+161,10
@@
void print_pp_token_type(FILE *f, int token_type)
const symbol_t *symbol = pp_token_symbols[token_type];
if (symbol != NULL) {
const symbol_t *symbol = pp_token_symbols[token_type];
if (symbol != NULL) {
- fp
rintf(f, "%s", symbol->string
);
+ fp
uts(symbol->string, f
);
} else {
if(token_type >= 0 && token_type < 256) {
} else {
if(token_type >= 0 && token_type < 256) {
- fp
rintf(f, "%c", token_type
);
+ fp
utc(token_type, f
);
return;
}
fputs("unknown token", f);
return;
}
fputs("unknown token", f);
@@
-173,10
+175,10
@@
void print_pp_token(FILE *f, const token_t *token)
{
switch((preprocessor_token_type_t) token->type) {
case TP_IDENTIFIER:
{
switch((preprocessor_token_type_t) token->type) {
case TP_IDENTIFIER:
- fprintf(f, "
symbol %s
", token->v.symbol->string);
+ fprintf(f, "
identifier '%s'
", token->v.symbol->string);
break;
case TP_NUMBER:
break;
case TP_NUMBER:
- fprintf(f, "number
%s
", token->v.string.begin);
+ fprintf(f, "number
'%s'
", token->v.string.begin);
break;
case TP_STRING_LITERAL:
fprintf(f, "string \"%s\"", token->v.string.begin);
break;
case TP_STRING_LITERAL:
fprintf(f, "string \"%s\"", token->v.string.begin);