Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
sarah.grebing
ProofScriptParser
Commits
93ab9a18
Commit
93ab9a18
authored
Feb 07, 2018
by
LULUDBR\Lulu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
9398d9ba
c62ccd21
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
11 deletions
+25
-11
keydeps/README.user
keydeps/README.user
+2
-2
lang/src/main/java/edu/kit/iti/formal/psdbg/parser/PrettyPrinter.java
...n/java/edu/kit/iti/formal/psdbg/parser/PrettyPrinter.java
+5
-1
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java
...ormal/psdbg/gui/controller/InteractiveModeController.java
+11
-7
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptController.java
...u/kit/iti/formal/psdbg/gui/controls/ScriptController.java
+1
-1
ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps
...u/kit/iti/formal/psdbg/examples/contraposition/script.kps
+6
-0
No files found.
keydeps/README.user
View file @
93ab9a18
...
...
@@ -4,9 +4,9 @@
# Execute this in this folder.
# Set to key/key/deployment/components/
#
COMPONENTS=${COMPONENTS:-/home/sarah/Documents/KIT_Mitarbeiter/KeYDevelopment/KeYGitDir/key/key/deployment/components/}
COMPONENTS
=
${
COMPONENTS
:-
/home/sarah/Documents/KIT_Mitarbeiter/KeYDevelopment/KeYGitDir/key/key/deployment/components/
}
#COMPONENTS=$HOME/work/key/key/deployment/components/
COMPONENTS
=
lib/components/
#
COMPONENTS=lib/components/
...
...
lang/src/main/java/edu/kit/iti/formal/psdbg/parser/PrettyPrinter.java
View file @
93ab9a18
...
...
@@ -197,7 +197,11 @@ public class PrettyPrinter extends DefaultASTVisitor<Void> {
@Override
public
Void
visit
(
TermLiteral
termLiteral
)
{
s
.
append
(
String
.
format
(
"`%s`"
,
termLiteral
.
getText
()));
String
termLit
=
termLiteral
.
getText
();
if
(
termLit
.
contains
(
"\n"
))
{
termLit
=
termLit
.
trim
();
}
s
.
append
(
String
.
format
(
"`%s`"
,
termLit
));
return
super
.
visit
(
termLiteral
);
}
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java
View file @
93ab9a18
...
...
@@ -268,9 +268,9 @@ public class InteractiveModeController {
map
.
put
(
"#2"
,
call
.
getCommand
());
EngineState
estate
=
new
EngineState
(
g
.
proof
());
estate
.
setGoal
(
g
);
System
.
out
.
println
(
"on = "
+
map
.
get
(
"on"
));
System
.
out
.
println
(
"formula = "
+
map
.
get
(
"formula"
));
System
.
out
.
println
(
"occ = "
+
map
.
get
(
"occ"
));
//
System.out.println("on = " + map.get("on"));
//
System.out.println("formula = " + map.get("formula"));
//
System.out.println("occ = " + map.get("occ"));
RuleCommand
.
Parameters
cc
=
c
.
evaluateArguments
(
estate
,
map
);
//reflection exception
AbstractUserInterfaceControl
uiControl
=
new
DefaultUserInterfaceControl
();
...
...
@@ -301,10 +301,14 @@ public class InteractiveModeController {
cases
.
put
(
last
.
getData
().
getNode
(),
caseForSubNode
.
getBody
());
}
}
else
{
KeyData
kdn
=
new
KeyData
(
kd
,
ngoals
.
get
(
0
).
node
());
goals
.
add
(
last
=
new
GoalNode
<>(
expandedNode
,
kdn
,
kdn
.
getNode
().
isClosed
()));
Node
currentNode
=
last
.
getData
().
getNode
();
cases
.
get
(
findRoot
(
currentNode
)).
add
(
call
);
if
(
ngoals
.
size
()
==
0
)
{
cases
.
get
(
g
).
add
(
call
);
}
else
{
KeyData
kdn
=
new
KeyData
(
kd
,
ngoals
.
get
(
0
).
node
());
goals
.
add
(
last
=
new
GoalNode
<>(
expandedNode
,
kdn
,
kdn
.
getNode
().
isClosed
()));
Node
currentNode
=
last
.
getData
().
getNode
();
cases
.
get
(
findRoot
(
currentNode
)).
add
(
call
);
}
}
if
(
last
!=
null
)
model
.
setSelectedGoalNodeToShow
(
last
);
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptController.java
View file @
93ab9a18
...
...
@@ -317,7 +317,7 @@ public class ScriptController {
lastScriptArea
=
area
;
lastRegion
=
r
;
}
else
{
logger
.
error
(
"Could not find editor for the node to highlight: "
+
node
.
getOrigin
());
logger
.
debug
(
"Could not find editor for the node to highlight: "
+
node
.
getOrigin
());
}
}
...
...
ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps
View file @
93ab9a18
// Please select one of the following scripts.
//
script toRemove(){
impRight;
useContract type='dependency' on=`p`;
}
script autoScript(){
__STRICT_MODE := true;
auto;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment