style: 调整了一些命名规范

include/arg.h → include/func.h

@@ -1,5 +1,5 @@
-#ifndef AFUN__ARG_H_PUBLIC
-#define AFUN__ARG_H_PUBLIC
+#ifndef AFUN__FUNC_H_PUBLIC
+#define AFUN__FUNC_H_PUBLIC
 #include "code.h"
 #include "object.h"
 
@@ -25,4 +25,4 @@ ArgList **pushArgList(ArgList **base, ArgList *new);
 ArgList **pushNewArgList(ArgList **base, char *name, af_Object *obj);
 bool runArgList(ArgList *al, af_VarSpaceListNode *vsl);
 
-#endif //AFUN__ARG_H_PUBLIC
+#endif //AFUN__FUNC_H_PUBLIC

include/object.h

@@ -7,7 +7,7 @@ typedef struct af_Inherit af_Inherit;
 typedef struct af_ObjectAPI af_ObjectAPI;
 
 /* 对象API函数 DLC */
-DEFINE_DLC_SYMBOL(pValueAPI, pAPIFUNC);
+DEFINE_DLC_SYMBOL(objectAPIFunc, objectAPIFunc);
 
 #include "env.h"
 
@@ -29,10 +29,10 @@ af_ObjectAPI *makeObjectAPI(void);
 void freeObjectAPI(af_ObjectAPI *api);
 
 /* API表 管理函数 */
-int addAPI(DLC_SYMBOL(pAPIFUNC) func, char *api_name, af_ObjectAPI *api);
+int addAPI(DLC_SYMBOL(objectAPIFunc) func, char *api_name, af_ObjectAPI *api);
 void *findAPI(char *api_name, af_ObjectAPI *api);
 
 /* 对象API函数 */
 void *findObjectAPI(char *api_name, af_Object *obj);
-int addAPIToObject(DLC_SYMBOL(pAPIFUNC) func, char *api_name, af_Object *obj);
+int addAPIToObject(DLC_SYMBOL(objectAPIFunc) func, char *api_name, af_Object *obj);
 #endif //AFUN__OBJECT_H_PUBLIC

src/core/__env.h

@@ -14,7 +14,7 @@ typedef struct af_TopMsgProcess af_TopMsgProcess;
 #include "__var.h"
 #include "__code.h"
 #include "__gc.h"
-#include "__arg.h"
+#include "__func.h"
 
 #define ENV_VAR_HASH_SIZE (8)
 typedef uint16_t ActivityCount;

src/core/__arg.h → src/core/__func.h

@@ -1,7 +1,7 @@
-#ifndef AFUN__ARG_H
-#define AFUN__ARG_H
+#ifndef AFUN__FUNC_H
+#define AFUN__FUNC_H
 #include "macro.h"
-#include "arg.h"
+#include "func.h"
 #include "__object.h"
 #include "__code.h"
 
@@ -23,4 +23,4 @@ struct ArgList {
     struct ArgList *next;
 };
 
-#endif //AFUN__ARG_H
+#endif //AFUN__FUNC_H

src/core/__object.h

@@ -17,12 +17,12 @@ typedef struct af_ObjectAPINode af_ObjectAPINode;
 
 #define API_HASHTABLE_SIZE (8)
 
-typedef void pValueAPI();
-NEW_DLC_SYMBOL(pValueAPI, pAPIFUNC);
+typedef void objectAPIFunc();
+NEW_DLC_SYMBOL(objectAPIFunc, objectAPIFunc);
 
 struct af_ObjectAPINode {
     char *name;  // api名字
-    DLC_SYMBOL(pAPIFUNC) api;  // api函数
+    DLC_SYMBOL(objectAPIFunc) api;  // api函数
     struct af_ObjectAPINode *next;
 };
 

src/core/__arg.c → src/core/func.c

@@ -1,4 +1,4 @@
-#include "__arg.h"
+#include "__func.h"
 
 ArgCodeList *makeArgCodeList(af_Code *code, size_t size, bool free_code, bool run_in_func) {
     ArgCodeList *acl = calloc(sizeof(ArgCodeList), 1);

src/core/object.c

@@ -7,13 +7,13 @@ static af_ObjectData *makeObjectData_Pri(char *id, bool free_api, af_ObjectAPI *
 static af_Object *makeObject_Pri(char *id, bool free_api, af_ObjectAPI *api, bool allow_inherit);
 
 /* ObjectData API 创建与释放 */
-static af_ObjectAPINode *makeObjectAPINode(DLC_SYMBOL(pAPIFUNC) func, char *api_name);
+static af_ObjectAPINode *makeObjectAPINode(DLC_SYMBOL(objectAPIFunc) func, char *api_name);
 static af_ObjectAPINode *freeObjectAPINode(af_ObjectAPINode *apin);
 static void freeAllObjectAPINode(af_ObjectAPINode *apin);
 
 /* ObjectData API 管理函数 */
 static af_ObjectAPINode *findObjectDataAPINode(char *api_name, af_ObjectData *od);
-static int addAPIToObjectData(DLC_SYMBOL(pAPIFUNC) func, char *api_name, af_ObjectData *od);
+static int addAPIToObjectData(DLC_SYMBOL(objectAPIFunc) func, char *api_name, af_ObjectData *od);
 
 static af_ObjectData *makeObjectData_Pri(char *id, bool free_api, af_ObjectAPI *api, bool allow_inherit) {
     af_ObjectData *od = calloc(sizeof(af_ObjectData), 1);
@@ -120,12 +120,12 @@ void freeAllInherit(af_Inherit *ih) {
         ih = freeInherit(ih);
 }
 
-static af_ObjectAPINode *makeObjectAPINode(DLC_SYMBOL(pAPIFUNC) func, char *api_name) {
+static af_ObjectAPINode *makeObjectAPINode(DLC_SYMBOL(objectAPIFunc) func, char *api_name) {
     if (func == NULL)
         return NULL;
 
     af_ObjectAPINode *apin = calloc(sizeof(af_ObjectAPINode), 1);
-    apin->api = COPY_SYMBOL(func, pAPIFUNC);
+    apin->api = COPY_SYMBOL(func, objectAPIFunc);
     apin->name = strCopy(api_name);
     return apin;
 }
@@ -161,7 +161,7 @@ void freeObjectAPI(af_ObjectAPI *api) {
  * 若dlc中不存在指定函数则返回-1且不作修改
  * 操作成功返回1
  */
-int addAPI(DLC_SYMBOL(pAPIFUNC) func, char *api_name, af_ObjectAPI *api) {
+int addAPI(DLC_SYMBOL(objectAPIFunc) func, char *api_name, af_ObjectAPI *api) {
     time33_t index = time33(api_name) % API_HASHTABLE_SIZE;
     af_ObjectAPINode **pNode = &api->node[index];
 
@@ -190,7 +190,7 @@ void *findAPI(char *api_name, af_ObjectAPI *api) {
  * 若dlc中不存在指定函数则返回-1且不作修改
  * 操作成功返回1
  */
-static int addAPIToObjectData(DLC_SYMBOL(pAPIFUNC) func, char *api_name,
+static int addAPIToObjectData(DLC_SYMBOL(objectAPIFunc) func, char *api_name,
                               af_ObjectData *od) {
     time33_t index = time33(api_name) % API_HASHTABLE_SIZE;
     af_ObjectAPINode **pNode = &od->api->node[index];
@@ -217,7 +217,7 @@ static af_ObjectAPINode *findObjectDataAPINode(char *api_name, af_ObjectData *od
  * 函数名: findObjectDataAPINode
  * 目标: 从DLC中获取函数并写入Object的API
  */
-int addAPIToObject(DLC_SYMBOL(pAPIFUNC) func, char *api_name,
+int addAPIToObject(DLC_SYMBOL(objectAPIFunc) func, char *api_name,
                    af_Object *obj) {
     return addAPIToObjectData(func, api_name, obj->data);
 }