Skip to content

SMV grammar: rename variable_name and qstring_list #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2025
Merged

SMV grammar: rename variable_name and qstring_list #1119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/smvlang/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ ltl_specification:
}
;

extern_var : variable_name EQUAL_Token QUOTE_Token
extern_var : variable_identifier EQUAL_Token QUOTE_Token
{
const irep_idt &identifier=stack_expr($1).get(ID_identifier);
smv_parse_treet::mc_vart &var=PARSER.module->vars[identifier];
Expand All @@ -440,7 +440,7 @@ vardecls : vardecl
| vardecls vardecl
;

module_argument: variable_name
module_argument: variable_identifier
{
const irep_idt &identifier=stack_expr($1).get(ID_identifier);
smv_parse_treet::mc_vart &var=PARSER.module->vars[identifier];
Expand Down Expand Up @@ -539,7 +539,7 @@ enum_element: STRING_Token
}
;

vardecl : variable_name ':' type_specifier ';'
vardecl : variable_identifier ':' type_specifier ';'
{
const irep_idt &identifier=stack_expr($1).get(ID_identifier);
smv_parse_treet::mc_vart &var=PARSER.module->vars[identifier];
Expand Down Expand Up @@ -621,7 +621,7 @@ assignment : assignment_head '(' assignment_var ')' BECOMES_Token formula ';'
}
;

assignment_var: variable_name
assignment_var: variable_identifier
;

assignment_head: init_Token { init($$, ID_init); }
Expand Down Expand Up @@ -670,7 +670,7 @@ define : assignment_var BECOMES_Token formula ';'
formula : term
;

term : variable_name
term : variable_identifier
| next_Token '(' term ')' { init($$, ID_smv_next); mto($$, $3); }
| '(' formula ')' { $$=$2; }
| '{' formula_list '}' { $$=$2; stack_expr($$).id("smv_nondet_choice"); }
Expand All @@ -684,7 +684,7 @@ term : variable_name
| case_Token cases esac_Token { $$=$2; }
| term IF_Token term ':' term %prec IF_Token
{ init($$, ID_if); mto($$, $1); mto($$, $3); mto($$, $5); }
| switch_Token '(' variable_name ')' '{' switches '}' { init($$, ID_switch); mto($$, $3); mto($$, $6); }
| switch_Token '(' variable_identifier ')' '{' switches '}' { init($$, ID_switch); mto($$, $3); mto($$, $6); }
| MINUS_Token term %prec UMINUS
{ init($$, ID_unary_minus); mto($$, $2); }
| term mod_Token term { binary($$, $1, ID_mod, $3); }
Expand Down Expand Up @@ -786,7 +786,7 @@ formula_list:
identifier : STRING_Token
;

variable_name: qstring_list
variable_identifier: complex_identifier
{
const irep_idt &id=stack_expr($1).id();

Expand Down Expand Up @@ -826,34 +826,34 @@ variable_name: qstring_list
}
;

qstring_list: QSTRING_Token
complex_identifier: QSTRING_Token
{
init($$, std::string(stack_expr($1).id_string(), 1)); // remove backslash
}
| STRING_Token
| qstring_list DOT_Token QSTRING_Token
| complex_identifier DOT_Token QSTRING_Token
{
std::string id(stack_expr($1).id_string());
id+=".";
id+=std::string(stack_expr($3).id_string(), 1); // remove backslash
init($$, id);
}
| qstring_list DOT_Token STRING_Token
| complex_identifier DOT_Token STRING_Token
{
std::string id(stack_expr($1).id_string());
id+=".";
id+=stack_expr($3).id_string();
init($$, id);
}
| qstring_list '[' NUMBER_Token ']'
| complex_identifier '[' NUMBER_Token ']'
{
std::string id(stack_expr($1).id_string());
id+="[";
id+=stack_expr($3).id_string();
id+="]";
init($$, id);
}
| qstring_list '(' NUMBER_Token ')'
| complex_identifier '(' NUMBER_Token ')'
{
std::string id(stack_expr($1).id_string());
id+="(";
Expand Down
Loading