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

Timestamp:

02/02/10 16:24:12 (15 years ago)

Author:

epitzer

Message:

incorporate persistence fixes from test branch (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeNameParser.cs (modified) (3 diffs)

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

@@ -31 +31 @@
       Version := '\d+\.\d+\.\d+\.\d+)'
 
-      IDENTIFIER = [a-zA-Z][a-ZA-Z0-9]*
+      IDENTIFIER = [_a-zA-Z][_a-ZA-Z0-9]*
     */
 
@@ -38 +38 @@
       private static Dictionary<string, string> tokens =
         new Dictionary<string, string> {
+          {"-", "DASH"},
           {"&", "AMPERSAND"},
           {".", "DOT"},
-          {"-", "DASH"},
           {"+", "PLUS"},
           {",", "COMMA"},
@@ -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 TokenRegex = new Regex("[-&.+,\\[\\]* =`]|\\d+|[_a-zA-Z][_a-zA-Z0-9]*");
       public string Name { get; private set; }
       public string Value { get; private set; }