diff options
author | LaMont, William (wl2432) <wl2432@att.com> | 2019-01-11 15:21:39 -0500 |
---|---|---|
committer | LaMont, William (wl2432) <wl2432@us.att.com> | 2019-01-16 11:56:04 -0500 |
commit | 16b48ab05e63fca707585b4ecee466b8b7721a1b (patch) | |
tree | bca44c248860f73d65031162a6f5581c4fef649b /aai-traversal/src/main/resources/antlr4/org | |
parent | c0365f15a25aed95f7e812dc1d7e7ac588ebbed5 (diff) |
Update traversal to support v15
Issue-ID: AAI-2073
Change-Id: I1c3df218d1333bdebc984947edc100607958ab60
Signed-off-by: LaMont, William (wl2432) <wl2432@us.att.com>
Diffstat (limited to 'aai-traversal/src/main/resources/antlr4/org')
-rw-r--r-- | aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 b/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 index f0c866a..cf34571 100644 --- a/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 +++ b/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 @@ -14,7 +14,7 @@ traverseStep: (TRAVERSE ( singleNodeStep | unionQueryStep)); singleNodeStep: NODE STORE? (filterStep | filterTraverseStep)*; -filterStep: NOT? (LPAREN KEY (COMMA KEY)* RPAREN); +filterStep: NOT? (LPAREN KEY (COMMA (KEY | NODE))* RPAREN); filterTraverseStep: (LPAREN traverseStep* RPAREN); limitStep: LIMIT NODE; @@ -47,13 +47,13 @@ RBRACKET: [\]]; NOT: [!]; -VALUE: DIGIT; +VALUE: [DIGIT]+; fragment LOWERCASE : [a-z] ; fragment UPPERCASE : [A-Z] ; fragment DIGIT : [0-9] ; ID - : ( LOWERCASE | UPPERCASE | DIGIT) ( LOWERCASE | UPPERCASE | DIGIT | '-' |'.' |'_')* + : ( LOWERCASE | UPPERCASE | DIGIT) ( LOWERCASE | UPPERCASE | DIGIT | '-' | '.' | '_' | '/')* ; WS : [ \t\r\n]+ -> skip ; // skip spaces, tabs, newlines |