SongZihuan 3 лет назад
Родитель
Сommit
0ff6b1dc85
6 измененных файлов с 15 добавлено и 15 удалено
  1. 3 3
      include/core/README
  2. 1 1
      include/core/env.h
  3. 2 2
      include/core/var.h
  4. 3 3
      src/core/env.c
  5. 4 4
      src/core/run.c
  6. 2 2
      src/core/var.c

+ 3 - 3
include/core/README

@@ -172,8 +172,8 @@ af_VarSpaceListNode 描述变量空间链
 * setVarToVarSpace
 * setVarToVarList
 * pushNewVarList
-* setVarPermison
-* setVarSpacePermison
+* setVarPermissions
+* setVarSpacePermissions
 * setVarSpaceProtect
 
 属性访问
@@ -197,7 +197,7 @@ af_ErrorInfo 描述错误信息
 * freeMessageCount
 * makeNORMALMessage
 * makeERRORMessage
-* makeERRORMessageFormate
+* makeERRORMessageFormat
 * makeErrorInfo
 * freeErrorInfo
 

+ 1 - 1
include/core/env.h

@@ -31,7 +31,7 @@ AFUN_CORE_EXPORT af_Message *freeMessage(af_Message *msg);
 AFUN_CORE_EXPORT bool freeMessageCount(size_t count, af_Message *msg);
 AFUN_CORE_EXPORT af_Message *makeNORMALMessage(af_Object *obj);
 AFUN_CORE_EXPORT af_Message *makeERRORMessage(char *type, char *error, af_Environment *env);
-AFUN_CORE_EXPORT af_Message *makeERRORMessageFormate(char *type, af_Environment *env, const char *formate, ...);
+AFUN_CORE_EXPORT af_Message *makeERRORMessageFormat(char *type, af_Environment *env, const char *format, ...);
 
 /* ErrorInfo 创建与释放 */
 AFUN_CORE_EXPORT af_ErrorInfo *makeErrorInfo(char *type, char *error, char *note, FileLine line, FilePath path);

+ 2 - 2
include/core/var.h

@@ -29,8 +29,8 @@ AFUN_CORE_EXPORT bool makeVarToVarSpace(char *name, char p_self, char p_posterit
                                         af_Object *visitor, af_Environment *env);
 AFUN_CORE_EXPORT bool delVarFromVarSpace(char *name, af_Object *visitor, af_VarSpace *vs);
 AFUN_CORE_EXPORT bool setVarToVarSpace(char *name, af_Object *obj, af_Object *visitor, af_VarSpace *vs);
-AFUN_CORE_EXPORT void setVarPermison(af_Var *var, af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external);
-AFUN_CORE_EXPORT void setVarSpacePermison(af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external);
+AFUN_CORE_EXPORT void setVarPermissions(af_Var *var, af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external);
+AFUN_CORE_EXPORT void setVarSpacePermissions(af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external);
 AFUN_CORE_EXPORT bool setVarSpaceProtect(af_Object *visitor, af_VarSpace *vs, char protect);
 
 /* 变量空间链 相关操作 */

+ 3 - 3
src/core/env.c

@@ -481,11 +481,11 @@ af_Message *makeERRORMessage(char *type, char *error, af_Environment *env) {
     return msg;
 }
 
-af_Message *makeERRORMessageFormate(char *type, af_Environment *env, const char *formate, ...) {
+af_Message *makeERRORMessageFormat(char *type, af_Environment *env, const char *format, ...) {
     char buf[1024];
     va_list ap;
-    va_start(ap, formate);
-    vsnprintf(buf, 1024, formate, ap);
+    va_start(ap, format);
+    vsnprintf(buf, 1024, format, ap);
     va_end(ap);
     return makeERRORMessage(type, buf, env);;
 }

+ 4 - 4
src/core/run.c

@@ -139,7 +139,7 @@ static bool codeElement(af_Code *code, af_Environment *env) {
             var = findVarFromVarList(func, env->activity->belong, env->activity->vsl);
 
         if (var == NULL) {
-            pushMessageDown(makeERRORMessageFormate(LITERAL_ERROR, env, "Literal not found: %s.", code->element.data), env);
+            pushMessageDown(makeERRORMessageFormat(LITERAL_ERROR, env, "Literal not found: %s.", code->element.data), env);
             return false;
         }
 
@@ -150,7 +150,7 @@ static bool codeElement(af_Code *code, af_Environment *env) {
     var = findVarFromVarList(code->element.data, env->activity->belong, env->activity->vsl);
 
     if (var == NULL) {
-        pushMessageDown(makeERRORMessageFormate(VARIABLE_ERROR, env, "Variable not found: %s.", code->element.data), env);
+        pushMessageDown(makeERRORMessageFormat(VARIABLE_ERROR, env, "Variable not found: %s.", code->element.data), env);
         return false;
     }
 
@@ -163,8 +163,8 @@ static bool codeElement(af_Code *code, af_Environment *env) {
             return pushVariableActivity(code, var->vn->obj, env);  // 对象函数
         else if (env->activity->status != act_func_get && // 在act_func_get 模式下不检查是否为is_infix函数 因为本来就要将其作为函数调用
                  (is_infix = findAPI("obj_isInfixFunc", obj->data->api)) != NULL && is_infix(obj)) {
-            pushMessageDown(makeERRORMessageFormate(INFIX_PROTECT, env,
-                                                    "Infix protect variable: %s.", code->element.data), env);
+            pushMessageDown(makeERRORMessageFormat(INFIX_PROTECT, env,
+                                                   "Infix protect variable: %s.", code->element.data), env);
             return false;
         }
     }

+ 2 - 2
src/core/var.c

@@ -445,7 +445,7 @@ af_VarSpaceListNode *pushNewVarList(af_Object *belong, af_VarSpaceListNode *base
     return new;
 }
 
-void setVarPermison(af_Var *var, af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external) {
+void setVarPermissions(af_Var *var, af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external) {
     if (vs->belong->data != visitor->data)
         return;
     var->permissions[0] = p_self;
@@ -453,7 +453,7 @@ void setVarPermison(af_Var *var, af_Object *visitor, af_VarSpace *vs, char p_sel
     var->permissions[2] = p_external;
 }
 
-void setVarSpacePermison(af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external) {
+void setVarSpacePermissions(af_Object *visitor, af_VarSpace *vs, char p_self, char p_posterity, char p_external) {
     if (vs->belong->data != visitor->data)
         return;
     vs->permissions[0] = p_self;