Newline terminated slot values

src/com/slalom/aws/avs/sutr/Sutr.bnf

@@ -50,14 +50,14 @@ file_name ::= NAME
 custom_type ::= 'slotType' type_name custom_type_items
 {extends="com.slalom.aws.avs.sutr.psi.impl.SutrReferenceImpl" implements="com.slalom.aws.avs.sutr.psi.SutrTypeDefinitionReference" }
 
-custom_type_items ::= LS custom_type_item (',' custom_type_item)* RS {pin=1}
-custom_type_item ::= (NAME|WORD)
+custom_type_items ::= LS (custom_type_item)* RS {pin=1}
+custom_type_item ::= PHRASE
 
 literal_type ::= 'literal' type_name literal_phrases
 {extends="com.slalom.aws.avs.sutr.psi.impl.SutrReferenceImpl" implements="com.slalom.aws.avs.sutr.psi.SutrTypeDefinitionReference" }
 
-literal_phrases ::= LS literal_phrase (',' literal_phrase )* RS {pin=1}
-literal_phrase ::= (NAME|WORD)*
+literal_phrases ::= LS (literal_phrase)* RS {pin=1}
+literal_phrase ::= PHRASE
 
 object ::= 'def' sutr_name sutr_params body function_pointer {pin=3}
 

src/com/slalom/aws/avs/sutr/_SutrLexer.flex

@@ -23,13 +23,14 @@ LINE_WS=[\ \t\f]
 WHITE_SPACE=({LINE_WS}|{EOL})+
 
 COMMENT=#[^\r\n]*
-
+PHRASE=[a-zA-Z0-9' ]+
 WORD=[a-zA-Z']+
 NAME=[a-zA-Z]+
 IDENTIFIER=[a-zA-Z_]+
 FUNCTION_IDENTIFIER=[a-zA-Z_\.]+
 
 %state YYSUTR
+%state YYSUTR_PHRASES
 %%
 <YYINITIAL> {
   {WHITE_SPACE}      { return com.intellij.psi.TokenType.WHITE_SPACE; }
@@ -48,8 +49,8 @@ FUNCTION_IDENTIFIER=[a-zA-Z_\.]+
   "}"                { return SutrRB; }
   "("                { return SutrLP; }
   ")"                { return SutrRP; }
-  "["                { return SutrLS; }
-  "]"                { return SutrRS; }
+  "["                { yybegin(YYSUTR_PHRASES); return SutrLS; }
+  "]"                { yybegin(YYSUTR); return SutrRS; }
   ","                { return SutrCOMMA; }
   {NAME}             { return SutrNAME; }
   {IDENTIFIER}       { return SutrIDENTIFIER; }
@@ -69,4 +70,11 @@ FUNCTION_IDENTIFIER=[a-zA-Z_\.]+
     "=>"               { yybegin(YYINITIAL); return SutrFP; }
 }
 
+<YYSUTR_PHRASES> {
+  {WHITE_SPACE} { return com.intellij.psi.TokenType.WHITE_SPACE; }
+  "]" { yybegin(YYINITIAL); return SutrRS; }
+  {COMMENT} { return SutrCOMMENT; }
+  {PHRASE} { return SutrPHRASE; }
+}
+
 [^] { return com.intellij.psi.TokenType.BAD_CHARACTER; }