Optimize search methods by signature

Author: xplicit

src/ServiceStack.Text/Common/DeserializeArray.cs

@@ -36,14 +36,15 @@ public static Func<string, ParseStringDelegate, object> GetParseFn(Type type)
             return (s, d) => func(new StringSegment(s), v => d(v.Value));
         }
 
+        private static readonly Type[] signature = {typeof(StringSegment), typeof(ParseStringSegmentDelegate)};
 
         public static Func<StringSegment, ParseStringSegmentDelegate, object> GetParseStringSegmentFn(Type type)
         {
             ParseArrayOfElementsDelegate parseFn;
             if (ParseDelegateCache.TryGetValue(type, out parseFn)) return parseFn.Invoke;
 
             var genericType = typeof(DeserializeArrayWithElements<,>).MakeGenericType(type, typeof(TSerializer));
-            var mi = genericType.GetStaticMethod("ParseGenericArray", new [] {typeof(StringSegment), typeof(ParseStringSegmentDelegate)});
+            var mi = genericType.GetStaticMethod("ParseGenericArray", signature);
             parseFn = (ParseArrayOfElementsDelegate)mi.CreateDelegate(typeof(ParseArrayOfElementsDelegate));
 
             Dictionary<Type, ParseArrayOfElementsDelegate> snapshot, newCache;

src/ServiceStack.Text/Common/DeserializeBuiltin.cs

@@ -124,7 +124,7 @@ private static ParseStringSegmentDelegate GetParseStringSegmentFn()
                     case TypeCode.Double:
                         return value => value.IsNullOrEmpty() ? (double?)null : double.Parse(value.Value, CultureInfo.InvariantCulture);
                     case TypeCode.Decimal:
-                        return value => value.IsNullOrEmpty() ? (decimal?)null : decimal.Parse(value.Value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture);
+                        return value => value.IsNullOrEmpty() ? (decimal?)null : value.ParseDecimal(allowThousands: true);
                     case TypeCode.DateTime:
                         return value => DateTimeSerializer.ParseShortestNullableXsdDateTime(value.Value);
                     case TypeCode.Char:

src/ServiceStack.Text/Common/DeserializeDictionary.cs

@@ -291,6 +291,7 @@ public static object ParseDictionaryType(string value, Type createMapType, Type[
             ParseDictionaryType(new StringSegment(value), createMapType, argTypes,
                 v => keyParseFn(v.Value), v => valueParseFn(v.Value));
 
+        static readonly Type[] signature = {typeof(StringSegment), typeof(Type), typeof(ParseStringSegmentDelegate), typeof(ParseStringSegmentDelegate)};
 
         public static object ParseDictionaryType(StringSegment value, Type createMapType, Type[] argTypes,
             ParseStringSegmentDelegate keyParseFn, ParseStringSegmentDelegate valueParseFn)
@@ -301,8 +302,7 @@ public static object ParseDictionaryType(StringSegment value, Type createMapType
             if (ParseDelegateCache.TryGetValue(key, out parseDelegate))
                 return parseDelegate(value, createMapType, keyParseFn, valueParseFn);
 
-            var mi = typeof(DeserializeDictionary<TSerializer>).GetStaticMethod("ParseDictionary",
-                new [] {typeof(StringSegment), typeof(Type), typeof(ParseStringSegmentDelegate), typeof(ParseStringSegmentDelegate)});
+            var mi = typeof(DeserializeDictionary<TSerializer>).GetStaticMethod("ParseDictionary", signature);
             var genericMi = mi.MakeGenericMethod(argTypes);
             parseDelegate = (ParseDictionaryDelegate)genericMi.MakeDelegate(typeof(ParseDictionaryDelegate));
 

src/ServiceStack.Text/Common/DeserializeKeyValuePair.cs

@@ -114,6 +114,7 @@ public static object ParseKeyValuePairType(string value, Type createMapType, Typ
             ParseKeyValuePairType(new StringSegment(value), createMapType, argTypes,
                 v => keyParseFn(v.Value), v => valueParseFn(v.Value));
 
+        static readonly Type[] signature = { typeof(StringSegment), typeof(Type), typeof(ParseStringSegmentDelegate), typeof(ParseStringSegmentDelegate) };
 
         public static object ParseKeyValuePairType(StringSegment value, Type createMapType, Type[] argTypes,
             ParseStringSegmentDelegate keyParseFn, ParseStringSegmentDelegate valueParseFn)
@@ -124,8 +125,7 @@ public static object ParseKeyValuePairType(StringSegment value, Type createMapTy
             if (ParseDelegateCache.TryGetValue(key, out parseDelegate))
                 return parseDelegate(value, createMapType, keyParseFn, valueParseFn);
 
-            var mi = typeof(DeserializeKeyValuePair<TSerializer>).GetStaticMethod("ParseKeyValuePair",
-                new [] {typeof(StringSegment), typeof(Type), typeof(ParseStringSegmentDelegate), typeof(ParseStringSegmentDelegate)});
+            var mi = typeof(DeserializeKeyValuePair<TSerializer>).GetStaticMethod("ParseKeyValuePair", signature);
             var genericMi = mi.MakeGenericMethod(argTypes);
             parseDelegate = (ParseKeyValuePairDelegate)genericMi.MakeDelegate(typeof(ParseKeyValuePairDelegate));
 

src/ServiceStack.Text/Common/DeserializeListWithElements.cs

@@ -42,6 +42,8 @@ public static Func<string, Type, ParseStringDelegate, object> GetListTypeParseFn
             return (s, t, d) => func(new StringSegment(s), t, v => d(v.Value));
         }
 
+        private static readonly Type[] signature = {typeof(StringSegment), typeof(Type), typeof(ParseStringSegmentDelegate)};
+
         public static Func<StringSegment, Type, ParseStringSegmentDelegate, object> GetListTypeParseStringSegmentFn(
             Type createListType, Type elementType, ParseStringSegmentDelegate parseFn)
         {
@@ -50,7 +52,7 @@ public static Func<StringSegment, Type, ParseStringSegmentDelegate, object> GetL
                 return parseDelegate.Invoke;
 
             var genericType = typeof(DeserializeListWithElements<,>).MakeGenericType(elementType, typeof(TSerializer));
-            var mi = genericType.GetStaticMethod("ParseGenericList", new [] {typeof(StringSegment), typeof(Type), typeof(ParseStringSegmentDelegate)});
+            var mi = genericType.GetStaticMethod("ParseGenericList", signature);
             parseDelegate = (ParseListDelegate)mi.MakeDelegate(typeof(ParseListDelegate));
 
             Dictionary<Type, ParseListDelegate> snapshot, newCache;

src/ServiceStack.Text/Json/JsonTypeSerializer.cs

@@ -435,6 +435,7 @@ private static StringSegment UnEscapeJsonString(StringSegment json, ref int inde
         {
             if (json.IsNullOrEmpty()) return json;
             var jsonLength = json.Length;
+
             var firstChar = json.GetChar(index);
             if (firstChar == JsonUtils.QuoteChar)
             {
@@ -443,13 +444,19 @@ private static StringSegment UnEscapeJsonString(StringSegment json, ref int inde
                 //MicroOp: See if we can short-circuit evaluation (to avoid StringBuilder)
                 var strEndPos = json.IndexOfAny(IsSafeJsonChars, index);
                 if (strEndPos == -1) return json.Subsegment(index, jsonLength - index);
+
                 if (json.GetChar(strEndPos) == JsonUtils.QuoteChar)
                 {
                     var potentialValue = json.Subsegment(index, strEndPos - index);
                     index = strEndPos + 1;
                     return potentialValue;
                 }
             }
+            else
+            {
+                var strEndPos = json.IndexOfAny(IsSafeJsonChars, index);
+                if (strEndPos == -1) return json.Subsegment(index, jsonLength - index);
+            }
 
             return Unescape(json);
         }