Merge pull request #117 from mavolin/fix/115

Ignore Braces in String and Rune Literals
mna · Sep 22, 2023 · 5f0a678 · 5f0a678
2 parents e380b41 + a9da6c0
commit 5f0a678
Show file tree

Hide file tree

Showing 5 changed files with 1,547 additions and 40 deletions.
diff --git a/Makefile b/Makefile
@@ -176,6 +176,9 @@ $(TEST_DIR)/issue_79/issue_79.go: $(TEST_DIR)/issue_79/issue_79.peg $(BINDIR)/pi
 $(TEST_DIR)/issue_80/issue_80.go: $(TEST_DIR)/issue_80/issue_80.peg $(BINDIR)/pigeon
 	$(BINDIR)/pigeon -nolint $< > $@
 
+$(TEST_DIR)/issue_115/issue_115.go: $(TEST_DIR)/issue_115/issue_115.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
@@ -322,7 +322,11 @@ CodeBlock ← '{' Code '}' {
     return nil, errors.New("code block not terminated")
 }
 
-Code ← ( ( Comment / ![{}] SourceChar )+ / '{' Code '}' )*
+Code ← ( ( Comment / CodeStringLiteral / ![{}] SourceChar )+ / '{' Code '}' )*
+
+CodeStringLiteral ← '"' (`\"` / [^"\r\n])* '"' /
+                    '`' [^`]* '`' /
+                    '\'' (`\'` / [^']+) '\''
 
 __ ← ( Whitespace / EOL / Comment )*
 _ ← ( Whitespace / MultiLineCommentNoLineTerminator )*

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