Drop named item types, refine named record types, esp in XSLT

michaelhkay · Jan 6, 2025 · 5a96b57 · 5a96b57
1 parent 4eaeba1
commit 5a96b57
Show file tree

Hide file tree

Showing 6 changed files with 294 additions and 177 deletions.
diff --git a/specifications/grammar-40/xpath-grammar.xml b/specifications/grammar-40/xpath-grammar.xml
@@ -596,7 +596,7 @@ VersionDecl ::= "xquery" (("encoding" StringLiteral) | ("version" StringLiteral
     <g:choice>
       <g:ref name="VarDecl"/>
       <g:ref name="FunctionDecl"/>
-      <g:ref name="ItemTypeDecl"/>
+      <!--<g:ref name="ItemTypeDecl"/>-->
       <g:ref name="NamedRecordTypeDecl"/>
     </g:choice>
   </g:production>
@@ -762,12 +762,12 @@ VersionDecl ::= "xquery" (("encoding" StringLiteral) | ("version" StringLiteral
     <g:ref name="Rbrace"/>
   </g:production>
 
-  <g:production name="ItemTypeDecl" if="xquery40">
+  <!--<g:production name="ItemTypeDecl" if="xquery40">
     <g:string>type</g:string>
     <g:ref name="EQName"/>
     <g:string>as</g:string>
     <g:ref name="ItemType"/>
-  </g:production>
+  </g:production>-->
 
   <g:production name="NamedRecordTypeDecl" if="xquery40">
     <g:string>record</g:string>

diff --git a/specifications/xquery-40/src/errors.xml b/specifications/xquery-40/src/errors.xml
@@ -420,8 +420,8 @@
          <p>It is a <termref def="dt-static-error">static error</termref> if an <termref
                def="dt-expanded-qname"/> used as an <nt def="ItemType"/>
                in a <nt def="SequenceType"/> is not defined
-            in the <termref def="dt-static-context"/> either as a <termref def="dt-named-item-type"/>
-            in the <termref def="dt-in-scope-named-item-types"/>,
+            in the <termref def="dt-static-context"/> either as a <termref def="dt-named-record-type"/>
+            in the <termref def="dt-in-scope-named-record-types"/>,
             or as a <termref def="dt-generalized-atomic-type"/>
             in the <termref def="dt-is-types"/>.</p>
       </error>