Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve tracking of InstallMethod and DeclareOperation #2422

Merged
merged 1 commit into from
May 2, 2018
Merged

Improve tracking of InstallMethod and DeclareOperation #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions hpcgap/src/c_oper1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef AVOID_PRECOMPILED
/* C file produced by GAC */
#include <src/compiled.h>
#define FILE_CRC "-121710233"
#define FILE_CRC "-126023111"

/* global variables used in handlers */
static GVar G_REREADING;
Expand Down Expand Up @@ -126,6 +126,8 @@ static GVar G_RankFilter;
static Obj GF_RankFilter;
static GVar G_CHECK__INSTALL__METHOD;
static Obj GC_CHECK__INSTALL__METHOD;
static GVar G_READEVALCOMMAND__LINENUMBER;
static Obj GC_READEVALCOMMAND__LINENUMBER;
static GVar G_INSTALL__METHOD;
static Obj GF_INSTALL__METHOD;
static GVar G_DeclareGlobalFunction;
Expand Down Expand Up @@ -1230,22 +1232,26 @@ static Obj HdlrFunc3 (
t_1 = (Obj)(UInt)(((Int)INTOBJ_INT(5)) >= ((Int)INTOBJ_INT(5)));
if ( t_1 ) {

/* methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), INPUT_LINENUMBER( ) ] ); */
/* methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), READEVALCOMMAND_LINENUMBER, INPUT_LINENUMBER( ) ] ); */
C_SUM_INTOBJS( t_2, l_narg, INTOBJ_INT(5) )
C_SUM_FIA( t_1, l_i, t_2 )
CHECK_INT_POS( t_1 )
t_3 = GF_MakeImmutable;
t_4 = NEW_PLIST( T_PLIST, 2 );
SET_LEN_PLIST( t_4, 2 );
t_4 = NEW_PLIST( T_PLIST, 3 );
SET_LEN_PLIST( t_4, 3 );
t_6 = GF_INPUT__FILENAME;
t_5 = CALL_0ARGS( t_6 );
CHECK_FUNC_RESULT( t_5 )
SET_ELM_PLIST( t_4, 1, t_5 );
CHANGED_BAG( t_4 );
t_5 = GC_READEVALCOMMAND__LINENUMBER;
CHECK_BOUND( t_5, "READEVALCOMMAND_LINENUMBER" )
SET_ELM_PLIST( t_4, 2, t_5 );
CHANGED_BAG( t_4 );
t_6 = GF_INPUT__LINENUMBER;
t_5 = CALL_0ARGS( t_6 );
CHECK_FUNC_RESULT( t_5 )
SET_ELM_PLIST( t_4, 2, t_5 );
SET_ELM_PLIST( t_4, 3, t_5 );
CHANGED_BAG( t_4 );
t_2 = CALL_1ARGS( t_3, t_4 );
CHECK_FUNC_RESULT( t_2 )
Expand Down Expand Up @@ -4030,7 +4036,7 @@ static Obj HdlrFunc1 (
methods[i + (narg + 3)] := rank;
methods[i + (narg + 4)] := IMMUTABLE_COPY_OBJ( info );
if 5 >= 5 then
methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), INPUT_LINENUMBER( ) ] );
methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), READEVALCOMMAND_LINENUMBER, INPUT_LINENUMBER( ) ] );
fi;
SET_METHODS_OPERATION( opr, narg, MakeReadOnlySingleObj( methods ) );
UNLOCK( lk );
Expand Down Expand Up @@ -4569,6 +4575,7 @@ static Int PostRestore ( StructInitInfo * module )
G_METHODS__OPERATION__REGION = GVarName( "METHODS_OPERATION_REGION" );
G_RankFilter = GVarName( "RankFilter" );
G_CHECK__INSTALL__METHOD = GVarName( "CHECK_INSTALL_METHOD" );
G_READEVALCOMMAND__LINENUMBER = GVarName( "READEVALCOMMAND_LINENUMBER" );
G_INSTALL__METHOD = GVarName( "INSTALL_METHOD" );
G_DeclareGlobalFunction = GVarName( "DeclareGlobalFunction" );
G_OPERATIONS__REGION = GVarName( "OPERATIONS_REGION" );
Expand Down Expand Up @@ -4691,6 +4698,7 @@ static Int InitKernel ( StructInitInfo * module )
InitCopyGVar( "METHODS_OPERATION_REGION", &GC_METHODS__OPERATION__REGION );
InitFopyGVar( "RankFilter", &GF_RankFilter );
InitCopyGVar( "CHECK_INSTALL_METHOD", &GC_CHECK__INSTALL__METHOD );
InitCopyGVar( "READEVALCOMMAND_LINENUMBER", &GC_READEVALCOMMAND__LINENUMBER );
InitFopyGVar( "INSTALL_METHOD", &GF_INSTALL__METHOD );
InitFopyGVar( "DeclareGlobalFunction", &GF_DeclareGlobalFunction );
InitCopyGVar( "OPERATIONS_REGION", &GC_OPERATIONS__REGION );
Expand Down Expand Up @@ -4791,7 +4799,7 @@ static Int InitLibrary ( StructInitInfo * module )
static StructInitInfo module = {
.type = MODULE_STATIC,
.name = "GAPROOT/lib/oper1.g",
.crc = -121710233,
.crc = -126023111,
.initKernel = InitKernel,
.initLibrary = InitLibrary,
.postRestore = PostRestore,
Expand Down
4 changes: 2 additions & 2 deletions lib/oper.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ function(oper, flags)
fi;
info := OPER_FLAGS.(nr);
ADD_LIST(info[2], MakeImmutable(flags));
ADD_LIST(info[3], MakeImmutable([INPUT_FILENAME(), INPUT_LINENUMBER()]));
ADD_LIST(info[3], MakeImmutable([INPUT_FILENAME(), READEVALCOMMAND_LINENUMBER, INPUT_LINENUMBER()]));
end);

BIND_GLOBAL( "GET_OPER_FLAGS", function(oper)
Expand Down Expand Up @@ -410,7 +410,7 @@ BIND_GLOBAL( "INSTALL_IMMEDIATE_METHOD",
imm[i+6] := pos;
imm[i+7] := IMMUTABLE_COPY_OBJ(info);
if SIZE_IMMEDIATE_METHOD_ENTRY >= 8 then
imm[i+8] := MakeImmutable([INPUT_FILENAME(), INPUT_LINENUMBER()]);
imm[i+8] := MakeImmutable([INPUT_FILENAME(), READEVALCOMMAND_LINENUMBER, INPUT_LINENUMBER()]);
fi;

if IsHPCGAP then
Expand Down
2 changes: 1 addition & 1 deletion lib/oper1.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ BIND_GLOBAL( "INSTALL_METHOD_FLAGS",

methods[i+(narg+4)] := IMMUTABLE_COPY_OBJ(info);
if BASE_SIZE_METHODS_OPER_ENTRY >= 5 then
methods[i+(narg+5)] := MakeImmutable([INPUT_FILENAME(), INPUT_LINENUMBER()]);
methods[i+(narg+5)] := MakeImmutable([INPUT_FILENAME(), READEVALCOMMAND_LINENUMBER, INPUT_LINENUMBER()]);
fi;

# flush the cache
Expand Down
22 changes: 15 additions & 7 deletions src/c_oper1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef AVOID_PRECOMPILED
/* C file produced by GAC */
#include <src/compiled.h>
#define FILE_CRC "-121710233"
#define FILE_CRC "-126023111"

/* global variables used in handlers */
static GVar G_REREADING;
Expand Down Expand Up @@ -114,6 +114,8 @@ static GVar G_RankFilter;
static Obj GF_RankFilter;
static GVar G_CHECK__INSTALL__METHOD;
static Obj GC_CHECK__INSTALL__METHOD;
static GVar G_READEVALCOMMAND__LINENUMBER;
static Obj GC_READEVALCOMMAND__LINENUMBER;
static GVar G_INSTALL__METHOD;
static Obj GF_INSTALL__METHOD;
static GVar G_DeclareGlobalFunction;
Expand Down Expand Up @@ -1198,22 +1200,26 @@ static Obj HdlrFunc3 (
t_1 = (Obj)(UInt)(((Int)INTOBJ_INT(5)) >= ((Int)INTOBJ_INT(5)));
if ( t_1 ) {

/* methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), INPUT_LINENUMBER( ) ] ); */
/* methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), READEVALCOMMAND_LINENUMBER, INPUT_LINENUMBER( ) ] ); */
C_SUM_INTOBJS( t_2, l_narg, INTOBJ_INT(5) )
C_SUM_FIA( t_1, l_i, t_2 )
CHECK_INT_POS( t_1 )
t_3 = GF_MakeImmutable;
t_4 = NEW_PLIST( T_PLIST, 2 );
SET_LEN_PLIST( t_4, 2 );
t_4 = NEW_PLIST( T_PLIST, 3 );
SET_LEN_PLIST( t_4, 3 );
t_6 = GF_INPUT__FILENAME;
t_5 = CALL_0ARGS( t_6 );
CHECK_FUNC_RESULT( t_5 )
SET_ELM_PLIST( t_4, 1, t_5 );
CHANGED_BAG( t_4 );
t_5 = GC_READEVALCOMMAND__LINENUMBER;
CHECK_BOUND( t_5, "READEVALCOMMAND_LINENUMBER" )
SET_ELM_PLIST( t_4, 2, t_5 );
CHANGED_BAG( t_4 );
t_6 = GF_INPUT__LINENUMBER;
t_5 = CALL_0ARGS( t_6 );
CHECK_FUNC_RESULT( t_5 )
SET_ELM_PLIST( t_4, 2, t_5 );
SET_ELM_PLIST( t_4, 3, t_5 );
CHANGED_BAG( t_4 );
t_2 = CALL_1ARGS( t_3, t_4 );
CHECK_FUNC_RESULT( t_2 )
Expand Down Expand Up @@ -3946,7 +3952,7 @@ static Obj HdlrFunc1 (
methods[i + (narg + 3)] := rank;
methods[i + (narg + 4)] := IMMUTABLE_COPY_OBJ( info );
if 5 >= 5 then
methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), INPUT_LINENUMBER( ) ] );
methods[i + (narg + 5)] := MakeImmutable( [ INPUT_FILENAME( ), READEVALCOMMAND_LINENUMBER, INPUT_LINENUMBER( ) ] );
fi;
CHANGED_METHODS_OPERATION( opr, narg );
return;
Expand Down Expand Up @@ -4478,6 +4484,7 @@ static Int PostRestore ( StructInitInfo * module )
G_IMMEDIATE__METHODS = GVarName( "IMMEDIATE_METHODS" );
G_RankFilter = GVarName( "RankFilter" );
G_CHECK__INSTALL__METHOD = GVarName( "CHECK_INSTALL_METHOD" );
G_READEVALCOMMAND__LINENUMBER = GVarName( "READEVALCOMMAND_LINENUMBER" );
G_INSTALL__METHOD = GVarName( "INSTALL_METHOD" );
G_DeclareGlobalFunction = GVarName( "DeclareGlobalFunction" );
G_EvalString = GVarName( "EvalString" );
Expand Down Expand Up @@ -4592,6 +4599,7 @@ static Int InitKernel ( StructInitInfo * module )
InitCopyGVar( "IMMEDIATE_METHODS", &GC_IMMEDIATE__METHODS );
InitFopyGVar( "RankFilter", &GF_RankFilter );
InitCopyGVar( "CHECK_INSTALL_METHOD", &GC_CHECK__INSTALL__METHOD );
InitCopyGVar( "READEVALCOMMAND_LINENUMBER", &GC_READEVALCOMMAND__LINENUMBER );
InitFopyGVar( "INSTALL_METHOD", &GF_INSTALL__METHOD );
InitFopyGVar( "DeclareGlobalFunction", &GF_DeclareGlobalFunction );
InitFopyGVar( "EvalString", &GF_EvalString );
Expand Down Expand Up @@ -4690,7 +4698,7 @@ static Int InitLibrary ( StructInitInfo * module )
static StructInitInfo module = {
.type = MODULE_STATIC,
.name = "GAPROOT/lib/oper1.g",
.crc = -121710233,
.crc = -126023111,
.initKernel = InitKernel,
.initLibrary = InitLibrary,
.postRestore = PostRestore,
Expand Down
2 changes: 2 additions & 0 deletions src/read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2769,6 +2769,8 @@ ExecStatus ReadEvalCommand(Obj context, Obj *evalResult, UInt *dualSemicolon)
lockSP = RegionLockSP();
#endif

AssGVar(GVarName("READEVALCOMMAND_LINENUMBER"), INTOBJ_INT(GetInputLineNumber()));

IntrBegin( context );

/* read an expression or an assignment or a procedure call */
Expand Down