Skip to content

SMV: do not allow defining identifiers that are already declared #982

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 2 commits into from
Feb 10, 2025
Merged

SMV: do not allow defining identifiers that are already declared #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed94b75
whitespace only: alignment in SMV parser
kroening Feb 9, 2025
35ecf21
SMV: do not allow defining identifiers that are already declared
kroening Feb 9, 2025
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
8 changes: 8 additions & 0 deletions regression/smv/assign/assign1.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
KNOWNBUG
assign1.smv

^file .* line 6: variable `x' already assigned.*$
^EXIT=1$
^SIGNAL=0$
--
--
Comment on lines +1 to +8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems there is one test that now works while the others are all KNOWNBUG: do those need further work?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, will need more work.

8 changes: 8 additions & 0 deletions regression/smv/assign/assign1.smv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
MODULE main

VAR x : 1..4;

ASSIGN x := 1;

-- not allowed, x is already assigned
ASSIGN init(x) := 2;
8 changes: 8 additions & 0 deletions regression/smv/assign/assign2.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
KNOWNBUG
assign1.smv

^file .* line 6: variable `x' already assigned.*$
^EXIT=1$
^SIGNAL=0$
--
--
8 changes: 8 additions & 0 deletions regression/smv/assign/assign2.smv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
MODULE main

VAR x : 1..4;

ASSIGN x := 1;

-- not allowed, x is already assigned
ASSIGN next(x) := 2;
8 changes: 8 additions & 0 deletions regression/smv/define/define2.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
define2.smv

^file .* line 6: variable `x' already declared.*$
^EXIT=1$
^SIGNAL=0$
--
--
6 changes: 6 additions & 0 deletions regression/smv/define/define2.smv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MODULE main

VAR x : boolean;

-- not allowed, x is already a variable
DEFINE x := TRUE;
8 changes: 8 additions & 0 deletions regression/smv/define/define3.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
define3.smv

^file .* line 6: variable `x' already defined.*$
^EXIT=1$
^SIGNAL=0$
--
--
6 changes: 6 additions & 0 deletions regression/smv/define/define3.smv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MODULE main

DEFINE x := TRUE;

-- not allowed, x is already defined
VAR x : boolean;
8 changes: 8 additions & 0 deletions regression/smv/define/define4.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
define4.smv

^file .* line 6: variable `x' already defined.*$
^EXIT=1$
^SIGNAL=0$
--
--
6 changes: 6 additions & 0 deletions regression/smv/define/define4.smv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MODULE main

DEFINE x := TRUE;

-- not allowed, x is already defined
ASSIGN x := TRUE;
8 changes: 8 additions & 0 deletions regression/smv/define/define5.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
KNOWNBUG
define5.smv

^file .* line 6: variable `x' already defined.*$
^EXIT=1$
^SIGNAL=0$
--
--
6 changes: 6 additions & 0 deletions regression/smv/define/define5.smv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MODULE main

DEFINE x := TRUE;

-- not allowed, x is already defined
ASSIGN next(x) := TRUE;
8 changes: 8 additions & 0 deletions regression/smv/define/define6.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
KNOWNBUG
define6.smv

^file .* line 6: variable `x' already defined.*$
^EXIT=1$
^SIGNAL=0$
--
--
6 changes: 6 additions & 0 deletions regression/smv/define/define6.smv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MODULE main

DEFINE x := TRUE;

-- not allowed, x is already defined
ASSIGN init(x) := TRUE;
59 changes: 30 additions & 29 deletions src/smvlang/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,39 +477,40 @@ defines: define
;

define : assignment_var BECOMES_Token formula ';'
{
const irep_idt &identifier=stack_expr($1).get(ID_identifier);
smv_parse_treet::mc_vart &var=PARSER.module->vars[identifier];
{
const irep_idt &identifier=stack_expr($1).get(ID_identifier);
smv_parse_treet::mc_vart &var=PARSER.module->vars[identifier];

switch(var.var_class)
{
case smv_parse_treet::mc_vart::UNKNOWN:
var.type.make_nil();
var.var_class=smv_parse_treet::mc_vart::DEFINED;
break;
switch(var.var_class)
{
case smv_parse_treet::mc_vart::UNKNOWN:
var.type.make_nil();
var.var_class=smv_parse_treet::mc_vart::DEFINED;
break;

case smv_parse_treet::mc_vart::DECLARED:
var.var_class=smv_parse_treet::mc_vart::DEFINED;
break;
case smv_parse_treet::mc_vart::DECLARED:
yyerror("variable `"+id2string(identifier)+"' already declared");
YYERROR;
break;

case smv_parse_treet::mc_vart::DEFINED:
yyerror("variable `"+id2string(identifier)+"' already defined");
YYERROR;
break;

case smv_parse_treet::mc_vart::ARGUMENT:
yyerror("variable `"+id2string(identifier)+"' already declared as argument");
YYERROR;
break;

default:
DATA_INVARIANT(false, "unexpected variable class");
}
case smv_parse_treet::mc_vart::DEFINED:
yyerror("variable `"+id2string(identifier)+"' already defined");
YYERROR;
break;

binary($$, $1, ID_equal, $3);
PARSER.module->add_define(to_equal_expr(stack_expr($$)));
}
;
case smv_parse_treet::mc_vart::ARGUMENT:
yyerror("variable `"+id2string(identifier)+"' already declared as argument");
YYERROR;
break;

default:
DATA_INVARIANT(false, "unexpected variable class");
}

binary($$, $1, ID_equal, $3);
PARSER.module->add_define(to_equal_expr(stack_expr($$)));
}
;

formula : term
;
Expand Down
Loading