diff options
| -rw-r--r-- | expr.c | 17 | ||||
| -rw-r--r-- | test/binary-constant.c | 1 | ||||
| -rw-r--r-- | test/binary-constant.qbe | 1 |
3 files changed, 16 insertions, 3 deletions
@@ -612,7 +612,15 @@ primaryexpr(struct scope *s) break; case TNUMBER: e = mkexpr(EXPRCONST, NULL, NULL); - base = tok.lit[0] != '0' ? 10 : tolower(tok.lit[1]) == 'x' ? 16 : 8; + if (tok.lit[0] == '0') { + switch (tolower(tok.lit[1])) { + case 'x': base = 16; break; + case 'b': base = 2; break; + default: base = 8; break; + } + } else { + base = 10; + } if (strpbrk(tok.lit, base == 16 ? ".pP" : ".eE")) { /* floating constant */ e->constant.f = strtod(tok.lit, &end); @@ -627,9 +635,12 @@ primaryexpr(struct scope *s) else error(&tok.loc, "invalid floating constant suffix '%s'", end); } else { + src = tok.lit; + if (base == 2) + src += 2; /* integer constant */ - e->constant.u = strtoull(tok.lit, &end, 0); - if (end == tok.lit) + e->constant.u = strtoull(src, &end, base); + if (end == src) error(&tok.loc, "invalid integer constant '%s'", tok.lit); e->type = inttype(e->constant.u, base == 10, end); } diff --git a/test/binary-constant.c b/test/binary-constant.c new file mode 100644 index 0000000..234e116 --- /dev/null +++ b/test/binary-constant.c @@ -0,0 +1 @@ +int x = 0b11100100; diff --git a/test/binary-constant.qbe b/test/binary-constant.qbe new file mode 100644 index 0000000..d72a76c --- /dev/null +++ b/test/binary-constant.qbe @@ -0,0 +1 @@ +export data $x = align 4 { w 228, } |