Fix AASQL grammar bugs #433, #434, #435

documentation/IDTA-01002-3/modules/ROOT/pages/query-language.adoc

@@ -69,10 +69,10 @@ The content and structure of the AAS Query Language is defined in the context-fr
 
 This is the combined grammar for the AAS Query Language and the AAS Access Rules defined by the AAS Security specification xref:bibliography.adoc#bib3[[3\]].
 
-
-include::./grammar.adoc[]
-
-
+[source,bnf,linenums]
+----
+include::partial$bnf/grammar.bnf[]
+----
 
 == Select Expression
 
@@ -234,7 +234,7 @@ The following example is used to illustrate the comparisons. The following Asset
                 }
             ]
         }
-    ],
+    ]
 }
 ----
 

documentation/IDTA-01002-3/modules/ROOT/pages/grammar.adoc → documentation/IDTA-01002-3/modules/ROOT/partials/bnf/grammar.bnf

@@ -1,4 +1,3 @@
-....
 <grammar> ::= <query> | <AllAccessPermissionRules>
 
 <query> ::= <selectStatement>? <logicalExpression>
@@ -24,8 +23,8 @@
 <allComparisons> ::= ( "$eq" | "$ne" | "$gt" | "$lt" | "$ge" | "$le" )
 
 <stringComparison> ::= 
-    ( ( "$starts-with" | "ends-with" | "$contains" | "$regex") <ws> "(" <ws> <stringOperand> <ws> "," <ws> <stringOperand> <ws> ")" <ws> ) |
-    ( <stringOperand> <ws> <allComparisons> <ws> <stringOperand> <ws> ) |
+    ( ( "$starts-with" | "$ends-with" | "$contains" | "$regex") <ws> "(" <ws> <stringOperand> <ws> "," <ws> <stringOperand> <ws> ")" <ws> ) |
+    ( <stringOperand> <ws> <allComparisons> <ws> <stringOperand> <ws> )
     ( <stringOperand> <ws> <allComparisons> <ws> <FieldIdentifierString> <ws> ) |
     ( <FieldIdentifierString> <ws> <allComparisons> <ws> <stringOperand> <ws> )
 
@@ -88,14 +87,14 @@
     "time" <ws> "(" <ws> ( <stringOperand> | <dateTimeOperand> ) <ws> ")" <ws>
 
 <AllAccessPermissionRules> ::= 
     ( "DEFATTRIBUTES" <ws> <StringLiteral> <ws> <AttributeGroup> <ws> )* 
     ( "DEFACLS" <ws> <StringLiteral> <ws> <ACL> <ws> )* 
     ( "DEFOBJECTS" <ws> <StringLiteral> <ws> <ObjectGroup> <ws> )* 
     ( "DEFFORMULAS" <ws> <StringLiteral> <ws> <Condition> <ws> )* 
     ( <AccessPermissionRule> <ws> )*
 
 <AccessPermissionRule> ::= 
     "ACCESSRULE:" <ws>
     ( <ACL> | <UseACL> ) <ws> 
     "OBJECTS:" <ws> 
     ( <SingleObject> <ws> )* 
@@ -127,7 +126,7 @@
     "CLAIM" <ws> "(" <ws> <ClaimLiteral> <ws> ")"
 
 <GlobalAttribute> ::= 
     "GLOBAL" <ws> "(" <ws> ( "LOCALNOW" | "UTCNOW" | "CLIENTNOW" | "ANONYMOUS" ) <ws> ")"
 
 <ReferenceAttribute> ::= 
     "REFERENCE" <ws> "(" <ws> <ReferenceLiteral> <ws> ")"
@@ -137,7 +136,7 @@
     ( <UseAttributeGroup> <ws> )*
 
 <UseAttributeGroup> ::= 
     "USEATTRIBUTES" <ws> <StringLiteral> <ws>
 
 <SingleObject> ::= 
     <RouteObject> | <IdentifiableObject> | <ReferableObject> | <FragmentObject> | <DescriptorObject>
@@ -162,10 +161,10 @@
     | ( <UseObjectGroup> <ws> )*
 
 <UseObjectGroup> ::= 
     "USEOBJECTS" <ws> <StringLiteral> <ws>
 
 <UseFormula> ::= 
     "USEFORMULAS" <ws> <StringLiteral> <ws>
 
 <Condition> ::= <logicalExpression> <ws>
 
@@ -201,16 +200,15 @@
 <FieldIdentifierSM> ::= "$sm#" ( <SemanticIdClause> | "idShort" | "id" )
 <FieldIdentifierSME> ::= "$sme" ( "." <idShortPath> )? "#" ( <SemanticIdClause> | "idShort" | "value" | "valueType" | "language" )
 <FieldIdentifierCD> ::= "$cd#" ( "idShort" | "id" ) <ws>
-<FieldIdentifierAasDescriptor> ::= "$aasdesc#" ( "idShort" | "id" | "assetKind" | "assetType" | "globalAssetId" | <SpecificAssetIdsClause>  | "endpoints" ( "[" ( [0-9]* ) "]" )? "." <EndpointClause> | "submodelDescriptors" ( "[" ( [0-9]* ) "]" )? "." <SmDescriptorClause> )
+<FieldIdentifierAasDescriptor> ::= "$aasdesc#" ( "idShort" | "id" | "assetKind" | "assetType" | "globalAssetId" | <SpecificAssetIdsClause>  | "endpoints" ( "[" ( [0-9]* ) "]" ) "." <EndpointClause> | "submodelDescriptors" ( "[" ( [0-9]* ) "]" ) "." <SmDescriptorClause> )
 <FieldIdentifierSmDescriptor> ::= "$smdesc#" <SmDescriptorClause>
-<SmDescriptorClause> ::= ( <SemanticIdClause> | "idShort" | "id" | "endpoints" ( "[" ( [0-9]* ) "]" )? "." <EndpointClause> )
+<SmDescriptorClause> ::= ( <SemanticIdClause> | "idShort" | "id" | "endpoints" ( "[" ( [0-9]* ) "]" ) "." <EndpointClause> )
 <EndpointClause> ::= "interface" | "protocolinformation.href" 
 
-<ReferenceClause> ::= ( "type" | "keys" ( "[" ( [0-9]* ) "]" )? ( ".type" | ".value" ) )
+<ReferenceClause> ::= ( "type" | "keys" ( "[" ( [0-9]* ) "]" ) ( ".type" | ".value" ) )
 <SemanticIdClause> ::= ( "semanticId" | "semanticId." <ReferenceClause> )
-<SpecificAssetIdsClause> ::=  ( "specificAssetIds" ( "[" ( [0-9]* ) "]" )? ( ".name" | ".value" | ".externalSubjectId" | ".externalSubjectId." <ReferenceClause> ) )
+<SpecificAssetIdsClause> ::=  ( "specificAssetIds" ( "[" ( [0-9]* ) "]" ) ( ".name" | ".value" | ".externalSubjectId" | ".externalSubjectId." <ReferenceClause> ) )
 <idShortPath> ::= ( <idShort> ("[" ( [0-9]* ) "]" )? ( "." <idShortPath> )* )
 <idShort> ::= ( ( [a-z] | [A-Z] ) ( [a-z] | [A-Z] | [0-9] | "_" )* )
 
 <ws> ::= ( " " | "\t" | "\r" | "\n" )*
-....