@sap/cds-compiler 2.4.4 → 2.10.2

package/lib/language/language.g4

@@ -20,7 +20,7 @@
 //    allow integers at certain places), one token type for non-quoted and
 //    quoted identifiers.
 //
-//  * Keep the number of keywords as small as possibile.  Thus, built-ins is a
+//  * Keep the number of keywords as small as possible.  Thus, built-ins is a
 //    topic for the semantic analysis, not the grammar.  Examples: no keywords
 //    for built-in types or built-in SQL functions.  This also avoids noise in
 //    the grammar and a huge/slow generated parser.
@@ -43,7 +43,7 @@
 //    is not enough for a decision), write a comment starting with `#ATN:`
 //    which describes the ambiguity.  Additionally, put a comment `/* #ATN n
 //    */` INSIDE an (`@after`) action of a rule if the corresponding function
-//    in '../gen/langageParser.js' contains `n` occurrences of
+//    in '../gen/languageParser.js' contains `n` occurrences of
 //    `adaptivePredict` calls.  This is checked in 'test/testCompiler.js',
 //    which also counts the total number of `adaptivePredict` occurrences.
 //  └─────────────────────────────────────────────────────────────────────────┘
@@ -55,6 +55,10 @@
 //    good idea anyway to avoid calls to `adaptivePredict`, see the rules
 //    starting with `annotationAssignment_`.
 //
+//  * Factoring out a sub rule into a named rule influences the error recovery:
+//    the parser tries to consume all tokens which are neither in the follow
+//    set of loops and named rules.  So be careful.
+//
 //  * Do not use actions in the lexer.  Examples: de-quote string literals not
 //    in the lexer, but in the parser; do not throw errors, but produce error
 //    tokens if necessary.
@@ -106,6 +110,9 @@
 //
 //  * The ANTLR error "missing attribute access on rule reference c in $c" can
 //    be solved with using $ctx.c instead of $c
+//
+//  * If you want to set a property starting with '$' like $syntax, use
+//    obj['$'+'syntax'] as the ANTLR tool would replace $syntax by $ctx.syntax
 
 grammar language;
 options {
@@ -114,6 +121,7 @@ options {
 }
 tokens {
   VIRTUAL,                      // used with setLocalToken()
+  OVER,                         // used with setLocalTokenIfBefore()
   HelperToken1,                 // used with setLocalToken(), does not appear in messages
   HelperToken2,                 // used with setLocalToken(), does not appear in messages
   HideAlternatives,             // hide alternative tokens (no token seq!)
@@ -491,17 +499,7 @@ projectionSpec returns[ query ] locals[ src ]
     )?
     ( AS aliasName=ident['FromAlias'] { $src.name = $aliasName.id } )?
     bracedSelectItemListDef[ $query ]?
-    (
-      // syntax is less than ideal - EXCLUDING is only useful for `*` - with
-      // this syntax, people wonder what happens with explicit select items
-      EXCLUDING
-      '{'
-      projectionExclusion[ $query ]
-      ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
-        projectionExclusion[ $query ]
-      )*
-      '}'
-    )?
+    excludingClause[ $query ]?
   ;
 
 projectionClauses[ query ]
@@ -518,6 +516,18 @@ projectionClauses[ query ]
     ( lc=limitClause[ $query ]   { $query = $lc.query; } ) ?
   ;
 
+excludingClause[ query ]
+  :
+    // syntax is less than ideal - EXCLUDING is only useful for `*` - with
+    // this syntax, people wonder what happens with explicit select items
+    EXCLUDING '{'
+    projectionExclusion[ $query ]
+    ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
+      projectionExclusion[ $query ]
+    )*
+    '}'
+  ;
+
 projectionExclusion[ outer ] locals[ art ]
 @after { this.attachLocation($art); }
   :
@@ -816,7 +826,7 @@ annotateArtifact[ outer, loc, annos ] locals[ art, name = {} ]
       )*
       ')'
       (
-        RETURNS '{'
+        RETURNS '{' { $art['$'+'syntax'] = 'returns'; }
         annotateElement[ $art ]*
         '}'
         optionalSemi
@@ -824,7 +834,7 @@ annotateArtifact[ outer, loc, annos ] locals[ art, name = {} ]
         requiredSemi
       )
     |
-      RETURNS '{'
+      RETURNS '{' { $art['$'+'syntax'] = 'returns'; }
       annotateElement[ $art ]*
       '}'
       optionalSemi
@@ -906,11 +916,12 @@ enumSymbolDef[ outer ] locals[ art, annos = [] ]
       { this.excludeExpected( ['Boolean', 'QuotedLiteral', "'#'", 'NULL'] ); }
       (
         val=literalValue
-        { $art.value = $val.val; this.docComment( $annos ); }
+        { $art.value = $val.val; }
       |
         ( plus='+' | min='-' ) num=Number
         { $art.value = this.numberLiteral( $num, $plus||$min ); }
       )
+      { this.docComment( $annos ); }
       annotationAssignment_ll1[ $annos ]*
     )?
     requiredSemi
@@ -1121,13 +1132,7 @@ bracedSelectItemListDef[ query ]
     '{'
     { if (!$query.columns) $query.columns = []; }  // set it early to avoid "wildcard" errors
     (
-      ( star='*'                // TODO: allow everywhere
-        {
-          $query.columns = [ this.tokenLocation( $star, undefined, '*' ) ];
-        }
-      |
-        selectItemDef[ $query.columns ]
-      )
+      selectItemDef[ $query.columns ]
       ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
         selectItemDef[ $query.columns ]
       )*
@@ -1135,45 +1140,62 @@ bracedSelectItemListDef[ query ]
     '}'
   ;
 
-selectItemDef[ outer ] locals[ art = {}, annos = [], item = {} ] // AnnotatedQLSelectItem
-@after{ /* #ATN 1 */ this.attachLocation($art); }
+selectItemDef[ outer ] locals[ annos = [] ]
+@after{ if ($ctx.art) this.attachLocation($art.art); }
   :
+    star='*'
+    { $outer.push( this.tokenLocation( $star, undefined, '*' ) ); }
+  |
     { this.docComment( $annos ); }
     annotationAssignment_atn[ $annos ]*
-    // NEW: `VIRTUAL foo` - was `virtual AS foo` before
     // VIRTUAL is keyword, except if before the following tokens texts:
     { this.setLocalToken( 'VIRTUAL', 'VIRTUAL', /^([,.:\[@]|as)$/i ) ; } // not '{'
     virtual=VIRTUAL?
     key=KEY?
+    art=selectItemDefBody[ $outer, $annos ]
+    {
+      if ($virtual) $art.art.virtual = this.tokenLocation( $virtual, undefined, true );
+      if ($key) $art.art.key = this.tokenLocation( $key, undefined, true );
+    }
+  ;
+
+selectItemDefBody[ outer, annos ] returns[ art = {} ]
+@after{ /* #ATN 1 */ this.attachLocation($art); }
+  :
     (
       e=expression
+      // we cannot use 'condition' instead, as long as we allow aliases without
+      // AS (using rule 'ident' instead of 'identNoKeyword') -> ambiguities
       {
-        $art = this.addItem( $outer, null, null, $annos,
-                             { value: $e.expr, key: $key, virtual: $virtual } );
+        $art = this.addItem( $outer, null, null, $annos, { value: $e.expr } );
       }
       ( AS n1=ident['Item'] { $art.name = $n1.id }
-      | n2=ident['Item'] { this.fragileAlias( $n2.id, true );; $art.name = $n2.id }
+      | n2=ident['Item'] { $art.name = this.fragileAlias( $n2.id, true ); }
       | { if (this.getCurrentToken().text !== '.') this.classifyImplicitName( 'Item', $e.expr ); }
       )
       { if ($art.value && !$art.value.path) this.excludeExpected( ["'.'", "'{'"] ); }
       (
         { if ($art.value && !$art.value.path) this.reportExpandInline( 'expand' ); }
         selectItemInlineList[ $art, 'expand' ]
+        excludingClause[ $art ]?
         // TODO: we might alternatively allow AS here
       |
         // TODO: complain if AS has been used - or in definer?
         { if ($art.value && !$art.value.path) this.reportExpandInline( 'inline' ); }
-        DOTbeforeBRACE selectItemInlineSpec[ $art ]
+        DOTbeforeBRACE          // ...orASTERISK
+        (
+          selectItemInlineList[ $art, 'inline' ]
+          excludingClause[ $art ]?
+        |
+          star='*'
+          { $art.inline = [ this.tokenLocation( $star, undefined, '*' ) ]; }
+        )
       )?
     |
-      {
-        $art = this.addItem( $outer, null, null, $annos, { key: $key, virtual: $virtual } );
-      }
+      { $art = this.addItem( $outer, null, null, $annos ); }
       selectItemInlineList[ $art, 'expand' ]
-      // TODO: use extra rule for expand with expressions
-      ( AS n1=ident['Item'] { $art.name = $n1.id }
-      | n2=ident['Item'] { this.fragileAlias( $n2.id, true );; $art.name = $n2.id }
-      )
+      excludingClause[ $art ]?
+      AS n1=ident['Item'] { $art.name = $n1.id }
     )
     { this.docComment( $annos ); }
     annotationAssignment_fix[ $annos ]*
@@ -1198,6 +1220,30 @@ selectItemDef[ outer ] locals[ art = {}, annos = [], item = {} ] // AnnotatedQLS
     )?
   ;
 
+selectItemInlineList[ art, clause ]
+  :
+    '{'
+    { $art[$clause] = []; }
+    (
+      selectItemInlineDef[ $art[$clause] ]
+      ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
+        selectItemInlineDef[ $art[$clause] ]
+      )*
+    )?
+    '}'
+  ;
+
+selectItemInlineDef[ outer ] locals[ annos = [] ]
+@after{ if ($ctx.art) this.attachLocation($art.art); }
+  :
+    star='*'
+    { $outer.push( this.tokenLocation( $star, undefined, '*' ) ); }
+  |
+    { this.docComment( $annos ); }
+    annotationAssignment_atn[ $annos ]*
+    art=selectItemDefBody[ $outer, $annos ]
+  ;
+
 parameterListDef[ art ]
   :
     '('
@@ -1222,6 +1268,8 @@ parameterDef[ outer ] locals[ art, annos = [] ]
       this.docComment( $annos ); }
     annotationAssignment_fix[ $annos ]*
     typeSpec[ $art ]
+    ( DEFAULT expr=expression { $art.default = $expr.expr; } )?
+    { this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
   ;
 
@@ -1365,6 +1413,8 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
   |
     ':'
     // #ATN: typeRefOptArgs can start with ARRAY or MANY or ASSOCIATION or TYPE or LOCALIZED
+    // Nevertheless, MANY '{' is handled by local token rewrite:
+    { this.setLocalToken( 'MANY', 'HelperToken1', /^[^\{]/ ); }
     (
       typeStruct[ $art ]
       optionalSemi
@@ -1374,6 +1424,12 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
       ( typeToMany[ $art ] | typeToOne[ $art ] | simplePath[ $art.target, 'artref' ] )
       typeAssociationCont[ $art ]?
       requiredSemi                       // and if its the ';'...
+    |
+      many=HelperToken1         // rewritten MANY before '{'
+      { $art.items = { location: this.tokenLocation( $many ) };}
+      typeStruct[ $art.items ]
+      nullability[ $art.items ]?
+      optionalSemi
     |
       (
         array=ARRAY of=OF
@@ -1413,6 +1469,7 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
       annotationAssignment_ll1[ $annos ]*
       requiredSemi
     |
+      // alt lookahead includes MANY '{'
       { $art.type = {}; }
       simplePath[ $art.type, 'artref' ]
       (
@@ -1420,8 +1477,20 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
         head=Number
         { $art['$'+'typeArgs'] = [ this.numberLiteral( $head ) ]; }
         ( ',' { if (this.isStraightBefore(')')) break; } // allow ',' before ')'
-          tail=Number
-          { $art['$'+'typeArgs'].push( this.numberLiteral( $tail ) ); }
+          (
+            v=VARIABLE
+            { $art['$'+'typeArgs'].push(
+              { literal: 'string', val: 'variable', location: this.tokenLocation($v) } );
+            }
+          |
+            f=FLOATING
+            { $art['$'+'typeArgs'].push(
+              { literal: 'string', val: 'floating', location: this.tokenLocation($f) } );
+            }
+          |
+            tail=Number
+            { $art['$'+'typeArgs'].push( this.numberLiteral( $tail ) ); }
+          )
         )*
         ')'
         { this.docComment( $annos ); }
@@ -1645,8 +1714,20 @@ typeRefOptArgs[ art ]
       head=Number
       { $art['$'+'typeArgs'] = [ this.numberLiteral( $head ) ]; }
       ( ',' { if (this.isStraightBefore(')')) break; } // allow ',' before ')'
-        tail=Number
-        { $art['$'+'typeArgs'].push( this.numberLiteral( $tail ) ); }
+        (
+          v=VARIABLE
+          { $art['$'+'typeArgs'].push(
+            { literal: 'string', val: 'variable', location: this.tokenLocation($v) } );
+          }
+        |
+          f=FLOATING
+          { $art['$'+'typeArgs'].push(
+            { literal: 'string', val: 'floating', location: this.tokenLocation($f) } );
+          }
+        |
+          tail=Number
+          { $art['$'+'typeArgs'].push( this.numberLiteral( $tail ) ); }
+        )
       )*
       ')'
     |
@@ -1681,6 +1762,30 @@ orderByClause[ inQuery ] returns [ query ]
     ( ',' obn=orderBySpec  { $query.orderBy.push( $obn.ob ); } )*
   ;
 
+overOrderByClause returns [ expr ]
+  :
+    o=ORDER b=BY { $expr = { op: this.tokenLocation($o, $b, 'orderBy' ) , args: [] }}
+    ob1=orderBySpec { $expr.args.push( $ob1.ob ); }
+    ( ',' obn=orderBySpec { $expr.args.push( $obn.ob ); } )*
+  ;
+
+partitionByClause returns [ expr ]
+  :
+    p=PARTITION b=BY { $expr = { op: this.tokenLocation($p, $b, 'partitionBy' ) , args: [] }}
+    e1=expression { $expr.args.push( $e1.expr ); }
+    ( ',' en=expression { $expr.args.push( $en.expr ); } )*
+  ;
+
+overClause returns [ over ]
+@after { this.attachLocation($over); }
+  :
+    o=OVER { $over = { op: this.tokenLocation( $o, null, 'over' ) , args: []  } }
+    '('
+      ( pb=partitionByClause { $over.args.push( $pb.expr ); } )?
+      ( ob=overOrderByClause { $over.args.push( $ob.expr ); } )?
+    ')'
+  ;
+
 limitClause[ inQuery ] returns [ query ]
   :
     limkw=LIMIT { $query = this.unaryOpForParens( $inQuery, '$'+'query' ); }
@@ -1733,29 +1838,13 @@ queryPrimary returns[ query = {} ]
       { $query.quantifier = this.tokenLocation( $ad, undefined, $ad.text.toLowerCase() ); }
       )?
       bracedSelectItemListDef[ $query ]?
-      (
-        // syntax is less than ideal - EXCLUDING is only useful for `*` - with
-        // this syntax, people wonder what happens with explicit select items
-        EXCLUDING
-        '{'
-        projectionExclusion[ $query ]
-        ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
-          projectionExclusion[ $query ]
-        )*
-        '}'
-      )?
+      excludingClause[ $query ]?
     |
       ( ad=( ALL | DISTINCT )     // TODO: or directly after SELECT ?
       { $query.quantifier = this.tokenLocation( $ad, undefined, $ad.text.toLowerCase() ); }
       )?
       { $query.columns = []; }  // set it early to avoid "wildcard" errors
-      ( star='*'
-        {
-          $query.columns = [ this.tokenLocation( $star, undefined, '*' ) ];
-        }
-      |
-        selectItemDef[ $query.columns ]
-      )
+      selectItemDef[ $query.columns ]
       ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
         selectItemDef[ $query.columns ]
       )*
@@ -1855,7 +1944,7 @@ tableTerm returns [ table ]
       fromPath[ $table, 'ref']
     )?
     ( AS n1=ident['FromAlias'] { $table.name = $n1.id }
-    | n2=identNoKeyword['FromAlias'] { this.fragileAlias( $n2.id );; $table.name = $n2.id; }
+    | n2=identNoKeyword['FromAlias'] { $table.name = this.fragileAlias( $n2.id ); }
       // if we would use rule `ident`, we would either had to make all JOIN
       // kinds reserved or introduce ATN
     )?
@@ -1865,11 +1954,9 @@ tableTerm returns [ table ]
     // left-paren, but queryExpression has SELECT after initial left-parens
     (
       qe=queryExpression close=')'
-      // TODO: if we have the surround query property,
-      // just use surroundByParens(), remove unaryOpForParens()
-      { $table = { query: this.unaryOpForParens( $qe.query ); } }
+      { $table = this.surroundByParens( $qe.query, $open, $close, true ); }
       ( AS a1=ident['FromAlias'] { $table.name = $a1.id } // for defining table aliass
-      | a2=identNoKeyword['FromAlias'] { this.fragileAlias( $a2.id, true );; $table.name = $a2.id; }
+      | a2=identNoKeyword['FromAlias'] { $table.name = this.fragileAlias( $a2.id, true ); }
         // not using ident` to have a similar behavior to above
       )
     |
@@ -1915,7 +2002,7 @@ fromPath[ qp, idkind ]
 condition returns [ cond ] locals [ args = [], orl = [] ]
 @after{
   $cond = ($args.length == 1)
-    ? $args[0]
+    ? this.attachLocation( $args[0] )
     : this.attachLocation({ op: $orl[0], args: $args });
 }
   :
@@ -1946,7 +2033,7 @@ conditionTerm returns [ cond ]
     (
       open='(' qe=queryExpression close=')'
       { $cond = { op: this.tokenLocation( $ex, undefined, 'exists' ),
-                  args: [ { query: $qe.query, location: this.tokenLocation( $open, $close ) } ] }; }
+                  args: [ this.surroundByParens( $qe.query, $open, $close, true ) ] }; }
     |
       qm=( HideAlternatives | '?' )
       { $cond = { op: this.tokenLocation( $ex, undefined, 'exists' ), args: [
@@ -2076,6 +2163,10 @@ expressionTerm returns [ expr ] locals [ op, args = [] ]
         this.notSupportedYet( $ne ); }
     |
       vp=valuePath[ 'ref', null ] { $expr = this.valuePathAst( $vp.qp ); }
+      { this.setLocalTokenIfBefore( 'OVER', 'OVER', /^\($/i ); }
+      (
+        over=overClause { $expr.suffix = [ $over.over ] }
+      )?
     |
       ':'
       ( vp=valuePath[ 'paramref', this.startLocation() ]
@@ -2095,7 +2186,8 @@ expressionTerm returns [ expr ] locals [ op, args = [] ]
       // #ATN: The following alternative is not LL1, because both can start with
       // left-paren, but queryExpression has SELECT after initial left-parens
       (
-        qe=queryExpression close=')' { $expr = { query: $qe.query }; } // TODO: surroundByParens
+        qe=queryExpression close=')'
+        { $expr = this.surroundByParens( $qe.query, $open, $close, true ); }
       |
         c1=condition { $expr = [ $c1.cond ]; }
         ( ',' { if ($expr.length > 1 && this.isStraightBefore(')')) break; } // allow ',' before ')'
@@ -2275,7 +2367,7 @@ optionalCardinality[ pathStep ]
     // completion just produces `:`after having inserted a Number - TODO.
     { if (this._input.LT(2).text !== ':') return $ctx; }
     ( trgMax=Number ':'
-      { if ($pathStep) $pathStep.cardinality = { targetMax: this.numberLiteral( $trgMax ) } }
+      { if ($pathStep) $pathStep.cardinality = { targetMax: this.numberLiteral( $trgMax ), location: this.startLocation() }; }
     )
   ;
 
@@ -2294,65 +2386,9 @@ optionalWhereForFilter
     WHERE
   ;
 
-selectItemInlineList[ art, clause ]
-  :
-    '{'
-    { $art[$clause] = []; }
-    (
-      ( star='*'                // TODO: allow everywhere
-        { $art[$clause].push( this.tokenLocation( $star, undefined, '*' ) ); }
-      |
-        selectItemInlineDef[ $art[$clause] ]
-      )
-      ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
-        selectItemInlineDef[ $art[$clause] ]
-      )*
-    )?
-    '}'
-  ;
-
-selectItemInlineDef[ outer ] locals[ art = {}, alias, annos = [] ] // AnnotatedQLSelectItem
-@after{ this.attachLocation($art); }
-  :
-    { this.docComment( $annos ); }
-    annotationAssignment_atn[ $annos ]*
-    (
-      vp=valuePath[ 'ref', null ]   // TODO: make sure that no function is used
-      { $art = this.addItem( $outer, null, null, $annos, { value: this.valuePathAst( $vp.qp ) }); }
-      ( AS n1=ident['Item'] { $art.name = $n1.id }
-      | n2=ident['Item'] { this.fragileAlias( $n2.id, true );; $art.name = $n2.id }
-      | { this.classifyImplicitName( 'Item', $vp.qp ); }
-      )
-      (
-        selectItemInlineList[ $art, 'expand' ]
-      |
-        DOTbeforeBRACE selectItemInlineSpec[ $art ]
-      )?
-      { this.docComment( $annos ); }
-      annotationAssignment_fix[ $annos ]*
-    |
-      {
-        $art = this.addItem( $outer, null, null, $annos, {} );
-      }
-      selectItemInlineList[ $art, 'expand' ]
-      // TODO: use extra rule for expand with expressions
-      ( AS n1=ident['Item'] { $art.name = $n1.id }
-      | n2=ident['Item'] { this.fragileAlias( $n2.id, true );; $art.name = $n2.id }
-      )
-    )
-  ;
-
-selectItemInlineSpec[ outer ]
-  :
-    selectItemInlineList[ $outer, 'inline' ]
-  |
-    star='*'
-    { $outer.inline = [ this.tokenLocation( $star, undefined, '*' ) ]; }
-  ;
-
 // Simple paths and values ---------------------------------------------------
 
-annoValueBase returns[ val ]
+annoValueBase returns[ val ] locals [ hasEllipsis=0 ]
 @after { this.attachLocation($val); }
   :
     { $val = { literal: 'struct', location: this.startLocation() }; }
@@ -2371,10 +2407,28 @@ annoValueBase returns[ val ]
     { $val = { literal: 'array', location: this.startLocation(), val: [] }; }
     '['
     (
-      head=arrayValue { $val.val.push( $head.val ); }
+      (
+          head=arrayValue  { $val.val.push( $head.val ); }
+        |
+          e='...'
+          { 
+            $val.val.push( { literal: 'token', val: '...', location: this.tokenLocation($e) } );
+            $hasEllipsis++;
+          }
+      )
       (
         ',' { if (this.isStraightBefore(']')) break; } // allow ',' before ']'
-        tail=arrayValue { $val.val.push( $tail.val ); }
+        (
+            tail=arrayValue { $val.val.push( $tail.val ); }
+          |
+            e='...'
+            { 
+              $val.val.push( { literal: 'token', val: '...', location: this.tokenLocation($e) } );
+              if(++$hasEllipsis > 1)
+                this.error( 'syntax-unexpected-ellipsis', $e, { code: '...' },
+                            'Expected no more than one $(CODE)' );
+            }
+        )
       )*
     )?
     ']'
@@ -2409,7 +2463,6 @@ namedValue[ struct ] locals[ namedVal = { name: {} } ]
                     ($ctx.elem) ? Object.assign($namedVal, $elem.val) : $namedVal ); }
   ;
 
-
 arrayValue returns[ val ]
 @after { this.attachLocation($val); }
   :
@@ -2565,6 +2618,7 @@ ident[ category ] returns[ id ]
   | EXCLUDING
   | EXTEND
   | FIRST
+  | FLOATING
   | FULL
   | FUNCTION
   | GROUP
@@ -2595,6 +2649,7 @@ ident[ category ] returns[ id ]
   | ORDER
   | OUTER
   | PARAMETERS
+  | PARTITION
   | PROJECTION
   | REDIRECTED
   | RETURNS
@@ -2607,6 +2662,7 @@ ident[ category ] returns[ id ]
   | TO
   | TYPE
   | USING
+  | VARIABLE
   | VIEW
   | YEAR
   ;
@@ -2723,6 +2779,7 @@ EXCEPT : [eE][xX][cC][eE][pP][tT] ;
 EXCLUDING : [eE][xX][cC][lL][uU][dD][iI][nN][gG] ;
 EXTEND : [eE][xX][tT][eE][nN][dD] ;
 FIRST : [fF][iI][rR][sS][tT] ;
+FLOATING : [fF][lL][oO][aA][tT][iI][nN][gG] ;
 FULL : [fF][uU][lL][lL] ;
 FUNCTION : [fF][uU][nN][cC][tT][iI][oO][nN] ;
 GROUP : [gG][rR][oO][uU][pP] ;
@@ -2752,7 +2809,9 @@ ONE : [oO][nN][eE] ;
 OR : [oO][rR] ;
 ORDER : [oO][rR][dD][eE][rR] ;
 OUTER : [oO][uU][tT][eE][rR] ;
+// OVER : [oO][vV][eE][rR] ;
 PARAMETERS : [pP][aA][rR][aA][mM][eE][tT][eE][rR][sS] ;
+PARTITION: [pP][aA][rR][tT][iI][tT][iI][oO][nN] ;
 PROJECTION : [pP][rR][oO][jJ][eE][cC][tT][iI][oO][nN] ;
 REDIRECTED : [rR][eE][dD][iI][rR][eE][cC][tT][eE][dD] ;
 RETURNS : [rR][eE][tT][uU][rR][nN][sS] ;
@@ -2765,6 +2824,7 @@ TO : [tT][oO] ;                 // or make reserved? (is in SQL-92)
 TYPE : [tT][yY][pP][eE] ;
 UNION : [uU][nN][iI][oO][nN] ;
 USING : [uU][sS][iI][nN][gG] ;
+VARIABLE : [vV][aA][rR][iI][aA][bB][lL][eE] ;
 VIEW : [vV][iI][eE][wW] ;
 // VIRTUAL: [vV][iI][rR][tT][uU][aA][lL] ; see tokens {}
 YEAR : [yY][eE][aA][rR] ;