@@ -53,7 +53,6 @@ package PGloadfiles;
5353use strict;
5454# use Encode(qw(encode decode));
5555use Exporter;
56-
5756use PGcore;
5857use WeBWorK::PG::Translator;
5958use WeBWorK::PG::IO;
@@ -69,11 +68,10 @@ sub new {
6968 my $envir = shift ; # pointer to environment hash
7069 warn " PGloadmacros must be called with an environment" unless ref ($envir ) eq ' HASH' ;
7170 my $self = {
72- envir => $envir ,
73- macroFileList => {}, # records macros used in compilation
74- macrosPath => ' ' ,
75- pwd => ' ' , # current directory -- defined in initialize
76- deprecated_macros => [],
71+ envir => $envir ,
72+ macroFileList => {}, # records macros used in compilation
73+ macrosPath => ' ' ,
74+ pwd => ' ' , # current directory -- defined in initialize
7775 };
7876 bless $self , $class ;
7977 $self -> initialize;
@@ -119,6 +117,7 @@ sub loadMacros {
119117 # At this point the directories have been defined from %envir and we can define
120118 # the directories for this file
121119 # ##############################################################################
120+
122121 while (@files ) {
123122 $fileName = shift @files ;
124123
@@ -146,9 +145,6 @@ sub loadMacros {
146145 unless ($macro_file_loaded ) {
147146 warn " loadMacros: loading macro file $fileName " if $debugON ;
148147 my $filePath = $self -> findMacroFile($fileName );
149- my @dirs = split (' /' , $filePath );
150- push (@{ $self -> {deprecated_macros } }, $dirs [$#dirs ]) if $dirs [ $#dirs - 1 ] eq ' deprecated' ;
151-
152148 # ### (check for renamed files here?) ####
153149 warn " loadMacros: look for $fileName at |$filePath |" if $debugON ;
154150 if ($filePath ) {
0 commit comments