add support to import all macros from a module with symbol '$' in import-as statement.

fix import macro rename issue.

1 files changed, 27 insertions, 26 deletions

diff --git a/src/MoonP/moon_parser.cpp b/src/MoonP/moon_parser.cpp
index 41db324..6485e46 100644
--- a/src/MoonP/moon_parser.cpp
+++ b/src/MoonP/moon_parser.cpp
@@ -51,19 +51,23 @@ MoonParser::MoonParser() {
         EmptyLine = SpaceBreak;
         AlphaNum = range('a', 'z') | range('A', 'Z') | range('0', '9') | '_';
         Name = (range('a', 'z') | range('A', 'Z') | '_') >> *AlphaNum;
-        Num =
+        Decimal = (
+                (
+                        +range('0', '9') >> -('.' >> +range('0', '9'))
+                ) | (
+                        '.' >> +range('0', '9')
+                )
+        ) >> -(set("eE") >> -expr('-') >> +range('0', '9'));
+        Integer =
         (
                 "0x" >>
                 +(range('0', '9') | range('a', 'f') | range('A', 'F')) >>
                 -(-set("uU") >> set("lL") >> set("lL"))
         ) | (
                 +range('0', '9') >> -set("uU") >> set("lL") >> set("lL")
-        ) | (
-                (
-                        (+range('0', '9') >> -('.' >> +range('0', '9'))) |
-                        ('.' >> +range('0', '9'))
-                ) >> -(set("eE") >> -expr('-') >> +range('0', '9'))
         );
+        Num = Integer | Decimal;
+
         Cut = false_();
         Seperator = true_();
 
@@ -185,26 +189,28 @@ MoonParser::MoonParser() {
         colon_import_name = sym('\\') >> Space >> Variable;
         ImportName = colon_import_name | Space >> Variable;
         ImportNameList = Seperator >> *SpaceBreak >> ImportName >> *((+SpaceBreak | sym(',') >> *SpaceBreak) >> ImportName);
+        ImportFrom = ImportNameList >> *SpaceBreak >> key("from") >> Exp;
 
         import_literal_inner = (range('a', 'z') | range('A', 'Z') | set("_-")) >> *(AlphaNum | '-');
         import_literal_chain = Seperator >> import_literal_inner >> *(expr('.') >> import_literal_inner);
         ImportLiteral = sym('\'') >> import_literal_chain >> symx('\'') | sym('"') >> import_literal_chain >> symx('"');
 
-        ImportFrom = ImportNameList >> *SpaceBreak >> key("from") >> Exp;
-
-        EnableMacroPair = pl::user(true_(), [](const item_t& item) {
-                State* st = reinterpret_cast<State*>(item.user_data);
-                st->macroPairEnabled = true;
-                return true;
-        });
-
-        DiableMacroPair = pl::user(true_(), [](const item_t& item) {
-                State* st = reinterpret_cast<State*>(item.user_data);
-                st->macroPairEnabled = false;
-                return true;
-        });
+        macro_name_pair = Space >> MacroName >> Space >> symx(':') >> Space >> MacroName;
+        import_all_macro = expr('$');
+        ImportTabItem = variable_pair | normal_pair | sym(':') >> MacroName | macro_name_pair | Space >> import_all_macro;
+        ImportTabList = ImportTabItem >> *(sym(',') >> ImportTabItem);
+        ImportTabLine = (
+                PushIndent >> (ImportTabList >> PopIndent | PopIndent)
+        ) | Space;
+        import_tab_lines = SpaceBreak >> ImportTabLine >> *(-sym(',') >> SpaceBreak >> ImportTabLine) >> -sym(',');
+        ImportTabLit =
+                sym('{') >> Seperator >>
+                -ImportTabList >>
+                -sym(',') >>
+                -import_tab_lines >>
+                White >> sym('}');
 
-        ImportAs = ImportLiteral >> -(key("as") >> (Space >> Variable | EnableMacroPair >> ensure(TableLit, DiableMacroPair)));
+        ImportAs = ImportLiteral >> -(key("as") >> (Space >> Variable | ImportTabLit));
 
         Import = key("import") >> (ImportAs | ImportFrom);
 
@@ -483,12 +489,7 @@ MoonParser::MoonParser() {
         symx(':') >>
         (Exp | TableBlock | +(SpaceBreak) >> Exp);
 
-        macro_name_pair = Space >> MacroName >> Space >> symx(':') >> Space >> MacroName;
-
-        KeyValue = variable_pair | normal_pair | pl::user(sym(':') >> MacroName | macro_name_pair, [](const item_t& item) {
-                State* st = reinterpret_cast<State*>(item.user_data);
-                return st->macroPairEnabled;
-        });
+        KeyValue = variable_pair | normal_pair;
 
         KeyValueList = KeyValue >> *(sym(',') >> KeyValue);
         KeyValueLine = CheckIndent >> (KeyValueList >> -sym(',') | TableBlockIndent | Space >> expr('*') >> Exp);