Fix peeked value unboxing

xPaw · xPaw · commit a3dec5e8781b · 2026-03-31T13:18:11.000+03:00
diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KVTokenReader.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KVTokenReader.cs
@@ -11,7 +11,7 @@ public KVTokenReader(TextReader textReader)
 
         protected TextReader textReader;
         protected bool disposed;
-        protected int? peekedNext;
+        int peekedNext = -1;
 
         int lineOffset;
         int columnOffset;
@@ -40,10 +40,10 @@ protected bool TryGetNext(out char next)
         {
             int nextValue;
 
-            if (peekedNext.HasValue)
+            if (peekedNext != -1)
             {
-                nextValue = peekedNext.Value;
-                peekedNext = null;
+                nextValue = peekedNext;
+                peekedNext = -1;
             }
             else
             {
@@ -72,9 +72,9 @@ protected bool TryGetNext(out char next)
 
         protected int Peek()
         {
-            if (peekedNext.HasValue)
+            if (peekedNext != -1)
             {
-                return peekedNext.Value;
+                return peekedNext;
             }
 
             var next = textReader.Read();

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public KVTokenReader(TextReader textReader)`
`11`	`11`
`12`	`12`	`protected TextReader textReader;`
`13`	`13`	`protected bool disposed;`
`14`		`- protected int? peekedNext;`
	`14`	`+ int peekedNext = -1;`
`15`	`15`
`16`	`16`	`int lineOffset;`
`17`	`17`	`int columnOffset;`
`@@ -40,10 +40,10 @@ protected bool TryGetNext(out char next)`
`40`	`40`	`{`
`41`	`41`	`int nextValue;`
`42`	`42`
`43`		`- if (peekedNext.HasValue)`
	`43`	`+ if (peekedNext != -1)`
`44`	`44`	`{`
`45`		`- nextValue = peekedNext.Value;`
`46`		`- peekedNext = null;`
	`45`	`+ nextValue = peekedNext;`
	`46`	`+ peekedNext = -1;`
`47`	`47`	`}`
`48`	`48`	`else`
`49`	`49`	`{`
`@@ -72,9 +72,9 @@ protected bool TryGetNext(out char next)`
`72`	`72`
`73`	`73`	`protected int Peek()`
`74`	`74`	`{`
`75`		`- if (peekedNext.HasValue)`
	`75`	`+ if (peekedNext != -1)`
`76`	`76`	`{`
`77`		`- return peekedNext.Value;`
	`77`	`+ return peekedNext;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`var next = textReader.Read();`