couchemar/wa_parser - Change ZNFKFYBFLWN753DAGZODAGH4BN4OTKL275FUK372VY55XB6KC3WAC

Fixed strange conflicts

Created by couchemar on September 18, 2021

ZNFKFYBFLWN753DAGZODAGH4BN4OTKL275FUK372VY55XB6KC3WAC

Dependencies

In channels

main

Change contents

Insertion in lib/wa_parser.ex at line 7 [5.693]

[3.31]

[5.771]


  def stream(data) do
    Stream.resource(
      fn -> {data, &parse/1} end,
      fn
        {"", _} = acc ->
          {:halt, acc}
        {data, parser} ->
          case parser.(data) do
            {:ok, {result, rest, next}} when is_list(result) ->
              {result, {rest, next}}

Insertion in lib/wa_parser.ex at line 20 [5.693]

[5.772]

[6.0]

            {:ok, {result, rest, next}} ->
              {[result], {rest, next}}
          end
      end,
      fn _ -> nil end
    )
  end

Deletion in lib/wa_parser.ex at line 37 [5.693]

B:BD[6.321] → [2.0:105]

    {:ok,
     {[{:section_id, id}, {:section_type, get_section_type(id)}], rest, do_parse_section(id)}}

Deletion in lib/wa_parser.ex at line 50 [5.693]

B:BD[7.590] → [2.106:425]

BD:BD[7.590] → [2.106:425]

  defp get_section_type(0), do: :custom
  defp get_section_type(1), do: :type
  defp get_section_type(3), do: :function
  defp get_section_type(4), do: :table
  defp get_section_type(5), do: :memory
  defp get_section_type(6), do: :global
  defp get_section_type(7), do: :export
  defp get_section_type(10), do: :code

Deletion in lib/wa_parser.ex at line 247 [5.693]

B:BD[9.297] → [10.0:77]

BD:BD[9.297] → [10.0:77]

B:BD[10.77] → [13.0:217]

B:BD[13.217] → [2.426:509]

∅:D[2.509] → [13.217:231]

B:BD[13.217] → [13.217:231]

∅:D[13.231] → [10.224:263]

B:BD[10.224] → [10.224:263]

BD:BD[10.224] → [10.224:263]

  def stream(data) do
    Stream.resource(
      fn -> {data, &parse/1} end,
      fn
        {"", _} = acc ->
          {:halt, acc}
        {data, parser} ->
          case parser.(data) do
            {:ok, {result, rest, next}} when is_list(result) ->
              {result, {rest, next}}
            {:ok, {result, rest, next}} ->
              {[result], {rest, next}}
          end
      end,
      fn _ -> nil end
    )

Resurrecting zombie bytes in "lib/wa_parser.ex" at line 247 [5.693]
B:B[14.823] → [12.0:29]
BD:B[14.823] → [12.0:29]
∅:∅[12.29] → [8.1630:1637]
∅:∅[14.1070] → [8.1630:1637]
B:B[8.1630] → [8.1630:1637]
BD:B[8.1630] → [8.1630:1637]
B:B[8.1637] → [12.30:87]
BD:B[8.1637] → [12.30:87]
B:B[15.765] → [15.765:766]
BD:B[15.765] → [15.765:766]
B:B[16.476] → [14.1251:1277]
BD:B[16.476] → [14.1251:1277]
B:B[14.1277] → [3.259:282]
BD:B[14.1277] → [3.259:282]
∅:∅[3.282] → [8.1977:1984]
∅:∅[16.516] → [8.1977:1984]
∅:∅[14.1293] → [8.1977:1984]
B:B[8.1977] → [8.1977:1984]
BD:B[8.1977] → [8.1977:1984]
B:B[8.1984] → [17.703:872]
BD:B[8.1984] → [17.703:872]
B:B[17.872] → [4.1577:1633]
BD:B[17.872] → [4.1577:1633]
```
    vec(&valtype/1).(binary)
  end
  defp valtype(<<0x7F, rest::binary>>), do: {:i32, rest}
  defp typeidx(binary) do
    Atomic.u32(binary)
  end
  defp memidx(binary) do
    Atomic.u32(binary)
  end
  defp globalidx(binary) do
    Atomic.u32(binary)
  end
  defp funcidx(binary) do
    Atomic.u32(binary)
  end
  defp localidx(binary) do
    Atomic.u32(binary)
  end
```

Deletion in lib/wa_parser.ex at line 271 [5.693]

B:BD[4.1633] → [4.1633:1634]

BD:BD[4.1633] → [4.1633:1634]

∅:D[17.872] → [11.0:134]

∅:D[4.1634] → [11.0:134]

∅:D[8.1984] → [11.0:134]

B:BD[9.297] → [11.0:134]

BD:BD[9.297] → [11.0:134]

B:BD[9.477] → [11.135:294]

BD:BD[9.477] → [11.135:294]

B:BD[9.561] → [11.295:430]

BD:BD[9.561] → [11.295:430]


  def stream(data) do
    Stream.resource(
      fn -> {data, &parse/1} end,
      fn
        {"", _} = acc ->
          {:halt, acc}
        {data, parser} ->
          case parser.(data) do
            {:ok, {result, rest, next}} when is_list(result) ->
              {result, {rest, next}}
            {:ok, {result, rest, next}} ->
              {[result], {rest, next}}
          end
      end,
      fn _ -> nil end
    )