From 36949e923a2fd75e22170e6bc97b3ed9a932c981 Mon Sep 17 00:00:00 2001 From: godotg Date: Tue, 16 Jul 2024 17:47:14 +0800 Subject: [PATCH] ref[lua]: lua protocol --- .../serializer/lua/LuaBoolSerializer.java | 4 +-- .../src/main/resources/lua/ByteBuffer.lua | 26 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/LuaBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/LuaBoolSerializer.java index fa0f1868..450d6b7d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/LuaBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/LuaBoolSerializer.java @@ -35,7 +35,7 @@ public class LuaBoolSerializer implements ILuaSerializer { @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); - builder.append(StringUtils.format("buffer:writeBoolean({})", objectStr)).append(LS); + builder.append(StringUtils.format("buffer:writeBool({})", objectStr)).append(LS); } @Override @@ -43,7 +43,7 @@ public class LuaBoolSerializer implements ILuaSerializer { String result = "result" + GenerateProtocolFile.localVariableId++; GenerateProtocolFile.addTab(builder, deep); - builder.append(StringUtils.format("local {} = buffer:readBoolean()", result)).append(LS); + builder.append(StringUtils.format("local {} = buffer:readBool()", result)).append(LS); return result; } } diff --git a/protocol/src/main/resources/lua/ByteBuffer.lua b/protocol/src/main/resources/lua/ByteBuffer.lua index 1b2d0d8d..6fe502d6 100644 --- a/protocol/src/main/resources/lua/ByteBuffer.lua +++ b/protocol/src/main/resources/lua/ByteBuffer.lua @@ -14,8 +14,8 @@ local zeroByte = string.char(0) local ByteBuffer = {} -local trueBooleanStrValue = string.char(1) -local falseBooleanStrValue = string.char(0) +local trueBoolStrValue = string.char(1) +local falseBoolStrValue = string.char(0) function serializeTableToJson(tbl) local res = {} @@ -127,6 +127,10 @@ function ByteBuffer:compatibleRead(beforeReadIndex, length) end -------------------------------------get和set------------------------------------- +function ByteBuffer:getBuffer() + return self.buffer +end + function ByteBuffer:getWriteOffset() return self.writeOffset end @@ -166,19 +170,19 @@ end -------------------------------------write和read------------------------------------- --bool -function ByteBuffer:writeBoolean(boolValue) +function ByteBuffer:writeBool(boolValue) if boolValue then - self:writeRawByteStr(trueBooleanStrValue) + self:writeRawByteStr(trueBoolStrValue) else - self:writeRawByteStr(falseBooleanStrValue) + self:writeRawByteStr(falseBoolStrValue) end return self end -function ByteBuffer:readBoolean() +function ByteBuffer:readBool() -- When char > 256, the readUByte method will show an error. -- So, we have to use readChar - return self:readRawByteStr() == trueBooleanStrValue + return self:readRawByteStr() == trueBoolStrValue end @@ -527,24 +531,24 @@ function ByteBuffer:readPacket(protocolId) return protocolRegistration:read(self) end -function ByteBuffer:writeBooleanArray(array) +function ByteBuffer:writeBoolArray(array) if array == nil then self:writeInt(0) else self:writeInt(#array) for index, element in pairs(array) do - self:writeBoolean(element) + self:writeBool(element) end end return self end -function ByteBuffer:readBooleanArray() +function ByteBuffer:readBoolArray() local array = {} local size = self:readInt() if size > 0 then for index = 1, size do - table.insert(array, self:readBoolean()) + table.insert(array, self:readBool()) end end return array