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

remvoe dead code

This commit is contained in:
Yuichi Nishiwaki 2015-06-27 16:44:05 +09:00
parent ac094a9477
commit 8c6496ef24
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extlib/benz/codegen.c
View File

@ -402,7 +402,7 @@ analyze_args(pic_state *pic, pic_value formals, analyze_scope *scope)
} }
static bool static bool
lookup_scope(analyze_scope *scope, pic_sym *sym) search_scope(analyze_scope *scope, pic_sym *sym)
{ {
return kh_get(a, &scope->args, sym) != kh_end(&scope->args) || kh_get(a, &scope->locals, sym) != kh_end(&scope->locals) || scope->depth == 0; return kh_get(a, &scope->args, sym) != kh_end(&scope->args) || kh_get(a, &scope->locals, sym) != kh_end(&scope->locals) || scope->depth == 0;
} }
@ -421,7 +421,7 @@ find_var(pic_state *pic, analyze_scope *scope, pic_sym *sym)
int depth = 0; int depth = 0;
while (scope) { while (scope) {
if (lookup_scope(scope, sym)) { if (search_scope(scope, sym)) {
if (depth > 0) { if (depth > 0) {
capture_var(pic, scope, sym); capture_var(pic, scope, sym);
} }
@ -430,7 +430,7 @@ find_var(pic_state *pic, analyze_scope *scope, pic_sym *sym)
depth++; depth++;
scope = scope->up; scope = scope->up;
} }
return -1; PIC_UNREACHABLE();
} }
static void static void
@ -438,7 +438,7 @@ define_var(pic_state *pic, analyze_scope *scope, pic_sym *sym)
{ {
int ret; int ret;
if (lookup_scope(scope, sym)) { if (search_scope(scope, sym)) {
if (scope->depth > 0 || pic_dict_has(pic, pic->globals, sym)) { if (scope->depth > 0 || pic_dict_has(pic, pic->globals, sym)) {
pic_warnf(pic, "redefining variable: ~s", pic_obj_value(sym)); pic_warnf(pic, "redefining variable: ~s", pic_obj_value(sym));
} }
@ -481,9 +481,7 @@ analyze_var(pic_state *pic, analyze_scope *scope, pic_sym *sym)
{ {
int depth; int depth;
if ((depth = find_var(pic, scope, sym)) == -1) { depth = find_var(pic, scope, sym);
pic_errorf(pic, "unbound variable %s", pic_symbol_name(pic, sym));
}
if (depth == scope->depth) { if (depth == scope->depth) {
return pic_list2(pic, pic_obj_value(pic->sGREF), pic_obj_value(sym)); return pic_list2(pic, pic_obj_value(pic->sGREF), pic_obj_value(sym));