Changeset 2859 for trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary

Timestamp:

02/24/10 12:36:43 (15 years ago)

Author:

epitzer

Message:

fix handling of PublicKeyToken in TypeNameParser (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary

Files:

• TypeName.cs (modified) (1 diff)
• TypeNameParser.cs (modified) (6 diffs)

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

@@ -31 +31 @@
     public string ToString(bool full, bool includeAssembly) {
       StringBuilder sb = new StringBuilder();
-      sb.Append(Namespace).Append('.').Append(ClassName);
+      if (!string.IsNullOrEmpty(Namespace))
+        sb.Append(Namespace).Append('.');
+      sb.Append(ClassName);
       if (IsGeneric) {
         sb.Append('`').Append(GenericArgs.Count).Append('[');

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

@@ -29 +29 @@
                  |  'Culture=[a-zA-F0-9]+'
 
-      Version := '\d+\.\d+\.\d+\.\d+)'
+      Version := \d+\.\d+\.\d+\.\d+
 
       IDENTIFIER = [_a-zA-Z][_a-ZA-Z0-9]*
@@ -50 +50 @@
           {"`", "BACKTICK"} };
       private static Regex NumberRegex = new Regex("^\\d+$");
-      private static Regex TokenRegex = new Regex("[-&.+,\\[\\]* =`]|\\d+|[_a-zA-Z][_a-zA-Z0-9]*");
+      private static Regex IdentifierRegex = new Regex("^[_a-zA-Z][_a-zA-Z0-9]*$");
+      private static Regex TokenRegex = new Regex("[-&.+,\\[\\]* =`]|[a-f0-9]+|\\d+|[_a-zA-Z][_a-zA-Z0-9]*");
       public string Name { get; private set; }
       public string Value { get; private set; }
+      public bool IsIdentifier { get; private set; }
       public int? Number { get; private set; }
       public int Position { get; private set; }
@@ -63 +65 @@
         } else {
           Value = value;
+          IsIdentifier = IdentifierRegex.IsMatch(value);
         }
       }
@@ -239 +242 @@
     private KeyValuePair<string, string> ConsumeAssignment(string name) {
       ConsumeToken("EQUALS", true);
-      return new KeyValuePair<string, string>(name, ConsumeIdentifier());
+      return new KeyValuePair<string, string>(name, ConsumeToken());
     }
 
@@ -273 +276 @@
       if (tokens.Count == 0)
         return false;
-      if (tokens.Peek().Value == value) {
+      if (tokens.Peek().Value == value && tokens.Peek().IsIdentifier) {
         tokens.Dequeue();
         return true;
@@ -288 +291 @@
       if (tokens.Count == 0)
         throw new ParseError("End of input while expecting identifier");
+      if (tokens.Peek().Value != null && tokens.Peek().IsIdentifier)
+        return tokens.Dequeue().Value;
+      throw new ParseError(String.Format(
+        "Identifier expected, found \"{0}\" instead",
+        tokens.Peek().ToString()));
+    }
+
+    private string ConsumeToken() {
+      if (tokens.Count == 0)
+        throw new ParseError("End of input while expecting token");
       if (tokens.Peek().Value != null)
         return tokens.Dequeue().Value;
       throw new ParseError(String.Format(
-        "Identifier expected, found \"{0}\" instead",
+        "Token expected, found \"{0}\" instead",
         tokens.Peek().ToString()));
     }