This commit is contained in:
Andreas Rumpf
2018-09-02 22:44:48 +02:00
parent d06da9ccf0
commit 4cf704bb3e

View File

@@ -215,7 +215,7 @@ proc semGenericStmt(c: PContext, n: PNode,
checkMinSonsLen(n, 1, c.config) checkMinSonsLen(n, 1, c.config)
let fn = n.sons[0] let fn = n.sons[0]
var s = qualifiedLookUp(c, fn, {}) var s = qualifiedLookUp(c, fn, {})
if s == nil and if s == nil and
{withinMixin, withinConcept}*flags == {} and {withinMixin, withinConcept}*flags == {} and
fn.kind in {nkIdent, nkAccQuoted} and fn.kind in {nkIdent, nkAccQuoted} and
considerQuotedIdent(c, fn).id notin ctx.toMixin: considerQuotedIdent(c, fn).id notin ctx.toMixin:
@@ -225,7 +225,7 @@ proc semGenericStmt(c: PContext, n: PNode,
var mixinContext = false var mixinContext = false
if s != nil: if s != nil:
incl(s.flags, sfUsed) incl(s.flags, sfUsed)
mixinContext = s.magic in {mDefined, mDefinedInScope, mCompiles} mixinContext = s.magic in {mDefined, mDefinedInScope, mCompiles, mRunnableExamples}
let sc = symChoice(c, fn, s, if s.isMixedIn: scForceOpen else: scOpen) let sc = symChoice(c, fn, s, if s.isMixedIn: scForceOpen else: scOpen)
case s.kind case s.kind
of skMacro: of skMacro: