projects
/
cparser
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6c3a1d
)
Fix condition of multi-char constant warning.
author
Christoph Mallon
<christoph.mallon@gmx.de>
Sun, 16 Nov 2008 10:36:19 +0000
(10:36 +0000)
committer
Christoph Mallon
<christoph.mallon@gmx.de>
Sun, 16 Nov 2008 10:36:19 +0000
(10:36 +0000)
[r23706]
parser.c
patch
|
blob
|
history
diff --git
a/parser.c
b/parser.c
index
d5a31ad
..
dcd6cdc
100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-6314,10
+6314,10
@@
static expression_t *parse_character_constant(void)
cnst->conste.v.character = token.v.string;
if (cnst->conste.v.character.size != 1) {
cnst->conste.v.character = token.v.string;
if (cnst->conste.v.character.size != 1) {
- if (warning.multichar && GNU_MODE) {
+ if (!GNU_MODE) {
+ errorf(HERE, "more than 1 character in character constant");
+ } else if (warning.multichar) {
warningf(HERE, "multi-character character constant");
warningf(HERE, "multi-character character constant");
- } else {
- errorf(HERE, "more than 1 characters in character constant");
}
}
next_token();
}
}
next_token();
@@
-6335,10
+6335,10
@@
static expression_t *parse_wide_character_constant(void)
cnst->conste.v.wide_character = token.v.wide_string;
if (cnst->conste.v.wide_character.size != 1) {
cnst->conste.v.wide_character = token.v.wide_string;
if (cnst->conste.v.wide_character.size != 1) {
- if (warning.multichar && GNU_MODE) {
+ if (!GNU_MODE) {
+ errorf(HERE, "more than 1 character in character constant");
+ } else if (warning.multichar) {
warningf(HERE, "multi-character character constant");
warningf(HERE, "multi-character character constant");
- } else {
- errorf(HERE, "more than 1 characters in character constant");
}
}
next_token();
}
}
next_token();