Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect suggestions for state variables #431

Merged
merged 2 commits into from Jul 3, 2019
Merged

Fix incorrect suggestions for state variables #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
303b782
Fix incorrect suggestions for state variables
Daniel-Cortez Jun 18, 2019
443979a
Update tests for suggestions
Daniel-Cortez Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions source/compiler/sc5.c
View file
Open in desktop
Expand Up @@ -199,7 +199,8 @@ static char *warnmsg[] = {
};

static char *noticemsg[] = {
/*001*/ "; did you mean \"%s\"?\n"
/*001*/ "; did you mean \"%s\"?\n",
/*002*/ "; state variable out of scope\n"
};

#define NUM_WARNINGS (sizeof warnmsg / sizeof warnmsg[0])
Expand Down Expand Up @@ -660,8 +661,14 @@ SC_FUNC int error_suggest(int number,const char *name,const char *name2,int type
if (type==estSYMBOL) {
find_symbol:
closest_sym=find_closest_symbol(name,subtype);
if (closest_sym!=NULL)
if (closest_sym!=NULL) {
closest_name=closest_sym->name;
if ((subtype & esfVARIABLE)!=0 && closest_sym->states!=NULL && strcmp(closest_name,name)==0) {
assert(number==17); /* undefined symbol */
error(makelong(number,2),name);
return 0;
} /* if */
} /* if */
} else if (type==estNONSYMBOL) {
if (tMIDDLE<subtype && subtype<=tLAST) {
extern char *sc_tokens[];
Expand Down
2 changes: 2 additions & 0 deletions source/compiler/tests/gh_353_symbol_suggestions.meta
View file
Open in desktop
Expand Up @@ -24,5 +24,7 @@ gh_353_symbol_suggestions.pwn(138) : error 087: unknown state "BEING1" for autom
gh_353_symbol_suggestions.pwn(138) : error 036: empty statement
gh_353_symbol_suggestions.pwn(141) : error 087: unknown state "STATE_1" for automaton "automaton_2"; did you mean "automaton_1:STATE_1"?
gh_353_symbol_suggestions.pwn(141) : error 036: empty statement
gh_353_symbol_suggestions.pwn(148) : error 017: undefined symbol "test_e017_sug2_var"; state variable out of scope
gh_353_symbol_suggestions.pwn(153) : error 017: undefined symbol "test_e017_sug2_var"; state variable out of scope
"""
}
16 changes: 16 additions & 0 deletions source/compiler/tests/gh_353_symbol_suggestions.pwn
View file
Open in desktop
Expand Up @@ -140,3 +140,19 @@ public test_e087()
// error 087: unknown state "STATE_1" for automaton "automaton_2"; did you mean "automaton_1:STATE_1"?
state automaton_2:STATE_1;
}

new test_e017_sug2_var <automaton_3:STATE_2>;
forward test_e017_sug2();
public test_e017_sug2()
{
printf("%d\n", test_e017_sug2_var); // error 017: undefined symbol "test_e017_sug2_var"; state variable out of scope
}
forward test_e017_sug2_func();
public test_e017_sug2_func() <automaton_3:STATE_1>
{
printf("%d\n", test_e017_sug2_var); // error 017: undefined symbol "test_e017_sug2_var"; state variable out of scope
}
public test_e017_sug2_func() <automaton_3:STATE_2>
{
#pragma unused test_e017_sug2_var
}