openwebwork-cvs

[WWcvs] pg: Backport from HEAD

[dpvc v. a. <we...@ma...>]

Log Message:
-----------
Backport from HEAD

Tags:
----
rel-2-2-dev

Modified Files:
--------------
    pg/lib/Parser/Context:
        Variables.pm

Revision Data
-------------
Index: Variables.pm
===================================================================
RCS file: /webwork/cvs/system/pg/lib/Parser/Context/Variables.pm,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -Llib/Parser/Context/Variables.pm -Llib/Parser/Context/Variables.pm -u -r1.10 -r1.10.2.1
--- lib/Parser/Context/Variables.pm
+++ lib/Parser/Context/Variables.pm
@@ -28,16 +28,12 @@
   $self->{name} = 'variable';
   $self->{Name} = 'Variable';
   $self->{namePattern} = '[a-zA-Z][a-zA-Z0-9]*';
-  $self->{pattern} = $self->{namePattern};
 }
 
-#
-#  Our pattern should match ANY variable name
-#    (Parser takes care of reporting unknown ones)
-# 
-sub update {
+sub getPattern {
   my $self = shift;
-  $self->{pattern} = $self->{namePattern};
+  my $pattern = $self->SUPER::getPattern(@_);
+  return '(?:' . $pattern . '|' . $self->{namePattern} . ')';
 }
 
 #

[WWcvs] pg: Backport from HEAD

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
Backport from HEAD

Tags:
----
rel-2-4-patches

Modified Files:
--------------
    pg/lib/Value:
        AnswerChecker.pm

Revision Data
-------------
Index: AnswerChecker.pm
===================================================================
RCS file: /webwork/cvs/system/pg/lib/Value/AnswerChecker.pm,v
retrieving revision 1.91.2.2.2.1
retrieving revision 1.91.2.2.2.2
diff -Llib/Value/AnswerChecker.pm -Llib/Value/AnswerChecker.pm -u -r1.91.2.2.2.1 -r1.91.2.2.2.2
--- lib/Value/AnswerChecker.pm
+++ lib/Value/AnswerChecker.pm
@@ -3,7 +3,7 @@
 
  #############################################################
  #
- #  Implements the ->cmp method for Value objects. 
+ #  Implements the ->cmp method for Value objects.
  #  Otherwise known as MathObjects.  This produces
  #  an answer checker appropriate for the type of object.
  #  Additional options can be passed to the cmp method to
@@ -34,8 +34,8 @@
 #       showEqualErrors  =>	1
 #       ignoreStrings    => 1
 #       studentsMustReduceUnions => 1
-#       show UnionReduceWarnings => 1
-# 
+#       showUnionReduceWarnings  => 1
+#
 
 =cut
 
@@ -1172,9 +1172,10 @@
 #  partial credit.  Set the various types for error
 #  messages.
 #
+my $typeMatchInterval = Value::Interval->make(0,1);
 sub cmp_defaults {(
   Value::List::cmp_defaults(@_),
-  typeMatch => 'Value::Interval',
+  typeMatch => $typeMatchInterval,
   list_type => 'an interval, set or union',
   short_type => 'a union',
   entry_type => 'an interval or set',
@@ -1431,7 +1432,7 @@
     $entry = $self->Package("Formula")->new($entry) if !Value::isValue($entry);
 
     #
-    #  Some words differ if ther eis only one entry in the student's list
+    #  Some words differ if there is only one entry in the student's list
     #
     my $nth = ''; my $answer = 'answer';
     my $class = $ans->{list_type} || $ans->{cmp_class};