diff --git a/omegaconf/grammar_parser.py b/omegaconf/grammar_parser.py index 6a6b78f6d..181e702c9 100644 --- a/omegaconf/grammar_parser.py +++ b/omegaconf/grammar_parser.py @@ -22,10 +22,10 @@ _config_key = f"({_id}|\\$)+" # foo, $bar, $foo$bar$ _node_path = f"(\\.)*({_config_key}(\\.{_config_key})*)?" # foo, .foo.$bar _node_inter = f"\\${{\\s*{_node_path}\\s*}}" # node interpolation ${foo.bar} -_resolver_path = f"({_id}(\\.{_id})*)?" # foo, ns.bar3, ns_1.ns_2.b0z +_resolver_name = f"({_id}(\\.{_id})*)?" # foo, ns.bar3, ns_1.ns_2.b0z _arg = "[a-zA-Z_0-9/\\-\\+.$%*@]+" # string representing a resolver argument _args = f"{_arg}(\\s*,\\s*{_arg})*" # list of resolver arguments -_resolver_inter = f"\\${{\\s*{_resolver_path}\\s*:\\s*{_args}?\\s*}}" # ${foo:bar} +_resolver_inter = f"\\${{\\s*{_resolver_name}\\s*:\\s*{_args}?\\s*}}" # ${foo:bar} _inter = f"({_node_inter}|{_resolver_inter})" # any kind of interpolation _outer = "([^$]|\\$(?!{))+" # any character except $ (unless not followed by {) SIMPLE_INTERPOLATION_PATTERN = re.compile(