Merge pull request #13 from wmak/master

fix: Allow conditions containing "-"
zhouzhuojie · Aug 21, 2020 · d618438 · d618438
2 parents ab0d399 + 0542d28
commit d618438
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/parser.go b/parser.go
@@ -358,6 +358,11 @@ func (p *Parser) scanArg() (rune, string, error) {
 			continue
 		}
 		t, _ := p.scan()
+		// Allow variables to contain "-"
+		if t == '-' {
+			sep = "-"
+			continue
+		}
 		if t == '}' {
 			ti, _ := p.scan()
 			if ti == '{' {

diff --git a/parser_test.go b/parser_test.go
@@ -79,6 +79,8 @@ var validTestData = []struct {
 	{"56.43", nil, false, true},
 	{"{var5}", nil, false, true},
 	{"{var0} > -100 AND {var0} < -50", map[string]interface{}{"var0": -75.4}, true, false},
+	{"{var5-type-2}", nil, false, true},
+	{"{var5-type-2} == 1", map[string]interface{}{"var5-type-2": 1}, true, false},
 	{"{var0}", map[string]interface{}{"var0": true}, true, false},
 	{"{var0}", map[string]interface{}{"var0": false}, false, false},
 	{"\"OFF\"", nil, false, true},