Fixed a regression of generating templates in C# with the option off.

ddobrev · ddobrev · commit b7faf3381923 · 2017-10-20T01:06:34.000+03:00
Signed-off-by: Dimitar Dobrev &lt;dpldobrev@protonmail.com&gt;
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
@@ -45,10 +45,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class CompressedPair<_T1, _T2>
-    {
-    }
-
     namespace Allocator
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -151,10 +147,6 @@ public unsafe partial struct __Internal
             internal global::Std.CompressedPair.__Internal __end_cap_;
         }
     }
-
-    public unsafe partial class Vector<_Tp, _Allocator>
-    {
-    }
 }
 
 namespace Std
@@ -175,10 +167,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class Tree<_Tp, _Compare, _Allocator>
-    {
-    }
-
     namespace TreeEndNode
     {
         [StructLayout(LayoutKind.Explicit, Size = 4)]
@@ -188,10 +176,6 @@ public unsafe partial struct __Internal_Ptr
             internal global::System.IntPtr __left_;
         }
     }
-
-    public unsafe partial class TreeEndNode<_Pointer>
-    {
-    }
 }
 
 namespace Std
@@ -205,10 +189,6 @@ public unsafe partial struct __Internal
             internal global::Std.Tree.__Internal __tree_;
         }
     }
-
-    public unsafe partial class Map<_Key, _Tp, _Compare, _Allocator>
-    {
-    }
 }
 
 namespace Std
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
@@ -366,10 +366,6 @@ public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_al
             internal global::Std.VectorVal.__Internal _Myval2;
         }
     }
-
-    public unsafe partial class CompressedPair<_Ty1, _Ty2, _0>
-    {
-    }
 }
 
 namespace Std
@@ -622,10 +618,6 @@ public partial struct __Internal
             }
         }
     }
-
-    public unsafe partial class StringVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
@@ -640,10 +632,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class Vector<_Ty, _Alloc>
-    {
-    }
-
     namespace VectorVal
     {
         [StructLayout(LayoutKind.Explicit, Size = 12)]
@@ -659,10 +647,6 @@ public unsafe partial struct __Internal
             internal global::System.IntPtr _Myend;
         }
     }
-
-    public unsafe partial class VectorVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
@@ -679,10 +663,6 @@ public unsafe partial struct __Internal
             internal uint _Mysize;
         }
     }
-
-    public unsafe partial class TreeVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
@@ -696,8 +676,4 @@ public unsafe partial struct __Internal
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1 _Mypair;
         }
     }
-
-    public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>
-    {
-    }
 }
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
@@ -45,10 +45,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class CompressedPair<_T1, _T2>
-    {
-    }
-
     namespace Allocator
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -151,10 +147,6 @@ public unsafe partial struct __Internal
             internal global::Std.CompressedPair.__Internal __end_cap_;
         }
     }
-
-    public unsafe partial class Vector<_Tp, _Allocator>
-    {
-    }
 }
 
 namespace Std
@@ -175,10 +167,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class Tree<_Tp, _Compare, _Allocator>
-    {
-    }
-
     namespace TreeEndNode
     {
         [StructLayout(LayoutKind.Explicit, Size = 8)]
@@ -188,10 +176,6 @@ public unsafe partial struct __Internal_Ptr
             internal global::System.IntPtr __left_;
         }
     }
-
-    public unsafe partial class TreeEndNode<_Pointer>
-    {
-    }
 }
 
 namespace Std
@@ -205,10 +189,6 @@ public unsafe partial struct __Internal
             internal global::Std.Tree.__Internal __tree_;
         }
     }
-
-    public unsafe partial class Map<_Key, _Tp, _Compare, _Allocator>
-    {
-    }
 }
 
 namespace Std
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
@@ -127,10 +127,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class Vector<_Tp, _Alloc>
-    {
-    }
-
     namespace VectorBase
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
@@ -157,10 +153,6 @@ public partial struct __Internal
             }
         }
     }
-
-    public unsafe partial class VectorBase<_Tp, _Alloc>
-    {
-    }
 }
 
 namespace Std
@@ -172,10 +164,6 @@ public unsafe partial struct __Internal
         {
         }
     }
-
-    public unsafe partial class Less<_Tp>
-    {
-    }
 }
 
 namespace Std
@@ -270,10 +258,6 @@ public unsafe partial struct __Internal
             internal global::Std.RbTree.__Internal _M_t;
         }
     }
-
-    public unsafe partial class Map<_Key, _Tp, _Compare, _Alloc>
-    {
-    }
 }
 
 namespace Std
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
@@ -127,10 +127,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class Vector<_Tp, _Alloc>
-    {
-    }
-
     namespace VectorBase
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
@@ -157,10 +153,6 @@ public partial struct __Internal
             }
         }
     }
-
-    public unsafe partial class VectorBase<_Tp, _Alloc>
-    {
-    }
 }
 
 namespace Std
@@ -172,10 +164,6 @@ public unsafe partial struct __Internal
         {
         }
     }
-
-    public unsafe partial class Less<_Tp>
-    {
-    }
 }
 
 namespace Std
@@ -270,10 +258,6 @@ public unsafe partial struct __Internal
             internal global::Std.RbTree.__Internal _M_t;
         }
     }
-
-    public unsafe partial class Map<_Key, _Tp, _Compare, _Alloc>
-    {
-    }
 }
 
 namespace Std
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
@@ -366,10 +366,6 @@ public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_al
             internal global::Std.VectorVal.__Internal _Myval2;
         }
     }
-
-    public unsafe partial class CompressedPair<_Ty1, _Ty2, _0>
-    {
-    }
 }
 
 namespace Std
@@ -622,10 +618,6 @@ public partial struct __Internal
             }
         }
     }
-
-    public unsafe partial class StringVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
@@ -640,10 +632,6 @@ public unsafe partial struct __Internal
         }
     }
 
-    public unsafe partial class Vector<_Ty, _Alloc>
-    {
-    }
-
     namespace VectorVal
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
@@ -659,10 +647,6 @@ public unsafe partial struct __Internal
             internal global::System.IntPtr _Myend;
         }
     }
-
-    public unsafe partial class VectorVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
@@ -679,10 +663,6 @@ public unsafe partial struct __Internal
             internal ulong _Mysize;
         }
     }
-
-    public unsafe partial class TreeVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
@@ -696,8 +676,4 @@ public unsafe partial struct __Internal
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1 _Mypair;
         }
     }
-
-    public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>
-    {
-    }
 }
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -344,7 +344,7 @@ public override bool VisitClassDecl(Class @class)
                 if (!(@class.Namespace is Class))
                     GenerateClassTemplateSpecializationInternal(@class);
 
-                if (@class.Specializations.All(s => s.Ignore))
+                if (@class.Specializations.All(s => !s.IsGenerated))
                     return true;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,6 @@ public unsafe partial struct __Internal`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public unsafe partial class CompressedPair<_T1, _T2>`
`49`		`- {`
`50`		`- }`
`51`		`-`
`52`	`48`	`namespace Allocator`
`53`	`49`	`{`
`54`	`50`	`[StructLayout(LayoutKind.Explicit, Size = 0)]`
`@@ -151,10 +147,6 @@ public unsafe partial struct __Internal`
`151`	`147`	`internal global::Std.CompressedPair.__Internal __end_cap_;`
`152`	`148`	`}`
`153`	`149`	`}`
`154`		`-`
`155`		`- public unsafe partial class Vector<_Tp, _Allocator>`
`156`		`- {`
`157`		`- }`
`158`	`150`	`}`
`159`	`151`
`160`	`152`	`namespace Std`
`@@ -175,10 +167,6 @@ public unsafe partial struct __Internal`
`175`	`167`	`}`
`176`	`168`	`}`
`177`	`169`
`178`		`- public unsafe partial class Tree<_Tp, _Compare, _Allocator>`
`179`		`- {`
`180`		`- }`
`181`		`-`
`182`	`170`	`namespace TreeEndNode`
`183`	`171`	`{`
`184`	`172`	`[StructLayout(LayoutKind.Explicit, Size = 4)]`
`@@ -188,10 +176,6 @@ public unsafe partial struct __Internal_Ptr`
`188`	`176`	`internal global::System.IntPtr __left_;`
`189`	`177`	`}`
`190`	`178`	`}`
`191`		`-`
`192`		`- public unsafe partial class TreeEndNode<_Pointer>`
`193`		`- {`
`194`		`- }`
`195`	`179`	`}`
`196`	`180`
`197`	`181`	`namespace Std`
`@@ -205,10 +189,6 @@ public unsafe partial struct __Internal`
`205`	`189`	`internal global::Std.Tree.__Internal __tree_;`
`206`	`190`	`}`
`207`	`191`	`}`
`208`		`-`
`209`		`- public unsafe partial class Map<_Key, _Tp, _Compare, _Allocator>`
`210`		`- {`
`211`		`- }`
`212`	`192`	`}`
`213`	`193`
`214`	`194`	`namespace Std`
Original file line number	Diff line number	Diff line change
`@@ -366,10 +366,6 @@ public unsafe partial struct __Internalc__N_std_S__Compressed_pair____N_std_S_al`
`366`	`366`	`internal global::Std.VectorVal.__Internal _Myval2;`
`367`	`367`	`}`
`368`	`368`	`}`
`369`		`-`
`370`		`- public unsafe partial class CompressedPair<_Ty1, _Ty2, _0>`
`371`		`- {`
`372`		`- }`
`373`	`369`	`}`
`374`	`370`
`375`	`371`	`namespace Std`
`@@ -622,10 +618,6 @@ public partial struct __Internal`
`622`	`618`	`}`
`623`	`619`	`}`
`624`	`620`	`}`
`625`		`-`
`626`		`- public unsafe partial class StringVal<_Val_types>`
`627`		`- {`
`628`		`- }`
`629`	`621`	`}`
`630`	`622`
`631`	`623`	`namespace Std`
`@@ -640,10 +632,6 @@ public unsafe partial struct __Internal`
`640`	`632`	`}`
`641`	`633`	`}`
`642`	`634`
`643`		`- public unsafe partial class Vector<_Ty, _Alloc>`
`644`		`- {`
`645`		`- }`
`646`		`-`
`647`	`635`	`namespace VectorVal`
`648`	`636`	`{`
`649`	`637`	`[StructLayout(LayoutKind.Explicit, Size = 12)]`
`@@ -659,10 +647,6 @@ public unsafe partial struct __Internal`
`659`	`647`	`internal global::System.IntPtr _Myend;`
`660`	`648`	`}`
`661`	`649`	`}`
`662`		`-`
`663`		`- public unsafe partial class VectorVal<_Val_types>`
`664`		`- {`
`665`		`- }`
`666`	`650`	`}`
`667`	`651`
`668`	`652`	`namespace Std`
`@@ -679,10 +663,6 @@ public unsafe partial struct __Internal`
`679`	`663`	`internal uint _Mysize;`
`680`	`664`	`}`
`681`	`665`	`}`
`682`		`-`
`683`		`- public unsafe partial class TreeVal<_Val_types>`
`684`		`- {`
`685`		`- }`
`686`	`666`	`}`
`687`	`667`
`688`	`668`	`namespace Std`
`@@ -696,8 +676,4 @@ public unsafe partial struct __Internal`
`696`	`676`	`internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1 _Mypair;`
`697`	`677`	`}`
`698`	`678`	`}`
`699`		`-`
`700`		`- public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>`
`701`		`- {`
`702`		`- }`
`703`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,6 @@ public unsafe partial struct __Internal`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`130`		`- public unsafe partial class Vector<_Tp, _Alloc>`
`131`		`- {`
`132`		`- }`
`133`		`-`
`134`	`130`	`namespace VectorBase`
`135`	`131`	`{`
`136`	`132`	`[StructLayout(LayoutKind.Explicit, Size = 24)]`
`@@ -157,10 +153,6 @@ public partial struct __Internal`
`157`	`153`	`}`
`158`	`154`	`}`
`159`	`155`	`}`
`160`		`-`
`161`		`- public unsafe partial class VectorBase<_Tp, _Alloc>`
`162`		`- {`
`163`		`- }`
`164`	`156`	`}`
`165`	`157`
`166`	`158`	`namespace Std`
`@@ -172,10 +164,6 @@ public unsafe partial struct __Internal`
`172`	`164`	`{`
`173`	`165`	`}`
`174`	`166`	`}`
`175`		`-`
`176`		`- public unsafe partial class Less<_Tp>`
`177`		`- {`
`178`		`- }`
`179`	`167`	`}`
`180`	`168`
`181`	`169`	`namespace Std`
`@@ -270,10 +258,6 @@ public unsafe partial struct __Internal`
`270`	`258`	`internal global::Std.RbTree.__Internal _M_t;`
`271`	`259`	`}`
`272`	`260`	`}`
`273`		`-`
`274`		`- public unsafe partial class Map<_Key, _Tp, _Compare, _Alloc>`
`275`		`- {`
`276`		`- }`
`277`	`261`	`}`
`278`	`262`
`279`	`263`	`namespace Std`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ public override bool VisitClassDecl(Class @class)`
`344`	`344`	`if (!(@class.Namespace is Class))`
`345`	`345`	`GenerateClassTemplateSpecializationInternal(@class);`
`346`	`346`
`347`		`- if (@class.Specializations.All(s => s.Ignore))`
	`347`	`+ if (@class.Specializations.All(s => !s.IsGenerated))`
`348`	`348`	`return true;`
`349`	`349`	`}`
`350`	`350`