Allow dashes in context dimension names

docs/context.rst

@@ -45,7 +45,7 @@ supported operators consult the following grammar outline::
     expression ::= dimension binary_operator values
     expression ::= dimension unary_operator
     expression ::= 'true' | 'false'
-    dimension ::= [[:alnum:]]+
+    dimension ::= [[:alnum:-]]+
     binary_operator ::= '==' | '!=' | '<' | '<=' | '>' | '>=' |
         '~=' | '~!=' | '~<' | '~<=' | '~>' | '~>='
     unary_operator ::= 'is defined' | 'is not defined'

fmf/context.py

@@ -376,15 +376,15 @@ def _op_core(self, dimension_name, values, comparator):
     # Triple expression: dimension operator values
     # [^=].* is necessary as .+ matches '= something'
     re_expression_triple = re.compile(
-        r"(\w+)"
+        r"([\w-]+)"
         + r"\s*("
         + r"|".join(
             set(operator_map.keys()) - {"is defined", "is not defined"})
         + r")\s*"
         + r"([^=].*)")
     # Double expression: dimension operator
     re_expression_double = re.compile(
-        r"(\w+)" + r"\s*(" + r"|".join(["is defined", "is not defined"]) + r")"
+        r"([\w-]+)" + r"\s*(" + r"|".join(["is defined", "is not defined"]) + r")"
         )
 
     # Simple boolean value

tests/unit/test_context.py

@@ -510,6 +510,10 @@ def test_split_expression(self):
         assert Context.split_expression("dim < value , second") == (
             "dim", "<", ["value", "second"])
         assert Context.split_expression("true") == (None, True, None)
+        assert Context.split_expression("provision-method == local") == (
+            "provision-method", "==", ["local"])
+        assert Context.split_expression("provision-method is defined") == (
+            "provision-method", "is defined", None)
 
     def test_parse_rule(self):
         """ Rule parsing """