[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} . ')';
 }
 
 #