Use counter instead of lexer line to name anonymous type (#219)

Fixes #217

Author: RSDuck

cparser.nim

@@ -99,6 +99,7 @@ type
                          # to 'foo: Foo' and not 'foo: var Foo'.
     continueActions: seq[PNode]
     currentSection: Section # can be nil
+    anoTypeCount: int
 
   ReplaceTuple* = array[0..1, string]
 
@@ -867,13 +868,14 @@ proc structPragmas(p: Parser, name: PNode, origName: string,
   if isUnion: pragmas.add newIdentNodeP("union", p)
   result.add pragmas
 
-proc hashPosition(p: Parser): string =
+proc hashPosition(p: var Parser): string =
   let lineInfo = parLineInfo(p)
   when declared(gConfig):
     let fileInfo = toFilename(gConfig, lineInfo.fileIndex).splitFile.name
   else:
     let fileInfo = toFilename(lineInfo.fileIndex).splitFile.name
-  result = fileInfo & "_" & $lineInfo.line
+  result = fileInfo & "_" & $p.anoTypeCount
+  inc(p.anoTypeCount)
 
 proc parseInnerStruct(p: var Parser, stmtList: PNode,
                       isUnion: bool, name: string): PNode =

testsuite/results/nestedanonymousstruct.nim

@@ -0,0 +1,10 @@
+type
+  INNER_C_STRUCT_nestedanonymousstruct_3* {.bycopy.} = object
+    a*: cint
+
+  INNER_C_STRUCT_nestedanonymousstruct_2* {.bycopy.} = object
+    meow*: INNER_C_STRUCT_nestedanonymousstruct_3
+
+  miauz* {.bycopy.} = object
+    meow2*: INNER_C_STRUCT_nestedanonymousstruct_2
+

testsuite/results/struct_anonym.nim

@@ -3,23 +3,23 @@ type
     a*: cint
     b*: cint
 
-  INNER_C_UNION_struct_anonym_14* {.bycopy, union.} = object
+  INNER_C_UNION_struct_anonym_1* {.bycopy, union.} = object
     b*: cint
 
-  INNER_C_STRUCT_struct_anonym_13* {.bycopy.} = object
-    a_union_in_the_struct*: INNER_C_UNION_struct_anonym_14
+  INNER_C_STRUCT_struct_anonym_0* {.bycopy.} = object
+    a_union_in_the_struct*: INNER_C_UNION_struct_anonym_1
     c*: cint
 
-  INNER_C_STRUCT_struct_anonym_24* {.bycopy.} = object
+  INNER_C_STRUCT_struct_anonym_4* {.bycopy.} = object
     e*: cint
 
-  INNER_C_UNION_struct_anonym_21* {.bycopy, union.} = object
+  INNER_C_UNION_struct_anonym_3* {.bycopy, union.} = object
     d*: cint
-    a_struct_in_the_union*: INNER_C_STRUCT_struct_anonym_24
+    a_struct_in_the_union*: INNER_C_STRUCT_struct_anonym_4
 
   outerStruct* {.bycopy.} = object
     a_nomal_one*: normal
     a*: cint
-    ano_struct_anonym_18*: INNER_C_STRUCT_struct_anonym_13
-    a_union*: INNER_C_UNION_struct_anonym_21
+    ano_struct_anonym_2*: INNER_C_STRUCT_struct_anonym_0
+    a_union*: INNER_C_UNION_struct_anonym_3
 

testsuite/results/systest2.nim

@@ -29,11 +29,11 @@ const
 
 proc bcf_float_set*(`ptr`: ptr cfloat; value: uint32_t) {.inline, cdecl.} =
   type
-    INNER_C_UNION_systest2_48 {.importc: "no_name", header: "iup.h", bycopy, union.} = object
+    INNER_C_UNION_systest2_0 {.importc: "no_name", header: "iup.h", bycopy, union.} = object
       i: uint32_t
       f: cfloat
 
-  var u: INNER_C_UNION_systest2_48
+  var u: INNER_C_UNION_systest2_0
   u.i = value
   `ptr`[] = u.f
 

testsuite/tests/nestedanonymousstruct.h

@@ -0,0 +1,11 @@
+
+typedef struct
+{
+    struct
+    {
+        struct
+        {
+            int a;
+        } meow;
+    } meow2;
+} miauz;