lassik
/
upscheme
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace gensym_t with struct

This commit is contained in:
Lassi Kortela 2019-08-09 19:26:33 +03:00
parent f2fb37e520
commit b561f9d4b0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
c/flisp.c
View File

@ -323,7 +323,8 @@ value_t fl_gensym(value_t *args, uint32_t nargs)
{ {
argcount("gensym", nargs, 0); argcount("gensym", nargs, 0);
(void)args; (void)args;
gensym_t *gs = (gensym_t *)alloc_words(sizeof(gensym_t) / sizeof(void *)); struct gensym *gs =
(struct gensym *)alloc_words(sizeof(struct gensym) / sizeof(void *));
gs->id = _gensym_ctr++; gs->id = _gensym_ctr++;
gs->binding = UNBOUND; gs->binding = UNBOUND;
gs->isconst = 0; gs->isconst = 0;
@ -342,7 +343,7 @@ static value_t fl_gensymp(value_t *args, u_int32_t nargs)
char *symbol_name(value_t v) char *symbol_name(value_t v)
{ {
if (ismanaged(v)) { if (ismanaged(v)) {
gensym_t *gs = (gensym_t *)ptr(v); struct gensym *gs = (struct gensym *)ptr(v);
gsnameno = 1 - gsnameno; gsnameno = 1 - gsnameno;
char *n = char *n =
uint2str(gsname[gsnameno] + 1, sizeof(gsname[0]) - 1, gs->id, 10); uint2str(gsname[gsnameno] + 1, sizeof(gsname[0]) - 1, gs->id, 10);
@ -522,9 +523,9 @@ static value_t relocate(value_t v)
nfn->name = fn->name; nfn->name = fn->name;
return nc; return nc;
} else if (t == TAG_SYM) { } else if (t == TAG_SYM) {
gensym_t *gs = (gensym_t *)ptr(v); struct gensym *gs = (struct gensym *)ptr(v);
gensym_t *ng = struct gensym *ng =
(gensym_t *)alloc_words(sizeof(gensym_t) / sizeof(void *)); (struct gensym *)alloc_words(sizeof(struct gensym) / sizeof(void *));
ng->id = gs->id; ng->id = gs->id;
ng->binding = gs->binding; ng->binding = gs->binding;
ng->isconst = 0; ng->isconst = 0;

4
c/flisp.h
View File

@ -30,12 +30,12 @@ typedef struct _symbol_t {
}; };
} symbol_t; } symbol_t;
typedef struct { struct gensym {
value_t isconst; value_t isconst;
value_t binding; // global value binding value_t binding; // global value binding
struct _fltype_t *type; struct _fltype_t *type;
uint32_t id; uint32_t id;
} gensym_t; };
#define TAG_NUM 0x0 #define TAG_NUM 0x0
#define TAG_CPRIM 0x1 #define TAG_CPRIM 0x1