diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/semdata.nim | 1 | ||||
| -rw-r--r-- | compiler/semexprs.nim | 6 | ||||
| -rw-r--r-- | compiler/semmagic.nim | 2 | ||||
| -rw-r--r-- | compiler/semtypes.nim | 4 |
4 files changed, 11 insertions, 2 deletions
diff --git a/compiler/semdata.nim b/compiler/semdata.nim index 12930feca..6065e9845 100644 --- a/compiler/semdata.nim +++ b/compiler/semdata.nim @@ -168,6 +168,7 @@ type inUncheckedAssignSection*: int importModuleLookup*: Table[int, seq[int]] # (module.ident.id, [module.id]) skipTypes*: seq[PNode] # used to skip types between passes in type section. So far only used for inheritance, sets and generic bodies. + inTypeofContext*: int TBorrowState* = enum bsNone, bsReturnNotMatch, bsNoDistinct, bsGeneric, bsNotSupported, bsMatch diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 731bd14dc..0147245af 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -970,7 +970,8 @@ proc evalAtCompileTime(c: PContext, n: PNode): PNode = if callee.magic notin ctfeWhitelist: return - if callee.kind notin {skProc, skFunc, skConverter, skConst} or callee.isGenericRoutine: + if callee.kind notin {skProc, skFunc, skConverter, skConst} or + callee.isGenericRoutineStrict: return if n.typ != nil and typeAllowed(n.typ, skConst, c) != nil: return @@ -1118,7 +1119,8 @@ proc afterCallActions(c: PContext; n, orig: PNode, flags: TExprFlags; expectedTy not (result.typ.kind == tySequence and result.elementType.kind == tyEmpty): liftTypeBoundOps(c, result.typ, n.info) #result = patchResolvedTypeBoundOp(c, result) - if c.matchedConcept == nil: + if c.matchedConcept == nil and (c.inTypeofContext == 0 or callee.magic != mNone): + # don't fold calls in concepts and typeof result = evalAtCompileTime(c, result) proc semIndirectOp(c: PContext, n: PNode, flags: TExprFlags; expectedType: PType = nil): PNode = diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim index c3c032147..1e579a959 100644 --- a/compiler/semmagic.nim +++ b/compiler/semmagic.nim @@ -49,7 +49,9 @@ proc semTypeOf(c: PContext; n: PNode): PNode = else: m = mode.intVal result = newNodeI(nkTypeOfExpr, n.info) + inc c.inTypeofContext let typExpr = semExprWithType(c, n[1], if m == 1: {efInTypeof} else: {}) + dec c.inTypeofContext result.add typExpr result.typ = makeTypeDesc(c, typExpr.typ) diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim index 48d4f2c8d..1219d6ed8 100644 --- a/compiler/semtypes.nim +++ b/compiler/semtypes.nim @@ -1841,7 +1841,9 @@ proc semStaticType(c: PContext, childNode: PNode, prev: PType): PType = proc semTypeOf(c: PContext; n: PNode; prev: PType): PType = openScope(c) + inc c.inTypeofContext let t = semExprWithType(c, n, {efInTypeof}) + dec c.inTypeofContext closeScope(c) fixupTypeOf(c, prev, t) result = t.typ @@ -1855,7 +1857,9 @@ proc semTypeOf2(c: PContext; n: PNode; prev: PType): PType = localError(c.config, n.info, "typeof: cannot evaluate 'mode' parameter at compile-time") else: m = mode.intVal + inc c.inTypeofContext let t = semExprWithType(c, n[1], if m == 1: {efInTypeof} else: {}) + dec c.inTypeofContext closeScope(c) fixupTypeOf(c, prev, t) result = t.typ |