VAMPIRE: close #22, improve test structure for #39, .vql file trouble

1 files changed, 4 insertions, 8 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
index 195b89bb..680213ab 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
@@ -273,15 +273,11 @@ class Logic2VampireLanguageMapper_Support {
                 }
         }
 
-        def protected List<Type> listSubtypes(Type t) {
-                var List<Type> allSubtypes = newArrayList
-                if (!t.subtypes.isEmpty) {
-                        for (subt : t.subtypes) {
-                                allSubtypes.add(subt)
-                                allSubtypes = listSubtypes(subt)
-                        }
+        def protected void listSubtypes(Type t, List<Type> allSubtypes) {
+                for (subt : t.subtypes) {
+                        allSubtypes.add(subt)
+                        listSubtypes(subt, allSubtypes)
                 }
-                return allSubtypes
         }
 
         def protected withAddition(Map<Variable, VLSVariable> map1, Map<Variable, VLSVariable> map2) {