add support for ##any default element namespace (#2629)

Author: GuntherRademacher

basex-core/src/main/java/org/basex/query/QueryParser.java

@@ -539,7 +539,7 @@ private boolean defaultNamespaceDecl(final boolean fixed) throws QueryException
     final boolean elem = wsConsumeWs(ELEMENT);
     if(!elem && !wsConsumeWs(FUNCTION)) return false;
     wsCheck(NAMESPACE);
-    final byte[] uri = uriLiteral();
+    final byte[] uri = elem ? uriLiteral(ANY_URI) : uriLiteral();
     if(eq(XML_URI, uri)) throw error(BINDXMLURI_X_X, uri, XML);
     if(eq(XMLNS_URI, uri)) throw error(BINDXMLURI_X_X, uri, XMLNS);
 
@@ -697,7 +697,6 @@ private void schemaImport() throws QueryException {
     }
     final byte[] uri = uriLiteral();
     if(prefix != null && uri.length == 0) throw error(NSEMPTY);
-    if(!Uri.get(uri).isValid()) throw error(INVURI_X, uri);
     addLocations(new TokenList());
     throw error(IMPLSCHEMA);
   }
@@ -715,7 +714,6 @@ private void moduleImport() throws QueryException {
 
     final byte[] uri = uriLiteral();
     if(uri.length == 0) throw error(NSMODURI);
-    if(!Uri.get(uri).isValid()) throw error(INVURI_X, uri);
     if(sc.imports.contains(token(uri))) throw error(DUPLMODULE_X, uri);
     sc.imports.add(uri);
 
@@ -754,8 +752,7 @@ private boolean addLocations(final TokenList list) throws QueryException {
     if(add) {
       do {
         final byte[] uri = uriLiteral();
-        if(!Uri.get(uri).isValid() || IO.get(string(uri)) instanceof IOContent)
-          throw error(INVURI_X, uri);
+        if(IO.get(string(uri)) instanceof IOContent) throw error(INVURI_X, uri);
         list.add(uri);
       } while(wsConsume(","));
     }
@@ -2467,7 +2464,8 @@ private ExprInfo simpleNodeTest(final Kind kind, final boolean all) throws Query
             name = new QNm(concat(name.string(), cpToken(':')));
             scope = NameTest.Scope.URI;
           } else if(!eqName) {
-            scope = NameTest.Scope.FLEXIBLE;
+            scope = kind == Kind.ELEMENT && eq(sc.elemNS, ANY_URI) ? NameTest.Scope.LOCAL
+                                                                   : NameTest.Scope.FLEXIBLE;
           }
         }
         // name test: prefix:name, name, Q{uri}name
@@ -2878,11 +2876,15 @@ private byte[] stringLiteral() throws QueryException {
 
   /**
    * Parses the "URILiteral" rule.
+   * @param special tokens that are allowed though not valid URI literals
    * @return query expression
    * @throws QueryException query exception
    */
-  private byte[] uriLiteral() throws QueryException {
-    return normalize(stringLiteral());
+  private byte[] uriLiteral(final byte[]... special) throws QueryException {
+    final byte[] uri = normalize(stringLiteral());
+    for(final byte[] sp : special) if(eq(uri, sp)) return uri;
+    if(!Uri.get(uri).isValid()) throw error(INVURI_X, uri);
+    return uri;
   }
 
   /**
@@ -2898,6 +2900,7 @@ private byte[] bracedURILiteral() throws QueryException {
       entity(token);
     }
     final byte[] ns = normalize(token.toArray());
+    if(!Uri.get(ns).isValid()) throw error(INVURI_X, ns);
     if(eq(ns, XMLNS_URI)) {
       pos = p;
       throw error(ILLEGALEQNAME_X, ns);
@@ -3471,7 +3474,7 @@ private SeqType castTarget() throws QueryException {
     if(wsConsume("(")) {
       type = choiceItemType().type;
     } else {
-      final QNm name = eQName(sc.elemNS, TYPEINVALID);
+      final QNm name = eQName(eq(sc.elemNS, ANY_URI) ? XS_URI : sc.elemNS, TYPEINVALID);
       if(!name.hasURI() && eq(name.local(), token(ENUM))) {
         if(!wsConsume("(")) throw error(WHICHCAST_X, BasicType.similar(name));
         type = enumerationType();
@@ -3560,8 +3563,8 @@ private SeqType itemType() throws QueryException {
         }
       }
     } else {
-      // attach default element namespace
-      if(!name.hasURI()) name.uri(sc.elemNS);
+      // attach default element namespace, or schema namespace if default element namespace is ##any
+      if(!name.hasURI()) name.uri(eq(sc.elemNS, ANY_URI) ? XS_URI : sc.elemNS);
       // basic type
       type = BasicType.get(name, false);
       // declared type

basex-core/src/main/java/org/basex/query/QueryText.java

@@ -340,6 +340,8 @@ public interface QueryText {
   /** BaseX URI. */ byte[] XQUERY_URI = token(BXMODULES_URL + "xquery");
   /** BaseX URI. */ byte[] XSLT_URI = token(BXMODULES_URL + "xslt");
 
+  /** "Any" URI. */ byte[] ANY_URI = token("##any");
+
   // QUERY PLAN ===================================================================================
 
   /** Query Info. */ String OP = "op";

basex-core/src/main/java/org/basex/query/util/parse/QNmResolver.java

@@ -64,7 +64,7 @@ public void resolve(final QueryParser qp, final int npos, final byte[] elemNS)
         entry.name.uri(qp.qc.ns.resolve(entry.name.prefix(), qp.sc));
         if(npos == 0 && !entry.name.hasURI())
           throw qp.error(NOURI_X, entry.info, entry.name.prefix());
-      } else if(entry.nsElem) {
+      } else if(entry.nsElem && !Token.eq(elemNS, QueryText.ANY_URI)) {
         entry.name.uri(elemNS);
       }
       if(entry.name.hasURI()) entries.remove(i);

basex-core/src/test/java/org/basex/query/NamespaceTest.java

@@ -701,6 +701,48 @@ public final class NamespaceTest extends SandboxTest {
         "<a xmlns=\"a\"/>");
   }
 
+  /**
+   * Tests with default element namespace set to ##any.
+   */
+  @Test public void defaultElementNamespaceAny() {
+    final String defAny = "declare default element namespace '##any';\n";
+
+    // element-axis NameTest => *:a
+    query(defAny + "<a/>/self::a", "<a/>");
+    query(defAny + "element Q{a}a {}/self::a", "<a xmlns=\"a\"/>");
+    query(defAny + "element Q{a}a {}/self::Q{}a", "");
+    query(defAny + "<r xmlns:x='X' xmlns:y='Y'><a/><x:a/><y:a/></r>/a",
+        "<a/>\n<x:a xmlns:x=\"X\"/>\n<y:a xmlns:y=\"Y\"/>");
+    query(defAny + "<r xmlns:x='X'><x:a/></r>/*[self::a]", "<x:a xmlns:x=\"X\"/>");
+
+    // attributes are unaffected
+    query(defAny + "count(<e xmlns:x='X' a='' x:a=''/>/@a)", 1);
+    query(defAny + "count(<e xmlns:x='X' a='' x:a=''/>/@*)", 2);
+
+    // element(...) node tests
+    query(defAny + "<a/> instance of element(a)", true);
+    query(defAny + "<a xmlns='X'/> instance of element(a)", true);
+    query(defAny + "<a/> instance of element(Q{}a)", true);
+    query(defAny + "element Q{X}a {} instance of element(Q{}a)", false);
+    query(defAny + "document { element Q{X}a {} } instance of document-node(element(a))", true);
+
+    // unprefixed type names => xs:*
+    query(defAny + "42 instance of integer", true);
+    query(defAny + "'42' cast as integer", 42);
+
+    // other contexts fall back to no namespace
+    query(defAny + "namespace-uri(element a {})", "");
+    query(defAny + "<r xmlns:x='X'><a/><x:a/></r>/Q{}a", "<a/>");
+
+    // with fixed + ##any, constructor xmlns must not suppress ##any behavior
+    query("declare fixed default element namespace '##any'; " +
+        "<a xmlns='u'><b/>{ <u:c xmlns:u='u'/>/self::c }</a>",
+        "<a xmlns=\"u\"><b/><u:c xmlns:u=\"u\"/></a>");
+
+    // ##any in xmlns context
+    error("<a xmlns='##any'/>", INVURI_X);
+  }
+
   /**
    * Test query.
    * Detects malformed namespace hierarchy.