conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Yuichi Nishiwaki 2014-03-20 13:48:51 +09:00
parent 37a87046b7
commit 1548a17b35
1 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/codegen.c
View File

@ -15,45 +15,6 @@
# error enable PIC_NONE_IS_FALSE
#endif
static pic_sym *
analyze_args(pic_state *pic, pic_value args, bool *varg, int *argc, int *localc)
{
pic_sym *syms = (pic_sym *)pic_alloc(pic, sizeof(pic_sym));
int i = 1, l = 0;
pic_value v;
*varg = false;
for (v = args; pic_pair_p(v); v = pic_cdr(pic, v)) {
pic_value sym;
sym = pic_car(pic, v);
if (! pic_sym_p(sym)) {
pic_free(pic, syms);
return NULL;
}
syms = (pic_sym *)pic_realloc(pic, syms, sizeof(pic_sym) * (i + 1));
syms[i] = pic_sym(sym);
i++;
}
if (pic_nil_p(v)) {
/* pass */
}
else if (pic_sym_p(v)) {
*varg = true;
syms = (pic_sym *)pic_realloc(pic, syms, sizeof(pic_sym) * (i + 1));
syms[i] = pic_sym(v);
l++;
}
else {
pic_free(pic, syms);
return NULL;
}
*argc = i;
*localc = l;
return syms;
}
typedef struct analyze_scope {
/* rest args variable is counted by localc */
bool varg;
@ -147,6 +108,45 @@ destroy_analyze_state(analyze_state *state)
pic_free(state->pic, state);
}
static pic_sym *
analyze_args(pic_state *pic, pic_value args, bool *varg, int *argc, int *localc)
{
pic_sym *syms = (pic_sym *)pic_alloc(pic, sizeof(pic_sym));
int i = 1, l = 0;
pic_value v;
*varg = false;
for (v = args; pic_pair_p(v); v = pic_cdr(pic, v)) {
pic_value sym;
sym = pic_car(pic, v);
if (! pic_sym_p(sym)) {
pic_free(pic, syms);
return NULL;
}
syms = (pic_sym *)pic_realloc(pic, syms, sizeof(pic_sym) * (i + 1));
syms[i] = pic_sym(sym);
i++;
}
if (pic_nil_p(v)) {
/* pass */
}
else if (pic_sym_p(v)) {
*varg = true;
syms = (pic_sym *)pic_realloc(pic, syms, sizeof(pic_sym) * (i + 1));
syms[i] = pic_sym(v);
l++;
}
else {
pic_free(pic, syms);
return NULL;
}
*argc = i;
*localc = l;
return syms;
}
static bool
push_scope(analyze_state *state, pic_value args)
{
@ -198,8 +198,7 @@ lookup_var(analyze_state *state, pic_sym sym)
xh_entry *e;
int depth = 0;
enter:
while (scope) {
e = xh_get_int(scope->var_tbl, sym);
if (e) {
if (depth > 0) { /* mark dirty */
@ -207,10 +206,8 @@ lookup_var(analyze_state *state, pic_sym sym)
}
return depth;
}
if (scope->up) {
depth++;
scope = scope->up;
++depth;
goto enter;
}
return -1;
}