Merge pull request #1205 from zickgraf/master

Some simplifications

Author: zickgraf

CAP/PackageInfo.g

@@ -10,7 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "CAP",
 Subtitle := "Categories, Algorithms, Programming",
-Version := "2022.12-09",
+Version := "2022.12-10",
 Date := Concatenation( "01/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ),
 License := "GPL-2.0-or-later",
 

CAP/gap/ToolsForCategories.gd

@@ -24,7 +24,6 @@ DeclareGlobalFunction( "CAP_INTERNAL_REPLACE_STRING_WITH_FILTER" );
 #!  Applies <Ref Func="CAP_INTERNAL_REPLACE_STRING_WITH_FILTER" /> to all elements of <A>list</A> and returns the result.
 DeclareGlobalFunction( "CAP_INTERNAL_REPLACE_STRINGS_WITH_FILTERS" );
 
-DeclareGlobalFunction( "CAP_INTERNAL_REPLACE_STRING_WITH_FILTER_FOR_JULIA" );
 DeclareGlobalFunction( "CAP_INTERNAL_REPLACE_STRINGS_WITH_FILTERS_FOR_JULIA" );
 
 #! @Arguments list, additional list

CAP/gap/ToolsForCategories.gi

@@ -212,129 +212,38 @@ InstallGlobalFunction( CAP_INTERNAL_REPLACE_STRINGS_WITH_FILTERS,
 
 end );
 
-InstallGlobalFunction( CAP_INTERNAL_REPLACE_STRING_WITH_FILTER_FOR_JULIA,
+InstallGlobalFunction( CAP_INTERNAL_REPLACE_STRINGS_WITH_FILTERS_FOR_JULIA,
 
-  function( filter_or_string, args... )
+  function( list, args... )
     local category;
 
     if Length( args ) > 1 then
-        Error( "CAP_INTERNAL_REPLACE_STRING_WITH_FILTER_FOR_JULIA must be called with at most two arguments" );
+        Error( "CAP_INTERNAL_REPLACE_STRINGS_WITH_FILTERS_FOR_JULIA must be called with at most two arguments" );
     elif Length( args ) = 1 then
         category := args[1];
     else
         category := false;
     fi;
 
-    if IsFilter( filter_or_string ) then
-        return filter_or_string;
-    elif IsString( filter_or_string ) then
-        if filter_or_string = "category" then
-            if category <> false then
-                return CategoryFilter( category );
-            else
-                return IsCapCategory;
-            fi;
-        elif filter_or_string = "object" then
-            if category <> false then
-                return ObjectFilter( category );
-            else
-                return IsCapCategoryObject;
-            fi;
-        elif filter_or_string = "morphism" then
-            if category <> false then
-                return MorphismFilter( category );
-            else
-                return IsCapCategoryMorphism;
-            fi;
-        elif filter_or_string = "twocell" then
-            if category <> false then
-                return TwoCellFilter( category );
-            else
-                return IsCapCategoryTwoCell;
-            fi;
-        elif filter_or_string = "object_in_range_category_of_homomorphism_structure" then
+    return List( list, function ( l )
+      local filter;
+        
+        filter := CAP_INTERNAL_REPLACE_STRING_WITH_FILTER( l, category );
+        
+        if filter = IsList then
 
-            if category <> false and not HasRangeCategoryOfHomomorphismStructure( category ) then
-                
-                Display( Concatenation( "WARNING: You are calling an Add function for a CAP operation for \"", Name( category ), "\" which is part of a homomorphism structure but the category has no RangeCategoryOfHomomorphismStructure (yet)" ) );
-                
-            fi;
+            return ValueGlobal( "IsJuliaObject" );
 
-            if category <> false and HasRangeCategoryOfHomomorphismStructure( category ) then
-                return ObjectFilter( RangeCategoryOfHomomorphismStructure( category ) );
-            else
-                return IsCapCategoryObject;
-            fi;
-        elif filter_or_string = "morphism_in_range_category_of_homomorphism_structure" then
+        else
 
-            if category <> false and not HasRangeCategoryOfHomomorphismStructure( category ) then
-                
-                Display( Concatenation( "WARNING: You are calling an Add function for a CAP operation for \"", Name( category ), "\" which is part of a homomorphism structure but the category has no RangeCategoryOfHomomorphismStructure (yet)" ) );
-                
-            fi;
+            return filter;
 
-            if category <> false and HasRangeCategoryOfHomomorphismStructure( category ) then
-                return MorphismFilter( RangeCategoryOfHomomorphismStructure( category ) );
-            else
-                return IsCapCategoryMorphism;
-            fi;
-        elif filter_or_string = "other_category" then
-            return IsCapCategory;
-        elif filter_or_string = "other_object" then
-            return IsCapCategoryObject;
-        elif filter_or_string = "other_morphism" then
-            return IsCapCategoryMorphism;
-        elif filter_or_string = "other_twocell" then
-            return IsCapCategoryTwoCell;
-        elif filter_or_string = "list_of_objects" then
-            return ValueGlobal( "IsJuliaObject" );
-        elif filter_or_string = "list_of_morphisms" then
-            return ValueGlobal( "IsJuliaObject" );
-        elif filter_or_string = "list_of_twocells" then
-            return ValueGlobal( "IsJuliaObject" );
-        elif filter_or_string = "object_datum" then
-            if category <> false and ObjectDatumType( category ) <> fail and ObjectDatumType( category ).filter = IsList then
-                return ValueGlobal( "IsJuliaObject" );
-            else
-                return IsObject;
-            fi;
-        elif filter_or_string = "morphism_datum" then
-            if category <> false and MorphismDatumType( category ) <> fail and MorphismDatumType( category ).filter = IsList then
-                return ValueGlobal( "IsJuliaObject" );
-            else
-                return IsObject;
-            fi;
-        elif filter_or_string = "nonneg_integer_or_infinity" then
-            return IsCyclotomic;
-        else
-            Error( "filter type ", filter_or_string, " is not recognized, see the documentation for allowed values" );
         fi;
 
-    else
-        
-        Error( "the first argument must be a string or filter" );
-        
-    fi;
+    end );
 
 end );
 
-InstallGlobalFunction( CAP_INTERNAL_REPLACE_STRINGS_WITH_FILTERS_FOR_JULIA,
-  
-  function( list, args... )
-      local category;
-      
-      if Length( args ) > 1 then
-          Error( "CAP_INTERNAL_REPLACE_STRINGS_WITH_FILTERS_FOR_JULIA must be called with at most two arguments" );
-      elif Length( args ) = 1 then
-          category := args[1];
-      else
-          category := false;
-      fi;
-      
-      return List( list, l -> CAP_INTERNAL_REPLACE_STRING_WITH_FILTER_FOR_JULIA( l, category ) );
-      
-end );
-
 InstallGlobalFunction( "CAP_INTERNAL_MERGE_FILTER_LISTS",
 
   function( filter_list, additional_filters )

CompilerForCAP/PackageInfo.g

@@ -10,7 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "CompilerForCAP",
 Subtitle := "Speed up computations in CAP categories",
-Version := "2022.12-07",
+Version := "2022.12-08",
 Date := Concatenation( "01/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ),
 License := "GPL-2.0-or-later",
 

CompilerForCAP/gap/EnhancedSyntaxTree.gi

@@ -525,7 +525,7 @@ InstallGlobalFunction( ENHANCED_SYNTAX_TREE, function ( func )
 
                     # using LocationFunc causes a segfault (https://github.com/gap-system/gap/issues/4507)
                     # COVERAGE_IGNORE_NEXT_LINE
-                    Print( "WARNING: operation ", tree.funcref.gvar, ", located in function at ", FilenameFunc( func ), ":", StartlineFunc( func ), " can probably not be resolved.\n" );
+                    Print( "WARNING: operation ", tree.funcref.gvar, ", located in function at ", FilenameFunc( func ), ":", StartlineFunc( func ), " with name\n", NameFunction( func ), "\ncan probably not be resolved.\n" );
 
                 fi;