diff options
Diffstat (limited to 'src/yuescript/yue_parser.cpp')
-rw-r--r-- | src/yuescript/yue_parser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp index cf3da01..7cf2ebe 100644 --- a/src/yuescript/yue_parser.cpp +++ b/src/yuescript/yue_parser.cpp | |||
@@ -199,20 +199,20 @@ YueParser::YueParser() { | |||
199 | 199 | ||
200 | macro_name_pair = Space >> MacroName >> Space >> symx(':') >> Space >> MacroName; | 200 | macro_name_pair = Space >> MacroName >> Space >> symx(':') >> Space >> MacroName; |
201 | import_all_macro = expr('$'); | 201 | import_all_macro = expr('$'); |
202 | ImportTabItem = variable_pair | normal_pair | sym(':') >> MacroName | macro_name_pair | Space >> import_all_macro; | 202 | ImportTabItem = variable_pair | normal_pair | sym(':') >> MacroName | macro_name_pair | Space >> import_all_macro | Exp; |
203 | ImportTabList = ImportTabItem >> *(sym(',') >> ImportTabItem); | 203 | ImportTabList = ImportTabItem >> *(sym(',') >> ImportTabItem); |
204 | ImportTabLine = ( | 204 | ImportTabLine = ( |
205 | PushIndent >> (ImportTabList >> PopIndent | PopIndent) | 205 | PushIndent >> (ImportTabList >> PopIndent | PopIndent) |
206 | ) | Space; | 206 | ) | Space; |
207 | import_tab_lines = SpaceBreak >> ImportTabLine >> *(-sym(',') >> SpaceBreak >> ImportTabLine) >> -sym(','); | 207 | import_tab_lines = SpaceBreak >> ImportTabLine >> *(-sym(',') >> SpaceBreak >> ImportTabLine) >> -sym(','); |
208 | ImportTabLit = | 208 | ImportTabLit = |
209 | sym('{') >> Seperator >> | 209 | Seperator >> (sym('{') >> |
210 | -ImportTabList >> | 210 | -ImportTabList >> |
211 | -sym(',') >> | 211 | -sym(',') >> |
212 | -import_tab_lines >> | 212 | -import_tab_lines >> |
213 | White >> sym('}'); | 213 | White >> sym('}') | KeyValue >> *(sym(',') >> KeyValue)); |
214 | 214 | ||
215 | ImportAs = ImportLiteral >> -(key("as") >> (Space >> Variable | ImportTabLit)); | 215 | ImportAs = ImportLiteral >> -(key("as") >> (ImportTabLit | Space >> Variable)); |
216 | 216 | ||
217 | Import = key("import") >> (ImportAs | ImportFrom); | 217 | Import = key("import") >> (ImportAs | ImportFrom); |
218 | 218 | ||