diff options
| author | Araq <rumpf_a@web.de> | 2018-06-11 17:05:23 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-06-11 17:05:23 +0200 |
| commit | 68ba13c759b11e4d1bcbfa41715d0bd8072f03db (patch) | |
| tree | bfbd760d3e7fa93f55a7983341e01c1b1d74b05a /compiler | |
| parent | 26133a33a4e61a593463fa4c62d237ab0b9ffe47 (diff) | |
| parent | 657062145ba5303d68e107a6f5fc50513b9d7f49 (diff) | |
| download | Nim-68ba13c759b11e4d1bcbfa41715d0bd8072f03db.tar.gz | |
fixes merge conflict
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/semexprs.nim | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index e96f93d1f..1901c0671 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -1613,10 +1613,8 @@ proc semDefined(c: PContext, n: PNode, onlyCurrentScope: bool): PNode = # we replace this node by a 'true' or 'false' node: result = newIntNode(nkIntLit, 0) if not onlyCurrentScope and considerQuotedIdent(c, n[0], n).s == "defined": - if n.sons[1].kind != nkIdent: - localError(c.config, n.info, "obsolete usage of 'defined', use 'declared' instead") - elif isDefined(c.config, n.sons[1].ident.s): - result.intVal = 1 + let d = considerQuotedIdent(c, n[1], n) + result.intVal = ord isDefined(c.config, d.s) elif lookUpForDefined(c, n.sons[1], onlyCurrentScope) != nil: result.intVal = 1 result.info = n.info |