mirror of
https://github.com/nim-lang/Nim.git
synced 2026-07-19 07:21:19 +00:00
Plug another hole: default(T) forbidden for objects requiring initialization
This commit is contained in:
committed by
Andreas Rumpf
parent
05a0ec4adb
commit
8ae48292ff
@@ -46,6 +46,7 @@ proc addParams(c: PContext, n: PNode, kind: TSymKind)
|
||||
proc maybeAddResult(c: PContext, s: PSym, n: PNode)
|
||||
proc tryExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode
|
||||
proc activate(c: PContext, n: PNode)
|
||||
proc checkDefaultConstruction(c: PContext, typ: PType, info: TLineInfo)
|
||||
proc semQuoteAst(c: PContext, n: PNode): PNode
|
||||
proc finishMethod(c: PContext, s: PSym)
|
||||
proc evalAtCompileTime(c: PContext, n: PNode): PNode
|
||||
@@ -58,24 +59,6 @@ proc isArrayConstr(n: PNode): bool {.inline.} =
|
||||
result = n.kind == nkBracket and
|
||||
n.typ.skipTypes(abstractInst).kind == tyArray
|
||||
|
||||
type
|
||||
ObjConstrContext = object
|
||||
typ: PType # The constructed type
|
||||
initExpr: PNode # The init expression (nkObjConstr)
|
||||
requiresFullInit: bool # A `requiresInit` derived type will
|
||||
# set this to true while visiting
|
||||
# parent types.
|
||||
|
||||
InitStatus = enum # This indicates the result of object construction
|
||||
initUnknown
|
||||
initFull # All of the fields have been initialized
|
||||
initPartial # Some of the fields have been initialized
|
||||
initNone # None of the fields have been initialized
|
||||
initConflict # Fields from different branches have been initialized
|
||||
|
||||
proc semConstructType(c: PContext, initExpr: PNode,
|
||||
t: PType, flags: TExprFlags): InitStatus
|
||||
|
||||
template semIdeForTemplateOrGenericCheck(conf, n, requiresCheck) =
|
||||
# we check quickly if the node is where the cursor is
|
||||
when defined(nimsuggest):
|
||||
|
||||
@@ -2264,6 +2264,12 @@ proc semMagic(c: PContext, n: PNode, s: PSym, flags: TExprFlags): PNode =
|
||||
of mSizeOf:
|
||||
markUsed(c, n.info, s)
|
||||
result = semSizeof(c, setMs(n, s))
|
||||
of mDefault:
|
||||
result = semDirectOp(c, n, flags)
|
||||
c.config.internalAssert result[1].typ.kind == tyTypeDesc
|
||||
let typ = result[1].typ.base
|
||||
if typ.kind in {tyObject, tyTuple}:
|
||||
checkDefaultConstruction(c, typ, n.info)
|
||||
else:
|
||||
result = semDirectOp(c, n, flags)
|
||||
|
||||
|
||||
@@ -11,6 +11,21 @@
|
||||
|
||||
# included from sem.nim
|
||||
|
||||
type
|
||||
ObjConstrContext = object
|
||||
typ: PType # The constructed type
|
||||
initExpr: PNode # The init expression (nkObjConstr)
|
||||
requiresFullInit: bool # A `requiresInit` derived type will
|
||||
# set this to true while visiting
|
||||
# parent types.
|
||||
|
||||
InitStatus = enum # This indicates the result of object construction
|
||||
initUnknown
|
||||
initFull # All of the fields have been initialized
|
||||
initPartial # Some of the fields have been initialized
|
||||
initNone # None of the fields have been initialized
|
||||
initConflict # Fields from different branches have been initialized
|
||||
|
||||
proc mergeInitStatus(existing: var InitStatus, newStatus: InitStatus) =
|
||||
case newStatus
|
||||
of initConflict:
|
||||
@@ -336,6 +351,9 @@ proc semConstructType(c: PContext, initExpr: PNode,
|
||||
constrCtx.requiresFullInit = constrCtx.requiresFullInit or
|
||||
tfRequiresInit in t.flags
|
||||
|
||||
proc checkDefaultConstruction(c: PContext, typ: PType, info: TLineInfo) =
|
||||
discard semConstructType(c, newNodeI(nkObjConstr, info), typ, {})
|
||||
|
||||
proc semObjConstr(c: PContext, n: PNode, flags: TExprFlags): PNode =
|
||||
var t = semTypeNode(c, n[0], nil)
|
||||
result = newNodeIT(nkObjConstr, n.info, t)
|
||||
|
||||
@@ -616,7 +616,7 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
|
||||
b[j] = newSymNode(v)
|
||||
if def.kind == nkEmpty:
|
||||
if v.typ.kind in {tyObject, tyTuple}:
|
||||
discard semConstructType(c, newNodeI(nkObjConstr, v.info), v.typ, {})
|
||||
checkDefaultConstruction(c, v.typ, v.info)
|
||||
else:
|
||||
checkNilable(c, v)
|
||||
if sfCompileTime in v.flags:
|
||||
|
||||
@@ -125,12 +125,15 @@ accept PartialRequiresInit(a: 10, b: "x")
|
||||
accept PartialRequiresInit(a: 20)
|
||||
reject PartialRequiresInit(b: "x")
|
||||
reject PartialRequiresInit()
|
||||
reject default(PartialRequiresInit)
|
||||
reject:
|
||||
var obj: PartialRequiresInit
|
||||
|
||||
accept FullRequiresInit(a: 10, b: 20)
|
||||
reject FullRequiresInit(a: 10)
|
||||
reject FullRequiresInit(b: 20)
|
||||
reject FullRequiresInit()
|
||||
reject default(FullRequiresInit)
|
||||
reject:
|
||||
var obj: FullRequiresInit
|
||||
|
||||
@@ -140,11 +143,13 @@ reject FullRequiresInitWithParent(a: notNilRef, b: nil, c: nil, e: 10, d: 20) #
|
||||
reject FullRequiresInitWithParent(a: notNilRef, b: notNilRef, e: 10, d: 20) # c should not be missing
|
||||
reject FullRequiresInitWithParent(a: notNilRef, b: notNilRef, c: nil, e: 10) # d should not be missing
|
||||
reject FullRequiresInitWithParent()
|
||||
reject default(FullRequiresInitWithParent)
|
||||
reject:
|
||||
var obj: FullRequiresInitWithParent
|
||||
|
||||
# this will be accepted, because the false outer branch will be taken and the inner A branch
|
||||
accept TNestedChoices()
|
||||
accept default(TNestedChoices)
|
||||
accept:
|
||||
var obj: TNestedChoices
|
||||
|
||||
|
||||
Reference in New Issue
Block a user