From 4e57c5f5df4c1baf1af2d4b0f3c56239f442c7ef Mon Sep 17 00:00:00 2001
From: ToruNiina <niina.toru.68u@gmail.com>
Date: Mon, 10 Dec 2018 21:43:02 +0900
Subject: [PATCH] improve error message for invalid line

like a = 12 = true, newline is expected after 12
---
 toml/parser.hpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/toml/parser.hpp b/toml/parser.hpp
index 7346cdb..8c9bbf4 100644
--- a/toml/parser.hpp
+++ b/toml/parser.hpp
@@ -1209,8 +1209,9 @@ result<table, std::string> parse_ml_table(location<Container>& loc)
         return err(std::string("toml::parse_ml_table: input is empty"));
     }
 
+    // XXX at lest one newline is needed
     using skip_line = repeat<
-        sequence<maybe<lex_ws>, maybe<lex_comment>, lex_newline>, unlimited>;
+        sequence<maybe<lex_ws>, maybe<lex_comment>, lex_newline>, at_least<1>>;
     skip_line::invoke(loc);
 
     table tab;
@@ -1244,7 +1245,18 @@ result<table, std::string> parse_ml_table(location<Container>& loc)
             return err(kv.unwrap_err());
         }
 
-        skip_line::invoke(loc);
+        const auto newline = skip_line::invoke(loc);
+        if(!newline && loc.iter() != loc.end())
+        {
+            const auto before = loc.iter();
+            lex_ws::invoke(loc); // skip whitespace
+            const auto msg = format_underline("[error] toml::parse_table: "
+                "invalid line format", loc, concat_to_string(
+                "expected newline, but got '", show_char(*loc.iter()), "'."));
+            loc.iter() = before;
+            return err(msg);
+        }
+
         // comment lines are skipped by the above function call.
         // However, if the file ends with comment without newline,
         // it might cause parsing error because skip_line matches