aboutsummaryrefslogtreecommitdiffstats
path: root/integration/intellij/src/main/bnf
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-05-28 11:58:33 +0200
committerJon Bratseth <bratseth@gmail.com>2022-05-28 11:58:33 +0200
commit330ffb3642c71079333f7f73cf4d1140c8c0a3d9 (patch)
treea95b1967eecda4b2cf2eb74d8888159d708ed562 /integration/intellij/src/main/bnf
parent8f4c6cc6e30440aca13f8a54daad73a35dc6cbd0 (diff)
Grammar fixes
Diffstat (limited to 'integration/intellij/src/main/bnf')
-rw-r--r--integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf5
1 files changed, 2 insertions, 3 deletions
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 527888cf95c..28d84ce123c 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
@@ -29,7 +29,6 @@
// NOTE: As far as I (Jon) can tell these are not used. Edit the ones in sd.flex instead.
tokens = [
ID_REG = 'regexp:[a-zA-Z_][a-zA-Z0-9_]*'
- ID_WITH_DASH_REG = 'regexp:[a-zA-Z_][a-zA-Z0-9_-]*[a-zA-Z0-9_]'
WHITE_SPACE = 'regexp:\s+'
COMMENT = 'regexp:#.*'
SYMBOL = 'regexp:[!$|:{}().\[\]]'
@@ -366,14 +365,14 @@ WeightedSetProperty ::= create-if-nonexistent | remove-if-zero
DictionaryDefinition ::= dictionary ((':' DictionarySetting) | ('{' DictionarySetting* '}'))
DictionarySetting ::= hash | btree | cased | uncased
-private WordWrapper ::= KeywordOrIdentifier | KeywordNotIdentifier | ID_REG | ID_WITH_DASH_REG | WORD_REG
+private WordWrapper ::= KeywordOrIdentifier | KeywordNotIdentifier | ID_REG | IdentifierWithDashVal | WORD_REG
IdentifierVal ::= KeywordOrIdentifier | ID_REG { mixin="ai.vespa.intellij.schema.psi.impl.SdIdentifierMixin"
implements=["ai.vespa.intellij.schema.psi.SdIdentifier"]
}
DottedIdentifier ::= IdentifierVal ('.' IdentifierVal)*
-IdentifierWithDashVal ::= ID_WITH_DASH_REG | IdentifierVal { mixin="ai.vespa.intellij.schema.psi.impl.SdIdentifierMixin"
+IdentifierWithDashVal ::= IdentifierVal ('-' IdentifierVal)* { mixin="ai.vespa.intellij.schema.psi.impl.SdIdentifierMixin"
implements=["ai.vespa.intellij.schema.psi.SdIdentifier"]
}
DottedIdentifierWithDash ::= IdentifierWithDashVal ('.' IdentifierWithDashVal)*