Skip to content

Commit fca7bf3

Browse files
committed
revert to previous version of PGloadfiles
1 parent 5227df9 commit fca7bf3

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

lib/PGloadfiles.pm

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ package PGloadfiles;
5959
use strict;
6060
#use Encode(qw(encode decode));
6161
use Exporter;
62-
6362
use PGcore;
6463
use WeBWorK::PG::Translator;
6564
use WeBWorK::PG::IO;
@@ -75,11 +74,10 @@ sub new {
7574
my $envir = shift; #pointer to environment hash
7675
warn "PGloadmacros must be called with an environment" unless ref($envir) eq 'HASH';
7776
my $self = {
78-
envir => $envir,
79-
macroFileList => {}, # records macros used in compilation
80-
macrosPath => '',
81-
pwd => '', # current directory -- defined in initialize
82-
deprecated_macros => [],
77+
envir => $envir,
78+
macroFileList => {}, # records macros used in compilation
79+
macrosPath => '',
80+
pwd => '', # current directory -- defined in initialize
8381
};
8482
bless $self, $class;
8583
$self->initialize;
@@ -125,6 +123,7 @@ sub loadMacros {
125123
# At this point the directories have been defined from %envir and we can define
126124
# the directories for this file
127125
###############################################################################
126+
128127
while (@files) {
129128
$fileName = shift @files;
130129

@@ -152,9 +151,6 @@ sub loadMacros {
152151
unless ($macro_file_loaded) {
153152
warn "loadMacros: loading macro file $fileName" if $debugON;
154153
my $filePath = $self->findMacroFile($fileName);
155-
my @dirs = split('/', $filePath);
156-
push(@{ $self->{deprecated_macros} }, $dirs[$#dirs]) if $dirs[ $#dirs - 1 ] eq 'deprecated';
157-
158154
#### (check for renamed files here?) ####
159155
warn "loadMacros: look for $fileName at |$filePath|" if $debugON;
160156
if ($filePath) {

0 commit comments

Comments
 (0)