Exclude semicolon character from 'normal' characters

accense · Aug 9, 2011 · 672f848 · 672f848
1 parent fd6635a
commit 672f848
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/eini_lexer.xrl b/src/eini_lexer.xrl
@@ -23,10 +23,11 @@ Definitions.
 K = [a-zA-Z0-9_\.]+
 
 %% Characters for values, printable except =, [ and ]
+%% \x3b : $;
 %% \x3d : $=
 %% \x5b : $[
 %% \x5d : $]
-V = [\x21-\x3c\x3e-\x5a\x5c\x5e-\x7e]+
+V = [\x21-\x3a\x3c\x3e-\x5a\x5c\x5e-\x7e]+
 
 %% spaces and breaks
 S = [\s\t]

diff --git a/test/eini_tests.erl b/test/eini_tests.erl
@@ -26,6 +26,23 @@ one_section_title_only_test_() ->
    fun setup/0,
    fun teardown/1,
    [
+    %% comment only
+    ?_assertEqual({ok, []},
+                  parse(
+                    ";"
+                   )),
+    ?_assertEqual({ok, []},
+                  parse(
+                    ";    "
+                   )),
+    ?_assertEqual({ok, []},
+                  parse(
+                    "; comment"
+                   )),
+    ?_assertEqual({ok, []},
+                  parse(
+                    "; comment in Japanese 日本語"
+                   )),
     %% Title only
     ?_assertEqual({ok, [
                         {title, []}
@@ -238,6 +255,14 @@ one_section_title_and_one_prop_test_() ->
                     "[title]  \n"
                     "key1=va[lu]e1\n"
                    )),
+    %% value has < and > chars
+    ?_assertEqual({ok, [
+                        {title, [{key1, <<"va<lu>e1">>}]}
+                       ]},
+                  parse(
+                    "[title]  \n"
+                    "key1=va<lu>e1\n"
+                   )),
     %% value has ; char
     ?_assertEqual({ok, [
                         {title, [{key1, <<"value1;continue">>}]}