Fix PEG grammar to consider whitespace as one or more whitespace char…

…acters, fix test in cuttlefish_conf
Kyorai · Aug 3, 2019 · 143dcad · 143dcad
1 parent ef90390
commit 143dcad
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/conf_parse.erl b/src/conf_parse.erl
@@ -66,6 +66,7 @@
 
 %% @doc Only let through lines that are not comments or whitespace.
 is_setting(ws) -> false;
+is_setting([ws]) -> false;
 is_setting(comment) -> false;
 is_setting(_) -> true.
 
@@ -97,14 +98,22 @@ utf8_test() ->
         }], Conf),
     ok.
 
-gh_1_only_whitespace_test() ->
+gh_1_two_tab_test() ->
     Conf = conf_parse:parse("setting0 = thing0\n\t\t\nsetting1 = thing1\n"),
     ?assertEqual([
             {["setting0"],"thing0"},
             {["setting1"],"thing1"}
         ], Conf),
     ok.
 
+gh_1_three_tab_test() ->
+    Conf = conf_parse:parse("setting0 = thing0\n\t\t\t\nsetting1 = thing1\n"),
+    ?assertEqual([
+            {["setting0"],"thing0"},
+            {["setting1"],"thing1"}
+        ], Conf),
+    ok.
+
 -endif.
 
 -spec file(file:name()) -> any().
@@ -180,7 +189,7 @@ parse(Input) when is_binary(Input) ->
 
 -spec 'ws'(input(), index()) -> parse_result().
 'ws'(Input, Index) ->
-  p(Input, Index, 'ws', fun(I,D) -> (p_charclass(<<"[\s\t]">>))(I,D) end, fun(_Node, _Idx) ->ws end).
+  p(Input, Index, 'ws', fun(I,D) -> (p_one_or_more(p_charclass(<<"[\s\t]">>)))(I,D) end, fun(_Node, _Idx) ->ws end).
 
 
 

diff --git a/src/conf_parse.peg b/src/conf_parse.peg
@@ -75,7 +75,7 @@ crlf <- "\r"? "\n" `ws`;
 eof <- !. `ws`;
 
 %% Whitespace is either spaces or tabs.
-ws <- [ \t] `ws`;
+ws <- [ \t]+ `ws`;
 
 % Erlang code
 %{
@@ -131,6 +131,7 @@ ws <- [ \t] `ws`;
 
 %% @doc Only let through lines that are not comments or whitespace.
 is_setting(ws) -> false;
+is_setting([ws]) -> false;
 is_setting(comment) -> false;
 is_setting(_) -> true.
 
@@ -162,13 +163,21 @@ utf8_test() ->
         }], Conf),
     ok.
 
-gh_1_only_whitespace_test() ->
+gh_1_two_tab_test() ->
     Conf = conf_parse:parse("setting0 = thing0\n\t\t\nsetting1 = thing1\n"),
     ?assertEqual([
             {["setting0"],"thing0"},
             {["setting1"],"thing1"}
         ], Conf),
     ok.
 
+gh_1_three_tab_test() ->
+    Conf = conf_parse:parse("setting0 = thing0\n\t\t\t\nsetting1 = thing1\n"),
+    ?assertEqual([
+            {["setting0"],"thing0"},
+            {["setting1"],"thing1"}
+        ], Conf),
+    ok.
+
 -endif.
 %}
diff --git a/src/cuttlefish_conf.erl b/src/cuttlefish_conf.erl
@@ -312,7 +312,7 @@ duplicates_multi_test() ->
 
 files_one_nonent_test() ->
     Conf = files(["test/multi1.conf", "test/nonent.conf"]),
-    ?assertEqual({errorlist,[{error, {file_open, {"test/nonent.conf", undefined}}}]}, Conf),
+    ?assertEqual({errorlist,[{error, {file_open, {"test/nonent.conf", enoent}}}]}, Conf),
     ok.
 
 files_incomplete_parse_test() ->