Merge pull request #135 from mavolin/fix/134

Fix Backslash Escapes Not Being Properly Handled
mna · Oct 16, 2023 · 456d46d · 456d46d
2 parents 783e261 + dc7b24e
commit 456d46d
Show file tree

Hide file tree

Showing 5 changed files with 1,447 additions and 47 deletions.
diff --git a/Makefile b/Makefile
@@ -179,6 +179,9 @@ $(TEST_DIR)/issue_80/issue_80.go: $(TEST_DIR)/issue_80/issue_80.peg $(BINDIR)/pi
 $(TEST_DIR)/issue_115/issue_115.go: $(TEST_DIR)/issue_115/issue_115.peg $(BINDIR)/pigeon
 	$(BINDIR)/pigeon -nolint $< > $@
 
+$(TEST_DIR)/issue_134/issue_134.go: $(TEST_DIR)/issue_134/issue_134.peg $(BINDIR)/pigeon
+	$(BINDIR)/pigeon -nolint $< > $@
+
 $(TEST_DIR)/left_recursion/left_recursion.go: \
 		$(TEST_DIR)/left_recursion/standart/leftrecursion/left_recursion.go \
 		$(TEST_DIR)/left_recursion/optimized/leftrecursion/left_recursion.go \

diff --git a/grammar/pigeon.peg b/grammar/pigeon.peg
@@ -324,9 +324,9 @@ CodeBlock ← '{' Code '}' {
 
 Code ← ( ( Comment / CodeStringLiteral / ![{}] SourceChar )+ / '{' Code '}' )*
 
-CodeStringLiteral ← '"' (`\"` / [^"\r\n])* '"' /
+CodeStringLiteral ← '"' (`\"` / `\\` / [^"\r\n])* '"' /
                     '`' [^`]* '`' /
-                    '\'' (`\'` / [^']+) '\''
+                    '\'' (`\'` / `\\` / [^']+) '\''
 
 __ ← ( Whitespace / EOL / Comment )*
 _ ← ( Whitespace / MultiLineCommentNoLineTerminator )*

diff --git a/pigeon.go b/pigeon.go