Merge pull request #166 from jahav/165-duplicated-valid-char

Don't require extra chars at the end of NameCombinationToken

Author: WillemJann

src/XLParser.Tests/ParserTests.cs

@@ -880,7 +880,7 @@ public void TestNamedRangeCombination()
         {
             // See [Issue 46](https://github.com/spreadsheetlab/XLParser/issues/46)
             // This concerns names beginning with non-name words.
-            var names = new[] {"A1ABC", "A1A1", "A2.PART_NUM", "A2?PART_NUM", "TRUEFOO", "FALSEFOO", "TRUEMODEL"};
+            var names = new[] {"A1ABC", "A1A1", "A2.PART_NUM", "A2?PART_NUM", "TRUEFOO", "FALSEFOO", "TRUEMODEL", "W1."};
             foreach (var name in names)
             {
                 Test(name, tree => tree.AllNodes(GrammarNames.NamedRange).Select(ExcelFormulaParser.Print).Contains(name));

src/XLParser/ExcelFormulaGrammar.cs

@@ -148,7 +148,7 @@ public class ExcelFormulaGrammar : Grammar
             ;
 
         // To prevent e.g. "A1A1" being parsed as 2 cell tokens
-        public Terminal NamedRangeCombinationToken { get; } = new RegexBasedTerminal(GrammarNames.TokenNamedRangeCombination, NameInvalidWordsRegex + NameValidCharacterRegex + "+",
+        public Terminal NamedRangeCombinationToken { get; } = new RegexBasedTerminal(GrammarNames.TokenNamedRangeCombination, NameInvalidWordsRegex,
                 ColumnPrefix.Concat(new[] { "T", "F" }).ToArray())
         { Priority = TerminalPriority.NamedRangeCombination };