Skip to content
Snippets Groups Projects
Commit bb6cbc91 authored by dgelessus's avatar dgelessus
Browse files

Make STANDARD_MODULES enum private

parent f2b5e664
No related branches found
No related tags found
No related merge requests found
...@@ -13,17 +13,25 @@ import java.nio.charset.StandardCharsets; ...@@ -13,17 +13,25 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.*; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import de.be4.classicalb.core.parser.exceptions.BCompoundException; import de.be4.classicalb.core.parser.exceptions.BCompoundException;
import de.tlc4b.analysis.UsedStandardModules.STANDARD_MODULES;
import de.tlc4b.exceptions.TLC4BIOException;
import de.tlc4b.exceptions.TLC4BException; import de.tlc4b.exceptions.TLC4BException;
import de.tlc4b.exceptions.TLC4BIOException;
import de.tlc4b.exceptions.TranslationException; import de.tlc4b.exceptions.TranslationException;
import de.tlc4b.tlc.TLCOutputInfo; import de.tlc4b.tlc.TLCOutputInfo;
import de.tlc4b.tlc.TLCResults; import de.tlc4b.tlc.TLCResults;
import de.tlc4b.util.StopWatch; import de.tlc4b.util.StopWatch;
import org.apache.commons.cli.*;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import static de.tlc4b.TLC4BCliOptions.*; import static de.tlc4b.TLC4BCliOptions.*;
import static de.tlc4b.TLC4BCliOptions.TLCOption.*; import static de.tlc4b.TLC4BCliOptions.TLCOption.*;
...@@ -448,8 +456,8 @@ public class TLC4B { ...@@ -448,8 +456,8 @@ public class TLC4B {
} }
private void createStandardModules() { private void createStandardModules() {
for (STANDARD_MODULES module : translator.getStandardModuleToBeCreated()) { for (String module : translator.getStandardModuleToBeCreated()) {
createStandardModule(buildDir, module.toString()); createStandardModule(buildDir, module);
} }
} }
......
...@@ -2,8 +2,8 @@ package de.tlc4b; ...@@ -2,8 +2,8 @@ package de.tlc4b;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set;
import de.be4.classicalb.core.parser.BParser; import de.be4.classicalb.core.parser.BParser;
import de.be4.classicalb.core.parser.analysis.prolog.RecursiveMachineLoader; import de.be4.classicalb.core.parser.analysis.prolog.RecursiveMachineLoader;
...@@ -21,7 +21,6 @@ import de.tlc4b.analysis.Renamer; ...@@ -21,7 +21,6 @@ import de.tlc4b.analysis.Renamer;
import de.tlc4b.analysis.Typechecker; import de.tlc4b.analysis.Typechecker;
import de.tlc4b.analysis.UnsupportedConstructsFinder; import de.tlc4b.analysis.UnsupportedConstructsFinder;
import de.tlc4b.analysis.UsedStandardModules; import de.tlc4b.analysis.UsedStandardModules;
import de.tlc4b.analysis.UsedStandardModules.STANDARD_MODULES;
import de.tlc4b.analysis.transformation.DefinitionsEliminator; import de.tlc4b.analysis.transformation.DefinitionsEliminator;
import de.tlc4b.analysis.transformation.SeesEliminator; import de.tlc4b.analysis.transformation.SeesEliminator;
import de.tlc4b.analysis.transformation.SequenceSubstitutionsEliminator; import de.tlc4b.analysis.transformation.SequenceSubstitutionsEliminator;
...@@ -44,7 +43,7 @@ public class Translator { ...@@ -44,7 +43,7 @@ public class Translator {
private String machineName; private String machineName;
private String ltlFormula; private String ltlFormula;
private PPredicate constantsSetup; private PPredicate constantsSetup;
private HashSet<STANDARD_MODULES> standardModulesToBeCreated; private Set<String> standardModulesToBeCreated;
private TLCOutputInfo tlcOutputInfo; private TLCOutputInfo tlcOutputInfo;
private String translatedLTLFormula; private String translatedLTLFormula;
...@@ -193,11 +192,7 @@ public class Translator { ...@@ -193,11 +192,7 @@ public class Translator {
return tlcOutputInfo; return tlcOutputInfo;
} }
public boolean containsUsedStandardModule(STANDARD_MODULES module) { public Set<String> getStandardModuleToBeCreated() {
return standardModulesToBeCreated.contains(module);
}
public HashSet<UsedStandardModules.STANDARD_MODULES> getStandardModuleToBeCreated() {
return standardModulesToBeCreated; return standardModulesToBeCreated;
} }
......
...@@ -4,6 +4,7 @@ import java.util.ArrayList; ...@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import de.be4.classicalb.core.parser.analysis.DepthFirstAdapter; import de.be4.classicalb.core.parser.analysis.DepthFirstAdapter;
import de.be4.classicalb.core.parser.node.AAddExpression; import de.be4.classicalb.core.parser.node.AAddExpression;
...@@ -103,8 +104,7 @@ import de.tlc4b.btypes.SetType; ...@@ -103,8 +104,7 @@ import de.tlc4b.btypes.SetType;
import de.tlc4b.tla.TLAModule; import de.tlc4b.tla.TLAModule;
public class UsedStandardModules extends DepthFirstAdapter { public class UsedStandardModules extends DepthFirstAdapter {
private enum STANDARD_MODULES {
public enum STANDARD_MODULES {
Naturals, Integers, FiniteSets, Sequences, TLC, BBuiltIns, Relations, FunctionsAsRelations, Functions, SequencesExtended, SequencesAsRelations, ExternalFunctions, Foo Naturals, Integers, FiniteSets, Sequences, TLC, BBuiltIns, Relations, FunctionsAsRelations, Functions, SequencesExtended, SequencesAsRelations, ExternalFunctions, Foo
} }
...@@ -149,7 +149,7 @@ public class UsedStandardModules extends DepthFirstAdapter { ...@@ -149,7 +149,7 @@ public class UsedStandardModules extends DepthFirstAdapter {
start.apply(this); start.apply(this);
} }
public ArrayList<STANDARD_MODULES> getExtendedModules() { public List<String> getExtendedModules() {
ArrayList<STANDARD_MODULES> list = new ArrayList<>(extendedStandardModules); ArrayList<STANDARD_MODULES> list = new ArrayList<>(extendedStandardModules);
if (list.contains(STANDARD_MODULES.Integers)) { if (list.contains(STANDARD_MODULES.Integers)) {
list.remove(STANDARD_MODULES.Naturals); list.remove(STANDARD_MODULES.Naturals);
...@@ -159,10 +159,10 @@ public class UsedStandardModules extends DepthFirstAdapter { ...@@ -159,10 +159,10 @@ public class UsedStandardModules extends DepthFirstAdapter {
Integer i2 = modules.indexOf(s2); Integer i2 = modules.indexOf(s2);
return i1.compareTo(i2); return i1.compareTo(i2);
}); });
return list; return list.stream().map(STANDARD_MODULES::name).collect(Collectors.toList());
} }
public HashSet<STANDARD_MODULES> getStandardModulesToBeCreated() { public Set<String> getStandardModulesToBeCreated() {
// dependencies of standard modules // dependencies of standard modules
HashSet<STANDARD_MODULES> res = new HashSet<>(); HashSet<STANDARD_MODULES> res = new HashSet<>();
for (STANDARD_MODULES module : extendedStandardModules) { for (STANDARD_MODULES module : extendedStandardModules) {
...@@ -199,7 +199,7 @@ public class UsedStandardModules extends DepthFirstAdapter { ...@@ -199,7 +199,7 @@ public class UsedStandardModules extends DepthFirstAdapter {
} }
} }
return res; return res.stream().map(STANDARD_MODULES::name).collect(Collectors.toSet());
} }
@Override @Override
......
...@@ -299,15 +299,10 @@ public class TLAPrinter extends DepthFirstAdapter { ...@@ -299,15 +299,10 @@ public class TLAPrinter extends DepthFirstAdapter {
} }
private void printExtendedModules() { private void printExtendedModules() {
if (!usedStandardModules.getExtendedModules().isEmpty()) { List<String> extendedModules = usedStandardModules.getExtendedModules();
if (!extendedModules.isEmpty()) {
moduleStringAppend("EXTENDS "); moduleStringAppend("EXTENDS ");
for (int i = 0; i < usedStandardModules.getExtendedModules().size(); i++) { moduleStringAppend(String.join(", ", extendedModules));
if (i > 0) {
moduleStringAppend(", ");
}
moduleStringAppend(usedStandardModules.getExtendedModules()
.get(i).toString());
}
moduleStringAppend("\n"); moduleStringAppend("\n");
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment