@@ -510,7 +510,7 @@ module_type_specifier:
510
510
stack_expr ($$).set (ID_identifier,
511
511
smv_module_symbol (stack_expr ($1 ).id_string ()));
512
512
}
513
- | module_name ' (' formula_list ' )'
513
+ | module_name ' (' parameter_list ' )'
514
514
{
515
515
init ($$, " submodule" );
516
516
stack_expr ($$).set (ID_identifier,
@@ -519,6 +519,11 @@ module_type_specifier:
519
519
}
520
520
;
521
521
522
+ parameter_list:
523
+ formula { init ($$); mto ($$, $1 ); }
524
+ | parameter_list ' ,' formula { $$=$1 ; mto ($$, $3 ); }
525
+ ;
526
+
522
527
enum_list : enum_element
523
528
{
524
529
init ($$, ID_enumeration);
@@ -672,7 +677,7 @@ formula : term
672
677
term : variable_identifier
673
678
| next_Token ' (' term ' )' { init ($$, ID_smv_next); mto ($$, $3 ); }
674
679
| ' (' formula ' )' { $$=$2 ; }
675
- | ' {' formula_list ' }' { $$=$2 ; stack_expr ($$).id (ID_smv_set); }
680
+ | ' {' set_body_expr ' }' { $$=$2 ; stack_expr ($$).id (ID_smv_set); }
676
681
| INC_Token ' (' term ' )' { init ($$, " inc" ); mto ($$, $3 ); }
677
682
| DEC_Token ' (' term ' )' { init ($$, " dec" ); mto ($$, $3 ); }
678
683
| ADD_Token ' (' term ' ,' term ' )' { j_binary ($$, $3 , ID_plus, $5 ); }
@@ -776,9 +781,9 @@ range : NUMBER_Token DOTDOT_Token NUMBER_Token
776
781
{ init ($$); mto ($$, $1 ); mto ($$, $3 ); }
777
782
;
778
783
779
- formula_list :
784
+ set_body_expr :
780
785
formula { init ($$); mto ($$, $1 ); }
781
- | formula_list ' ,' formula { $$=$1 ; mto ($$, $3 ); }
786
+ | set_body_expr ' ,' formula { $$=$1 ; mto ($$, $3 ); }
782
787
;
783
788
784
789
identifier : IDENTIFIER_Token
0 commit comments