TAPAAL

Merge lp:~tapaal-contributor/tapaal/ltl-parse-no-quantifiers into lp:tapaal

  1. ltl-parse-no-quantifiers
  2. Merge into trunk
Proposed by Lena Ernstsen
Status: Merged
Merged at revision: 1171
Proposed branch: lp:~tapaal-contributor/tapaal/ltl-parse-no-quantifiers
Merge into: lp:tapaal
Diff against target: 43 lines (+3/-11)
2 files modified
src/dk/aau/cs/TCTL/LTLParsing/TAPAALLTLQueryParser.jj (+2/-2)
src/pipe/gui/widgets/QueryDialog.java (+1/-9)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/ltl-parse-no-quantifiers
Reviewer Review Type Date Requested Status
TAPAAL Reviewers Pending
Review via email: mp+423913@code.launchpad.net

Commit message

Manual parsing is able to recognise queries without quantifiers

Description of the change

Can parse ltl queries without quantifiers
Also fixed the reset query action for ltl queries, where it produced the property A <*> instead of just <*>

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/TCTL/LTLParsing/TAPAALLTLQueryParser.jj'
2--- src/dk/aau/cs/TCTL/LTLParsing/TAPAALLTLQueryParser.jj 2021-10-08 06:22:05 +0000
3+++ src/dk/aau/cs/TCTL/LTLParsing/TAPAALLTLQueryParser.jj 2022-06-03 07:38:37 +0000
4@@ -135,8 +135,9 @@
5 {
6 <F> child = OrExpr() {return new LTLFNode(child); }
7 | <G> child = OrExpr() {return new LTLGNode(child); }
8- | child = OrExpr() <U> child2 = OrExpr() {return new LTLUNode(child, child2); }
9 | <X> child = OrExpr() {return new LTLXNode(child); }
10+ | child = OrExpr() [LOOKAHEAD(2) <U> child2 = OrExpr()] { return (child2 == null ? new TCTLStateToPathConverter(child) : new LTLUNode(child, child2)); }
11+
12 }
13
14 TCTLAbstractStateProperty OrExpr() :
15@@ -198,7 +199,6 @@
16 | "(" thisProp = OrExpr() ")"
17 | LOOKAHEAD(ParanthesesExpr()) {
18 thisProp = new TCTLPathToStateConverter(QuantifierExpr()); }
19-
20 )
21 { return thisProp; }
22 }
23
24=== modified file 'src/pipe/gui/widgets/QueryDialog.java'
25--- src/pipe/gui/widgets/QueryDialog.java 2022-05-23 13:04:57 +0000
26+++ src/pipe/gui/widgets/QueryDialog.java 2022-06-03 07:38:37 +0000
27@@ -2917,15 +2917,7 @@
28 }
29 } else { // we are not in edit mode so the button should reset
30 // the query
31-
32- if (queryType.getSelectedIndex() == 1) {
33- TCTLAbstractProperty oldProperty = newProperty;
34- addAllPathsToProperty(new TCTLPathPlaceHolder(), oldProperty);
35- resetQuantifierSelectionButtons();
36- return;
37- }
38-
39- TCTLPathPlaceHolder ph = new TCTLPathPlaceHolder();
40+ TCTLPathPlaceHolder ph = new TCTLPathPlaceHolder();
41 UndoableEdit edit = new QueryConstructionEdit(newProperty, ph);
42 newProperty = ph;
43 resetQuantifierSelectionButtons();

Subscribers

People subscribed via source and target branches