Minor cleanup of random suff (#6377)

Author: fingolfin

lib/clas.gi

@@ -116,7 +116,7 @@ local fam,  filter,  cl;
       fi;
       filter:=filter and HasActingDomain and HasRepresentative and
               HasFunctionAction;
-      fam!.defaultClassType:=NewType( FamilyObj( G ), filter );
+      fam!.defaultClassType:=NewType( fam, filter );
     fi;
 
     cl:=rec( start := [ g ] );
@@ -141,7 +141,7 @@ local fam,  filter,  cl;
       fi;
       filter:=filter and HasActingDomain and HasRepresentative and
               HasFunctionAction and HasStabilizerOfExternalSet;
-      fam!.defaultClassCentType:=NewType( FamilyObj( G ), filter );
+      fam!.defaultClassCentType:=NewType( fam, filter );
     fi;
 
     cl:=rec( start := [ g ]);

lib/oprt.gi

@@ -587,10 +587,9 @@ end );
 ##
 #M  ActionHomomorphismConstructor( <xset>, <surj> )
 ##
-InstallGlobalFunction( ActionHomomorphismConstructor, function(arg)
-local   xset,surj,G,  D,  act,  fam,  filter,  hom,  i,blockacttest;
+InstallGlobalFunction( ActionHomomorphismConstructor, function(xset, surj, arg...)
+local   G,  D,  act,  fam,  filter,  hom,  i,blockacttest;
 
-    xset:=arg[1];surj:=arg[2];
     G := ActingDomain( xset );
     D := HomeEnumerator( xset );
     act := FunctionAction( xset );
@@ -650,8 +649,8 @@ local   xset,surj,G,  D,  act,  fam,  filter,  hom,  i,blockacttest;
     end;
 
     hom := rec(  );
-    if Length(arg)>2 then
-      filter:=arg[3];
+    if Length(arg)>0 then
+      filter:=arg[1];
     elif IsExternalSetByActorsRep( xset )  then
         filter := filter and IsActionHomomorphismByActors;
     elif     IsMatrixGroup( G )

src/ariths.c

@@ -20,7 +20,7 @@
 
 #define RequireValue(funcname, val)                                          \
     do {                                                                     \
-        if (!val)                                                            \
+        if (!(val))                                                          \
             ErrorMayQuit(funcname ": method should have returned a value",   \
                          0, 0);                                              \
     } while (0)

src/code.c

@@ -1755,14 +1755,14 @@ void CodeListExprEnd(
     }
 
     // allocate the list expression
-    if ( ! range && ! (top && tilde) ) {
-        list = NewExpr(cs, EXPR_LIST, INT_INTEXPR(pos) * sizeof(Expr));
+    if (range) {
+        list = NewExpr(cs, EXPR_RANGE, INT_INTEXPR(pos) * sizeof(Expr));
     }
-    else if ( ! range && (top && tilde) ) {
+    else if (top && tilde) {
         list = NewExpr(cs, EXPR_LIST_TILDE, INT_INTEXPR(pos) * sizeof(Expr));
     }
-    else /* if ( range && ! (top && tilde) ) */ {
-        list = NewExpr(cs, EXPR_RANGE, INT_INTEXPR(pos) * sizeof(Expr));
+    else {
+        list = NewExpr(cs, EXPR_LIST, INT_INTEXPR(pos) * sizeof(Expr));
     }
 
     // enter the entries

src/dt.c

@@ -61,7 +61,7 @@
 #include "modules.h"
 #include "plist.h"
 
-static void UnmarkTree(Obj z);
+static void UnmarkTree(Obj tree);
 static UInt Mark(Obj tree, Obj reftree, Int indexx);
 static Int  AlmostEqual(Obj tree1, Int index1, Obj tree2, Int index2);
 static Int  Equal(Obj tree1, Int index1, Obj tree2, Int index2);
@@ -726,16 +726,15 @@ static Int Leftof(Obj tree1, Int index1, Obj tree2, Int index2)
 */
 static Int Leftof2(Obj tree1, Int index1, Obj tree2, Int index2)
 {
-    if  ( DT_GEN(tree2, index2) < DT_GEN(tree1, DT_RIGHT(tree1, index1) )  )
-        return  0;
-    else if  (Equal(tree1, DT_RIGHT(tree1, index1), tree2, index2 )  )
-        return  0;
-    else if  (DT_GEN(tree2, index2) == DT_GEN(tree1, DT_RIGHT(tree1, index1)) )
-        return  Leftof(tree1, DT_RIGHT(tree1, index1), tree2, index2 );
-    else if  (Equal(tree1, DT_LEFT(tree1, index1), tree2, index2) )
-        return  0;
-    else
-        return  Leftof(tree1, DT_LEFT(tree1, index1), tree2, index2);
+    if (DT_GEN(tree2, index2) < DT_GEN(tree1, DT_RIGHT(tree1, index1)))
+        return 0;
+    if (Equal(tree1, DT_RIGHT(tree1, index1), tree2, index2))
+        return 0;
+    if (DT_GEN(tree2, index2) == DT_GEN(tree1, DT_RIGHT(tree1, index1)))
+        return Leftof(tree1, DT_RIGHT(tree1, index1), tree2, index2);
+    if (Equal(tree1, DT_LEFT(tree1, index1), tree2, index2))
+        return 0;
+    return Leftof(tree1, DT_LEFT(tree1, index1), tree2, index2);
 }
 
 

src/error.h

@@ -192,13 +192,13 @@ void ErrorBoundedInt(const char * funcname,
                      int          min,
                      int          max) NORETURN;
 
-#define RequireBoundedIntEx(funcname, op, argname, min, max)                 \
-    do {                                                                     \
-        if (!(IS_INTOBJ(op) && min <= INT_INTOBJ(op) &&                      \
-              INT_INTOBJ(op) <= max)) {                                      \
-            ErrorBoundedInt(funcname, op, argname, min, max);                \
-        }                                                                    \
-    } while (0)
+EXPORT_INLINE void RequireBoundedIntEx(
+    const char * funcname, Obj op, const char * argname, int min, int max)
+{
+    if (!(IS_INTOBJ(op) && min <= INT_INTOBJ(op) && INT_INTOBJ(op) <= max)) {
+        ErrorBoundedInt(funcname, op, argname, min, max);
+    }
+}
 
 #define RequireBoundedInt(funcname, op, min, max)                            \
     RequireBoundedIntEx(funcname, op, NICE_ARGNAME(op), min, max)

src/stringobj.c

@@ -1062,7 +1062,7 @@ static BOOL IsSSortString(Obj list)
     len = GET_LEN_STRING( list );
     ptr = CONST_CHARS_STRING(list);
     for ( i = 1; i < len; i++ ) {
-        if ( ! (ptr[i-1] < ptr[i]) )
+        if (ptr[i - 1] >= ptr[i])
             break;
     }
 
@@ -1468,7 +1468,7 @@ static Obj FuncPOSITION_SUBSTRING(Obj self, Obj string, Obj substr, Obj off)
   for (i = ipos; i < max; i++) {
     if (c == s[i]) {
       for (j = 1; j < lenss; j++) {
-        if (! (s[i+j] == ss[j]))
+        if (s[i + j] != ss[j])
           break;
       }
       if (j == lenss)