mirror of
https://github.com/nim-lang/Nim.git
synced 2026-04-19 14:00:35 +00:00
* Fixes #10514
(cherry picked from commit f6f789bb4d)
* Add comment
* Add changelog entry
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
|
||||
### Breaking changes in the compiler
|
||||
|
||||
- Implicit conversions for `const` behave correctly now, meaning that code like `const SOMECONST = 0.int; procThatTakesInt32(SOMECONST)` will be illegal now.
|
||||
Simply write `const SOMECONST = 0` instead.
|
||||
|
||||
|
||||
## Library additions
|
||||
|
||||
@@ -595,11 +595,8 @@ proc semConst(c: PContext, n: PNode): PNode =
|
||||
if a.sons[length-2].kind != nkEmpty:
|
||||
typ = semTypeNode(c, a.sons[length-2], nil)
|
||||
|
||||
var def = semConstExpr(c, a.sons[length-1])
|
||||
if def == nil:
|
||||
localError(c.config, a.sons[length-1].info, errConstExprExpected)
|
||||
continue
|
||||
|
||||
# don't evaluate here since the type compatibility check below may add a converter
|
||||
var def = semExprWithType(c, a[^1])
|
||||
if def.typ.kind == tyProc and def.kind == nkSym:
|
||||
if def.sym.kind == skMacro:
|
||||
localError(c.config, def.info, errCannotAssignMacroSymbol % "constant")
|
||||
@@ -621,7 +618,10 @@ proc semConst(c: PContext, n: PNode): PNode =
|
||||
def = fitRemoveHiddenConv(c, typ, def)
|
||||
else:
|
||||
typ = def.typ
|
||||
if typ == nil:
|
||||
|
||||
# evaluate the node
|
||||
def = semConstExpr(c, def)
|
||||
if def == nil:
|
||||
localError(c.config, a.sons[length-1].info, errConstExprExpected)
|
||||
continue
|
||||
if typeAllowed(typ, skConst) != nil and def.kind != nkNilLit:
|
||||
@@ -639,7 +639,7 @@ proc semConst(c: PContext, n: PNode): PNode =
|
||||
b.sons[length-2] = a.sons[length-2]
|
||||
b.sons[length-1] = def
|
||||
|
||||
for j in 0 .. length-3:
|
||||
for j in 0 ..< length-2:
|
||||
var v = semIdentDef(c, a.sons[j], skConst)
|
||||
if sfGenSym notin v.flags: addInterfaceDecl(c, v)
|
||||
elif v.owner == nil: v.owner = getCurrOwner(c)
|
||||
|
||||
@@ -25,3 +25,18 @@ doAssert x == ""
|
||||
static:
|
||||
var i, j: set[int8] = {}
|
||||
var k = i + j
|
||||
|
||||
type
|
||||
Obj = object
|
||||
x: int
|
||||
|
||||
converter toObj(x: int): Obj = Obj(x: x)
|
||||
|
||||
# bug #10514
|
||||
block:
|
||||
const
|
||||
b: Obj = 42
|
||||
bar = [b]
|
||||
|
||||
let i_runtime = 0
|
||||
doAssert bar[i_runtime] == b
|
||||
|
||||
Reference in New Issue
Block a user