Skip to content

Commit bc47917

Browse files
xPawxPaw
committed
Rebase
1 parent 49a7c7d commit bc47917

File tree

22 files changed

+72
-112
lines changed

22 files changed

+72
-112
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
* text=auto
22
*.cs diff=csharp
3-
4-
# Keep intended line endings to test parser
5-
*_crlf.kv3 eol=crlf
6-
*_lf.kv3 eol=lf

‎ValveKeyValue/ValveKeyValue.Test/Test Data/TextKV3/.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Keep intended line endings to test parser
2+
*.kv3 eol=lf
3+
*_crlf.kv3 eol=crlf

‎ValveKeyValue/ValveKeyValue.Test/Test Data/apisurface.txt‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class ValveKeyValue.KVArrayValue
3939
public bool Equals(object obj);
4040
protected void Finalize();
4141
public int get_Count();
42+
public ValveKeyValue.KVFlag get_Flag();
4243
public bool get_IsReadOnly();
4344
public ValveKeyValue.KVValue get_Item(int key);
4445
public ValveKeyValue.KVValue get_Item(string key);
@@ -52,6 +53,7 @@ public class ValveKeyValue.KVArrayValue
5253
protected object MemberwiseClone();
5354
public bool Remove(ValveKeyValue.KVValue item);
5455
public void RemoveAt(int index);
56+
public void set_Flag(ValveKeyValue.KVFlag value);
5557
public void set_Item(int key, ValveKeyValue.KVValue value);
5658
public bool ToBoolean(IFormatProvider provider);
5759
public byte ToByte(IFormatProvider provider);
@@ -77,12 +79,14 @@ public class ValveKeyValue.KVBinaryBlob
7779
public bool Equals(object obj);
7880
protected void Finalize();
7981
public Memory`1[[byte]] get_Bytes();
82+
public ValveKeyValue.KVFlag get_Flag();
8083
public ValveKeyValue.KVValue get_Item(string key);
8184
public ValveKeyValue.KVValueType get_ValueType();
8285
public int GetHashCode();
8386
public Type GetType();
8487
public TypeCode GetTypeCode();
8588
protected object MemberwiseClone();
89+
public void set_Flag(ValveKeyValue.KVFlag value);
8690
public bool ToBoolean(IFormatProvider provider);
8791
public byte ToByte(IFormatProvider provider);
8892
public char ToChar(IFormatProvider provider);
@@ -108,6 +112,8 @@ public class ValveKeyValue.KVDocument
108112
public bool Equals(object obj);
109113
protected void Finalize();
110114
public System.Collections.Generic.IEnumerable`1[[ValveKeyValue.KVObject]] get_Children();
115+
public System.Collections.Generic.IEnumerable`1[[ValveKeyValue.KVValue]] get_ChildrenValues();
116+
public ValveKeyValue.KVHeader get_Header();
111117
public ValveKeyValue.KVValue get_Item(string key);
112118
public string get_Name();
113119
public ValveKeyValue.KVValue get_Value();
@@ -119,6 +125,43 @@ public class ValveKeyValue.KVDocument
119125
public string ToString();
120126
}
121127

128+
public sealed enum ValveKeyValue.KVFlag
129+
{
130+
None = 0;
131+
Resource = 1;
132+
ResourceName = 2;
133+
Panorama = 3;
134+
SoundEvent = 4;
135+
SubClass = 5;
136+
137+
public int CompareTo(object target);
138+
public bool Equals(object obj);
139+
protected void Finalize();
140+
public int GetHashCode();
141+
public Type GetType();
142+
public TypeCode GetTypeCode();
143+
public bool HasFlag(Enum flag);
144+
protected object MemberwiseClone();
145+
public string ToString();
146+
public string ToString(IFormatProvider provider);
147+
public string ToString(string format);
148+
public string ToString(string format, IFormatProvider provider);
149+
}
150+
151+
public class ValveKeyValue.KVHeader
152+
{
153+
public bool Equals(object obj);
154+
protected void Finalize();
155+
public Guid get_Encoding();
156+
public Guid get_Format();
157+
public int GetHashCode();
158+
public Type GetType();
159+
protected object MemberwiseClone();
160+
public void set_Encoding(Guid value);
161+
public void set_Format(Guid value);
162+
public string ToString();
163+
}
164+
122165
public sealed class ValveKeyValue.KVIgnoreAttribute
123166
{
124167
public bool Equals(object obj);
@@ -138,6 +181,7 @@ public class ValveKeyValue.KVObject
138181
public bool Equals(object obj);
139182
protected void Finalize();
140183
public System.Collections.Generic.IEnumerable`1[[ValveKeyValue.KVObject]] get_Children();
184+
public System.Collections.Generic.IEnumerable`1[[ValveKeyValue.KVValue]] get_ChildrenValues();
141185
public ValveKeyValue.KVValue get_Item(string key);
142186
public string get_Name();
143187
public ValveKeyValue.KVValue get_Value();
@@ -221,6 +265,7 @@ public class ValveKeyValue.KVValue
221265
{
222266
public bool Equals(object obj);
223267
protected void Finalize();
268+
public ValveKeyValue.KVFlag get_Flag();
224269
public ValveKeyValue.KVValue get_Item(string key);
225270
public ValveKeyValue.KVValueType get_ValueType();
226271
public int GetHashCode();
@@ -249,6 +294,7 @@ public class ValveKeyValue.KVValue
249294
public static ValveKeyValue.KVValue op_Implicit(long value);
250295
public static ValveKeyValue.KVValue op_Implicit(string value);
251296
public static ValveKeyValue.KVValue op_Implicit(ulong value);
297+
public void set_Flag(ValveKeyValue.KVFlag value);
252298
public bool ToBoolean(IFormatProvider provider);
253299
public byte ToByte(IFormatProvider provider);
254300
public char ToChar(IFormatProvider provider);

‎ValveKeyValue/ValveKeyValue.Test/TextKV3/BasicKV3TestCases.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using NUnit.Framework;
2-
31
namespace ValveKeyValue.Test.TextKV3
42
{
53
class BasicKV3TestCases
@@ -27,7 +25,7 @@ public void DeserializesFlaggedValues()
2725
Assert.That(data["bar"].Flag, Is.EqualTo(KVFlag.Resource));
2826
Assert.That((string)data["bar"], Is.EqualTo("foo"));
2927

30-
Assert.That(data["multipleFlags"].Flag, Is.EqualTo(KVFlag.Resource | KVFlag.ResourceName | KVFlag.SubClass));
28+
Assert.That(data["multipleFlags"].Flag, Is.EqualTo(KVFlag.SubClass));
3129
Assert.That((string)data["multipleFlags"], Is.EqualTo("cool value"));
3230

3331
Assert.That(data["flaggedNumber"].Flag, Is.EqualTo(KVFlag.Panorama));
@@ -97,7 +95,7 @@ public void DeserializesArray()
9795

9896
var arrayValue = (KVArrayValue)data["arrayValue"];
9997

100-
Assert.That(arrayValue.Count, Is.EqualTo(2));
98+
Assert.That(arrayValue, Has.Count.EqualTo(2));
10199
Assert.That(arrayValue[0].ToString(), Is.EqualTo("a"));
102100
Assert.That(arrayValue[1].ToString(), Is.EqualTo("b"));
103101

@@ -111,7 +109,7 @@ public void DeserializesBinaryBlob()
111109
var data = KVSerializer.Create(KVSerializationFormat.KeyValues3Text).Deserialize(stream);
112110

113111
Assert.That(data["array"].ValueType, Is.EqualTo(KVValueType.BinaryBlob));
114-
Assert.That(((KVBinaryBlob)data["array"]).Bytes, Is.EqualTo(new byte[]
112+
Assert.That(((KVBinaryBlob)data["array"]).Bytes.ToArray(), Is.EqualTo(new byte[]
115113
{
116114
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
117115
0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xFF

‎ValveKeyValue/ValveKeyValue.Test/TextKV3/HeadersTestCase.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using System.IO;
31
using System.Text;
4-
using NUnit.Framework;
52

63
namespace ValveKeyValue.Test.TextKV3
74
{

‎ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv1ToKv3TestCase.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
using System;
2-
using System.IO;
3-
using NUnit.Framework;
4-
51
namespace ValveKeyValue.Test.TextKV3
62
{
73
class Kv1ToKv3TestCase

‎ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv3ToKv1TestCase.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
using System.IO;
2-
using NUnit.Framework;
3-
41
namespace ValveKeyValue.Test.TextKV3
52
{
63
class Kv3ToKv1TestCase

‎ValveKeyValue/ValveKeyValue.Test/TextKV3/RootTypesTestCase.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using NUnit.Framework;
2-
31
namespace ValveKeyValue.Test.TextKV3
42
{
53
class RootTypesTestCase
@@ -86,7 +84,7 @@ public void DeserializesRootBinaryBlob()
8684
{
8785
Assert.That(data.Name, Is.EqualTo("root"));
8886
Assert.That(data.Value.ValueType, Is.EqualTo(KVValueType.BinaryBlob));
89-
Assert.That(((KVBinaryBlob)data.Value).Bytes, Is.EqualTo(new byte[]
87+
Assert.That(((KVBinaryBlob)data.Value).Bytes.ToArray(), Is.EqualTo(new byte[]
9088
{
9189
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
9290
0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xFF

‎ValveKeyValue/ValveKeyValue.Test/TextKV3/SerializationTestCase.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
using System.IO;
2-
using NUnit.Framework;
3-
41
namespace ValveKeyValue.Test.TextKV3
52
{
63
class SerializationTestCase

‎ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReader.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
21
using System.Globalization;
3-
using System.IO;
42
using ValveKeyValue.Abstraction;
53

64
namespace ValveKeyValue.Deserialization.KeyValues3
@@ -183,7 +181,7 @@ void ReadText(string text)
183181

184182
void ReadBinaryBlob(string text)
185183
{
186-
var bytes = Utils.ParseHexStringAsByteArrayNoReverse(text);
184+
var bytes = HexStringHelper.ParseHexStringAsByteArray(text);
187185
var value = new KVBinaryBlob(bytes)
188186
{
189187
Flag = stateMachine.GetAndResetFlag()

0 commit comments

Comments
 (0)