From: dpvc v. a. <we...@ma...> - 2007-08-28 22:46:17
|
Log Message: ----------- Add context names for the context(s) created here. Modified Files: -------------- pg/macros: contextABCD.pl contextCurrency.pl contextInequalities.pl contextIntegerFunctions.pl contextLimitedComplex.pl contextLimitedNumeric.pl contextLimitedPoint.pl contextLimitedPolynomial.pl contextLimitedVector.pl contextScientificNotation.pl contextString.pl contextTF.pl parserImplicitEquation.pl parserImplicitPlane.pl parserParametricLine.pl Revision Data ------------- Index: parserImplicitEquation.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/parserImplicitEquation.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -Lmacros/parserImplicitEquation.pl -Lmacros/parserImplicitEquation.pl -u -r1.8 -r1.9 --- macros/parserImplicitEquation.pl +++ macros/parserImplicitEquation.pl @@ -135,6 +135,7 @@ sub Init { my $context = $main::context{ImplicitEquation} = Parser::Context->getCopy("Numeric"); + $context->{name} = "ImplicitEquation"; $context->variables->are(x=>'Real',y=>'Real'); $context{precedence}{ImplicitEquation} = $context->{precedence}{special}; Parser::BOP::equality->Allow($context); Index: contextABCD.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextABCD.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -Lmacros/contextABCD.pl -Lmacros/contextABCD.pl -u -r1.9 -r1.10 --- macros/contextABCD.pl +++ macros/contextABCD.pl @@ -34,6 +34,7 @@ sub _contextABCD_init { my $context = $main::context{ABCD} = Parser::Context->getCopy("String"); + $context->{name} = "ABCD"; $context->strings->are( "A" => {}, "B" => {}, Index: parserParametricLine.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/parserParametricLine.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -Lmacros/parserParametricLine.pl -Lmacros/parserParametricLine.pl -u -r1.11 -r1.12 --- macros/parserParametricLine.pl +++ macros/parserParametricLine.pl @@ -49,6 +49,7 @@ sub Init { my $context = $main::context{ParametricLine} = Parser::Context->getCopy("Vector"); + $context->{name} = "ParametricLine"; $context->variables->are(t=>'Real'); $context->{precedence}{ParametricLine} = $context->{precedence}{special}; $context->reduction->set('(-x)-y'=>0); Index: contextLimitedPoint.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextLimitedPoint.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -Lmacros/contextLimitedPoint.pl -Lmacros/contextLimitedPoint.pl -u -r1.9 -r1.10 --- macros/contextLimitedPoint.pl +++ macros/contextLimitedPoint.pl @@ -116,6 +116,7 @@ # my $context = $main::context{LimitedPoint} = Parser::Context->getCopy("Point"); + $context->{name} = "LimitedPoint"; $context->operators->set( '+' => {class => 'LimitedPoint::BOP::add'}, '-' => {class => 'LimitedPoint::BOP::subtract'}, Index: contextString.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextString.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -Lmacros/contextString.pl -Lmacros/contextString.pl -u -r1.10 -r1.11 --- macros/contextString.pl +++ macros/contextString.pl @@ -62,6 +62,7 @@ sub Init { my $context = $main::context{String} = Parser::Context->getCopy("Numeric"); + $context->{name} = "String"; $context->parens->clear(); $context->variables->clear(); $context->constants->clear(); Index: contextLimitedNumeric.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextLimitedNumeric.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -Lmacros/contextLimitedNumeric.pl -Lmacros/contextLimitedNumeric.pl -u -r1.6 -r1.7 --- macros/contextLimitedNumeric.pl +++ macros/contextLimitedNumeric.pl @@ -25,6 +25,7 @@ sub _contextLimitedNumeric_init { my $context = $main::context{"LimitedNumeric-List"} = Parser::Context->getCopy("LimitedNumeric"); + $context->{name} = "LimitedNumeric-List"; $context->operators->redefine(','); main::Context("LimitedNumeric"); ### FIXME: probably should require the author to set this explicitly Index: parserImplicitPlane.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/parserImplicitPlane.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -Lmacros/parserImplicitPlane.pl -Lmacros/parserImplicitPlane.pl -u -r1.15 -r1.16 --- macros/parserImplicitPlane.pl +++ macros/parserImplicitPlane.pl @@ -59,6 +59,7 @@ sub Init { my $context = $main::context{ImplicitPlane} = Parser::Context->getCopy("Vector"); + $context->{name} = "ImplicitPlane"; $context->{precedence}{ImplicitPlane} = $context->{precedence}{special}; #$context->{value}{Equality} = "ImplicitPlane::equality"; Parser::BOP::equality->Allow($context); Index: contextLimitedVector.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextLimitedVector.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -Lmacros/contextLimitedVector.pl -Lmacros/contextLimitedVector.pl -u -r1.8 -r1.9 --- macros/contextLimitedVector.pl +++ macros/contextLimitedVector.pl @@ -213,6 +213,7 @@ # my $context = $main::context{LimitedVector} = Parser::Context->getCopy("Vector"); + $context->{name} = "LimitedVector"; $context->operators->set( '+' => {class => 'LimitedVector::BOP::add'}, '-' => {class => 'LimitedVector::BOP::subtract'}, Index: contextTF.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextTF.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -Lmacros/contextTF.pl -Lmacros/contextTF.pl -u -r1.10 -r1.11 --- macros/contextTF.pl +++ macros/contextTF.pl @@ -25,6 +25,7 @@ sub _contextTF_init { my $context = $main::context{TF} = Parser::Context->getCopy("String"); + $context->{name} = "TF"; $context->strings->are( "T" => {value => 1}, "F" => {value => 0}, Index: contextIntegerFunctions.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextIntegerFunctions.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -Lmacros/contextIntegerFunctions.pl -Lmacros/contextIntegerFunctions.pl -u -r1.7 -r1.8 --- macros/contextIntegerFunctions.pl +++ macros/contextIntegerFunctions.pl @@ -45,6 +45,7 @@ sub Init { my $context = $main::context{IntegerFunctions} = Parser::Context->getCopy("Numeric"); + $context->{name} = "IntegerFunctions"; $context->functions->add( C => {class => 'context::IntegerFunction2'}, Index: contextLimitedPolynomial.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextLimitedPolynomial.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -Lmacros/contextLimitedPolynomial.pl -Lmacros/contextLimitedPolynomial.pl -u -r1.11 -r1.12 --- macros/contextLimitedPolynomial.pl +++ macros/contextLimitedPolynomial.pl @@ -322,6 +322,7 @@ # my $context = $main::context{LimitedPolynomial} = Parser::Context->getCopy("Numeric"); + $context->{name} = "LimitedPolynomial"; $context->operators->set( '+' => {class => 'LimitedPolynomial::BOP::add'}, '-' => {class => 'LimitedPolynomial::BOP::subtract'}, Index: contextLimitedComplex.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextLimitedComplex.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -Lmacros/contextLimitedComplex.pl -Lmacros/contextLimitedComplex.pl -u -r1.8 -r1.9 --- macros/contextLimitedComplex.pl +++ macros/contextLimitedComplex.pl @@ -230,6 +230,7 @@ # my $context = $main::context{LimitedComplex} = Parser::Context->getCopy("Complex"); + $context->{name} = "LimitedComplex"; $context->operators->set( '+' => {class => 'LimitedComplex::BOP::add'}, '-' => {class => 'LimitedComplex::BOP::subtract'}, Index: contextInequalities.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextInequalities.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -Lmacros/contextInequalities.pl -Lmacros/contextInequalities.pl -u -r1.7 -r1.8 --- macros/contextInequalities.pl +++ macros/contextInequalities.pl @@ -65,6 +65,7 @@ # sub Init { my $context = $main::context{Inequalities} = Parser::Context->getCopy("Interval"); + $context->{name} = "Inequalities"; $context->operators->add( '<' => {precedence => .5, associativity => 'left', type => 'bin', string => ' < ', class => 'Inequalities::BOP::inequality', eval => 'evalLessThan', combine => 1}, Index: contextScientificNotation.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextScientificNotation.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -Lmacros/contextScientificNotation.pl -Lmacros/contextScientificNotation.pl -u -r1.6 -r1.7 --- macros/contextScientificNotation.pl +++ macros/contextScientificNotation.pl @@ -103,6 +103,7 @@ # Create the Scientific Notation context # my $context = $main::context{ScientificNotation} = Parser::Context->getCopy("Numeric"); + $context->{name} = "ScientificNotation"; # # Make numbers include the leading + or - and not allow E notation Index: contextCurrency.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/contextCurrency.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -Lmacros/contextCurrency.pl -Lmacros/contextCurrency.pl -u -r1.5 -r1.6 --- macros/contextCurrency.pl +++ macros/contextCurrency.pl @@ -132,6 +132,8 @@ # sub Init { my $context = $main::context{Currency} = new Currency::Context(); + $context->{name} = "Currency"; + main::PG_restricted_eval('sub Currency {Value->Package("Currency")->new(@_)}'); } |