Log Message:
-----------
Adjusted some spacing
Modified Files:
--------------
pg/lib/Value/Context:
Data.pm
pg/macros:
PGcommonFunctions.pl
Revision Data
-------------
Index: Data.pm
===================================================================
RCS file: /webwork/cvs/system/pg/lib/Value/Context/Data.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -Llib/Value/Context/Data.pm -Llib/Value/Context/Data.pm -u -r1.4 -r1.5
--- lib/Value/Context/Data.pm
+++ lib/Value/Context/Data.pm
@@ -61,7 +61,7 @@
foreach my $x (@_) {$x = protectRegexp($x)}
my @pattern = ();
push(@pattern,join('|',@_)) if scalar(@_) > 0;
- push(@pattern,protectRegexp($s)) if length($s) ==1;
+ push(@pattern,protectRegexp($s)) if length($s) == 1;
push(@pattern,"[".protectChars($s)."]") if length($s) > 1;
my $pattern = join('|',@pattern);
$pattern = '^$' if $pattern eq '';
Index: PGcommonFunctions.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/PGcommonFunctions.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lmacros/PGcommonFunctions.pl -Lmacros/PGcommonFunctions.pl -u -r1.5 -r1.6
--- macros/PGcommonFunctions.pl
+++ macros/PGcommonFunctions.pl
@@ -62,20 +62,19 @@
sub sgn {$_[1] <=> 0}
-#our @ISA = qw(Parser::Function::numeric2);
sub C {
shift; my ($n,$r) = @_; my $C = 1;
- return (0) if($r>$n);
+ return(0) if ($r>$n);
$r = $n-$r if ($r > $n-$r); # find the smaller of the two
for (1..$r) {$C = ($C*($n-$_+1))/$_}
- return $C
+ return $C;
}
sub P {
shift; my ($n,$r) = @_; my $P = 1;
- return (0) if($r>$n);
+ return(0) if ($r>$n);
for (1..$r) {$P *= ($n-$_+1)}
- return $P
+ return $P;
}
|