Support empty configs

rossabaker · rossabaker · commit e4a5db899bc2 · 2017-02-24T17:03:11.000-05:00
Fixes bug reported in #49 by @jedesah.
diff --git a/core/src/main/scala/knobs/Parser.scala b/core/src/main/scala/knobs/Parser.scala
@@ -39,21 +39,18 @@ object ConfigParser {
 
   /** Top-level parser of configuration files */
   lazy val topLevel: Parser[List[Directive]] = "configuration" |: {
-    directives << skipLWS << realEOF
+    skipLWS >> directives << realEOF
   }
 
   /** Parser of configuration files that don't support import directives */
-  lazy val sansImport: Parser[List[Directive]] = {
-    val d = (skipLWS >> choice(bindDirective, groupDirective) << skipHWS)
-    d.map2(attempt(newline >> d).many)(_ :: _)
-  }
+  lazy val sansImport: Parser[List[Directive]] =
+    (choice(bindDirective, groupDirective) << skipHWS).sepEndBy(newline << skipLWS)
 
   lazy val directives: Parser[List[Directive]] =
-    directive.map2(attempt(newline >> directive).many)(_ :: _)
+    (directive << skipHWS).sepEndBy(newline << skipLWS)
 
   lazy val directive: Parser[Directive] =
-    (skipLWS >> choice(importDirective, bindDirective, groupDirective) << skipHWS) scope
-      "directive"
+    choice(importDirective, bindDirective, groupDirective) scope "directive"
 
   lazy val importDirective = "import directive" |: {
     word("import") >> skipLWS >> stringLiteral.map(Import(_))
diff --git a/core/src/test/resources/all-comments.cfg b/core/src/test/resources/all-comments.cfg
@@ -0,0 +1,7 @@
+
+# param1=true
+# param2="hello"
+
+# group {
+#   this.group.is = "commented out"
+# }
diff --git a/core/src/test/resources/pathological.cfg b/core/src/test/resources/pathological.cfg
@@ -1,3 +1,8 @@
+
+
+   
+# ^^^ Start with some irritating whitespace
+
 # Comment
 
 aa # Comment
@@ -41,3 +46,8 @@ dur = 5 seconds
 ca.cb {
   cd = "fuf"
 }
+
+# And finish with some more irritating whitespace
+
+
+ 
diff --git a/core/src/test/scala/knobs/Test.scala b/core/src/test/scala/knobs/Test.scala
@@ -164,6 +164,8 @@ object Test extends Properties("Knobs") {
     }
   }
 
+  lazy val allCommentsTest: Task[Prop] =
+    load(List(Required(ClassPathResource("all-comments.cfg")))).attempt.map(_.isRight)
 
   property("load-pathological-config") = loadTest.unsafePerformSync
 
@@ -203,4 +205,5 @@ object Test extends Properties("Knobs") {
 
   property("mutable-config-value-error") = mutableConfigValueErrorTest.unsafePerformSync
 
+  property("all-comments") = allCommentsTest.unsafePerformSync
 }

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,8 @@ object Test extends Properties("Knobs") {`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
	`167`	`+ lazy val allCommentsTest: Task[Prop] =`
	`168`	`+ load(List(Required(ClassPathResource("all-comments.cfg")))).attempt.map(_.isRight)`
`167`	`169`
`168`	`170`	`property("load-pathological-config") = loadTest.unsafePerformSync`
`169`	`171`
`@@ -203,4 +205,5 @@ object Test extends Properties("Knobs") {`
`203`	`205`
`204`	`206`	`property("mutable-config-value-error") = mutableConfigValueErrorTest.unsafePerformSync`
`205`	`207`
	`208`	`+ property("all-comments") = allCommentsTest.unsafePerformSync`
`206`	`209`	`}`