Skip to content

Commit

Permalink
kernel: rename IS_MUTABLE_PLIST to IS_PLIST_MUTABLE
Browse files Browse the repository at this point in the history 
This helper tests whether a plist is mutable, not whether an object is a
mutable plist. In other words: it assumes that the input is already known to
be a plist, and hence does not normally verify that. A newly added assert
verifies this now in debug builds, to catch accidental misuse.
  • Loading branch information
@fingolfin
fingolfin committed Aug 30, 2018
1 parent c0c554b commit 861fb50
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion src/debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ VoidFunc debug_func_pointers[] = {
(VoidFunc)IS_MODULE_BUILTIN,
(VoidFunc)IS_MODULE_DYNAMIC,
(VoidFunc)IS_MODULE_STATIC,
(VoidFunc)IS_MUTABLE_PLIST,
(VoidFunc)IS_PLIST_MUTABLE,
(VoidFunc)IS_NONNEG_INTOBJ,
(VoidFunc)IS_PLIST,
(VoidFunc)IS_PLIST_OR_POSOBJ,
Expand Down
4 changes: 2 additions & 2 deletions src/listfunc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void AddPlist3 (
{
UInt len;

if ( ! IS_MUTABLE_PLIST(list) ) {
if ( ! IS_PLIST_MUTABLE(list) ) {
list = ErrorReturnObj(
"List Assignment: <list> must be a mutable list",
0L, 0L,
Expand Down Expand Up @@ -200,7 +200,7 @@ Obj RemPlist (
Int pos;
Obj removed;

if ( ! IS_MUTABLE_PLIST(list) ) {
if ( ! IS_PLIST_MUTABLE(list) ) {
list = ErrorReturnObj(
"Remove: <list> must be a mutable list",
0L, 0L,
Expand Down
6 changes: 3 additions & 3 deletions src/permutat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3578,7 +3578,7 @@ Obj OnTuplesPerm (
const UInt len = LEN_PLIST(tup);

/* make a bag for the result and initialize pointers */
res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(tup), T_PLIST, len);
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(tup), T_PLIST, len);
SET_LEN_PLIST(res, len);

/* handle small permutations */
Expand Down Expand Up @@ -3686,7 +3686,7 @@ Obj OnSetsPerm (
const UInt len = LEN_PLIST(set);

/* make a bag for the result and initialize pointers */
res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(set), T_PLIST, len);
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(set), T_PLIST, len);
SET_LEN_PLIST(res, len);

/* handle small permutations */
Expand Down Expand Up @@ -3758,7 +3758,7 @@ Obj OnSetsPerm (
// sort the result
if (isint) {
SortPlistByRawObj(res);
RetypeBag(res, IS_MUTABLE_PLIST(set) ? T_PLIST_CYC_SSORT
RetypeBag(res, IS_PLIST_MUTABLE(set) ? T_PLIST_CYC_SSORT
: T_PLIST_CYC_SSORT + IMMUTABLE);
}
else {
Expand Down
8 changes: 4 additions & 4 deletions src/plist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ Int KTNumPlist (
#endif
else if (TEST_OBJ_FLAG(elm, TESTING)) {
isHom = 0;
areMut = IS_MUTABLE_PLIST(elm);
areMut = IS_PLIST_MUTABLE(elm);
isTable = 0;
}
else {
Expand Down Expand Up @@ -332,7 +332,7 @@ Int KTNumPlist (
#endif
else if (TEST_OBJ_FLAG(elm, TESTING)) {
isHom = 0;
areMut = (areMut || IS_MUTABLE_PLIST(elm));
areMut = (areMut || IS_PLIST_MUTABLE(elm));
isTable = 0;
isRect = 0;
}
Expand Down Expand Up @@ -798,7 +798,7 @@ Obj ShallowCopyPlist (

/* make the new object and copy the contents */
len = LEN_PLIST(list);
if ( ! IS_MUTABLE_PLIST(list) ) {
if ( ! IS_PLIST_MUTABLE(list) ) {
new = NEW_PLIST( TNUM_OBJ(list) - IMMUTABLE, len );
}
else {
Expand Down Expand Up @@ -2608,7 +2608,7 @@ Obj FuncASS_PLIST_DEFAULT (
"you can replace <pos> via 'return <pos>;'" );
return FuncASS_PLIST_DEFAULT( self, plist, pos, val );
}
while ( ! IS_PLIST(plist) || ! IS_MUTABLE_PLIST(plist) ) {
while ( ! IS_PLIST(plist) || ! IS_PLIST_MUTABLE(plist) ) {
plist = ErrorReturnObj(
"<list> must be a mutable plain list (not a %s)",
(Int)TNAM_OBJ(plist), 0,
Expand Down
5 changes: 3 additions & 2 deletions src/plist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,11 @@ static inline Int IS_DENSE_PLIST(Obj list)

/****************************************************************************
**
*F IS_MUTABLE_PLIST( <list> ) . . . . . . . . . . . is a plain list mutable
*F IS_PLIST_MUTABLE( <list> ) . . . . . . . . . . . is a plain list mutable
*/
static inline Int IS_MUTABLE_PLIST(Obj list)
static inline Int IS_PLIST_MUTABLE(Obj list)
{
GAP_ASSERT(IS_PLIST(list));
return !((TNUM_OBJ(list) - T_PLIST) % 2);
}

Expand Down
18 changes: 9 additions & 9 deletions src/pperm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ static inline Obj DOM_PPERM(Obj f)
static inline void SET_IMG_PPERM(Obj f, Obj img)
{
GAP_ASSERT(IS_PPERM(f));
GAP_ASSERT(IS_PLIST(img) && !IS_MUTABLE_PLIST(img));
GAP_ASSERT(IS_PLIST(img) && !IS_PLIST_MUTABLE(img));
GAP_ASSERT(DOM_PPERM(f) == NULL ||
LEN_PLIST(img) == LEN_PLIST(DOM_PPERM(f)));
// TODO check entries of img are valid
Expand All @@ -175,7 +175,7 @@ static inline void SET_IMG_PPERM(Obj f, Obj img)
static inline void SET_DOM_PPERM(Obj f, Obj dom)
{
GAP_ASSERT(IS_PPERM(f));
GAP_ASSERT(IS_PLIST(dom) && !IS_MUTABLE_PLIST(dom));
GAP_ASSERT(IS_PLIST(dom) && !IS_PLIST_MUTABLE(dom));
GAP_ASSERT(IMG_PPERM(f) == NULL ||
LEN_PLIST(dom) == LEN_PLIST(IMG_PPERM(f)));
// TODO check entries of img are valid
Expand Down Expand Up @@ -6180,7 +6180,7 @@ Obj OnSetsPPerm(Obj set, Obj f)

const UInt len = LEN_PLIST(set);

res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(set), T_PLIST, len);
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(set), T_PLIST, len);

/* get the pointer */
ptset = CONST_ADDR_OBJ(set) + len;
Expand Down Expand Up @@ -6239,7 +6239,7 @@ Obj OnSetsPPerm(Obj set, Obj f)
}
}
if (reslen == 0) {
RetypeBag(res, IS_MUTABLE_PLIST(set) ? T_PLIST_EMPTY
RetypeBag(res, IS_PLIST_MUTABLE(set) ? T_PLIST_EMPTY
: T_PLIST_EMPTY + IMMUTABLE);
return res;
}
Expand All @@ -6249,7 +6249,7 @@ Obj OnSetsPPerm(Obj set, Obj f)
// sort the result
if (isint) {
SortPlistByRawObj(res);
RetypeBag(res, IS_MUTABLE_PLIST(set) ? T_PLIST_CYC_SSORT
RetypeBag(res, IS_PLIST_MUTABLE(set) ? T_PLIST_CYC_SSORT
: T_PLIST_CYC_SSORT + IMMUTABLE);
}
else {
Expand Down Expand Up @@ -6284,7 +6284,7 @@ Obj OnTuplesPPerm(Obj tup, Obj f)

const UInt len = LEN_PLIST(tup);

res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(tup), T_PLIST_CYC, len);
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(tup), T_PLIST_CYC, len);

/* get the pointer */
pttup = CONST_ADDR_OBJ(tup) + 1;
Expand Down Expand Up @@ -6363,7 +6363,7 @@ Obj FuncOnPosIntSetsPartialPerm(Obj self, Obj set, Obj f)
}

PLAIN_LIST(set);
res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(set), T_PLIST_CYC_SSORT,
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(set), T_PLIST_CYC_SSORT,
LEN_PLIST(set));

/* get the pointer */
Expand Down Expand Up @@ -6401,12 +6401,12 @@ Obj FuncOnPosIntSetsPartialPerm(Obj self, Obj set, Obj f)
SET_LEN_PLIST(res, reslen);

if (reslen == 0) {
RetypeBag(res, IS_MUTABLE_PLIST(set) ? T_PLIST_EMPTY
RetypeBag(res, IS_PLIST_MUTABLE(set) ? T_PLIST_EMPTY
: T_PLIST_EMPTY + IMMUTABLE);
}
else {
SortPlistByRawObj(res);
RetypeBag(res, IS_MUTABLE_PLIST(set) ? T_PLIST_CYC_SSORT
RetypeBag(res, IS_PLIST_MUTABLE(set) ? T_PLIST_CYC_SSORT
: T_PLIST_CYC_SSORT + IMMUTABLE);
}

Expand Down
12 changes: 6 additions & 6 deletions src/trans.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ static inline Obj EXT_TRANS(Obj f)
static inline void SET_IMG_TRANS(Obj f, Obj img)
{
GAP_ASSERT(IS_TRANS(f));
GAP_ASSERT(img == NULL || (IS_PLIST(img) && !IS_MUTABLE_PLIST(img)));
GAP_ASSERT(img == NULL || (IS_PLIST(img) && !IS_PLIST_MUTABLE(img)));
ADDR_OBJ(f)[0] = img;
}

static inline void SET_KER_TRANS(Obj f, Obj ker)
{
GAP_ASSERT(IS_TRANS(f));
GAP_ASSERT(ker == NULL || (IS_PLIST(ker) && !IS_MUTABLE_PLIST(ker) &&
GAP_ASSERT(ker == NULL || (IS_PLIST(ker) && !IS_PLIST_MUTABLE(ker) &&
LEN_PLIST(ker) == DEG_TRANS(f)));
ADDR_OBJ(f)[1] = ker;
}
Expand Down Expand Up @@ -3829,7 +3829,7 @@ Obj FuncOnPosIntSetsTrans(Obj self, Obj set, Obj f, Obj n)

const UInt len = LEN_PLIST(set);

res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(set), T_PLIST_CYC_SSORT, len);
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(set), T_PLIST_CYC_SSORT, len);
SET_LEN_PLIST(res, len);

ptset = CONST_ADDR_OBJ(set) + len;
Expand Down Expand Up @@ -5235,7 +5235,7 @@ Obj OnSetsTrans(Obj set, Obj f)

const UInt len = LEN_PLIST(set);

res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(set), T_PLIST, len);
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(set), T_PLIST, len);
SET_LEN_PLIST(res, len);

ptset = CONST_ADDR_OBJ(set) + len;
Expand Down Expand Up @@ -5295,7 +5295,7 @@ Obj OnSetsTrans(Obj set, Obj f)
SortPlistByRawObj(res);
REMOVE_DUPS_PLIST_INTOBJ(res);

RetypeBag(res, IS_MUTABLE_PLIST(set) ? T_PLIST_CYC_SSORT
RetypeBag(res, IS_PLIST_MUTABLE(set) ? T_PLIST_CYC_SSORT
: T_PLIST_CYC_SSORT + IMMUTABLE);
}
else {
Expand Down Expand Up @@ -5329,7 +5329,7 @@ Obj OnTuplesTrans(Obj tup, Obj f)

const UInt len = LEN_PLIST(tup);

res = NEW_PLIST_WITH_MUTABILITY(IS_MUTABLE_PLIST(tup), T_PLIST, len);
res = NEW_PLIST_WITH_MUTABILITY(IS_PLIST_MUTABLE(tup), T_PLIST, len);
SET_LEN_PLIST(res, len);

pttup = CONST_ADDR_OBJ(tup) + len;
Expand Down
6 changes: 3 additions & 3 deletions src/vecgf2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ void ConvGF2Vec (
/* retype and resize bag */
ResizeWordSizedBag( list, SIZE_PLEN_GF2VEC(len) );
SET_LEN_GF2VEC( list, len );
if ( IS_MUTABLE_PLIST( list ) ) {
if ( IS_PLIST_MUTABLE( list ) ) {
SetTypeDatObj( list, TYPE_LIST_GF2VEC);
} else {
SetTypeDatObj( list, TYPE_LIST_GF2VEC_IMM);
Expand Down Expand Up @@ -1504,7 +1504,7 @@ Obj NewGF2Vec (
}

/* mutability should be inherited from the argument */
if ( IS_MUTABLE_PLIST( list ) )
if ( IS_PLIST_MUTABLE( list ) )
SetTypeDatObj( res , TYPE_LIST_GF2VEC);
else
SetTypeDatObj( res , TYPE_LIST_GF2VEC_IMM);
Expand Down Expand Up @@ -1564,7 +1564,7 @@ Obj FuncCONV_GF2MAT( Obj self, Obj list)
SET_ELM_PLIST(list, i+1, tmp);
}
SET_ELM_PLIST(list,1,INTOBJ_INT(len));
mut = IS_MUTABLE_PLIST(list);
mut = IS_PLIST_MUTABLE(list);
RetypeBag(list, T_POSOBJ);
SET_TYPE_POSOBJ(list, mut ? TYPE_LIST_GF2MAT : TYPE_LIST_GF2MAT_IMM);
return (Obj) 0;
Expand Down

0 comments on commit 861fb50

Please sign in to comment.