[system] / trunk / pg / macros / dangerousMacros.pl Repository:
ViewVC logotype

Diff of /trunk/pg/macros/dangerousMacros.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1267 Revision 1280
202 my $init_subroutine_name = "_${macro_file_name}_init"; 202 my $init_subroutine_name = "_${macro_file_name}_init";
203 my $init_subroutine = eval { \&{$init_subroutine_name} }; 203 my $init_subroutine = eval { \&{$init_subroutine_name} };
204 use strict; 204 use strict;
205 my $macro_file_loaded = defined($init_subroutine); 205 my $macro_file_loaded = defined($init_subroutine);
206 warn "dangerousMacros: macro init $init_subroutine_name defined |$init_subroutine| |$macro_file_loaded|" if $debugON; 206 warn "dangerousMacros: macro init $init_subroutine_name defined |$init_subroutine| |$macro_file_loaded|" if $debugON;
207 if ( defined( &{$init_subroutine} ) ) { 207 if ( defined($init_subroutine) && defined( &{$init_subroutine} ) ) {
208 208
209 warn "dangerousMacros: initializing $macro_file_name" if $debugON; 209 warn "dangerousMacros: initializing $macro_file_name" if $debugON;
210 &$init_subroutine(); 210 &$init_subroutine();
211 } 211 }
212 } 212 }
269 $init_subroutine = eval { \&{'main::'.$init_subroutine_name} }; 269 $init_subroutine = eval { \&{'main::'.$init_subroutine_name} };
270 use strict; 270 use strict;
271 #warn "loadMacros: defining \$temp::rf_init_subroutine ",$temp::rf_init_subroutine; 271 #warn "loadMacros: defining \$temp::rf_init_subroutine ",$temp::rf_init_subroutine;
272 warn "init file defined: $macro_file_name = ", defined(&{$init_subroutine}) if $debugON; 272 warn "init file defined: $macro_file_name = ", defined(&{$init_subroutine}) if $debugON;
273 273
274 if ( defined( &{$init_subroutine} ) ) { 274 if ( defined($init_subroutine) && defined( &{$init_subroutine} ) ) {
275 275
276 warn "dangerousMacros: initializing $macro_file_name" if $debugON; 276 warn "dangerousMacros: initializing $macro_file_name" if $debugON;
277 &$init_subroutine(); 277 &$init_subroutine();
278 } 278 }
279 #warn "main:: contains <br>\n $macro_file_name ".join("<br>\n $macro_file_name ", %main::); 279 #warn "main:: contains <br>\n $macro_file_name ".join("<br>\n $macro_file_name ", %main::);

Legend:
Removed from v.1267  
changed lines
  Added in v.1280

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9