Fix parse of unpacked repeated fields in proto3 files

ahamez · Jun 16, 2020 · 728be4e · 728be4e
1 parent 9e89fbd
commit 728be4e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/lib/protox/parse.ex b/lib/protox/parse.ex
@@ -281,6 +281,9 @@ defmodule Protox.Parse do
       %FieldDescriptorProto{label: :repeated, options: %FieldOptions{packed: true}} ->
         :packed
 
+      %FieldDescriptorProto{label: :repeated, options: %FieldOptions{packed: false}} ->
+        :unpacked
+
       %FieldDescriptorProto{label: :repeated} ->
         case {syntax, type} do
           {:proto3, ty} when is_primitive(ty) -> :packed

diff --git a/test/protox/parse_test.exs b/test/protox/parse_test.exs
@@ -93,6 +93,13 @@ defmodule Protox.ParseTest do
               {:enum, Proto2A.NestedEnum}}
   end
 
+  test "Parse Proto3, packed and unpacked fields", %{messages: messages} do
+    fs = fields(messages, Abc.Def.Proto3)
+
+    assert field(fs, 200) == {:repeated, :repeated_int32_packed, :packed, :int32}
+    assert field(fs, 201) == {:repeated, :repeated_int32_unpacked, :unpacked, :int32}
+  end
+
   defp field(fields, tag) do
     fields
     |> Enum.find(&(elem(&1, 0) == tag))

diff --git a/test/protox_test.exs b/test/protox_test.exs
@@ -168,7 +168,9 @@ defmodule ProtoxTest do
              134 => {:oneof_2_int32, {:oneof, :oneof_2}, :int32},
              135 =>
                {:oneof_2_nested_enum, {:oneof, :oneof_2}, {:enum, Abc.Def.Proto3.NestedEnum}},
-             9999 => {:nested_enum, {:default, :FOO}, {:enum, Abc.Def.Proto3.NestedEnum}}
+             9999 => {:nested_enum, {:default, :FOO}, {:enum, Abc.Def.Proto3.NestedEnum}},
+             200 => {:repeated_int32_packed, :packed, :int32},
+             201 => {:repeated_int32_unpacked, :unpacked, :int32}
            }
   end
 
@@ -221,7 +223,9 @@ defmodule ProtoxTest do
                {:oneof_2_nested_enum, {:oneof, :oneof_2},
                 {:enum, Namespace.Abc.Def.Proto3.NestedEnum}},
              9999 =>
-               {:nested_enum, {:default, :FOO}, {:enum, Namespace.Abc.Def.Proto3.NestedEnum}}
+               {:nested_enum, {:default, :FOO}, {:enum, Namespace.Abc.Def.Proto3.NestedEnum}},
+             200 => {:repeated_int32_packed, :packed, :int32},
+             201 => {:repeated_int32_unpacked, :unpacked, :int32}
            }
   end
 

diff --git a/test/samples/file_descriptor_set.bin b/test/samples/file_descriptor_set.bin
diff --git a/test/samples/proto3.proto b/test/samples/proto3.proto
@@ -39,6 +39,9 @@ message Proto3 {
   }
 
   NestedEnum nested_enum = 9999;
+
+  repeated int32 repeated_int32_packed = 200 [packed = true];
+  repeated int32 repeated_int32_unpacked = 201 [packed = false];
 }
 
 message EmptyProto3 {