Skip to content

Implement W3C XQuery Update Facility 3.0 #6109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joewiz wants to merge 7 commits into from
Closed

Implement W3C XQuery Update Facility 3.0 #6109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c3475e
[feature] Add expression infrastructure for W3C XQuery Update Facilit…
joewiz Mar 6, 2026
8488502
[feature] Implement W3C XQUF grammar, PUL, expression classes, and in…
joewiz Mar 6, 2026
be93934
[test] Add W3C XQUF JUnit tests and update XQSuite for new syntax
joewiz Mar 6, 2026
f6f463a
[test] Migrate existing tests from proprietary to W3C update syntax
joewiz Mar 6, 2026
e2469fd
[refactor] Remove old proprietary update implementation classes
joewiz Mar 6, 2026
1b4c480
[test] Add XQUF performance benchmark
joewiz Mar 6, 2026
965c70d
[refactor] Address Codacy static analysis warnings
joewiz Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 91 additions & 23 deletions exist-core/src/main/antlr/org/exist/xquery/parser/XQuery.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ prolog throws XPathException
( "declare" "function" )
=> functionDeclUp { inSetters = false; }
|
( "declare" "updating" "function" )
=> updatingFunctionDeclUp { inSetters = false; }
|
( "declare" "variable" )
=> varDeclUp { inSetters = false; }
|
Expand Down Expand Up @@ -428,7 +431,7 @@ annotateDecl! throws XPathException
:
decl:"declare"! ann:annotations!
(
("function") => f:functionDecl[#ann] { #annotateDecl = #f; }
("function") => f:functionDecl[#ann, false] { #annotateDecl = #f; }
|
("variable") => v:varDecl[#decl, #ann] { #annotateDecl = #v; }
)
Expand Down Expand Up @@ -496,10 +499,15 @@ bracedUriLiteral returns [String uri]

functionDeclUp! throws XPathException
:
"declare"! f:functionDecl[null] { #functionDeclUp = #f; }
"declare"! f:functionDecl[null, false] { #functionDeclUp = #f; }
;

updatingFunctionDeclUp! throws XPathException
:
"declare"! "updating"! f:functionDecl[null, true] { #updatingFunctionDeclUp = #f; }
;

functionDecl [XQueryAST ann] throws XPathException
functionDecl [XQueryAST ann, boolean updating] throws XPathException
{ String name= null; }
:
"function"! name=eqName! lp:LPAREN! ( paramList )?
Expand All @@ -509,6 +517,9 @@ functionDecl [XQueryAST ann] throws XPathException
#functionDecl= #(#[FUNCTION_DECL, name, org.exist.xquery.parser.XQueryFunctionAST.class.getName()], #ann, #functionDecl);
#functionDecl.copyLexInfo(#lp);
#functionDecl.setDoc(getXQDoc());
if (updating) {
((XQueryFunctionAST) #functionDecl).setUpdating(true);
}
}
exception catch [RecognitionException e]
{
Expand Down Expand Up @@ -708,48 +719,63 @@ exprSingle throws XPathException
| ( "if" LPAREN ) => ifExpr
| ( "switch" LPAREN ) => switchExpr
| ( "typeswitch" LPAREN ) => typeswitchExpr
| ( "update" ( "replace" | "value" | "insert" | "delete" | "rename" )) => updateExpr
| ( "insert" ( "node" | "nodes" ) ) => xqufInsertExpr
| ( "delete" ( "node" | "nodes" ) ) => xqufDeleteExpr
| ( "replace" ( "node" | "value" ) ) => xqufReplaceExpr
| ( "rename" "node" ) => xqufRenameExpr
| ( "copy" DOLLAR ) => xqufTransformExpr
| orExpr
;

// === Xupdate ===
// === W3C XQuery Update Facility 3.0 ===

updateExpr throws XPathException
xqufInsertExpr throws XPathException
:
"update"^
"insert"^ ( "node"! | "nodes"! ) exprSingle
(
replaceExpr
| updateValueExpr
| insertExpr
| deleteExpr
| ( "rename" . "as" ) => renameExpr
( "as" "first" "into" ) => "as"! "first" "into"! exprSingle
| ( "as" "last" "into" ) => "as"! "last" "into"! exprSingle
| "into" exprSingle
| "before" exprSingle
| "after" exprSingle
)
;

replaceExpr throws XPathException
xqufDeleteExpr throws XPathException
:
"replace" expr "with"! exprSingle
"delete"^ ( "node"! | "nodes"! ) exprSingle
;

updateValueExpr throws XPathException
xqufReplaceExpr throws XPathException
:
"value" expr "with"! exprSingle
"replace"^
(
( "value" "of" "node" ) => "value" "of"! "node"! exprSingle "with"! exprSingle
| "node"! exprSingle "with"! exprSingle
)
;

insertExpr throws XPathException
xqufRenameExpr throws XPathException
:
"insert" exprSingle
( "into" | "preceding" | "following" ) exprSingle
"rename"^ "node"! exprSingle "as"! exprSingle
;

deleteExpr throws XPathException
xqufTransformExpr throws XPathException
:
"delete" exprSingle
"copy"^
xqufCopyBinding ( COMMA! xqufCopyBinding )*
"modify"! exprSingle
"return"! exprSingle
;

renameExpr throws XPathException
xqufCopyBinding throws XPathException
{ String varName; }
:
"rename" exprSingle "as"! exprSingle
DOLLAR! varName=v:varName! COLON! EQ! exprSingle
{
#xqufCopyBinding = #(#[VARIABLE_BINDING, varName], #xqufCopyBinding);
#xqufCopyBinding.copyLexInfo(#v);
}
;

// === try/catch ===
Expand Down Expand Up @@ -2304,6 +2330,48 @@ reservedKeywords returns [String name]
"next" { name = "next"; }
|
"when" { name = "when"; }
|
"copy" { name = "copy"; }
|
"modify" { name = "modify"; }
|
"nodes" { name = "nodes"; }
|
"before" { name = "before"; }
|
"after" { name = "after"; }
|
"first" { name = "first"; }
|
"last" { name = "last"; }
|
"updating" { name = "updating"; }
|
"ascending" { name = "ascending"; }
|
"descending" { name = "descending"; }
|
"greatest" { name = "greatest"; }
|
"least" { name = "least"; }
|
"satisfies" { name = "satisfies"; }
|
"schema-attribute" { name = "schema-attribute"; }
|
"revalidation" { name = "revalidation"; }
|
"skip" { name = "skip"; }
|
"strict" { name = "strict"; }
|
"lax" { name = "lax"; }
|
"castable" { name = "castable"; }
|
"idiv" { name = "idiv"; }
|
"processing-instruction" { name = "processing-instruction"; }
;


Expand Down
Loading