made AddObjectConstructor/AddMorphismConstructor the primitive operations

and FinSetOp/MapOfFinSets the "derived" ones

Author: mohamed-barakat

gap/SkeletalFinSetsForCAP.gi

@@ -55,14 +55,8 @@ InstallMethodForCompilerForCAP( FinSetOp,
         [ IsCategoryOfSkeletalFinSets, IsBigInt ],
 
   function ( cat, n )
-    local int;
-    
-    int := CreateCapCategoryObjectWithAttributes( cat, Length, n );
-    
-    #% CAP_JIT_DROP_NEXT_STATEMENT
-    Assert( 4, IsWellDefined( int ) );
 
-    return int;
+    return ObjectConstructor( cat, n );
 
 end );
 
@@ -96,17 +90,8 @@ InstallOtherMethodForCompilerForCAP( MapOfFinSets,
         [ IsCategoryOfSkeletalFinSets, IsSkeletalFiniteSet, IsList, IsSkeletalFiniteSet ],
 
   function ( cat, s, G, t )
-    local map;
 
-    map := CreateCapCategoryMorphismWithAttributes( cat,
-            s,
-            t,
-            AsList, G );
-    
-    #% CAP_JIT_DROP_NEXT_STATEMENT
-    Assert( 4, IsWellDefined( map ) );
-    
-    return map;
+    return MorphismConstructor( cat, s, G, t );
 
 end );
 
@@ -257,9 +242,15 @@ InstallGlobalFunction( INSTALL_FUNCTIONS_FOR_SKELETAL_FIN_SETS,
 
 ##
 AddObjectConstructor( SkeletalFinSets,
-  function ( SkeletalFinSets, n )
+  function ( cat, n )
+    local int;
 
-    return FinSet( SkeletalFinSets, n );
+    int := CreateCapCategoryObjectWithAttributes( cat, Length, n );
+    
+    #% CAP_JIT_DROP_NEXT_STATEMENT
+    Assert( 4, IsWellDefined( int ) );
+    
+    return int;
 
 end );
 
@@ -273,9 +264,18 @@ end );
 
 ##
 AddMorphismConstructor( SkeletalFinSets,
-  function ( SkeletalFinSets, source, map, range )
+  function ( cat, source, images, range )
+    local map;
+    
+    map := CreateCapCategoryMorphismWithAttributes( cat,
+            source,
+            range,
+            AsList, images );
 
-    return MapOfFinSets( SkeletalFinSets, source, map, range );
+    #% CAP_JIT_DROP_NEXT_STATEMENT
+    Assert( 4, IsWellDefined( map ) );
+    
+    return map;
 
 end );