do not skip empty messages

starwing · starwing · commit 8afa265df5ae · 2018-09-19T14:36:50.000+08:00
diff --git a/pb.c b/pb.c
@@ -1474,7 +1474,7 @@ 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 || f->oneof_idx > 0)) {
+            else if (!f->type || !f->type->is_dead) {
                 size_t ignoredlen;
                 lpbE_tagfield(e, f, &ignoredlen);
                 if (t->is_proto3) e->b->size -= ignoredlen;
@@ -1572,8 +1572,7 @@ 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 && f->oneof_idx == 0))
+        if (f->type == NULL || f->type->is_dead)
             lua_pushnil(L);
         else {
             lpb_pushtypetable(L, e->LS, f->type);
diff --git a/test.lua b/test.lua
@@ -158,7 +158,7 @@ function _G.test_depend.test()
 
    load_depend(protoc.new())
    local t = { dep1 = { id = 1, name = "foo" }, other = 2 }
-   check_msg("Depend2Msg", t, { other = 2 })
+   check_msg("Depend2Msg", t, { dep1 = {}, other = 2 })
 
    eq(protoc.new():loadfile "depend1.proto", true)
    local chunk = pb.encode("Depend2Msg", t)
