[Templates-cvs] cvs commit: TT3/lib/Template Directives.pm

[cvs@template-toolkit.org]

cvs         04/12/10 09:59:24

  Modified:    lib/Template Directives.pm
  Log:
  * changed $EXTRA to $NAME
  
  Revision  Changes    Path
  1.4       +9 -8      TT3/lib/Template/Directives.pm
  
  Index: Directives.pm
  ===================================================================
  RCS file: /template-toolkit/TT3/lib/Template/Directives.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Directives.pm	2004/11/23 10:54:54	1.3
  +++ Directives.pm	2004/12/10 09:59:24	1.4
  @@ -15,7 +15,7 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Directives.pm,v 1.3 2004/11/23 10:54:54 abw Exp $
  +#   $Id: Directives.pm,v 1.4 2004/12/10 09:59:24 abw Exp $
   #
   #========================================================================
   
  @@ -26,19 +26,20 @@
   use Template::Modules;
   use base qw( Template::Modules );
   
  -our $VERSION = sprintf("%d.%02d", q$Revision: 1.3 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = sprintf("%d.%02d", q$Revision: 1.4 $ =~ /(\d+)\.(\d+)/);
   our $DEBUG   = 0 unless defined $DEBUG;
   our $ERROR   = '';
   our $THROW   = 'directive';
  -our $PATH    = 'Template::Directive';
  +our $NAME    = 'directives';
  +our $PATH    = 'Template::Directive' unless defined $PATH;
   our $LOADED  = { } unless defined $LOADED;
   our $MODULES = { } unless defined $MODULES;
   
  -# define $EXTRA as 'directives' so base class knows what to look for in init()
  -our $EXTRA  = 'directives';
  -
  -# alias directive() and directives() methods to module() and modules() in base class
  +# define $DIRECTIVE and directive() (and directives()??) as aliases
  +# for $MODULES, module() (and modules())
  +our $DIRECTIVES = $MODULES;
   *directive  = __PACKAGE__->can('module');
  +# *directives = __PACKAGE__->can('modules');   # see below
   
   
   sub init {
  @@ -89,7 +90,7 @@
   
   =head1 VERSION
   
  -$Revision: 1.3 $
  +$Revision: 1.4 $
   
   =head1 COPYRIGHT