diff options
| author | awr1 <41453959+awr1@users.noreply.github.com> | 2018-09-04 16:33:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 16:33:52 -0500 |
| commit | eb668003bf35671d7358e5f54e05820c0f4aef3d (patch) | |
| tree | e5c5d6315f8ba4a5dd647bf67a4d0afb609916e7 /compiler/semgnrc.nim | |
| parent | 89ad1cc9b18db8320e5b170ee45888cf79d52001 (diff) | |
| parent | 4aba2981dd47672744191bd17b39bb149f494637 (diff) | |
| download | Nim-eb668003bf35671d7358e5f54e05820c0f4aef3d.tar.gz | |
Merge branch 'devel' into experimentalize-reorder
Diffstat (limited to 'compiler/semgnrc.nim')
| -rw-r--r-- | compiler/semgnrc.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/semgnrc.nim b/compiler/semgnrc.nim index e3c750f5b..7be0610a2 100644 --- a/compiler/semgnrc.nim +++ b/compiler/semgnrc.nim @@ -215,7 +215,7 @@ proc semGenericStmt(c: PContext, n: PNode, checkMinSonsLen(n, 1, c.config) let fn = n.sons[0] var s = qualifiedLookUp(c, fn, {}) - if s == nil and + if s == nil and {withinMixin, withinConcept}*flags == {} and fn.kind in {nkIdent, nkAccQuoted} and considerQuotedIdent(c, fn).id notin ctx.toMixin: @@ -225,7 +225,7 @@ proc semGenericStmt(c: PContext, n: PNode, var mixinContext = false if s != nil: 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) case s.kind of skMacro: |