fix show packed in optional field

starwing · starwing · commit cfe483dfec8f · 2019-02-18T18:54:44.000+08:00
diff --git a/pb.c b/pb.c
@@ -1181,8 +1181,8 @@ static int lpb_pushfield(lua_State *L, pb_Type *t, pb_Field *f) {
     lua_pushstring(L, f->type ? (char*)f->type->name :
             pb_typename(f->type_id, "<unknown>"));
     lua_pushstring(L, (char*)f->default_value);
-    lua_pushstring(L, f->packed ? "packed" :
-            f->repeated ? "repeated" : "optional");
+    lua_pushstring(L, f->repeated ? f->packed ? "packed" : "repeated"
+                                  : "optional");
     if (f->oneof_idx > 0) {
         lua_pushstring(L, (const char*)pb_oneofname(t, f->oneof_idx));
         lua_pushinteger(L, f->oneof_idx-1);
diff --git a/pb.h b/pb.h
@@ -1579,7 +1579,7 @@ static void pbL_loadField(pb_State *S, pbL_FieldInfo *info, pb_Loader *L, pb_Typ
     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;
+    f->packed    = info->packed >= 0 ? info->packed : L->is_proto3 && f->repeated;
     if (f->type_id >= 9 && f->type_id <= 12) f->packed = 0;
     f->scalar = (f->type == NULL);
 }
diff --git a/test.lua b/test.lua
@@ -374,6 +374,8 @@ function _G.test_default()
          repeated int32 array = 18;
       } ]]
 
+   local _, _, _, _, rep = pb.field("TestDefault", "foo")
+   eq(rep, "optional")
    table_eq(copy_no_meta(pb.defaults "TestDefault"), {
             defaulted_int = 0,
             defaulted_bool = false,

Original file line number	Diff line number	Diff line change
`@@ -1579,7 +1579,7 @@ static void pbL_loadField(pb_State S, pbL_FieldInfo info, pb_Loader *L, pb_Typ`
`1579`	`1579`	`f->oneof_idx = info->oneof_index;`
`1580`	`1580`	`f->type_id = info->type;`
`1581`	`1581`	`f->repeated = info->label == 3; /* repeated */`
`1582`		`- f->packed = info->packed >= 0 ? info->packed : L->is_proto3;`
	`1582`	`+ f->packed = info->packed >= 0 ? info->packed : L->is_proto3 && f->repeated;`
`1583`	`1583`	`if (f->type_id >= 9 && f->type_id <= 12) f->packed = 0;`
`1584`	`1584`	`f->scalar = (f->type == NULL);`
`1585`	`1585`	`}`