do not omit empty message in oneof

starwing · starwing · commit 76eec5fb12d7 · 2018-09-17T12:38:51.000+08:00
diff --git a/pb.c b/pb.c
@@ -1167,7 +1167,6 @@ static int lpb_pushtype(lua_State *L, pb_Type *t) {
 }
 
 static int lpb_pushfield(lua_State *L, pb_Type *t, pb_Field *f) {
-    pb_OneofEntry *e;
     if (f == NULL) return 0;
     lua_pushstring(L, (char*)f->name);
     lua_pushinteger(L, f->number);
@@ -1176,10 +1175,9 @@ static int lpb_pushfield(lua_State *L, pb_Type *t, pb_Field *f) {
     lua_pushstring(L, (char*)f->default_value);
     lua_pushstring(L, f->packed ? "packed" :
             f->repeated ? "repeated" : "optional");
-    e = (pb_OneofEntry*)pb_gettable(&t->oneof_index, (pb_Key)f);
-    if (e) {
-        lua_pushstring(L, (const char*)e->name);
-        lua_pushinteger(L, e->index-1);
+    if (f->oneof_idx > 0) {
+        lua_pushstring(L, (const char*)pb_oneofname(t, f->oneof_idx));
+        lua_pushinteger(L, f->oneof_idx-1);
         return 7;
     }
     return 5;
@@ -1244,7 +1242,7 @@ static int Lpb_enum(lua_State *L) {
 }
 
 static int lpb_pushdefault(lua_State *L, lpb_State *LS, pb_Field *f, int is_proto3) {
-	pb_Type *type = f->type;
+    pb_Type *type = f->type;
     int ret = 0;
     char *end;
     if (f == NULL) return 0;
@@ -1389,7 +1387,7 @@ static void lpbE_field(lpb_Env *e, pb_Field *f, size_t *plen) {
     pb_Buffer *b = e->b;
     size_t len;
     int ltype;
-	if (plen) *plen = 0;
+    if (plen) *plen = 0;
     switch (f->type_id) {
     case PB_Tenum:
         lpbE_enum(e, f);
@@ -1476,8 +1474,8 @@ static void lpb_encode(lpb_Env *e, pb_Type *t) {
                 lpbE_map(e, f);
             else if (f->repeated)
                 lpbE_repeated(e, f);
-            else if (!f->type || f->type->field_count != 0) {
-				size_t ignoredlen;
+            else if (!f->type || (f->type->field_count != 0 || f->oneof_idx > 0)) {
+                size_t ignoredlen;
                 lpbE_tagfield(e, f, &ignoredlen);
                 if (t->is_proto3) e->b->size -= ignoredlen;
             }
@@ -1574,7 +1572,8 @@ static void lpbD_field(lpb_Env *e, pb_Field *f, uint32_t tag) {
 
     case PB_Tmessage:
         lpb_readbytes(L, s, &sv);
-        if (f->type == NULL || f->type->field_count == 0)
+        if (f->type == NULL
+                || (f->type->field_count == 0 && f->oneof_idx == 0))
             lua_pushnil(L);
         else {
             lpb_pushtypetable(L, e->LS, f->type);
@@ -1650,11 +1649,11 @@ static int lpb_decode(lpb_Env *e, pb_Type *t) {
             lpbD_map(e, f);
         else if (f->repeated)
             lpbD_repeated(e, f, tag);
-		else {
-			lua_pushstring(L, (char*)f->name);
-			lpbD_field(e, f, tag);
-			lua_rawset(L, -3);
-		}
+        else {
+            lua_pushstring(L, (char*)f->name);
+            lpbD_field(e, f, tag);
+            lua_rawset(L, -3);
+        }
     }
     return 1;
 }
diff --git a/pb.h b/pb.h
@@ -217,6 +217,8 @@ PB_API pb_Type  *pb_type   (pb_State *S, pb_Name *tname);
 PB_API pb_Field *pb_fname  (pb_Type *t,  pb_Name *tname);
 PB_API pb_Field *pb_field  (pb_Type *t,  int32_t number);
 
+PB_API pb_Name *pb_oneofname (pb_Type *t, int oneof_index);
+
 PB_API int pb_nexttype  (pb_State *S, pb_Type **ptype);
 PB_API int pb_nextfield (pb_Type *t, pb_Field **pfield);
 
@@ -293,10 +295,11 @@ struct pb_Field {
     pb_Type *type;
     pb_Name *default_value;
     int32_t  number;
-    unsigned type_id  : 29; /* PB_T* enum */
-    unsigned repeated : 1;
-    unsigned packed   : 1;
-    unsigned scalar   : 1;
+    unsigned oneof_idx : 24;
+    unsigned type_id   : 5; /* PB_T* enum */
+    unsigned repeated  : 1;
+    unsigned packed    : 1;
+    unsigned scalar    : 1;
 };
 
 struct pb_Type {
@@ -1110,6 +1113,12 @@ PB_API pb_Field *pb_field(pb_Type *t, int32_t number) {
     return fe ? fe->value : NULL;
 }
 
+PB_API pb_Name *pb_oneofname(pb_Type *t, int idx) {
+    pb_OneofEntry *oe = NULL;
+    if (t != NULL) oe = (pb_OneofEntry*)pb_gettable(&t->oneof_index, idx);
+    return oe ? oe->name : NULL;
+}
+
 PB_API int pb_nexttype(pb_State *S, pb_Type **ptype) {
     pb_TypeEntry *e = NULL;
     if (S != NULL) {
@@ -1564,22 +1573,13 @@ static void pbL_loadField(pb_State *S, pbL_FieldInfo *info, pb_Loader *L, pb_Typ
     if (!(f = pb_newfield(S, t, pb_newname(S, info->name), info->number)))
         return;
     f->default_value = pb_newname(S, info->default_value);
-    f->type     = ft;
-    f->type_id  = info->type;
-    f->repeated = info->label == 3; /* repeated */
-    f->packed   = info->packed >= 0 ? info->packed : L->is_proto3;
+    f->type      = ft;
+    f->oneof_idx = info->oneof_index;
+    f->type_id   = info->type;
+    f->repeated  = info->label == 3; /* repeated */
+    f->packed    = info->packed >= 0 ? info->packed : L->is_proto3;
     if (f->type_id >= 9 && f->type_id <= 12) f->packed = 0;
-    f->scalar   = f->type == NULL;
-    if (info->oneof_index != 0) {
-        pb_OneofEntry *fe, *e = (pb_OneofEntry*)pb_gettable(&t->oneof_index,
-                info->oneof_index), saved;
-        if (e != NULL) {
-            saved = *e;
-            fe = (pb_OneofEntry*)pb_settable(&t->oneof_index, (pb_Key)f);
-            fe->name = pb_usename(saved.name);
-            fe->index = saved.index;
-        }
-    }
+    f->scalar = (f->type == NULL);
 }
 
 static void pbL_loadType(pb_State *S, pbL_TypeInfo *info, pb_Loader *L) {
diff --git a/test.lua b/test.lua
@@ -615,6 +615,29 @@ function _G.test_map()
 end
 
 function _G.test_oneof()
+   check_load [[
+   syntax = "proto3";
+   message TO_M1 {
+   }
+   message TO_M2 {
+   }
+   message TO_M3 {
+       int32 value = 1;
+   }
+   message TestOneof { 
+       oneof body_oneof {
+           TO_M1 m1 = 100;
+           TO_M2 m2 = 200;
+           TO_M3 m3 = 300;
+       }
+   } ]]
+   check_msg("TestOneof", {})
+   check_msg("TestOneof", { m1 = {} })
+   check_msg("TestOneof", { m2 = {} })
+   check_msg("TestOneof", { m3 = { value = 0 } })
+   check_msg("TestOneof", { m3 = { value = 10 } })
+   pb.clear "TestOneof"
+
    check_load [[
    syntax = "proto3";
    message TestOneof {
