Skip to content

Change EndSort type for transform statements #516

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

Merged
merged 1 commit into from
May 13, 2024
Merged

Change EndSort type for transform statements #516

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
40 changes: 39 additions & 1 deletion check/fixes.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,22 @@ P;
.end
assert succeeded?
assert result("F") =~ expr("rat(1,ep^2 + 2*ep + 1)")
*--#] Issue180 :
*--#] Issue180 :
*--#[ Issue183 :
#: MaxTermSize 16K
#: SubTermsInSmall 800

CF f;
Auto S x;
L F = f(<x1+x2+x3+x4>,...,<x6+x7+x8+x9>);
*repeat id f(x1?,x2?,?a) = f(x1*x2,?a); * error: Sorted function argument...
transform f,mulargs(1,last); * silent crash
P;
.end
# Runtime errors may freeze ParFORM.
#pend_if mpi?
assert runtime_error?("Term too complex during normalization")
*--#] Issue183 :
*--#[ Issue185 :
* Wrong result of content_

Expand Down Expand Up @@ -2002,6 +2017,29 @@ Symbol x;
.end
assert succeeded?
*--#] Issue222 :
*--#[ Issue230 :
#-
#: MaxTermSize 16K
#: SubTermsInSmall 800


Off Statistics;

Symbol x1,...,x11;
CFunction f;

Local test = f(x1+...+x11) - (x1+...+x11)^4;
Identify f(x1?) = f(x1,x1,x1,x1);
.sort

Transform f mulargs(1,last);
Identify f(x1?) = x1;

Print +s;
.end
assert succeeded?
assert result("test") =~ expr("0")
*--#] Issue230 :
*--#[ Issue231 :
Symbol x,y,z;
Local F = x + y + x*z;
Expand Down
12 changes: 6 additions & 6 deletions sources/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ returnvalues:;
return(-1);
}
newterm = AT.WorkPointer;
if ( EndSort(BHEAD newterm,0) < 0 ) {}
if ( EndSort(BHEAD newterm,1) < 0 ) {}
if ( ( *newterm && *(newterm+*newterm) != 0 ) || *newterm == 0 ) {
MLOCK(ErrorMessageLock);
MesPrint("&yes/no information in islyndon/tolyndon does not evaluate into a single term");
Expand Down Expand Up @@ -1379,7 +1379,7 @@ WORD RunReplace(PHEAD WORD *fun, WORD *args, WORD *info)
return(-1);
}
newterm = AT.WorkPointer;
if ( EndSort(BHEAD newterm,0) < 0 ) {}
if ( EndSort(BHEAD newterm,1) < 0 ) {}
if ( ( *newterm && *(newterm+*newterm) != 0 ) || *newterm == 0 ) {
MLOCK(ErrorMessageLock);
MesPrint("&information in replace transformation does not evaluate into a single term");
Expand Down Expand Up @@ -1641,7 +1641,7 @@ getthisone:;
return(-1);
}
term4 = AT.WorkPointer;
if ( EndSort(BHEAD term4,0) < 0 ) {}
if ( EndSort(BHEAD term4,1) < 0 ) {}
if ( ( *term4 && *(term4+*term4) != 0 ) || *term4 == 0 ) {
MLOCK(ErrorMessageLock);
MesPrint("&information in replace transformation does not evaluate into a single term");
Expand Down Expand Up @@ -1768,7 +1768,7 @@ dothisnow:;
return(-1);
}
term4 = AT.WorkPointer;
if ( EndSort(BHEAD term4,0) < 0 ) {}
if ( EndSort(BHEAD term4,1) < 0 ) {}
if ( ( *term4 && *(term4+*term4) != 0 ) || *term4 == 0 ) {
MLOCK(ErrorMessageLock);
MesPrint("&information in replace transformation does not evaluate into a single term");
Expand Down Expand Up @@ -2737,7 +2737,7 @@ WORD RunAddArg(PHEAD WORD *fun, WORD *args)
}
n++;
}
if ( EndSort(BHEAD tstop+ARGHEAD,0) ) return(-1);
if ( EndSort(BHEAD tstop+ARGHEAD,1) ) return(-1);
num = 0;
f2 = tstop+ARGHEAD;
while ( *f2 ) { f2 += *f2; num++; }
Expand Down Expand Up @@ -2883,7 +2883,7 @@ WORD RunMulArg(PHEAD WORD *fun, WORD *args)
NewSort(BHEAD0);
Generator(BHEAD scratch,AR.Cnumlhs);
newterm = AT.WorkPointer;
EndSort(BHEAD newterm+ARGHEAD,0);
EndSort(BHEAD newterm+ARGHEAD,1);
C->Pointer = C->Buffer+oldcpointer_pos;
C->numrhs = nb;
w = newterm+ARGHEAD; while ( *w ) w += *w;
Expand Down