Fix reserved words parsing

edgurgel · Jan 7, 2025 · 02b9cf8 · 02b9cf8
1 parent 3fd9d33
commit 02b9cf8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/lib/solid/parser/literal.ex b/lib/solid/parser/literal.ex
@@ -38,22 +38,6 @@ defmodule Solid.Parser.Literal do
   end
 
   def value do
-    true_value =
-      string("true")
-      |> replace(true)
-
-    false_value =
-      string("false")
-      |> replace(false)
-
-    null =
-      string("nil")
-      |> replace(nil)
-
-    empty =
-      string("empty")
-      |> replace(:empty)
-
     frac =
       string(".")
       |> concat(integer(min: 1))
@@ -73,10 +57,6 @@ defmodule Solid.Parser.Literal do
     choice([
       float,
       int(),
-      true_value,
-      false_value,
-      null,
-      empty,
       single_quoted_string(),
       double_quoted_string()
     ])

diff --git a/lib/solid/parser/variable.ex b/lib/solid/parser/variable.ex
@@ -26,5 +26,15 @@ defmodule Solid.Parser.Variable do
     identifier()
     |> repeat(choice([dot_access(), bracket_access()]))
     |> tag(:field)
+    |> map({__MODULE__, :reserved_words, []})
+  end
+
+  @reserved_words ~w(true false nil empty)
+
+  def reserved_words(field) do
+    case field do
+      {:field, [word]} when word in @reserved_words -> {:value, String.to_atom(word)}
+      _ -> field
+    end
   end
 end