Run tests a second time without precompiled code

Author: zickgraf

examples/PrecompileCategoryOfSkeletalFinSets.g

@@ -40,8 +40,11 @@ cat := CategoryOfSkeletalFinSets( );
 # Now we check whether the compiled code is loaded automatically.
 # For this we use the name of the argument of `InitialObject`;
 # for non-compiled code it is "cat", while for compiled code it is "cat_1":
-NamesLocalVariablesFunction(
-        Last( cat!.added_functions.InitialObject )[1] )[1];
-#! "cat_1"
+argument_name := NamesLocalVariablesFunction(
+    Last( cat!.added_functions.InitialObject )[1] )[1];;
+
+(ValueOption( "no_precompiled_code" ) = true and argument_name = "cat") or
+    (ValueOption( "no_precompiled_code" ) = fail and argument_name = "cat_1");
+#! true
 
 #! @EndExample

gap/SkeletalFinSetsForCAP.gi

@@ -485,9 +485,6 @@ AddCoastrictionToImageWithGivenImageObject( SkeletalFinSets,
     #% CAP_JIT_DROP_NEXT_STATEMENT
     Assert( 3, IsEpimorphism( cat, pi ) );
 
-    #% CAP_JIT_DROP_NEXT_STATEMENT
-    SetIsEpimorphism( pi, true );
-    
     return pi;
 
 end );
@@ -673,14 +670,26 @@ AddIsInjective( SkeletalFinSets,
 end );
 
 ##
-AddMonomorphismIntoSomeInjectiveObject( SkeletalFinSets,
+AddSomeInjectiveObject( SkeletalFinSets,
   function ( cat, M )
 
     if IsInitial( cat, M ) then
-        return UniversalMorphismIntoTerminalObject( cat, M );
+        
+        return TerminalObject( cat );
+        
+    else
+        
+        return M;
+        
     fi;
 
-    return IdentityMorphism( cat, M );
+end );
+
+##
+AddMonomorphismIntoSomeInjectiveObjectWithGivenSomeInjectiveObject( SkeletalFinSets,
+  function ( cat, M, injective_object )
+    
+    return MapOfFinSets( M, List( M, x -> x ), injective_object );
 
 end );
 

gap/precompiled_categories/CategoryOfSkeletalFinSetsPrecompiled.gi

@@ -563,22 +563,13 @@ end
     , 100 );
 
     ##
-    AddMonomorphismIntoSomeInjectiveObject( cat,
+    AddMonomorphismIntoSomeInjectiveObjectWithGivenSomeInjectiveObject( cat,
 
 ########
-function ( cat_1, A_1 )
-    local hoisted_1_1, deduped_2_1, deduped_3_1;
-    deduped_2_1 := Length( A_1 );
-    if deduped_2_1 = 0 then
-        deduped_3_1 := FinSet( cat_1, 1 );
-        hoisted_1_1 := Length( deduped_3_1 );
-        return MapOfFinSets( A_1, List( AsList( A_1 ), function ( a_2 )
-                  return hoisted_1_1;
-              end ), deduped_3_1 );
-    else
-        return MapOfFinSets( A_1, [ 1 .. deduped_2_1 ], A_1 );
-    fi;
-    return;
+function ( cat_1, A_1, I_1 )
+    return MapOfFinSets( A_1, List( A_1, function ( x_2 )
+              return x_2;
+          end ), I_1 );
 end
 ########
 
@@ -663,6 +654,22 @@ end
 
     , 100 );
 
+    ##
+    AddSomeInjectiveObject( cat,
+        
+########
+function ( cat_1, arg2_1 )
+    if Length( arg2_1 ) = 0 then
+        return FinSet( cat_1, 1 );
+    else
+        return arg2_1;
+    fi;
+    return;
+end
+########
+        
+    , 100 );
+    
     ##
     AddSubobjectClassifier( cat,
 

makefile

@@ -31,6 +31,10 @@ test-with-coverage: doc
 	gap --quitonbreak --cover stats tst/testall.g
 	echo 'LoadPackage("profiling"); OutputJsonCoverage("stats", "coverage.json");' | gap --quitonbreak
 
+test-with-coverage-without-precompiled-code: doc
+	gap --quitonbreak --cover stats_no_precompiled_code tst/testall_no_precompiled_code.g
+	echo 'LoadPackage("profiling"); OutputJsonCoverage("stats_no_precompiled_code", "coverage_no_precompiled_code.json");' | gap --quitonbreak
+
 test-spacing:
 	grep -R "[^ [\"]  " gap/*.gi && echo "Duplicate spaces found" && exit 1 || exit 0
 	grep -RE '[^ ] +$$' gap/* && echo "Trailing whitespace found" && exit 1 || exit 0
@@ -54,4 +58,4 @@ test-spacing:
 	rm spacing_diff
 	rm spacing_diff_no_blanks
 
-ci-test: test-basic-spacing test-spacing test-doc test-with-coverage
+ci-test: test-basic-spacing test-spacing test-doc test-with-coverage test-with-coverage-without-precompiled-code

process_coverage_ignored_lines.py

@@ -15,8 +15,9 @@
 regex_block_start = re.compile("^\s*# COVERAGE_IGNORE_BLOCK_START$")
 regex_block_end = re.compile("^\s*# COVERAGE_IGNORE_BLOCK_END$")
 regex_next_line = re.compile("^\s*# COVERAGE_IGNORE_NEXT_LINE$")
+regex_return_void = re.compile("^\s*return;$")
 
-for coverage_filename in Path(".").glob("**/coverage.json"):
+for coverage_filename in Path(".").glob("**/coverage*.json"):
     print("processing coverage file " + str(coverage_filename))
     with open(coverage_filename) as json_file:
         data = json.load(json_file)
@@ -53,6 +54,14 @@
                                 exit(1)
                             ignored_lines.append(line_number + 1)
 
+                        # ignore empty return statements in precompiled code
+                        # those are inserted automatically by GAP and are never executed
+                        if "precompiled_categories" in filename and regex_return_void.match(line) is not None:
+                            if ignoring:
+                                print("Error in line " + str(line_number) + ": ignoring empty return statement while already ignoring block")
+                                exit(1)
+                            ignored_lines.append(line_number)
+                        
                         if ignoring:
                             ignored_lines.append(line_number)
 

tst/testall_no_precompiled_code.g

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# FinSetsForCAP: The elementary topos of (skeletal) finite sets
+#
+# This file runs package tests without precompiled code.
+#
+options := rec(
+    exitGAP := true,
+    testOptions := rec(
+        compareFunction := "uptowhitespace",
+    ),
+);
+
+PushOptions( rec(
+    no_precompiled_code := true,
+) );
+
+TestDirectory( DirectoriesPackageLibrary( "FinSetsForCAP", "tst" ), options );
+
+FORCE_QUIT_GAP( 1 ); # if we ever get here, there was an error