Skip to content

Warn about conflicting module options for $-variables #779

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

Open
tueda wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Warn about conflicting module options for $-variables #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions check/features.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2357,6 +2357,23 @@ discard;
.end
assert succeeded?
*--#] ModuleOption_dollar_order :
*--#[ ModuleOption_dollar_warnings_1 :
$a = 0;
ModuleOption local,$a;
ModuleOption local,$a;
.end
assert succeeded?
*--#] ModuleOption_dollar_warnings_1 :
*--#[ ModuleOption_dollar_warnings_2 :
ModuleOption local,$a;
$b = 0;
ModuleOption local,$b;
ModuleOption sum,$b;
.end
assert return_value == 0
assert warning?("Undefined $-variable in module option; option ignored: $a")
assert warning?("Conflicting module options for $-variable; later option ignored: $b")
*--#] ModuleOption_dollar_warnings_2 :
*--#[ Issue49 :
* Add mul_ function for polynomial multiplications
Symbols x,y,z;
Expand Down
17 changes: 16 additions & 1 deletion sources/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,7 @@ UBYTE * DoModDollar(UBYTE *s, int type)
UBYTE *name, c;
WORD number;
MODOPTDOLLAR *md;
int nummodopt;
while ( *s == '$' ) {
/*
Read the name of the dollar
Expand All @@ -671,8 +672,22 @@ UBYTE * DoModDollar(UBYTE *s, int type)
c = *s; *s = 0;
number = GetDollar(name);
if ( number < 0 ) {
UBYTE *s1;
number = AddDollar(s,0,0,0);
Warning("Undefined $-variable in module statement");
s1 = strDup1((UBYTE *)"Undefined $-variable in module option; option ignored: $","Undefined $-variable in ModuleOption");
s1 = AddToString(s1,name,0);
Warning((char *)s1);
M_free(s1,"Undefined $-variable in ModuleOption");
}
for ( nummodopt = 0; nummodopt < NumModOptdollars; nummodopt++ ) {
if ( number == ModOptdollars[nummodopt].number && type != ModOptdollars[nummodopt].type ) {
UBYTE *s1;
s1 = strDup1((UBYTE *)"Conflicting module options for $-variable; later option ignored: $","Conflicting $-variable in ModuleOption");
s1 = AddToString(s1,name,0);
Warning((char *)s1);
M_free(s1,"Conflicting $-variable in ModuleOption");
break;
}
}
md = (MODOPTDOLLAR *)FromList(&AC.ModOptDolList);
md->number = number;
Expand Down
Loading