Преглед изворни кода

style: 调整了命名规范

ArgCodeList -> af_ArgCodeList
ArgList -> af_ArgList
SongZihuan пре 3 година
родитељ
комит
76a155d50b
7 измењених фајлова са 50 додато и 50 уклоњено
  1. 22 22
      include/func.h
  2. 2 2
      include/obj_api.h
  3. 2 2
      src/core/__env.h
  4. 4 4
      src/core/__func.h
  5. 1 1
      src/core/env.c
  6. 17 17
      src/core/func.c
  7. 2 2
      src/main.c

+ 22 - 22
include/func.h

@@ -1,7 +1,7 @@
 #ifndef AFUN__FUNC_H_PUBLIC
 #ifndef AFUN__FUNC_H_PUBLIC
 #define AFUN__FUNC_H_PUBLIC
 #define AFUN__FUNC_H_PUBLIC
-typedef struct ArgCodeList ArgCodeList;
-typedef struct ArgList ArgList;
+typedef struct af_ArgCodeList af_ArgCodeList;
+typedef struct af_ArgList af_ArgList;
 typedef struct af_FuncInfo af_FuncInfo;
 typedef struct af_FuncInfo af_FuncInfo;
 
 
 #include "code.h"
 #include "code.h"
@@ -23,26 +23,26 @@ enum af_FuncInfoEmbedded {
 typedef void callFuncBody(void *make, af_Environment *env);
 typedef void callFuncBody(void *make, af_Environment *env);
 DEFINE_DLC_SYMBOL(callFuncBody);
 DEFINE_DLC_SYMBOL(callFuncBody);
 
 
-/* ArgCodeList 创建与释放 */
-ArgCodeList *makeArgCodeList(af_Code *code, size_t size, bool free_code, bool run_in_func);
-ArgCodeList *freeArgCodeList(ArgCodeList *acl);
-void freeAllArgCodeList(ArgCodeList *acl);
-
-/* ArgCodeList 操作函数 */
-ArgCodeList **pushArgCodeList(ArgCodeList **base, ArgCodeList *new);
-ArgCodeList **pushNewArgCodeList(ArgCodeList **base, af_Code *code, size_t size, bool free_code, bool run_in_func);
-void *getArgCodeListData(ArgCodeList *acl);
-af_Object *getArgCodeListResult(ArgCodeList *acl);
-
-/* ArgList 创建与释放 */
-ArgList *makeArgList(char *name, af_Object *obj);
-ArgList *freeArgList(ArgList *al);
-void freeAllArgList(ArgList *al);
-
-/* ArgList 操作函数 */
-ArgList **pushArgList(ArgList **base, ArgList *new);
-ArgList **pushNewArgList(ArgList **base, char *name, af_Object *obj);
-bool runArgList(ArgList *al, af_VarSpaceListNode *vsl);
+/* af_ArgCodeList 创建与释放 */
+af_ArgCodeList *makeArgCodeList(af_Code *code, size_t size, bool free_code, bool run_in_func);
+af_ArgCodeList *freeArgCodeList(af_ArgCodeList *acl);
+void freeAllArgCodeList(af_ArgCodeList *acl);
+
+/* af_ArgCodeList 操作函数 */
+af_ArgCodeList **pushArgCodeList(af_ArgCodeList **base, af_ArgCodeList *new);
+af_ArgCodeList **pushNewArgCodeList(af_ArgCodeList **base, af_Code *code, size_t size, bool free_code, bool run_in_func);
+void *getArgCodeListData(af_ArgCodeList *acl);
+af_Object *getArgCodeListResult(af_ArgCodeList *acl);
+
+/* af_ArgList 创建与释放 */
+af_ArgList *makeArgList(char *name, af_Object *obj);
+af_ArgList *freeArgList(af_ArgList *al);
+void freeAllArgList(af_ArgList *al);
+
+/* af_ArgList 操作函数 */
+af_ArgList **pushArgList(af_ArgList **base, af_ArgList *new);
+af_ArgList **pushNewArgList(af_ArgList **base, char *name, af_Object *obj);
+bool runArgList(af_ArgList *al, af_VarSpaceListNode *vsl);
 
 
 /* FuncInfo 创建与释放 */
 /* FuncInfo 创建与释放 */
 af_FuncInfo *makeFuncInfo(enum af_FuncInfoScope scope, enum af_FuncInfoEmbedded embedded, bool is_macro);
 af_FuncInfo *makeFuncInfo(enum af_FuncInfoScope scope, enum af_FuncInfoEmbedded embedded, bool is_macro);

+ 2 - 2
include/obj_api.h

@@ -29,9 +29,9 @@ typedef void obj_initData(void *data);  // 初始化data
 typedef void obj_freeData(void *data);  // 释放data的内容 (但不释放void *data)指针
 typedef void obj_freeData(void *data);  // 释放data的内容 (但不释放void *data)指针
 
 
 /* Object 函数调用 */
 /* Object 函数调用 */
-typedef bool obj_funcGetArgCodeList(ArgCodeList **acl, af_Object *obj, af_Code *code, void **mark, af_Environment *env);  // 获取参数计算表
+typedef bool obj_funcGetArgCodeList(af_ArgCodeList **acl, af_Object *obj, af_Code *code, void **mark, af_Environment *env);  // 获取参数计算表
 typedef bool obj_funcGetVarList(af_VarSpaceListNode **vsl, af_Object *obj, void *mark, af_Environment *env);  // 获取函数变量空间
 typedef bool obj_funcGetVarList(af_VarSpaceListNode **vsl, af_Object *obj, void *mark, af_Environment *env);  // 获取函数变量空间
-typedef bool obj_funcGetArgList(ArgList **al, af_Object *obj, ArgCodeList *acl, void *mark, af_Environment *env);  // 获取参数赋值表
+typedef bool obj_funcGetArgList(af_ArgList **al, af_Object *obj, af_ArgCodeList *acl, void *mark, af_Environment *env);  // 获取参数赋值表
 typedef bool obj_funcGetInfo(af_FuncInfo **fi, af_Object *obj, af_Code *code, void *mark, af_Environment *env);  // 获取函数信息
 typedef bool obj_funcGetInfo(af_FuncInfo **fi, af_Object *obj, af_Code *code, void *mark, af_Environment *env);  // 获取函数信息
 typedef void obj_funcFreeMask(void *mark);  // 释放mask的函数
 typedef void obj_funcFreeMask(void *mark);  // 释放mask的函数
 
 

+ 2 - 2
src/core/__env.h

@@ -85,8 +85,8 @@ struct af_Activity {  // 活动记录器
     /* 函数调用专项 */
     /* 函数调用专项 */
     enum af_BlockType call_type;  // 函数调用类型
     enum af_BlockType call_type;  // 函数调用类型
     struct af_Object *parentheses_call;  // 类前缀调用
     struct af_Object *parentheses_call;  // 类前缀调用
-    struct ArgCodeList *acl_start;
-    struct ArgCodeList *acl_next;
+    struct af_ArgCodeList *acl_start;
+    struct af_ArgCodeList *acl_next;
     struct af_FuncInfo *fi;
     struct af_FuncInfo *fi;
     struct af_FuncBody *body_next;
     struct af_FuncBody *body_next;
     void *mark;  // 标记 [完全由API管理, 不随activity释放]
     void *mark;  // 标记 [完全由API管理, 不随activity释放]

+ 4 - 4
src/core/__func.h

@@ -8,7 +8,7 @@ typedef struct af_FuncBody af_FuncBody;
 #include "__object.h"
 #include "__object.h"
 #include "__code.h"
 #include "__code.h"
 
 
-struct ArgCodeList {
+struct af_ArgCodeList {
     void *info;  // info信息
     void *info;  // info信息
     size_t size;
     size_t size;
 
 
@@ -17,13 +17,13 @@ struct ArgCodeList {
     bool run_in_func;  // 是否在函数的变量空间内运行
     bool run_in_func;  // 是否在函数的变量空间内运行
 
 
     struct af_Object *result;  // 有gc引用计数
     struct af_Object *result;  // 有gc引用计数
-    struct ArgCodeList *next;
+    struct af_ArgCodeList *next;
 };
 };
 
 
-struct ArgList {
+struct af_ArgList {
     char *name;
     char *name;
     struct af_Object *obj;  // 有gc引用计数
     struct af_Object *obj;  // 有gc引用计数
-    struct ArgList *next;
+    struct af_ArgList *next;
 };
 };
 
 
 typedef void callFuncBody(void *mark, af_Environment *env);
 typedef void callFuncBody(void *mark, af_Environment *env);

+ 1 - 1
src/core/env.c

@@ -681,7 +681,7 @@ bool setFuncActivityAddVar(bool new_vsl, bool is_protect, af_Environment *env){
         env->activity->new_vs_count++;
         env->activity->new_vs_count++;
     }
     }
 
 
-    ArgList *al;
+    af_ArgList *al;
     if (!get_arg_list(&al, env->activity->func, env->activity->acl_start, env->activity->mark, env))
     if (!get_arg_list(&al, env->activity->func, env->activity->acl_start, env->activity->mark, env))
         return false;
         return false;
     runArgList(al, env->activity->var_list);
     runArgList(al, env->activity->var_list);

+ 17 - 17
src/core/func.c

@@ -13,8 +13,8 @@ static void freeMsgType(char **msg_type);
 /* FuncBody 操作函数 */
 /* FuncBody 操作函数 */
 static void pushFuncBody(af_FuncBody **base, af_FuncBody *body);
 static void pushFuncBody(af_FuncBody **base, af_FuncBody *body);
 
 
-ArgCodeList *makeArgCodeList(af_Code *code, size_t size, bool free_code, bool run_in_func) {
-    ArgCodeList *acl = calloc(sizeof(ArgCodeList), 1);
+af_ArgCodeList *makeArgCodeList(af_Code *code, size_t size, bool free_code, bool run_in_func) {
+    af_ArgCodeList *acl = calloc(sizeof(af_ArgCodeList), 1);
     acl->info = calloc(size, 1);
     acl->info = calloc(size, 1);
     acl->size = size;
     acl->size = size;
     acl->code = code;
     acl->code = code;
@@ -23,8 +23,8 @@ ArgCodeList *makeArgCodeList(af_Code *code, size_t size, bool free_code, bool ru
     return acl;
     return acl;
 }
 }
 
 
-ArgCodeList *freeArgCodeList(ArgCodeList *acl) {
-    ArgCodeList *next = acl->next;
+af_ArgCodeList *freeArgCodeList(af_ArgCodeList *acl) {
+    af_ArgCodeList *next = acl->next;
     free(acl->info);
     free(acl->info);
     if (acl->free_code)
     if (acl->free_code)
         freeAllCode(acl->code);
         freeAllCode(acl->code);
@@ -34,12 +34,12 @@ ArgCodeList *freeArgCodeList(ArgCodeList *acl) {
     return next;
     return next;
 }
 }
 
 
-void freeAllArgCodeList(ArgCodeList *acl) {
+void freeAllArgCodeList(af_ArgCodeList *acl) {
     while (acl != NULL)
     while (acl != NULL)
         acl = freeArgCodeList(acl);
         acl = freeArgCodeList(acl);
 }
 }
 
 
-ArgCodeList **pushArgCodeList(ArgCodeList **base, ArgCodeList *new) {
+af_ArgCodeList **pushArgCodeList(af_ArgCodeList **base, af_ArgCodeList *new) {
     while (*base != NULL)
     while (*base != NULL)
         base = &((*base)->next);
         base = &((*base)->next);
     *base = new;
     *base = new;
@@ -49,31 +49,31 @@ ArgCodeList **pushArgCodeList(ArgCodeList **base, ArgCodeList *new) {
     return base;
     return base;
 }
 }
 
 
-ArgCodeList **pushNewArgCodeList(ArgCodeList **base, af_Code *code, size_t size, bool free_code, bool run_in_func) {
+af_ArgCodeList **pushNewArgCodeList(af_ArgCodeList **base, af_Code *code, size_t size, bool free_code, bool run_in_func) {
     while (*base != NULL)
     while (*base != NULL)
         base = &((*base)->next);
         base = &((*base)->next);
     *base = makeArgCodeList(code, size, free_code, run_in_func);
     *base = makeArgCodeList(code, size, free_code, run_in_func);
     return &((*base)->next);
     return &((*base)->next);
 }
 }
 
 
-void *getArgCodeListData(ArgCodeList *acl) {
+void *getArgCodeListData(af_ArgCodeList *acl) {
     return acl->info;
     return acl->info;
 }
 }
 
 
-af_Object *getArgCodeListResult(ArgCodeList *acl) {
+af_Object *getArgCodeListResult(af_ArgCodeList *acl) {
     return acl->result;
     return acl->result;
 }
 }
 
 
-ArgList *makeArgList(char *name, af_Object *obj) {
-    ArgList *arg_list = calloc(sizeof(ArgList), 1);
+af_ArgList *makeArgList(char *name, af_Object *obj) {
+    af_ArgList *arg_list = calloc(sizeof(af_ArgList), 1);
     arg_list->name = strCopy(name);
     arg_list->name = strCopy(name);
     arg_list->obj = obj;
     arg_list->obj = obj;
     gc_addReference(obj);
     gc_addReference(obj);
     return arg_list;
     return arg_list;
 }
 }
 
 
-ArgList *freeArgList(ArgList *al) {
-    ArgList *next = al->next;
+af_ArgList *freeArgList(af_ArgList *al) {
+    af_ArgList *next = al->next;
     free(al->name);
     free(al->name);
     if (al->obj != NULL)
     if (al->obj != NULL)
         gc_addReference(al->obj);
         gc_addReference(al->obj);
@@ -81,12 +81,12 @@ ArgList *freeArgList(ArgList *al) {
     return next;
     return next;
 }
 }
 
 
-void freeAllArgList(ArgList *al) {
+void freeAllArgList(af_ArgList *al) {
     while (al != NULL)
     while (al != NULL)
         al = freeArgList(al);
         al = freeArgList(al);
 }
 }
 
 
-ArgList **pushArgList(ArgList **base, ArgList *new) {
+af_ArgList **pushArgList(af_ArgList **base, af_ArgList *new) {
     while (*base != NULL)
     while (*base != NULL)
         base = &((*base)->next);
         base = &((*base)->next);
     *base = new;
     *base = new;
@@ -96,14 +96,14 @@ ArgList **pushArgList(ArgList **base, ArgList *new) {
     return base;
     return base;
 }
 }
 
 
-ArgList **pushNewArgList(ArgList **base, char *name, af_Object *obj) {
+af_ArgList **pushNewArgList(af_ArgList **base, char *name, af_Object *obj) {
     while (*base != NULL)
     while (*base != NULL)
         base = &((*base)->next);
         base = &((*base)->next);
     *base = makeArgList(name, obj);
     *base = makeArgList(name, obj);
     return &((*base)->next);
     return &((*base)->next);
 }
 }
 
 
-bool runArgList(ArgList *al, af_VarSpaceListNode *vsl) {
+bool runArgList(af_ArgList *al, af_VarSpaceListNode *vsl) {
     for (NULL; al != NULL; al = al->next) {
     for (NULL; al != NULL; al = al->next) {
         if (!makeVarToVarSpaceList(al->name, 3, 3, al->obj, vsl))
         if (!makeVarToVarSpaceList(al->name, 3, 3, al->obj, vsl))
             return false;
             return false;

+ 2 - 2
src/main.c

@@ -24,7 +24,7 @@ void freeData(int **data) {
     free(*data);
     free(*data);
 }
 }
 
 
-bool getAcl(ArgCodeList **acl, af_Object *obj, af_Code *code, int **mark, af_Environment *env) {
+bool getAcl(af_ArgCodeList **acl, af_Object *obj, af_Code *code, int **mark, af_Environment *env) {
     *acl = makeArgCodeList(makeVariableCode("object", NUL, 0, "Unknown"), 0, true, false);
     *acl = makeArgCodeList(makeVariableCode("object", NUL, 0, "Unknown"), 0, true, false);
     *mark = calloc(sizeof(int), 1);
     *mark = calloc(sizeof(int), 1);
     **mark = 100;
     **mark = 100;
@@ -37,7 +37,7 @@ bool getVsl(af_VarSpaceListNode **vsl, af_Object *obj, void *mark, af_Environmen
     return true;
     return true;
 }
 }
 
 
-bool getAl(ArgList **al, af_Object *obj, ArgCodeList *acl, void *mark, af_Environment *env) {
+bool getAl(af_ArgList **al, af_Object *obj, af_ArgCodeList *acl, void *mark, af_Environment *env) {
     *al = makeArgList("test", getArgCodeListResult(acl));
     *al = makeArgList("test", getArgCodeListResult(acl));
     return true;
     return true;
 }
 }