Commit e35d6ac7 authored by Sarah Grebing's avatar Sarah Grebing

Docu, and changed package building plugin

parent b2d6b0e4
Pipeline #17240 passed with stages
in 9 minutes and 38 seconds
...@@ -156,7 +156,7 @@ public class KeYMatcher implements MatcherApi<KeyData> { ...@@ -156,7 +156,7 @@ public class KeYMatcher implements MatcherApi<KeyData> {
} }
assignments.forEach(variableAssignment -> System.out.println(variableAssignment)); // assignments.forEach(variableAssignment -> System.out.println(variableAssignment));
return assignments.isEmpty()? null: assignments; return assignments.isEmpty()? null: assignments;
} }
...@@ -198,11 +198,11 @@ public class KeYMatcher implements MatcherApi<KeyData> { ...@@ -198,11 +198,11 @@ public class KeYMatcher implements MatcherApi<KeyData> {
Value<String> value = toValueTerm(currentState.getData(), matched); Value<String> value = toValueTerm(currentState.getData(), matched);
va.declare(s, value.getType()); va.declare(s, value.getType());
va.assign(s, value); va.assign(s, value);
LOGGER.error("Variables to match " + s + " : " + value); //LOGGER.info("Variables to match " + s + " : " + value);
} }
} }
List<VariableAssignment> retList = new LinkedList(); List<VariableAssignment> retList = new LinkedList();
LOGGER.error("Matched Variables " + va.toString()); LOGGER.info("Matched Variables " + va.toString());
retList.add(va); retList.add(va);
return retList; return retList;
} }
......
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>smt</title>
</head>
<body>
<h2 id="smt">smt</h2>
<blockquote>
<p>Synopsis: <code>cut TERM</code></p>
</blockquote>
<p></strong>Description:</strong>
Performs a cut and thus splits the sequent into two goals. The unnamed
argument is the formula to cut with
</p>
<p><strong>Arguments:</strong></p>
<ul>
<li><em>TERM</em> formula to cut with</li>
</ul>
Examples:
<code>cut `value1 = value2`;</code>
</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
</blockquote> </blockquote>
<p><strong>Arguments:</strong></p> <p><strong>Arguments:</strong></p>
<ul> <ul>
<li><code>formula</code> : <em>TERM</em> (<em>R</em>)null</li> <li><code>formula</code> : <em>TERM</em> top-level formula where variables should be instantiated</li>
<li><code>var</code> : <em>STRING</em> (<em>R</em>)null</li> <li><code>var</code> : <em>STRING</em> the variable name that shoudl be instantiated</li>
<li><code>occ</code> : <em>INT</em> (<em>R</em>)null</li> <li><code>occ</code> : <em>INT</em> occurence of the top-level formula</li>
<li><code>with</code> : <em>TERM</em> (<em>R</em>)null</li> <li><code>with</code> : <em>TERM</em> the term with which variables should be instantiated</li>
</ul> </ul>
</body> </body>
</html> </html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>macro</title>
</head>
<body>
<h2 id="macro">macro</h2>
<blockquote>
<p>Synopsis: <code>macro macroname </code></p>
</blockquote>
<p></strong>Description:</strong>
The macro command applies the macro specified as argument
</p>
<code>macro</code> keyword can be ommited
<p><strong>Arguments:</strong></p>
<ul>
<li>macroname : <em>STRING</em> name of macro to apply</li>
</ul>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Call to subscripts</title>
</head>
<body>
<h2 id="script">Call to subscripts</h2>
<blockquote>
<p>Synopsis: <code>scriptname; </code></p>
</blockquote>
Call of a subscript.
<p><strong>Arguments:</strong></p>
Arguments according to the subscript's declaration.
</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<body>
This command is currently not supported by PSDBG.
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>smt</title>
</head>
<body>
<h2 id="smt">smt</h2>
<blockquote>
<p>Synopsis: <code>smt solver=&lt;STRING&gt;</code></p>
</blockquote>
<p></strong>Description:</strong>
Invoke an external SMT solver. That solver must be adequately
configured outside the script mechanism. By default, Z3 is invoked,
but that can be chosen.
</p>
<p><strong>Arguments:</strong></p>
<ul>
<li>solver : <em>STRING</em> comma separated list of SMT solvers (currently supported: "z3", "yices")</li>
</ul>
</body>
</html>
\ No newline at end of file
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>autopilot-prep</title> <title>autopilot_prep</title>
</head> </head>
<body> <body>
<h2 id="autopilot-prep">autopilot-prep</h2> <h2 id="autopilot-prep">autopilot_prep</h2>
<blockquote> <blockquote>
<p>Synopsis: <code>autopilot-prep;</code></p> <p>Synopsis: <code>autopilot_prep;</code></p>
</blockquote> </blockquote>
<p><strong></strong>Description:</strong></strong></p> <p><strong></strong>Description:</strong></strong></p>
This macro performs the following steps: This macro performs the following steps:
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>infflow-autopilot</title> <title>infflow_autopilot</title>
</head> </head>
<body> <body>
<h2 id="infflow-autopilot">infflow-autopilot</h2> <h2 id="infflow-autopilot">infflow_autopilot</h2>
<blockquote> <blockquote>
<p>Synopsis: <code>infflow-autopilot;</code></p> <p>Synopsis: <code>infflow_autopilot;</code></p>
</blockquote> </blockquote>
<p><strong></strong>Description:</strong></strong></p> <p><strong></strong>Description:</strong></strong></p>
This macro is tailored to information flow problems. This macro is tailored to information flow problems.
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>nosplit-prop</title> <title>nosplit_prop</title>
</head> </head>
<body> <body>
<h2 id="symbex">nosplit-prop</h2> <h2 id="symbex">nosplit_prop</h2>
<blockquote> <blockquote>
<p>Synopsis: <code>nosplit-prop;</code></p> <p>Synopsis: <code>nosplit_prop;</code></p>
</blockquote> </blockquote>
<p><strong></strong>Description:</strong></strong></p> <p><strong></strong>Description:</strong></strong></p>
This macros applies rules to decompose propositional toplevel formulas without applying splitting rules. This macros applies rules to decompose propositional toplevel formulas without applying splitting rules.
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>simp-heap</title> <title>simp_heap</title>
</head> </head>
<body> <body>
<h2 id="symbex">simp-heap</h2> <h2 id="symbex">simp_heap</h2>
<blockquote> <blockquote>
<p>Synopsis: <code>simp-heap;</code></p> <p>Synopsis: <code>simp_heap;</code></p>
</blockquote> </blockquote>
<p><strong></strong>Description:</strong></strong></p> <p><strong></strong>Description:</strong></strong></p>
This macro performs simplification of Heap and LocSet terms. This macro performs simplification of Heap and LocSet terms.
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>simp-int</title> <title>simp_int</title>
</head> </head>
<body> <body>
<h2 id="symbex">simp-int</h2> <h2 id="symbex">simp_int</h2>
<blockquote> <blockquote>
<p>Synopsis: <code>simp-int;</code></p> <p>Synopsis: <code>simp_int;</code></p>
</blockquote> </blockquote>
<p><strong></strong>Description:</strong></strong></p> <p><strong></strong>Description:</strong></strong></p>
This macro performs simplification of integers and terms with integers. This macro performs simplification of integers and terms with integers.
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>simp-upd</title> <title>simp_upd</title>
</head> </head>
<body> <body>
<h2 id="simp-upd">simp-upd</h2> <h2 id="simp-upd">simp_upd</h2>
<blockquote> <blockquote>
<p>Synopsis: <code>simp-upd;</code></p> <p>Synopsis: <code>simp_upd;</code></p>
</blockquote> </blockquote>
<p><strong></strong>Description:</strong></strong></p> <p><strong></strong>Description:</strong></strong></p>
This macro applies only update simplification rules, i.e., that simplify the update term. This macro applies only update simplification rules, i.e., that simplify the update term.
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<title>split-prop</title> <title>split-prop</title>
</head> </head>
<body> <body>
<h2 id="symbex">split-prop</h2> <h2 id="symbex">split_prop</h2>
<blockquote> <blockquote>
<p>Synopsis: <code>split-prop;</code></p> <p>Synopsis: <code>split_prop;</code></p>
</blockquote> </blockquote>
<p><strong></strong>Description:</strong></strong></p> <p><strong></strong>Description:</strong></strong></p>
This macros applies rules to decompose propositional toplevel formulas and also applies splitting rules. This macros applies rules to decompose propositional toplevel formulas and also applies splitting rules.
......
...@@ -72,50 +72,29 @@ ...@@ -72,50 +72,29 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>appassembler-maven-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>1.10</version>
<configuration> <configuration>
<repositoryLayout>flat</repositoryLayout> <descriptorRefs>
<repositoryName>libs</repositoryName> <descriptorRef>jar-with-dependencies</descriptorRef>
<binFolder>./</binFolder> </descriptorRefs>
<!-- Set the target configuration directory to be used in the bin scripts --> <archive>
<configurationDirectory>conf</configurationDirectory> <manifest>
<!-- Copy the contents from "/src/main/config" to the target
configuration directory in the assembled application -->
<copyConfigurationDirectory>true</copyConfigurationDirectory>
<!-- Include the target configuration directory in the beginning of
the classpath declaration in the bin scripts -->
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
<!-- set alternative assemble directory -->
<assembleDirectory>${project.build.directory}/dist</assembleDirectory>
<!-- Extra JVM arguments that will be included in the bin scripts -->
<extraJvmArguments>-Xms128m</extraJvmArguments>
<!-- Generate bin scripts for windows and unix pr default -->
<platforms>
<platform>windows</platform>
<platform>unix</platform>
</platforms>
<programs>
<program>
<mainClass>edu.kit.iti.formal.psdbg.gui.ProofScriptDebugger</mainClass> <mainClass>edu.kit.iti.formal.psdbg.gui.ProofScriptDebugger</mainClass>
<id>psdbg</id> </manifest>
<!-- Only generate unix shell script for this application --> </archive>
<platforms>
<platform>unix</platform>
<platform>windows</platform>
</platforms>
</program>
</programs>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!--HIER EVTL. PLUGIN HIN-->
<plugin> <plugin>
......
...@@ -121,9 +121,20 @@ public class CommandHelp extends BorderPane { ...@@ -121,9 +121,20 @@ public class CommandHelp extends BorderPane {
class CommandEntry { class CommandEntry {
String name, additionalInformation; String name, additionalInformation;
@Override @Override
public String toString() { public String toString() {
return name + " (" + additionalInformation + ")"; return beautifyName(name) + " (" + additionalInformation + ")";
}
private String beautifyName(String cname) {
String ret;
if (cname.contains("-")) {
ret = cname.replace("-", "_");
return ret;
} else {
return cname;
}
} }
} }
} }
...@@ -317,7 +317,7 @@ public class ScriptController { ...@@ -317,7 +317,7 @@ public class ScriptController {
lastScriptArea = area; lastScriptArea = area;
lastRegion = r; lastRegion = r;
} else { } else {
logger.error("Could not find editor for: " + node.getOrigin()); logger.error("Could not find editor for the node to highlight: " + node.getOrigin());
} }
} }
......
...@@ -26,9 +26,7 @@ import javafx.scene.input.MouseEvent; ...@@ -26,9 +26,7 @@ import javafx.scene.input.MouseEvent;
import javafx.scene.layout.BorderPane; import javafx.scene.layout.BorderPane;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Pattern;
public class SequentMatcher extends BorderPane { public class SequentMatcher extends BorderPane {
...@@ -86,7 +84,7 @@ public class SequentMatcher extends BorderPane { ...@@ -86,7 +84,7 @@ public class SequentMatcher extends BorderPane {
Range r = cursorPosition.get(pio); Range r = cursorPosition.get(pio);
sequentView.setStyleClass(r.start(), r.end(), "sequent-highlight"); sequentView.setStyleClass(r.start(), r.end(), "sequent-highlight");
System.out.println("Highlight " + r.start() + " " + r.end()); //System.out.println("Highlight " + r.start() + " " + r.end());
}); });
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<h3>Thanks to:</h3> <h3>Thanks to:</h3>
<ul> <ul>
<li>Lulu Luang</li> <li>An Thuy Tien Luong</li>
<li>Mattias Ulbrich</li> <li>Mattias Ulbrich</li>
</ul> </ul>
</body> </body>
......
...@@ -12,4 +12,5 @@ Authors: ...@@ -12,4 +12,5 @@ Authors:
* Alexander Weigl <weigl@ira.uka.de> * Alexander Weigl <weigl@ira.uka.de>
https://formal.iti.kit.edu/~weigl https://formal.iti.kit.edu/~weigl
* Lulu Lulong * An Thuy Tien Luong
...@@ -208,16 +208,18 @@ interactive rule applications. ...@@ -208,16 +208,18 @@ interactive rule applications.
<h2>Downloads</h2> <h2>Downloads</h2>
<ul> <ul>
<li>PSDBG - <strong>Version 1.0-FM</strong> <li>PSDBG - <strong>Version 1.0.1b-FM</strong>
<a href="../psdbg_releases/psdbg-1.0-fm.jar">psdbg-1.0-fm.jar</a> <a href="../psdbg_releases/psdbg-1.0.1b-fm.jar">psdbg-1.0.1b-fm.jar</a>
<br> <br>
Special Version for the tool paper at Formal Methods 2018. Special Version for the tool paper at Formal Methods 2018.
Including examples and all dependencies. Including examples and all dependencies.
<br> <br>
<!-- Requires Java version 1.8.0_121 or higher -->
<br>
<a href="https://www.gnu.org/licenses/gpl-3.0.txt">License: GPLv3</a> <a href="https://www.gnu.org/licenses/gpl-3.0.txt">License: GPLv3</a>
<a href="thirdparty.txt">Third Party Licenses</a> <a href="thirdparty.txt">Third Party Licenses</a>
<br> <br>
Executable with <code>java -jar psdbg-1.0-fm.jar</code> Executable with <code>java -jar psdbg-1.0.1b-fm.jar</code>
</li> </li>
</ul> </ul>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment