diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-12-21 12:36:58 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-12-21 12:36:58 +0100 |
commit | 793bc708b0554ba84cf209363bdde9a555c69740 (patch) | |
tree | e14eca6017c135663764b322c14e6d32a54f19c4 /container-search/src/main | |
parent | 811e7036517781a863c5a326a9f24957a2866ceb (diff) |
Allow keywords as YQL properties without quoting
Diffstat (limited to 'container-search/src/main')
-rw-r--r-- | container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 | 8 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 b/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 index 8b0ebcf98fc..6193cabeaa7 100644 --- a/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 +++ b/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 @@ -270,7 +270,7 @@ sequence_source ; namespaced_name - : (ident (DOT ident)* (DOT STAR)?) + : (dotted_idents (DOT STAR)?) ; orderby @@ -450,12 +450,12 @@ propertyNameAndValue ; propertyName - : dottedIdentifiers + : dotted_idents | STRING ; -dottedIdentifiers - : IDENTIFIER (DOT IDENTIFIER)* +dotted_idents + : ident (DOT ident)* ; constantExpression diff --git a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java index 3e7084acc56..cc441eb0c3d 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java +++ b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java @@ -1485,7 +1485,7 @@ public class VespaSerializer { private static void serializeOrigin(StringBuilder destination, String image, int offset, int length) { destination.append(ORIGIN).append(": {").append(ORIGIN_ORIGINAL).append(": \""); escape(image, destination); - destination.append("\", '").append(ORIGIN_OFFSET).append("': ") + destination.append("\", ").append(ORIGIN_OFFSET).append(": ") .append(offset).append(", ").append(ORIGIN_LENGTH) .append(": ").append(length).append("}"); } |