[interchange-cvs] interchange - heins modified 2 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Mon Aug 5 02:05:01 2002
User: heins
Date: 2002-08-05 06:04:49 GMT
Modified: lib/Vend Config.pm Parse.pm
Log:
* Fix apparent long-standing bug where NoReparse was not being passed
from UserTag defines.
Revision Changes Path
2.61 +3 -2 interchange/lib/Vend/Config.pm
rev 2.61, prev_rev 2.60
Index: Config.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -r2.60 -r2.61
--- Config.pm 3 Aug 2002 04:20:30 -0000 2.60
+++ Config.pm 5 Aug 2002 06:04:49 -0000 2.61
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.60 2002/08/03 04:20:30 mheins Exp $
+# $Id: Config.pm,v 2.61 2002/08/05 06:04:49 mheins Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -44,7 +44,7 @@
use Vend::Parse;
use Vend::Util;
=20
-$VERSION =3D substr(q$Revision: 2.60 $, 10);
+$VERSION =3D substr(q$Revision: 2.61 $, 10);
=20
my %CDname;
=20
@@ -3159,6 +3159,7 @@
isOperator 1
ItemAction 1
noRearrange 1
+ NoReparse 1
OrderCheck 1
UserTag 1
! );
2.21 +6 -3 interchange/lib/Vend/Parse.pm
rev 2.21, prev_rev 2.20
Index: Parse.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Parse.pm,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -r2.20 -r2.21
--- Parse.pm 2 Aug 2002 03:07:32 -0000 2.20
+++ Parse.pm 5 Aug 2002 06:04:49 -0000 2.21
@@ -1,6 +1,6 @@
# Vend::Parse - Parse Interchange tags
#=20
-# $Id: Parse.pm,v 2.20 2002/08/02 03:07:32 mheins Exp $
+# $Id: Parse.pm,v 2.21 2002/08/05 06:04:49 mheins Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -35,7 +35,7 @@
=20
@ISA =3D qw(Exporter Vend::Parser);
=20
-$VERSION =3D substr(q$Revision: 2.20 $, 10);
+$VERSION =3D substr(q$Revision: 2.21 $, 10);
=20
@EXPORT =3D ();
@EXPORT_OK =3D qw(find_matching_end);
@@ -316,6 +316,7 @@
attrAlias =3D> \%attrAlias,
Documentation =3D> \%Documentation,
hasEndTag =3D> \%hasEndTag,
+ NoReparse =3D> \%NoReparse,
noRearrange =3D> \%noRearrange,
Implicit =3D> \%Implicit,
Interpolate =3D> \%Interpolate,
@@ -326,6 +327,8 @@
Routine =3D> \%Routine,
);
=20
+my @myRefs =3D keys %myRefs;
+
sub do_tag {
my $tag =3D shift;
#::logDebug("Parse-do_tag: tag=3D$tag caller=3D" . caller() . " args=3D" .=
::uneval_it(\@_) );
@@ -398,7 +401,7 @@
return unless $ref->{Routine} or $ref->{Alias};
my $area;
no strict 'refs';
- foreach $area (keys %myRefs) {
+ foreach $area (@myRefs) {
next unless $ref->{$area};
if($area eq 'Routine') {
for (keys %{$ref->{$area}}) {