Merge 29753da into 99b1a35

geographika · Feb 8, 2020 · 8e7aea5 · 8e7aea5
2 parents 99b1a35 + 29753da
commit 8e7aea5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/mappyfile/mapfile.lalr.g b/mappyfile/mapfile.lalr.g
@@ -54,7 +54,7 @@ num_pair: (int|float) (int|float)
 
 attr_bind: "[" UNQUOTED_STRING "]"
 
-not_expression: ("!"|"NOT"i) expression
+not_expression: ("!"|"NOT"i) comparison
 expression: "(" or_test ")"
 ?or_test : (or_test ("OR"i|"||"))? and_test
 ?and_test : (and_test ("AND"i|"&&"))? comparison

diff --git a/tests/test_expressions.py b/tests/test_expressions.py
@@ -392,7 +392,6 @@ def test_class_not_expression_brackets():
     assert(output(s) == exp)
 
 
-@pytest.mark.xfail
 def test_class_not_expression_no_brackets():
     """
     See issue #85 - coding of NOT logical expressions #85