[fix] EnclosedExpression in element constructor with location

- In XQuery.g: copy lexer info (location) of enclosed expression to
  compElementConstructorContent, if present.
  Add virtual parenthesized expression otherwise, evaluating to
  `element test { () }`

- Set AST node of enclosed expression in computed element constructor
  in XQueryTree.g

- Adapt jUnit-tests to:
  1. Ensure enclosed expression location is reported.
  2. Ensure arrays are allowed as computed element constructor content.

Author: line-o

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

@@ -1673,7 +1673,9 @@ compElemConstructor throws XPathException
 compElemConstructorContent throws XPathException
 :
     ( LCURLY RCURLY ) => LCURLY! RCURLY!
-    | LCURLY^ (expr)?  RCURLY!
+    { #compElemConstructorContent= #(#[PARENTHESIZED, "Parenthesized"], null); }
+    | LCURLY! e:expr RCURLY!
+    { #compElemConstructorContent.copyLexInfo(#e); }
     ;
 
 

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

@@ -3157,8 +3157,11 @@ throws PermissionDeniedException, EXistException, XPathException
 		qnameExpr=expr [qnamePathExpr]
 		(
 			{ elementContent = new PathExpr(context); }
-			contentExpr=expr[elementContent]
-			{ construct.addPathIfNotFunction(elementContent); }
+			contentExpr=ec:expr[elementContent]
+			{
+			  elementContent.setASTNode(ec);
+			  construct.addPathIfNotFunction(elementContent);
+			}
 		)*
 	)
 	|

exist-core/src/test/java/org/exist/xquery/FunctionTypeInElementContent.java

@@ -42,35 +42,35 @@ public class FunctionTypeInElementContent {
     @Test
     public void arrayLiteral() throws XMLDBException {
         final String query = "element test { [] }";
-        final String error = "err:XQTY0105 Function types are not allowed in element content. Got array(*) [at line 1, column 14, source: element test { [] }]";
-        assertCompilationError(query, error);
+        assertCompilationSuccess(query);
+    }
+
+    @Test
+    public void arrayConstructor() throws XMLDBException {
+        final String query = "element test { array { () } }";
+        assertCompilationSuccess(query);
     }
 
+
     @Test
     public void partialBuiltIn() throws XMLDBException {
         final String query = "element test { sum(?) }";
-        final String error = "err:XQTY0105 Function types are not allowed in element content. Got function(*) [at line 1, column 14, source: element test { sum(?) }]";
+        final String error = "err:XQTY0105 Function types are not allowed in element content. Got function(*) [at line 1, column 16, source: element test { sum(?) }]";
         assertCompilationError(query, error);
     }
 
     @Test
     public void userDefinedFunction() throws XMLDBException {
         final String query = "element test { function () { () } }";
-        final String error = "err:XQTY0105 Function types are not allowed in element content. Got function(*) [at line 1, column 14, source: element test { function () { () } }]";
-        assertCompilationError(query, error);
-    }
-
-    @Test
-    public void arrayConstructor() throws XMLDBException {
-        final String query = "element test { array { () } }";
-        final String error = "err:XQTY0105 Function types are not allowed in element content. Got array(*) [at line 1, column 14, source: element test { array { () } }]";
+        // TODO: user defined function has its location offset to a weird location
+        final String error = "err:XQTY0105 Function types are not allowed in element content. Got function(*) [at line 1, column 25, source: element test { function () { () } }]";
         assertCompilationError(query, error);
     }
 
     @Test
     public void mapConstructor() throws XMLDBException {
         final String query = "element test { map {} }";
-        final String error = "err:XQTY0105 Function types are not allowed in element content. Got map(*) [at line 1, column 14, source: element test { map {} }]";
+        final String error = "err:XQTY0105 Function types are not allowed in element content. Got map(*) [at line 1, column 16, source: element test { map {} }]";
         assertCompilationError(query, error);
     }
 
@@ -107,4 +107,10 @@ private void assertCompilationError(final String query, final String error) thro
             assertEquals( error, ex.getMessage() );
         }
     }
+    private void assertCompilationSuccess(final String query) throws XMLDBException {
+        final XQueryService service = (XQueryService)existEmbeddedServer.getRoot().getService("XQueryService", "1.0");
+
+        service.compile(query);
+        assertTrue( true );
+    }
 }