Fix first level matching (#326)

ArnaudBuchholz · Dec 11, 2019 · 1ca52c6 · 1ca52c6
1 parent 218c6a5
commit 1ca52c6
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/xml/xpath/parser.js b/src/xml/xpath/parser.js
@@ -56,7 +56,7 @@ var _GPF_XML_XPATH_TOKEN = {};
 ]));
 
 // <start> -> <level> (CONCAT <level>)?
-// <level> -> CURRENT? (SUB|DEEP) <match> ( (SUB|DEEP) <match> )*
+// <level> -> (CURRENT? (SUB|DEEP))? <match> ( (SUB|DEEP) <match> )*
 // <match> -> ATTRIBUTE? NAMESPACE_PREFIX? (NAME|ANY)
 
 /**
@@ -121,7 +121,16 @@ function _gpfXmlXPathParse (xpathExpression) {
             chain = new _GpfXmlXPathChain(),
             subOrDeep,
             operator;
-        subOrDeep = checkAndConsumeIfTokenMatch(_GPF_XML_XPATH_TOKEN.SUB, _GPF_XML_XPATH_TOKEN.DEEP);
+        subOrDeep = consumeIfTokenMatch(_GPF_XML_XPATH_TOKEN.SUB, _GPF_XML_XPATH_TOKEN.DEEP);
+        if (!subOrDeep) {
+            if (relative) {
+                gpf.Error.invalidXPathSyntax();
+            }
+            relative = true;
+            subOrDeep = {
+                token: _GPF_XML_XPATH_TOKEN.SUB
+            };
+        }
         while (subOrDeep) {
             operator = new levelClasses[subOrDeep.token](relative);
             operator.addChild(match());