Fix regression with runnableExamples in generic expr
The examples should not enter the generic analysis at all.
The regression was introduced in 4cf704bb as a fix for #8694.
Fixes #9130
Fixes #8694
This commit is contained in:
parent
5676e032bd
commit
6d4503325c
3 changed files with 69 additions and 5 deletions
|
|
@ -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, mRunnableExamples}
|
mixinContext = s.magic in {mDefined, mDefinedInScope, mCompiles}
|
||||||
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:
|
||||||
|
|
@ -255,11 +255,11 @@ proc semGenericStmt(c: PContext, n: PNode,
|
||||||
discard
|
discard
|
||||||
of skProc, skFunc, skMethod, skIterator, skConverter, skModule:
|
of skProc, skFunc, skMethod, skIterator, skConverter, skModule:
|
||||||
result.sons[0] = sc
|
result.sons[0] = sc
|
||||||
# do not check of 's.magic==mRoof' here because it might be some
|
|
||||||
# other '^' but after overload resolution the proper one:
|
|
||||||
if ctx.bracketExpr != nil and n.len == 2 and s.name.s == "^":
|
|
||||||
result.add ctx.bracketExpr
|
|
||||||
first = 1
|
first = 1
|
||||||
|
# We're not interested in the example code during this pass so let's
|
||||||
|
# skip it
|
||||||
|
if s.magic == mRunnableExamples:
|
||||||
|
inc first
|
||||||
of skGenericParam:
|
of skGenericParam:
|
||||||
result.sons[0] = newSymNodeTypeDesc(s, fn.info)
|
result.sons[0] = newSymNodeTypeDesc(s, fn.info)
|
||||||
styleCheckUse(fn.info, s)
|
styleCheckUse(fn.info, s)
|
||||||
|
|
|
||||||
31
tests/generics/t8694.nim
Normal file
31
tests/generics/t8694.nim
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
discard """
|
||||||
|
output: '''
|
||||||
|
true
|
||||||
|
true
|
||||||
|
true
|
||||||
|
'''
|
||||||
|
"""
|
||||||
|
|
||||||
|
when true:
|
||||||
|
# Error: undeclared identifier: '|'
|
||||||
|
proc bar[T](t:T): bool =
|
||||||
|
runnableExamples:
|
||||||
|
type Foo = int | float
|
||||||
|
true
|
||||||
|
echo bar(0)
|
||||||
|
|
||||||
|
when true:
|
||||||
|
# ok
|
||||||
|
proc bar(t:int): bool =
|
||||||
|
runnableExamples:
|
||||||
|
type Foo = int | float
|
||||||
|
true
|
||||||
|
echo bar(0)
|
||||||
|
|
||||||
|
when true:
|
||||||
|
# Error: undeclared identifier: '|'
|
||||||
|
proc bar(t:typedesc): bool =
|
||||||
|
runnableExamples:
|
||||||
|
type Foo = int | float
|
||||||
|
true
|
||||||
|
echo bar(int)
|
||||||
33
tests/generics/t9130.nim
Normal file
33
tests/generics/t9130.nim
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
when true:
|
||||||
|
# stack overflow
|
||||||
|
template baz1*(iter: untyped): untyped =
|
||||||
|
runnableExamples:
|
||||||
|
import sugar
|
||||||
|
proc fun(a: proc(x:int): int) = discard
|
||||||
|
baz1(fun(x:int => x))
|
||||||
|
discard
|
||||||
|
|
||||||
|
proc foo1[A](ts: A) =
|
||||||
|
baz1(ts)
|
||||||
|
|
||||||
|
when true:
|
||||||
|
# ok
|
||||||
|
template baz2*(iter: untyped): untyped =
|
||||||
|
runnableExamples:
|
||||||
|
import sugar
|
||||||
|
proc fun(a: proc(x:int): int) = discard
|
||||||
|
baz2(fun(x:int => x))
|
||||||
|
discard
|
||||||
|
|
||||||
|
proc foo2(ts: int) =
|
||||||
|
baz2(ts)
|
||||||
|
|
||||||
|
when true:
|
||||||
|
# stack overflow
|
||||||
|
template baz3*(iter: untyped): untyped =
|
||||||
|
runnableExamples:
|
||||||
|
baz3(fun(x:int => x))
|
||||||
|
discard
|
||||||
|
|
||||||
|
proc foo3[A](ts: A) =
|
||||||
|
baz3(ts)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue