[refactor] Add detection of error XUST0032

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

@@ -500,6 +500,24 @@ throws PermissionDeniedException, EXistException, XPathException
                         { List annots = new ArrayList(); }
                         (annotations [annots]
                         )?
+                        {
+                            for(int i = 0; i < annots.size(); i++)
+                            {
+                            	List la = (List) annots.get(i);
+                                if(la.size() > 0)
+                                {
+                                    for(int a = 0; a < la.size(); a++)
+                                    {
+                                         if(la.get(a).toString().equals("simple") || la.get(a).toString().equals("updating"))
+                                         {
+                                             throw new XPathException(qname, ErrorCodes.XUST0032,
+                                             "It is a static error if an %updating or %simple annotation is used on a VarDecl.");
+                                         }
+                                    }
+                                }
+                            }
+
+                        }
             (
                 #(
                     "as"

exist-core/src/main/java/org/exist/xquery/ErrorCodes.java

@@ -239,6 +239,9 @@ public class ErrorCodes {
 
     public static final ErrorCode XTSE0165 = new W3CErrorCode("XTSE0165","It is a static error if the processor is not able to retrieve the resource identified by the URI reference [ in the href attribute of xsl:include or xsl:import] , or if the resource that is retrieved does not contain a stylesheet module conforming to this specification.");
 
+    /* XQuery 3.0 Update Facility https://www.w3.org/TR/xquery-update-30/#id-new-error-codes */
+    public static final ErrorCode XUST0032 = new W3CErrorCode("XUST0032", "It is a static error if an %updating or %simple annotation is used on a VarDecl.");
+
     /* eXist specific XQuery and XPath errors
      *
      * Codes have the format [EX][XQ|XP][DY|SE|ST][nnnn]

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

@@ -28,6 +28,7 @@
 import org.exist.storage.BrokerPool;
 import org.exist.storage.DBBroker;
 import org.exist.test.ExistEmbeddedServer;
+import org.exist.xquery.ErrorCodes;
 import org.exist.xquery.PathExpr;
 import org.exist.xquery.XPathException;
 import org.exist.xquery.XQueryContext;
@@ -123,4 +124,31 @@ public void simpleAnnotation() throws EXistException, RecognitionException, XPat
             }
         }
     }
+
+    @Test
+    public void simpleAnnotationIsInvalidForVariableDeclaration() throws EXistException, RecognitionException, XPathException, TokenStreamException, PermissionDeniedException
+    {
+        String query = "declare %simple variable $ab := 1;";
+
+        BrokerPool pool = BrokerPool.getInstance();
+        try(final DBBroker broker = pool.getBroker()) {
+            // parse the query into the internal syntax tree
+            XQueryContext context = new XQueryContext(broker.getBrokerPool());
+            XQueryLexer lexer = new XQueryLexer(context, new StringReader(query));
+            XQueryParser xparser = new XQueryParser(lexer);
+            xparser.prolog();
+            if (xparser.foundErrors()) {
+                fail(xparser.getErrorMessage());
+                return;
+            }
+
+            XQueryAST ast = (XQueryAST) xparser.getAST();
+            XQueryTreeParser treeParser = new XQueryTreeParser(context);
+            PathExpr expr = new PathExpr(context);
+            treeParser.prolog(ast, expr);
+        }
+        catch(XPathException ex) {
+            assertEquals(ErrorCodes.XUST0032, ex.getErrorCode());
+        }
+    }
 }