kernel: remove unused print hooks

Author: fingolfin

src/exprs.c

@@ -1194,29 +1194,39 @@ static void RecExpr2(Obj rec, Expr expr)
 
 /****************************************************************************
 **
-*F  PrintExpr(<expr>) . . . . . . . . . . . . . . . . . . print an expression
+*V  PrintExprFuncs[<type>]  . .  printing function for objects of type <type>
 **
-**  'PrintExpr' prints the expression <expr>.
+**  'PrintExprFuncs' is the dispatching table that contains for every type of
+**  expressions a pointer to the printer for expressions  of this type, i.e.,
+**  the function that should be called to print expressions of this type.
+*/
+static PrintExprFunc PrintExprFuncs[256];
+
+
+/****************************************************************************
 **
-**  'PrintExpr' simply dispatches  through  the table 'PrintExprFuncs' to the
-**  appropriate printer.
+*F  InstallPrintExprFunc(<pos>,<f>)
 */
-void            PrintExpr (
-    Expr                expr )
+void InstallPrintExprFunc(unsigned int pos, PrintExprFunc f)
 {
-    (*PrintExprFuncs[ TNUM_EXPR(expr) ])( expr );
+    GAP_ASSERT(pos < ARRAY_SIZE(PrintExprFuncs));
+    PrintExprFuncs[pos] = f;
 }
 
 
 /****************************************************************************
 **
-*V  PrintExprFuncs[<type>]  . .  printing function for objects of type <type>
+*F  PrintExpr(<expr>) . . . . . . . . . . . . . . . . . . print an expression
 **
-**  'PrintExprFuncs' is the dispatching table that contains for every type of
-**  expressions a pointer to the printer for expressions  of this type, i.e.,
-**  the function that should be called to print expressions of this type.
+**  'PrintExpr' prints the expression <expr>.
+**
+**  'PrintExpr' simply dispatches  through  the table 'PrintExprFuncs' to the
+**  appropriate printer.
 */
-PrintExprFunc PrintExprFuncs[256];
+void PrintExpr(Expr expr)
+{
+    (*PrintExprFuncs[TNUM_EXPR(expr)])(expr);
+}
 
 
 /****************************************************************************

src/exprs.h

@@ -141,15 +141,7 @@ void PrintExpr(Expr expr);
 void PrintRecExpr1(Expr expr); /* needed for printing
                                        function calls with options */
 
-/****************************************************************************
-**
-*V  PrintExprFuncs[<type>]  . .  printing function for objects of type <type>
-**
-**  'PrintExprFuncs' is the dispatching table that contains for every type of
-**  expressions a pointer to the printer for expressions  of this type, i.e.,
-**  the function that should be called to print expressions of this type.
-*/
-extern PrintExprFunc PrintExprFuncs[256];
+void InstallPrintExprFunc(unsigned int pos, PrintExprFunc f);
 
 
 /****************************************************************************

src/hookintrprtr.c

@@ -30,9 +30,6 @@ struct InterpreterHooks * activeHooks[HookCount];
 // Number of active hooks
 static Int HookActiveCount;
 
-// If a print hook is current active
-static Int PrintHookActive;
-
 /****************************************************************************
 **
 ** Store the true values of each function we wrap for hooking. These always
@@ -44,9 +41,6 @@ ExecStatFunc OriginalExecStatFuncsForHook[256];
 EvalExprFunc OriginalEvalExprFuncsForHook[256];
 EvalBoolFunc OriginalEvalBoolFuncsForHook[256];
 
-PrintStatFunc OriginalPrintStatFuncsForHook[256];
-PrintExprFunc OriginalPrintExprFuncsForHook[256];
-
 /****************************************************************************
 **
 ** These functions install implementations of eval/expr functions,
@@ -83,26 +77,6 @@ void InstallExecStatFunc(Int pos, ExecStatFunc f)
     HashUnlock(&activeHooks);
 }
 
-void InstallPrintStatFunc(Int pos, PrintStatFunc f)
-{
-    OriginalPrintStatFuncsForHook[pos] = f;
-    HashLock(&activeHooks);
-    if(!PrintHookActive) {
-        PrintStatFuncs[pos] = f;
-    }
-    HashUnlock(&activeHooks);
-}
-
-void InstallPrintExprFunc(Int pos, PrintExprFunc f)
-{
-    OriginalPrintExprFuncsForHook[pos] = f;
-    HashLock(&activeHooks);
-    if(!PrintHookActive) {
-        PrintExprFuncs[pos] = f;
-    }
-    HashUnlock(&activeHooks);
-}
-
 static ExecStatus ProfileExecStatPassthrough(Stat stat)
 {
     GAP_HOOK_LOOP(visitStat, stat);
@@ -191,34 +165,6 @@ Int DeactivateHooks(struct InterpreterHooks * hook)
     return 1;
 }
 
-void ActivatePrintHooks(struct PrintHooks * hook)
-{
-    Int i;
-
-    if (PrintHookActive) {
-        return;
-    }
-    PrintHookActive = 1;
-    for (i = 0; i < ARRAY_SIZE(ExecStatFuncs); i++) {
-        if (hook->printStatPassthrough) {
-            PrintStatFuncs[i] = hook->printStatPassthrough;
-        }
-        if (hook->printExprPassthrough) {
-            PrintExprFuncs[i] = hook->printExprPassthrough;
-        }
-    }
-}
-
-void DeactivatePrintHooks(struct PrintHooks * hook)
-{
-    if (!PrintHookActive) {
-        return;
-    }
-    PrintHookActive = 0;
-    memcpy(PrintStatFuncs, OriginalPrintStatFuncsForHook, sizeof(PrintStatFuncs));
-    memcpy(PrintExprFuncs, OriginalPrintExprFuncsForHook, sizeof(PrintExprFuncs));
-}
-
 /****************************************************************************
 **
 *F * * * * * * * * * * * * * initialize module * * * * * * * * * * * * * * *

src/hookintrprtr.h

@@ -19,8 +19,6 @@
 void InstallEvalBoolFunc(Int, EvalBoolFunc);
 void InstallEvalExprFunc(Int, EvalExprFunc);
 void InstallExecStatFunc(Int, ExecStatFunc);
-void InstallPrintStatFunc(Int, PrintStatFunc);
-void InstallPrintExprFunc(Int, PrintExprFunc);
 
 
 /****************************************************************************
@@ -36,9 +34,6 @@ extern ExecStatFunc OriginalExecStatFuncsForHook[256];
 extern EvalExprFunc OriginalEvalExprFuncsForHook[256];
 extern EvalBoolFunc OriginalEvalBoolFuncsForHook[256];
 
-extern PrintStatFunc OriginalPrintStatFuncsForHook[256];
-extern PrintExprFunc OriginalPrintExprFuncsForHook[256];
-
 
 /****************************************************************************
 **
@@ -91,25 +86,6 @@ extern struct InterpreterHooks * activeHooks[HookCount];
 Int ActivateHooks(struct InterpreterHooks * hook);
 Int DeactivateHooks(struct InterpreterHooks * hook);
 
-/****************************************************************************
-**
-** A struct to represent the hooks allowed into printing functions
-**
-**
-** This struct represents a list of functions which will be called whenever
-** a statement or expression is printed. They can be used to provide
-** simple customisation of printing. At the moment they are used by
-** profiling.c, to mark statements which have been executed.
-** Look at that code to get an idea how to use them.
-*/
-struct PrintHooks {
-    void (*printStatPassthrough)(Stat stat);
-    void (*printExprPassthrough)(Expr stat);
-};
-
-void ActivatePrintHooks(struct PrintHooks * hook);
-void DeactivatePrintHooks(struct PrintHooks * hook);
-
 /****************************************************************************
 **
 ** We need the functions in the next three functions to be in the header,

src/stats.c

@@ -1137,31 +1137,42 @@ void ClearError ( void )
     }
 }
 
+
 /****************************************************************************
 **
-*F  PrintStat(<stat>) . . . . . . . . . . . . . . . . . . . print a statement
+*V  PrintStatFuncs[<type>]  . .  print function for statements of type <type>
 **
-**  'PrintStat' prints the statements <stat>.
+**  'PrintStatFuncs' is the dispatching table that contains for every type of
+**  statements a pointer to the  printer for statements  of this type,  i.e.,
+**  the function that should be called to print statements of this type.
+*/
+static PrintStatFunc PrintStatFuncs[256];
+
+
+/****************************************************************************
 **
-**  'PrintStat' simply dispatches  through the table  'PrintStatFuncs' to the
-**  appropriate printer.
+*F  InstallPrintStatFunc(<pos>,<f>)
 */
-void            PrintStat (
-    Stat                stat )
+void InstallPrintStatFunc(unsigned int pos, PrintStatFunc f)
 {
-    (*PrintStatFuncs[TNUM_STAT(stat)])( stat );
+    GAP_ASSERT(pos < ARRAY_SIZE(PrintStatFuncs));
+    PrintStatFuncs[pos] = f;
 }
 
 
 /****************************************************************************
 **
-*V  PrintStatFuncs[<type>]  . .  print function for statements of type <type>
+*F  PrintStat(<stat>) . . . . . . . . . . . . . . . . . . . print a statement
 **
-**  'PrintStatFuncs' is the dispatching table that contains for every type of
-**  statements a pointer to the  printer for statements  of this type,  i.e.,
-**  the function that should be called to print statements of this type.
+**  'PrintStat' prints the statements <stat>.
+**
+**  'PrintStat' simply dispatches  through the table  'PrintStatFuncs' to the
+**  appropriate printer.
 */
-PrintStatFunc PrintStatFuncs[256];
+void PrintStat(Stat stat)
+{
+    (*PrintStatFuncs[TNUM_STAT(stat)])(stat);
+}
 
 
 /****************************************************************************

src/stats.h

@@ -109,15 +109,7 @@ void InterruptExecStat(void);
 void PrintStat(Stat stat);
 
 
-/****************************************************************************
-**
-*V  PrintStatFuncs[<type>]  . .  print function for statements of type <type>
-**
-**  'PrintStatFuncs' is the dispatching table that contains for every type of
-**  statements a pointer to the  printer for statements  of this type,  i.e.,
-**  the function that should be called to print statements of this type.
-*/
-extern PrintStatFunc PrintStatFuncs[256];
+void InstallPrintStatFunc(unsigned int pos, PrintStatFunc f);
 
 
 /****************************************************************************