Changeset 9018

Timestamp:

12/10/12 14:32:49 (12 years ago)

Author:

ascheibe

Message:

#1990 fixed crash in the debug engine: use the FullName of a type instead of ToString

Location:

trunk/sources

Files:

• HeuristicLab.DebugEngine/3.3/Utils.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Auxiliary/TypeNameParser.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.DebugEngine/3.3/Utils.cs

@@ -36 +36 @@
       if (obj == null)
         return "null";
-      return TypeNameParser.Parse(obj.GetType().ToString()).GetTypeNameInCode(true);
+      return TypeNameParser.Parse(obj.GetType().FullName).GetTypeNameInCode(true);
     }
 

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -89 +89 @@
 
     private class Token {
-      public enum Symbol {None, Dash, Ampersand, Dot, Plus, Comma, OpenBracket, CloseBracket, Asterisk, Space, Equals, Backtick}
+      public enum Symbol { None, Dash, Ampersand, Dot, Plus, Comma, OpenBracket, CloseBracket, Asterisk, Space, Equals, Backtick }
       private static readonly Dictionary<string, Symbol> TOKENS =
         new Dictionary<string, Symbol> {
@@ -157 +157 @@
     /// <summary>
     /// Parses the specified typename string as obtained by
-    /// <c>System.Object.GetType().FullName"</c>.
+    /// <c>System.Object.GetType().FullName</c> or 
+    /// <c>System.Object.GetType().AssemblyQualifiedName</c>.
     /// </summary>
     /// <param name="s">The typename string.</param>
@@ -189 +190 @@
 
     private TypeName TransformSimpleTypeSpec() {
-      var nameSpace = new List<string> {ConsumeIdentifier()};
+      var nameSpace = new List<string> { ConsumeIdentifier() };
       while (ConsumeToken(Token.Symbol.Dot))
         nameSpace.Add(ConsumeIdentifier());
@@ -200 +201 @@
         ConsumeToken(Token.Symbol.Backtick) ? ConsumeNumber() : 0
       };
-      while(ConsumeToken(Token.Symbol.Plus)) {
+      while (ConsumeToken(Token.Symbol.Plus)) {
         className.Add(ConsumeIdentifier());
         genericArgCounts.Add(ConsumeToken(Token.Symbol.Backtick) ? ConsumeNumber() : 0);