fix cpp utf8 literals issue.

IppClub · Oct 18, 2023 · d947516 · d947516
1 parent 267fbb2
commit d947516
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 76 deletions.
diff --git a/Source/3rdParty/yuescript/yue_compiler.cpp b/Source/3rdParty/yuescript/yue_compiler.cpp
@@ -74,7 +74,7 @@ static std::unordered_set<std::string> Metamethods = {
 	"close"s // Lua 5.4
 };
 
-const std::string_view version = "0.19.5"sv;
+const std::string_view version = "0.19.6"sv;
 const std::string_view extension = "yue"sv;
 
 class CompileError : public std::logic_error {

diff --git a/Source/3rdParty/yuescript/yue_parser.cpp b/Source/3rdParty/yuescript/yue_parser.cpp
@@ -286,7 +286,9 @@ YueParser::YueParser() {
 	import_name = ColonImportName | Variable;
 	import_name_list = Seperator >> *space_break >> space >> import_name >> *((+space_break | space >> ',' >> *space_break) >> space >> import_name);
 	ImportFrom = import_name_list >> *space_break >> space >> key("from") >> space >> (ImportLiteral | not_(String) >> Exp);
-	FromImport = key("from") >> space >> (ImportLiteral | not_(String) >> Exp) >> *space_break >> space >> key("import") >> space >> import_name_list;
+	from_import_name_list_line = import_name >> *(space >> ',' >> space >> import_name);
+	from_import_name_in_block = +space_break >> advance_match >> ensure(space >> from_import_name_list_line >> *(-(space >> ',') >> +space_break >> check_indent_match >> space >> from_import_name_list_line), pop_indent);
+	FromImport = key("from") >> space >> (ImportLiteral | not_(String) >> Exp) >> *space_break >> space >> key("import") >> space >> Seperator >> (from_import_name_list_line >> -(space >> ',') >> -from_import_name_in_block | from_import_name_in_block);
 
 	ImportLiteralInner = (range('a', 'z') | range('A', 'Z') | set("_-") | larger(255)) >> *(alpha_num | '-' | larger(255));
 	import_literal_chain = Seperator >> ImportLiteralInner >> *('.' >> ImportLiteralInner);

diff --git a/Source/3rdParty/yuescript/yue_parser.h b/Source/3rdParty/yuescript/yue_parser.h
@@ -177,6 +177,8 @@ class YueParser {
 	NONE_AST_RULE(in_block);
 	NONE_AST_RULE(import_name);
 	NONE_AST_RULE(import_name_list);
+	NONE_AST_RULE(from_import_name_list_line);
+	NONE_AST_RULE(from_import_name_in_block);
 	NONE_AST_RULE(import_literal_chain);
 	NONE_AST_RULE(import_tab_item);
 	NONE_AST_RULE(import_tab_list);