Merge lp://staging/~thomir-deactivatedaccount/xpathselect/trunk-extend-type-name-options into lp://staging/xpathselect
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~thomir-deactivatedaccount/xpathselect/trunk-extend-type-name-options |
| Merge into: | lp://staging/xpathselect |
| Diff against target: |
1347 lines (+609/-308) 8 files modified
lib/CMakeLists.txt (+2/-2) lib/parser.cpp (+34/-1) lib/parser.h (+55/-50) lib/xpathquerypart.cpp (+129/-0) lib/xpathquerypart.h (+57/-73) lib/xpathselect.cpp (+69/-31) test/test_parser.cpp (+241/-150) test/test_xpath_tree.cpp (+22/-1) |
| To merge this branch: | bzr merge lp://staging/~thomir-deactivatedaccount/xpathselect/trunk-extend-type-name-options |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Autopilot Hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Extend xpathselect grammar to allow multiple node names per query.
Description of the change
This branch changes the XPathSelect grammar such that you can now say "get me all the nodes named X, Y, or Z at this location". This is required to work around a problem with versioned Qml objects, and is also useful in other scenarios.
This involved extending the boost::spirit grammar (in parser.h), which in turn meant re-working the parser return types to be different structs, and using boost::variant.
As you'd expect, tests have been added / updated.
| Thomi Richards (thomir-deactivatedaccount) wrote | # |
| Brendan Donegan (brendan-donegan) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Thomi Richards (thomir-deactivatedaccount) | # |
| Christopher Lee (veebers) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Martin Pitt (pitti) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 66. By Thomi Richards
-
Fix test as per MP comment.
- 65. By Thomi Richards
-
Code cleanups.
- 64. By Thomi Richards
-
Remove use of boost::optional that wasn't needed.
- 63. By Thomi Richards
-
whitespace-only change.
- 62. By Thomi Richards
-
Addded test, cleaned up the code a little bit.
- 61. By Thomi Richards
-
Remove some commented out code.
- 60. By Thomi Richards
-
Add missing file - whoops!
- 59. By Thomi Richards
-
Use a template function to remove some code.
- 58. By Thomi Richards
-
Hook up new xpathselect grammar, added test to those already present.
- 57. By Thomi Richards
-
Builds, and tests all pass again.
Note: Please do not merge this. While this MP is considered complete, I need to write the autopilot-side of things, and I'd like to land the two at the same time to avoid back-and-forth merge proposals between the two projects.
Reviews are very welcome though :)