mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-11 22:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #20233 Float ranges in case statement in JS crash compiler (#20349)

Browse Source
This commit is contained in:
Bung
2022-09-14 23:16:34 +08:00
committed by GitHub
parent 2e8c016799
commit 08faa04d78
2 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
compiler/jsgen.nim
View File

@@ -871,15 +871,19 @@ proc genRaiseStmt(p: PProc, n: PNode) =
proc genCaseJS(p: PProc, n: PNode, r: var TCompRes) =
var
cond, stmt: TCompRes
a, b, cond, stmt: TCompRes
totalRange = 0
genLineDir(p, n)
gen(p, n[0], cond)
let typeKind = skipTypes(n[0].typ, abstractVar).kind
var transferRange = false
let anyString = typeKind in {tyString, tyCstring}
if typeKind == tyString:
case typeKind
of tyString:
useMagic(p, "toJSStr")
lineF(p, "switch (toJSStr($1)) {$n", [cond.rdLoc])
of tyFloat..tyFloat128:
transferRange = true
else:
lineF(p, "switch ($1) {$n", [cond.rdLoc])
if not isEmptyType(n.typ):
@@ -887,20 +891,34 @@ proc genCaseJS(p: PProc, n: PNode, r: var TCompRes) =
r.res = getTemp(p)
for i in 1..<n.len:
let it = n[i]
let itLen = it.len
case it.kind
of nkOfBranch:
for j in 0..<it.len - 1:
if transferRange:
if i == 1:
lineF(p, "if (", [])
else:
lineF(p, "else if (", [])
for j in 0..<itLen - 1:
let e = it[j]
if e.kind == nkRange:
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])
inc(v.intVal)
if transferRange:
gen(p, e[0], a)
gen(p, e[1], b)
if j != itLen - 2:
lineF(p, "$1 >= $2 && $1 <= $3 || $n", [cond.rdLoc, a.rdLoc, b.rdLoc])
else:
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])
inc(v.intVal)
else:
if anyString:
case e.kind
@@ -909,20 +927,39 @@ proc genCaseJS(p: PProc, n: PNode, r: var TCompRes) =
of nkNilLit: lineF(p, "case null:$n", [])
else: internalError(p.config, e.info, "jsgen.genCaseStmt: 2")
else:
gen(p, e, cond)
lineF(p, "case $1:$n", [cond.rdLoc])
if transferRange:
gen(p, e, a)
if j != itLen - 2:
lineF(p, "$1 == $2 || $n", [cond.rdLoc, a.rdLoc])
else:
lineF(p, "$1 == $2", [cond.rdLoc, a.rdLoc])
else:
gen(p, e, a)
lineF(p, "case $1:$n", [a.rdLoc])
if transferRange:
lineF(p, "){", [])
p.nested:
gen(p, lastSon(it), stmt)
moveInto(p, stmt, r)
lineF(p, "break;$n", [])
if transferRange:
lineF(p, "}$n", [])
else:
lineF(p, "break;$n", [])
of nkElse:
lineF(p, "default: $n", [])
if transferRange:
lineF(p, "else{$n", [])
else:
lineF(p, "default: $n", [])
p.nested:
gen(p, it[0], stmt)
moveInto(p, stmt, r)
lineF(p, "break;$n", [])
if transferRange:
lineF(p, "}$n", [])
else:
lineF(p, "break;$n", [])
else: internalError(p.config, it.info, "jsgen.genCaseStmt")
lineF(p, "}$n", [])
if not transferRange:
lineF(p, "}$n", [])
proc genBlock(p: PProc, n: PNode, r: var TCompRes) =
inc(p.unique)

7
tests/js/t20233.nim Normal file
View File

@@ -0,0 +1,7 @@
discard """
output: "yes"
"""
case 1.0
of 1.0..2.0, 4.0: echo "yes"
of 3.0: discard
else: echo "no"