diff --git a/build.gradle b/build.gradle index 7cb2506d0275abaf43217a088fa6894e1d2271b2..ce4fd2922d9a1acd58430160dd822fa22a28687f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { allprojects { apply plugin: 'maven' group = 'edu.kit.iti.formal.psdbg' - version = '1.1-experimental' + version = '1.2-experimental' } subprojects { diff --git a/matcher/build.gradle b/matcher/build.gradle deleted file mode 100644 index dc4b9361f3b5c7075fb634d44a6c4bd44d3fc0c2..0000000000000000000000000000000000000000 --- a/matcher/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -apply plugin: 'antlr' - -description = '' - -repositories { mavenCentral() } - -generateGrammarSource { - maxHeapSize = "64m" - arguments += ["-visitor", "-long-messages", - "-package", "edu.kit.iti.formal.psdbg.termmatcher"] - outputDirectory file("${project.buildDir}/generated-src/antlr/main/") -} - -dependencies { - compile group: 'org.antlr', name: 'antlr4', version: '4.7' - antlr group: 'org.antlr', name: 'antlr4', version: '4.7' - compile project(':keydeps') -} diff --git a/rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/matcher/KeyMatcherFacade.java b/rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/matcher/KeyMatcherFacade.java index eb5448c936eb0f2ff9e12026c81ab18945902fd9..cd23e198d7c9770a382165dff9519682382d19ff 100644 --- a/rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/matcher/KeyMatcherFacade.java +++ b/rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/matcher/KeyMatcherFacade.java @@ -30,7 +30,7 @@ public class KeyMatcherFacade { } else { ret = matchesTerm(pattern); } - loggerConsole.info("Pattern: {} against Sequent: {} matches as {}", pattern, this.sequent, ret); + //loggerConsole.info("Pattern: {} against Sequent: {} matches as {}", pattern, this.sequent, ret); return ret; } diff --git a/ui/build.gradle b/ui/build.gradle index b6177c4caebbfad5d47608b5711367bf8784befc..6bb764747d4a085d6546e89b3d1ceb2a1d05b66f 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -54,6 +54,7 @@ task runApp(type: JavaExec) { task distJar(type: Jar) { + manifest { attributes 'Main-Class': mainClassName } @@ -61,4 +62,14 @@ task distJar(type: Jar) { from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } with jar } -distJar.dependsOn jar \ No newline at end of file +distJar.dependsOn jar + +task customFatJar(type: Jar) { + manifest { + attributes 'Main-Class': 'edu.kit.iti.formal.psdbg.gui.ProofScriptDebugger' + } + baseName = 'all-in-one-jar' + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar +} +customFatJar.dependsOn jar \ No newline at end of file diff --git a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/ProofScriptDebugger.java b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/ProofScriptDebugger.java index 49e6cd5c9f8f8b7524f1895a91736b8b0129b1cb..4f1efea744cf47c4e4414089223601b722a1d6bf 100644 --- a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/ProofScriptDebugger.java +++ b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/ProofScriptDebugger.java @@ -27,7 +27,7 @@ import java.util.Locale; public class ProofScriptDebugger extends Application { public static final String NAME = "Proof Script Debugger"; - public static final String VERSION = "Experimental-1.1"; + public static final String VERSION = "1.2-experimental"; public static final String KEY_VERSION = KeYConstants.VERSION; private static Logger consoleLogger = LogManager.getLogger("console"); diff --git a/ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps b/ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps index f891c5839f7873a65aabe4dc9b33966639593cab..475b454970ad01d58cf32cc46cba8c80e127a90d 100644 --- a/ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps +++ b/ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps @@ -6,8 +6,8 @@ script full(){ case match `!q ==> p`: notLeft; notRight; - close; - auto; + closeAntec; + case match `q==>!p`: notLeft; diff --git a/website/docs/index.md b/website/docs/index.md index 2df14499c90926284251820f1fc87f7a19c6abe2..cf32f138ceb96cef7e9a45d2d7199e5b5f8d6a38 100644 --- a/website/docs/index.md +++ b/website/docs/index.md @@ -209,14 +209,14 @@ interactive rule applications. Terms in KPS are enquoted using backticks `. Entering these in the editor of PDBG requires a keyboard layout with the option "no dead keys" enabled. -If this is not possible the terms can be entered by using the shortcut Ctrl+E -which adds a pair of backticks to the cursor position. +
java -jar psdbg-Experimental-1.1.jar
+ Executable with java -jar psdbg-1.2-experimental.jar