From d2f316f86298786327568e810f7e370e74d8244b Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Thu, 10 Aug 2023 17:31:51 +0800 Subject: [PATCH] =?UTF-8?q?ft:=20cs=E5=BA=8F=E5=88=97=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/writeCs/gCsField.erl | 26 +++---- src/writeCs/gCsGen.erl | 2 +- test/cs/protoMsg.cs | 159 +++++++++++++++++++-------------------- test/erl/protoMsg.erl | 2 +- test/erl/protoMsg.hrl | 16 ++-- 5 files changed, 102 insertions(+), 103 deletions(-) diff --git a/src/writeCs/gCsField.erl b/src/writeCs/gCsField.erl index 0c8a7cc..0a16620 100644 --- a/src/writeCs/gCsField.erl +++ b/src/writeCs/gCsField.erl @@ -15,20 +15,20 @@ , <<"double">> ]). --define(CustomTypeEnum, <<"0x00">>). +-define(CustomTypeEnum, <<"ProtocolCore.BasicTypeEnum.Custom">>). -define(TypeValue, [ - {<<"bool">>, <<"bool">>, <<"0x01">>} - , {<<"int8">>, <<"sbyte">>, <<"0x02">>} - , {<<"uint8">>, <<"byte">>, <<"0x03">>} - , {<<"int16">>, <<"short">>, <<"0x04">>} - , {<<"uint16">>, <<"ushort">>, <<"0x05">>} - , {<<"int32">>, <<"int">>, <<"0x06">>} - , {<<"uint32">>, <<"uint">>, <<"0x07">>} - , {<<"int64">>, <<"long">>, <<"0x08">>} - , {<<"uint64">>, <<"ulong">>, <<"0x09">>} - , {<<"float">>, <<"float">>, <<"0x10">>} - , {<<"double">>, <<"double">>, <<"0x11">>} - , {<<"string">>, <<"string">>, <<"0x12">>} + {<<"bool">>, <<"bool">>, <<"ProtocolCore.BasicTypeEnum.Boolean">>} + , {<<"int8">>, <<"sbyte">>, <<"ProtocolCore.BasicTypeEnum.Int8">>} + , {<<"uint8">>, <<"byte">>, <<"ProtocolCore.BasicTypeEnum.UInt8">>} + , {<<"int16">>, <<"short">>, <<"ProtocolCore.BasicTypeEnum.Int16">>} + , {<<"uint16">>, <<"ushort">>, <<"ProtocolCore.BasicTypeEnum.UInt16">>} + , {<<"int32">>, <<"int">>, <<"ProtocolCore.BasicTypeEnum.Int32">>} + , {<<"uint32">>, <<"uint">>, <<"ProtocolCore.BasicTypeEnum.UInt32">>} + , {<<"int64">>, <<"long">>, <<"ProtocolCore.BasicTypeEnum.Int64">>} + , {<<"uint64">>, <<"ulong">>, <<"ProtocolCore.BasicTypeEnum.UInt64">>} + , {<<"float">>, <<"float">>, <<"ProtocolCore.BasicTypeEnum.Float">>} + , {<<"double">>, <<"double">>, <<"ProtocolCore.BasicTypeEnum.Double">>} + , {<<"string">>, <<"string">>, <<"ProtocolCore.BasicTypeEnum.String">>} ]). builtMemberStr({TypeStr, NameStr}) -> diff --git a/src/writeCs/gCsGen.erl b/src/writeCs/gCsGen.erl index 0d4a138..d99099c 100644 --- a/src/writeCs/gCsGen.erl +++ b/src/writeCs/gCsGen.erl @@ -341,7 +341,7 @@ spellCalssSerialize(FieldList) -> <>. spellCalssDeserialize(FieldList) -> - FunHead = <<"\t\tpublic void Deserialize(EndianBinaryWriter binaryReader)\n\t\t{\n">>, + FunHead = <<"\t\tpublic void Deserialize(EndianBinaryReader binaryReader)\n\t\t{\n">>, FunBody = <<<<(gCsField:builtDecodeStr(OneTypeName))/binary>> || OneTypeName <- FieldList>>, <>. diff --git a/test/cs/protoMsg.cs b/test/cs/protoMsg.cs index f5537e5..5f0a176 100644 --- a/test/cs/protoMsg.cs +++ b/test/cs/protoMsg.cs @@ -120,7 +120,6 @@ namespace GenProto break; } - break; } } @@ -327,7 +326,7 @@ namespace GenProto { binaryWriter.WriteValue(aa); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out aa); } @@ -365,7 +364,7 @@ namespace GenProto } binaryWriter.WriteValue(type); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { if (binaryReader.ReadBoolean()) { @@ -403,12 +402,12 @@ namespace GenProto binaryWriter.WriteValue(email); binaryWriter.WriteValue(phone); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out name); binaryReader.ReadValue(out id); binaryReader.ReadValue(out email); - binaryReader.ReadValue(out phone, 0x00); + binaryReader.ReadValue(out phone, ProtocolCore.BasicTypeEnum.Custom); } } public class addressBook : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -436,10 +435,10 @@ namespace GenProto binaryWriter.WriteValue(person); binaryWriter.WriteValue(other); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out person, 0x00); - binaryReader.ReadValue(out other, 0x00); + binaryReader.ReadValue(out person, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out other, ProtocolCore.BasicTypeEnum.Custom); } } public class union : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -467,7 +466,7 @@ namespace GenProto binaryWriter.WriteValue(test); binaryWriter.WriteValue(type); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out test); binaryReader.ReadValue(out type); @@ -496,7 +495,7 @@ namespace GenProto { binaryWriter.WriteValue(bool); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out bool); } @@ -526,7 +525,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -557,7 +556,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -588,7 +587,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -619,7 +618,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -666,7 +665,7 @@ namespace GenProto binaryWriter.WriteValue(int9); binaryWriter.WriteValue(int10); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -705,7 +704,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -736,7 +735,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -767,7 +766,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -874,7 +873,7 @@ namespace GenProto binaryWriter.WriteValue(0); } } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { if (binaryReader.ReadBoolean()) { @@ -1031,7 +1030,7 @@ namespace GenProto binaryWriter.WriteValue(0); } } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { if (binaryReader.ReadBoolean()) { @@ -1100,7 +1099,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -1131,7 +1130,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -1162,7 +1161,7 @@ namespace GenProto binaryWriter.WriteValue(int1); binaryWriter.WriteValue(int2); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out int1); binaryReader.ReadValue(out int2); @@ -1191,9 +1190,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x01); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Boolean); } } public class tlistint8 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1219,9 +1218,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x02); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Int8); } } public class tlistuint8 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1247,9 +1246,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x03); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.UInt8); } } public class tlistint16 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1275,9 +1274,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x04); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Int16); } } public class tlistuint16 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1303,9 +1302,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x05); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.UInt16); } } public class tlistint32 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1331,9 +1330,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x06); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Int32); } } public class tlistuint32 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1359,9 +1358,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x07); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.UInt32); } } public class tlistint64 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1387,9 +1386,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x08); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Int64); } } public class tlistuint64 : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1415,9 +1414,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x09); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.UInt64); } } public class tlistinteger : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1443,9 +1442,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x00); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Custom); } } public class tlistnumber : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1471,9 +1470,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x00); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Custom); } } public class tlistfloat : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1499,9 +1498,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x10); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Float); } } public class tlistdouble : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1527,9 +1526,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x11); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Double); } } public class tliststring : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1555,9 +1554,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x12); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.String); } } public class tlistunion : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1583,9 +1582,9 @@ namespace GenProto { binaryWriter.WriteValue(int1); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { - binaryReader.ReadValue(out int1, 0x00); + binaryReader.ReadValue(out int1, ProtocolCore.BasicTypeEnum.Custom); } } public class allType : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -1871,7 +1870,7 @@ namespace GenProto binaryWriter.WriteValue(lstring); binaryWriter.WriteValue(lunion); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out bool); binaryReader.ReadValue(out int8); @@ -1962,29 +1961,29 @@ namespace GenProto { binaryReader.ReadValue(out union); } - binaryReader.ReadValue(out lbool, 0x01); - binaryReader.ReadValue(out lint8, 0x02); - binaryReader.ReadValue(out luint8, 0x03); - binaryReader.ReadValue(out lint16, 0x04); - binaryReader.ReadValue(out luint16, 0x05); - binaryReader.ReadValue(out lint32, 0x06); - binaryReader.ReadValue(out luint32, 0x07); - binaryReader.ReadValue(out lint64, 0x08); - binaryReader.ReadValue(out luint64, 0x09); - binaryReader.ReadValue(out linte8, 0x00); - binaryReader.ReadValue(out linte16, 0x00); - binaryReader.ReadValue(out linte32, 0x00); - binaryReader.ReadValue(out linte64, 0x00); - binaryReader.ReadValue(out lnum8, 0x00); - binaryReader.ReadValue(out lnum16, 0x00); - binaryReader.ReadValue(out lnum32, 0x00); - binaryReader.ReadValue(out lnum64, 0x00); - binaryReader.ReadValue(out lnfloat32, 0x00); - binaryReader.ReadValue(out lnfloat64, 0x00); - binaryReader.ReadValue(out lfloat, 0x10); - binaryReader.ReadValue(out ldouble, 0x11); - binaryReader.ReadValue(out lstring, 0x12); - binaryReader.ReadValue(out lunion, 0x00); + binaryReader.ReadValue(out lbool, ProtocolCore.BasicTypeEnum.Boolean); + binaryReader.ReadValue(out lint8, ProtocolCore.BasicTypeEnum.Int8); + binaryReader.ReadValue(out luint8, ProtocolCore.BasicTypeEnum.UInt8); + binaryReader.ReadValue(out lint16, ProtocolCore.BasicTypeEnum.Int16); + binaryReader.ReadValue(out luint16, ProtocolCore.BasicTypeEnum.UInt16); + binaryReader.ReadValue(out lint32, ProtocolCore.BasicTypeEnum.Int32); + binaryReader.ReadValue(out luint32, ProtocolCore.BasicTypeEnum.UInt32); + binaryReader.ReadValue(out lint64, ProtocolCore.BasicTypeEnum.Int64); + binaryReader.ReadValue(out luint64, ProtocolCore.BasicTypeEnum.UInt64); + binaryReader.ReadValue(out linte8, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out linte16, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out linte32, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out linte64, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out lnum8, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out lnum16, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out lnum32, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out lnum64, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out lnfloat32, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out lnfloat64, ProtocolCore.BasicTypeEnum.Custom); + binaryReader.ReadValue(out lfloat, ProtocolCore.BasicTypeEnum.Float); + binaryReader.ReadValue(out ldouble, ProtocolCore.BasicTypeEnum.Double); + binaryReader.ReadValue(out lstring, ProtocolCore.BasicTypeEnum.String); + binaryReader.ReadValue(out lunion, ProtocolCore.BasicTypeEnum.Custom); } } public class testnull : ProtocolCore.ISerialize, ProtocolCore.IDeserialize @@ -2008,7 +2007,7 @@ namespace GenProto public void Serialize(EndianBinaryWriter binaryWriter) { } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { } } @@ -2041,12 +2040,12 @@ namespace GenProto binaryWriter.WriteValue(email); binaryWriter.WriteValue(phone); } - public void Deserialize(BinaryReader binaryReader) + public void Deserialize(EndianBinaryReader binaryReader) { binaryReader.ReadValue(out name); binaryReader.ReadValue(out id); binaryReader.ReadValue(out email); - binaryReader.ReadValue(out phone, 0x00); + binaryReader.ReadValue(out phone, ProtocolCore.BasicTypeEnum.Custom); } } } \ No newline at end of file diff --git a/test/erl/protoMsg.erl b/test/erl/protoMsg.erl index 70aca5b..82affd4 100644 --- a/test/erl/protoMsg.erl +++ b/test/erl/protoMsg.erl @@ -3,7 +3,7 @@ -compile([nowarn_unused_vars]). --export([encodeIol/1, encodeBin/1, encodeIol/2, subEncode/1, subEncode/2, decode/1, decodeBin/2]). +-export([encodeIol/1, encodeBin/1, encodeIol/2, subEncode/1, subEncode/2, decode/1, decodeBin/2, getMsgName/1]). -define(min8, -128). -define(max8, 127). diff --git a/test/erl/protoMsg.hrl b/test/erl/protoMsg.hrl index 442cf12..a092bf3 100644 --- a/test/erl/protoMsg.hrl +++ b/test/erl/protoMsg.hrl @@ -8,14 +8,14 @@ -opaque uint64() :: 0..18446744073709551615. -opaque double() :: float(). --define(ERR1, 1001). %% 辅导费 --define(ERR2, 1002). %% 444 --define(ERR3, 1003). %% 辅导费 --define(ERR4, 1004). %% dfsf --define(ERR5, 1005). %% 其他注释辅导费 --define(ERR6, 1006). %% dfff --define(ERR7, 1007). %% def --define(ERR8, 1008). %% 其他注释辅导费 +-define(ERR1, 1). %% 辅导费 +-define(ERR2, 2). %% 444 +-define(ERR3, 3). %% 辅导费 +-define(ERR4, 4). %% dfsf +-define(ERR5, 5). %% 其他注释辅导费 err6:dfff +-define(ERR7, 6). %% def +-define(ERR8, 7). %% 其他注释辅导费 +-define(ERR6, 1001). %% dfff -record(test, {