From 32b258868ccd35b6fce3cf5fa6221da74868bc0b Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Fri, 18 Jan 2019 15:18:49 -0800
Subject: [PATCH] Fix for parsing an indented top_block that starts with a
 comment and has code after it.

---
 nomsu.2.peg |  2 +-
 nomsu.3.peg |  2 +-
 nomsu.4.peg |  2 +-
 nomsu.5.peg |  2 +-
 nomsu.6.peg | 10 ++++++----
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/nomsu.2.peg b/nomsu.2.peg
index 64db7fa..3b98a20 100644
--- a/nomsu.2.peg
+++ b/nomsu.2.peg
@@ -15,7 +15,7 @@ file_chunks (FileChunks) <-
     ws* unexpected_chunk?
 
 top_block (Block) <-
-    comment? blank_lines? statement (nl_nodent statement)*
+    (comment nl_nodent)? statement (nl_nodent statement)*
 
 empty_block (Block) <-
     comment? blank_lines?
diff --git a/nomsu.3.peg b/nomsu.3.peg
index 655ed11..df29772 100644
--- a/nomsu.3.peg
+++ b/nomsu.3.peg
@@ -15,7 +15,7 @@ file_chunks (FileChunks) <-
     ws* unexpected_chunk?
 
 top_block (Block) <-
-    comment? blank_lines? statement (nl_nodent statement)*
+    (comment nl_nodent)? statement (nl_nodent statement)*
 
 empty_block (Block) <-
     comment? blank_lines?
diff --git a/nomsu.4.peg b/nomsu.4.peg
index 873638a..7d57831 100644
--- a/nomsu.4.peg
+++ b/nomsu.4.peg
@@ -17,7 +17,7 @@ file_chunks (FileChunks) <-
     ws* unexpected_chunk?
 
 top_block (Block) <-
-    comment? blank_lines? statement (nl_nodent statement)*
+    (comment nl_nodent)? statement (nl_nodent statement)*
 
 empty_block (Block) <-
     comment? blank_lines?
diff --git a/nomsu.5.peg b/nomsu.5.peg
index 751e033..2ecc800 100644
--- a/nomsu.5.peg
+++ b/nomsu.5.peg
@@ -17,7 +17,7 @@ file_chunks (FileChunks) <-
     ws* unexpected_chunk?
 
 top_block (Block) <-
-    comment? blank_lines? statement (nl_nodent statement)*
+    (comment nl_nodent)? statement (nl_nodent statement)*
 
 empty_block (Block) <-
     comment? blank_lines?
diff --git a/nomsu.6.peg b/nomsu.6.peg
index 39b0629..9b82345 100644
--- a/nomsu.6.peg
+++ b/nomsu.6.peg
@@ -2,9 +2,8 @@
 file <-
     {:curr_indent: ' '* :}
     (((methodchain / action / expression / inline_block) eol !.)
-     / file_chunks / comment? blank_lines?)
+     / file_chunks / comment? (blank_lines ws*)?)
     {:curr_indent: %nil :}
-    (unexpected_code .+)?
     !.
 
 shebang <- "#!" (!"nomsu" [^%nl])* "nomsu" ws+ "-V" ws* [0-9.]+ [^%nl]* (%nl / !.)
@@ -20,7 +19,7 @@ section_division <- ("~")^+3 eol
 eof <- !.
 eol <- ws* (&%nl / !.)
 nodent <- (unexpected_indent [^%nl]* / =curr_indent)
-indent <- {~ =curr_indent "    " ~}
+indent <- {=curr_indent "    "}
 blank_lines <- %nl ((nodent comment / ws*) %nl)*
 nl_nodent <- blank_lines nodent
 nl_indent <- blank_lines tab_error? {:curr_indent: indent :} (comment nl_nodent)*
@@ -31,7 +30,7 @@ comment (Comment) <-
 
 
 top_block (Block) <-
-    comment? blank_lines? statement (nl_nodent statement)*
+    (comment nl_nodent)? statement (nl_nodent statement)*
 
 inline_block (Block) <-
     ":" ws* (inline_statement (ws* ";" ws* inline_statement)*)?
@@ -244,6 +243,9 @@ _unexpected_code (Error) <-
     {:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :}
 unexpected_chunk (Error) <-
     {:error: {~ .+ -> "Couldn't parse this code" ~} :}
+unexpected_space (Error) <-
+    {:error: {~ ws+ -> "Messed up indentation" ~} :}
+    {:hint: {~ '' -> 'Either make sure this line is aligned with the one above it, or make sure the previous line ends with something that uses indentation, like ":" or "(..)"' ~} :}
 unexpected_indent (Error) <-
     {:error: {~ (=curr_indent ws+) -> "Messed up indentation" ~} :}
     {:hint: {~ '' -> 'Either make sure this line is aligned with the one above it, or make sure the previous line ends with something that uses indentation, like ":" or "(..)"' ~} :}