summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-02-04 14:23:37 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2019-02-04 14:23:37 +0100
commit1afa067beaa0fe2947e77a022b69d2c8ba7dbaca (patch)
tree6c91e4e880bd77552841f44f6e5aa79d643db8ff /config-model
parent1caec5a2070920c99e5701b4638701328e68600a (diff)
Allow dash in document summary names
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/javacc/SDParser.jj6
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index f2eb45205df..77214ce9cc1 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -1207,7 +1207,7 @@ Object attributeSetting(FieldOperationContainer field, AttributeOperation attrib
| <ENABLEBITVECTORS> { attribute.setEnableBitVectors(true); }
| <ENABLEONLYBITVECTOR> { attribute.setEnableOnlyBitVector(true); }
| sorting(field, attributeName)
- | <ALIAS> { String alias; String aliasedName=attributeName; } [aliasedName = identifier()] <COLON> alias = identifier() {
+ | <ALIAS> { String alias; String aliasedName=attributeName; } [aliasedName = identifier()] <COLON> alias = identifierWithDash() {
attribute.setDoAlias(true);
attribute.setAlias(alias);
attribute.setAliasedName(aliasedName);
@@ -1250,7 +1250,7 @@ Object summaryInDocument(DocumentSummary document) :
}
{
- <SUMMARY> name = identifier() { }
+ <SUMMARY> name = identifierWithDash() { }
<TYPE> type = dataType() {
summary = new SummaryField(name, type);
summary.setVsmCommand(SummaryField.VsmCommand.FLATTENSPACE);
@@ -1700,7 +1700,7 @@ Object documentSummary(Search search) :
}
{
( <DOCUMENTSUMMARY>
- name = identifier() { search.addSummary(summary = new DocumentSummary(name)); }
+ name = identifierWithDash() { search.addSummary(summary = new DocumentSummary(name)); }
lbrace()
(
<FROMDISK> { summary.setFromDisk(true); } |