Remove LOCATION_FUNC

Also tweak PrintKernelFunction

Author: fingolfin

lib/function.g

@@ -347,13 +347,6 @@ BIND_GLOBAL( "LocationFunc", function(func)
         APPEND_LIST(ret, STRING_INT(line));
         return ret;
     fi;
-    line := LOCATION_FUNC(func);
-    if line <> fail then
-        APPEND_LIST(ret, nam);
-        APPEND_LIST(ret, ":");
-        APPEND_LIST(ret, line);
-        return ret;
-    fi;
     return fail;
 end);
 

src/calls.c

@@ -1347,11 +1347,8 @@ void PrintKernelFunction(Obj func)
                 Pr("<<compiled GAP code>> from %g:%d", (Int)filename,
                    startline);
         }
-        else if (location != Fail) {
-            Pr("<<kernel code>> from %g:%g", (Int)filename, (Int)location);
-        }
         else {
-            Pr("<<kernel or compiled code>>", 0, 0);
+            Pr("<<kernel or compiled code>> from %g", (Int)filename, 0);
         }
     }
     else {
@@ -1731,13 +1728,6 @@ static Obj FuncENDLINE_FUNC(Obj self, Obj func)
     return Fail;
 }
 
-static Obj FuncLOCATION_FUNC(Obj self, Obj func)
-{
-    RequireFunction(SELF_NAME, func);
-
-    return IsKernelFunction(func) ? KernelLocationOfFunction(func) : Fail;
-}
-
 /****************************************************************************
 **
 *F  FuncUNPROFILE_FUNC( <self>, <func> )  . . . . . . . . . . .  stop profile
@@ -1955,7 +1945,6 @@ static StructGVarFunc GVarFuncs[] = {
     GVAR_FUNC_1ARGS(UNPROFILE_FUNC, func),
     GVAR_FUNC_1ARGS(IsKernelFunction, func),
     GVAR_FUNC_1ARGS(FILENAME_FUNC, func),
-    GVAR_FUNC_1ARGS(LOCATION_FUNC, func),
     GVAR_FUNC_1ARGS(STARTLINE_FUNC, func),
     GVAR_FUNC_1ARGS(ENDLINE_FUNC, func),
 

tst/testinstall/declarefunction.tst

@@ -9,8 +9,8 @@ gap> testfunctionA;
 function( args... ) ... end
 gap> Print(testfunctionA,"\n");
 function ( args... )
-    <<kernel code>> from the global function "testfunctionA" is not yet define\
-d:
+    <<kernel or compiled code>> from the global function "testfunctionA" is no\
+t yet defined
 end
 gap> InstallGlobalFunction(testfunctionA, x -> x);
 gap> testfunctionA;
@@ -23,15 +23,15 @@ gap> name := List([1..100], x -> 'a');;
 gap> func := NEW_GLOBAL_FUNCTION(name);;
 gap> Print(func,"\n");
 function ( args... )
-    <<kernel code>> from the global function "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is not y\
-et defined:
+    <<kernel or compiled code>> from the global function "aaaaaaaaaaaaaaaaaaaa\
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
+aa" is not yet defined
 end
 gap> name := List([1..1000], x -> 'a');;
 gap> func := NEW_GLOBAL_FUNCTION(name);;
 gap> Print(func,"\n");
 function ( args... )
-    <<kernel code>> from the global function "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
+    <<kernel or compiled code>> from the global function "aaaaaaaaaaaaaaaaaaaa\
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
@@ -44,6 +44,6 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is not yet defined:
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is not yet defined
 end
 gap> STOP_TEST("declarefunction.tst");

tst/testinstall/kernel/calls.tst

@@ -111,12 +111,6 @@ gap> ENDLINE_FUNC(f);
 1
 gap> ENDLINE_FUNC(IS_OBJECT);
 fail
-gap> LOCATION_FUNC(fail);
-Error, LOCATION_FUNC: <func> must be a function (not the value 'fail')
-gap> LOCATION_FUNC(f);
-fail
-gap> LOCATION_FUNC(IS_OBJECT);
-fail
 
 #
 gap> UNPROFILE_FUNC(fail);