Skip to content

SMV: remove legacy grammar rules #1503

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

Draft
kroening wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −57
Draft

SMV: remove legacy grammar rules #1503

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# EBMC 6.0

* SMV: removed legacy keywords EXTERN and switch

# EBMC 5.9

* Verilog: fix for four-valued | and &
Expand Down
8 changes: 0 additions & 8 deletions regression/smv/smv/smv1.desc
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions regression/smv/smv/smv1.smv
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions src/smvlang/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,6 @@ static smv_parse_treet::modulet &new_module(YYSTYPE &location, YYSTYPE &module_n
%token min_Token "min"

/* Not in the NuSMV manual */
%token EXTERN_Token "EXTERN"
%token switch_Token "switch"
%token notin_Token "notin"
%token R_Token "R"

Expand All @@ -280,12 +278,7 @@ static smv_parse_treet::modulet &new_module(YYSTYPE &location, YYSTYPE &module_n
%token NOTEQUAL_Token "!="
%token LTLT_Token "<<"
%token GTGT_Token ">>"

%token INC_Token
%token DEC_Token
%token BECOMES_Token ":="
%token ADD_Token
%token SUB_Token

%token IDENTIFIER_Token "identifier"
%token QIDENTIFIER_Token "quoted identifier"
Expand Down Expand Up @@ -360,9 +353,6 @@ module_element:
| ltl_specification
| compute_specification
| isa_declaration
/* not in the NuSMV manual */
| EXTERN_Token extern_var semi_opt
| EXTERN_Token
;

var_declaration:
Expand Down Expand Up @@ -523,9 +513,6 @@ ltl_specification:
}
;

extern_var : variable_identifier EQUAL_Token STRING_Token
;

var_list : var_decl
| var_list var_decl
;
Expand Down Expand Up @@ -739,11 +726,6 @@ basic_expr : constant
unary($$, ID_member, $1);
stack_expr($$).set(ID_component_name, stack_expr($3).id());
}
| basic_expr '(' basic_expr ')'
{
// Not in the NuSMV grammar.
binary($$, $1, ID_index, $3);
}
| '(' formula ')' { $$=$2; }
| NOT_Token basic_expr { init($$, ID_not); mto($$, $2); }
| "abs" '(' basic_expr ')' { unary($$, ID_smv_abs, $3); }
Expand Down Expand Up @@ -790,12 +772,6 @@ basic_expr : constant
{ init($$, ID_if); mto($$, $1); mto($$, $3); mto($$, $5); }
| case_Token cases esac_Token { $$=$2; }
| next_Token '(' basic_expr ')' { init($$, ID_smv_next); mto($$, $3); }
/* Not in NuSMV manual */
| INC_Token '(' basic_expr ')' { init($$, "inc"); mto($$, $3); }
| DEC_Token '(' basic_expr ')' { init($$, "dec"); mto($$, $3); }
| ADD_Token '(' basic_expr ',' basic_expr ')' { j_binary($$, $3, ID_plus, $5); }
| SUB_Token '(' basic_expr ',' basic_expr ')' { init($$, ID_minus); mto($$, $3); mto($$, $5); }
| switch_Token '(' variable_identifier ')' '{' switches '}' { init($$, ID_switch); mto($$, $3); mto($$, $6); }
/* CTL */
| AX_Token basic_expr { init($$, ID_AX); mto($$, $2); }
| AF_Token basic_expr { init($$, ID_AF); mto($$, $2); }
Expand Down Expand Up @@ -907,11 +883,6 @@ complex_identifier:
{
binary($$, $1, ID_index, $3);
}
| complex_identifier '(' basic_expr ')'
{
// Not in the NuSMV grammar.
binary($$, $1, ID_index, $3);
}
;

cases :
Expand All @@ -924,16 +895,6 @@ case : formula ':' formula ';'
{ binary($$, $1, ID_case, $3); }
;

switches :
{ init($$, "switches"); }
| switches switch
{ $$=$1; mto($$, $2); }
;

switch : NUMBER_Token ':' basic_expr ';'
{ init($$, ID_switch); mto($$, $1); mto($$, $3); }
;

%%

int yysmverror(const std::string &error)
Expand Down
2 changes: 0 additions & 2 deletions src/smvlang/scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ void newlocation(YYSTYPE &x)
"min" token(min_Token);

/* Not in the NuSMV manual */
"EXTERN" token(EXTERN_Token);
"switch" token(switch_Token);
"notin" token(notin_Token);
"R" token(R_Token);

Expand Down
Loading