Merge lp:~zorba-coders/zorba/xqddf_doc into lp:zorba

[William Candillon]

Update the XQDDF ebnf to fit with XQuery 3.0 syntax.

Minor documentation fixes

[lp:~zorba-coders/zorba/xqddf_doc]

10667. By William Candillon on 2012-02-17

Remove QName references to EQName in the xqddf doc.

[Matthias Brantner (matthias-brantner)]

review: Approve

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqddf_doc-2012-02-20T17-08-01.572Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xqddf_doc-2012-02-20T17-08-01.572Z is finished. The final status was:

All tests succeeded!

=== modified file 'doc/zorba/xqddf.dox'
--- doc/zorba/xqddf.dox	2011-10-30 08:04:47 +0000
+++ doc/zorba/xqddf.dox	2012-02-17 16:33:21 +0000
@@ -333,12 +333,12 @@
 \subsection collection_declaration Collection Declaration
 
 \code
-  Prolog ::= ((DefaultNamespaceDecl | Setter | NamespaceDecl | Import) Separator)*
-             ((ContextItemDecl | AnnotatedDecl | OptionDecl | CollectionDecl | IndexDecl | ICDecl) Separator)*
-  
-  CollectionDecl ::= 'declare'  Annotation* 'collection' QName CollectionTypeDecl?
+  AnnotatedDecl
+          ::= 'declare' ( CompatibilityAnnotation | Annotation )*
+              ( VarDecl | FunctionDecl | CollectionDecl | IndexDecl | ICDecl )
+  CollectionDecl ::= 'collection' EQName CollectionTypeDecl?
 
-  CollectionTypeDeclaration ::= 'as' KindTest OccurrenceIndicator?
+  CollectionTypeDecl ::= 'as' KindTest OccurrenceIndicator?
 \endcode
 
 Collections are defined by <strong>collection declaration statements</strong>,
@@ -1355,14 +1355,11 @@
 
 
 \code
-  Prolog ::= ((DefaultNamespaceDecl | Setter | NamespaceDecl | Import) Separator)*
-             ((ContextItemDecl | AnnotatedDecl | OptionDecl | CollectionDecl | IndexDecl | ICDecl) Separator)*
-  
-  IndexDecl ::= 'declare' Annotation* 'index' IndexName
+  IndexDecl ::= 'index' IndexName
                'on' 'nodes' IndexDomainExpr
                'by' IndexKeySpec (',' IndexKeySpec)*
 
-  IndexName ::= QName
+  IndexName ::= EQName
 
   IndexDomainExpr ::= PathExpr
 
@@ -1372,9 +1369,9 @@
 
   IndexKeyTypeDecl ::= 'as' AtomicType OccurrenceIndicator?
 
-  AtomicType ::= QName
+  AtomicType ::= EQName
 
-  IndexKeyCollation ::= 'collation' UriLiteral
+  IndexKeyCollation ::= 'collation' URILiteral
 
   Note: the following annotations are accepted within the context of an index declaration:
 
@@ -2103,16 +2100,16 @@
 \section integrity_constraints Integrity Constraints in Zorba 
 
 \code
-  ICDecl                ::=  'declare' 'integrity' 'constraint' QName (ICCollection | ICForeignKey)
+  ICDecl                ::=  'integrity' 'constraint' EQName (ICCollection | ICForeignKey)
 
-  ICCollection          ::=  'on' 'collection' QName
+  ICCollection          ::=  'on' 'collection' EQName
        ( ICCollSequence | ICCollSequenceUnique | ICCollNode )
 
-  ICCollSequence        ::=  '\$' QName 'check' ExprSingle
-
-  ICCollSequenceUnique  ::=  'node' '\$' QName 'check' 'unique' 'key' PathExpr
-
-  ICCollNode            ::=  'foreach' 'node' '\$' QName 'check' ExprSingle
+  ICCollSequence        ::=  '\$' EQName 'check' ExprSingle
+
+  ICCollSequenceUnique  ::=  'node' '\$' EQName 'check' 'unique' 'key' PathExpr
+
+  ICCollNode            ::=  'foreach' 'node' '\$' EQName 'check' ExprSingle
 
   ICForeignKey          ::=  'foreign' 'key' ICForeignKeySource ICForeignKeyTarget
 
@@ -2120,7 +2117,7 @@
 
   ICForeignKeyTarget    ::=  'to' ICForeignKeyValues
 
-  ICForeignKeyValues    ::=  'collection' QName 'node' '\$' QName 'key' PathExpr
+  ICForeignKeyValues    ::=  'collection' EQName 'node' '\$' QName 'key' PathExpr
 \endcode