idetools: 'usages' and 'def' should work now; documented js backend

compiler/sigmatch.nim

@@ -12,7 +12,7 @@
 
 import 
   intsets, ast, astalgo, semdata, types, msgs, renderer, lookups, semtypinst, 
-  magicsys, condsyms, idents
+  magicsys, condsyms, idents, lexer, options
 
 type
   TCandidateState* = enum 
@@ -32,6 +32,7 @@ type
     bindings*: TIdTable      # maps types to types
     baseTypeMatch: bool      # needed for conversions from T to openarray[T]
                              # for example
+    proxyMatch*: bool        # to prevent instantiations
     inheritancePenalty: int  # to prefer closest father object type
   
   TTypeRelation* = enum      # order is important!
@@ -43,7 +44,9 @@ type
     isGeneric,
     isFromIntLit,            # conversion *from* int literal; proven safe
     isEqual
-  
+    
+proc markUsed*(n: PNode, s: PSym)
+
 proc initCandidateAux(c: var TCandidate, callee: PType) {.inline.} = 
   c.exactMatches = 0
   c.subtypeMatches = 0
@@ -114,22 +117,26 @@ proc writeMatches*(c: TCandidate) =
   Writeln(stdout, "intconv matches: " & $c.intConvMatches)
   Writeln(stdout, "generic matches: " & $c.genericMatches)
 
-proc getNotFoundError*(c: PContext, n: PNode): string =
+proc NotFoundError*(c: PContext, n: PNode) =
   # Gives a detailed error message; this is separated from semOverloadedCall,
   # as semOverlodedCall is already pretty slow (and we need this information
   # only in case of an error).
-  if c.InCompilesContext > 0: return ""
-  result = msgKindToString(errTypeMismatch)
+  if c.InCompilesContext > 0: 
+    # fail fast:
+    GlobalError(n.info, errTypeMismatch, "")
+  var result = msgKindToString(errTypeMismatch)
   for i in countup(1, sonsLen(n) - 1): 
     #debug(n.sons[i].typ)
     if n.sons[i].kind == nkExprEqExpr: 
       add(result, renderTree(n.sons[i].sons[0]))
       add(result, ": ")
-    add(result, typeToString(n.sons[i].typ))
+    let nt = n.sons[i].typ
+    if nt.kind == tyError: return
+    add(result, typeToString(nt))
     if i != sonsLen(n) - 1: add(result, ", ")
   add(result, ')')
   var candidates = ""
-  var o: TOverloadIter  
+  var o: TOverloadIter
   var sym = initOverloadIter(o, c, n.sons[0])
   while sym != nil: 
     if sym.kind in {skProc, skMethod, skIterator, skConverter}: 
@@ -139,6 +146,7 @@ proc getNotFoundError*(c: PContext, n: PNode): string =
     sym = nextOverloadIter(o, c, n.sons[0])
   if candidates != "": 
     add(result, "\n" & msgKindToString(errButExpected) & "\n" & candidates)
+  LocalError(n.Info, errGenerated, result)
   
 proc typeRel(c: var TCandidate, f, a: PType): TTypeRelation
 proc concreteType(c: TCandidate, t: PType): PType = 
@@ -418,7 +426,7 @@ proc typeRel(c: var TCandidate, f, a: PType): TTypeRelation =
       result = typeRel(c, f.sons[0], x)
       if result < isGeneric: result = isNone
   of tyForward: InternalError("forward type in typeRel()")
-  of tyNil: 
+  of tyNil:
     if a.kind == f.kind: result = isEqual
   of tyTuple: 
     if a.kind == tyTuple: result = tupleRel(c, f, a)
@@ -539,8 +547,10 @@ proc typeRel(c: var TCandidate, f, a: PType): TTypeRelation =
       if result == isGeneric: put(c.bindings, f, a)
     else:
       result = isNone
-  of tyExpr, tyStmt, tyProxy:
+  of tyExpr, tyStmt:
     result = isGeneric
+  of tyProxy:
+    result = isEqual
   else: internalError("typeRel: " & $f.kind)
   
 proc cmpTypes*(f, a: PType): TTypeRelation = 
@@ -560,8 +570,13 @@ proc getInstantiatedType(c: PContext, arg: PNode, m: TCandidate,
 proc implicitConv(kind: TNodeKind, f: PType, arg: PNode, m: TCandidate, 
                   c: PContext): PNode = 
   result = newNodeI(kind, arg.info)
-  if containsGenericType(f): result.typ = getInstantiatedType(c, arg, m, f)
-  else: result.typ = f
+  if containsGenericType(f):
+    if not m.proxyMatch:
+      result.typ = getInstantiatedType(c, arg, m, f)
+    else:
+      result.typ = errorType(c)
+  else:
+    result.typ = f
   if result.typ == nil: InternalError(arg.info, "implicitConv")
   addSon(result, ast.emptyNode)
   addSon(result, arg)
@@ -648,11 +663,12 @@ proc ParamTypesMatchAux(c: PContext, m: var TCandidate, f, a: PType,
     result = copyTree(arg)
     if skipTypes(f, abstractVar).kind in {tyTuple}: 
       result = implicitConv(nkHiddenStdConv, f, copyTree(arg), m, c)
-  of isNone: 
-    # we test for this here to not slow down ``typeRel``:
+  of isNone:
+    # do not do this in ``typeRel`` as it then can't infere T in ``ref T``:
     if a.kind == tyProxy:
       inc(m.genericMatches)
-      return copyTree(arg)    
+      m.proxyMatch = true
+      return copyTree(arg)
     result = userConvMatch(c, m, f, a, arg) 
     # check for a base type match, which supports openarray[T] without []
     # constructor in a call:
@@ -854,3 +870,5 @@ proc matches*(c: PContext, n, nOrig: PNode, m: var TCandidate) =
         # use default value:
         setSon(m.call, formal.position + 1, copyTree(formal.ast))
     inc(f)
+
+include suggest