Skip to content

Commit

Permalink
Improve InstallMethod warnings when using -N
Browse files Browse the repository at this point in the history 
Some time ago we added the command line option -N to disable
hidden methods (see also gap-system#2336). This causes many InstallMethod
invocations in packages to print warnings. Improve these warnings
to make it easier to resolve them.
  • Loading branch information
@fingolfin
fingolfin committed May 17, 2019
1 parent f30c1e4 commit 8f971c9
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 194 deletions.
10 changes: 4 additions & 6 deletions lib/oper1.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,12 +564,10 @@ BIND_GLOBAL( "INSTALL_METHOD",
Ordinal(notmatch)," argument do not match a declaration of ",
NAME_FUNC(opr) );
else
Print("InstallMethod warning: ", NAME_FUNC(opr), "(\c",INPUT_FILENAME(),"\c +",
INPUT_LINENUMBER(),") \c","required filters \c");
for j in NamesFilter(imp[notmatch]) do
Print(j,"/\c");
od;
Print(" for ",Ordinal(notmatch)," argument do not match \ca ",
Print("InstallMethod warning: ", NAME_FUNC(opr), " at \c",INPUT_FILENAME(),":",
INPUT_LINENUMBER()," \c","required filter \c",
NAME_FUNC(filters[notmatch]),
" for ",Ordinal(notmatch)," argument does not match any ",
"declaration\n");
fi;
fi;
Expand Down
152 changes: 58 additions & 94 deletions src/c_oper1.c
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef AVOID_PRECOMPILED
/* C file produced by GAC */
#include "compiled.h"
#define FILE_CRC "72241890"
#define FILE_CRC "-114334241"

/* global variables used in handlers */
static GVar G_REREADING;
Expand Down Expand Up @@ -2776,10 +2776,11 @@ static Obj HdlrFunc6 (
/* else */
else {

/* Print( "InstallMethod warning: ", NAME_FUNC( opr ), "(\c", INPUT_FILENAME( ), "\c +", INPUT_LINENUMBER( ), ") \c", "required filters \c" ); */
/* Print( "InstallMethod warning: ", NAME_FUNC( opr ), " at \c", INPUT_FILENAME( ), ":", INPUT_LINENUMBER( ), " \c", "required filter \c", NAME_FUNC( filters[notmatch] ), " for ", Ordinal( notmatch ), " argument does not match any ",
"declaration\n" ); */
t_1 = GF_Print;
t_2 = NEW_PLIST( T_PLIST, 8 );
SET_LEN_PLIST( t_2, 8 );
t_2 = NEW_PLIST( T_PLIST, 13 );
SET_LEN_PLIST( t_2, 13 );
t_3 = MakeString( "InstallMethod warning: " );
SET_ELM_PLIST( t_2, 1, t_3 );
CHANGED_BAG( t_2 );
Expand All @@ -2793,7 +2794,7 @@ static Obj HdlrFunc6 (
CHECK_FUNC_RESULT( t_3 );
SET_ELM_PLIST( t_2, 2, t_3 );
CHANGED_BAG( t_2 );
t_3 = MakeString( "(\03" );
t_3 = MakeString( " at \03" );
SET_ELM_PLIST( t_2, 3, t_3 );
CHANGED_BAG( t_2 );
t_4 = GF_INPUT__FILENAME;
Expand All @@ -2806,7 +2807,7 @@ static Obj HdlrFunc6 (
CHECK_FUNC_RESULT( t_3 );
SET_ELM_PLIST( t_2, 4, t_3 );
CHANGED_BAG( t_2 );
t_3 = MakeString( "\03 +" );
t_3 = MakeString( ":" );
SET_ELM_PLIST( t_2, 5, t_3 );
CHANGED_BAG( t_2 );
t_4 = GF_INPUT__LINENUMBER;
Expand All @@ -2819,67 +2820,27 @@ static Obj HdlrFunc6 (
CHECK_FUNC_RESULT( t_3 );
SET_ELM_PLIST( t_2, 6, t_3 );
CHANGED_BAG( t_2 );
t_3 = MakeString( ") \03" );
t_3 = MakeString( " \03" );
SET_ELM_PLIST( t_2, 7, t_3 );
CHANGED_BAG( t_2 );
t_3 = MakeString( "required filters \03" );
t_3 = MakeString( "required filter \03" );
SET_ELM_PLIST( t_2, 8, t_3 );
CHANGED_BAG( t_2 );
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
CALL_XARGS( t_1, t_2 );
}
else {
DoOperation2Args( CallFuncListOper, t_1, t_2 );
}

/* for j in NamesFilter( imp[notmatch] ) do */
t_5 = GF_NamesFilter;
t_4 = GF_NAME__FUNC;
CHECK_INT_POS( l_notmatch );
C_ELM_LIST_FPL( t_6, l_imp, l_notmatch )
if ( TNUM_OBJ( t_5 ) == T_FUNCTION ) {
t_4 = CALL_1ARGS( t_5, t_6 );
}
else {
t_4 = DoOperation2Args( CallFuncListOper, t_5, NewPlistFromArgs( t_6 ) );
}
CHECK_FUNC_RESULT( t_4 );
if ( IS_SMALL_LIST(t_4) ) {
t_3 = (Obj)(UInt)1;
t_1 = INTOBJ_INT(1);
C_ELM_LIST_FPL( t_5, l_filters, l_notmatch )
if ( TNUM_OBJ( t_4 ) == T_FUNCTION ) {
t_3 = CALL_1ARGS( t_4, t_5 );
}
else {
t_3 = (Obj)(UInt)0;
t_1 = CALL_1ARGS( GF_ITERATOR, t_4 );
}
while ( 1 ) {
if ( t_3 ) {
if ( LEN_LIST(t_4) < INT_INTOBJ(t_1) ) break;
t_2 = ELMV0_LIST( t_4, INT_INTOBJ(t_1) );
t_1 = (Obj)(((UInt)t_1)+4);
if ( t_2 == 0 ) continue;
}
else {
if ( CALL_1ARGS( GF_IS_DONE_ITER, t_1 ) != False ) break;
t_2 = CALL_1ARGS( GF_NEXT_ITER, t_1 );
}
l_j = t_2;

/* Print( j, "/\c" ); */
t_5 = GF_Print;
t_6 = MakeString( "/\03" );
if ( TNUM_OBJ( t_5 ) == T_FUNCTION ) {
CALL_2ARGS( t_5, l_j, t_6 );
}
else {
DoOperation2Args( CallFuncListOper, t_5, NewPlistFromArgs( l_j, t_6 ) );
}

t_3 = DoOperation2Args( CallFuncListOper, t_4, NewPlistFromArgs( t_5 ) );
}
/* od */

/* Print( " for ", Ordinal( notmatch ), " argument do not match \ca ", "declaration\n" ); */
t_1 = GF_Print;
t_2 = MakeString( " for " );
CHECK_FUNC_RESULT( t_3 );
SET_ELM_PLIST( t_2, 9, t_3 );
CHANGED_BAG( t_2 );
t_3 = MakeString( " for " );
SET_ELM_PLIST( t_2, 10, t_3 );
CHANGED_BAG( t_2 );
t_4 = GF_Ordinal;
if ( TNUM_OBJ( t_4 ) == T_FUNCTION ) {
t_3 = CALL_1ARGS( t_4, l_notmatch );
Expand All @@ -2888,13 +2849,19 @@ static Obj HdlrFunc6 (
t_3 = DoOperation2Args( CallFuncListOper, t_4, NewPlistFromArgs( l_notmatch ) );
}
CHECK_FUNC_RESULT( t_3 );
t_4 = MakeString( " argument do not match \03a " );
t_5 = MakeString( "declaration\n" );
SET_ELM_PLIST( t_2, 11, t_3 );
CHANGED_BAG( t_2 );
t_3 = MakeString( " argument does not match any " );
SET_ELM_PLIST( t_2, 12, t_3 );
CHANGED_BAG( t_2 );
t_3 = MakeString( "declaration\n" );
SET_ELM_PLIST( t_2, 13, t_3 );
CHANGED_BAG( t_2 );
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
CALL_4ARGS( t_1, t_2, t_3, t_4, t_5 );
CALL_XARGS( t_1, t_2 );
}
else {
DoOperation2Args( CallFuncListOper, t_1, NewPlistFromArgs( t_2, t_3, t_4, t_5 ) );
DoOperation2Args( CallFuncListOper, t_1, t_2 );
}

}
Expand Down Expand Up @@ -3719,8 +3686,8 @@ static Obj HdlrFunc7 (
t_6 = NewFunction( NameFunc[8], 1, ArgStringToList("obj"), HdlrFunc8 );
SET_ENVI_FUNC( t_6, STATE(CurrLVars) );
t_7 = NewFunctionBody();
SET_STARTLINE_BODY(t_7, 696);
SET_ENDLINE_BODY(t_7, 714);
SET_STARTLINE_BODY(t_7, 694);
SET_ENDLINE_BODY(t_7, 712);
SET_FILENAME_BODY(t_7, FileName);
SET_BODY_FUNC(t_6, t_7);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -4423,8 +4390,8 @@ static Obj HdlrFunc11 (
t_1 = NewFunction( NameFunc[12], 1, ArgStringToList("key"), HdlrFunc12 );
SET_ENVI_FUNC( t_1, STATE(CurrLVars) );
t_2 = NewFunctionBody();
SET_STARTLINE_BODY(t_2, 893);
SET_ENDLINE_BODY(t_2, 897);
SET_STARTLINE_BODY(t_2, 891);
SET_ENDLINE_BODY(t_2, 895);
SET_FILENAME_BODY(t_2, FileName);
SET_BODY_FUNC(t_1, t_2);
ASS_LVAR( 2, t_1 );
Expand Down Expand Up @@ -4542,8 +4509,8 @@ static Obj HdlrFunc11 (
t_6 = NewFunction( NameFunc[13], 1, ArgStringToList("D"), HdlrFunc13 );
SET_ENVI_FUNC( t_6, STATE(CurrLVars) );
t_7 = NewFunctionBody();
SET_STARTLINE_BODY(t_7, 914);
SET_ENDLINE_BODY(t_7, 914);
SET_STARTLINE_BODY(t_7, 912);
SET_ENDLINE_BODY(t_7, 912);
SET_FILENAME_BODY(t_7, FileName);
SET_BODY_FUNC(t_6, t_7);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -4629,8 +4596,8 @@ static Obj HdlrFunc11 (
t_6 = NewFunction( NameFunc[14], 2, ArgStringToList("D,key"), HdlrFunc14 );
SET_ENVI_FUNC( t_6, STATE(CurrLVars) );
t_7 = NewFunctionBody();
SET_STARTLINE_BODY(t_7, 936);
SET_ENDLINE_BODY(t_7, 959);
SET_STARTLINE_BODY(t_7, 934);
SET_ENDLINE_BODY(t_7, 957);
SET_FILENAME_BODY(t_7, FileName);
SET_BODY_FUNC(t_6, t_7);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -4697,8 +4664,8 @@ static Obj HdlrFunc11 (
t_6 = NewFunction( NameFunc[15], 2, ArgStringToList("D,key"), HdlrFunc15 );
SET_ENVI_FUNC( t_6, STATE(CurrLVars) );
t_7 = NewFunctionBody();
SET_STARTLINE_BODY(t_7, 969);
SET_ENDLINE_BODY(t_7, 977);
SET_STARTLINE_BODY(t_7, 967);
SET_ENDLINE_BODY(t_7, 975);
SET_FILENAME_BODY(t_7, FileName);
SET_BODY_FUNC(t_6, t_7);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -4778,8 +4745,8 @@ static Obj HdlrFunc11 (
t_6 = NewFunction( NameFunc[16], 3, ArgStringToList("D,key,obj"), HdlrFunc16 );
SET_ENVI_FUNC( t_6, STATE(CurrLVars) );
t_7 = NewFunctionBody();
SET_STARTLINE_BODY(t_7, 986);
SET_ENDLINE_BODY(t_7, 999);
SET_STARTLINE_BODY(t_7, 984);
SET_ENDLINE_BODY(t_7, 997);
SET_FILENAME_BODY(t_7, FileName);
SET_BODY_FUNC(t_6, t_7);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -5197,8 +5164,8 @@ static Obj HdlrFunc17 (
t_4 = NewFunction( NameFunc[18], -1, ArgStringToList("arg"), HdlrFunc18 );
SET_ENVI_FUNC( t_4, STATE(CurrLVars) );
t_5 = NewFunctionBody();
SET_STARTLINE_BODY(t_5, 1065);
SET_ENDLINE_BODY(t_5, 1081);
SET_STARTLINE_BODY(t_5, 1063);
SET_ENDLINE_BODY(t_5, 1079);
SET_FILENAME_BODY(t_5, FileName);
SET_BODY_FUNC(t_4, t_5);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -5597,11 +5564,8 @@ static Obj HdlrFunc1 (
if not GAPInfo.CommandLineOptions.N then
Error( "required filters ", NamesFilter( imp[notmatch] ), "\nfor ", Ordinal( notmatch ), " argument do not match a declaration of ", NAME_FUNC( opr ) );
else
Print( "InstallMethod warning: ", NAME_FUNC( opr ), "(\c", INPUT_FILENAME( ), "\c +", INPUT_LINENUMBER( ), ") \c", "required filters \c" );
for j in NamesFilter( imp[notmatch] ) do
Print( j, "/\c" );
od;
Print( " for ", Ordinal( notmatch ), " argument do not match \ca ", "declaration\n" );
Print( "InstallMethod warning: ", NAME_FUNC( opr ), " at \c", INPUT_FILENAME( ), ":", INPUT_LINENUMBER( ), " \c", "required filter \c", NAME_FUNC( filters[notmatch] ), " for ", Ordinal( notmatch ), " argument does not match any "
, "declaration\n" );
fi;
fi;
else
Expand Down Expand Up @@ -5652,7 +5616,7 @@ static Obj HdlrFunc1 (
SET_ENVI_FUNC( t_3, STATE(CurrLVars) );
t_4 = NewFunctionBody();
SET_STARTLINE_BODY(t_4, 378);
SET_ENDLINE_BODY(t_4, 635);
SET_ENDLINE_BODY(t_4, 633);
SET_FILENAME_BODY(t_4, FileName);
SET_BODY_FUNC(t_3, t_4);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -5714,8 +5678,8 @@ static Obj HdlrFunc1 (
t_2 = NewFunction( NameFunc[7], 6, ArgStringToList("name,filter,getter,setter,tester,mutflag"), HdlrFunc7 );
SET_ENVI_FUNC( t_2, STATE(CurrLVars) );
t_3 = NewFunctionBody();
SET_STARTLINE_BODY(t_3, 654);
SET_ENDLINE_BODY(t_3, 718);
SET_STARTLINE_BODY(t_3, 652);
SET_ENDLINE_BODY(t_3, 716);
SET_FILENAME_BODY(t_3, FileName);
SET_BODY_FUNC(t_2, t_3);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand All @@ -5733,8 +5697,8 @@ static Obj HdlrFunc1 (
t_2 = NewFunction( NameFunc[9], 6, ArgStringToList("name,filter,getter,setter,tester,mutflag"), HdlrFunc9 );
SET_ENVI_FUNC( t_2, STATE(CurrLVars) );
t_3 = NewFunctionBody();
SET_STARTLINE_BODY(t_3, 721);
SET_ENDLINE_BODY(t_3, 727);
SET_STARTLINE_BODY(t_3, 719);
SET_ENDLINE_BODY(t_3, 725);
SET_FILENAME_BODY(t_3, FileName);
SET_BODY_FUNC(t_2, t_3);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -5766,8 +5730,8 @@ static Obj HdlrFunc1 (
t_3 = NewFunction( NameFunc[10], 2, ArgStringToList("list,elm"), HdlrFunc10 );
SET_ENVI_FUNC( t_3, STATE(CurrLVars) );
t_4 = NewFunctionBody();
SET_STARTLINE_BODY(t_4, 740);
SET_ENDLINE_BODY(t_4, 764);
SET_STARTLINE_BODY(t_4, 738);
SET_ENDLINE_BODY(t_4, 762);
SET_FILENAME_BODY(t_4, FileName);
SET_BODY_FUNC(t_3, t_4);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -5855,8 +5819,8 @@ static Obj HdlrFunc1 (
t_3 = NewFunction( NameFunc[11], 4, ArgStringToList("name,domreq,keyreq,keytest"), HdlrFunc11 );
SET_ENVI_FUNC( t_3, STATE(CurrLVars) );
t_4 = NewFunctionBody();
SET_STARTLINE_BODY(t_4, 889);
SET_ENDLINE_BODY(t_4, 1000);
SET_STARTLINE_BODY(t_4, 887);
SET_ENDLINE_BODY(t_4, 998);
SET_FILENAME_BODY(t_4, FileName);
SET_BODY_FUNC(t_3, t_4);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -5911,8 +5875,8 @@ static Obj HdlrFunc1 (
t_3 = NewFunction( NameFunc[17], -1, ArgStringToList("arg"), HdlrFunc17 );
SET_ENVI_FUNC( t_3, STATE(CurrLVars) );
t_4 = NewFunctionBody();
SET_STARTLINE_BODY(t_4, 1035);
SET_ENDLINE_BODY(t_4, 1082);
SET_STARTLINE_BODY(t_4, 1033);
SET_ENDLINE_BODY(t_4, 1080);
SET_FILENAME_BODY(t_4, FileName);
SET_BODY_FUNC(t_3, t_4);
if ( TNUM_OBJ( t_1 ) == T_FUNCTION ) {
Expand Down Expand Up @@ -6237,7 +6201,7 @@ static Int InitLibrary ( StructInitInfo * module )
static StructInitInfo module = {
.type = MODULE_STATIC,
.name = "GAPROOT/lib/oper1.g",
.crc = 72241890,
.crc = -114334241,
.initKernel = InitKernel,
.initLibrary = InitLibrary,
.postRestore = PostRestore,
Expand Down
Loading

0 comments on commit 8f971c9

Please sign in to comment.