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

fixes #12091

Browse source
This commit is contained in:
Araq 2019-09-08 09:22:11 +02:00
commit 8362d92e47
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/semtypes.nim
View file

@ -850,6 +850,7 @@ proc semAnyRef(c: PContext; n: PNode; kind: TTypeKind; prev: PType): PType =
localError(c.config, n.info, "type '$1 void' is not allowed" % kindToStr[kind]) localError(c.config, n.info, "type '$1 void' is not allowed" % kindToStr[kind])
result = newOrPrevType(kind, prev, c) result = newOrPrevType(kind, prev, c)
var isNilable = false var isNilable = false
var isOwned = false
# check every except the last is an object: # check every except the last is an object:
for i in isCall .. n.len-2: for i in isCall .. n.len-2:
let ni = n[i] let ni = n[i]
@ -857,7 +858,9 @@ proc semAnyRef(c: PContext; n: PNode; kind: TTypeKind; prev: PType): PType =
isNilable = true isNilable = true
else: else:
let region = semTypeNode(c, ni, nil) let region = semTypeNode(c, ni, nil)
if region.skipTypes({tyGenericInst, tyAlias, tySink}).kind notin { if region.kind == tyOwned:
isOwned = true
elif region.skipTypes({tyGenericInst, tyAlias, tySink}).kind notin {
tyError, tyObject}: tyError, tyObject}:
message c.config, n[i].info, errGenerated, "region needs to be an object type" message c.config, n[i].info, errGenerated, "region needs to be an object type"
else: else:
@ -867,6 +870,11 @@ proc semAnyRef(c: PContext; n: PNode; kind: TTypeKind; prev: PType): PType =
if tfPartial in result.flags: if tfPartial in result.flags:
if result.lastSon.kind == tyObject: incl(result.lastSon.flags, tfPartial) if result.lastSon.kind == tyObject: incl(result.lastSon.flags, tfPartial)
#if not isNilable: result.flags.incl tfNotNil #if not isNilable: result.flags.incl tfNotNil
if isOwned and optNimV2 in c.config.globalOptions:
let t = newTypeS(tyOwned, c)
t.flags.incl tfHasOwned
t.rawAddSonNoPropagationOfTypeFlags result
result = t
proc findEnforcedStaticType(t: PType): PType = proc findEnforcedStaticType(t: PType): PType =
# This handles types such as `static[T] and Foo`, # This handles types such as `static[T] and Foo`,