Log Message:
-----------
Moved placement of loadMacros(subfiles) to inside the
_PGanswermacros_init() subroutine. Even though the subfiles
do not have to be recompiled they do have to be reinitialized every time they are
used and calling loadMacros() is the appropriate way to insure this.
loadMacros() is smart about recompiling only if necessary.
Modified Files:
--------------
pg/macros:
PGanswermacros.pl
Revision Data
-------------
Index: PGanswermacros.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/PGanswermacros.pl,v
retrieving revision 1.65
retrieving revision 1.66
diff -Lmacros/PGanswermacros.pl -Lmacros/PGanswermacros.pl -u -r1.65 -r1.66
--- macros/PGanswermacros.pl
+++ macros/PGanswermacros.pl
@@ -142,6 +142,11 @@
my $functVarDefault;
my $useBaseTenLog;
sub _PGanswermacros_init {
+ loadMacros('PGnumericevaluators.pl'); # even if these files are already loaded they need to be initialized.
+ loadMacros('PGfunctionevaluators.pl');
+ loadMacros('PGstringevaluators.pl');
+ loadMacros('PGmiscevaluators.pl');
+
$BR = PG_restricted_eval(q/$BR/);
$functLLimitDefault = PG_restricted_eval(q/$envir{functLLimitDefault}/);
$functULimitDefault = PG_restricted_eval(q/$envir{functULimitDefault}/);
@@ -1763,11 +1768,6 @@
$out;
}
-BEGIN {
- loadMacros('PGnumericevaluators.pl');
- loadMacros('PGfunctionevaluators.pl');
- loadMacros('PGstringevaluators.pl');
- loadMacros('PGmiscevaluators.pl');
-}
+
1;
|
