Change parsing to require fewer newlines

1 files changed, 8 insertions, 6 deletions

@@ -63,17 +63,20 @@ FLAT FUCK FORMAT : Specification
        (+ array-item)))
 
 (define-peg-pattern item all
-  object-item)
+  (and object-item
+       (* NEWLINE)))
 
 (define-peg-pattern object-item body
   (and key (* WHITESPACE)
        COLON (* WHITESPACE)
-       (or ref val)))
+       (or ref val)
+       (? NEWLINE)))
 
 (define-peg-pattern array-item body
   (and (* WHITESPACE)
        COLON (* WHITESPACE)
-       (or ref val)))
+       (or ref val)
+       (? NEWLINE)))
 
 (define-peg-pattern name all
   (and key COLON COLON (* WHITESPACE) NEWLINE))
@@ -83,11 +86,10 @@ FLAT FUCK FORMAT : Specification
           nonl)))
 
 (define-peg-pattern val all
-  (and (* nonl)
-       NEWLINE))
+  (and (* nonl)))
 
 (define-peg-pattern ref all
-  (and AT key NEWLINE))
+  (and AT key))
 
 (define-peg-pattern escaped body
   (and BACKSLASH (or (and NEWLINE (* WHITESPACE))