1 files changed, 14 insertions, 13 deletions

diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 0d9a183..758865e 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -406,10 +406,10 @@ YueParser::YueParser() {
         simple_table = Seperator >> KeyValue >> *(sym(',') >> KeyValue);
         Value = SimpleValue | simple_table | ChainValue | Space >> String;
 
-        single_string_inner = expr("\\'") | "\\\\" | not_(expr('\'')) >> Any;
+        single_string_inner = expr('\\') >> set("'\\") | not_(expr('\'')) >> Any;
         SingleString = symx('\'') >> *single_string_inner >> symx('\'');
         interp = symx("#{") >> Exp >> sym('}');
-        double_string_plain = expr("\\\"") | "\\\\" | not_(expr('"')) >> Any;
+        double_string_plain = expr('\\') >> set("\"\\") | not_(expr('"')) >> Any;
         double_string_inner = +(not_(interp) >> double_string_plain);
         double_string_content = double_string_inner | interp;
         DoubleString = symx('"') >> Seperator >> *double_string_content >> symx('"');
@@ -484,7 +484,13 @@ YueParser::YueParser() {
 
         SpreadExp = sym("...") >> Exp;
 
-        TableValue = ((KeyValue | SpreadExp | Exp) >> not_(sym('='))) | meta_default_pair | default_pair;
+        TableValue =
+                variable_pair_def |
+                normal_pair_def |
+                meta_variable_pair_def |
+                meta_normal_pair_def |
+                SpreadExp |
+                normal_def;
 
         table_lit_lines = SpaceBreak >> TableLitLine >> *(-sym(',') >> SpaceBreak >> TableLitLine) >> -sym(',');
 
@@ -564,21 +570,16 @@ YueParser::YueParser() {
         symx(':') >> not_(':') >>
         (Exp | TableBlock | +SpaceBreak >> Exp);
 
-        default_pair = (
-                sym(':') >> Variable >> Seperator |
-                KeyName >> symx(':') >> not_(':') >> Seperator >> exp_not_tab |
-                Space >> String >> symx(':') >> not_(':') >> Seperator >> exp_not_tab |
-                exp_not_tab >> Seperator) >> sym('=') >> Exp;
-
         meta_variable_pair = sym(":<") >> Space >> Variable >> sym('>');
 
         meta_normal_pair = sym('<') >> Space >> -meta_index >> sym(">:") >>
                 (Exp | TableBlock | +(SpaceBreak) >> Exp);
 
-        meta_default_pair = (
-                sym(":<") >> Space >> Variable >> sym('>') >> Seperator |
-                sym('<') >> Space >> -meta_index >> sym(">:") >> Seperator >> exp_not_tab
-        ) >> sym('=') >> Exp;
+        variable_pair_def = variable_pair >> -(sym('=') >> Exp);
+        normal_pair_def = normal_pair >> -(sym('=') >> Exp);
+        meta_variable_pair_def = meta_variable_pair >> -(sym('=') >> Exp);
+        meta_normal_pair_def = meta_normal_pair >> -(sym('=') >> Exp);
+        normal_def = Exp >> Seperator >> -(sym('=') >> Exp);
 
         KeyValue = variable_pair | normal_pair | meta_variable_pair | meta_normal_pair;
         KeyValueList = KeyValue >> *(sym(',') >> KeyValue);