Variable calls support multiple parameters

This also updates filter parameters to be handled the same as calling
a variable.

diff --git a/tatsu_grammar.txt b/tatsu_grammar.txt
index bd01bcab096bd566923cce9218606157ab8c8e0b..a9512805d616ffa847cb1515fbc20de1a182a0fa 100644 (file)
--- a/tatsu_grammar.txt
+++ b/tatsu_grammar.txt
@@ -97,7 +97,13 @@ variable_accessor_brackets
 \r
 variable_accessor_call\r
     =\r
-    "(" [variable_identifier] ")"\r
+    "(" [variable_accessor_call_parameters] ")"\r
+    ;\r
+\r
+variable_accessor_call_parameters\r
+    =\r
+    {SP}* @+:variable_identifier {SP}*\r
+    { "," {SP}* @+:variable_identifier {SP}* }*\r
     ;\r
 \r
 variable_accessor_dot\r
@@ -116,20 +122,8 @@ filter =
 \r
 filter_parameters\r
     =\r
-    "("\r
-        @:[filter_parameter_list]\r
-    ")"\r
-    ;\r
-filter_parameter_list\r
-    =\r
-    @+:filter_parameter {filter_parameter_separator ~ @+:filter_parameter}*\r
-    ;\r
-\r
-filter_parameter_separator\r
-    =\r
-    {SP}* "," {SP}*\r
+    variable_accessor_call\r
     ;\r
-filter_parameter        = variable_identifier ;\r
 \r
 comment_expression      = comment_open comment_content comment_close ;\r
 comment_open            = "{#" ;\r