[feature] Add support for XQUF 3.0 updating and simple annotations

exist-core/src/main/antlr/org/exist/xquery/parser/XQuery.g

@@ -263,7 +263,8 @@ prolog throws XPathException
             ( "declare" "context" "item" )
             => contextItemDeclUp { inSetters = false; }
 			|
-			( "declare" MOD )
+			// bare keyword updating is valid because of rule CompatibilityAnnotation in the XQUF standard
+			( "declare" (MOD | "updating") )
 			=> annotateDecl { inSetters = false; }
         )
 		SEMICOLON!
@@ -454,6 +455,12 @@ annotation
 :
 	MOD! name=eqName! (LPAREN! literal (COMMA! literal)* RPAREN!)?
         { #annotation= #(#[ANNOT_DECL, name], #annotation); }
+
+    | "updating"!
+    {
+        name = "updating";
+        #annotation= #(#[ANNOT_DECL, name], #annotation);
+    }
     ;
 
 eqName returns [String name]
@@ -2228,6 +2235,8 @@ reservedKeywords returns [String name]
 	"empty-sequence" { name = "empty-sequence"; }
 	|
 	"schema-element" { name = "schema-element"; }
+	|
+	"updating" { name = "updating"; }
 	;
 
 /**

exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g

@@ -147,7 +147,7 @@ options {
         String ns = qname.getNamespaceURI();
         if (ns.equals(Namespaces.XPATH_FUNCTIONS_NS)) {
             String ln = qname.getLocalPart();
-            return ("private".equals(ln) || "public".equals(ln));
+            return ("private".equals(ln) || "public".equals(ln) || "updating".equals(ln) || "simple".equals(ln));
         } else {
             return !(ns.equals(Namespaces.XML_NS)
                      || ns.equals(Namespaces.SCHEMA_NS)

exist-core/src/test/java/org/exist/xquery/update/XQueryUpdate3Test.java

@@ -0,0 +1,126 @@
+/*
+ * eXist-db Open Source Native XML Database
+ * Copyright (C) 2001 The eXist-db Authors
+ *
+ * [email protected]
+ * http://www.exist-db.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package org.exist.xquery.update;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+import org.exist.EXistException;
+import org.exist.security.PermissionDeniedException;
+import org.exist.storage.BrokerPool;
+import org.exist.storage.DBBroker;
+import org.exist.test.ExistEmbeddedServer;
+import org.exist.xquery.PathExpr;
+import org.exist.xquery.XPathException;
+import org.exist.xquery.XQueryContext;
+import org.exist.xquery.parser.XQueryAST;
+import org.exist.xquery.parser.XQueryLexer;
+import org.exist.xquery.parser.XQueryParser;
+import org.exist.xquery.parser.XQueryTreeParser;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import java.io.StringReader;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author <a href="[email protected]">Adam Retter</a>
+ * @author <a href="[email protected]">Gabriele Tomassetti</a>
+ */
+public class XQueryUpdate3Test {
+
+    @ClassRule
+    public static final ExistEmbeddedServer existEmbeddedServer = new ExistEmbeddedServer(true, true);
+
+    @Test
+    public void updatingCompatibilityAnnotation() throws EXistException, RecognitionException, XPathException, TokenStreamException, PermissionDeniedException {
+        final String query =
+                "xquery version \"3.0\"\n;" +
+                        "module namespace t=\"http://exist-db.org/xquery/test/examples\";\n" +
+                        "declare updating function" +
+                        "   t:upsert($e as element(), \n" +
+                        "          $an as xs:QName, \n" +
+                        "          $av as xs:anyAtomicType) \n" +
+                        "   {\n" +
+                        "   let $ea := $e/attribute()[fn:node-name(.) = $an]\n" +
+                        "   return\n" +
+                        "     $ea\n" +
+                        "   };";
+
+        final BrokerPool pool = BrokerPool.getInstance();
+        try (final DBBroker broker = pool.getBroker()) {
+            // parse the query into the internal syntax tree
+            final XQueryContext context = new XQueryContext(broker.getBrokerPool());
+            final XQueryLexer lexer = new XQueryLexer(context, new StringReader(query));
+            final XQueryParser xparser = new XQueryParser(lexer);
+            xparser.xpath();
+            if (xparser.foundErrors()) {
+                fail(xparser.getErrorMessage());
+            }
+
+            final XQueryAST ast = (XQueryAST) xparser.getAST();
+            final XQueryTreeParser treeParser = new XQueryTreeParser(context);
+            final PathExpr expr = new PathExpr(context);
+            treeParser.xpath(ast, expr);
+            if (treeParser.foundErrors()) {
+                fail(treeParser.getErrorMessage());
+            }
+        }
+    }
+
+    @Test
+    public void simpleAnnotation() throws EXistException, RecognitionException, XPathException, TokenStreamException, PermissionDeniedException {
+        final String query =
+                "xquery version \"3.0\"\n;" +
+                        "module namespace t=\"http://exist-db.org/xquery/test/examples\";\n" +
+                        "declare %simple function" +
+                        "   t:upsert($e as element(), \n" +
+                        "          $an as xs:QName, \n" +
+                        "          $av as xs:anyAtomicType) \n" +
+                        "   {\n" +
+                        "   let $ea := $e/attribute()[fn:node-name(.) = $an]\n" +
+                        "   return\n" +
+                        "     $ea\n" +
+                        "   };";
+
+        final BrokerPool pool = BrokerPool.getInstance();
+        try (final DBBroker broker = pool.getBroker()) {
+            // parse the query into the internal syntax tree
+            final XQueryContext context = new XQueryContext(broker.getBrokerPool());
+            final XQueryLexer lexer = new XQueryLexer(context, new StringReader(query));
+            final XQueryParser xparser = new XQueryParser(lexer);
+            xparser.xpath();
+            if (xparser.foundErrors()) {
+                fail(xparser.getErrorMessage());
+                return;
+            }
+
+            final XQueryAST ast = (XQueryAST) xparser.getAST();
+            final XQueryTreeParser treeParser = new XQueryTreeParser(context);
+            final PathExpr expr = new PathExpr(context);
+            treeParser.xpath(ast, expr);
+            if (treeParser.foundErrors()) {
+                fail(treeParser.getErrorMessage());
+            }
+        }
+    }
+}