Fixed more error messages.

Author: pigpigyyy

spec/inputs/import.yue

@@ -23,7 +23,7 @@ do
 		b, c from z
 
 do
-	import a
+	import a,
 		b
 		c from z
 

spec/inputs/unicode/import.yue

@@ -23,7 +23,7 @@ do
 		字段b, 字段c from 对象z
 
 do
-	import 字段a
+	import 字段a,
 		字段b
 		字段c from 对象z
 

src/yuescript/yue_ast.cpp

@@ -594,7 +594,7 @@ std::string Repeat_t::to_string(void* ud) const {
 std::string ForStepValue_t::to_string(void* ud) const {
 	return value->to_string(ud);
 }
-std::string For_t::to_string(void* ud) const {
+std::string ForNum_t::to_string(void* ud) const {
 	auto info = reinterpret_cast<YueFormat*>(ud);
 	auto line = "for "s + varName->to_string(ud) + " = "s + startValue->to_string(ud) + ", "s + stopValue->to_string(ud);
 	if (stepValue) {
@@ -633,6 +633,9 @@ std::string ForEach_t::to_string(void* ud) const {
 		return line + '\n' + block;
 	}
 }
+std::string For_t::to_string(void* ud) const {
+	return forLoop->to_string(ud);
+}
 std::string Do_t::to_string(void* ud) const {
 	auto info = reinterpret_cast<YueFormat*>(ud);
 	if (body->content.is<Statement_t>()) {
@@ -784,7 +787,7 @@ static bool isInBlockExp(ast_node* node, bool last = false) {
 	return false;
 }
 std::string Comprehension_t::to_string(void* ud) const {
-	if (items.size() != 2 || !ast_is<CompInner_t>(items.back())) {
+	if (items.size() != 2 || !ast_is<CompFor_t>(items.back())) {
 		if (items.size() == 1) {
 			str_list temp;
 			for (const auto& item : items.objects()) {
@@ -851,14 +854,14 @@ std::string StarExp_t::to_string(void* ud) const {
 std::string CompForEach_t::to_string(void* ud) const {
 	return "for "s + nameList->to_string(ud) + " in "s + loopValue->to_string(ud);
 }
-std::string CompFor_t::to_string(void* ud) const {
+std::string CompForNum_t::to_string(void* ud) const {
 	auto line = "for "s + varName->to_string(ud) + " = "s + startValue->to_string(ud) + ", "s + stopValue->to_string(ud);
 	if (stepValue) {
 		line += stepValue->to_string(ud);
 	}
 	return line;
 }
-std::string CompInner_t::to_string(void* ud) const {
+std::string CompFor_t::to_string(void* ud) const {
 	str_list temp;
 	for (auto item : items.objects()) {
 		if (ast_is<Exp_t>(item)) {

src/yuescript/yue_ast.h

@@ -68,7 +68,7 @@ class Statement_t;
 class Body_t;
 class AssignableNameList_t;
 class StarExp_t;
-class CompInner_t;
+class CompFor_t;
 class AssignableChain_t;
 class UnaryExp_t;
 class Parens_t;
@@ -358,14 +358,14 @@ AST_NODE(ForStepValue)
 	AST_MEMBER(ForStepValue, &value)
 AST_END(ForStepValue)
 
-AST_NODE(For)
+AST_NODE(ForNum)
 	ast_ptr<true, Variable_t> varName;
 	ast_ptr<true, Exp_t> startValue;
 	ast_ptr<true, Exp_t> stopValue;
 	ast_ptr<false, ForStepValue_t> stepValue;
 	ast_sel<true, Block_t, Statement_t> body;
-	AST_MEMBER(For, &varName, &startValue, &stopValue, &stepValue, &body)
-AST_END(For)
+	AST_MEMBER(ForNum, &varName, &startValue, &stopValue, &stepValue, &body)
+AST_END(ForNum)
 
 AST_NODE(ForEach)
 	ast_ptr<true, AssignableNameList_t> nameList;
@@ -374,6 +374,11 @@ AST_NODE(ForEach)
 	AST_MEMBER(ForEach, &nameList, &loopValue, &body)
 AST_END(ForEach)
 
+AST_NODE(For)
+	ast_sel<true, ForEach_t, ForNum_t> forLoop;
+	AST_MEMBER(For, &forLoop)
+AST_END(For)
+
 AST_NODE(Do)
 	ast_ptr<true, Body_t> body;
 	AST_MEMBER(Do, &body)
@@ -394,7 +399,7 @@ AST_END(Try)
 
 AST_NODE(Comprehension)
 	ast_ptr<true, Seperator_t> sep;
-	ast_sel_list<false, NormalDef_t, SpreadListExp_t, CompInner_t,
+	ast_sel_list<false, NormalDef_t, SpreadListExp_t, CompFor_t,
 		/*non-syntax-rule*/ Statement_t> items;
 	AST_MEMBER(Comprehension, &sep, &items)
 AST_END(Comprehension)
@@ -407,7 +412,7 @@ AST_END(CompValue)
 AST_NODE(TblComprehension)
 	ast_ptr<true, Exp_t> key;
 	ast_ptr<false, CompValue_t> value;
-	ast_ptr<true, CompInner_t> forLoop;
+	ast_ptr<true, CompFor_t> forLoop;
 	AST_MEMBER(TblComprehension, &key, &value, &forLoop)
 AST_END(TblComprehension)
 
@@ -422,19 +427,19 @@ AST_NODE(CompForEach)
 	AST_MEMBER(CompForEach, &nameList, &loopValue)
 AST_END(CompForEach)
 
-AST_NODE(CompFor)
+AST_NODE(CompForNum)
 	ast_ptr<true, Variable_t> varName;
 	ast_ptr<true, Exp_t> startValue;
 	ast_ptr<true, Exp_t> stopValue;
 	ast_ptr<false, ForStepValue_t> stepValue;
-	AST_MEMBER(CompFor, &varName, &startValue, &stopValue, &stepValue)
-AST_END(CompFor)
+	AST_MEMBER(CompForNum, &varName, &startValue, &stopValue, &stepValue)
+AST_END(CompForNum)
 
-AST_NODE(CompInner)
+AST_NODE(CompFor)
 	ast_ptr<true, Seperator_t> sep;
-	ast_sel_list<true, CompFor_t, CompForEach_t, Exp_t> items;
-	AST_MEMBER(CompInner, &sep, &items)
-AST_END(CompInner)
+	ast_sel_list<true, CompForNum_t, CompForEach_t, Exp_t> items;
+	AST_MEMBER(CompFor, &sep, &items)
+AST_END(CompFor)
 
 AST_NODE(Assign)
 	ast_ptr<true, Seperator_t> sep;
@@ -553,7 +558,7 @@ AST_NODE(SimpleValue)
 	ast_sel<true,
 		TableLit_t, ConstValue_t,
 		If_t, Switch_t, With_t, ClassDecl_t,
-		ForEach_t, For_t, While_t, Repeat_t,
+		For_t, While_t, Repeat_t,
 		Do_t, Try_t, UnaryValue_t,
 		TblComprehension_t, Comprehension_t,
 		FunLit_t, Num_t, VarArg_t> value;
@@ -919,7 +924,7 @@ AST_NODE(PipeBody)
 AST_END(PipeBody)
 
 AST_NODE(StatementAppendix)
-	ast_sel<true, IfLine_t, WhileLine_t, CompInner_t> item;
+	ast_sel<true, IfLine_t, WhileLine_t, CompFor_t> item;
 	AST_MEMBER(StatementAppendix, &item)
 AST_END(StatementAppendix)
 
@@ -949,7 +954,7 @@ AST_END(ChainAssign)
 
 AST_NODE(Statement)
 	ast_sel<true,
-		Import_t, While_t, Repeat_t, For_t, ForEach_t,
+		Import_t, While_t, Repeat_t, For_t,
 		Return_t, Local_t, Global_t, Export_t, Macro_t, MacroInPlace_t,
 		BreakLoop_t, Label_t, Goto_t, ShortTabAppending_t,
 		Backcall_t, LocalAttrib_t, PipeBody_t, ExpListAssign_t, ChainAssign_t