From 754e2ef1db61610cba1b96752fa37c6e923e2808 Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Mon, 30 Dec 2013 19:11:42 +0200
Subject: [PATCH] migrate the static param handling to ReplaceTypeVars; fix
 tgenericvariant

---
 compiler/sem.nim           | 11 +++++++----
 compiler/semtypes.nim      | 23 +++++++++++++++++------
 compiler/semtypinst.nim    | 21 ++++++++++-----------
 compiler/sigmatch.nim      |  3 +--
 compiler/types.nim         |  4 ++--
 tests/reject/teffects1.nim |  2 +-
 6 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/compiler/sem.nim b/compiler/sem.nim
index df37a6384f..e9c2de6572 100644
--- a/compiler/sem.nim
+++ b/compiler/sem.nim
@@ -204,12 +204,15 @@ proc tryConstExpr(c: PContext, n: PNode): PNode =
   result = getConstExpr(c.module, e)
   if result != nil: return
 
-  result = evalConstExpr(c.module, e)
-  if result == nil or result.kind == nkEmpty:
+  try:
+    result = evalConstExpr(c.module, e)
+    if result == nil or result.kind == nkEmpty:
+      return nil
+
+    result = fixupTypeAfterEval(c, result, e)
+  except:
     return nil
 
-  result = fixupTypeAfterEval(c, result, e)
-  
 proc semConstExpr(c: PContext, n: PNode): PNode =
   var e = semExprWithType(c, n)
   if e == nil:
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index 175901057d..fb05469615 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -594,7 +594,7 @@ proc addParamOrResult(c: PContext, param: PSym, kind: TSymKind) =
 let typedescId = getIdent"typedesc"
 
 template shouldHaveMeta(t) =
-  InternalAssert tfHasMeta in result.lastSon.flags
+  InternalAssert tfHasMeta in t.flags
   # result.lastSon.flags.incl tfHasMeta
 
 proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
@@ -677,7 +677,8 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
     result = newTypeS(tyGenericInvokation, c)
     result.rawAddSon(paramType)
     for i in 0 .. paramType.sonsLen - 2:
-      result.rawAddSon(copyType(paramType.sons[i], getCurrOwner(), true))
+      result.rawAddSon newTypeS(tyAnything, c)
+      # result.rawAddSon(copyType(paramType.sons[i], getCurrOwner(), true))
     result = instGenericContainer(c, paramType.sym.info, result,
                                   allowMetaTypes = true)
     result.lastSon.shouldHaveMeta
@@ -696,20 +697,29 @@ proc liftParamType(c: PContext, procKind: TSymKind, genericParams: PNode,
     if liftBody != nil:
       result = liftBody
       result.shouldHaveMeta
-    
+ 
+  of tyGenericInvokation:
+    for i in 1 .. <paramType.sonsLen:
+      let lifted = liftingWalk(paramType.sons[i])
+      if lifted != nil: paramType.sons[i] = lifted
+
+    let expanded = instGenericContainer(c, info, paramType,
+                                        allowMetaTypes = true)
+    result = liftingWalk(expanded)
+
   of tyTypeClass, tyBuiltInTypeClass, tyAnd, tyOr, tyNot:
     result = addImplicitGeneric(copyType(paramType, getCurrOwner(), true))
   
   of tyExpr:
     if procKind notin {skMacro, skTemplate}:
-      result = addImplicitGeneric(newTypeS(tyGenericParam, c))
+      result = addImplicitGeneric(newTypeS(tyAnything, c))
   
   of tyGenericParam:
     if tfGenericTypeParam in paramType.flags and false:
       if paramType.sonsLen > 0:
         result = liftingWalk(paramType.lastSon)
       else:
-        result = addImplicitGeneric(newTypeS(tyGenericParam, c))
+        result = addImplicitGeneric(newTypeS(tyAnything, c))
   
   else: nil
 
@@ -860,7 +870,7 @@ proc semGeneric(c: PContext, n: PNode, s: PSym, prev: PType): PType =
       return newOrPrevType(tyError, prev, c)
 
     var isConcrete = true
-  
+ 
     for i in 1 .. <m.call.len:
       let typ = m.call[i].typ.skipTypes({tyTypeDesc})
       if containsGenericType(typ): isConcrete = false
@@ -878,6 +888,7 @@ proc semGeneric(c: PContext, n: PNode, s: PSym, prev: PType): PType =
                                         allowMetaTypes = not isConcrete)
           if not isConcrete and result.kind == tyGenericInst:
             result.lastSon.shouldHaveMeta
+          
 
 proc semTypeExpr(c: PContext, n: PNode): PType =
   var n = semExprWithType(c, n, {efDetermineType})
diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim
index 029bf6c8c6..fb7be3a385 100644
--- a/compiler/semtypinst.nim
+++ b/compiler/semtypinst.nim
@@ -263,25 +263,24 @@ proc propagateFieldFlags(t: PType, n: PNode) =
   of nkSym:
     propagateToOwner(t, n.sym.typ)
   of nkRecList, nkRecCase, nkOfBranch, nkElse:
-    for son in n.sons:
-      propagateFieldFlags(t, son)
+    if n.sons != nil:
+      for son in n.sons:
+        propagateFieldFlags(t, son)
   else: discard
 
 proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
   result = t
   if t == nil: return
 
-  if t.kind == tyStatic and t.sym != nil and t.sym.kind == skGenericParam:
-    let s = lookupTypeVar(cl, t)
-    return if s != nil: s else: t
+  #if t.kind == tyStatic and t.sym != nil and t.sym.kind == skGenericParam:
+  #  let s = lookupTypeVar(cl, t)
+  #  return if s != nil: s else: t
+
+  if t.kind in {tyStatic, tyGenericParam} + tyTypeClasses:
+    let lookup = PType(idTableGet(cl.typeMap, t))
+    if lookup != nil: return lookup
 
   case t.kind
-  of tyGenericParam, tyTypeClasses:
-    let lookup = lookupTypeVar(cl, t)
-    if lookup != nil:
-      result = lookup
-      if result.kind == tyGenericInvokation:
-        result = handleGenericInvokation(cl, result)
   of tyGenericInvokation:
     result = handleGenericInvokation(cl, t)
   of tyGenericBody:
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index 13546eae2f..9a00a308b1 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -649,8 +649,7 @@ proc typeRel(c: var TCandidate, f, aOrig: PType, doBind = true): TTypeRelation =
     if a.kind == tyEmpty: result = isEqual
 
   of tyGenericInst:
-    if a.kind == tyGenericInst:
-      if a.base != f.base: return isNone
+    if a.kind == tyGenericInst and a.base == f.base:
       for i in 1 .. f.sonsLen-2:
         result = typeRel(c, f.sons[i], a.sons[i])
         if result == isNone: return
diff --git a/compiler/types.nim b/compiler/types.nim
index a24adb17e3..1bf18fbe29 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -1227,8 +1227,8 @@ proc getSize(typ: PType): BiggestInt =
   if result < 0: internalError("getSize: " & $typ.kind)
 
 proc containsGenericTypeIter(t: PType, closure: PObject): bool =
-  result = t.kind in GenericTypes + tyTypeClasses +
-                     {tyTypeDesc, tyStatic}
+  result = t.kind in GenericTypes + tyTypeClasses + {tyTypeDesc} or
+           t.kind == tyStatic and t.n == nil
 
 proc containsGenericType*(t: PType): bool = 
   result = iterOverType(t, containsGenericTypeIter, nil)
diff --git a/tests/reject/teffects1.nim b/tests/reject/teffects1.nim
index 340acc6eac..b72e8b00c0 100644
--- a/tests/reject/teffects1.nim
+++ b/tests/reject/teffects1.nim
@@ -1,5 +1,5 @@
 discard """
-  line: 1847
+  line: 1855
   file: "system.nim"
   errormsg: "can raise an unlisted exception: ref EIO"
 """