case coverage error message for char (#12948)

This commit is contained in:
Jasper Jenkins 2019-12-22 01:10:46 -08:00 • committed by Andreas Rumpf
commit 2e7c9eb6a8
3 changed files with 15 additions and 6 deletions

View file

@ -953,7 +953,7 @@ proc semCase(c: PContext, n: PNode; flags: TExprFlags): PNode =
if chckCovered:
if covered == toCover(c, n[0].typ):
hasElse = true
elif n[0].typ.skipTypes(abstractRange).kind == tyEnum:
elif n[0].typ.skipTypes(abstractRange).kind in {tyEnum, tyChar}:
localError(c.config, n.info, "not all cases are covered; missing: $1" %
formatMissingEnums(c, n))
else:

View file

@ -607,7 +607,7 @@ iterator processBranchVals(b: PNode): int =
assert b.kind in {nkOfBranch, nkElifBranch, nkElse}
if b.kind == nkOfBranch:
for i in 0..<b.len-1:
if b[i].kind == nkIntLit:
if b[i].kind in {nkIntLit, nkCharLit}:
yield b[i].intVal.int
elif b[i].kind == nkRange:
for i in b[i][0].intVal..b[i][1].intVal:
@ -621,9 +621,12 @@ proc renderAsType(vals: IntSet, t: PType): string =
for val in vals:
if result.len > 1:
result &= ", "
if t.kind in {tyEnum, tyBool}:
case t.kind:
of tyEnum, tyBool:
while t.n[enumSymOffset].sym.position < val: inc(enumSymOffset)
result &= t.n[enumSymOffset].sym.name.s
of tyChar:
result.addQuoted(char(val))
else:
if i == 64:
result &= "omitted $1 values..." % $(vals.len - i)