Chore: A lot of tiny code fixes.

StringEpsilon · StringEpsilon · commit 0cb8efa1ed3c · 2024-08-12T21:30:04.000+02:00
diff --git a/PhpSerializerNET.Test/Serialize/DynamicSerialization.cs b/PhpSerializerNET.Test/Serialize/DynamicSerialization.cs
@@ -29,7 +29,6 @@ public void SerializesPhpDynamicObjectWithClassname() {
 		data.SetClassName("phpDynamicObject");
 		data.Foo = "a";
 		data.Bar = 3.1415;
-		System.Console.WriteLine(data.Bar);
 		Assert.Equal(
 			"O:16:\"phpDynamicObject\":2:{s:3:\"Foo\";s:1:\"a\";s:3:\"Bar\";d:3.1415;}",
 			PhpSerialization.Serialize(data)
diff --git a/PhpSerializerNET/Deserialization/PhpDeserializer.cs b/PhpSerializerNET/Deserialization/PhpDeserializer.cs
@@ -127,12 +127,7 @@ private object DeserializeInteger(Type targetType, in PhpToken token) {
 			TypeCode.UInt32 => uint.Parse(token.Value.GetSlice(_input), CultureInfo.InvariantCulture),
 			TypeCode.UInt64 => ulong.Parse(token.Value.GetSlice(_input), CultureInfo.InvariantCulture),
 			TypeCode.SByte => sbyte.Parse(token.Value.GetSlice(_input), CultureInfo.InvariantCulture),
-			_ => this.DeserializeTokenFromSimpleType(
-				targetType,
-				token.Type,
-				this.GetString(token),
-				token.Position
-			),
+			_ => this.DeserializeTokenFromSimpleType(targetType, token.Type, this.GetString(token), token.Position),
 		};
 	}
 
@@ -143,7 +138,7 @@ private object DeserializeDouble(Type targetType, in PhpToken token) {
 
 		string value = this.GetString(token);
 		if (value == "INF") {
-			value =  double.PositiveInfinity.ToString(CultureInfo.InvariantCulture);
+			value = double.PositiveInfinity.ToString(CultureInfo.InvariantCulture);
 		} else if (value == "-INF") {
 			value = double.NegativeInfinity.ToString(CultureInfo.InvariantCulture);
 		}
@@ -159,13 +154,12 @@ private object DeserializeBoolean(Type targetType, in PhpToken token) {
 			underlyingType = targetType.GenericTypeArguments[0];
 		}
 
-		if (underlyingType.IsIConvertible()) {
-			return ((IConvertible)token.Value.GetBool(_input)).ToType(underlyingType, CultureInfo.InvariantCulture);
-		} else {
+		if (!underlyingType.IsIConvertible()) {
 			throw new DeserializationException(
 				$"Can not assign value \"{this.GetString(token)}\" (at position {token.Position}) to target type of {targetType.Name}."
 			);
 		}
+		return ((IConvertible)token.Value.GetBool(_input)).ToType(underlyingType, CultureInfo.InvariantCulture);
 	}
 
 	private object DeserializeTokenFromSimpleType(
@@ -351,7 +345,7 @@ private object MakeObject(Type targetType, in PhpToken token) {
 						DeserializeToken(property.PropertyType)
 					);
 				} catch (Exception exception) {
-					var valueToken = _tokens[_currentToken-1];
+					var valueToken = _tokens[_currentToken - 1];
 					throw new DeserializationException(
 						$"Exception encountered while trying to assign '{this.GetString(valueToken)}' to {targetType.Name}.{property.Name}. See inner exception for details.",
 						exception
@@ -368,24 +362,24 @@ private object MakeArray(Type targetType, in PhpToken token) {
 		var elementType = targetType.GetElementType() ?? throw new InvalidOperationException("targetType.GetElementType() returned null");
 		Array result = Array.CreateInstance(elementType, token.Length);
 
-		var arrayIndex = 0;
-		for (int i = 0; i < token.Length; i++) {
-			_currentToken++;
-			result.SetValue(
-				elementType == typeof(object)
-					? DeserializeToken()
-					: DeserializeToken(elementType),
-				arrayIndex
-			);
-			arrayIndex++;
+		if (elementType == typeof(object)) {
+			for (int i = 0; i < token.Length; i++) {
+				_currentToken++;
+				result.SetValue(DeserializeToken(), i);
+			}
+		} else {
+			for (int i = 0; i < token.Length; i++) {
+				_currentToken++;
+				result.SetValue(DeserializeToken(elementType), i);
+			}
 		}
 		return result;
 	}
 
 	private object MakeList(Type targetType, in PhpToken token) {
-		for (int i = 0; i < token.Length * 2; i+=2) {
-			if (this._tokens[_currentToken+i].Type != PhpDataType.Integer) {
-				var badToken = this._tokens[_currentToken+i];
+		for (int i = 0; i < token.Length * 2; i += 2) {
+			if (this._tokens[_currentToken + i].Type != PhpDataType.Integer) {
+				var badToken = this._tokens[_currentToken + i];
 				throw new DeserializationException(
 					$"Can not deserialize array at position {token.Position} to list: " +
 					$"It has a non-integer key '{this.GetString(badToken)}' at element {i} (position {badToken.Position})."
@@ -396,24 +390,23 @@ private object MakeList(Type targetType, in PhpToken token) {
 		if (targetType.IsArray) {
 			return MakeArray(targetType, token);
 		}
-		var result = (IList)Activator.CreateInstance(targetType, token.Length);
-		if (result == null) {
+		if (Activator.CreateInstance(targetType, token.Length) is not IList result) {
 			throw new NullReferenceException("Activator.CreateInstance(targetType) returned null");
 		}
-		Type itemType;
-		if (targetType.GenericTypeArguments.Length >= 1) {
-			itemType = targetType.GenericTypeArguments[0];
-		} else {
-			itemType = typeof(object);
-		}
+		Type itemType = targetType.GenericTypeArguments.Length >= 1
+			? targetType.GenericTypeArguments[0]
+			: typeof(object);
 
-		for (int i = 0; i < token.Length; i++) {
-			_currentToken++;
-			result.Add(
-				itemType == typeof(object)
-					? DeserializeToken()
-					: DeserializeToken(itemType)
-			);
+		if (itemType == typeof(object)) {
+			for (int i = 0; i < token.Length; i++) {
+				_currentToken++;
+				result.Add(DeserializeToken());
+			}
+		} else {
+			for (int i = 0; i < token.Length; i++) {
+				_currentToken++;
+				result.Add(DeserializeToken(itemType));
+			}
 		}
 		return result;
 	}
@@ -425,10 +418,7 @@ private object MakeDictionary(Type targetType, in PhpToken token) {
 		}
 		if (!targetType.GenericTypeArguments.Any()) {
 			for (int i = 0; i < token.Length; i++) {
-				result.Add(
-					DeserializeToken(),
-					DeserializeToken()
-				);
+				result.Add(DeserializeToken(), DeserializeToken());
 			}
 			return result;
 		}
@@ -455,12 +445,12 @@ private object MakeCollection(in PhpToken token) {
 		long previousKey = -1;
 		bool isList = true;
 		bool consecutive = true;
-		for (int i = 0; i < token.Length*2; i+=2) {
-			if (this._tokens[_currentToken+i].Type != PhpDataType.Integer) {
+		for (int i = 0; i < token.Length * 2; i += 2) {
+			if (this._tokens[_currentToken + i].Type != PhpDataType.Integer) {
 				isList = false;
 				break;
 			} else {
-				var key = this._tokens[_currentToken+i].Value.GetLong(_input);
+				var key = this._tokens[_currentToken + i].Value.GetLong(_input);
 				if (i == 0 || key == previousKey + 1) {
 					previousKey = key;
 				} else {
@@ -471,10 +461,7 @@ private object MakeCollection(in PhpToken token) {
 		if (!isList || (this._options.UseLists == ListOptions.Default && consecutive == false)) {
 			var result = new Dictionary<object, object>(token.Length);
 			for (int i = 0; i < token.Length; i++) {
-				result.Add(
-					this.DeserializeToken(),
-					this.DeserializeToken()
-				);
+				result.Add(this.DeserializeToken(), this.DeserializeToken());
 			}
 			return result;
 		} else {
diff --git a/PhpSerializerNET/Deserialization/PhpToken.cs b/PhpSerializerNET/Deserialization/PhpToken.cs
@@ -13,8 +13,8 @@ internal readonly struct PhpToken {
 	internal readonly PhpDataType Type;
 	internal readonly int Position;
 	internal readonly int Length;
-
 	internal readonly ValueSpan Value;
+
 	internal PhpToken(PhpDataType type, int position, in ValueSpan value, int length = 0) {
 		this.Type = type;
 		this.Position = position;
diff --git a/PhpSerializerNET/Deserialization/PhpTokenizer.cs b/PhpSerializerNET/Deserialization/PhpTokenizer.cs
@@ -25,23 +25,19 @@ private PhpTokenizer(ReadOnlySpan<byte> input, Span<PhpToken> array) {
 		this._tokenPosition = 0;
 	}
 
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private void Advance() {
 		this._position++;
 	}
 
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private void Advance(int positons) {
 		this._position += positons;
 	}
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private ValueSpan GetNumbers() {
 		int start = this._position;
-		while (this._input[this._position] != (byte)';') {
-			this._position++;
-		}
-		return new ValueSpan(start, this._position-start);
+		while (this._input[++this._position] != (byte)';') { }
+		return new ValueSpan(start, this._position - start);
 	}
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -50,9 +46,7 @@ private int GetLength() {
 			return _input[_position++] - 48;
 		}
 		int start = this._position;
-		while (this._input[this._position] != (byte)':') {
-			this._position++;
-		}
+		while (this._input[++this._position] != (byte)':') { }
 		return int.Parse(this._input.Slice(start, this._position - start), CultureInfo.InvariantCulture);
 	}
 
@@ -84,12 +78,6 @@ internal void GetToken() {
 		};
 	}
 
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	private void GetNullToken() {
-		this._tokens[this._tokenPosition++] = new PhpToken(PhpDataType.Null, _position - 1, ValueSpan.Empty);
-		this.Advance();
-	}
-
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private void GetBooleanToken() {
 		this.Advance();
diff --git a/PhpSerializerNET/Deserialization/ValueSpan.cs b/PhpSerializerNET/Deserialization/ValueSpan.cs
@@ -13,15 +13,15 @@ internal readonly struct ValueSpan {
 	private static ValueSpan _empty = new ValueSpan(0,0);
 	internal readonly int Start;
 	internal readonly int Length;
-	public ValueSpan(int start, int length) {
+
+	internal ValueSpan(int start, int length) {
 		this.Start = start;
 		this.Length = length;
 	}
 
-	public static ValueSpan Empty => _empty;
-
-	public ReadOnlySpan<byte> GetSlice(ReadOnlySpan<byte> input) => input.Slice(this.Start, this.Length);
+	internal static ValueSpan Empty => _empty;
 
+	internal ReadOnlySpan<byte> GetSlice(ReadOnlySpan<byte> input) => input.Slice(this.Start, this.Length);
 
 	internal double GetDouble(ReadOnlySpan<byte> input) {
 		var value = input.Slice(Start, Length);
