[MOD] Adaptive serialization: more flexibility for function items

Author: ChristianGruen

basex-core/src/main/java/org/basex/io/serial/AdaptiveSerializer.java

@@ -145,15 +145,7 @@ protected final void function(final FItem item) throws IOException {
     } else if(item instanceof final XQMap map) {
       map(map);
     } else {
-      if(this instanceof BaseXSerializer) {
-        printChars(Token.token(item.toErrorString()));
-      } else {
-        final QNm fn = item.funcName();
-        if(fn == null) printChars(Token.token("(anonymous-function)"));
-        else printChars(fn.prefixId());
-        printChar('#');
-        printChars(Token.token(item.arity()));
-      }
+      printChars(Token.token(item.toErrorString()));
     }
   }
 

basex-core/src/test/java/org/basex/query/SerializerTest.java

@@ -271,7 +271,7 @@ public final class SerializerTest extends SandboxTest {
     query(option + "xs:dayTimeDuration('P1D')", "xs:duration(\"P1D\")");
     query(option + "<xml><a>B</a></xml>", "<xml><a>B</a></xml>");
     query(option + "true#0", "fn:true#0");
-    query(option + "fn() {}", "(anonymous-function)#0");
+    query(option + "fn() {}", "fn() as empty-sequence() { () }");
     query(option + "xs:float(1)", "xs:float(\"1\")");
 
     query(option + "[]", "[]");
@@ -290,7 +290,7 @@ public final class SerializerTest extends SandboxTest {
     query(option + "[ xs:dayTimeDuration('P1D') ]", "[xs:duration(\"P1D\")]");
     query(option + "[ <xml><a>B</a></xml> ]", "[<xml><a>B</a></xml>]");
     query(option + "[ true#0 ]", "[fn:true#0]");
-    query(option + "[ fn() {} ]", "[(anonymous-function)#0]");
+    query(option + "[ fn() {} ]", "[fn() as empty-sequence() { () }]");
     query(option + "[ xs:float(1) ]", "[xs:float(\"1\")]");
 
     query(option + "{ 1: (), 2: 3, 4: (5, 6) }", "{1:(),2:3,4:(5,6)}");