SMV: do not allow defining identifiers that are already declared

regression/smv/assign/assign1.desc

@@ -0,0 +1,8 @@
+KNOWNBUG
+assign1.smv
+
+^file .* line 6: variable `x' already assigned.*$
+^EXIT=1$
+^SIGNAL=0$
+--
+--

regression/smv/assign/assign1.smv

@@ -0,0 +1,8 @@
+MODULE main
+
+VAR x : 1..4;
+
+ASSIGN x := 1;
+
+-- not allowed, x is already assigned
+ASSIGN init(x) := 2;

regression/smv/assign/assign2.desc

@@ -0,0 +1,8 @@
+KNOWNBUG
+assign1.smv
+
+^file .* line 6: variable `x' already assigned.*$
+^EXIT=1$
+^SIGNAL=0$
+--
+--

regression/smv/assign/assign2.smv

@@ -0,0 +1,8 @@
+MODULE main
+
+VAR x : 1..4;
+
+ASSIGN x := 1;
+
+-- not allowed, x is already assigned
+ASSIGN next(x) := 2;

regression/smv/define/define2.desc

@@ -0,0 +1,8 @@
+CORE
+define2.smv
+
+^file .* line 6: variable `x' already declared.*$
+^EXIT=1$
+^SIGNAL=0$
+--
+--

regression/smv/define/define2.smv

@@ -0,0 +1,6 @@
+MODULE main
+
+VAR x : boolean;
+
+-- not allowed, x is already a variable
+DEFINE x := TRUE;

regression/smv/define/define3.desc

@@ -0,0 +1,8 @@
+CORE
+define3.smv
+
+^file .* line 6: variable `x' already defined.*$
+^EXIT=1$
+^SIGNAL=0$
+--
+--

regression/smv/define/define3.smv

@@ -0,0 +1,6 @@
+MODULE main
+
+DEFINE x := TRUE;
+
+-- not allowed, x is already defined
+VAR x : boolean;

regression/smv/define/define4.desc

@@ -0,0 +1,8 @@
+CORE
+define4.smv
+
+^file .* line 6: variable `x' already defined.*$
+^EXIT=1$
+^SIGNAL=0$
+--
+--

regression/smv/define/define4.smv

@@ -0,0 +1,6 @@
+MODULE main
+
+DEFINE x := TRUE;
+
+-- not allowed, x is already defined
+ASSIGN x := TRUE;

regression/smv/define/define5.desc

@@ -0,0 +1,8 @@
+KNOWNBUG
+define5.smv
+
+^file .* line 6: variable `x' already defined.*$
+^EXIT=1$
+^SIGNAL=0$
+--
+--

regression/smv/define/define5.smv

@@ -0,0 +1,6 @@
+MODULE main
+
+DEFINE x := TRUE;
+
+-- not allowed, x is already defined
+ASSIGN next(x) := TRUE;

regression/smv/define/define6.desc

@@ -0,0 +1,8 @@
+KNOWNBUG
+define6.smv
+
+^file .* line 6: variable `x' already defined.*$
+^EXIT=1$
+^SIGNAL=0$
+--
+--

regression/smv/define/define6.smv

@@ -0,0 +1,6 @@
+MODULE main
+
+DEFINE x := TRUE;
+
+-- not allowed, x is already defined
+ASSIGN init(x) := TRUE;

src/smvlang/parser.y

@@ -489,7 +489,8 @@ define     : assignment_var BECOMES_Token formula ';'
                break;
 
              case smv_parse_treet::mc_vart::DECLARED:
-               var.var_class=smv_parse_treet::mc_vart::DEFINED;
+               yyerror("variable `"+id2string(identifier)+"' already declared");
+               YYERROR;
                break;
 
              case smv_parse_treet::mc_vart::DEFINED: