From 63e0ca74266f7422cbcd528ff7c8327634ca2a88 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 30 May 2022 01:22:38 +0200 Subject: Grammar fixes --- .../intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'integration/intellij') diff --git a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf index 558d217d005..59028366edf 100644 --- a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf +++ b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf @@ -33,8 +33,6 @@ COMMENT = 'regexp:#.*' SYMBOL = 'regexp:[!$|:{}().\[\]]' COMMA = 'regexp:[,]' - //BLOCK_START = '{' - //BLOCK_END = '}' INTEGER_REG = 'regexp:[0-9]+' FLOAT_REG = 'regexp:[0-9]+[.][0-9]+([eE][0-9]+)?' STRING_REG = 'regexp:\"([^\"\\]*(\\.[^\"\\]*)*)\"' @@ -369,9 +367,10 @@ IdentifierVal ::= KeywordOrIdentifier | ID_REG { mixin="ai.vespa.intellij.schema } DottedIdentifier ::= IdentifierVal ('.' IdentifierVal)* -IdentifierWithDashVal ::= IdentifierVal ('-' IdentifierVal)* { mixin="ai.vespa.intellij.schema.psi.impl.SdIdentifierMixin" - implements=["ai.vespa.intellij.schema.psi.SdIdentifier"] - } +IdentifierWithDashVal ::= IdentifierVal ('-' ( IdentifierVal | INTEGER_REG ) )* + { mixin="ai.vespa.intellij.schema.psi.impl.SdIdentifierMixin" + implements=["ai.vespa.intellij.schema.psi.SdIdentifier"] + } DottedIdentifierWithDash ::= IdentifierWithDashVal ('.' IdentifierWithDashVal)* BlockStart ::= (NL)* '{' (NL)* -- cgit v1.2.3