Peformance: Utilize compiler hints.

Author: StringEpsilon

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Future
+- Improved tokenization performance by allowing and forcing more aggresive inlining.
+  - In my benchmark, this is about 8 to 9% faster
+
 # 1.3.0
 - Removed net5 support and added net7 support
 

PhpSerializerNET/Extensions/StringExtensions.cs

@@ -0,0 +1,18 @@
+using System.Globalization;
+
+namespace PhpSerializerNET;
+
+internal static class StringExtensions {
+	internal static double PhpToDouble(this string value) {
+		return value switch {
+			"INF" => double.PositiveInfinity,
+			"-INF" => double.NegativeInfinity,
+			"NAN" => double.NaN,
+			_ => double.Parse(value, CultureInfo.InvariantCulture),
+		};
+	}
+
+	internal static bool PhpToBool(this string value) => value == "1";
+
+	internal static long PhpToLong(this string value) => long.Parse(value, CultureInfo.InvariantCulture);
+}

PhpSerializerNET/PhpDeserializer.cs

@@ -56,14 +56,14 @@ public static void ClearPropertyInfoCache() {
 	private object DeserializeToken(PhpSerializeToken token) {
 		switch (token.Type) {
 			case PhpSerializerType.Boolean:
-				return token.ToBool();
+				return token.Value.PhpToBool();
 			case PhpSerializerType.Integer:
-				return token.ToLong();
+				return token.Value.PhpToLong();
 			case PhpSerializerType.Floating:
-				return token.ToDouble();
+				return token.Value.PhpToDouble();
 			case PhpSerializerType.String:
 				if (this._options.NumberStringToBool && (token.Value == "0" || token.Value == "1")) {
-					return token.ToBool();
+					return token.Value.PhpToBool();
 				}
 				return token.Value;
 			case PhpSerializerType.Array:
@@ -173,7 +173,7 @@ private object DeserializeInteger(Type targetType, PhpSerializeToken token) {
 
 	private object DeserializeDouble(Type targetType, PhpSerializeToken token) {
 		if (targetType == typeof(double) || targetType == typeof(float)) {
-			return token.ToDouble();
+			return token.Value.PhpToDouble();
 		}
 
 		token.Value = token.Value switch {
@@ -186,15 +186,15 @@ private object DeserializeDouble(Type targetType, PhpSerializeToken token) {
 
 	private static object DeserializeBoolean(Type targetType, PhpSerializeToken token) {
 		if (targetType == typeof(bool) || targetType == typeof(bool?)) {
-			return token.ToBool();
+			return token.Value.PhpToBool();
 		}
 		Type underlyingType = targetType;
 		if (targetType.IsNullableReferenceType()) {
 			underlyingType = targetType.GenericTypeArguments[0];
 		}
 
 		if (underlyingType.IsIConvertible()) {
-			return ((IConvertible)token.ToBool()).ToType(underlyingType, CultureInfo.InvariantCulture);
+			return ((IConvertible)token.Value.PhpToBool()).ToType(underlyingType, CultureInfo.InvariantCulture);
 		} else {
 			throw new DeserializationException(
 				$"Can not assign value \"{token.Value}\" (at position {token.Position}) to target type of {targetType.Name}."
@@ -250,7 +250,7 @@ private object DeserializeTokenFromSimpleType(Type givenType, PhpSerializeToken
 
 			if (targetType == typeof(bool)) {
 				if (_options.NumberStringToBool && token.Value is "0" or "1") {
-					return token.ToBool();
+					return token.Value.PhpToBool();
 				}
 			}
 
@@ -319,7 +319,7 @@ private object MakeObject(Type targetType, PhpSerializeToken token) {
 			if (token.Children[i].Type == PhpSerializerType.String) {
 				propertyName = this._options.CaseSensitiveProperties ? token.Children[i].Value : token.Children[i].Value.ToLower();
 			} else if (token.Children[i].Type == PhpSerializerType.Integer) {
-				propertyName = token.Children[i].ToLong();
+				propertyName = token.Children[i].Value.PhpToLong();
 			} else {
 				throw new DeserializationException(
 					$"Error encountered deserizalizing an object of type '{targetType.FullName}': " +
@@ -450,7 +450,7 @@ private object MakeCollection(PhpSerializeToken token) {
 				isList = false;
 				break;
 			} else {
-				var key = token.Children[i].ToLong();
+				var key = token.Children[i].Value.PhpToLong();
 				if (i == 0 || key == previousKey + 1) {
 					previousKey = key;
 				} else {

PhpSerializerNET/PhpSerializeToken.cs

@@ -3,54 +3,14 @@ This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 **/
-
-using System.Globalization;
-
 namespace PhpSerializerNET;
 
 /// <summary>
 /// PHP Serialization format token. Holds type, length, position (of the token in the input string) and child information.
 /// </summary>
-internal struct PhpSerializeToken {
-	internal PhpSerializerType Type;
-	internal string Value;
-
-	internal PhpSerializeToken[] Children;
-	internal int Position;
-
-	/// <summary>
-	/// Convert the token value to a <see cref="long"/>.
-	/// </summary>
-	/// <returns>
-	/// The token value as a <see cref="long"/>.
-	/// </returns>
-	internal long ToLong() {
-		return long.Parse(this.Value, CultureInfo.InvariantCulture);
-	}
-
-	/// <summary>
-	/// Convert the token value to a <see cref="double"/>.
-	/// </summary>
-	/// <returns>
-	/// The token value as a <see cref="double"/>.
-	/// </returns>
-	internal double ToDouble() {
-		return this.Value switch {
-			"INF" => double.PositiveInfinity,
-			"-INF" => double.NegativeInfinity,
-			"NAN" => double.NaN,
-			_ => double.Parse(this.Value, CultureInfo.InvariantCulture),
-		};
-		;
-	}
-
-	/// <summary>
-	/// Convert the token value to a <see cref="bool"/>
-	/// </summary>
-	/// <returns>
-	/// The token value as a <see cref="bool"/>
-	/// </returns>
-	internal bool ToBool() {
-		return this.Value == "1";
-	}
-}
+internal record struct PhpSerializeToken(
+	PhpSerializerType Type,
+	int Position,
+	string Value,
+	PhpSerializeToken[] Children
+);