diff options
author | Li Jin <dragon-fly@qq.com> | 2022-02-08 09:37:28 +0800 |
---|---|---|
committer | Li Jin <dragon-fly@qq.com> | 2022-02-08 09:37:28 +0800 |
commit | d22ae154b57ac80107020e98f04f76fffaa9cd90 (patch) | |
tree | 17da62ceeed4d736bef5c04d328015c4350df92d /src | |
parent | b933fbfce34e9afc798e6882a96586b496ac432f (diff) | |
download | yuescript-d22ae154b57ac80107020e98f04f76fffaa9cd90.tar.gz yuescript-d22ae154b57ac80107020e98f04f76fffaa9cd90.tar.bz2 yuescript-d22ae154b57ac80107020e98f04f76fffaa9cd90.zip |
fix issue #76.
Diffstat (limited to 'src')
-rwxr-xr-x | src/yuescript/yue_compiler.cpp | 2 | ||||
-rwxr-xr-x | src/yuescript/yue_parser.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp index 3852f32..2da72da 100755 --- a/src/yuescript/yue_compiler.cpp +++ b/src/yuescript/yue_compiler.cpp | |||
@@ -60,7 +60,7 @@ using namespace parserlib; | |||
60 | 60 | ||
61 | typedef std::list<std::string> str_list; | 61 | typedef std::list<std::string> str_list; |
62 | 62 | ||
63 | const std::string_view version = "0.9.5"sv; | 63 | const std::string_view version = "0.9.6"sv; |
64 | const std::string_view extension = "yue"sv; | 64 | const std::string_view extension = "yue"sv; |
65 | 65 | ||
66 | class YueCompilerImpl { | 66 | class YueCompilerImpl { |
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp index 772fc2f..e171f3f 100755 --- a/src/yuescript/yue_parser.cpp +++ b/src/yuescript/yue_parser.cpp | |||
@@ -195,7 +195,7 @@ YueParser::YueParser() { | |||
195 | 195 | ||
196 | macro_name_pair = Space >> MacroName >> Space >> symx(':') >> Space >> MacroName; | 196 | macro_name_pair = Space >> MacroName >> Space >> symx(':') >> Space >> MacroName; |
197 | import_all_macro = expr('$'); | 197 | import_all_macro = expr('$'); |
198 | ImportTabItem = variable_pair | normal_pair | sym(':') >> MacroName | macro_name_pair | Space >> import_all_macro | Exp; | 198 | ImportTabItem = variable_pair | normal_pair | sym(':') >> MacroName | macro_name_pair | Space >> import_all_macro | meta_variable_pair | meta_normal_pair | Exp; |
199 | ImportTabList = ImportTabItem >> *(sym(',') >> ImportTabItem); | 199 | ImportTabList = ImportTabItem >> *(sym(',') >> ImportTabItem); |
200 | ImportTabLine = ( | 200 | ImportTabLine = ( |
201 | PushIndent >> (ImportTabList >> PopIndent | PopIndent) | 201 | PushIndent >> (ImportTabList >> PopIndent | PopIndent) |
@@ -542,7 +542,7 @@ YueParser::YueParser() { | |||
542 | meta_normal_pair = Space >> -(Name | symx('[') >> Exp >> sym(']')) >> expr("#:") >> | 542 | meta_normal_pair = Space >> -(Name | symx('[') >> Exp >> sym(']')) >> expr("#:") >> |
543 | (Exp | TableBlock | +(SpaceBreak) >> Exp); | 543 | (Exp | TableBlock | +(SpaceBreak) >> Exp); |
544 | 544 | ||
545 | meta_default_pair = (sym(':') >> Variable >> expr('#') >> Seperator | -Name >> expr("#:") >> Seperator >> Exp) >> sym('=') >> Exp; | 545 | meta_default_pair = (sym(':') >> Variable >> expr('#') >> Seperator | Space >> -Name >> expr("#:") >> Seperator >> Exp) >> sym('=') >> Exp; |
546 | 546 | ||
547 | KeyValue = variable_pair | normal_pair | meta_variable_pair | meta_normal_pair; | 547 | KeyValue = variable_pair | normal_pair | meta_variable_pair | meta_normal_pair; |
548 | KeyValueList = KeyValue >> *(sym(',') >> KeyValue); | 548 | KeyValueList = KeyValue >> *(sym(',') >> KeyValue); |