Merge pull request #1181 from diffblue/smv-rename-formula-list

SMV: split up and rename `formula_list`

Author: tautschnig

src/smvlang/parser.y

@@ -510,7 +510,7 @@ module_type_specifier:
              stack_expr($$).set(ID_identifier,
                            smv_module_symbol(stack_expr($1).id_string()));
            }
-           | module_name '(' formula_list ')'
+           | module_name '(' parameter_list ')'
            {
              init($$, "submodule");
              stack_expr($$).set(ID_identifier,
@@ -519,6 +519,11 @@ module_type_specifier:
            }
            ;
 
+parameter_list:
+             formula { init($$); mto($$, $1); }
+           | parameter_list ',' formula { $$=$1; mto($$, $3); }
+           ;
+
 enum_list  : enum_element
            {
              init($$, ID_enumeration);
@@ -673,7 +678,7 @@ formula    : term
 term       : variable_identifier
            | next_Token '(' term ')'  { init($$, ID_smv_next); mto($$, $3); }
            | '(' formula ')'          { $$=$2; }
-           | '{' formula_list '}'     { $$=$2; stack_expr($$).id(ID_smv_set); }
+           | '{' set_body_expr '}'    { $$=$2; stack_expr($$).id(ID_smv_set); }
            | INC_Token '(' term ')'   { init($$, "inc"); mto($$, $3); }
            | DEC_Token '(' term ')'   { init($$, "dec"); mto($$, $3); }
            | ADD_Token '(' term ',' term ')' { j_binary($$, $3, ID_plus, $5); }
@@ -777,9 +782,9 @@ range      : NUMBER_Token DOTDOT_Token NUMBER_Token
            { init($$); mto($$, $1); mto($$, $3); }
            ;
 
-formula_list:
+set_body_expr:
              formula { init($$); mto($$, $1); }
-           | formula_list ',' formula { $$=$1; mto($$, $3); }
+           | set_body_expr ',' formula { $$=$1; mto($$, $3); }
            ;
 
 identifier : IDENTIFIER_Token