rebuild qmaxuse

classicwuhao · Jan 4, 2022 · d466444 · d466444
1 parent fff7ac0
commit d466444
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 17 deletions.
diff --git a/build/classes/org/tzi/use/query/QueryCompiler.class b/build/classes/org/tzi/use/query/QueryCompiler.class
diff --git a/build/classes/org/tzi/use/query/setup/Settings.class b/build/classes/org/tzi/use/query/setup/Settings.class
diff --git a/lib/qmaxuse.jar b/lib/qmaxuse.jar
diff --git a/lib/use-gui.jar b/lib/use-gui.jar
diff --git a/lib/use-runtime.jar b/lib/use-runtime.jar
diff --git a/src/main/org/tzi/use/parser/generator/GeneratorLexer.java b/src/main/org/tzi/use/parser/generator/GeneratorLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 Generator.g 2022-01-04 15:59:36
+// $ANTLR 3.4 Generator.g 2022-01-04 16:20:13
 
 package org.tzi.use.parser.generator;
 

diff --git a/src/main/org/tzi/use/parser/generator/GeneratorParser.java b/src/main/org/tzi/use/parser/generator/GeneratorParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 Generator.g 2022-01-04 15:59:36
+// $ANTLR 3.4 Generator.g 2022-01-04 16:20:13
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/ocl/OCLLexer.java b/src/main/org/tzi/use/parser/ocl/OCLLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 OCL.g 2022-01-04 15:59:32
+// $ANTLR 3.4 OCL.g 2022-01-04 16:20:09
 
 package org.tzi.use.parser.ocl; 
 

diff --git a/src/main/org/tzi/use/parser/ocl/OCLParser.java b/src/main/org/tzi/use/parser/ocl/OCLParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 OCL.g 2022-01-04 15:59:31
+// $ANTLR 3.4 OCL.g 2022-01-04 16:20:09
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/shell/ShellCommandLexer.java b/src/main/org/tzi/use/parser/shell/ShellCommandLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 ShellCommand.g 2022-01-04 15:59:35
+// $ANTLR 3.4 ShellCommand.g 2022-01-04 16:20:13
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/shell/ShellCommandParser.java b/src/main/org/tzi/use/parser/shell/ShellCommandParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 ShellCommand.g 2022-01-04 15:59:35
+// $ANTLR 3.4 ShellCommand.g 2022-01-04 16:20:12
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/soil/SoilLexer.java b/src/main/org/tzi/use/parser/soil/SoilLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 Soil.g 2022-01-04 15:59:32
+// $ANTLR 3.4 Soil.g 2022-01-04 16:20:10
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/soil/SoilParser.java b/src/main/org/tzi/use/parser/soil/SoilParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 Soil.g 2022-01-04 15:59:32
+// $ANTLR 3.4 Soil.g 2022-01-04 16:20:10
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/testsuite/TestSuiteLexer.java b/src/main/org/tzi/use/parser/testsuite/TestSuiteLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 TestSuite.g 2022-01-04 15:59:37
+// $ANTLR 3.4 TestSuite.g 2022-01-04 16:20:14
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/testsuite/TestSuiteParser.java b/src/main/org/tzi/use/parser/testsuite/TestSuiteParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 TestSuite.g 2022-01-04 15:59:36
+// $ANTLR 3.4 TestSuite.g 2022-01-04 16:20:14
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/use/USELexer.java b/src/main/org/tzi/use/parser/use/USELexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 USE.g 2022-01-04 15:59:33
+// $ANTLR 3.4 USE.g 2022-01-04 16:20:11
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/parser/use/USEParser.java b/src/main/org/tzi/use/parser/use/USEParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 USE.g 2022-01-04 15:59:33
+// $ANTLR 3.4 USE.g 2022-01-04 16:20:11
 
 /*
  * USE - UML based specification environment

diff --git a/src/main/org/tzi/use/query/QueryCompiler.java b/src/main/org/tzi/use/query/QueryCompiler.java
@@ -28,6 +28,7 @@
 import org.tzi.use.query.io.Color;
 import org.tzi.use.query.graph.*;
 import org.tzi.use.query.setup.Settings;
+import org.tzi.use.query.setup.OS;
 import org.tzi.use.query.setup.Solver;
 import java.io.PrintStream;
 import org.tzi.use.common.*;
@@ -42,11 +43,29 @@ public class QueryCompiler{
     public QueryCompiler(){}
 
     public static void set_solver(String solver){
+        OS os = settings.System();
         if (solver.equals(Solver.Z3.toString())){
-            settings.SetSolver(Solver.Z3);
+            if (os==OS.WINDOWS | os==OS.LINUX | os==OS.MACOS){
+                settings.SetSolver(Solver.Z3);
+            }
+            else{
+                System.out.println("Z3 is currently supported for Windows, Linux and MacOS.");
+                settings.SetSolver(Solver.UNDEF);
+            }
         }
         else if (solver.equals(Solver.CVC5.toString())){
-            settings.SetSolver(Solver.CVC5);
+            if (os==OS.LINUX | os==OS.MACOS){
+                settings.SetSolver(Solver.CVC5);
+            }
+            else if (os==OS.WINDOWS){
+                System.out.println("CVC5 is not supported for Windows");
+                System.out.println("Switch back to Z3.");
+                settings.SetSolver(Solver.Z3);
+            }
+            else{
+                System.out.println("CVC5 is currently supported for Linux and MacOS.");
+                settings.SetSolver(Solver.UNDEF);
+            }
         }
         else {
             System.out.println("unrecognised solver - "+solver);

diff --git a/src/main/org/tzi/use/query/QueryLexer.java b/src/main/org/tzi/use/query/QueryLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 Query.g 2022-01-04 15:59:34
+// $ANTLR 3.4 Query.g 2022-01-04 16:20:12
 
 package org.tzi.use.query;
 import org.tzi.use.query.ast.*;

diff --git a/src/main/org/tzi/use/query/QueryParser.java b/src/main/org/tzi/use/query/QueryParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 Query.g 2022-01-04 15:59:34
+// $ANTLR 3.4 Query.g 2022-01-04 16:20:12
 
 package org.tzi.use.query;
 import org.tzi.use.query.ast.*;

diff --git a/src/main/org/tzi/use/query/setup/Settings.java b/src/main/org/tzi/use/query/setup/Settings.java
@@ -53,7 +53,8 @@ else if (strOS.contains("Windows")){
     }
 
     public String OS(){return this.os.toString();}
-
+    public OS System(){return this.os;}
+
     public void SetSolver(Solver solver){
         if (solver!=Solver.UNDEF){
             this.MainSolver=solver;