From d4957812cf3f07e8eabe0b5bb553c7946fae9b8c Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Fri, 3 Nov 2023 15:47:54 +0100
Subject: [PATCH] [bugfix] Correct the XQuery Parser so that Named Function
 References can have Postfix Expressions

---
 exist-core/pom.xml                            |  2 +
 .../org/exist/xquery/parser/XQueryTree.g      |  1 +
 .../exist/xquery/NamedFunctionReference.java  |  5 ++
 .../src/test/xquery/xquery3/postfix-expr.xqm  | 49 +++++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 exist-core/src/test/xquery/xquery3/postfix-expr.xqm

diff --git a/exist-core/pom.xml b/exist-core/pom.xml
index 262ffd0ac90..ac238809954 100644
--- a/exist-core/pom.xml
+++ b/exist-core/pom.xml
@@ -724,6 +724,7 @@
                                 <exclude>src/test/java/org/exist/xquery/value/SubSequenceRangeTest.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/value/SubSequenceTest.java</exclude>
                                 <exclude>src/test/xquery/binary-value.xqm</exclude>
+                                <exclude>src/test/xquery/xquery3/postfix-expr.xqm</exclude>
 
                                 <!--
                                     Derivative work licensed under dbXML 1.0 and LGPL 2.1
@@ -876,6 +877,7 @@ The original license statement is also included below.]]></preamble>
                                 <include>src/test/java/org/exist/xquery/value/SubSequenceRangeTest.java</include>
                                 <include>src/test/java/org/exist/xquery/value/SubSequenceTest.java</include>
                                 <include>src/test/xquery/binary-value.xqm</include>
+                                <include>src/test/xquery/xquery3/postfix-expr.xqm</include>
                             </includes>
 
                         </licenseSet>
diff --git a/exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g b/exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g
index e965f13c295..a5cd24cb7a6 100644
--- a/exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g
+++ b/exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g
@@ -2228,6 +2228,7 @@ throws PermissionDeniedException, EXistException, XPathException
     { path.add(step); }
     |
     step=functionReference [path]
+    step=postfixExpr [step]
     { path.add(step); }
     |
     step=inlineFunctionDecl [path]
diff --git a/exist-core/src/main/java/org/exist/xquery/NamedFunctionReference.java b/exist-core/src/main/java/org/exist/xquery/NamedFunctionReference.java
index d4d6232b2af..9fb95b828db 100644
--- a/exist-core/src/main/java/org/exist/xquery/NamedFunctionReference.java
+++ b/exist-core/src/main/java/org/exist/xquery/NamedFunctionReference.java
@@ -102,6 +102,11 @@ public void dump(ExpressionDumper dumper) {
 		dumper.display(Integer.toString(arity));
 	}
 
+	@Override
+	public String toString() {
+		return qname.toString() + '#' + arity;
+	}
+
 	@Override
 	public Sequence eval(Sequence contextSequence, Item contextItem)
 			throws XPathException {
diff --git a/exist-core/src/test/xquery/xquery3/postfix-expr.xqm b/exist-core/src/test/xquery/xquery3/postfix-expr.xqm
new file mode 100644
index 00000000000..27d252540ed
--- /dev/null
+++ b/exist-core/src/test/xquery/xquery3/postfix-expr.xqm
@@ -0,0 +1,49 @@
+(:
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This file was originally ported from FusionDB to eXist-db by
+ : Evolved Binary, for the benefit of the eXist-db Open Source community.
+ : Only the ported code as it appears in this file, at the time that
+ : it was contributed to eXist-db, was re-licensed under The GNU
+ : Lesser General Public License v2.1 only for use in eXist-db.
+ :
+ : This license grant applies only to a snapshot of the code as it
+ : appeared when ported, it does not offer or infer any rights to either
+ : updates of this source code or access to the original source code.
+ :
+ : The GNU Lesser General Public License v2.1 only license follows.
+ :
+ : ---------------------------------------------------------------------
+ :
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : 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; version 2.1.
+ :
+ : 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
+ :)
+xquery version "3.1";
+
+module namespace tpe = "http://exist-db.org/xquery/test/postfix-expr";
+
+declare namespace test = "http://exist-db.org/xquery/xqsuite";
+
+declare
+    %test:assertEquals("test123")
+function tpe:named-function-ref-postfix() {
+  xs:string#1("test123")
+};
+
+declare
+    %test:assertEquals("test456")
+function tpe:include-function-expr-postfix() {
+  function($x) { $x }("test456")
+};