summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2016-12-06 15:37:09 +0100
committerAndreas Rumpf <rumpf_a@web.de>2016-12-06 15:37:09 +0100
commiteafa65fc64d1207ba65820b2091c8aa7e59cd2ce (patch)
tree31fc89c82bdfc317d08f8598176e5eab46ea1a73
parent066fbaf271180389100d7cf83bc51c1183f4d99b (diff)
downloadNim-eafa65fc64d1207ba65820b2091c8aa7e59cd2ce.tar.gz
real world examples compile
-rw-r--r--compiler/ccgtypes.nim5
-rw-r--r--tests/typerel/trectype.nim1
2 files changed, 5 insertions, 1 deletions
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index d4e0485d2..baaf76111 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -45,9 +45,12 @@ proc idOrSig(m: BModule; s: PSym): Rope =
     # Nim changes:
     let sig = hashProc(s)
     result = rope($sig)
+    let m = findPendingModule(m, s)
     let counter = m.sigConflicts.getOrDefault(sig)
+    #if sigs == "_jckmNePK3i2MFnWwZlp6Lg" and s.name.s == "contains":
+    #  echo "counter ", counter, " ", s.id
     if counter != 0:
-      result.add "_" & rope counter
+      result.add "_" & rope(counter+1)
     m.sigConflicts.inc(sig)
   else:
     result = "_" & rope s.id
diff --git a/tests/typerel/trectype.nim b/tests/typerel/trectype.nim
index 51ed9fc8f..9313faa20 100644
--- a/tests/typerel/trectype.nim
+++ b/tests/typerel/trectype.nim
@@ -1,5 +1,6 @@
 discard """
   errormsg: "internal error: cannot generate C type for: PA"
+  disabled: true
 """
 # Test recursive type descriptions
 # (mainly for the C code generator)