From: Sam H. v. a. <we...@ma...> - 2008-05-08 00:53:01
|
Log Message: ----------- add "my" and "our" specifiers to ^variable definitions. (This breaks compatibility with the current version of ww-symbol-map, but it is the format that the upcoming version will use. I hope to commit that new version soon but testing is taking longer than expected.) Modified Files: -------------- pg/macros: PG.pl PGanswermacros.pl Parser.pl dangerousMacros.pl Revision Data ------------- Index: Parser.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/Parser.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -Lmacros/Parser.pl -Lmacros/Parser.pl -u -r1.15 -r1.16 --- macros/Parser.pl +++ macros/Parser.pl @@ -116,7 +116,7 @@ # ^uses Parser::Context::current # ^uses %context sub Context {Parser::Context->current(\%context,@_)} -# ^variable %context +# ^variable our %context %context = (); # Locally defined contexts, including 'current' context # ^uses Context Context(); # Initialize context (for persistent mod_perl) @@ -343,7 +343,7 @@ ########################################################################### -# ^variable $_parser_loaded +# ^variable our $_parser_loaded $_parser_loaded = 1; # use this to tell if Parser.pl is loaded # ^function _Parser_init Index: dangerousMacros.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/dangerousMacros.pl,v retrieving revision 1.51 retrieving revision 1.52 diff -Lmacros/dangerousMacros.pl -Lmacros/dangerousMacros.pl -u -r1.51 -r1.52 --- macros/dangerousMacros.pl +++ macros/dangerousMacros.pl @@ -97,24 +97,24 @@ } -# ^variable $debugON +# ^variable my $debugON my $debugON = 0; # grab read only variables from the current safe compartment -# ^variable $macrosPath +# ^variable my $macrosPath my ($macrosPath, - # ^variable $pwd + # ^variable my $pwd $pwd, - # ^variable $appletPath + # ^variable my $appletPath $appletPath, - # ^variable $server_root_url + # ^variable my $server_root_url $server_root_url, - # ^variable $templateDirectory + # ^variable my $templateDirectory $templateDirectory, - # ^variable $scriptDirectory + # ^variable my $scriptDirectory $scriptDirectory, - # ^variable $externalTTHPath + # ^variable my $externalTTHPath $externalTTHPath, ); @@ -369,7 +369,7 @@ return ($response) ? 0 : 1; # 0 indicates success, 256 is failure possibly more checks can be made } -# ^variable %appletCodebaseLocations +# ^variable our %appletCodebaseLocations our %appletCodebaseLocations = (); # ^function findAppletCodebase # ^uses %appletCodebaseLocations @@ -505,9 +505,9 @@ # only needs to be read once. however, the contents of the file may change, # and indeed the file refered to may change, between rendering passes. thus, # we need to keep track of the file name and the mtime as well. -# ^variable $tthPreambleFile -# ^variable $tthPreambleMtime -# ^variable $tthPreambleContents +# ^variable my $tthPreambleFile +# ^variable my $tthPreambleMtime +# ^variable my $tthPreambleContents my ($tthPreambleFile, $tthPreambleMtime, $tthPreambleContents); # ^function tth @@ -617,7 +617,7 @@ =cut -# ^variable $math2imgCount +# ^variable my $math2imgCount my $math2imgCount = 0; # ^function math2img Index: PG.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/PG.pl,v retrieving revision 1.36 retrieving revision 1.37 diff -Lmacros/PG.pl -Lmacros/PG.pl -u -r1.36 -r1.37 --- macros/PG.pl +++ macros/PG.pl @@ -107,18 +107,18 @@ # Private variables for the PG.pl file. -# ^variable $STRINGforOUTPUT +# ^variable my $STRINGforOUTPUT my $STRINGforOUTPUT; -# ^variable $STRINGforHEADER_TEXT +# ^variable my $STRINGforHEADER_TEXT my $STRINGforHEADER_TEXT; -# ^variable @PG_ANSWERS +# ^variable my @PG_ANSWERS my @PG_ANSWERS; -# ^variable @PG_UNLABELED_ANSWERS +# ^variable my @PG_UNLABELED_ANSWERS my @PG_UNLABELED_ANSWERS; -# ^variable %PG_ANSWERS_HASH +# ^variable my %PG_ANSWERS_HASH my %PG_ANSWERS_HASH; -# ^variable $PG_STOP_FLAG +# ^variable our $PG_STOP_FLAG our $PG_STOP_FLAG; # my variables are unreliable if two DOCUMENTS were to be called before an ENDDOCUMENT Index: PGanswermacros.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/PGanswermacros.pl,v retrieving revision 1.67 retrieving revision 1.68 diff -Lmacros/PGanswermacros.pl -Lmacros/PGanswermacros.pl -u -r1.67 -r1.68 --- macros/PGanswermacros.pl +++ macros/PGanswermacros.pl @@ -138,15 +138,15 @@ # variables. We do this once here and place the values in lexicals for later # access. -# ^variable $BR +# ^variable my $BR my $BR; -# ^variable $functLLimitDefault +# ^variable my $functLLimitDefault my $functLLimitDefault; -# ^variable $functULimitDefault +# ^variable my $functULimitDefault my $functULimitDefault; -# ^variable $functVarDefault +# ^variable my $functVarDefault my $functVarDefault; -# ^variable $useBaseTenLog +# ^variable my $useBaseTenLog my $useBaseTenLog; # ^function _PGanswermacros_init |