Allow comments to end in CRLF. Fixes #1.

valderman · Apr 26, 2022 · a5fa5e5 · a5fa5e5
1 parent 80a0a1b
commit a5fa5e5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/antlr/Toml.g4 b/src/main/antlr/Toml.g4
@@ -64,7 +64,7 @@ array_table : '[' '[' key ']' ']' ;
 
 WS : [ \t]+ -> skip ;
 NL : ('\r'? '\n')+ ;
-COMMENT : '#' (~[\n])* ;
+COMMENT : '#' (~[\r\n])* ;
 
 fragment DIGIT : [0-9] ;
 fragment ALPHA : [A-Za-z] ;

diff --git a/src/test/kotlin/cc/ekblad/toml/parser/MiscTests.kt b/src/test/kotlin/cc/ekblad/toml/parser/MiscTests.kt
@@ -147,11 +147,34 @@ class MiscTests : StringTest {
         assertIs<InputMismatchException>(exception.cause)
     }
 
+    @Test
+    fun `key-value pair can end in CRLF`() {
+        assertEquals(
+            TomlValue.Map("foo" to TomlValue.Integer(123)),
+            TomlValue.from("foo = 123\r\n")
+        )
+    }
+
+    @Test
+    fun `comment can end in CRLF`() {
+        assertEquals(
+            TomlValue.Map(),
+            TomlValue.from("# Hello\r\n")
+        )
+    }
+
     @Test
     fun `throws on unspecified value`() {
         assertDocumentParseError("foo =")
     }
 
+    @Test
+    fun `throws on comment containing CR`() {
+        asciiControlChars.assertAll {
+            assertDocumentParseError("# this is \r bad")
+        }
+    }
+
     @Test
     fun `throws on comment containing ASCII control char`() {
         asciiControlChars.assertAll {