[MOD] XQuery: drop constructors for built-in records. qtspecs#2768

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/func/Function.java

@@ -799,43 +799,6 @@ public enum Function implements AFunction {
   ZERO_OR_ONE(FnZeroOrOne::new, "zero-or-one(input)",
       params(ITEM_ZM), ITEM_ZO),
 
-  // Predefined record constructor functions
-
-  /** XQuery function. */
-  ARRAY_SORT_KEY_RECORD(Records.ARRAY_SORT_KEY.get()),
-  /** XQuery function. */
-  ATTRIBUTE_CONVERSION_PLAN_RECORD(Records.ATTRIBUTE_CONVERSION_PLAN.get()),
-  /** XQuery function. */
-  CAPTURED_GROUP_RECORD(Records.CAPTURED_GROUP.get()),
-  /** XQuery function. */
-  COMPILED_REGEX_RECORD(Records.COMPILED_REGEX.get()),
-  /** XQuery function. */
-  DATETIME_RECORD(Records.DATETIME.get()),
-  /** XQuery function. */
-  DIVISION_RECORD(Records.DIVISION.get()),
-  /** XQuery function. */
-  ELEMENT_CONVERSION_PLAN_RECORD(Records.ELEMENT_CONVERSION_PLAN.get()),
-  /** XQuery function. */
-  _BIN_INFER_ENCODING_RECORD(Records.INFER_ENCODING.get()),
-  /** XQuery function. */
-  LOAD_XQUERY_MODULE_RECORD(Records.LOAD_XQUERY_MODULE.get()),
-  /** XQuery function. */
-  LOCATION_RECORD(Records.LOCATION.get()),
-  /** XQuery function. */
-  MATCHING_SEGMENT_RECORD(Records.MATCHING_SEGMENT.get()),
-  /** XQuery function. */
-  PARSED_CSV_STRUCTURE_RECORD(Records.PARSED_CSV_STRUCTURE.get()),
-  /** XQuery function. */
-  RANDOM_NUMBER_GENERATOR_RECORD(Records.RANDOM_NUMBER_GENERATOR.get()),
-  /** XQuery function. */
-  SCHEMA_TYPE_RECORD(Records.SCHEMA_TYPE.get()),
-  /** XQuery function. */
-  SORT_KEY_RECORD(Records.SORT_KEY.get()),
-  /** XQuery function. */
-  URI_STRUCTURE_RECORD(Records.URI_STRUCTURE.get()),
-  /** XQuery function. */
-  VALIDATION_RESULT_RECORD(Records.VALIDATION_RESULT.get()),
-
   // Map Module
 
   /** XQuery function. */
@@ -2206,14 +2169,6 @@ EMPTY_SEQUENCE_Z, flag(UPD), USER_URI, Perm.ADMIN),
   /** Function definition. */
   private final FuncDefinition definition;
 
-  /**
-   * Constructs a function signature for a predefined record constructor from a ShapeType.
-   * @param rt record type
-   */
-  Function(final RecordType rt) {
-    this(ShapeConstructor.definition(rt));
-  }
-
   /**
    * Constructs a function signature; calls
    * {@link #Function(Supplier, String, SeqType[], SeqType, EnumSet)}.

basex-core/src/main/java/org/basex/query/func/Functions.java

@@ -304,9 +304,7 @@ private static Cast constructorCall(final QNm name, final FuncBuilder fb) throws
   private static StaticFuncCall staticCall(final QNm name, final FuncBuilder fb,
       final QueryContext qc) throws QueryException {
 
-    if(NSGlobal.reserved(name.uri()) && !Records.BUILT_IN.contains(name)) {
-      throw qc.functions.similarError(name, fb.info);
-    }
+    if(NSGlobal.reserved(name.uri())) throw qc.functions.similarError(name, fb.info);
 
     final StaticFuncCall call = new StaticFuncCall(name, fb.args(), fb.keywords, fb.info);
     qc.functions.setFunc(call, fb.runtime, qc);

basex-core/src/main/java/org/basex/query/func/ShapeConstructor.java

@@ -122,7 +122,7 @@ public void toString(final QueryString qs) {
    * @param sh shape
    * @return constructor function definition
    */
-  public static FuncDefinition definition(final ShapeType sh) {
+  private static FuncDefinition definition(final ShapeType sh) {
     final QNm name = sh.name();
     final TokenBuilder tb = new TokenBuilder(name != null ? name.local() :
       Token.token(sh instanceof RecordType ? QueryText.RECORD : QueryText.MAP)).add('(');

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

@@ -216,14 +216,6 @@ public final class ModuleTest extends SandboxTest {
     final IOFile q2 = new IOFile(sandbox, "q2.xqm");
     write(q2, "module namespace q = 'q';\n"
         + "declare %private function x() {42};");
-    final IOFile r = new IOFile(sandbox, "r.xqm");
-    write(r, "module namespace r = 'r';\n"
-        + "declare function r:f() {\n"
-        + "  fn:division-record(1, 2),\n"
-        + "  fn:division-record#2(3, 4),\n"
-        + "  5 => fn:division-record(6),\n"
-        + "  function-lookup(#fn:division-record, 2)(7, 8)\n"
-        + "};");
     final IOFile s = new IOFile(sandbox, "s.xqm");
     write(s, "module namespace s = 's';\n"
         + "import module 's' at '" + s.path() + "';\n"
@@ -238,14 +230,6 @@ public final class ModuleTest extends SandboxTest {
     query("import module namespace q = 'q' at '" + q1.path() + "', '" + q2.path() + "';\n"
         + "q:f()", 42);
 
-    // built-in record constructor visible in library module
-    query("import module namespace r = 'r' at '" + r.path() + "';\n"
-        + "r:f()",
-          "{\"quotient\":1,\"remainder\":2}\n"
-        + "{\"quotient\":3,\"remainder\":4}\n"
-        + "{\"quotient\":5,\"remainder\":6}\n"
-        + "{\"quotient\":7,\"remainder\":8}");
-
     // private function reported as such
     error("import module namespace p = 'p' at '" + p.path() + "';\n"
         + "p:x()", QueryError.FUNCPRIVATE_X);

basex-core/src/test/java/org/basex/query/expr/RecordTest.java

@@ -6,7 +6,6 @@
 
 import org.basex.*;
 import org.basex.query.func.*;
-import org.basex.query.util.hash.*;
 import org.basex.query.value.item.*;
 import org.basex.query.value.map.*;
 import org.basex.query.value.seq.*;
@@ -740,15 +739,13 @@ declare record cx:complex(r as xs:double, i as xs:double := ());
         "0\n0", exists(REPLICATE));
   }
 
-  /** Checks that every built-in record type has a constructor function in {@link Function}. */
-  @Test public void builtInRecordsHaveConstructors() {
-    final QNmSet funcNames = new QNmSet();
-    for(final Function f : Function.values()) {
-      funcNames.add(f.definition().name);
-    }
+  /** Checks that no built-in record type has a constructor function. */
+  @Test public void builtInRecordsHaveNoConstructors() {
     for(final Records record : Records.values()) {
-      assertTrue(funcNames.contains(record.get().name()),
-          "Missing constructor function for " + record);
+      assertFalse(Functions.BUILT_IN.contains(record.get().name()),
+          "Constructor function for " + record);
     }
+    error("fn:division-record(1, 2)", WHICHFUNC_X);
+    error("fn:division-record#2", WHICHFUNC_X);
   }
 }

basex-core/src/test/java/org/basex/query/func/FnModuleTest.java

@@ -445,7 +445,6 @@ public final class FnModuleTest extends SandboxTest {
     query(func.args(" {\"day\": 3,"
         + " \"timezone\": xs:dayTimeDuration('PT1H') }"),
         "---03+01:00");
-    query(func.args(" dateTime-record(day:=4)"), "---04");
     // year 0
     query(func.args(" {\"year\": 0, \"month\": 1, \"day\": 1}"), "0000-01-01");