hyung-hwan/hcl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compiler enhancement in checking instance variable access in class methods

Browse Source
This commit is contained in:
hyung-hwan 2022-02-24 17:16:02 +00:00
parent 50c04bb770
commit c446330f4a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/comp.c
View File

@ -287,6 +287,8 @@ static int find_variable_backward (hcl_t* hcl, const hcl_cnode_t* token, hcl_var
haystack.len = hcl_count_oocstr(clsbi->ivars_str); haystack.len = hcl_count_oocstr(clsbi->ivars_str);
if (__find_word_in_string(&haystack, name, 1, &index) >= 0) if (__find_word_in_string(&haystack, name, 1, &index) >= 0)
{ {
hcl_oow_t fi;
if (i >= hcl->c->fnblk.depth) if (i >= hcl->c->fnblk.depth)
{ {
/* instance variables are accessible only in an instance method defintion scope. /* instance variables are accessible only in an instance method defintion scope.
@ -295,14 +297,19 @@ static int find_variable_backward (hcl_t* hcl, const hcl_cnode_t* token, hcl_var
return -1; return -1;
} }
if (hcl->c->fnblk.info[hcl->c->fnblk.depth].fun_type == FUN_CM) for (fi = hcl->c->fnblk.depth + 1; fi > i; ) /* TOOD: review this loop for correctness */
{
if (hcl->c->fnblk.info[--fi].fun_type == FUN_CM)
{ {
/* TODO: check if it's a block inside a method ... */
/* the function where this variable is defined is a class method */ /* the function where this variable is defined is a class method */
hcl_setsynerrbfmt (hcl, HCL_SYNERR_BANNED, HCL_CNODE_GET_LOC(token), name, "prohibited access to an instance variable in a class method"); hcl_setsynerrbfmt (hcl, HCL_SYNERR_BANNED, HCL_CNODE_GET_LOC(token), name, "prohibited access to an instance variable in a class method");
return -1; return -1;
} }
/* instance methods and instantiation methods can access instance variables */
if (hcl->c->fnblk.info[fi].fun_type != FUN_PLAIN) break;
}
vi->type = VAR_INST; vi->type = VAR_INST;
vi->ctx_offset = 0; vi->ctx_offset = 0;
vi->index_in_ctx = index; vi->index_in_ctx = index;