aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java2
-rw-r--r--src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java
index 9dc2d4d..36a43f3 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingTokeniser.java
@@ -6,7 +6,7 @@ import static org.zwobble.mammoth.internal.util.Lists.list;
public class StyleMappingTokeniser {
public static List<Token<TokenType>> tokenise(String line) {
- String stringPrefix = "'((?:\\.|[^'])*)";
+ String stringPrefix = "'((?:\\\\.|[^'])*)";
String identifierCharacter = "(?:[a-zA-Z\\-_]|\\\\.)";
RegexTokeniser<TokenType> tokeniser = new RegexTokeniser<>(
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java
index f3147ba..85fb6d4 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java
@@ -51,6 +51,11 @@ public class StyleMappingTokeniserTests {
}
@Test
+ public void escapeSequencesInStringsAreTokenised() {
+ assertTokens("'Tristan\\''", isToken(TokenType.STRING, "'Tristan\\''"));
+ }
+
+ @Test
public void unterminatedStringsAreTokenised() {
assertTokens("'Tristan", isToken(TokenType.UNTERMINATED_STRING, "'Tristan"));
}