Changeset 9005 for trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs

Timestamp:

12/06/12 12:07:31 (12 years ago)

Author:

epitzer

Message:

#1990 Enable correct parsing of generics and nested classes.

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs

@@ -51 +51 @@
 
     /// <summary>
+    /// Gets or sets the number of generic args for
+    /// each class in a series of nested classes.
+    /// </summary>
+    [Storable]
+    public List<int> GenericArgCounts { get; private set; }
+
+      /// <summary>
     /// Gets or sets the generic args.
     /// </summary>
@@ -103 +110 @@
     /// <param name="nameSpace">The namespace.</param>
     /// <param name="className">Name of the class.</param>
-    internal TypeName(string nameSpace, string className) {
+    internal TypeName(string nameSpace, string className, List<int> genericArgCounts=null) {
       Namespace = nameSpace;
       ClassName = className;
@@ -109 +116 @@
       MemoryMagic = "";
       AssemblyAttribues = new Dictionary<string, string>();
+      if (genericArgCounts != null)
+        GenericArgCounts = genericArgCounts.ToList();
     }
 
     internal TypeName(TypeName typeName, string className = null, string nameSpace = null) {
-      Namespace = typeName.Namespace;
-      ClassName = typeName.ClassName;
+      Namespace = nameSpace ?? typeName.Namespace;
+      ClassName = className ?? typeName.ClassName;
       GenericArgs = new List<TypeName>(typeName.GenericArgs);
       AssemblyAttribues = new Dictionary<string, string>(typeName.AssemblyAttribues);
@@ -119 +128 @@
       AssemblyName = typeName.AssemblyName;
       IsReference = typeName.IsReference;
-      if (nameSpace != null)
-        Namespace = nameSpace;
-      if (className != null)
-        ClassName = className;
+      if (typeName.GenericArgCounts != null)
+        GenericArgCounts = typeName.GenericArgCounts.ToList();
     }
 
@@ -148 +155 @@
     /// </returns>
     public string ToString(bool full, bool includeAssembly) {
-      StringBuilder sb = new StringBuilder();
+      var sb = new StringBuilder();
       if (!string.IsNullOrEmpty(Namespace))
         sb.Append(Namespace).Append('.');
-      sb.Append(ClassName);
+      if (GenericArgCounts != null) {
+        sb.Append(string.Join("+",
+          ClassName
+          .Split('+')
+          .Zip(GenericArgCounts, (n, c) =>
+            c > 0 ? String.Format("{0}`{1}", n, c) : n)));
+      } else {
+        sb.Append(ClassName);
+        if (IsGeneric)
+          sb.Append('`').Append(GenericArgs.Count);
+      }
       if (IsGeneric) {
-        sb.Append('`').Append(GenericArgs.Count).Append('[');
-        bool first = true;
-        foreach (TypeName t in GenericArgs) {
-          if (first)
-            first = false;
-          else
-            sb.Append(',');
-          sb.Append('[').Append(t.ToString(full)).Append(']');
-        }
+        sb.Append('[');
+        sb.Append(String.Join(",", GenericArgs.Select(a =>
+          string.Format("[{0}]", a.ToString(full)))));
         sb.Append(']');
       }
@@ -174 +185 @@
     }
 
-    public string GetTypeNameInCode(HashSet<string> omitNamespaces) {
-      StringBuilder sb = new StringBuilder();
-      if (!string.IsNullOrEmpty(Namespace) && omitNamespaces == null || !omitNamespaces.Contains(Namespace))
-        sb.Append(Namespace).Append('.');
-      sb.Append(ClassName);
-      if (IsGeneric) {
-        sb.Append("<");
-        sb.Append(
-          string.Join(", ",
-            GenericArgs
-              .Select(a => a.GetTypeNameInCode(omitNamespaces))
-              .ToArray()));
-        sb.Append(">");
+    private IEnumerable<string> GetNestedClassesInCode(HashSet<string> omitNamespaces, bool includeAllNamespaces) {
+      var i = 0;
+      foreach (var pair in ClassName.Split('+').Zip(GenericArgCounts, (n, c) => new {n, c})) {
+        if (pair.c == 0) {
+          yield return pair.n;
+        }
+        else {
+          yield return string.Format("{0}<{1}>",
+            pair.n,
+            string.Join(",",
+              GenericArgs
+                .GetRange(i, pair.c)
+                .Select(a => a.GetTypeNameInCode(omitNamespaces, includeAllNamespaces))));
+          i += pair.c;
+        }
+      }
+    }
+
+    private string GetTypeNameInCode(HashSet<string> omitNamespaces, bool includeNamespaces) {
+      var sb = new StringBuilder();
+      if (!string.IsNullOrEmpty(Namespace) &&
+            (omitNamespaces == null && includeNamespaces) ||
+             omitNamespaces != null && !omitNamespaces.Contains(Namespace))
+          sb.Append(Namespace).Append('.');
+      if (GenericArgCounts != null) {
+        sb.Append(string.Join(".", GetNestedClassesInCode(omitNamespaces, includeNamespaces)));
+      } else {
+        sb.Append(ClassName);
+        if (IsGeneric) {
+          sb.Append("<");
+          sb.Append(
+            string.Join(", ",
+                        GenericArgs
+                          .Select(a => a.GetTypeNameInCode(omitNamespaces, includeNamespaces))
+                          .ToArray()));
+          sb.Append(">");
+        }
       }
       sb.Append(MemoryMagic);
@@ -192 +227 @@
     }
 
-    public string GetTypeNameInCode(bool includeAllNamespaces) {
-      StringBuilder sb = new StringBuilder();
-      if (includeAllNamespaces)
-        sb.Append(Namespace).Append('.');
-      sb.Append(ClassName);
-      if (IsGeneric) {
-        sb.Append("<");
-        sb.Append(
-          string.Join(", ",
-            GenericArgs
-              .Select(a => a.GetTypeNameInCode(includeAllNamespaces))
-              .ToArray()));
-        sb.Append(">");
-      }
-      sb.Append(MemoryMagic);
-      return sb.ToString();
+    public string GetTypeNameInCode(HashSet<string> omitNamespaces) {
+      return GetTypeNameInCode(omitNamespaces, false);
+    }
+
+    public string GetTypeNameInCode(bool includeNamespaces) {
+      return GetTypeNameInCode(null, includeNamespaces);
     }