style: 修改了部分枚举体成员名

vmcore/include/statement.h

@@ -34,7 +34,7 @@ struct Statement{
         import_file,
         from_import_file,
         default_var,
-        assert,
+        assert_,
         label_,
         goto_,
     } type;
@@ -86,7 +86,7 @@ struct Statement{
                 OPT_ASS = 5,
                 OPT_POINT = 6,  // 成员运算
                 OPT_BLOCK = 7,  // 代码块
-                OPT_LINK = 8,  // 获取外部成员 TODO-szh 该名为OUTPOINT
+                OPT_OUTPOINT = 8,  // 获取外部成员 TODO-szh 该名为OUTPOINT
                 OPT_INTDIV = 9,
                 OPT_MOD = 10,
                 OPT_POW = 11,

vmcore/parser/grammar.c

@@ -191,7 +191,7 @@ void parserCommand(P_FUNC){
             break;
         case MATHER_ASSERT :
             status = commandCallControl_(CP_FUNC, makeAssertStatement, T_ASSERT, &st, true,
-                                         "parserAssert: Don't get conditions after assert");
+                                         "parserAssert: Don't get conditions after assert_");
             break;
         case MATHER_INCLUDE :
             status = commandCallControl_(CP_FUNC, makeIncludeStatement, T_INCLUDE, &st, true,
@@ -1446,7 +1446,7 @@ bool taliLink(P_FUNC, Token *left_token, Statement **st){
     delToken(pm);
     if (!callChildStatement(CP_FUNC, parserNegate, T_NEGATE, &right_st, "Don't get a Negate after link"))
         return false;
-    *st = makeOperationStatement(OPT_LINK, left_token->data.st, right_st);
+    *st = makeOperationStatement(OPT_OUTPOINT, left_token->data.st, right_st);
     return true;
 }
 

vmcore/parser/syntax.c

@@ -417,7 +417,7 @@ int getMatherStatus(LexFile *file, LexMathers *mathers) {
         strMatherMacro(MATHER_LINK, "->");
         strMatherMacro(MATHER_RAISE, "raise");
         strMatherMacro(MATHER_FROM, "from");
-        strMatherMacro(MATHER_ASSERT, "assert");
+        strMatherMacro(MATHER_ASSERT, "assert_");
         strMatherMacro(MATHER_LAMBDA, "lambda");
         strMatherMacro(MATHER_GOTO, "goto");
         strMatherMacro(MATHER_LABEL, "label");

vmcore/src/run.c

@@ -97,7 +97,7 @@ ResultType runStatement(FUNC) {
         case default_var:
             type = setDefault(CNEXT);
             break;
-        case assert:
+        case assert_:
             type = assertCode(CNEXT);
             break;
         case goto_:

vmcore/src/runoperation.c

@@ -59,7 +59,7 @@ ResultType operationStatement(FUNC) {
         case OPT_ASS:
             assOperation(CNEXT);
             break;
-        case OPT_LINK:
+        case OPT_OUTPOINT:
         case OPT_POINT:
             pointOperation(CNEXT);
             break;
@@ -180,7 +180,7 @@ ResultType pointOperation(FUNC) {
 
     if (st->u.operation.OperationType == OPT_POINT)
         object = left->value->object.var;
-    else if (st->u.operation.OperationType == OPT_LINK)
+    else if (st->u.operation.OperationType == OPT_OUTPOINT)
         object = left->value->object.out_var;
 
     if (object == NULL) {
@@ -215,7 +215,7 @@ ResultType delCore(Statement *name, bool check_aut, FUNC_NT) {
         listDel(name, CNEXT_NT);
     else if (name->type == slice_)
         downDel(name, CNEXT_NT);
-    else if (name->type == operation && (name->u.operation.OperationType == OPT_POINT || name->u.operation.OperationType == OPT_LINK))
+    else if (name->type == operation && (name->u.operation.OperationType == OPT_POINT || name->u.operation.OperationType == OPT_OUTPOINT))
         pointDel(name, CNEXT_NT);
     else
         varDel(name, check_aut, CNEXT_NT);
@@ -275,7 +275,7 @@ ResultType pointDel(Statement *name, FUNC_NT) {
     }
 
     gc_freeze(inter, var_list, object, true);
-    if (right->type == T_OPERATION && (right->u.operation.OperationType == OPT_POINT || right->u.operation.OperationType == OPT_LINK))
+    if (right->type == T_OPERATION && (right->u.operation.OperationType == OPT_POINT || right->u.operation.OperationType == OPT_OUTPOINT))
         pointDel(name->u.operation.right, CFUNC_NT(object, result, belong));
     else
         delCore(name->u.operation.right, true, CFUNC_NT(object, result, belong));
@@ -359,7 +359,7 @@ ResultType assCore(Statement *name, LinkValue *value, bool check_aut, bool setti
         listAss(name, value, CNEXT_NT);
     else if (name->type == slice_)
         downAss(name, value, CNEXT_NT);
-    else if (name->type == operation && (name->u.operation.OperationType == OPT_POINT || name->u.operation.OperationType == OPT_LINK))
+    else if (name->type == operation && (name->u.operation.OperationType == OPT_POINT || name->u.operation.OperationType == OPT_OUTPOINT))
         pointAss(name, value, CNEXT_NT);
     else
         varAss(name, value, check_aut, setting, CNEXT_NT);
@@ -498,7 +498,7 @@ ResultType pointAss(Statement *name, LinkValue *value, FUNC_NT) {
     }
 
     gc_freeze(inter, var_list, object, true);
-    if (right->type == T_OPERATION && (right->u.operation.OperationType == OPT_POINT || right->u.operation.OperationType == OPT_LINK))
+    if (right->type == T_OPERATION && (right->u.operation.OperationType == OPT_POINT || right->u.operation.OperationType == OPT_OUTPOINT))
         pointAss(name->u.operation.right, value, CFUNC_NT(object, result, belong));
     else
         assCore(name->u.operation.right, value, true, false, CFUNC_NT(object, result, belong));

vmcore/src/statement.c

@@ -293,7 +293,7 @@ Statement *makeRaiseStatement(Statement *value, fline line, char *file){
 
 Statement *makeAssertStatement(Statement *conditions, fline line, char *file){
     Statement *tmp = makeStatement(line, file);
-    tmp->type = assert;
+    tmp->type = assert_;
     tmp->u.assert.conditions = conditions;
     return tmp;
 }
@@ -487,7 +487,7 @@ void freeStatement(Statement *st){
             case default_var:
                 freeParameter(st->u.default_var.var, true);
                 break;
-            case assert:
+            case assert_:
                 freeStatement(st->u.assert.conditions);
                 break;
             case label_:
@@ -657,7 +657,7 @@ Statement *copyStatementCore(Statement *st){
         case default_var:
             new->u.default_var.var = copyParameter(st->u.default_var.var);
             break;
-        case assert:
+        case assert_:
             new->u.assert.conditions = copyStatement(st->u.assert.conditions);
             break;
         case label_: