Fix bug with case-insensitive strings

boxbeam · Mar 10, 2022 · b28e1a7 · b28e1a7
1 parent 94ebd0e
commit b28e1a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/redempt/redlex/token/StringToken.java b/src/redempt/redlex/token/StringToken.java
@@ -2,6 +2,7 @@
 
 import redempt.redlex.data.TokenType;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -57,6 +58,12 @@ public int maxLength() {
 
 	@Override
 	public List<Character> calcFirstCharacters() {
+		if (!caseSensitive && string.length() > 0) {
+			List<Character> chars = new ArrayList<>();
+			chars.add(string.charAt(0));
+			chars.add(Character.toUpperCase(string.charAt(0)));
+			return chars;
+		}
 		return Collections.singletonList(string.length() == 0 ? null : string.charAt(0));
 	}
 

diff --git a/test/java/redempt/redlex/test/RedLexTest.java b/test/java/redempt/redlex/test/RedLexTest.java
@@ -118,6 +118,12 @@ public void caseInsensitiveTest() {
 		assertDoesNotThrow(() -> lexer.tokenize("aBc"));
 		assertDoesNotThrow(() -> lexer.tokenize("Abc"));
 		assertDoesNotThrow(() -> lexer.tokenize("ABC"));
+
+		Lexer lexer2 = BNFParser.createLexer("root ::= \"abc\"");
+		assertDoesNotThrow(() -> lexer2.tokenize("abc"));
+		assertThrows(LexException.class, () -> lexer2.tokenize("Abc"));
+		assertThrows(LexException.class, () -> lexer2.tokenize("aBc"));
+		assertThrows(LexException.class, () -> lexer2.tokenize("aBC"));
 	}
 
 }