Changed namespaces + fixed runtime tests.

- Changed namespace chain (org::antlr::v4::runtime) to just antlr4 in all files.
- Fixed runtime tests for that.
- Added conversion of the xpath code, which compiles now (no tests, tho, as there are runtime tests for it).
- Removed TestRig stuff. That doesn't work in C++.

runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java

@@ -888,7 +888,7 @@ public abstract class BaseCppTest {
 						+ "\n"
 						+ "#include \"support/StringUtils.h\"\n"
 						+ "\n"
-						+ "using namespace org::antlr::v4::runtime;\n"
+						+ "using namespace antlr4;\n"
 						+ "\n"
 						+ "class TreeShapeListener : public tree::ParseTreeListener {\n"
 						+ "public:\n"
@@ -953,7 +953,7 @@ public abstract class BaseCppTest {
 					+ "\n"
 					+ "#include \"support/StringUtils.h\"\n"
 					+ "\n"
-					+ "using namespace org::antlr::v4::runtime;\n"
+					+ "using namespace antlr4;\n"
 					+ "\n"
 					+ "int main(int argc, const char* argv[]) {\n"
 					+ "  std::wifstream stream;\n"

runtime/Cpp/demo/Mac/antlr4-cpp-demo/main.cpp

@@ -12,7 +12,7 @@
 #include "TParser.h"
 
 using namespace antlrcpptest;
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 int main(int , const char **) {
   ANTLRInputStream input(u8"🍴 = 🍐 + \"😎\";(((x * π))) * µ + ∰; a + (x * (y ? 0 : 1) + z);");

runtime/Cpp/demo/Mac/antlrcpp Tests/InputHandlingTests.mm

@@ -36,8 +36,8 @@
 #include "StringUtils.h"
 
 using namespace antlrcpp;
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
-using namespace org::antlr::v4::runtime::misc;
+using namespace antlr4::misc;
 
 @interface InputHandlingTests : XCTestCase
 

runtime/Cpp/demo/Mac/antlrcpp Tests/MiscClassTests.mm

@@ -37,8 +37,8 @@
 #include "Lexer.h"
 #include "CPPUtils.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
-using namespace org::antlr::v4::runtime::misc;
+using namespace antlr4::misc;
 using namespace antlrcpp;
 
 @interface MiscClassTests : XCTestCase

runtime/Cpp/demo/Mac/antlrcpp Tests/antlrcpp_Tests.mm

@@ -36,7 +36,7 @@
 
 #include <vector>
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 @interface antlrcpp_Tests : XCTestCase
 
@@ -59,7 +59,7 @@ using namespace org::antlr::v4::runtime;
       std::vector<dfa::DFA> decisionToDFA;
       atn::ATN atn;
 
-      org::antlr::v4::runtime::atn::ParserATNSimulator foo(nullptr, atn, decisionToDFA, nullptr);
+      antlr4::atn::ParserATNSimulator foo(nullptr, atn, decisionToDFA, nullptr);
     }
     catch (std::exception &e) {
         

runtime/Cpp/runtime/antlrcpp.xcodeproj/project.pbxproj

@@ -582,12 +582,6 @@
 		276E5F741CDB57AA003FF4B4 /* Predicate.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5CD11CDB57AA003FF4B4 /* Predicate.h */; };
 		276E5F751CDB57AA003FF4B4 /* Predicate.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5CD11CDB57AA003FF4B4 /* Predicate.h */; };
 		276E5F761CDB57AA003FF4B4 /* Predicate.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5CD11CDB57AA003FF4B4 /* Predicate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		276E5F771CDB57AA003FF4B4 /* TestRig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5CD21CDB57AA003FF4B4 /* TestRig.cpp */; };
-		276E5F781CDB57AA003FF4B4 /* TestRig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5CD21CDB57AA003FF4B4 /* TestRig.cpp */; };
-		276E5F791CDB57AA003FF4B4 /* TestRig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5CD21CDB57AA003FF4B4 /* TestRig.cpp */; };
-		276E5F7A1CDB57AA003FF4B4 /* TestRig.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5CD31CDB57AA003FF4B4 /* TestRig.h */; };
-		276E5F7B1CDB57AA003FF4B4 /* TestRig.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5CD31CDB57AA003FF4B4 /* TestRig.h */; };
-		276E5F7C1CDB57AA003FF4B4 /* TestRig.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5CD31CDB57AA003FF4B4 /* TestRig.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		276E5F7D1CDB57AA003FF4B4 /* NoViableAltException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5CD41CDB57AA003FF4B4 /* NoViableAltException.cpp */; };
 		276E5F7E1CDB57AA003FF4B4 /* NoViableAltException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5CD41CDB57AA003FF4B4 /* NoViableAltException.cpp */; };
 		276E5F7F1CDB57AA003FF4B4 /* NoViableAltException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5CD41CDB57AA003FF4B4 /* NoViableAltException.cpp */; };
@@ -836,6 +830,66 @@
 		27AC52D01CE773A80093AAAB /* antlr4-runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 27AC52CF1CE773A80093AAAB /* antlr4-runtime.h */; };
 		27AC52D11CE773A80093AAAB /* antlr4-runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 27AC52CF1CE773A80093AAAB /* antlr4-runtime.h */; };
 		27AC52D21CE773A80093AAAB /* antlr4-runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 27AC52CF1CE773A80093AAAB /* antlr4-runtime.h */; };
+		27DB449D1D045537007E790B /* XPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448B1D045537007E790B /* XPath.cpp */; };
+		27DB449E1D045537007E790B /* XPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB448C1D045537007E790B /* XPath.h */; };
+		27DB449F1D045537007E790B /* XPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448D1D045537007E790B /* XPathElement.cpp */; };
+		27DB44A01D045537007E790B /* XPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB448E1D045537007E790B /* XPathElement.h */; };
+		27DB44A11D045537007E790B /* XPathLexerErrorListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448F1D045537007E790B /* XPathLexerErrorListener.cpp */; };
+		27DB44A21D045537007E790B /* XPathLexerErrorListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44901D045537007E790B /* XPathLexerErrorListener.h */; };
+		27DB44A31D045537007E790B /* XPathRuleAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44911D045537007E790B /* XPathRuleAnywhereElement.cpp */; };
+		27DB44A41D045537007E790B /* XPathRuleAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44921D045537007E790B /* XPathRuleAnywhereElement.h */; };
+		27DB44A51D045537007E790B /* XPathRuleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44931D045537007E790B /* XPathRuleElement.cpp */; };
+		27DB44A61D045537007E790B /* XPathRuleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44941D045537007E790B /* XPathRuleElement.h */; };
+		27DB44A71D045537007E790B /* XPathTokenAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44951D045537007E790B /* XPathTokenAnywhereElement.cpp */; };
+		27DB44A81D045537007E790B /* XPathTokenAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44961D045537007E790B /* XPathTokenAnywhereElement.h */; };
+		27DB44A91D045537007E790B /* XPathTokenElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44971D045537007E790B /* XPathTokenElement.cpp */; };
+		27DB44AA1D045537007E790B /* XPathTokenElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44981D045537007E790B /* XPathTokenElement.h */; };
+		27DB44AB1D045537007E790B /* XPathWildcardAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44991D045537007E790B /* XPathWildcardAnywhereElement.cpp */; };
+		27DB44AC1D045537007E790B /* XPathWildcardAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB449A1D045537007E790B /* XPathWildcardAnywhereElement.h */; };
+		27DB44AD1D045537007E790B /* XPathWildcardElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB449B1D045537007E790B /* XPathWildcardElement.cpp */; };
+		27DB44AE1D045537007E790B /* XPathWildcardElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB449C1D045537007E790B /* XPathWildcardElement.h */; };
+		27DB44B11D0463CC007E790B /* XPathLexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44AF1D0463CC007E790B /* XPathLexer.cpp */; };
+		27DB44B21D0463CC007E790B /* XPathLexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44AF1D0463CC007E790B /* XPathLexer.cpp */; };
+		27DB44B31D0463CC007E790B /* XPathLexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44AF1D0463CC007E790B /* XPathLexer.cpp */; };
+		27DB44B41D0463CC007E790B /* XPathLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44B01D0463CC007E790B /* XPathLexer.h */; };
+		27DB44B51D0463CC007E790B /* XPathLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44B01D0463CC007E790B /* XPathLexer.h */; };
+		27DB44B61D0463CC007E790B /* XPathLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44B01D0463CC007E790B /* XPathLexer.h */; };
+		27DB44B71D0463DA007E790B /* XPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448B1D045537007E790B /* XPath.cpp */; };
+		27DB44B81D0463DA007E790B /* XPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB448C1D045537007E790B /* XPath.h */; };
+		27DB44B91D0463DA007E790B /* XPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448D1D045537007E790B /* XPathElement.cpp */; };
+		27DB44BA1D0463DA007E790B /* XPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB448E1D045537007E790B /* XPathElement.h */; };
+		27DB44BB1D0463DA007E790B /* XPathLexerErrorListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448F1D045537007E790B /* XPathLexerErrorListener.cpp */; };
+		27DB44BC1D0463DA007E790B /* XPathLexerErrorListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44901D045537007E790B /* XPathLexerErrorListener.h */; };
+		27DB44BD1D0463DA007E790B /* XPathRuleAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44911D045537007E790B /* XPathRuleAnywhereElement.cpp */; };
+		27DB44BE1D0463DA007E790B /* XPathRuleAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44921D045537007E790B /* XPathRuleAnywhereElement.h */; };
+		27DB44BF1D0463DA007E790B /* XPathRuleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44931D045537007E790B /* XPathRuleElement.cpp */; };
+		27DB44C01D0463DA007E790B /* XPathRuleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44941D045537007E790B /* XPathRuleElement.h */; };
+		27DB44C11D0463DA007E790B /* XPathTokenAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44951D045537007E790B /* XPathTokenAnywhereElement.cpp */; };
+		27DB44C21D0463DA007E790B /* XPathTokenAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44961D045537007E790B /* XPathTokenAnywhereElement.h */; };
+		27DB44C31D0463DA007E790B /* XPathTokenElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44971D045537007E790B /* XPathTokenElement.cpp */; };
+		27DB44C41D0463DA007E790B /* XPathTokenElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44981D045537007E790B /* XPathTokenElement.h */; };
+		27DB44C51D0463DA007E790B /* XPathWildcardAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44991D045537007E790B /* XPathWildcardAnywhereElement.cpp */; };
+		27DB44C61D0463DA007E790B /* XPathWildcardAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB449A1D045537007E790B /* XPathWildcardAnywhereElement.h */; };
+		27DB44C71D0463DA007E790B /* XPathWildcardElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB449B1D045537007E790B /* XPathWildcardElement.cpp */; };
+		27DB44C81D0463DA007E790B /* XPathWildcardElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB449C1D045537007E790B /* XPathWildcardElement.h */; };
+		27DB44C91D0463DB007E790B /* XPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448B1D045537007E790B /* XPath.cpp */; };
+		27DB44CA1D0463DB007E790B /* XPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB448C1D045537007E790B /* XPath.h */; };
+		27DB44CB1D0463DB007E790B /* XPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448D1D045537007E790B /* XPathElement.cpp */; };
+		27DB44CC1D0463DB007E790B /* XPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB448E1D045537007E790B /* XPathElement.h */; };
+		27DB44CD1D0463DB007E790B /* XPathLexerErrorListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB448F1D045537007E790B /* XPathLexerErrorListener.cpp */; };
+		27DB44CE1D0463DB007E790B /* XPathLexerErrorListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44901D045537007E790B /* XPathLexerErrorListener.h */; };
+		27DB44CF1D0463DB007E790B /* XPathRuleAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44911D045537007E790B /* XPathRuleAnywhereElement.cpp */; };
+		27DB44D01D0463DB007E790B /* XPathRuleAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44921D045537007E790B /* XPathRuleAnywhereElement.h */; };
+		27DB44D11D0463DB007E790B /* XPathRuleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44931D045537007E790B /* XPathRuleElement.cpp */; };
+		27DB44D21D0463DB007E790B /* XPathRuleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44941D045537007E790B /* XPathRuleElement.h */; };
+		27DB44D31D0463DB007E790B /* XPathTokenAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44951D045537007E790B /* XPathTokenAnywhereElement.cpp */; };
+		27DB44D41D0463DB007E790B /* XPathTokenAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44961D045537007E790B /* XPathTokenAnywhereElement.h */; };
+		27DB44D51D0463DB007E790B /* XPathTokenElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44971D045537007E790B /* XPathTokenElement.cpp */; };
+		27DB44D61D0463DB007E790B /* XPathTokenElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB44981D045537007E790B /* XPathTokenElement.h */; };
+		27DB44D71D0463DB007E790B /* XPathWildcardAnywhereElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB44991D045537007E790B /* XPathWildcardAnywhereElement.cpp */; };
+		27DB44D81D0463DB007E790B /* XPathWildcardAnywhereElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB449A1D045537007E790B /* XPathWildcardAnywhereElement.h */; };
+		27DB44D91D0463DB007E790B /* XPathWildcardElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27DB449B1D045537007E790B /* XPathWildcardElement.cpp */; };
+		27DB44DA1D0463DB007E790B /* XPathWildcardElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 27DB449C1D045537007E790B /* XPathWildcardElement.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -1034,8 +1088,6 @@
 		276E5CCE1CDB57AA003FF4B4 /* MurmurHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MurmurHash.cpp; sourceTree = "<group>"; };
 		276E5CCF1CDB57AA003FF4B4 /* MurmurHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MurmurHash.h; sourceTree = "<group>"; };
 		276E5CD11CDB57AA003FF4B4 /* Predicate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Predicate.h; sourceTree = "<group>"; };
-		276E5CD21CDB57AA003FF4B4 /* TestRig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestRig.cpp; sourceTree = "<group>"; };
-		276E5CD31CDB57AA003FF4B4 /* TestRig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestRig.h; sourceTree = "<group>"; };
 		276E5CD41CDB57AA003FF4B4 /* NoViableAltException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NoViableAltException.cpp; sourceTree = "<group>"; wrapsLines = 0; };
 		276E5CD51CDB57AA003FF4B4 /* NoViableAltException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoViableAltException.h; sourceTree = "<group>"; };
 		276E5CD61CDB57AA003FF4B4 /* Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Parser.cpp; sourceTree = "<group>"; };
@@ -1047,7 +1099,7 @@
 		276E5CDC1CDB57AA003FF4B4 /* ProxyErrorListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProxyErrorListener.cpp; sourceTree = "<group>"; };
 		276E5CDD1CDB57AA003FF4B4 /* ProxyErrorListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyErrorListener.h; sourceTree = "<group>"; };
 		276E5CDE1CDB57AA003FF4B4 /* RecognitionException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecognitionException.cpp; sourceTree = "<group>"; };
-		276E5CDF1CDB57AA003FF4B4 /* RecognitionException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecognitionException.h; sourceTree = "<group>"; };
+		276E5CDF1CDB57AA003FF4B4 /* RecognitionException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecognitionException.h; sourceTree = "<group>"; wrapsLines = 0; };
 		276E5CE01CDB57AA003FF4B4 /* Recognizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Recognizer.cpp; sourceTree = "<group>"; };
 		276E5CE11CDB57AA003FF4B4 /* Recognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Recognizer.h; sourceTree = "<group>"; };
 		276E5CE21CDB57AA003FF4B4 /* RuleContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuleContext.cpp; sourceTree = "<group>"; wrapsLines = 0; };
@@ -1119,6 +1171,26 @@
 		27874F1D1CCB7A0700AF1C53 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		2794D8551CE7821B00FADD0F /* antlr4-common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "antlr4-common.h"; sourceTree = "<group>"; };
 		27AC52CF1CE773A80093AAAB /* antlr4-runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "antlr4-runtime.h"; sourceTree = "<group>"; };
+		27DB448B1D045537007E790B /* XPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPath.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB448C1D045537007E790B /* XPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPath.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB448D1D045537007E790B /* XPathElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathElement.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB448E1D045537007E790B /* XPathElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathElement.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB448F1D045537007E790B /* XPathLexerErrorListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathLexerErrorListener.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44901D045537007E790B /* XPathLexerErrorListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathLexerErrorListener.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44911D045537007E790B /* XPathRuleAnywhereElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathRuleAnywhereElement.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44921D045537007E790B /* XPathRuleAnywhereElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathRuleAnywhereElement.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44931D045537007E790B /* XPathRuleElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathRuleElement.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44941D045537007E790B /* XPathRuleElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathRuleElement.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44951D045537007E790B /* XPathTokenAnywhereElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathTokenAnywhereElement.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44961D045537007E790B /* XPathTokenAnywhereElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathTokenAnywhereElement.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44971D045537007E790B /* XPathTokenElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathTokenElement.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44981D045537007E790B /* XPathTokenElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathTokenElement.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44991D045537007E790B /* XPathWildcardAnywhereElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathWildcardAnywhereElement.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB449A1D045537007E790B /* XPathWildcardAnywhereElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathWildcardAnywhereElement.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB449B1D045537007E790B /* XPathWildcardElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathWildcardElement.cpp; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB449C1D045537007E790B /* XPathWildcardElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathWildcardElement.h; sourceTree = "<group>"; wrapsLines = 0; };
+		27DB44AF1D0463CC007E790B /* XPathLexer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathLexer.cpp; sourceTree = "<group>"; };
+		27DB44B01D0463CC007E790B /* XPathLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathLexer.h; sourceTree = "<group>"; wrapsLines = 0; };
 		37C147171B4D5A04008EDDDB /* libantlrcpp_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libantlrcpp_static.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		37D727AA1867AF1E007B6D10 /* antlrcpp.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = antlrcpp.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -1419,8 +1491,6 @@
 				276E5CCE1CDB57AA003FF4B4 /* MurmurHash.cpp */,
 				276E5CCF1CDB57AA003FF4B4 /* MurmurHash.h */,
 				276E5CD11CDB57AA003FF4B4 /* Predicate.h */,
-				276E5CD21CDB57AA003FF4B4 /* TestRig.cpp */,
-				276E5CD31CDB57AA003FF4B4 /* TestRig.h */,
 			);
 			path = misc;
 			sourceTree = "<group>";
@@ -1446,6 +1516,7 @@
 			isa = PBXGroup;
 			children = (
 				276E5D061CDB57AA003FF4B4 /* pattern */,
+				27DB448A1D045537007E790B /* xpath */,
 				276E5CFA1CDB57AA003FF4B4 /* AbstractParseTreeVisitor.h */,
 				276E5CFB1CDB57AA003FF4B4 /* ErrorNode.h */,
 				276E5CFC1CDB57AA003FF4B4 /* ErrorNodeImpl.cpp */,
@@ -1500,6 +1571,33 @@
 			name = "Linked Frameworks";
 			sourceTree = "<group>";
 		};
+		27DB448A1D045537007E790B /* xpath */ = {
+			isa = PBXGroup;
+			children = (
+				27DB448B1D045537007E790B /* XPath.cpp */,
+				27DB448C1D045537007E790B /* XPath.h */,
+				27DB448D1D045537007E790B /* XPathElement.cpp */,
+				27DB448E1D045537007E790B /* XPathElement.h */,
+				27DB44AF1D0463CC007E790B /* XPathLexer.cpp */,
+				27DB44B01D0463CC007E790B /* XPathLexer.h */,
+				27DB448F1D045537007E790B /* XPathLexerErrorListener.cpp */,
+				27DB44901D045537007E790B /* XPathLexerErrorListener.h */,
+				27DB44911D045537007E790B /* XPathRuleAnywhereElement.cpp */,
+				27DB44921D045537007E790B /* XPathRuleAnywhereElement.h */,
+				27DB44931D045537007E790B /* XPathRuleElement.cpp */,
+				27DB44941D045537007E790B /* XPathRuleElement.h */,
+				27DB44951D045537007E790B /* XPathTokenAnywhereElement.cpp */,
+				27DB44961D045537007E790B /* XPathTokenAnywhereElement.h */,
+				27DB44971D045537007E790B /* XPathTokenElement.cpp */,
+				27DB44981D045537007E790B /* XPathTokenElement.h */,
+				27DB44991D045537007E790B /* XPathWildcardAnywhereElement.cpp */,
+				27DB449A1D045537007E790B /* XPathWildcardAnywhereElement.h */,
+				27DB449B1D045537007E790B /* XPathWildcardElement.cpp */,
+				27DB449C1D045537007E790B /* XPathWildcardElement.h */,
+			);
+			path = xpath;
+			sourceTree = "<group>";
+		};
 		37D727A11867AF1E007B6D10 = {
 			isa = PBXGroup;
 			children = (
@@ -1537,8 +1635,10 @@
 				276E5DA81CDB57AA003FF4B4 /* BlockStartState.h in Headers */,
 				276E5FE21CDB57AA003FF4B4 /* TokenStream.h in Headers */,
 				276E5D6F1CDB57AA003FF4B4 /* ATNDeserializationOptions.h in Headers */,
+				27DB44CA1D0463DB007E790B /* XPath.h in Headers */,
 				276E5EDD1CDB57AA003FF4B4 /* BaseErrorListener.h in Headers */,
 				276E5DB71CDB57AA003FF4B4 /* DecisionEventInfo.h in Headers */,
+				27DB44D01D0463DB007E790B /* XPathRuleAnywhereElement.h in Headers */,
 				27AC52D21CE773A80093AAAB /* antlr4-runtime.h in Headers */,
 				276E5E2C1CDB57AA003FF4B4 /* LL1Analyzer.h in Headers */,
 				276E5D7B1CDB57AA003FF4B4 /* ATNSerializer.h in Headers */,
@@ -1546,6 +1646,7 @@
 				276E5E1A1CDB57AA003FF4B4 /* LexerPushModeAction.h in Headers */,
 				276E5ECB1CDB57AA003FF4B4 /* Transition.h in Headers */,
 				276E5EA11CDB57AA003FF4B4 /* SemanticContext.h in Headers */,
+				27DB44DA1D0463DB007E790B /* XPathWildcardElement.h in Headers */,
 				276E5F5E1CDB57AA003FF4B4 /* ListTokenSource.h in Headers */,
 				276E5F8E1CDB57AA003FF4B4 /* ParserInterpreter.h in Headers */,
 				276E603C1CDB57AA003FF4B4 /* RuleNode.h in Headers */,
@@ -1602,15 +1703,17 @@
 				276E5F251CDB57AA003FF4B4 /* DiagnosticErrorListener.h in Headers */,
 				276E5E141CDB57AA003FF4B4 /* LexerPopModeAction.h in Headers */,
 				276E5ED71CDB57AA003FF4B4 /* BailErrorStrategy.h in Headers */,
+				27DB44CE1D0463DB007E790B /* XPathLexerErrorListener.h in Headers */,
 				276E5DCF1CDB57AA003FF4B4 /* EpsilonTransition.h in Headers */,
 				276E5FBE1CDB57AA003FF4B4 /* Declarations.h in Headers */,
 				276E600C1CDB57AA003FF4B4 /* ParseTreeWalker.h in Headers */,
 				276E5E771CDB57AA003FF4B4 /* PredictionContext.h in Headers */,
 				276E60151CDB57AA003FF4B4 /* ParseTreeMatch.h in Headers */,
-				276E5F7C1CDB57AA003FF4B4 /* TestRig.h in Headers */,
+				27DB44CC1D0463DB007E790B /* XPathElement.h in Headers */,
 				276E5F581CDB57AA003FF4B4 /* LexerNoViableAltException.h in Headers */,
 				276E5D811CDB57AA003FF4B4 /* ATNSimulator.h in Headers */,
 				276E5F461CDB57AA003FF4B4 /* IRecognizer.h in Headers */,
+				27DB44B61D0463CC007E790B /* XPathLexer.h in Headers */,
 				276E5FC41CDB57AA003FF4B4 /* guid.h in Headers */,
 				276E602D1CDB57AA003FF4B4 /* TagChunk.h in Headers */,
 				276E5E951CDB57AA003FF4B4 /* RuleStopState.h in Headers */,
@@ -1635,6 +1738,7 @@
 				276E5F9A1CDB57AA003FF4B4 /* ProxyErrorListener.h in Headers */,
 				276E5E411CDB57AA003FF4B4 /* NotSetTransition.h in Headers */,
 				276E5E891CDB57AA003FF4B4 /* RangeTransition.h in Headers */,
+				27DB44D21D0463DB007E790B /* XPathRuleElement.h in Headers */,
 				276E601B1CDB57AA003FF4B4 /* ParseTreePattern.h in Headers */,
 				276E5DFC1CDB57AA003FF4B4 /* LexerCustomAction.h in Headers */,
 				276E5FE81CDB57AA003FF4B4 /* TokenStreamRewriter.h in Headers */,
@@ -1642,6 +1746,7 @@
 				276E5DAB1CDB57AA003FF4B4 /* ConfigLookup.h in Headers */,
 				276E5DD51CDB57AA003FF4B4 /* ErrorInfo.h in Headers */,
 				276E5E261CDB57AA003FF4B4 /* LexerTypeAction.h in Headers */,
+				27DB44D61D0463DB007E790B /* XPathTokenElement.h in Headers */,
 				276E5DE41CDB57AA003FF4B4 /* LexerActionType.h in Headers */,
 				276E5D511CDB57AA003FF4B4 /* AmbiguityInfo.h in Headers */,
 				276E5E711CDB57AA003FF4B4 /* PredicateTransition.h in Headers */,
@@ -1670,6 +1775,8 @@
 				276E5F701CDB57AA003FF4B4 /* MurmurHash.h in Headers */,
 				276E60211CDB57AA003FF4B4 /* ParseTreePatternMatcher.h in Headers */,
 				276E5D631CDB57AA003FF4B4 /* ATNConfig.h in Headers */,
+				27DB44D41D0463DB007E790B /* XPathTokenAnywhereElement.h in Headers */,
+				27DB44D81D0463DB007E790B /* XPathWildcardAnywhereElement.h in Headers */,
 				276E5E4D1CDB57AA003FF4B4 /* ParseInfo.h in Headers */,
 				276E5F881CDB57AA003FF4B4 /* Parser.h in Headers */,
 				276E603F1CDB57AA003FF4B4 /* SyntaxTree.h in Headers */,
@@ -1701,6 +1808,7 @@
 				276E5EDC1CDB57AA003FF4B4 /* BaseErrorListener.h in Headers */,
 				276E5DB61CDB57AA003FF4B4 /* DecisionEventInfo.h in Headers */,
 				276E5E2B1CDB57AA003FF4B4 /* LL1Analyzer.h in Headers */,
+				27DB44BA1D0463DA007E790B /* XPathElement.h in Headers */,
 				276E5D7A1CDB57AA003FF4B4 /* ATNSerializer.h in Headers */,
 				276E5EAC1CDB57AA003FF4B4 /* SingletonPredictionContext.h in Headers */,
 				276E5E191CDB57AA003FF4B4 /* LexerPushModeAction.h in Headers */,
@@ -1713,9 +1821,12 @@
 				276E5F4B1CDB57AA003FF4B4 /* Lexer.h in Headers */,
 				276E5F631CDB57AA003FF4B4 /* Interval.h in Headers */,
 				276E5DA41CDB57AA003FF4B4 /* BlockEndState.h in Headers */,
+				27DB44C21D0463DA007E790B /* XPathTokenAnywhereElement.h in Headers */,
 				276E5E821CDB57AA003FF4B4 /* ProfilingATNSimulator.h in Headers */,
+				27DB44C41D0463DA007E790B /* XPathTokenElement.h in Headers */,
 				276E5D981CDB57AA003FF4B4 /* BasicBlockStartState.h in Headers */,
 				276E5E9A1CDB57AA003FF4B4 /* RuleTransition.h in Headers */,
+				27DB44B81D0463DA007E790B /* XPath.h in Headers */,
 				276E60021CDB57AA003FF4B4 /* ParseTreeProperty.h in Headers */,
 				276E5D8C1CDB57AA003FF4B4 /* ATNType.h in Headers */,
 				276E5FFC1CDB57AA003FF4B4 /* ParseTreeListener.h in Headers */,
@@ -1731,6 +1842,7 @@
 				276E5E371CDB57AA003FF4B4 /* LoopEndState.h in Headers */,
 				276E5D681CDB57AA003FF4B4 /* ATNConfigSet.h in Headers */,
 				276E5D381CDB57AA003FF4B4 /* ANTLRFileStream.h in Headers */,
+				27DB44C01D0463DA007E790B /* XPathRuleElement.h in Headers */,
 				276E5D2F1CDB57AA003FF4B4 /* ANTLRErrorListener.h in Headers */,
 				276E5FC91CDB57AA003FF4B4 /* StringUtils.h in Headers */,
 				276E5EF41CDB57AA003FF4B4 /* CommonTokenFactory.h in Headers */,
@@ -1741,10 +1853,12 @@
 				276E5FCF1CDB57AA003FF4B4 /* Token.h in Headers */,
 				276E60411CDB57AA003FF4B4 /* TerminalNode.h in Headers */,
 				276E5D741CDB57AA003FF4B4 /* ATNDeserializer.h in Headers */,
+				27DB44B51D0463CC007E790B /* XPathLexer.h in Headers */,
 				276E5D861CDB57AA003FF4B4 /* ATNState.h in Headers */,
 				276E5E7C1CDB57AA003FF4B4 /* PredictionMode.h in Headers */,
 				276E5EBE1CDB57AA003FF4B4 /* StarLoopEntryState.h in Headers */,
 				276E5F9F1CDB57AA003FF4B4 /* RecognitionException.h in Headers */,
+				27DB44BE1D0463DA007E790B /* XPathRuleAnywhereElement.h in Headers */,
 				27745F071CE49C000067C6A3 /* RuntimeMetaData.h in Headers */,
 				276E5EA61CDB57AA003FF4B4 /* SetTransition.h in Headers */,
 				276E5F1E1CDB57AA003FF4B4 /* LexerDFASerializer.h in Headers */,
@@ -1759,6 +1873,7 @@
 				276E5DC81CDB57AA003FF4B4 /* EmptyPredictionContext.h in Headers */,
 				276E5D441CDB57AA003FF4B4 /* AbstractPredicateTransition.h in Headers */,
 				276E5F2A1CDB57AA003FF4B4 /* Exceptions.h in Headers */,
+				27DB44C61D0463DA007E790B /* XPathWildcardAnywhereElement.h in Headers */,
 				276E5F241CDB57AA003FF4B4 /* DiagnosticErrorListener.h in Headers */,
 				276E5E131CDB57AA003FF4B4 /* LexerPopModeAction.h in Headers */,
 				276E5ED61CDB57AA003FF4B4 /* BailErrorStrategy.h in Headers */,
@@ -1767,7 +1882,6 @@
 				276E600B1CDB57AA003FF4B4 /* ParseTreeWalker.h in Headers */,
 				276E5E761CDB57AA003FF4B4 /* PredictionContext.h in Headers */,
 				276E60141CDB57AA003FF4B4 /* ParseTreeMatch.h in Headers */,
-				276E5F7B1CDB57AA003FF4B4 /* TestRig.h in Headers */,
 				276E5F571CDB57AA003FF4B4 /* LexerNoViableAltException.h in Headers */,
 				276E5D801CDB57AA003FF4B4 /* ATNSimulator.h in Headers */,
 				276E5F451CDB57AA003FF4B4 /* IRecognizer.h in Headers */,
@@ -1814,6 +1928,7 @@
 				276E5E641CDB57AA003FF4B4 /* PrecedencePredicateTransition.h in Headers */,
 				276E5F061CDB57AA003FF4B4 /* DefaultErrorStrategy.h in Headers */,
 				276E5F3C1CDB57AA003FF4B4 /* InterpreterRuleContext.h in Headers */,
+				27DB44BC1D0463DA007E790B /* XPathLexerErrorListener.h in Headers */,
 				276E5F121CDB57AA003FF4B4 /* DFASerializer.h in Headers */,
 				276E5F361CDB57AA003FF4B4 /* InputMismatchException.h in Headers */,
 				276E5FDB1CDB57AA003FF4B4 /* TokenSource.h in Headers */,
@@ -1827,6 +1942,7 @@
 				276E5EFA1CDB57AA003FF4B4 /* CommonTokenStream.h in Headers */,
 				276E5EB21CDB57AA003FF4B4 /* StarBlockStartState.h in Headers */,
 				276E5F6F1CDB57AA003FF4B4 /* MurmurHash.h in Headers */,
+				27DB44C81D0463DA007E790B /* XPathWildcardElement.h in Headers */,
 				276E60201CDB57AA003FF4B4 /* ParseTreePatternMatcher.h in Headers */,
 				276E5D621CDB57AA003FF4B4 /* ATNConfig.h in Headers */,
 				276E5E4C1CDB57AA003FF4B4 /* ParseInfo.h in Headers */,
@@ -1846,11 +1962,13 @@
 			files = (
 				276E5FE91CDB57AA003FF4B4 /* AbstractParseTreeVisitor.h in Headers */,
 				27745F001CE49C000067C6A3 /* RuleContextWithAltNum.h in Headers */,
+				27DB44AC1D045537007E790B /* XPathWildcardAnywhereElement.h in Headers */,
 				276E60311CDB57AA003FF4B4 /* TextChunk.h in Headers */,
 				276E5F411CDB57AA003FF4B4 /* IntStream.h in Headers */,
 				276E5D5B1CDB57AA003FF4B4 /* ATN.h in Headers */,
 				276E605E1CDB57AA003FF4B4 /* UnbufferedCharStream.h in Headers */,
 				276E5DD61CDB57AA003FF4B4 /* LexerAction.h in Headers */,
+				27DB44A41D045537007E790B /* XPathRuleAnywhereElement.h in Headers */,
 				276E5FF51CDB57AA003FF4B4 /* ParseTree.h in Headers */,
 				27AC52D01CE773A80093AAAB /* antlr4-runtime.h in Headers */,
 				276E5DA61CDB57AA003FF4B4 /* BlockStartState.h in Headers */,
@@ -1889,6 +2007,7 @@
 				276E5E361CDB57AA003FF4B4 /* LoopEndState.h in Headers */,
 				276E5D671CDB57AA003FF4B4 /* ATNConfigSet.h in Headers */,
 				276E5D371CDB57AA003FF4B4 /* ANTLRFileStream.h in Headers */,
+				27DB44B41D0463CC007E790B /* XPathLexer.h in Headers */,
 				276E5D2E1CDB57AA003FF4B4 /* ANTLRErrorListener.h in Headers */,
 				276E5FC81CDB57AA003FF4B4 /* StringUtils.h in Headers */,
 				276E5EF31CDB57AA003FF4B4 /* CommonTokenFactory.h in Headers */,
@@ -1918,6 +2037,7 @@
 				276E5D431CDB57AA003FF4B4 /* AbstractPredicateTransition.h in Headers */,
 				276E5F291CDB57AA003FF4B4 /* Exceptions.h in Headers */,
 				276E5F231CDB57AA003FF4B4 /* DiagnosticErrorListener.h in Headers */,
+				27DB449E1D045537007E790B /* XPath.h in Headers */,
 				276E5E121CDB57AA003FF4B4 /* LexerPopModeAction.h in Headers */,
 				276E5ED51CDB57AA003FF4B4 /* BailErrorStrategy.h in Headers */,
 				276E5DCD1CDB57AA003FF4B4 /* EpsilonTransition.h in Headers */,
@@ -1925,7 +2045,6 @@
 				276E600A1CDB57AA003FF4B4 /* ParseTreeWalker.h in Headers */,
 				276E5E751CDB57AA003FF4B4 /* PredictionContext.h in Headers */,
 				276E60131CDB57AA003FF4B4 /* ParseTreeMatch.h in Headers */,
-				276E5F7A1CDB57AA003FF4B4 /* TestRig.h in Headers */,
 				276E5F561CDB57AA003FF4B4 /* LexerNoViableAltException.h in Headers */,
 				276E5D7F1CDB57AA003FF4B4 /* ATNSimulator.h in Headers */,
 				276E5F441CDB57AA003FF4B4 /* IRecognizer.h in Headers */,
@@ -1942,6 +2061,7 @@
 				276E5D911CDB57AA003FF4B4 /* AtomTransition.h in Headers */,
 				276E604C1CDB57AA003FF4B4 /* Tree.h in Headers */,
 				276E5F501CDB57AA003FF4B4 /* LexerInterpreter.h in Headers */,
+				27DB44AE1D045537007E790B /* XPathWildcardElement.h in Headers */,
 				276E60671CDB57AA003FF4B4 /* Vocabulary.h in Headers */,
 				276E5F2F1CDB57AA003FF4B4 /* FailedPredicateException.h in Headers */,
 				276E5E301CDB57AA003FF4B4 /* LookaheadEventInfo.h in Headers */,
@@ -1949,6 +2069,7 @@
 				276E606D1CDB57AA003FF4B4 /* VocabularyImpl.h in Headers */,
 				276E60521CDB57AA003FF4B4 /* Trees.h in Headers */,
 				276E5FB31CDB57AA003FF4B4 /* BitSet.h in Headers */,
+				27DB44AA1D045537007E790B /* XPathTokenElement.h in Headers */,
 				276E5F981CDB57AA003FF4B4 /* ProxyErrorListener.h in Headers */,
 				276E5E3F1CDB57AA003FF4B4 /* NotSetTransition.h in Headers */,
 				276E5E871CDB57AA003FF4B4 /* RangeTransition.h in Headers */,
@@ -1957,6 +2078,7 @@
 				276E5FE61CDB57AA003FF4B4 /* TokenStreamRewriter.h in Headers */,
 				276E5DEE1CDB57AA003FF4B4 /* LexerATNSimulator.h in Headers */,
 				276E5DA91CDB57AA003FF4B4 /* ConfigLookup.h in Headers */,
+				27DB44A61D045537007E790B /* XPathRuleElement.h in Headers */,
 				276E5DD31CDB57AA003FF4B4 /* ErrorInfo.h in Headers */,
 				276E5E241CDB57AA003FF4B4 /* LexerTypeAction.h in Headers */,
 				276E5DE21CDB57AA003FF4B4 /* LexerActionType.h in Headers */,
@@ -1981,15 +2103,18 @@
 				276E5EE11CDB57AA003FF4B4 /* BufferedTokenStream.h in Headers */,
 				276E5DAF1CDB57AA003FF4B4 /* ContextSensitivityInfo.h in Headers */,
 				276E5E001CDB57AA003FF4B4 /* LexerIndexedCustomAction.h in Headers */,
+				27DB44A81D045537007E790B /* XPathTokenAnywhereElement.h in Headers */,
 				276E5FD41CDB57AA003FF4B4 /* TokenFactory.h in Headers */,
 				276E5EF91CDB57AA003FF4B4 /* CommonTokenStream.h in Headers */,
 				276E5EB11CDB57AA003FF4B4 /* StarBlockStartState.h in Headers */,
 				276E5F6E1CDB57AA003FF4B4 /* MurmurHash.h in Headers */,
 				276E601F1CDB57AA003FF4B4 /* ParseTreePatternMatcher.h in Headers */,
 				276E5D611CDB57AA003FF4B4 /* ATNConfig.h in Headers */,
+				27DB44A21D045537007E790B /* XPathLexerErrorListener.h in Headers */,
 				276E5E4B1CDB57AA003FF4B4 /* ParseInfo.h in Headers */,
 				276E5F861CDB57AA003FF4B4 /* Parser.h in Headers */,
 				276E603D1CDB57AA003FF4B4 /* SyntaxTree.h in Headers */,
+				27DB44A01D045537007E790B /* XPathElement.h in Headers */,
 				276E5DBB1CDB57AA003FF4B4 /* DecisionInfo.h in Headers */,
 				276E5DC11CDB57AA003FF4B4 /* DecisionState.h in Headers */,
 				276E5E691CDB57AA003FF4B4 /* PredicateEvalInfo.h in Headers */,
@@ -2129,6 +2254,7 @@
 				276E5E051CDB57AA003FF4B4 /* LexerModeAction.cpp in Sources */,
 				276E5F491CDB57AA003FF4B4 /* Lexer.cpp in Sources */,
 				276E5EDA1CDB57AA003FF4B4 /* BaseErrorListener.cpp in Sources */,
+				27DB44C91D0463DB007E790B /* XPath.cpp in Sources */,
 				276E5DBA1CDB57AA003FF4B4 /* DecisionInfo.cpp in Sources */,
 				276E5F611CDB57AA003FF4B4 /* Interval.cpp in Sources */,
 				276E5F911CDB57AA003FF4B4 /* ParserRuleContext.cpp in Sources */,
@@ -2137,7 +2263,9 @@
 				276E5E7A1CDB57AA003FF4B4 /* PredictionMode.cpp in Sources */,
 				276E605D1CDB57AA003FF4B4 /* UnbufferedCharStream.cpp in Sources */,
 				276E5F341CDB57AA003FF4B4 /* InputMismatchException.cpp in Sources */,
+				27DB44D91D0463DB007E790B /* XPathWildcardElement.cpp in Sources */,
 				276E5E741CDB57AA003FF4B4 /* PredictionContext.cpp in Sources */,
+				27DB44CB1D0463DB007E790B /* XPathElement.cpp in Sources */,
 				276E5E171CDB57AA003FF4B4 /* LexerPushModeAction.cpp in Sources */,
 				276E5DA21CDB57AA003FF4B4 /* BlockEndState.cpp in Sources */,
 				276E5EF21CDB57AA003FF4B4 /* CommonTokenFactory.cpp in Sources */,
@@ -2156,6 +2284,8 @@
 				276E5FA31CDB57AA003FF4B4 /* Recognizer.cpp in Sources */,
 				276E5D6C1CDB57AA003FF4B4 /* ATNDeserializationOptions.cpp in Sources */,
 				276E60361CDB57AA003FF4B4 /* TokenTagToken.cpp in Sources */,
+				27DB44D51D0463DB007E790B /* XPathTokenElement.cpp in Sources */,
+				27DB44D11D0463DB007E790B /* XPathRuleElement.cpp in Sources */,
 				276E5DED1CDB57AA003FF4B4 /* LexerATNSimulator.cpp in Sources */,
 				276E606C1CDB57AA003FF4B4 /* VocabularyImpl.cpp in Sources */,
 				276E5F1C1CDB57AA003FF4B4 /* LexerDFASerializer.cpp in Sources */,
@@ -2167,6 +2297,7 @@
 				276E5D4E1CDB57AA003FF4B4 /* AmbiguityInfo.cpp in Sources */,
 				276E5F161CDB57AA003FF4B4 /* DFAState.cpp in Sources */,
 				276E60091CDB57AA003FF4B4 /* ParseTreeWalker.cpp in Sources */,
+				27DB44CD1D0463DB007E790B /* XPathLexerErrorListener.cpp in Sources */,
 				276E5F9D1CDB57AA003FF4B4 /* RecognitionException.cpp in Sources */,
 				276E5E8C1CDB57AA003FF4B4 /* RuleStartState.cpp in Sources */,
 				276E5EA41CDB57AA003FF4B4 /* SetTransition.cpp in Sources */,
@@ -2184,7 +2315,6 @@
 				276E5ECE1CDB57AA003FF4B4 /* WildcardTransition.cpp in Sources */,
 				276E5E861CDB57AA003FF4B4 /* RangeTransition.cpp in Sources */,
 				276E5D7E1CDB57AA003FF4B4 /* ATNSimulator.cpp in Sources */,
-				276E5F791CDB57AA003FF4B4 /* TestRig.cpp in Sources */,
 				276E5D9C1CDB57AA003FF4B4 /* BasicState.cpp in Sources */,
 				276E5FC11CDB57AA003FF4B4 /* guid.cpp in Sources */,
 				276E5E801CDB57AA003FF4B4 /* ProfilingATNSimulator.cpp in Sources */,
@@ -2193,10 +2323,13 @@
 				276E5F6D1CDB57AA003FF4B4 /* MurmurHash.cpp in Sources */,
 				276E5FDF1CDB57AA003FF4B4 /* TokenStream.cpp in Sources */,
 				276E5FF11CDB57AA003FF4B4 /* ErrorNodeImpl.cpp in Sources */,
+				27DB44D71D0463DB007E790B /* XPathWildcardAnywhereElement.cpp in Sources */,
 				276E5D961CDB57AA003FF4B4 /* BasicBlockStartState.cpp in Sources */,
 				276E5E4A1CDB57AA003FF4B4 /* ParseInfo.cpp in Sources */,
 				276E5E3E1CDB57AA003FF4B4 /* NotSetTransition.cpp in Sources */,
+				27DB44B31D0463CC007E790B /* XPathLexer.cpp in Sources */,
 				276E60301CDB57AA003FF4B4 /* TextChunk.cpp in Sources */,
+				27DB44CF1D0463DB007E790B /* XPathRuleAnywhereElement.cpp in Sources */,
 				276E5E441CDB57AA003FF4B4 /* OrderedATNConfigSet.cpp in Sources */,
 				276E5DCC1CDB57AA003FF4B4 /* EpsilonTransition.cpp in Sources */,
 				276E5D5A1CDB57AA003FF4B4 /* ATN.cpp in Sources */,
@@ -2227,6 +2360,7 @@
 				276E5F4F1CDB57AA003FF4B4 /* LexerInterpreter.cpp in Sources */,
 				276E5E291CDB57AA003FF4B4 /* LL1Analyzer.cpp in Sources */,
 				276E5EB01CDB57AA003FF4B4 /* StarBlockStartState.cpp in Sources */,
+				27DB44D31D0463DB007E790B /* XPathTokenAnywhereElement.cpp in Sources */,
 				276E5FB81CDB57AA003FF4B4 /* CPPUtils.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2260,6 +2394,7 @@
 				276E5E041CDB57AA003FF4B4 /* LexerModeAction.cpp in Sources */,
 				276E5F481CDB57AA003FF4B4 /* Lexer.cpp in Sources */,
 				276E5ED91CDB57AA003FF4B4 /* BaseErrorListener.cpp in Sources */,
+				27DB44B71D0463DA007E790B /* XPath.cpp in Sources */,
 				276E5DB91CDB57AA003FF4B4 /* DecisionInfo.cpp in Sources */,
 				276E5F601CDB57AA003FF4B4 /* Interval.cpp in Sources */,
 				276E5F901CDB57AA003FF4B4 /* ParserRuleContext.cpp in Sources */,
@@ -2268,7 +2403,9 @@
 				276E5E791CDB57AA003FF4B4 /* PredictionMode.cpp in Sources */,
 				276E605C1CDB57AA003FF4B4 /* UnbufferedCharStream.cpp in Sources */,
 				276E5F331CDB57AA003FF4B4 /* InputMismatchException.cpp in Sources */,
+				27DB44C71D0463DA007E790B /* XPathWildcardElement.cpp in Sources */,
 				276E5E731CDB57AA003FF4B4 /* PredictionContext.cpp in Sources */,
+				27DB44B91D0463DA007E790B /* XPathElement.cpp in Sources */,
 				276E5E161CDB57AA003FF4B4 /* LexerPushModeAction.cpp in Sources */,
 				276E5DA11CDB57AA003FF4B4 /* BlockEndState.cpp in Sources */,
 				276E5EF11CDB57AA003FF4B4 /* CommonTokenFactory.cpp in Sources */,
@@ -2287,6 +2424,8 @@
 				276E5FA21CDB57AA003FF4B4 /* Recognizer.cpp in Sources */,
 				276E5D6B1CDB57AA003FF4B4 /* ATNDeserializationOptions.cpp in Sources */,
 				276E60351CDB57AA003FF4B4 /* TokenTagToken.cpp in Sources */,
+				27DB44C31D0463DA007E790B /* XPathTokenElement.cpp in Sources */,
+				27DB44BF1D0463DA007E790B /* XPathRuleElement.cpp in Sources */,
 				276E5DEC1CDB57AA003FF4B4 /* LexerATNSimulator.cpp in Sources */,
 				276E606B1CDB57AA003FF4B4 /* VocabularyImpl.cpp in Sources */,
 				276E5F1B1CDB57AA003FF4B4 /* LexerDFASerializer.cpp in Sources */,
@@ -2298,6 +2437,7 @@
 				276E5D4D1CDB57AA003FF4B4 /* AmbiguityInfo.cpp in Sources */,
 				276E5F151CDB57AA003FF4B4 /* DFAState.cpp in Sources */,
 				276E60081CDB57AA003FF4B4 /* ParseTreeWalker.cpp in Sources */,
+				27DB44BB1D0463DA007E790B /* XPathLexerErrorListener.cpp in Sources */,
 				276E5F9C1CDB57AA003FF4B4 /* RecognitionException.cpp in Sources */,
 				276E5E8B1CDB57AA003FF4B4 /* RuleStartState.cpp in Sources */,
 				276E5EA31CDB57AA003FF4B4 /* SetTransition.cpp in Sources */,
@@ -2315,7 +2455,6 @@
 				276E5ECD1CDB57AA003FF4B4 /* WildcardTransition.cpp in Sources */,
 				276E5E851CDB57AA003FF4B4 /* RangeTransition.cpp in Sources */,
 				276E5D7D1CDB57AA003FF4B4 /* ATNSimulator.cpp in Sources */,
-				276E5F781CDB57AA003FF4B4 /* TestRig.cpp in Sources */,
 				276E5D9B1CDB57AA003FF4B4 /* BasicState.cpp in Sources */,
 				276E5FC01CDB57AA003FF4B4 /* guid.cpp in Sources */,
 				276E5E7F1CDB57AA003FF4B4 /* ProfilingATNSimulator.cpp in Sources */,
@@ -2324,10 +2463,13 @@
 				276E5F6C1CDB57AA003FF4B4 /* MurmurHash.cpp in Sources */,
 				276E5FDE1CDB57AA003FF4B4 /* TokenStream.cpp in Sources */,
 				276E5FF01CDB57AA003FF4B4 /* ErrorNodeImpl.cpp in Sources */,
+				27DB44C51D0463DA007E790B /* XPathWildcardAnywhereElement.cpp in Sources */,
 				276E5D951CDB57AA003FF4B4 /* BasicBlockStartState.cpp in Sources */,
 				276E5E491CDB57AA003FF4B4 /* ParseInfo.cpp in Sources */,
 				276E5E3D1CDB57AA003FF4B4 /* NotSetTransition.cpp in Sources */,
+				27DB44B21D0463CC007E790B /* XPathLexer.cpp in Sources */,
 				276E602F1CDB57AA003FF4B4 /* TextChunk.cpp in Sources */,
+				27DB44BD1D0463DA007E790B /* XPathRuleAnywhereElement.cpp in Sources */,
 				276E5E431CDB57AA003FF4B4 /* OrderedATNConfigSet.cpp in Sources */,
 				276E5DCB1CDB57AA003FF4B4 /* EpsilonTransition.cpp in Sources */,
 				276E5D591CDB57AA003FF4B4 /* ATN.cpp in Sources */,
@@ -2358,6 +2500,7 @@
 				276E5F4E1CDB57AA003FF4B4 /* LexerInterpreter.cpp in Sources */,
 				276E5E281CDB57AA003FF4B4 /* LL1Analyzer.cpp in Sources */,
 				276E5EAF1CDB57AA003FF4B4 /* StarBlockStartState.cpp in Sources */,
+				27DB44C11D0463DA007E790B /* XPathTokenAnywhereElement.cpp in Sources */,
 				276E5FB71CDB57AA003FF4B4 /* CPPUtils.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2374,6 +2517,7 @@
 				276E5D521CDB57AA003FF4B4 /* ArrayPredictionContext.cpp in Sources */,
 				276E5F081CDB57AA003FF4B4 /* DFA.cpp in Sources */,
 				276E5E211CDB57AA003FF4B4 /* LexerTypeAction.cpp in Sources */,
+				27DB449F1D045537007E790B /* XPathElement.cpp in Sources */,
 				276E5EC01CDB57AA003FF4B4 /* TokensStartState.cpp in Sources */,
 				276E5DB21CDB57AA003FF4B4 /* DecisionEventInfo.cpp in Sources */,
 				276E60431CDB57AA003FF4B4 /* TerminalNodeImpl.cpp in Sources */,
@@ -2388,6 +2532,7 @@
 				276E604F1CDB57AA003FF4B4 /* Trees.cpp in Sources */,
 				276E5EB41CDB57AA003FF4B4 /* StarLoopbackState.cpp in Sources */,
 				276E5E601CDB57AA003FF4B4 /* PrecedencePredicateTransition.cpp in Sources */,
+				27DB44A31D045537007E790B /* XPathRuleAnywhereElement.cpp in Sources */,
 				276E5E031CDB57AA003FF4B4 /* LexerModeAction.cpp in Sources */,
 				276E5F471CDB57AA003FF4B4 /* Lexer.cpp in Sources */,
 				276E5ED81CDB57AA003FF4B4 /* BaseErrorListener.cpp in Sources */,
@@ -2407,9 +2552,12 @@
 				276E5E901CDB57AA003FF4B4 /* RuleStopState.cpp in Sources */,
 				276E60611CDB57AA003FF4B4 /* UnbufferedTokenStream.cpp in Sources */,
 				276E5DD91CDB57AA003FF4B4 /* LexerActionExecutor.cpp in Sources */,
+				27DB449D1D045537007E790B /* XPath.cpp in Sources */,
 				276E5E9C1CDB57AA003FF4B4 /* SemanticContext.cpp in Sources */,
+				27DB44AD1D045537007E790B /* XPathWildcardElement.cpp in Sources */,
 				276E5EC61CDB57AA003FF4B4 /* Transition.cpp in Sources */,
 				276E601C1CDB57AA003FF4B4 /* ParseTreePatternMatcher.cpp in Sources */,
+				27DB44A51D045537007E790B /* XPathRuleElement.cpp in Sources */,
 				276E5F201CDB57AA003FF4B4 /* DiagnosticErrorListener.cpp in Sources */,
 				276E5D461CDB57AA003FF4B4 /* ActionTransition.cpp in Sources */,
 				276E60491CDB57AA003FF4B4 /* Tree.cpp in Sources */,
@@ -2425,6 +2573,7 @@
 				276E5DE51CDB57AA003FF4B4 /* LexerATNConfig.cpp in Sources */,
 				276E5F0E1CDB57AA003FF4B4 /* DFASerializer.cpp in Sources */,
 				276E5F2C1CDB57AA003FF4B4 /* FailedPredicateException.cpp in Sources */,
+				27DB44A71D045537007E790B /* XPathTokenAnywhereElement.cpp in Sources */,
 				276E5F891CDB57AA003FF4B4 /* ParserInterpreter.cpp in Sources */,
 				276E5D4C1CDB57AA003FF4B4 /* AmbiguityInfo.cpp in Sources */,
 				276E5F141CDB57AA003FF4B4 /* DFAState.cpp in Sources */,
@@ -2446,7 +2595,6 @@
 				276E5ECC1CDB57AA003FF4B4 /* WildcardTransition.cpp in Sources */,
 				276E5E841CDB57AA003FF4B4 /* RangeTransition.cpp in Sources */,
 				276E5D7C1CDB57AA003FF4B4 /* ATNSimulator.cpp in Sources */,
-				276E5F771CDB57AA003FF4B4 /* TestRig.cpp in Sources */,
 				276E5D9A1CDB57AA003FF4B4 /* BasicState.cpp in Sources */,
 				276E5FBF1CDB57AA003FF4B4 /* guid.cpp in Sources */,
 				276E5E7E1CDB57AA003FF4B4 /* ProfilingATNSimulator.cpp in Sources */,
@@ -2463,13 +2611,16 @@
 				276E5DCA1CDB57AA003FF4B4 /* EpsilonTransition.cpp in Sources */,
 				276E5D581CDB57AA003FF4B4 /* ATN.cpp in Sources */,
 				276E5EE41CDB57AA003FF4B4 /* CharStream.cpp in Sources */,
+				27DB44AB1D045537007E790B /* XPathWildcardAnywhereElement.cpp in Sources */,
 				276E5EDE1CDB57AA003FF4B4 /* BufferedTokenStream.cpp in Sources */,
 				276E5F021CDB57AA003FF4B4 /* DefaultErrorStrategy.cpp in Sources */,
 				276E5D401CDB57AA003FF4B4 /* AbstractPredicateTransition.cpp in Sources */,
 				276E5E5A1CDB57AA003FF4B4 /* PlusLoopbackState.cpp in Sources */,
 				276E5E331CDB57AA003FF4B4 /* LoopEndState.cpp in Sources */,
 				276E5FE31CDB57AA003FF4B4 /* TokenStreamRewriter.cpp in Sources */,
+				27DB44A11D045537007E790B /* XPathLexerErrorListener.cpp in Sources */,
 				276E5FA71CDB57AA003FF4B4 /* RuleContext.cpp in Sources */,
+				27DB44B11D0463CC007E790B /* XPathLexer.cpp in Sources */,
 				276E5D5E1CDB57AA003FF4B4 /* ATNConfig.cpp in Sources */,
 				276E5EFC1CDB57AA003FF4B4 /* ConsoleErrorListener.cpp in Sources */,
 				276E5EA81CDB57AA003FF4B4 /* SingletonPredictionContext.cpp in Sources */,
@@ -2489,6 +2640,7 @@
 				276E5F4D1CDB57AA003FF4B4 /* LexerInterpreter.cpp in Sources */,
 				276E5E271CDB57AA003FF4B4 /* LL1Analyzer.cpp in Sources */,
 				276E5EAE1CDB57AA003FF4B4 /* StarBlockStartState.cpp in Sources */,
+				27DB44A91D045537007E790B /* XPathTokenElement.cpp in Sources */,
 				276E5FB61CDB57AA003FF4B4 /* CPPUtils.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

runtime/Cpp/runtime/src/ANTLRErrorListener.h

@@ -37,10 +37,7 @@ namespace antlrcpp {
   class BitSet;
 }
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// How to emit recognition errors (an interface in Java).
   class ANTLR4CPP_PUBLIC ANTLRErrorListener {
@@ -193,7 +190,4 @@ namespace runtime {
       int prediction, Ref<atn::ATNConfigSet> configs) = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ANTLRErrorStrategy.h

@@ -33,10 +33,7 @@
 
 #include "Token.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// The interface for defining strategies to deal with syntax errors encountered
@@ -146,7 +143,4 @@ namespace runtime {
     virtual void reportError(Parser *recognizer, const RecognitionException &e) = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ANTLRFileStream.cpp

@@ -31,7 +31,7 @@
 
 #include "ANTLRFileStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 ANTLRFileStream::ANTLRFileStream(const std::string &fileName) {
   _fileName = fileName;

runtime/Cpp/runtime/src/ANTLRFileStream.h

@@ -33,10 +33,7 @@
 
 #include "ANTLRInputStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// This is an ANTLRInputStream that is loaded from a file all at once
   /// when you construct the object (or call load()).
@@ -53,7 +50,4 @@ namespace runtime {
     virtual std::string getSourceName() const override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ANTLRInputStream.cpp

@@ -38,7 +38,7 @@
 
 #include "ANTLRInputStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
 using misc::Interval;

runtime/Cpp/runtime/src/ANTLRInputStream.h

@@ -33,10 +33,7 @@
 
 #include "CharStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   // Vacuum all input from a stream and then treat it
   // like a string. Can also pass in a string or char[] to use.
@@ -94,7 +91,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/BailErrorStrategy.cpp

@@ -36,7 +36,7 @@
 
 #include "BailErrorStrategy.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 void BailErrorStrategy::recover(Parser *recognizer, std::exception_ptr e) {
   Ref<ParserRuleContext> context = recognizer->getContext();

runtime/Cpp/runtime/src/BailErrorStrategy.h

@@ -33,10 +33,7 @@
 
 #include "DefaultErrorStrategy.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * This implementation of {@link ANTLRErrorStrategy} responds to syntax errors
@@ -87,7 +84,4 @@ namespace runtime {
     virtual void sync(Parser *recognizer) override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/BaseErrorListener.cpp

@@ -32,7 +32,7 @@
 #include "BaseErrorListener.h"
 #include "RecognitionException.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 void BaseErrorListener::syntaxError(IRecognizer * /*recognizer*/, Ref<Token> /*offendingSymbol*/, size_t /*line*/,
   int /*charPositionInLine*/, const std::string &/*msg*/, std::exception_ptr /*e*/) {

runtime/Cpp/runtime/src/BaseErrorListener.h

@@ -37,10 +37,7 @@ namespace antlrcpp {
   class BitSet;
 }
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * Provides an empty default implementation of {@link ANTLRErrorListener}. The
@@ -62,7 +59,4 @@ namespace runtime {
       int prediction, Ref<atn::ATNConfigSet> configs) override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/BufferedTokenStream.cpp

@@ -38,7 +38,7 @@
 
 #include "BufferedTokenStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
 BufferedTokenStream::BufferedTokenStream(TokenSource *tokenSource) : _tokenSource(tokenSource){

runtime/Cpp/runtime/src/BufferedTokenStream.h

@@ -33,10 +33,7 @@
 
 #include "TokenStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * This implementation of {@link TokenStream} loads tokens from a
@@ -224,7 +221,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/CharStream.cpp

@@ -31,7 +31,7 @@
 
 #include "CharStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 CharStream::~CharStream() {
 }

runtime/Cpp/runtime/src/CharStream.h

@@ -34,10 +34,7 @@
 #include "IntStream.h"
 #include "misc/Interval.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// A source of characters for an ANTLR lexer.
   class ANTLR4CPP_PUBLIC CharStream : public IntStream {
@@ -63,7 +60,4 @@ namespace runtime {
     virtual std::string toString() const = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/CommonToken.cpp

@@ -37,7 +37,7 @@
 
 #include "CommonToken.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
 const std::pair<TokenSource*, CharStream*> CommonToken::EMPTY_SOURCE;
@@ -164,11 +164,11 @@ void CommonToken::setTokenIndex(int index) {
   _index = index;
 }
 
-org::antlr::v4::runtime::TokenSource *CommonToken::getTokenSource() const {
+antlr4::TokenSource *CommonToken::getTokenSource() const {
   return _source.first;
 }
 
-org::antlr::v4::runtime::CharStream *CommonToken::getInputStream() const {
+antlr4::CharStream *CommonToken::getInputStream() const {
   return _source.second;
 }
 

runtime/Cpp/runtime/src/CommonToken.h

@@ -33,10 +33,7 @@
 
 #include "WritableToken.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC CommonToken : public WritableToken {
   protected:
@@ -183,7 +180,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/CommonTokenFactory.cpp

@@ -35,7 +35,7 @@
 
 #include "CommonTokenFactory.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 const Ref<TokenFactory<CommonToken>> CommonTokenFactory::DEFAULT = std::make_shared<CommonTokenFactory>();
 

runtime/Cpp/runtime/src/CommonTokenFactory.h

@@ -33,10 +33,7 @@
 
 #include "TokenFactory.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * This default implementation of {@link TokenFactory} creates
@@ -100,7 +97,4 @@ namespace runtime {
     virtual Ref<CommonToken> create(int type, const std::string &text) override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/CommonTokenStream.cpp

@@ -33,7 +33,7 @@
 
 #include "CommonTokenStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 CommonTokenStream::CommonTokenStream(TokenSource *tokenSource) : BufferedTokenStream(tokenSource) {
   InitializeInstanceFields();

runtime/Cpp/runtime/src/CommonTokenStream.h

@@ -33,10 +33,7 @@
 
 #include "BufferedTokenStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * This class extends {@link BufferedTokenStream} with functionality to filter
@@ -109,7 +106,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ConsoleErrorListener.cpp

@@ -31,7 +31,7 @@
 
 #include "ConsoleErrorListener.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 ConsoleErrorListener ConsoleErrorListener::INSTANCE;
 

runtime/Cpp/runtime/src/ConsoleErrorListener.h

@@ -33,10 +33,7 @@
 
 #include "BaseErrorListener.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC ConsoleErrorListener : public BaseErrorListener {
   public:
@@ -61,7 +58,4 @@ namespace runtime {
                              const std::string &msg, std::exception_ptr e) override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp

@@ -45,7 +45,7 @@
 
 #include "DefaultErrorStrategy.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
 void DefaultErrorStrategy::reset(Parser *recognizer) {

runtime/Cpp/runtime/src/DefaultErrorStrategy.h

@@ -34,10 +34,7 @@
 #include "ANTLRErrorStrategy.h"
 #include "misc/IntervalSet.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * This is the default implementation of {@link ANTLRErrorStrategy} used for
@@ -490,7 +487,4 @@ namespace runtime {
 
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/DiagnosticErrorListener.cpp

@@ -38,7 +38,7 @@
 
 #include "DiagnosticErrorListener.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 DiagnosticErrorListener::DiagnosticErrorListener() : DiagnosticErrorListener(true) {
 }

runtime/Cpp/runtime/src/DiagnosticErrorListener.h

@@ -33,10 +33,7 @@
 
 #include "BaseErrorListener.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// This implementation of <seealso cref="ANTLRErrorListener"/> can be used to identify
@@ -106,7 +103,4 @@ namespace runtime {
     virtual antlrcpp::BitSet getConflictingAlts(const antlrcpp::BitSet &reportedAlts, Ref<atn::ATNConfigSet> configs);
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/Exceptions.cpp

@@ -30,7 +30,7 @@
 
 #include "Exceptions.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 RuntimeException::RuntimeException(const std::string &msg) : std::exception(), _message(msg) {
 }

runtime/Cpp/runtime/src/Exceptions.h

@@ -32,10 +32,7 @@
 
 #include "antlr4-common.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   // An exception hierarchy modelled loosely after java.lang.* exceptions.
   class ANTLR4CPP_PUBLIC RuntimeException : public std::exception {
@@ -99,7 +96,4 @@ namespace runtime {
     ParseCancellationException(const std::string &msg = "") : CancellationException(msg) {};
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/FailedPredicateException.cpp

@@ -38,7 +38,7 @@
 
 #include "FailedPredicateException.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
 FailedPredicateException::FailedPredicateException(Parser *recognizer) : FailedPredicateException(recognizer, "", "") {

runtime/Cpp/runtime/src/FailedPredicateException.h

@@ -33,10 +33,7 @@
 
 #include "RecognitionException.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// A semantic predicate failed during validation.  Validation of predicates
   /// occurs when normally parsing the alternative just like matching a token.
@@ -58,7 +55,4 @@ namespace runtime {
     std::string _predicate;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/IRecognizer.h

@@ -31,10 +31,7 @@
 
 #pragma once
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC IRecognizer {
   public:
@@ -47,7 +44,4 @@ namespace runtime {
 
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/InputMismatchException.cpp

@@ -33,7 +33,7 @@
 
 #include "InputMismatchException.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 InputMismatchException::InputMismatchException(Parser *recognizer)
   : RecognitionException(recognizer, recognizer->getInputStream(), recognizer->getContext(),

runtime/Cpp/runtime/src/InputMismatchException.h

@@ -33,10 +33,7 @@
 
 #include "RecognitionException.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// This signifies any kind of mismatched input exceptions such as
@@ -47,7 +44,4 @@ namespace runtime {
     InputMismatchException(Parser *recognizer);
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/IntStream.cpp

@@ -31,6 +31,6 @@
 
 #include "IntStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 const std::string IntStream::UNKNOWN_SOURCE_NAME = "<unknown>";

runtime/Cpp/runtime/src/IntStream.h

@@ -33,10 +33,7 @@
 
 #include "antlr4-common.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// A simple stream of symbols whose values are represented as integers. This
@@ -244,7 +241,4 @@ namespace runtime {
     virtual std::string getSourceName() const = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/InterpreterRuleContext.cpp

@@ -31,7 +31,7 @@
 
 #include "InterpreterRuleContext.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 InterpreterRuleContext::InterpreterRuleContext() {
 }

runtime/Cpp/runtime/src/InterpreterRuleContext.h

@@ -33,10 +33,7 @@
 
 #include "ParserRuleContext.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * This class extends {@link ParserRuleContext} by allowing the value of
@@ -71,7 +68,4 @@ namespace runtime {
     const ssize_t _ruleIndex = -1;
 };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/Lexer.cpp

@@ -42,7 +42,7 @@
 #include "Lexer.h"
 
 using namespace antlrcpp;
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 Lexer::Lexer() : Recognizer() {
   InitializeInstanceFields();

runtime/Cpp/runtime/src/Lexer.h

@@ -36,10 +36,7 @@
 #include "CharStream.h"
 #include "Token.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// A lexer is recognizer that draws input symbols from a character stream.
   /// lexer grammars result in a subclass of this object. A Lexer object
@@ -229,7 +226,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/LexerInterpreter.cpp

@@ -38,7 +38,7 @@
 
 #include "LexerInterpreter.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 LexerInterpreter::LexerInterpreter(const std::string &grammarFileName, const std::vector<std::string> &tokenNames,
   const std::vector<std::string> &ruleNames, const std::vector<std::string> &modeNames, const atn::ATN &atn,

runtime/Cpp/runtime/src/LexerInterpreter.h

@@ -34,10 +34,7 @@
 #include "Lexer.h"
 #include "atn/PredictionContext.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC LexerInterpreter : public Lexer {
   public:
@@ -75,7 +72,4 @@ namespace runtime {
     Ref<dfa::Vocabulary> _vocabulary;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/LexerNoViableAltException.cpp

@@ -36,7 +36,7 @@
 
 #include "LexerNoViableAltException.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 LexerNoViableAltException::LexerNoViableAltException(Lexer *lexer, CharStream *input, size_t startIndex,
                                                      Ref<atn::ATNConfigSet> deadEndConfigs)

runtime/Cpp/runtime/src/LexerNoViableAltException.h

@@ -34,10 +34,7 @@
 #include "RecognitionException.h"
 #include "atn/ATNConfigSet.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC LexerNoViableAltException : public RecognitionException {
   public:
@@ -57,7 +54,4 @@ namespace runtime {
     
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ListTokenSource.cpp

@@ -35,7 +35,7 @@
 
 #include "ListTokenSource.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 int ListTokenSource::getCharPositionInLine() {
   if (i < tokens.size()) {

runtime/Cpp/runtime/src/ListTokenSource.h

@@ -34,10 +34,7 @@
 #include "TokenSource.h"
 #include "CommonTokenFactory.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// Provides an implementation of <seealso cref="TokenSource"/> as a wrapper around a list
@@ -131,7 +128,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/NoViableAltException.cpp

@@ -33,7 +33,7 @@
 
 #include "NoViableAltException.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 NoViableAltException::NoViableAltException(Parser *recognizer)
   : NoViableAltException(recognizer, recognizer->getTokenStream(), recognizer->getCurrentToken(),

runtime/Cpp/runtime/src/NoViableAltException.h

@@ -35,10 +35,7 @@
 #include "Token.h"
 #include "atn/ATNConfigSet.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// Indicates that the parser could not decide which of two or more paths
   /// to take based upon the remaining input. It tracks the starting token
@@ -65,7 +62,4 @@ namespace runtime {
    
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/Parser.cpp

@@ -51,7 +51,7 @@
 
 #include "Parser.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
 std::map<std::vector<uint16_t>, atn::ATN> Parser::bypassAltsAtnCache;

runtime/Cpp/runtime/src/Parser.h

@@ -37,10 +37,7 @@
 #include "TokenSource.h"
 #include "misc/Interval.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// This is all the parsing support code essentially; most of it is error recovery stuff.
   class ANTLR4CPP_PUBLIC Parser : public Recognizer {
@@ -471,7 +468,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ParserInterpreter.cpp

@@ -53,8 +53,8 @@
 
 #include "ParserInterpreter.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 using namespace antlrcpp;
 
 ParserInterpreter::ParserInterpreter(const std::string &grammarFileName, const std::vector<std::string>& tokenNames,

runtime/Cpp/runtime/src/ParserInterpreter.h

@@ -36,10 +36,7 @@
 #include "support/BitSet.h"
 #include "atn/PredictionContext.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// A parser simulator that mimics what ANTLR's generated
@@ -204,7 +201,4 @@ namespace runtime {
     Ref<dfa::Vocabulary> _vocabulary;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ParserRuleContext.cpp

@@ -37,7 +37,7 @@
 
 #include "ParserRuleContext.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
 ParserRuleContext::ParserRuleContext() {

runtime/Cpp/runtime/src/ParserRuleContext.h

@@ -34,10 +34,7 @@
 #include "RuleContext.h"
 #include "support/CPPUtils.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// A rule invocation record for parsing.
@@ -186,7 +183,4 @@ namespace runtime {
     virtual Ref<Tree> getChildReference(size_t i) override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/ProxyErrorListener.cpp

@@ -31,7 +31,7 @@
 
 #include "ProxyErrorListener.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 void ProxyErrorListener::addErrorListener(ANTLRErrorListener *listener) {
   if (listener == nullptr) {

runtime/Cpp/runtime/src/ProxyErrorListener.h

@@ -34,10 +34,7 @@
 #include "ANTLRErrorListener.h"
 #include "Exceptions.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// This implementation of ANTLRErrorListener dispatches all calls to a
   /// collection of delegate listeners. This reduces the effort required to support multiple
@@ -64,7 +61,4 @@ namespace runtime {
                                           int prediction, Ref<atn::ATNConfigSet> configs) override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/RecognitionException.cpp

@@ -37,7 +37,7 @@
 
 #include "RecognitionException.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 RecognitionException::RecognitionException(IRecognizer *recognizer, IntStream *input,
   Ref<ParserRuleContext> ctx, Ref<Token> offendingToken)

runtime/Cpp/runtime/src/RecognitionException.h

@@ -33,10 +33,7 @@
 
 #include "Exceptions.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// The root of the ANTLR exception hierarchy. In general, ANTLR tracks just
   /// 3 kinds of errors: prediction errors, failed predicate errors, and
@@ -62,6 +59,7 @@ namespace runtime {
                          Ref<Token> offendingToken = Ref<Token>());
     RecognitionException(const std::string &message, IRecognizer *recognizer, IntStream *input,
                          Ref<ParserRuleContext> ctx, Ref<Token> offendingToken = Ref<Token>());
+    ~RecognitionException() {}
     
     /// Get the ATN state number the parser was in at the time the error
     /// occurred. For NoViableAltException and
@@ -121,7 +119,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/Recognizer.cpp

@@ -43,7 +43,7 @@
 
 #include "Recognizer.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 std::map<Ref<dfa::Vocabulary>, std::map<std::string, size_t>> Recognizer::_tokenTypeMapCache;
 std::map<std::vector<std::string>, std::map<std::string, size_t>> Recognizer::_ruleIndexMapCache;

runtime/Cpp/runtime/src/Recognizer.h

@@ -34,10 +34,7 @@
 #include "ProxyErrorListener.h"
 #include "IRecognizer.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC Recognizer : public IRecognizer {
   public:
@@ -192,7 +189,4 @@ namespace runtime {
 
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/RuleContext.cpp

@@ -36,7 +36,7 @@
 
 #include "RuleContext.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 const Ref<RuleContext> RuleContext::EMPTY = std::make_shared<ParserRuleContext>();
 

runtime/Cpp/runtime/src/RuleContext.h

@@ -33,10 +33,7 @@
 
 #include "tree/RuleNode.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /** A rule context is a record of a single rule invocation.
    *
@@ -179,7 +176,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/RuleContextWithAltNum.cpp

@@ -32,8 +32,8 @@
 
 #include "RuleContextWithAltNum.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 
 RuleContextWithAltNum::RuleContextWithAltNum() : ParserRuleContext() {
   altNum = ATN::INVALID_ALT_NUMBER;

runtime/Cpp/runtime/src/RuleContextWithAltNum.h

@@ -32,10 +32,7 @@
 
 #include "ParserRuleContext.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// A handy class for use with
   ///
@@ -57,7 +54,4 @@ namespace runtime {
     virtual void setAltNumber(int altNum) override;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/RuntimeMetaData.cpp

@@ -31,7 +31,7 @@
 
 #include "RuntimeMetaData.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 const std::string RuntimeMetaData::VERSION = "4.5.3";
 

runtime/Cpp/runtime/src/RuntimeMetaData.h

@@ -33,10 +33,7 @@
 
 #include "antlr4-common.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// This class provides access to the current version of the ANTLR 4 runtime
@@ -181,7 +178,4 @@ namespace runtime {
     static std::string getMajorMinorVersion(const std::string &version);
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/Token.cpp

@@ -33,5 +33,5 @@
 
 #include "Token.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 

runtime/Cpp/runtime/src/Token.h

@@ -33,10 +33,7 @@
 
 #include "IntStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// A token has properties: text, type, line, character position in the line
   /// (so we can ignore tabs), token channel, index, and source from which
@@ -138,7 +135,4 @@ namespace runtime {
     virtual std::string toString() const = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/TokenFactory.h

@@ -31,10 +31,7 @@
 
 #pragma once
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// The default mechanism for creating tokens. It's used by default in Lexer and
   ///  the error handling strategy (to create missing tokens).  Notifying the parser
@@ -54,7 +51,4 @@ namespace runtime {
     virtual Ref<Symbol> create(int type, const std::string &text) = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/TokenSource.h

@@ -33,10 +33,7 @@
 
 #include "TokenFactory.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// A source of tokens must provide a sequence of tokens via <seealso cref="#nextToken()"/>
@@ -111,7 +108,4 @@ namespace runtime {
     virtual Ref<TokenFactory<CommonToken>> getTokenFactory() = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/TokenStream.cpp

@@ -31,7 +31,7 @@
 
 #include "TokenStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 TokenStream::~TokenStream() {
 }

runtime/Cpp/runtime/src/TokenStream.h

@@ -33,10 +33,7 @@
 
 #include "IntStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// <summary>
   /// An <seealso cref="IntStream"/> whose symbols are <seealso cref="Token"/> instances.
@@ -163,7 +160,4 @@ namespace runtime {
     virtual std::string getText(Ref<Token> start, Ref<Token> stop) = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/TokenStreamRewriter.cpp

@@ -37,10 +37,10 @@
 
 #include "TokenStreamRewriter.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 using namespace antlrcpp;
 
-using org::antlr::v4::runtime::misc::Interval;
+using antlr4::misc::Interval;
 
 TokenStreamRewriter::RewriteOperation::RewriteOperation(TokenStreamRewriter *outerInstance, size_t index) : outerInstance(outerInstance) {
 

runtime/Cpp/runtime/src/TokenStreamRewriter.h

@@ -31,10 +31,7 @@
 
 #pragma once
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /**
    * Useful for rewriting out a buffered input token stream after doing some
@@ -333,7 +330,4 @@ namespace runtime {
 
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/UnbufferedCharStream.cpp

@@ -36,7 +36,7 @@
 #include "UnbufferedCharStream.h"
 
 using namespace antlrcpp;
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 UnbufferedCharStream::UnbufferedCharStream(std::wistream &input) : _input(input) {
   InitializeInstanceFields();

runtime/Cpp/runtime/src/UnbufferedCharStream.h

@@ -33,10 +33,7 @@
 
 #include "CharStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   /// Do not buffer up the entire char stream. It does keep a small buffer
   /// for efficiency and also buffers while a mark exists (set by the
@@ -142,7 +139,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/UnbufferedTokenStream.cpp

@@ -40,7 +40,7 @@
 
 #include "UnbufferedTokenStream.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
 
 UnbufferedTokenStream::UnbufferedTokenStream(TokenSource *tokenSource) : UnbufferedTokenStream(tokenSource, 256) {
 }

runtime/Cpp/runtime/src/UnbufferedTokenStream.h

@@ -33,10 +33,7 @@
 
 #include "TokenStream.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC UnbufferedTokenStream : public TokenStream {
   public:
@@ -138,7 +135,4 @@ namespace runtime {
     void InitializeInstanceFields();
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/Vocabulary.h

@@ -33,10 +33,7 @@
 
 #include "antlr4-common.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace dfa {
 
   /// This interface provides information about the vocabulary used by a
@@ -158,7 +155,4 @@ namespace dfa {
   };
 
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/VocabularyImpl.cpp

@@ -33,7 +33,7 @@
 
 #include "VocabularyImpl.h"
 
-using namespace org::antlr::v4::runtime::dfa;
+using namespace antlr4::dfa;
 
 const std::vector<std::string> VocabularyImpl::EMPTY_NAMES;
 const Ref<Vocabulary> VocabularyImpl::EMPTY_VOCABULARY = std::make_shared<VocabularyImpl>(EMPTY_NAMES, EMPTY_NAMES, EMPTY_NAMES);

runtime/Cpp/runtime/src/VocabularyImpl.h

@@ -33,10 +33,7 @@
 
 #include "Vocabulary.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace dfa {
 
   /// This class provides a default implementation of the <seealso cref="Vocabulary"/>
@@ -115,7 +112,4 @@ namespace dfa {
   };
   
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/WritableToken.h

@@ -33,10 +33,7 @@
 
 #include "Token.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 
   class ANTLR4CPP_PUBLIC WritableToken : public Token {
   public:
@@ -48,7 +45,4 @@ namespace runtime {
     virtual void setTokenIndex(int index) = 0;
   };
 
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/antlr4-runtime.h

@@ -153,7 +153,6 @@
 #include "misc/IntervalSet.h"
 #include "misc/MurmurHash.h"
 #include "misc/Predicate.h"
-#include "misc/TestRig.h"
 #include "support/Arrays.h"
 #include "support/BitSet.h"
 #include "support/CPPUtils.h"
@@ -181,4 +180,15 @@
 #include "tree/pattern/TagChunk.h"
 #include "tree/pattern/TextChunk.h"
 #include "tree/pattern/TokenTagToken.h"
+#include "tree/xpath/XPath.h"
+#include "tree/xpath/XPathElement.h"
 #include "tree/xpath/XPathLexer.h"
+#include "tree/xpath/XPathLexerErrorListener.h"
+#include "tree/xpath/XPathRuleAnywhereElement.h"
+#include "tree/xpath/XPathRuleElement.h"
+#include "tree/xpath/XPathTokenAnywhereElement.h"
+#include "tree/xpath/XPathTokenElement.h"
+#include "tree/xpath/XPathWildcardAnywhereElement.h"
+#include "tree/xpath/XPathWildcardElement.h"
+
+

runtime/Cpp/runtime/src/atn/ATN.cpp

@@ -42,8 +42,8 @@
 
 #include "atn/ATN.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 using namespace antlrcpp;
 
 ATN::ATN() : ATN(ATNType::LEXER, 0) {

runtime/Cpp/runtime/src/atn/ATN.h

@@ -33,10 +33,7 @@
 
 #include "RuleContext.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace atn {
 
   class ANTLR4CPP_PUBLIC ATN {
@@ -135,7 +132,4 @@ namespace atn {
   };
   
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/atn/ATNConfig.cpp

@@ -35,7 +35,7 @@
 
 #include "atn/ATNConfig.h"
 
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 
 const size_t ATNConfig::SUPPRESS_PRECEDENCE_FILTER = 0x40000000;
 

runtime/Cpp/runtime/src/atn/ATNConfig.h

@@ -31,10 +31,7 @@
 
 #pragma once
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace atn {
 
   /// <summary>
@@ -146,16 +143,13 @@ namespace atn {
   };
 
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org
 
 
 // Hash function for ATNConfig.
 
 namespace std {
-  using org::antlr::v4::runtime::atn::ATNConfig;
+  using antlr4::atn::ATNConfig;
 
   template <> struct hash<ATNConfig>
   {

runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp

@@ -37,7 +37,7 @@
 
 #include "atn/ATNConfigSet.h"
 
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 using namespace antlrcpp;
 
 size_t SimpleATNConfigHasher::operator()(const Ref<ATNConfig> &k) const {

runtime/Cpp/runtime/src/atn/ATNConfigSet.h

@@ -35,10 +35,7 @@
 #include "atn/ConfigLookup.h"
 #include "atn/PredictionContext.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace atn {
 
   // Simpler hasher and comparer variants than those in ATNConfig (less fields, no murmur hash).
@@ -154,7 +151,4 @@ namespace atn {
   };
 
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.cpp

@@ -31,7 +31,7 @@
 
 #include "atn/ATNDeserializationOptions.h"
 
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 
 ATNDeserializationOptions ATNDeserializationOptions::defaultOptions;
 

runtime/Cpp/runtime/src/atn/ATNDeserializationOptions.h

@@ -33,10 +33,7 @@
 
 #include "antlr4-common.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace atn {
 
   class ANTLR4CPP_PUBLIC ATNDeserializationOptions {
@@ -74,7 +71,4 @@ namespace atn {
   };
 
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp

@@ -77,8 +77,8 @@
 
 #include "atn/ATNDeserializer.h"
 
-using namespace org::antlr::v4::runtime;
+using namespace antlr4;
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 using namespace antlrcpp;
 
 const size_t ATNDeserializer::SERIALIZED_VERSION = 3;

runtime/Cpp/runtime/src/atn/ATNDeserializer.h

@@ -34,10 +34,7 @@
 #include "atn/LexerAction.h"
 #include "atn/ATNDeserializationOptions.h"
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace atn {
 
   class ANTLR4CPP_PUBLIC ATNDeserializer {
@@ -104,7 +101,4 @@ namespace atn {
   };
 
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org

runtime/Cpp/runtime/src/atn/ATNSerializer.cpp

@@ -67,7 +67,7 @@
 #include "atn/ATNSerializer.h"
 
 using namespace antlrcpp;
-using namespace org::antlr::v4::runtime::atn;
+using namespace antlr4::atn;
 
 ATNSerializer::ATNSerializer(ATN *atn) { this->atn = atn; }
 

runtime/Cpp/runtime/src/atn/ATNSerializer.h

@@ -31,10 +31,7 @@
 
 #pragma once
 
-namespace org {
+namespace antlr4 {
-namespace antlr {
-namespace v4 {
-namespace runtime {
 namespace atn {
 
   class ANTLR4CPP_PUBLIC ATNSerializer {
@@ -87,7 +84,4 @@ namespace atn {
   };
 
 } // namespace atn
-} // namespace runtime
+} // namespace antlr4
-} // namespace v4
-} // namespace antlr
-} // namespace org