Skip to content

Commit

Permalink
Repaired problems with poly(rat)fun and symbols in the LHS pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
@vermaseren
vermaseren committed Nov 30, 2017
1 parent 954024f commit 8e8b0ae
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions sources/comexpr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,7 @@ IllLeft:MesPrint("&Illegal LHS");
return(1);
}
if ( error == 0 ) {
WORD oldpolyfun = AR.PolyFun;
if ( NewSort(BHEAD0) || NewSort(BHEAD0) ) {
if ( !error ) error = 1;
return(error);
Expand All @@ -826,13 +827,15 @@ IllLeft:MesPrint("&Illegal LHS");
while ( --i >= 0 ) *ww++ = *mm++; AT.WorkPointer = ww;
AC.lhdollarflag = 0; oldEside = AR.Eside; AR.Eside = LHSIDE;
AR.Cnumlhs = C->numlhs;
AR.PolyFun = 0;
if ( Generator(BHEAD ow,C->numlhs) ) {
AR.Eside = oldEside;
LowerSortLevel(); LowerSortLevel(); goto IllLeft;
LowerSortLevel(); LowerSortLevel(); AR.PolyFun = oldpolyfun; goto IllLeft;
}
AR.Eside = oldEside;
AT.WorkPointer = w;
if ( EndSort(BHEAD w,0) < 0 ) { LowerSortLevel(); goto IllLeft; }
if ( EndSort(BHEAD w,0) < 0 ) { LowerSortLevel(); AR.PolyFun = oldpolyfun; goto IllLeft; }
AR.PolyFun = oldpolyfun;
if ( *w == 0 || *(w+*w) != 0 ) {
MesPrint("&LHS must be one term");
AC.lhdollarflag = 0;
Expand Down
6 changes: 3 additions & 3 deletions sources/findpat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ OnlyL10: AddWild(BHEAD *m-WILDOFFSET,VECTOVEC,newval1);
*/
else {
MLOCK(ErrorMessageLock);
MesPrint("Error in pattern");
MesPrint("Error in pattern(1)");
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
Expand Down Expand Up @@ -930,7 +930,7 @@ OnceL8a: mt -= 2*MAXPOWER;
*/
else {
MLOCK(ErrorMessageLock);
MesPrint("Error in pattern");
MesPrint("Error in pattern(2)");
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
Expand Down Expand Up @@ -1050,7 +1050,7 @@ WORD FindMulti(PHEAD WORD *term, WORD *pattern)
*/
else {
MLOCK(ErrorMessageLock);
MesPrint("Error in pattern");
MesPrint("Error in pattern(3)");
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
Expand Down

3 comments on commit 8e8b0ae

@tueda
Copy link
Collaborator

@tueda tueda commented on 8e8b0ae Nov 30, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The failures on Travis CI for this commit seem to be related to travis-ci/travis-ci#8826 and travis-ci/travis-ci#8836, I guess.

@vermaseren
Copy link
Owner Author

@vermaseren vermaseren commented on 8e8b0ae Nov 30, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tueda
Copy link
Collaborator

@tueda tueda commented on 8e8b0ae Nov 30, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Jos, I think this is a Travis CI side problem and anyway they should fix it. We can just wait for a coming fix.

Please sign in to comment.