Merge branch 'devel' into araq-misc

2018-08-13 20:16:18 +02:00 · 2018-08-13 20:16:18 +02:00 · a0cde8cee6
commit a0cde8cee6
parent f960523b46 aa1cdebdc2
13 changed files with 90 additions and 20 deletions
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@ -1819,6 +1819,10 @@ proc userConvMatch(c: PContext, m: var TCandidate, f, a: PType,
    # see tests/tgenericconverter:
    let srca = typeRel(m, src, a)
    if srca notin {isEqual, isGeneric, isSubtype}: continue
+   
+    let constraint = c.converters[i].typ.n[1].sym.constraint
+    if not constraint.isNil and not matchNodeKinds(constraint, arg):
+      continue

    let destIsGeneric = containsGenericType(dest)
    if destIsGeneric: