style: 修复拼写错误

iherit->inherit

include/object.h

@@ -12,17 +12,17 @@ DEFINE_DLC_SYMBOL(pValueAPI, pAPIFUNC);
 #include "tool.h"
 
 /* 对象创建与释放函数 */
-af_Object *makeObject(char *id, size_t data_size, bool inherit_api, bool allow_iherit, af_Object *belong,
-                      af_Inherit *iherit, af_Environment *env);
+af_Object *makeObject(char *id, size_t data_size, bool inherit_api, bool allow_inherit, af_Object *belong,
+                      af_Inherit *inherit, af_Environment *env);
 void freeObject(af_Object *obj);
 
 /* 对象属性获取函数 */
 af_Object *getBelongObject(af_Object *object, af_Environment *env);
 
 /* 对象继承关系函数 */
-af_Inherit *makeIherit(af_Object *obj);
-af_Inherit *freeIherit(af_Inherit *ih);
-void freeAllIherit(af_Inherit *ih);
+af_Inherit *makeInherit(af_Object *obj);
+af_Inherit *freeInherit(af_Inherit *ih);
+void freeAllInherit(af_Inherit *ih);
 
 /* 对象API函数 */
 void *findObjectAPI(char *api_name, af_Object *obj);

src/core/__object.h

@@ -43,7 +43,7 @@ struct af_ObjectData {
     bool inherit_api;  // api被继承
 
     struct af_VarSpace *var_space;
-    struct af_Inherit *iherit;  // 只有顶级继承对象的iherit属性可为NULL
+    struct af_Inherit *inherit;  // 只有顶级继承对象的inherit属性可为NULL
 
     struct af_Object *base;  // 在gc机制中, 当对想要被释放前, 调用析构函数是对象以该base的身份出现
     GC_ObjectData gc;

src/core/env.c

@@ -98,11 +98,11 @@ static void checkInherit(af_Inherit **ih, af_Object *obj) {
         if ((*ih)->obj->data == obj->data) {
             if ((*ih)->next == NULL && (*ih)->obj == obj)  // 最后一个就是obj
                 return;  // 不需要任何更改
-            *ih = freeIherit(*ih);  // 释放该ih
+            *ih = freeInherit(*ih);  // 释放该ih
         } else
             ih = &((*ih)->next);
     }
-    *ih = makeIherit(obj);
+    *ih = makeInherit(obj);
 }
 
 static bool checkInheritAPI(af_ObjectData *od) {
@@ -112,10 +112,10 @@ static bool checkInheritAPI(af_ObjectData *od) {
     if (!od->inherit_api)
         return false;
 
-    if (od->iherit->obj->data->api == NULL && !checkInheritAPI(od->iherit->obj->data))
+    if (od->inherit->obj->data->api == NULL && !checkInheritAPI(od->inherit->obj->data))
         return false;
 
-    od->api = od->iherit->obj->data->api;
+    od->api = od->inherit->obj->data->api;
     return true;
 }
 
@@ -126,7 +126,7 @@ static bool enableCore(af_Core *core) {
     if (global == NULL || global->belong != NULL)
         return false;  // global未找到 或其有属对象
 
-    if (object == NULL || object->data->iherit != NULL || object->data->inherit_api || !object->data->allow_inherit)
+    if (object == NULL || object->data->inherit != NULL || object->data->inherit_api || !object->data->allow_inherit)
         return false;  // object未找到 或其继承自其他对象 或其使用继承api 或其不可被继承
 
     core->global = global;
@@ -145,7 +145,7 @@ static bool enableCore(af_Core *core) {
         last = od;
         if (od == object->data)
             continue;
-        checkInherit(&od->iherit, object);
+        checkInherit(&od->inherit, object);
     }
 
     // 先创造的obj在后面, 因此倒着遍历, 先遍历到的obj依赖少, 可以减少checkInheritAPI递归的深度

src/core/gc.c

@@ -118,7 +118,7 @@ static pgc_Analyzed reachableObjectData(struct af_ObjectData *od, pgc_Analyzed p
     if (!od->base->gc.info.reachable)
         plist = newObjectAnalyzed(od->base, plist);
 
-    for (af_Inherit *ih = od->iherit; ih != NULL; ih = ih->next) {
+    for (af_Inherit *ih = od->inherit; ih != NULL; ih = ih->next) {
         if (!ih->obj->gc.info.reachable)
             plist = newObjectAnalyzed(ih->obj, plist);
     }

src/core/object.c

@@ -3,8 +3,8 @@
 #include "tool.h"
 
 /* ObjectData 创建与释放 */
-static af_ObjectData *makeObjectData_Pri(char *id, size_t data_size, bool inherit_api, bool allow_iherit);
-static af_Object *makeObject_Pri(char *id, size_t data_size, bool inherit_api, bool allow_iherit);
+static af_ObjectData *makeObjectData_Pri(char *id, size_t data_size, bool inherit_api, bool allow_inherit);
+static af_Object *makeObject_Pri(char *id, size_t data_size, bool inherit_api, bool allow_inherit);
 
 /* ObjectData API 创建与释放 */
 static af_ObjectAPINode *makeObjectAPINode(DLC_SYMBOL(pAPIFUNC) func, char *api_name);
@@ -20,7 +20,7 @@ static af_ObjectAPI *makeObjectAPI(void);
 static void freeObjectAPI(af_ObjectAPI *api);
 
 
-static af_ObjectData *makeObjectData_Pri(char *id, size_t data_size, bool inherit_api, bool allow_iherit) {
+static af_ObjectData *makeObjectData_Pri(char *id, size_t data_size, bool inherit_api, bool allow_inherit) {
     af_ObjectData *od = calloc(sizeof(af_ObjectData), 1);
     od->id = strCopy(id == NULL ? "Unknow" : id);
 
@@ -33,20 +33,20 @@ static af_ObjectData *makeObjectData_Pri(char *id, size_t data_size, bool inheri
     else
         od->api = makeObjectAPI();
 
-    od->allow_inherit = allow_iherit;
+    od->allow_inherit = allow_inherit;
     od->inherit_api = inherit_api;
 
     od->var_space = makeVarSpace();
-    od->iherit = NULL;
+    od->inherit = NULL;
 
     od->base = NULL;
     return od;
 }
 
-static af_Object *makeObject_Pri(char *id, size_t data_size, bool inherit_api, bool allow_iherit) {
+static af_Object *makeObject_Pri(char *id, size_t data_size, bool inherit_api, bool allow_inherit) {
     af_Object *obj = calloc(sizeof(af_Object), 1);
     obj->belong = NULL;
-    obj->data = makeObjectData_Pri(id, data_size, inherit_api, allow_iherit);
+    obj->data = makeObjectData_Pri(id, data_size, inherit_api, allow_inherit);
     obj->data->base = obj;
     return obj;
 }
@@ -56,9 +56,9 @@ static af_Object *makeObject_Pri(char *id, size_t data_size, bool inherit_api, b
  * 目标: 生成Object和ObjectData, 并且添加到gc链表中
  * 若处于初始化模式, 则belong, inherit等可以设置为NULL, 由后期统一填上
  */
-af_Object *makeObject(char *id, size_t data_size, bool inherit_api, bool allow_iherit, af_Object *belong,
-                      af_Inherit *iherit, af_Environment *env) {
-    af_Object *obj = makeObject_Pri(id, data_size, inherit_api, allow_iherit);
+af_Object *makeObject(char *id, size_t data_size, bool inherit_api, bool allow_inherit, af_Object *belong,
+                      af_Inherit *inherit, af_Environment *env) {
+    af_Object *obj = makeObject_Pri(id, data_size, inherit_api, allow_inherit);
 
     if (env->core->in_init || belong != NULL)
         obj->belong = belong;
@@ -67,15 +67,15 @@ af_Object *makeObject(char *id, size_t data_size, bool inherit_api, bool allow_i
     else
         return NULL;
 
-    if (env->core->in_init || iherit != NULL)
-        obj->data->iherit = iherit;
+    if (env->core->in_init || inherit != NULL)
+        obj->data->inherit = inherit;
     else if (env->core->object != NULL)
-        obj->data->iherit = makeIherit(env->core->object);
+        obj->data->inherit = makeInherit(env->core->object);
     else
         return NULL;
 
     if (!env->core->in_init && inherit_api)
-        obj->data->api = obj->data->iherit->obj->data->api;
+        obj->data->api = obj->data->inherit->obj->data->api;
 
     gc_addObjectData(obj->data, env);
     gc_addObject(obj, env);
@@ -94,7 +94,7 @@ void freeObjectData(af_ObjectData *od) {
         freeObjectAPI(od->api);
     if (!od->var_space->gc.info.start_gc)
         freeVarSpace(od->var_space);
-    freeAllIherit(od->iherit);
+    freeAllInherit(od->inherit);
     GC_FREE_EXCHANGE(od);
     free(od);
 }
@@ -114,21 +114,21 @@ af_Object *getBelongObject(af_Object *object, af_Environment *env) {
     return belong;
 }
 
-af_Inherit *makeIherit(af_Object *obj) {
+af_Inherit *makeInherit(af_Object *obj) {
     af_Inherit *ih = calloc(sizeof(af_Inherit), 1);
     ih->obj = obj;
     return ih;
 }
 
-af_Inherit *freeIherit(af_Inherit *ih) {
+af_Inherit *freeInherit(af_Inherit *ih) {
     af_Inherit *next = ih->next;
     free(ih);
     return next;
 }
 
-void freeAllIherit(af_Inherit *ih) {
+void freeAllInherit(af_Inherit *ih) {
     while (ih != NULL)
-        ih = freeIherit(ih);
+        ih = freeInherit(ih);
 }
 
 static af_ObjectAPINode *makeObjectAPINode(DLC_SYMBOL(pAPIFUNC) func, char *api_name) {