Merge lp:~veebers/xpathselect/fix_for_colons_in_node_name_1281688 into lp:xpathselect

[Christopher Lee]

Node names can now contain colons (so names like Internal::MainWindow work). Tests added.

Node names can now contain colons (so names like Internal::MainWindow work). Tests added.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/xpathselect-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-trusty-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/xpathselect-ci/7/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

LGTM, thanks

review: Approve

=== modified file 'lib/parser.h'
--- lib/parser.h	2013-09-03 03:28:14 +0000
+++ lib/parser.h	2014-02-19 19:43:57 +0000
@@ -134,7 +134,7 @@
             // spec_node_name is a node name that has been explicitly specified.
             // it must start and end with a non-space character, but you can have
             // spaces in the middle.
-            spec_node_name = +qi::char_("a-zA-Z0-9_\\-") >> *(+qi::char_(" ") >> +qi::char_("a-zA-Z0-9_\\-"));
+            spec_node_name = +qi::char_("a-zA-Z0-9_\\-") >> *(+qi::char_(" :") >> +qi::char_("a-zA-Z0-9_\\-"));
             // a wildcard node name is simply a '*'
             wildcard_node_name = qi::char_("*");
 

=== modified file 'test/test_parser.cpp'
--- test/test_parser.cpp	2013-09-03 03:28:14 +0000
+++ test/test_parser.cpp	2014-02-19 19:43:57 +0000
@@ -327,6 +327,7 @@
                             std::pair<std::string, bool>("node-name", true),
                             std::pair<std::string, bool>("node_name", true),
                             std::pair<std::string, bool>("node\\name", true),
+                            std::pair<std::string, bool>("node::name", false),
                             std::pair<std::string, bool>("node.name", false),
                             std::pair<std::string, bool>("node name", false),
                             std::pair<std::string, bool>("..", false)
@@ -458,7 +459,9 @@
                             std::pair<std::string, bool>("1", true),
                             std::pair<std::string, bool>("node-name", true),
                             std::pair<std::string, bool>("node_name", true),
-                            std::pair<std::string, bool>("node\\name", true)
+                            std::pair<std::string, bool>("node\\name", true),
+                            std::pair<std::string, bool>("node::name", true),
+                            std::pair<std::string, bool>("node::name::extra", true)
                          ));