From 9441a8101142199cca09f4c234f788da16391f7a Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 23 Jan 2019 15:40:07 -0800 Subject: [PATCH] Better error reporting and error handling for chunks. --- nomsu.2.peg | 10 +++++----- nomsu.3.peg | 10 +++++----- nomsu.4.peg | 10 +++++----- nomsu.5.peg | 10 +++++----- nomsu.6.peg | 12 ++++++------ 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/nomsu.2.peg b/nomsu.2.peg index 49d4aaf..f95f36d 100644 --- a/nomsu.2.peg +++ b/nomsu.2.peg @@ -12,7 +12,7 @@ file_chunks (FileChunks) <- shebang? comment? blank_lines? (top_block (nl_nodent section_division top_block)*) blank_lines? - ws* unexpected_chunk? + unexpected_indent? unexpected_chunk? top_block (Block) <- ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)* @@ -35,12 +35,12 @@ eol_comment (Comment) <- unexpected_code <- ws* _unexpected_code _unexpected_code (Error) <- - {:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :} + {:error: {~ [^%nl]+ -> "Couldn't parse this code." ~} :} unexpected_chunk (Error) <- - {:error: {~ .+ -> "Couldn't parse this code" ~} :} + {:error: {~ .+ -> "Couldn't parse this chunk of code." ~} :} 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 "(..)"' ~} :} + {:error: {~ (=curr_indent ws+) -> "This indentation is messed up." ~} :} + {:hint: {~ '' -> 'This line should either have the same indentation as the line above it, or exactly 4 spaces more.' ~} :} missing_paren_err (Error) <- {:error: {~ eol -> 'Line ended without finding a closing )-parenthesis' ~} :} {:hint: {~ '' -> 'Put a ")" here' ~} :} diff --git a/nomsu.3.peg b/nomsu.3.peg index 9daaa35..a8b64ad 100644 --- a/nomsu.3.peg +++ b/nomsu.3.peg @@ -12,7 +12,7 @@ file_chunks (FileChunks) <- shebang? comment? blank_lines? (top_block (nl_nodent section_division top_block)*) blank_lines? - ws* unexpected_chunk? + unexpected_indent? unexpected_chunk? top_block (Block) <- ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)* @@ -35,12 +35,12 @@ eol_comment (Comment) <- unexpected_code <- ws* _unexpected_code _unexpected_code (Error) <- - {:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :} + {:error: {~ [^%nl]+ -> "Couldn't parse this code." ~} :} unexpected_chunk (Error) <- - {:error: {~ .+ -> "Couldn't parse this code" ~} :} + {:error: {~ .+ -> "Couldn't parse this chunk of code." ~} :} 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 "(..)"' ~} :} + {:error: {~ (=curr_indent ws+) -> "This indentation is messed up." ~} :} + {:hint: {~ '' -> 'This line should either have the same indentation as the line above it, or exactly 4 spaces more.' ~} :} missing_paren_err (Error) <- {:error: {~ eol -> 'Line ended without finding a closing )-parenthesis' ~} :} {:hint: {~ '' -> 'Put a ")" here' ~} :} diff --git a/nomsu.4.peg b/nomsu.4.peg index cb2a561..cc1c140 100644 --- a/nomsu.4.peg +++ b/nomsu.4.peg @@ -14,7 +14,7 @@ file_chunks (FileChunks) <- {:shebang: shebang :}? (top_block (nl_nodent section_division top_block)*) blank_lines? - ws* unexpected_chunk? + unexpected_indent? unexpected_chunk? top_block (Block) <- ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)* @@ -37,12 +37,12 @@ eol_comment (Comment) <- unexpected_code <- ws* _unexpected_code _unexpected_code (Error) <- - {:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :} + {:error: {~ [^%nl]+ -> "Couldn't parse this code." ~} :} unexpected_chunk (Error) <- - {:error: {~ .+ -> "Couldn't parse this code" ~} :} + {:error: {~ .+ -> "Couldn't parse this chunk of code." ~} :} 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 "(..)"' ~} :} + {:error: {~ (=curr_indent ws+) -> "This indentation is messed up." ~} :} + {:hint: {~ '' -> 'This line should either have the same indentation as the line above it, or exactly 4 spaces more.' ~} :} missing_paren_err (Error) <- {:error: {~ eol -> 'Line ended without finding a closing )-parenthesis' ~} :} {:hint: {~ '' -> 'Put a ")" here' ~} :} diff --git a/nomsu.5.peg b/nomsu.5.peg index 9886132..4aa23be 100644 --- a/nomsu.5.peg +++ b/nomsu.5.peg @@ -14,7 +14,7 @@ file_chunks (FileChunks) <- {:shebang: shebang :}? (top_block (nl_nodent section_division top_block)*) blank_lines? - ws* unexpected_chunk? + unexpected_indent? unexpected_chunk? top_block (Block) <- ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)* @@ -35,12 +35,12 @@ comment (Comment) <- unexpected_code <- ws* _unexpected_code _unexpected_code (Error) <- - {:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :} + {:error: {~ [^%nl]+ -> "Couldn't parse this code." ~} :} unexpected_chunk (Error) <- - {:error: {~ .+ -> "Couldn't parse this code" ~} :} + {:error: {~ .+ -> "Couldn't parse this chunk of code." ~} :} 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 "(..)"' ~} :} + {:error: {~ (=curr_indent ws+) -> "This indentation is messed up." ~} :} + {:hint: {~ '' -> 'This line should either have the same indentation as the line above it, or exactly 4 spaces more.' ~} :} missing_paren_err (Error) <- {:error: {~ eol -> 'Line ended without finding a closing )-parenthesis' ~} :} {:hint: {~ '' -> 'Put a ")" here' ~} :} diff --git a/nomsu.6.peg b/nomsu.6.peg index d0ccd9a..82aad2c 100644 --- a/nomsu.6.peg +++ b/nomsu.6.peg @@ -12,7 +12,7 @@ file_chunks (FileChunks) <- {:shebang: shebang :}? (top_block (nl_nodent section_division top_block)*) blank_lines? - ws* unexpected_chunk? + unexpected_indent? unexpected_chunk? section_division <- ("~")^+3 eol @@ -240,14 +240,14 @@ escaped_char <- -- Errors unexpected_code <- ws* _unexpected_code _unexpected_code (Error) <- - {:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :} + {:error: {~ [^%nl]+ -> "Couldn't parse this code." ~} :} unexpected_chunk (Error) <- - {:error: {~ .+ -> "Couldn't parse this code" ~} :} + {:error: {~ .+ -> "Couldn't parse this chunk of code." ~} :} 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 "(..)"' ~} :} + {:error: {~ (=curr_indent ws+) -> "This indentation is messed up." ~} :} + {:hint: {~ '' -> 'This line should either have the same indentation as the line above it, or exactly 4 spaces more.' ~} :} missing_paren_err (Error) <- - {:error: {~ eol -> 'This expression is missing a closing )-parenthesis' ~} :} + {:error: {~ eol -> 'This expression is missing a closing )-parenthesis.' ~} :} {:hint: {~ '' -> 'Put a ")" here' ~} :} missing_quote_err (Error) <- {:error: {~ eol -> "This text is missing a closing quotation mark." ~} :}