Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
sarah.grebing
ProofScriptParser
Commits
01ac913d
Commit
01ac913d
authored
Mar 09, 2018
by
Sarah Grebing
Browse files
interim
parent
e0c77460
Pipeline
#19502
failed with stages
in 4 minutes and 25 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
rt-key/src/main/java/edu/kit/iti/formal/psdbg/ValueInjector.java
View file @
01ac913d
...
...
@@ -113,7 +113,12 @@ public class ValueInjector {
if
(
s
.
getTerm
()
!=
null
)
{
return
s
.
getTerm
();
}
else
{
TermConverter
converter
=
new
TermConverter
(
node
);
NamespaceSet
nss
=
null
;
if
(
s
.
getNs
()
!=
null
)
{
nss
=
s
.
getNs
();
}
TermConverter
converter
=
new
TermConverter
(
node
,
nss
);
Term
t
=
converter
.
convert
(
s
.
getTermRepr
());
s
.
setTerm
(
t
);
return
t
;
...
...
@@ -127,6 +132,12 @@ public class ValueInjector {
private
final
static
DefaultTermParser
PARSER
=
new
DefaultTermParser
();
private
NamespaceSet
additionalNamespace
;
public
TermConverter
(
Node
node
,
NamespaceSet
additionalNamespace
)
{
this
.
node
=
node
;
this
.
additionalNamespace
=
additionalNamespace
;
}
@Override
public
Term
convert
(
String
string
)
throws
ParserException
{
StringReader
reader
=
new
StringReader
(
string
);
...
...
@@ -147,6 +158,7 @@ public class ValueInjector {
}
Term
formula
=
PARSER
.
parse
(
reader
,
null
,
services
,
ns
,
node
.
proof
().
abbreviations
());
return
formula
;
}
}
...
...
@@ -273,7 +285,6 @@ public class ValueInjector {
/**
* Registers the given converter for the specified class.
*
* @param clazz a class
* @param conv a converter for the given class
* @param <T> an arbitrary type
*/
...
...
rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/KeyEvaluator.java
View file @
01ac913d
...
...
@@ -37,6 +37,7 @@ public class KeyEvaluator extends Evaluator<KeyData> {
TermValue
data
=
((
TermValue
)
term
.
getData
()).
copy
();
nss
.
getSignature
().
forEach
((
v
,
s
)
->
{
Sort
sort
=
asKeySort
(
s
,
getGoal
().
getData
().
getGoal
());
QuantifiableVariable
gf
;
data
.
getNs
().
variables
().
add
(
new
LogicVariable
(
new
Name
(
v
.
getIdentifier
()),
sort
));
});
return
new
Value
(
term
.
getType
(),
data
);
...
...
rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/data/TermValue.java
View file @
01ac913d
...
...
@@ -44,10 +44,15 @@ public class TermValue {
public
TermValue
copy
()
{
TermValue
tv
=
new
TermValue
();
tv
.
keySort
=
keySort
;
tv
.
termRepr
=
termRepr
;
tv
.
term
=
term
;
tv
.
ns
=
ns
.
copy
();
if
(
ns
!=
null
)
{
tv
.
ns
=
ns
.
copy
();
}
else
{
tv
.
ns
=
new
NamespaceSet
();
}
return
tv
;
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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