update Yuescript. [skip CI]

IppClub · Nov 18, 2023 · 8ec0858 · 8ec0858
1 parent 9cf40ab
commit 8ec0858
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/Source/3rdParty/yuescript/yue_compiler.cpp b/Source/3rdParty/yuescript/yue_compiler.cpp
@@ -75,7 +75,7 @@ static std::unordered_set<std::string> Metamethods = {
 	"close"s // Lua 5.4
 };
 
-const std::string_view version = "0.20.6"sv;
+const std::string_view version = "0.20.7"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
@@ -617,11 +617,21 @@ YueParser::YueParser() {
 
 	Parens = '(' >> *space_break >> space >> Exp >> *space_break >> space >> ')';
 	Callable = Variable | SelfItem | MacroName | Parens;
-	fn_args_exp_list = space >> Exp >> space >> *((line_break | ',') >> white >> Exp);
+
+	fn_args_value_list = Exp >> *(space >> ',' >> space >> Exp);
+
+	fn_args_lit_line = (
+		push_indent_match >> (space >> fn_args_value_list >> pop_indent | pop_indent)
+	) | (
+		space
+	);
+
+	fn_args_lit_lines = space_break >> fn_args_lit_line >> *(-(space >> ',') >> space_break >> fn_args_lit_line) >> -(space >> ',');
 
 	fn_args =
-		'(' >> *space_break >> -fn_args_exp_list >> *space_break >> space >> ')' |
-		space >> '!' >> not_('=');
+		'(' >> -(space >> fn_args_value_list >> -(space >> ',')) >>
+		-fn_args_lit_lines >>
+		white >> ')' | space >> '!' >> not_('=');
 
 	meta_index = Name | index | String;
 	Metatable = '<' >> space >> '>';
@@ -701,7 +711,7 @@ YueParser::YueParser() {
 	table_lit_lines = space_break >> table_lit_line >> *(-(space >> ',') >> space_break >> table_lit_line) >> -(space >> ',');
 
 	TableLit =
-		space >> '{' >> Seperator >>
+		'{' >> Seperator >>
 		-(space >> table_value_list >> -(space >> ',')) >>
 		-table_lit_lines >>
 		white >> '}';

diff --git a/Source/3rdParty/yuescript/yue_parser.h b/Source/3rdParty/yuescript/yue_parser.h
@@ -217,7 +217,9 @@ class YueParser {
 	NONE_AST_RULE(double_string_plain);
 	NONE_AST_RULE(lua_string_open);
 	NONE_AST_RULE(lua_string_close);
-	NONE_AST_RULE(fn_args_exp_list);
+	NONE_AST_RULE(fn_args_value_list);
+	NONE_AST_RULE(fn_args_lit_line);
+	NONE_AST_RULE(fn_args_lit_lines);
 	NONE_AST_RULE(fn_args);
 	NONE_AST_RULE(destruct_def);
 	NONE_AST_RULE(macro_args_def);