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

updated add_class_level_variable() for better duplicate check
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hyung-hwan 2024-10-20 20:12:31 +09:00
parent d2b3cc9f71
commit a2b840f41d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/comp.c
View File

@ -295,14 +295,15 @@ static void fini_class_level_variable_buffer (hcl_t* hcl, hcl_oocsc_t* dst)
} }
} }
static int add_class_level_variable (hcl_t* hcl, hcl_oocsc_t* dst, const hcl_cnode_t* var, const hcl_bch_t* desc) static int add_class_level_variable (hcl_t* hcl, hcl_oocsc_t* dst, hcl_oocsc_t* altdst, const hcl_cnode_t* var, const hcl_bch_t* desc)
{ {
/* it downcasts hcl_oocsc_t* to hcl_oocs_t*. take extra care to keep their type defintion /* it downcasts hcl_oocsc_t* to hcl_oocs_t*. take extra care to keep their type defintion
* compatible for downcasting in hcl-cmn.h */ * compatible for downcasting in hcl-cmn.h */
hcl_oocs_t* name; hcl_oocs_t* name;
name = HCL_CNODE_GET_TOK(var); name = HCL_CNODE_GET_TOK(var);
if (__find_word_in_string((hcl_oocs_t*)dst, name, 0, HCL_NULL) >= 0) if (__find_word_in_string((hcl_oocs_t*)dst, name, 0, HCL_NULL) >= 0 ||
(__find_word_in_string((hcl_oocs_t*)altdst, name, 0, HCL_NULL) >= 0))
{ {
hcl_setsynerrbfmt ( hcl_setsynerrbfmt (
hcl, HCL_SYNERR_VARNAMEDUP, HCL_CNODE_GET_LOC(var), HCL_NULL, hcl, HCL_SYNERR_VARNAMEDUP, HCL_CNODE_GET_LOC(var), HCL_NULL,
@ -3801,7 +3802,7 @@ static int compile_var (hcl_t* hcl, hcl_cnode_t* src)
goto oops; goto oops;
} }
if (add_class_level_variable(hcl, &cbi->ivars, tmp, "instance") <= -1) goto oops; if (add_class_level_variable(hcl, &cbi->ivars, &cbi->cvars, tmp, "instance") <= -1) goto oops;
cbi->nivars++; cbi->nivars++;
} }
else else
@ -3815,7 +3816,7 @@ static int compile_var (hcl_t* hcl, hcl_cnode_t* src)
goto oops; goto oops;
} }
if (add_class_level_variable(hcl, &cbi->cvars, tmp, "class") <= -1) goto oops; if (add_class_level_variable(hcl, &cbi->cvars, &cbi->ivars, tmp, "class") <= -1) goto oops;
cbi->ncvars++; cbi->ncvars++;
} }

7
t/class-5001.err
View File

@ -289,11 +289,14 @@ class Kuduro [a b c] {
} }
--- ---
class Kuduru [a [b] c] {
class Kuduro [a [b] c] {
var d e var d e
var b ##TODO: should this be prohibited? var b ##ERROR: syntax error - duplicate instance variable name 'b'
} }
---
class Kuduro [a [b] c] { class Kuduro [a [b] c] {
var d e var d e
var(#class) b ##ERROR: syntax error - duplicate class variable name 'b' var(#class) b ##ERROR: syntax error - duplicate class variable name 'b'