ODATA-1506: Allow numeric index segment in path expressions

abnf/odata-abnf-construction-rules.txt

@@ -317,7 +317,7 @@ orderbyItem = commonExpr [ RWS ( "asc" / "desc" ) ]
 skip = ( "$skip" / "skip" ) EQ 1*DIGIT
 top  = ( "$top"  / "top"  ) EQ 1*DIGIT
 
-index  = ( "$index" / "index" ) EQ [ "-" ] 1*DIGIT
+index  = ( "$index" / "index" ) EQ indexExpr
 
 format = ( "$format" / "format" ) EQ
          ( "atom"
@@ -567,12 +567,15 @@ collectionPathExpr = count [ OPEN expandCountOption *( SEMI expandCountOption )
                    / "/" allExpr
                    / "/" boundFunctionExpr
                    / "/" annotationExpr
+                   / "/" indexExpr [ complexPathExpr ]
 
 complexPathExpr = "/" directMemberExpr
                 / "/" optionallyQualifiedComplexTypeName [ "/" directMemberExpr ]
 
 primitivePathExpr = "/" [ annotationExpr / boundFunctionExpr ]
 
+indexExpr = [ "-" ] 1*DIGIT
+
 boundFunctionExpr = functionExpr ; boundFunction segments can only be composed if the type of the
                                  ; previous segment matches the type of the first function parameter
 

abnf/odata-abnf-testcases.yaml

@@ -1309,6 +1309,18 @@ TestCases:
     Rule: odataRelativeUri
     Input: Suppliers(1)/Addresses/Model.AddressWithLocation/-1
 
+  - Name: 4.10 Addressing a Member of an Ordered Primitive Collection - in $orderby
+    Rule: orderby
+    Input: $orderby=EmailAddresses/1
+
+  - Name: 4.10 Addressing a Member of an Ordered Complex Collection - in $orderby
+    Rule: orderby
+    Input: $orderby=Addresses/0/Name
+
+  - Name: 4.10 Addressing a Member of an Ordered Complex Collection with type-cast - in $orderby
+    Rule: orderby
+    Input: $orderby=Addresses/Model.AddressWithLocation/-1/Location
+
   - Name: 4.11 Inheritance - set of subtypes
     Rule: odataRelativeUri
     Input: Products/Model.BestSellingProduct