Squashed types, fixed tests for older version support

balance-platform · Feb 19, 2024 · 73d1788 · 73d1788
1 parent 60de611
commit 73d1788
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lib/ex_pression/parser/grammar.ex b/lib/ex_pression/parser/grammar.ex
@@ -11,11 +11,9 @@ defmodule ExPression.Parser.Grammar do
       S <- {' ', '\t', '\r', '\n'}
 
       # Basic atoms
-      True <- "true" * fn cs -> [true | cs] end
-      TrueP <- "True" * fn cs -> [true | cs] end
-      False <- "false" * fn cs -> [false | cs] end
-      FalseP <- "False" * fn cs -> [false | cs] end
-      Null <- "null" * fn cs -> [nil | cs] end
+      True <- ("True" | "true") * fn cs -> [true | cs] end
+      False <- ("False" | "false") * fn cs -> [false | cs] end
+      Null <- ("None" | "null") * fn cs -> [nil | cs] end
 
       # Strings
       Xdigit <- {'0'..'9', 'a'..'f', 'A'..'F'}
@@ -28,7 +26,7 @@ defmodule ExPression.Parser.Grammar do
       Integer <- int(opt('-') * ('0' | {'1'..'9'}) * star({'0'..'9'}))
       Float <- float(opt('-') * ('0' | {'1'..'9'}) * star({'0'..'9'}) * (("." * +{'0'..'9'}) | ({'e', 'E'} * opt({'+', '-'}) * +{'0'..'9'})))
 
-      KeyWord <- ("False" | "True" | "false" | "true" | "null" | "or" | "and" | "not")
+      KeyWord <- ("None" | "False" | "True" | "false" | "true" | "null" | "or" | "and" | "not")
       IdentifierRest <- {'a'..'z', 'A'..'Z', '_', '0'..'9'}
       Identifier1 <- {'a'..'z', 'A'..'Z', '_'} * star(IdentifierRest)
       Identifier <- str((KeyWord * Identifier1) | (!KeyWord * Identifier1))
@@ -41,7 +39,7 @@ defmodule ExPression.Parser.Grammar do
       L5 <- L6 * star(L5BinOp)
       L6 <- L7 * star(L6BinOp)
       L7 <- (Special | FCall | Object | Array | Var | Const | "(" * star(S) * Expr * star(S) * ")") * star(AccessOp)
-      Const <- String | Float | Integer  | Null | True | False | TrueP | FalseP
+      Const <- String | Float | Integer  | Null | True | False
       Var <- Identifier * fn [name | cs] -> [{:var, [name]} | cs] end
 
       Special <- str("$") * (String | str(+IdentifierRest)) * fn [value, special | cs] -> [{:special, [special, value]} | cs] end

diff --git a/test/ex_pression/interpreter_test.exs b/test/ex_pression/interpreter_test.exs
@@ -39,7 +39,7 @@ defmodule ExPression.InterpreterTest do
     test "function_call and deep dig (sad path)" do
       {:ok, ast} = Parser.parse("some_result().key.unknown_field")
 
-      assert_raise(ArgumentError, ~r/existing atom/, fn ->
+      assert_raise(ArgumentError, ~r/(existing atom)|(argument error)/, fn ->
         Interpreter.eval(ast, %{}, ObjWithStruct)
       end)
     end