fix: match duplicate variable/function in raw string

e.g.

"ABC$var_1/123$var_1/456"
"ABC${func1($var_1, $var_3)}--${func1($var_1, $var_3)}"
This commit is contained in:
debugtalk
2019-04-16 19:20:49 +08:00
parent fa9b65cff7
commit 04248ee7e1
3 changed files with 29 additions and 1 deletions

View File

@@ -320,6 +320,11 @@ class TestParserBasic(unittest.TestCase):
self.assertEqual(var._args, ["var_1"])
self.assertEqual(var.to_value(variables_mapping), "ABCabc$")
var = parser.LazyString("ABC$var_1/123$var_1/456", functions_mapping, check_variables_set)
self.assertEqual(var._string, "ABC{}/123{}/456")
self.assertEqual(var._args, ["var_1", "var_1"])
self.assertEqual(var.to_value(variables_mapping), "ABCabc/123abc/456")
var = parser.LazyString("ABC$var_1{", functions_mapping, check_variables_set)
self.assertEqual(var._string, "ABC{}{")
self.assertEqual(var._args, ["var_1"])
@@ -361,6 +366,27 @@ class TestParserBasic(unittest.TestCase):
self.assertEqual(var._string, "ABC{}{}")
self.assertEqual(var.to_value(variables_mapping), "ABCabc123True")
var = parser.LazyString(
"ABC${func1($var_1, $var_3)}--${func1($var_1, $var_3)}",
functions_mapping,
check_variables_set
)
self.assertEqual(var._string, "ABC{}--{}")
self.assertEqual(var.to_value(variables_mapping), "ABCabc123--abc123")
var = parser.LazyString("ABC${func1($var_1, $var_3)}$var_1", functions_mapping, check_variables_set)
self.assertEqual(var._string, "ABC{}{}")
self.assertEqual(var.to_value(variables_mapping), "ABCabc123abc")
# TODO: fix
# var = parser.LazyString(
# "ABC${func1($var_1, $var_3)}$var_1--${func1($var_1, $var_3)}$var_1",
# functions_mapping,
# check_variables_set
# )
# self.assertEqual(var._string, "ABC{}{}--{}{}")
# self.assertEqual(var.to_value(variables_mapping), "ABCabc123abc--abc123abc")
var = parser.LazyString("ABC${func1($var_1, $var_3)}DE$var_4", functions_mapping, check_variables_set)
self.assertEqual(var._string, "ABC{}DE{}")
self.assertEqual(var.to_value(variables_mapping), "ABCabc123DE{'a': 1}")