Skip to content

kernel: fix tracing of mutable variants of One/Zero/Inv/AInv; some cleanup #2365

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
fingolfin merged 3 commits into from
Apr 16, 2018
Merged

kernel: fix tracing of mutable variants of One/Zero/Inv/AInv; some cleanup #2365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e369b9f
kernel: add missing InstallZeroMutObject call
fingolfin Apr 14, 2018
bb2cd86
kernel: remove commented out code
fingolfin Apr 14, 2018
732ff81
kernel: fix tracing of mutable One/Zero/Inv/AInv
fingolfin Apr 14, 2018
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
2 changes: 1 addition & 1 deletion src/ariths.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@ static Int InitKernel (
assert(ZeroMutFuncs[t1] == 0);
ZeroMutFuncs[t1] = ZeroMutObject;
}
InstallZeroObject(0);
InstallZeroMutObject(0);

/* make and install the 'AINV' arithmetic operation */
for ( t1 = FIRST_REAL_TNUM; t1 <= LAST_REAL_TNUM; t1++ ) {
Expand Down
8 changes: 7 additions & 1 deletion src/opers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3943,10 +3943,16 @@ void ChangeDoOperations (
if ( oper == PowOper ) { InstallPowObject(verb); }
if ( oper == CommOper ) { InstallCommObject(verb); }
if ( oper == ModOper ) { InstallModObject(verb); }

if ( oper == InvOp ) { InstallInvObject(verb); }
if ( oper == OneOp ) { InstallOneObject(verb); }
if ( oper == AInvOp ) { InstallAinvObject(verb); }
if ( oper == ZeroOp ) { InstallZeroObject(verb); }
if ( oper == ZEROOp ) { InstallZeroObject(verb); }

if ( oper == InvMutOp ) { InstallInvMutObject(verb); }
if ( oper == OneMutOp ) { InstallOneMutObject(verb); }
if ( oper == AdditiveInverseOp ) { InstallAinvMutObject(verb); }
if ( oper == ZeroOp ) { InstallZeroMutObject(verb); }

/* be verbose */
if ( verb ) {
Expand Down
15 changes: 0 additions & 15 deletions src/range.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,21 +623,6 @@ Obj PosRange (
}
}

/* I have no idea how a record can ever be equal to an integer. I'll leave
* the code in comments for a while, in case someone digs out what this is
* good for. FL
* */
/* for a record compare every entry */
/* else if ( TNUM_OBJ(val) == T_PREC ) {
for ( k = istart+1; k <= lenList; k++ ) {
if ( EQ( INTOBJ_INT( low + (k-1) * inc ), val ) )
break;
}
if ( lenList < k ) {
k = 0;
}
} */

/* otherwise it can not be an element of the range */
else {
k = 0;
Expand Down
9 changes: 9 additions & 0 deletions tst/test-error/trace.g
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
m:=ImmutableMatrix(GF(2),IdentityMat(2,GF(2)));;

InverseMutable(m);
TraceMethods(InverseMutable);
InverseMutable(m);

AdditiveInverseMutable(m);
TraceMethods(AdditiveInverseMutable);
AdditiveInverseMutable(m);
16 changes: 16 additions & 0 deletions tst/test-error/trace.g.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
gap> m:=ImmutableMatrix(GF(2),IdentityMat(2,GF(2)));;
gap>
gap> InverseMutable(m);
<a 2x2 matrix over GF2>
gap> TraceMethods(InverseMutable);
gap> InverseMutable(m);
#I InverseMutable: for GF2 matrix at src/vecgf2.c:fail
<a 2x2 matrix over GF2>
gap>
gap> AdditiveInverseMutable(m);
<a 2x2 matrix over GF2>
gap> TraceMethods(AdditiveInverseMutable);
gap> AdditiveInverseMutable(m);
#I AdditiveInverseMutable: for GF2 matrix at GAPROOT/lib/vecmat.gi:763
<a 2x2 matrix over GF2>
gap> QUIT;