Grammar fixes

2 files changed, 9 insertions, 6 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 d90e46ec953..bcb34dd4552 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
@@ -25,7 +25,8 @@
     tokenTypeClass="ai.vespa.intellij.schema.psi.SdTokenType" // Class which will be used to create leaf nodes.
       
     extends(".*Expr")=RankingExpression  // Here to deal with left-recursion that happens in expressions
-   
+
+    // 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_-]*'
@@ -35,10 +36,10 @@
         COMMA = 'regexp:[,]'
         //BLOCK_START = '{'
         //BLOCK_END = '}'
-        INTEGER_REG = 'regexp:[0-9]+'
-        FLOAT_REG = 'regexp:[0-9]+[.][0-9]+[e]?'
+        INTEGER_REG = 'regexp:[\-]?[0-9]+'
+        FLOAT_REG = 'regexp:[\-]?[0-9]+[.][0-9]+[e]?'
         STRING_REG = 'regexp:\"([^\"\\]*(\\.[^\"\\]*)*)\"'
-        STRING_REG_SINGLE_QUOTE = "regexp:'([^'\\]*(\\.[^'\\]*)*)'" // TODO: This appears not to work
+        STRING_REG_SINGLE_QUOTE = "regexp:'([^'\\]*(\\.[^'\\]*)*)'"
         WORD_REG = 'regexp:\w+'
     ]
 }
@@ -199,7 +200,7 @@ StrictDefinition ::= strict ':' (true | false)
 InputsDefinition ::= inputs '{' InputDefinition* '}'
 InputDefinition ::= ( QueryFeature | IdentifierVal)
                     (':')?
-                    ( TensorType | "double" )? (':' ( TensorValue | FLOAT_REG | INTEGER_REG) )?
+                    ( TensorType | "double" )? (':'? ( FLOAT_REG | INTEGER_REG | TensorValue ) )?
 
 FirstPhaseDefinition ::= first-phase '{' FirstPhaseBody '}'  { mixin="ai.vespa.intellij.schema.psi.impl.SdFirstPhaseDefinitionMixin" }
 FirstPhaseBody ::= FirstPhaseBodyOptions* // Does not support zero-or-one occurrences
diff --git a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
index 3947a9fb2eb..b1077f9187c 100644
--- a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
+++ b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
@@ -38,9 +38,10 @@ SYMBOL= [!$|:{}().\[\]]
 COMMA= [,]
 //BLOCK_START= \{
 //BLOCK_END= \}
-INTEGER = [0-9]+
+INTEGER = [-]?[0-9]+
 FLOAT = {INTEGER}[.][0-9]+[e]?
 STRING = \"([^\"\\]*(\\.[^\"\\]*)*)\"
+STRING_SINGLE_QUOTE = '([^'\\]*(\\.[^'\\]*)*)'
 WORD = \w+
 
 
@@ -249,6 +250,7 @@ WORD = \w+
   {FLOAT}                    { return FLOAT_REG; }
   {WORD}                     { return WORD_REG; }
   {STRING}                   { return STRING_REG; }  
+  {STRING_SINGLE_QUOTE}     { return STRING_REG_SINGLE_QUOTE; }
 
 }