allow any routine kind in concepts, fix concepts in other modules (#835)

* allow any routine kind in concepts, fix concepts in other modules

fixes #829

* fix generic procs in iterinliner, update test

Author: metagn

src/hexer/iterinliner.nim

@@ -488,11 +488,18 @@ proc transformStmt(e: var EContext; c: var Cursor) =
     of FuncS, ProcS, ConverterS, MethodS:
       e.dest.add c
       inc c
-      for i in 0..<BodyPos:
+      takeTree(e, c) # name
+      takeTree(e, c) # exported
+      takeTree(e, c) # pattern
+      let isGeneric = c.substructureKind == TypevarsU
+      for i in 3..<BodyPos:
         takeTree(e, c)
       let oldTmpId = e.tmpId
       e.tmpId = 0
-      transformStmt(e, c)
+      if isGeneric:
+        takeTree(e, c)
+      else:
+        transformStmt(e, c)
       e.tmpId = oldTmpId
       takeParRi(e, c)
     of VarS, LetS, CursorS, ResultS:

src/nimony/sem.nim

@@ -735,15 +735,14 @@ proc pickBestMatch(c: var SemContext; m: openArray[Match]): int =
           other = -1
   if other >= 0: result = -2 # ambiguous
 
-const
-  ConceptProcY = CchoiceY
-
 type MagicCallKind = enum
   NonMagicCall, MagicCall, MagicCallNeedsSemcheck
 
 proc addFn(c: var SemContext; fn: FnCandidate; fnOrig: Cursor; args: openArray[Item]): MagicCallKind =
   result = NonMagicCall
-  if fn.kind in RoutineKinds:
+  if fn.fromConcept and fn.sym != SymId(0):
+    c.dest.add identToken(symToIdent(fn.sym), fnOrig.info)
+  elif fn.kind in RoutineKinds:
     assert fn.sym != SymId(0)
     let res = tryLoadSym(fn.sym)
     if res.status == LacksNothing:
@@ -772,8 +771,6 @@ proc addFn(c: var SemContext; fn: FnCandidate; fnOrig: Cursor; args: openArray[I
             error "broken `magic`: expected ')', but got: ", n
     if result == NonMagicCall:
       c.dest.add symToken(fn.sym, fnOrig.info)
-  elif fn.kind == ConceptProcY and fn.sym != SymId(0):
-    c.dest.add identToken(symToIdent(fn.sym), fnOrig.info)
   else:
     c.dest.addSubtree fnOrig
 
@@ -848,7 +845,7 @@ proc maybeAddConceptMethods(c: var SemContext; fn: StrId; typevar: SymId; cands:
           if prc.kind == SymbolDef and sameIdent(prc.symId, fn):
             var d = ops
             skipToParams d
-            cands.addUnique FnCandidate(kind: ConceptProcY, sym: prc.symId, typ: d)
+            cands.addUnique FnCandidate(kind: sk, sym: prc.symId, typ: d, fromConcept: true)
         skip ops
 
 proc considerTypeboundOps(c: var SemContext; m: var seq[Match]; candidates: FnCandidates; args: openArray[Item], genericArgs: Cursor, hasNamedArgs: bool) =
@@ -2407,7 +2404,10 @@ proc semConceptType(c: var SemContext; n: var Cursor) =
   if n.stmtKind != StmtsS:
     error "(stmts) expected, but got: ", n
   takeToken c, n
+  let oldScopeKind = c.currentScope.kind
   withNewScope c:
+    # make syms of routines in toplevel concept also toplevel:
+    c.currentScope.kind = oldScopeKind
     while true:
       let k = n.symKind
       if k in RoutineKinds:
@@ -3962,7 +3962,9 @@ proc semFor(c: var SemContext; it: var Item) =
   var isMacroLike = false
   if c.dest[beforeCall+1].kind == Symbol and c.isIterator(c.dest[beforeCall+1].symId):
     discard "fine"
-  elif iterCall.typ.typeKind == UntypedT:
+  elif iterCall.typ.typeKind == UntypedT or
+      # for iterators from concepts in generic context:
+      c.dest[beforeCall+1].kind == Ident:
     isMacroLike = true
   else:
     buildErr c, it.n.info, "iterator expected"

src/nimony/sigmatch.nim

@@ -20,6 +20,7 @@ type
     kind*: SymKind
     sym*: SymId
     typ*: Cursor
+    fromConcept*: bool
 
   MatchErrorKind* = enum
     InvalidMatch

tests/nimony/concepts/tconceptiterator.nim

@@ -0,0 +1,18 @@
+# issue #829
+
+iterator `..`*(a, b: int): int {.inline.} =
+  var i = a
+  while i <= b:
+    yield i
+    inc i
+
+type
+  Iterable* = concept
+    iterator `..`(a, b: Self): Self
+
+proc default2*[I: Iterable; T: HasDefault](x: typedesc[array[I, T]]): array[I, T] {.inline, noinit.} =
+  # Needs to call iterator `..`(a, b: I): I
+  for i in low(array[I, T]) .. high(array[I, T]):
+    result[i] = default(T)
+
+var x = default2(array[2, int])

tests/nimony/nosystem/tfib2.nif

@@ -76,16 +76,16 @@
   (concept . .
    (typevar :Self.0.tfitjdpcx . . . .) ~8,1
    (stmts
-    (proc 5 :<=.0 . . . 9
+    (proc 5 :<=.2.tfitjdpcx . . . 9
      (params 1
       (param :a.0 . . 6 Self.0.tfitjdpcx .) 4
       (param :b.0 . . 3 Self.0.tfitjdpcx .)) 14
      (bool) . . .) ,1
-    (proc 5 :\2B.0 . . . 8
+    (proc 5 :\2B.2.tfitjdpcx . . . 8
      (params 1
       (param :x.6 . . 6 Self.0.tfitjdpcx .) 4
       (param :y.6 . . 3 Self.0.tfitjdpcx .)) 14 Self.0.tfitjdpcx . . .) ,2
-    (proc 5 :\2D.0 . . . 8
+    (proc 5 :\2D.2.tfitjdpcx . . . 8
      (params 1
       (param :x.7 . . 6 Self.0.tfitjdpcx .) 4
       (param :y.7 . . 3 Self.0.tfitjdpcx .)) 14 Self.0.tfitjdpcx . . .)))) ,22