From: dpvc v. a. <we...@ma...> - 2007-09-15 14:52:03
|
Log Message: ----------- Cosmetic changes. Modified Files: -------------- pg/lib/Parser: Number.pm pg/lib/Parser/BOP: equality.pm Revision Data ------------- Index: Number.pm =================================================================== RCS file: /webwork/cvs/system/pg/lib/Parser/Number.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -Llib/Parser/Number.pm -Llib/Parser/Number.pm -u -r1.17 -r1.18 --- lib/Parser/Number.pm +++ lib/Parser/Number.pm @@ -11,11 +11,11 @@ sub new { my $self = shift; my $class = ref($self) || $self; my $equation = shift; my $context = $equation->{context}; - my $num; my ($value,$ref) = @_; + my ($value,$ref) = @_; return $self->Item("Complex",$context)->new($equation,$value,$ref) if (ref($value) eq 'ARRAY'); $value = $value->value while Value::isReal($value); - $num = bless { + my $num = bless { value => $value + 0, # format the value as a number, just in case value_string => $value, # for decimal checking, etc. type => $Value::Type{number}, isConstant => 1, Index: equality.pm =================================================================== RCS file: /webwork/cvs/system/pg/lib/Parser/BOP/equality.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -Llib/Parser/BOP/equality.pm -Llib/Parser/BOP/equality.pm -u -r1.14 -r1.15 --- lib/Parser/BOP/equality.pm +++ lib/Parser/BOP/equality.pm @@ -40,7 +40,7 @@ $self = $self->Item("BOP")->new($equation,'=',$self->{lop}{op},$self->{rop}{op}); $self = $self->reduce; } - if ($self->{lop}->isNeg && $self->{rop}{isConstant} && + if ($self->{lop}->isNeg && $self->{rop}{isConstant} && $self->{rop}->isNumber && $reduce->{'-x=n'}) { $self = $self->Item("BOP")->new($equation,"=",$self->{lop}{op},Parser::UOP::Neg($self->{rop})); $self = $self->reduce; |