Log Message:
-----------
make sure formulas are in the correct context
Modified Files:
--------------
pg/macros:
parserImplicitEquation.pl
Revision Data
-------------
Index: parserImplicitEquation.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/parserImplicitEquation.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lmacros/parserImplicitEquation.pl -Lmacros/parserImplicitEquation.pl -u -r1.12 -r1.13
--- macros/parserImplicitEquation.pl
+++ macros/parserImplicitEquation.pl
@@ -214,12 +214,12 @@
my $self = shift; my $class = ref($self) || $self;
my $context = (Value::isContext($_[0]) ? shift : $self->context);
my $f = shift; return $f if ref($f) eq $class;
- $f = main::Formula($f);
+ $f = $context->Package("Formula")->new($context,$f);
Value::Error("Your formula doesn't look like an implicit equation")
unless $f->type eq 'Equality';
my $F = ($context->Package("Formula")->new($context,$f->{tree}{lop}) -
$context->Package("Formula")->new($context,$f->{tree}{rop}))->reduce;
- $F = $context->Package("Formula")->new($F) unless Value::isFormula($F);
+ $F = $context->Package("Formula")->new($context,$F) unless Value::isFormula($F);
Value::Error("Your equation must be real-valued") unless $F->isRealNumber;
Value::Error("Your equation should not be constant") if $F->isConstant;
Value::Error("Your equation can not contain adaptive parameters")
|
