Max/korenkonder_PD_Tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Release v0.4.6.2

Browse Source 
Some fixes and changes
This commit is contained in:
KujiKita
2019-07-03 01:08:18 +03:00
parent 4de7bd32f7
commit 3bbbea9536
37 changed files with 272 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
KKdMainLib/MessagePack/IO.cs
+1 -1
View File
@@ -131,7 +131,7 @@ namespace KKdMainLib.MessagePack
int Length = 0;
if (Type == Types.Str8 ) Length = _IO.ReadByte();
else if (Type == Types.Str16) Length = _IO.ReadInt16Endian(true);
else Length = _IO.ReadInt32Endian(true);
else Length = _IO.ReadInt32Endian(true);
return _IO.ReadString(Length);
}
return null;
KKdMainLib/MessagePack/JSONIO.cs
-2
View File
@@ -18,8 +18,6 @@ namespace KKdMainLib.MessagePack
public MsgPack Read() => ReadValue();
private string ReadKey() => ReadString();
private MsgPack ReadValue(string Key = null)
{
char c = _IO.SkipWhitespace().PeekCharUTF8();
KKdMainLib/MessagePack/MsgPack.cs
+9 -18
View File
@@ -8,10 +8,8 @@ namespace KKdMainLib.MessagePack
public string Name;
public object Object;
public MsgPack[] Array => Object is MsgPack[] List ?
List : null;
public KKdList<MsgPack> List => Object is KKdList<MsgPack> List ?
List : default(KKdList<MsgPack>);
public MsgPack[] Array => Object is MsgPack[] List ? List : null;
public KKdList<MsgPack> List => Object is KKdList<MsgPack> List ? List : default;
public static MsgPack New => new MsgPack { Object = KKdList<MsgPack>.New };
public static MsgPack NewReserve(int Capacity) =>
@@ -21,8 +19,7 @@ namespace KKdMainLib.MessagePack
{ Object = KKdList<MsgPack>.New; this.Name = Name; }
public MsgPack(long Count, string Name = null)
{ if (Count > 0) { Object = new MsgPack[Count]; }
else Object = null; this.Name = Name; }
{ Object = Count > 0 ? new MsgPack[Count] : null; this.Name = Name; }
public MsgPack(string Name, object Object)
{ this.Name = Name; this.Object = Object; }
@@ -30,8 +27,8 @@ namespace KKdMainLib.MessagePack
public static MsgPack Null => new MsgPack();
public MsgPack this[int index]
{ get { if (Object is MsgPack[] Array) return Array[index]; return default(MsgPack); }
set { if (Object is MsgPack[] Array) { Array[index] = value; Object = Array; } } }
{ get => Object is MsgPack[] Array ? Array[index] : default;
set { if (Object is MsgPack[] Array) { Array[index] = value; Object = Array; } } }
public MsgPack Add(MsgPack obj)
{ if (Object is KKdList<MsgPack> List) { List.Add(obj); Object = List; } return this; }
@@ -44,7 +41,8 @@ namespace KKdMainLib.MessagePack
public override string ToString() => Name ?? "" +
(List. NotNull ? ((Name != null ? " " : "") + "Elements Count: " + List .Count ) :
(Array != null ? ((Name != null ? " " : "") + "Elements Count: " + Array.Length) : Object.ToString()));
(Array != null ? ((Name != null ? " " : "") + "Elements Count: " + Array.Length) :
Object.ToString()));
public static explicit operator MsgPack(byte[] val) => new MsgPack(null, val);
public static explicit operator MsgPack(string val) => new MsgPack(null, val);
@@ -232,15 +230,8 @@ namespace KKdMainLib.MessagePack
public string ReadString()
{ if (Object is string String) return String; return null; }
public bool ElementArray(string Name, out MsgPack MsgPack)
{
if (Element(Name, out MsgPack))
{
if (MsgPack.Array == null) return false;
return true;
}
return false;
}
public bool ElementArray(string Name, out MsgPack MsgPack) =>
Element(Name, out MsgPack) ? MsgPack.Array != null : false;
public bool Element(string Name, out MsgPack MsgPack)
{