SMV: flatten hierarchy on parse tree

regression/smv/define/define2.desc

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

regression/smv/define/define3.desc

@@ -1,7 +1,7 @@
 CORE
 define3.smv
 
-^file .* line 6: variable x already declared, at file .* line 3$
+^file .* line 6: identifier x already used as define$
 ^EXIT=2$
 ^SIGNAL=0$
 --

regression/smv/enums/name_collision1.desc

@@ -1,9 +1,9 @@
-KNOWNBUG
+CORE
 name_collision1.smv
 
-^EXIT=0$
+^file .* line 6: identifier red already used as enum$
+^EXIT=2$
 ^SIGNAL=0$
 --
 ^warning: ignoring
 --
-This crashes.

regression/smv/enums/name_collision2.desc

@@ -1,7 +1,7 @@
 CORE
 name_collision2.smv
 
-^file .* line 8: enum red already declared, at file .* line 3$
+^file .* line 8: identifier red already used as variable$
 ^EXIT=2$
 ^SIGNAL=0$
 --

regression/smv/enums/name_collision3.desc

@@ -1,9 +1,9 @@
-KNOWNBUG
+CORE
 name_collision3.smv
 
-^EXIT=0$
+^file .* line 8: identifier red already used as enum$
+^EXIT=2$
 ^SIGNAL=0$
 --
 ^warning: ignoring
 --
-This crashes.

regression/smv/modules/parameters2.desc

@@ -1,9 +1,8 @@
-KNOWNBUG
+CORE
 parameters2.smv
 
 ^EXIT=10$
 ^SIGNAL=0$
 --
 ^warning: ignoring
 --
-This yields a type-checking error.

regression/smv/var/already_declared1.desc

@@ -1,7 +1,7 @@
 CORE
 already_declared1.smv
 
-^file .* line 6: variable x already declared, at file .* line 3$
+^file .* line 6: identifier x already used as variable$
 ^EXIT=2$
 ^SIGNAL=0$
 --

regression/smv/var/already_declared2.desc

@@ -1,7 +1,7 @@
 CORE
 already_declared2.smv
 
-^file .* line 6: variable x already declared, at file .* line 3$
+^file .* line 6: identifier x already used as define$
 ^EXIT=2$
 ^SIGNAL=0$
 --

regression/smv/var/already_declared3.desc

@@ -1,7 +1,7 @@
 CORE
 already_declared3.smv
 
-^file .* line 8: variable x already declared, at file .* line 5$
+^file .* line 8: identifier x already used as variable$
 ^EXIT=2$
 ^SIGNAL=0$
 --

src/smvlang/smv_parse_tree.h

@@ -24,7 +24,7 @@ class smv_parse_treet
   struct modulet
   {
     irep_idt name, base_name;
-    std::list<irep_idt> parameters;
+    std::vector<irep_idt> parameters;
 
     struct elementt
     {