diff options
author | ringabout <43030857+ringabout@users.noreply.github.com> | 2023-11-29 17:36:20 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-29 10:36:20 +0100 |
commit | 96513b2506d9057744da9926986181294a3da653 (patch) | |
tree | e517c18a371a395aa03887a52d035dd3187f6c87 | |
parent | 795aad4f2a0032ed9b54a7b89dc08b420981e208 (diff) | |
download | Nim-96513b2506d9057744da9926986181294a3da653.tar.gz |
fixes #22926; Different type inferred when setting a default value for an array field (#22999)
fixes #22926
-rw-r--r-- | compiler/semtypes.nim | 6 | ||||
-rw-r--r-- | tests/objects/tdefaultfieldscheck.nim | 9 | ||||
-rw-r--r-- | tests/objects/tobject_default_value.nim | 27 |
3 files changed, 36 insertions, 6 deletions
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim index a2e7bb639..e234c6b1f 100644 --- a/compiler/semtypes.nim +++ b/compiler/semtypes.nim @@ -245,6 +245,12 @@ proc fitDefaultNode(c: PContext, n: PNode): PType = if n[^2].kind != nkEmpty: if expectedType != nil and oldType != expectedType: n[^1] = fitNodeConsiderViewType(c, expectedType, n[^1], n[^1].info) + changeType(c, n[^1], expectedType, true) # infer types for default fields value + # bug #22926; be cautious that it uses `semConstExpr` to + # evaulate the default fields; it's only natural to use + # `changeType` to infer types for constant values + # that's also the reason why we don't use `semExpr` to check + # the type since two overlapping error messages might be produced result = n[^1].typ else: result = n[^1].typ diff --git a/tests/objects/tdefaultfieldscheck.nim b/tests/objects/tdefaultfieldscheck.nim index d6feb2988..8a05439d9 100644 --- a/tests/objects/tdefaultfieldscheck.nim +++ b/tests/objects/tdefaultfieldscheck.nim @@ -4,16 +4,13 @@ discard """ nimout: ''' tdefaultfieldscheck.nim(14, 17) Error: type mismatch: got <string> but expected 'int' -tdefaultfieldscheck.nim(15, 20) Error: type mismatch: got <int literal(12)> but expected 'string' -tdefaultfieldscheck.nim(17, 16) Error: type mismatch: got <float64> but expected 'int' ''' """ + type Date* = object - name: int = "string" - time: string = 12 goal: float = 7 - fun: int = 1.4 + name: int = "string" -echo default(Date) \ No newline at end of file +echo default(Date) diff --git a/tests/objects/tobject_default_value.nim b/tests/objects/tobject_default_value.nim index 3af790da6..152b355f4 100644 --- a/tests/objects/tobject_default_value.nim +++ b/tests/objects/tobject_default_value.nim @@ -717,6 +717,33 @@ template main {.dirty.} = doAssert T().kind == B + block: # bug #22926 + type + Direction = enum + North + South + East + West + + ArrayObj1 = object + list: array[Direction, int] + + ArrayObj2 = object + list: array[Direction, int] = [1, 2, 3, 4] + + block: + var a: ArrayObj1 + doAssert a.list[West] == 0 + var b = default ArrayObj1 + doAssert b.list[North] == 0 + + + block: + var a: ArrayObj2 + doAssert a.list[West] == 0 + var b = default ArrayObj2 + doAssert b.list[North] == 1 + static: main() main() |