Skip to content

Commit b35cfee

Browse files
committed
fix: remove unintended & in warnings (#766)
Close #766.
1 parent 4722ec4 commit b35cfee

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

check/fixes.frm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4437,6 +4437,14 @@ assert result("testCF1") =~ expr("putfirst_(f,2,mu1)*putfirst_(e,2,mu1)*putfirst
44374437
assert result("testCF2") =~ expr("d(mu2,mu1)*e(mu2,mu1)*f(mu2,mu1)")
44384438
assert result("testCF3") =~ expr("d(mu2,mu1,mu3)*e(mu2,mu1,mu3)*f(mu2,mu1,mu3)")
44394439
*--#] Issue750 :
4440+
*--#[ Issue766 :
4441+
* Unintended "&" in some warning messages
4442+
CF f(s,s);
4443+
ModuleOption local,$a;
4444+
.end
4445+
assert warning?("Excess information in symmetric properties")
4446+
assert warning?("Undefined $-variable")
4447+
*--#] Issue766 :
44404448
*--#[ PullReq535 :
44414449
* This test requires more than the specified 50K workspace.
44424450
#:maxtermsize 200

sources/module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ UBYTE * DoModDollar(UBYTE *s, int type)
672672
number = GetDollar(name);
673673
if ( number < 0 ) {
674674
number = AddDollar(s,0,0,0);
675-
Warning("&Undefined $-variable in module statement");
675+
Warning("Undefined $-variable in module statement");
676676
}
677677
md = (MODOPTDOLLAR *)FromList(&AC.ModOptDolList);
678678
md->number = number;

sources/names.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ illegsym: *s = cc;
15261526
else goto illegsym;
15271527
*s = cc;
15281528
if ( *s != ')' || ( s[1] && s[1] != ',' && s[1] != '<' ) ) {
1529-
Warning("&Excess information in symmetric properties currently ignored");
1529+
Warning("Excess information in symmetric properties currently ignored");
15301530
s = SkipField(s,1);
15311531
}
15321532
else s++;
@@ -1547,7 +1547,7 @@ retry:;
15471547
if ( ( StrICont(par,(UBYTE *)"arguments") == 0 )
15481548
|| ( StrICont(par,(UBYTE *)"args") == 0 ) ) {}
15491549
else {
1550-
Warning("&Illegal information in number of arguments properties currently ignored");
1550+
Warning("Illegal information in number of arguments properties currently ignored");
15511551
error = 1;
15521552
}
15531553
*s = cc;
@@ -1571,7 +1571,7 @@ retry:;
15711571
if ( ( StrICont(par,(UBYTE *)"arguments") == 0 )
15721572
|| ( StrICont(par,(UBYTE *)"args") == 0 ) ) {}
15731573
else {
1574-
Warning("&Illegal information in number of arguments properties currently ignored");
1574+
Warning("Illegal information in number of arguments properties currently ignored");
15751575
error = 1;
15761576
}
15771577
*s = cc;

0 commit comments

Comments
 (0)