xquery 4: switch case .. without any parens

benibela · Nov 29, 2023 · 4959f7e · 4959f7e
1 parent d6ced24
commit 4959f7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/data/xquery.pas b/data/xquery.pas
@@ -3389,6 +3389,7 @@ type TXQTerm_VisitorTrackKnownVariables = class(TXQTerm_Visitor)
 PARSING_MODEL_XPATHXQUERY = [xqpmXPath2, xqpmXPath3_0, xqpmXPath3_1, xqpmXPath4_0, xqpmXQuery1, xqpmXQuery3_0, xqpmXQuery3_1, xqpmXQuery4_0];
 PARSING_MODEL_XQUERY = [xqpmXQuery1, xqpmXQuery3_0, xqpmXQuery3_1, xqpmXQuery4_0];
 PARSING_MODEL_XQUERY3 = [xqpmXQuery3_0, xqpmXQuery3_1, xqpmXQuery4_0];
+PARSING_MODEL_XQUERY4 = [xqpmXQuery4_0];
 
 var XMLNamespace_XPathFunctions, XMLnamespace_XPathFunctionsArray, XMLnamespace_XPathFunctionsMap, XMLNamespace_MyExtensionsNew, XMLNamespace_MyExtensionsMerged, XMLNamespace_MyExtensionOperators, XMLNamespace_XMLSchema: TNamespace;
 

diff --git a/data/xquery__parse.pas b/data/xquery__parse.pas
@@ -105,7 +105,7 @@ TXQParsingContext = class(TXQAbstractParsingContext)
   procedure expect(c: char);
   procedure expect(s: string);
   function nextToken(lookahead: boolean=false): string;
-  function nextTokenIs(const s: string): boolean; //checks the next token and skips it if it matches
+  function nextTokenIs(const s: string; lookahead: boolean=false): boolean; //checks the next token and skips it if it matches
   function nextTokenNCName(): string; inline; //returns a NCName
 
   function expectTerm(const a: string; const bt: TParseTermFunction; c: string = ''): TXQTerm;
@@ -1060,7 +1060,7 @@ function TXQParsingContext.nextToken(lookahead: boolean=false): string;
   else lastTokenStart := start;
 end;
 
-function TXQParsingContext.nextTokenIs(const s: string): boolean;
+function TXQParsingContext.nextTokenIs(const s: string; lookahead: boolean=false): boolean;
 var
   temppos: pchar;
   i: SizeInt;
@@ -1076,7 +1076,7 @@ function TXQParsingContext.nextTokenIs(const s: string): boolean;
     if not (temppos^ in WHITE_SPACE + SYMBOLS + [#0]) then
       exit(false);
   result := true;
-  pos := temppos;
+  if not lookahead then pos := temppos;
 end;
 
 function TXQParsingContext.nextTokenNCName(): string;
@@ -3207,6 +3207,8 @@ function TXQParsingContext.parseValue: TXQTerm;
         end;
         'function', 'fn': if parsingModel in PARSING_MODEL4 then
           exit(parseFunctionDeclarationWithoutArgs(nil));
+        'switch': if parsingModel in PARSING_MODEL_XQUERY4 then
+          exit(parseSwitch);
       end;
       '#': begin
         require3('Named Function Reference');
@@ -3243,6 +3245,8 @@ function TXQParsingContext.parseValue: TXQTerm;
             raiseParsingError('XQST0075', 'Schema validation is not supported');
           end;
         end;
+        'switch': if (nextTokenIs('case', true)) and (parsingModel in PARSING_MODEL_XQUERY4) then
+          exit(parseSwitch);
       end;
 
     if (word = '') or (word[1] in [',', ';', ':', ')', ']', '}']) then //todo: check if valid xml node name