Merge #332

332: [WIP] Add multiline comments to Pest's PEG format r=dragostis a=felix91gr Implementation of #330. At least, that's what I think. Probably needs tests. How do I make one, or update the existing ones? And how can I test it manually? Thanks <3 Co-authored-by: Félix Fischer <[email protected]> Co-authored-by: Félix Fischer <[email protected]>
pest-parser · Nov 6, 2018 · dece2c9 · dece2c9
2 parents dba2949 + b312f6f
commit dece2c9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 105 deletions.
diff --git a/derive/tests/grammar.pest b/derive/tests/grammar.pest
@@ -58,3 +58,23 @@ SYMBOL = { "shadows builtin" }
 
 WHITESPACE = _{ " " }
 COMMENT = _{ "$"+ }
+
+// Line comment
+
+/* 1-line multiline comment */
+
+/*
+	N-line multiline comment
+*/
+
+/*
+	// Line comment inside multiline
+
+	/*
+		(Multiline inside) multiline
+	*/
+
+	Invalid segment of grammar below (repeated rule)
+
+	WHITESPACE = _{ "hi" }
+*/
diff --git a/meta/src/grammar.pest b/meta/src/grammar.pest
@@ -90,4 +90,5 @@ range_operator = { ".." }
 
 newline    = _{ "\n" | "\r\n" }
 WHITESPACE = _{ " " | "\t" | newline }
-COMMENT    = _{ "//" ~ (!newline ~ ANY)* }
+block_comment = _{ "/*" ~ (block_comment | !"*/" ~ ANY)* ~ "*/" }
+COMMENT    = _{ block_comment | ("//" ~ (!newline ~ ANY)*) }
diff --git a/vm/tests/grammar.pest b/vm/tests/grammar.pest
diff --git a/vm/tests/grammar.pest b/vm/tests/grammar.pest
@@ -0,0 +1 @@
+../../derive/tests/grammar.pest
diff --git a/vm/tests/lists.pest b/vm/tests/lists.pest
diff --git a/vm/tests/lists.pest b/vm/tests/lists.pest
@@ -0,0 +1 @@
+../../derive/tests/lists.pest
diff --git a/vm/tests/reporting.pest b/vm/tests/reporting.pest
diff --git a/vm/tests/reporting.pest b/vm/tests/reporting.pest
@@ -0,0 +1 @@
+../../derive/tests/reporting.pest