mirror of
https://github.com/nim-lang/Nim.git
synced 2026-06-04 10:54:42 +00:00
* fix #8821 JS codegen can produce extreme switch statements with case a of range * remove totalRange
This commit is contained in:
@@ -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])
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user