jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #8821 JS codegen can produce extreme switch statements with case … (#20548)

Browse source 
* fix #8821 JS codegen can produce extreme switch statements with case a of range

* remove totalRange
This commit is contained in:
Bung 2022-10-14 18:21:02 +08:00 • committed by GitHub
commit b286448a99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/jsgen.nim
View file

@ -887,7 +887,6 @@ proc genRaiseStmt(p: PProc, n: PNode) =
proc genCaseJS(p: PProc, n: PNode, r: var TCompRes) =
var
a, b, cond, stmt: TCompRes
totalRange = 0
genLineDir(p, n)
gen(p, n[0], cond)
let typeKind = skipTypes(n[0].typ, abstractVar).kind
@ -897,7 +896,7 @@ proc genCaseJS(p: PProc, n: PNode, r: var TCompRes) =
of tyString:
useMagic(p, "toJSStr")
lineF(p, "switch (toJSStr($1)) {$n", [cond.rdLoc])
of tyFloat..tyFloat128:
of tyFloat..tyFloat128, tyInt..tyInt64, tyUInt..tyUInt64:
transferRange = true
else:
lineF(p, "switch ($1) {$n", [cond.rdLoc])
@ -926,10 +925,6 @@ proc genCaseJS(p: PProc, n: PNode, r: var TCompRes) =
lineF(p, "$1 >= $2 && $1 <= $3", [cond.rdLoc, a.rdLoc, b.rdLoc])
else:
var v = copyNode(e[0])
inc(totalRange, int(e[1].intVal - v.intVal))
if totalRange > 65535:
localError(p.config, n.info,
"Your case statement contains too many branches, consider using if/else instead!")
while v.intVal <= e[1].intVal:
gen(p, v, cond)
lineF(p, "case $1:$n", [cond.rdLoc])

5
tests/js/t8821.nim
View file

@ -1,6 +1,3 @@
discard """
errormsg: "Your case statement contains too many branches, consider using if/else instead!"
"""
proc isInt32(i: int): bool =
case i
@ -9,4 +6,4 @@ proc isInt32(i: int): bool =
else:
return false
discard isInt32(1)
doAssert isInt32(1) == true