[bugfix] Preserve the Error Code from the initial XQuery parser stage

Author: adamretter

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

@@ -103,6 +103,10 @@ options {
 		return buf.toString();
 	}
 
+	public Exception getLastException() {
+		return (Exception) exceptions.get(exceptions.size() - 1);
+	}
+
 	public String getXQDoc() {
 		return lexer.getXQDoc();
 	}

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

@@ -224,10 +224,18 @@ private CompiledXQuery compile(final XQueryContext context, final Reader reader,
             } else {
                 parser.xpath();
             }
-            
-            if(parser.foundErrors()) {
-            	LOG.debug(parser.getErrorMessage());
-            	throw new StaticXQueryException(context.getRootExpression(), parser.getErrorMessage());
+
+            if (parser.foundErrors()) {
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(parser.getErrorMessage());
+                }
+                final Exception lastException = parser.getLastException();
+                if (lastException != null && lastException instanceof XPathException) {
+                    final XPathException xpe = (XPathException) lastException;
+                    throw new StaticXQueryException(xpe.getColumn(), xpe.getLine(), parser.getErrorMessage(), xpe);
+                } else {
+                    throw new StaticXQueryException(context.getRootExpression(), parser.getErrorMessage());
+                }
             }
 
             final AST ast = parser.getAST();