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

implement (#14114)

Browse source 
Co-authored-by: cooldome <ariabushenko@bk.ru>
This commit is contained in:
cooldome 2020-04-25 18:59:56 +01:00 • committed by GitHub
commit 13fa338ada
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/sem.nim
View file

@ -481,15 +481,10 @@ proc forceBool(c: PContext, n: PNode): PNode =
if result == nil: result = n if result == nil: result = n
proc semConstBoolExpr(c: PContext, n: PNode): PNode = proc semConstBoolExpr(c: PContext, n: PNode): PNode =
let nn = semExprWithType(c, n) result = forceBool(c, semConstExpr(c, n))
result = fitNode(c, getSysType(c.graph, n.info, tyBool), nn, nn.info) if result.kind != nkIntLit:
if result == nil:
localError(c.config, n.info, errConstExprExpected) localError(c.config, n.info, errConstExprExpected)
return nn
result = getConstExpr(c.module, result, c.graph)
if result == nil:
localError(c.config, n.info, errConstExprExpected)
result = nn
proc semGenericStmt(c: PContext, n: PNode): PNode proc semGenericStmt(c: PContext, n: PNode): PNode
proc semConceptBody(c: PContext, n: PNode): PNode proc semConceptBody(c: PContext, n: PNode): PNode

6
tests/objects/twhen1.nim
View file

@ -49,3 +49,9 @@ block:
block: block:
var x: Foo4[0] var x: Foo4[0]
type
MyObject = object
x: int
when (NimMajor, NimMinor) >= (1, 1):
y: int