PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-20 04:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix precedence

Browse source
This commit is contained in:
Liam P. White 2019-08-27 09:07:12 -04:00
parent b5a9660fd0
commit 9239418d4b
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/philomena/search/parser.ex
View file

@ -15,9 +15,6 @@ defmodule Philomena.Search.Parser do
else else
{:error, msg, _1, _2, _3, _4} -> {:error, msg, _1, _2, _3, _4} ->
{:error, msg} {:error, msg}
{:error, msg} ->
{:error, msg}
end end
end end
@ -36,6 +33,7 @@ defmodule Philomena.Search.Parser do
# #
# Predictive LL(k) parser for search grammar # Predictive LL(k) parser for search grammar
# #
defp search_top(ctx, tokens), do: search_or(ctx, tokens) defp search_top(ctx, tokens), do: search_or(ctx, tokens)
# #
@ -45,7 +43,7 @@ defmodule Philomena.Search.Parser do
defp search_or(ctx, tokens) do defp search_or(ctx, tokens) do
case search_and(ctx, tokens) do case search_and(ctx, tokens) do
{left, [{:or, _} | r_tokens]} -> {left, [{:or, _} | r_tokens]} ->
{right, rest} = search_top(ctx, r_tokens) {right, rest} = search_or(ctx, r_tokens)
{%{bool: %{should: [left, right]}}, rest} {%{bool: %{should: [left, right]}}, rest}
{child, rest} -> {child, rest} ->
@ -60,7 +58,7 @@ defmodule Philomena.Search.Parser do
defp search_and(ctx, tokens) do defp search_and(ctx, tokens) do
case search_boost(ctx, tokens) do case search_boost(ctx, tokens) do
{left, [{:and, _} | r_tokens]} -> {left, [{:and, _} | r_tokens]} ->
{right, rest} = search_top(ctx, r_tokens) {right, rest} = search_and(ctx, r_tokens)
{%{bool: %{must: [left, right]}}, rest} {%{bool: %{must: [left, right]}}, rest}
{child, rest} -> {child, rest} ->