[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2055
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2055-g74a7f49 |
|
Date: |
Mon, 05 Mar 2012 19:52:08 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=74a7f49212cb3428846da599ac488e4a31ff57ed
The branch, master has been updated
via 74a7f49212cb3428846da599ac488e4a31ff57ed (commit)
via 7df05a0b38efdd2e3bc9b3cfeedc3e53616bc71a (commit)
via 7f9974c75fc6cdd9821b887afac94ef0be415bc2 (commit)
via 1ac2c3dd535894df514efa06b756162398041eb3 (commit)
from ec47213f8b9d1e477845c81b8621fed78f2e99bc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 74a7f49212cb3428846da599ac488e4a31ff57ed
Author: Stefano Lattarini <address@hidden>
Date: Sun Mar 4 16:00:58 2012 +0100
maint: drop 'Automake::Struct' module
Now that we require Perl 5.6, we can drop the 'Automake::Struct'
module, which was basically just a backport of Perl 5.6's
'Class::Struct' to Perl 5.5.
* automake.in: Use 'Class::Struct', not 'Automake::Struct'.
* lib/Automake/Struct.pm: Delete.
* lib/Automake/Makefile.am (dist_perllib_DATA): Remove it.
commit 7df05a0b38efdd2e3bc9b3cfeedc3e53616bc71a
Author: Stefano Lattarini <address@hidden>
Date: Sun Mar 4 15:44:46 2012 +0100
maint: require perl 5.6 throughout
That version of perl is quite old already, so it should be OK to
require it. More importantly, it is the older perl versions the
developers can currently use for testing, thus it's safer and more
honest to just require it throughout. And anyway, we were already
requiring it in Automake::Getopt, which implied that both automake
and aclocal wouldn't have worked in practice with an older perl
version.
See also the discussion related to automake bug#10925.
* lib/Automake/ChannelDefs.pm: Adjusted to require perl 5.6.
* lib/Automake/Channels.pm: Likewise.
* lib/Automake/Condition.pm: Likewise.
* lib/Automake/Configure_ac.pm: Likewise.
* lib/Automake/DisjConditions.pm: Likewise.
* lib/Automake/FileUtils.pm: Likewise.
* lib/Automake/General.pm: Likewise.
* lib/Automake/Item.pm: Likewise.
* lib/Automake/ItemDef.pm: Likewise.
* lib/Automake/Location.pm: Likewise.
* lib/Automake/Options.pm: Likewise.
* lib/Automake/Rule.pm: Likewise.
* lib/Automake/RuleDef.pm: Likewise.
* lib/Automake/Struct.pm: Likewise.
* lib/Automake/VarDef.pm: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/Version.pm: Likewise.
* lib/Automake/Wrap.pm: Likewise.
* lib/Automake/XFile.pm: Likewise.
commit 7f9974c75fc6cdd9821b887afac94ef0be415bc2
Author: Stefano Lattarini <address@hidden>
Date: Sun Mar 4 13:02:57 2012 +0100
cosmetics: remove useless escaping for "'" character
commit 1ac2c3dd535894df514efa06b756162398041eb3
Author: Stefano Lattarini <address@hidden>
Date: Sun Mar 4 12:56:54 2012 +0100
test defs: remove redundant and unused requirements
* tests/defs (xsi-bin-sh, xsi-shell): Remove these requirements,
they have never been used.
(cygpath, cscope): Recognizing these explicitly is mostly redundant;
just merge them with the default "catch all" rule, and adjust that
accordingly.
(bzip2): Adjust some outdated comments.
-----------------------------------------------------------------------
Summary of changes:
automake.in | 11 +-
lib/Automake/ChannelDefs.pm | 2 +-
lib/Automake/Channels.pm | 2 +-
lib/Automake/Condition.pm | 2 +
lib/Automake/Configure_ac.pm | 1 +
lib/Automake/DisjConditions.pm | 3 +-
lib/Automake/FileUtils.pm | 1 +
lib/Automake/General.pm | 2 +-
lib/Automake/Getopt.pm | 2 +-
lib/Automake/Item.pm | 3 +-
lib/Automake/ItemDef.pm | 2 +
lib/Automake/Location.pm | 2 +
lib/Automake/Makefile.am | 1 -
lib/Automake/Options.pm | 1 +
lib/Automake/Rule.pm | 2 +
lib/Automake/RuleDef.pm | 2 +
lib/Automake/Struct.pm | 627 ----------------------------------------
lib/Automake/VarDef.pm | 2 +
lib/Automake/Variable.pm | 2 +
lib/Automake/Version.pm | 2 +
lib/Automake/Wrap.pm | 1 +
lib/Automake/XFile.pm | 2 +-
tests/defs | 29 +--
23 files changed, 44 insertions(+), 660 deletions(-)
delete mode 100644 lib/Automake/Struct.pm
diff --git a/automake.in b/automake.in
index 8ea1587..3e16fd8 100644
--- a/automake.in
+++ b/automake.in
@@ -42,8 +42,9 @@ BEGIN
$ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'};
}
-use Automake::Struct;
-struct (# Short name of the language (c, f77...).
+use Class::Struct ();
+Class::Struct::struct (
+ # Short name of the language (c, f77...).
'name' => "\$",
# Nice name of the language (C, Fortran 77...).
'Name' => "\$",
@@ -3615,7 +3616,7 @@ sub handle_tags
if (var ('SUBDIRS'))
{
$output_rules .= ("tags-recursive:\n"
- . "\tlist=\'\$(SUBDIRS)\'; for subdir in \$\$list; do
\\\n"
+ . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do
\\\n"
# Never fail here if a subdir fails; it
# isn't important.
. "\t test \"\$\$subdir\" = . || (\$(am__cd)
\$\$subdir"
@@ -3626,7 +3627,7 @@ sub handle_tags
&depend ('.MAKE', 'tags-recursive');
$output_rules .= ("ctags-recursive:\n"
- . "\tlist=\'\$(SUBDIRS)\'; for subdir in \$\$list; do
\\\n"
+ . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do
\\\n"
# Never fail here if a subdir fails; it
# isn't important.
. "\t test \"\$\$subdir\" = . || (\$(am__cd)
\$\$subdir"
@@ -3637,7 +3638,7 @@ sub handle_tags
&depend ('.MAKE', 'ctags-recursive');
$output_rules .= ("cscopelist-recursive:\n"
- . "\tlist=\'\$(SUBDIRS)\'; for subdir in \$\$list; do
\\\n"
+ . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do
\\\n"
# Never fail here if a subdir fails; it
# isn't important.
. "\t test \"\$\$subdir\" = . || (\$(am__cd)
\$\$subdir"
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index afafae5..524b8f5 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -55,7 +55,7 @@ shorthand function to output on specific channels.
=cut
-use 5.005;
+use 5.006;
use strict;
use Exporter;
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 4b5c5e2..724a114 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -66,7 +66,7 @@ etc.) that can also be overridden on a per-message basis.
=cut
-use 5.005;
+use 5.006;
use strict;
use Exporter;
use Carp;
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index ee16f62..cc753d9 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -14,6 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::Condition;
+
+use 5.006;
use strict;
use Carp;
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index d5c54da..53e62a5 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -20,6 +20,7 @@
package Automake::Configure_ac;
+use 5.006;
use strict;
use Exporter;
use Automake::Channels;
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index cb98495..e449121 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -15,8 +15,9 @@
package Automake::DisjConditions;
-use Carp;
+use 5.006;
use strict;
+use Carp;
use Automake::Condition qw/TRUE FALSE/;
=head1 NAME
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index d73cebf..17d8a49 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -34,6 +34,7 @@ This perl module provides various general purpose file
handling functions.
=cut
+use 5.006;
use strict;
use Exporter;
use File::stat;
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index be57648..2a4a527 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -15,7 +15,7 @@
package Automake::General;
-use 5.005;
+use 5.006;
use strict;
use Exporter;
use File::Basename;
diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm
index ffbcc12..ea1c7ca 100644
--- a/lib/Automake/Getopt.pm
+++ b/lib/Automake/Getopt.pm
@@ -30,7 +30,7 @@ line options in conformance to the GNU Coding standards.
=cut
-use 5.006_002;
+use 5.006;
use strict;
use warnings FATAL => 'all';
use Exporter ();
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index 0066ac4..6da070e 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -14,9 +14,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::Item;
+
+use 5.006;
use strict;
use Carp;
-
use Automake::ChannelDefs;
use Automake::DisjConditions;
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index 8148df8..8b64562 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -14,6 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::ItemDef;
+
+use 5.006;
use strict;
use Carp;
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index ba24ca2..290db73 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -15,6 +15,8 @@
package Automake::Location;
+use 5.006;
+
=head1 NAME
Automake::Location - a class for location tracking, with a stack of contexts
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index 9e7b6f5..b5c93b1 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -31,7 +31,6 @@ dist_perllib_DATA = \
Options.pm \
Rule.pm \
RuleDef.pm \
- Struct.pm \
Variable.pm \
VarDef.pm \
Version.pm \
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 651430d..2f977bd 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -15,6 +15,7 @@
package Automake::Options;
+use 5.006;
use strict;
use Exporter;
use Automake::Config;
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 0b8d867..3db8c44 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -14,6 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::Rule;
+
+use 5.006;
use strict;
use Carp;
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index 738e377..571111c 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -14,6 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::RuleDef;
+
+use 5.006;
use strict;
use Carp;
use Automake::ChannelDefs;
diff --git a/lib/Automake/Struct.pm b/lib/Automake/Struct.pm
deleted file mode 100644
index cd93691..0000000
--- a/lib/Automake/Struct.pm
+++ /dev/null
@@ -1,627 +0,0 @@
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# This file is basically Perl 5.6's Class::Struct, but made compatible
-# with Perl 5.5. If someday this has to be updated, be sure to rename
-# all the occurrences of Class::Struct into Automake::Struct, otherwise
-# if we 'use' a Perl module (e.g., File::stat) that uses Class::Struct,
-# we would have two packages defining the same symbols. Boom.
-
-###############################################################
-# The main copy of this file is in Automake's git repository. #
-# Updates should be sent to address@hidden #
-###############################################################
-
-package Automake::Struct;
-
-## See POD after __END__
-
-use 5.005_03;
-
-use strict;
-use vars qw(@ISA @EXPORT $VERSION);
-
-use Carp;
-
-require Exporter;
address@hidden = qw(Exporter);
address@hidden = qw(struct);
-
-$VERSION = '0.58';
-
-## Tested on 5.002 and 5.003 without class membership tests:
-my $CHECK_CLASS_MEMBERSHIP = ($] >= 5.003_95);
-
-my $print = 0;
-sub printem {
- if (@_) { $print = shift }
- else { $print++ }
-}
-
-{
- package Automake::Struct::Tie_ISA;
-
- sub TIEARRAY {
- my $class = shift;
- return bless [], $class;
- }
-
- sub STORE {
- my ($self, $index, $value) = @_;
- Automake::Struct::_subclass_error();
- }
-
- sub FETCH {
- my ($self, $index) = @_;
- $self->[$index];
- }
-
- sub FETCHSIZE {
- my $self = shift;
- return scalar(@$self);
- }
-
- sub DESTROY { }
-}
-
-sub struct {
-
- # Determine parameter list structure, one of:
- # struct( class => [ element-list ])
- # struct( class => { element-list })
- # struct( element-list )
- # Latter form assumes current package name as struct name.
-
- my ($class, @decls);
- my $base_type = ref $_[1];
- if ( $base_type eq 'HASH' ) {
- $class = shift;
- @decls = %{shift()};
- _usage_error() if @_;
- }
- elsif ( $base_type eq 'ARRAY' ) {
- $class = shift;
- @decls = @{shift()};
- _usage_error() if @_;
- }
- else {
- $base_type = 'ARRAY';
- $class = (caller())[0];
- @decls = @_;
- }
- _usage_error() if @decls % 2 == 1;
-
- # Ensure we are not, and will not be, a subclass.
-
- my $isa = do {
- no strict 'refs';
- address@hidden . '::ISA'};
- };
- _subclass_error() if @$isa;
- tie @$isa, 'Automake::Struct::Tie_ISA';
-
- # Create constructor.
-
- croak "function 'new' already defined in package $class"
- if do { no strict 'refs'; defined &{$class . "::new"} };
-
- my @methods = ();
- my %refs = ();
- my %arrays = ();
- my %hashes = ();
- my %classes = ();
- my $got_class = 0;
- my $out = '';
-
- $out = "{\n package $class;\n use Carp;\n sub new {\n";
- $out .= " my (\$class, \%init) = address@hidden;\n";
- $out .= " \$class = __PACKAGE__ unless address@hidden;\n";
-
- my $cnt = 0;
- my $idx = 0;
- my( $cmt, $name, $type, $elem );
-
- if( $base_type eq 'HASH' ){
- $out .= " my(\$r) = {};\n";
- $cmt = '';
- }
- elsif( $base_type eq 'ARRAY' ){
- $out .= " my(\$r) = [];\n";
- }
- while( $idx < @decls ){
- $name = $decls[$idx];
- $type = $decls[$idx+1];
- push( @methods, $name );
- if( $base_type eq 'HASH' ){
- $elem = "{'${class}::$name'}";
- }
- elsif( $base_type eq 'ARRAY' ){
- $elem = "[$cnt]";
- ++$cnt;
- $cmt = " # $name";
- }
- if( $type =~ /^\*(.)/ ){
- $refs{$name}++;
- $type = $1;
- }
- my $init = "defined(\$init{'$name'}) ? \$init{'$name'} :";
- if( $type eq '@' ){
- $out .= " croak 'Initializer for $name must be array
reference'\n";
- $out .= " if defined(\$init{'$name'}) &&
ref(\$init{'$name'}) ne 'ARRAY';\n";
- $out .= " \$r->$elem = $init [];$cmt\n";
- $arrays{$name}++;
- }
- elsif( $type eq '%' ){
- $out .= " croak 'Initializer for $name must be hash
reference'\n";
- $out .= " if defined(\$init{'$name'}) &&
ref(\$init{'$name'}) ne 'HASH';\n";
- $out .= " \$r->$elem = $init {};$cmt\n";
- $hashes{$name}++;
- }
- elsif ( $type eq '$') {
- $out .= " \$r->$elem = $init undef;$cmt\n";
- }
- elsif( $type =~ /^\w+(?:::\w+)*$/ ){
- $init = "defined(\$init{'$name'}) ? \%{\$init{'$name'}} : ()";
- $out .= " croak 'Initializer for $name must be hash
reference'\n";
- $out .= " if defined(\$init{'$name'}) &&
ref(\$init{'$name'}) ne 'HASH';\n";
- $out .= " \$r->$elem = '${type}'->new($init);$cmt\n";
- $classes{$name} = $type;
- $got_class = 1;
- }
- else{
- croak "'$type' is not a valid struct element type";
- }
- $idx += 2;
- }
- $out .= " bless \$r, \$class;\n }\n";
-
- # Create accessor methods.
-
- my( $pre, $pst, $sel );
- $cnt = 0;
- foreach $name (@methods){
- if ( do { no strict 'refs'; defined &{$class . "::$name"} } ) {
- carp "function '$name' already defined, overrides struct accessor
method";
- }
- else {
- $pre = $pst = $cmt = $sel = '';
- if( defined $refs{$name} ){
- $pre = "\\(";
- $pst = ")";
- $cmt = " # returns ref";
- }
- $out .= " sub $name {$cmt\n my \$r = shift;\n";
- if( $base_type eq 'ARRAY' ){
- $elem = "[$cnt]";
- ++$cnt;
- }
- elsif( $base_type eq 'HASH' ){
- $elem = "{'${class}::$name'}";
- }
- if( defined $arrays{$name} ){
- $out .= " my \$i;\n";
- $out .= " address@hidden ? (\$i = shift) : return
\$r->$elem;\n";
- $sel = "->[\$i]";
- }
- elsif( defined $hashes{$name} ){
- $out .= " my \$i;\n";
- $out .= " address@hidden ? (\$i = shift) : return
\$r->$elem;\n";
- $sel = "->{\$i}";
- }
- elsif( defined $classes{$name} ){
- if ( $CHECK_CLASS_MEMBERSHIP ) {
- $out .= " croak '$name argument is wrong class' if
address@hidden && ! UNIVERSAL::isa(\$_[0], '$classes{$name}');\n";
- }
- }
- $out .= " croak 'Too many args to $name' if address@hidden >
1;\n";
- $out .= " address@hidden ? ($pre\$r->$elem$sel = shift$pst) :
$pre\$r->$elem$sel$pst;\n";
- $out .= " }\n";
- }
- }
- $out .= "}\n1;\n";
-
- print $out if $print;
- my $result = eval $out;
- carp $@ if $@;
-}
-
-sub _usage_error {
- confess "struct usage error";
-}
-
-sub _subclass_error {
- croak 'struct class cannot be a subclass (@ISA not allowed)';
-}
-
-1; # for require
-
-
-__END__
-
-=head1 NAME
-
-Automake::Struct - declare struct-like datatypes as Perl classes
-
-=head1 SYNOPSIS
-
- use Automake::Struct;
- # declare struct, based on array:
- struct( CLASS_NAME => [ ELEMENT_NAME => ELEMENT_TYPE, ... ]);
- # declare struct, based on hash:
- struct( CLASS_NAME => { ELEMENT_NAME => ELEMENT_TYPE, ... });
-
- package CLASS_NAME;
- use Automake::Struct;
- # declare struct, based on array, implicit class name:
- struct( ELEMENT_NAME => ELEMENT_TYPE, ... );
-
-
- package Myobj;
- use Automake::Struct;
- # declare struct with four types of elements:
- struct( s => '$', a => '@', h => '%', c => 'My_Other_Class' );
-
- $obj = new Myobj; # constructor
-
- # scalar type accessor:
- $element_value = $obj->s; # element value
- $obj->s('new value'); # assign to element
-
- # array type accessor:
- $ary_ref = $obj->a; # reference to whole array
- $ary_element_value = $obj->a(2); # array element value
- $obj->a(2, 'new value'); # assign to array element
-
- # hash type accessor:
- $hash_ref = $obj->h; # reference to whole hash
- $hash_element_value = $obj->h('x'); # hash element value
- $obj->h('x', 'new value'); # assign to hash element
-
- # class type accessor:
- $element_value = $obj->c; # object reference
- $obj->c->method(...); # call method of object
- $obj->c(new My_Other_Class); # assign a new object
-
-
-=head1 DESCRIPTION
-
-C<Automake::Struct> exports a single function, C<struct>.
-Given a list of element names and types, and optionally
-a class name, C<struct> creates a Perl 5 class that implements
-a "struct-like" data structure.
-
-The new class is given a constructor method, C<new>, for creating
-struct objects.
-
-Each element in the struct data has an accessor method, which is
-used to assign to the element and to fetch its value. The
-default accessor can be overridden by declaring a C<sub> of the
-same name in the package. (See Example 2.)
-
-Each element's type can be scalar, array, hash, or class.
-
-
-=head2 The C<struct()> function
-
-The C<struct> function has three forms of parameter-list.
-
- struct( CLASS_NAME => [ ELEMENT_LIST ]);
- struct( CLASS_NAME => { ELEMENT_LIST });
- struct( ELEMENT_LIST );
-
-The first and second forms explicitly identify the name of the
-class being created. The third form assumes the current package
-name as the class name.
-
-An object of a class created by the first and third forms is
-based on an array, whereas an object of a class created by the
-second form is based on a hash. The array-based forms will be
-somewhat faster and smaller; the hash-based forms are more
-flexible.
-
-The class created by C<struct> must not be a subclass of another
-class other than C<UNIVERSAL>.
-
-It can, however, be used as a superclass for other classes. To facilitate
-this, the generated constructor method uses a two-argument blessing.
-Furthermore, if the class is hash-based, the key of each element is
-prefixed with the class name (see I<Perl Cookbook>, Recipe 13.12).
-
-A function named C<new> must not be explicitly defined in a class
-created by C<struct>.
-
-The I<ELEMENT_LIST> has the form
-
- NAME => TYPE, ...
-
-Each name-type pair declares one element of the struct. Each
-element name will be defined as an accessor method unless a
-method by that name is explicitly defined; in the latter case, a
-warning is issued if the warning flag (B<-w>) is set.
-
-
-=head2 Element Types and Accessor Methods
-
-The four element types -- scalar, array, hash, and class -- are
-represented by strings -- C<'$'>, C<'@'>, C<'%'>, and a class name --
-optionally preceded by a C<'*'>.
-
-The accessor method provided by C<struct> for an element depends
-on the declared type of the element.
-
-=over
-
-=item Scalar (C<'$'> or C<'*$'>)
-
-The element is a scalar, and by default is initialized to C<undef>
-(but see L<Initializing with new>).
-
-The accessor's argument, if any, is assigned to the element.
-
-If the element type is C<'$'>, the value of the element (after
-assignment) is returned. If the element type is C<'*$'>, a reference
-to the element is returned.
-
-=item Array (C<'@'> or C<'*@'>)
-
-The element is an array, initialized by default to C<()>.
-
-With no argument, the accessor returns a reference to the
-element's whole array (whether or not the element was
-specified as C<'@'> or C<'*@'>).
-
-With one or two arguments, the first argument is an index
-specifying one element of the array; the second argument, if
-present, is assigned to the array element. If the element type
-is C<'@'>, the accessor returns the array element value. If the
-element type is C<'*@'>, a reference to the array element is
-returned.
-
-=item Hash (C<'%'> or C<'*%'>)
-
-The element is a hash, initialized by default to C<()>.
-
-With no argument, the accessor returns a reference to the
-element's whole hash (whether or not the element was
-specified as C<'%'> or C<'*%'>).
-
-With one or two arguments, the first argument is a key specifying
-one element of the hash; the second argument, if present, is
-assigned to the hash element. If the element type is C<'%'>, the
-accessor returns the hash element value. If the element type is
-C<'*%'>, a reference to the hash element is returned.
-
-=item Class (C<'Class_Name'> or C<'*Class_Name'>)
-
-The element's value must be a reference blessed to the named
-class or to one of its subclasses. The element is initialized to
-the result of calling the C<new> constructor of the named class.
-
-The accessor's argument, if any, is assigned to the element. The
-accessor will C<croak> if this is not an appropriate object
-reference.
-
-If the element type does not start with a C<'*'>, the accessor
-returns the element value (after assignment). If the element type
-starts with a C<'*'>, a reference to the element itself is returned.
-
-=back
-
-=head2 Initializing with C<new>
-
-C<struct> always creates a constructor called C<new>. That constructor
-may take a list of initializers for the various elements of the new
-struct.
-
-Each initializer is a pair of values: I<element name>C< =E<gt> >I<value>.
-The initializer value for a scalar element is just a scalar value. The
-initializer for an array element is an array reference. The initializer
-for a hash is a hash reference.
-
-The initializer for a class element is also a hash reference, and the
-contents of that hash are passed to the element's own constructor.
-
-See Example 3 below for an example of initialization.
-
-
-=head1 EXAMPLES
-
-=over
-
-=item Example 1
-
-Giving a struct element a class type that is also a struct is how
-structs are nested. Here, C<timeval> represents a time (seconds and
-microseconds), and C<rusage> has two elements, each of which is of
-type C<timeval>.
-
- use Automake::Struct;
-
- struct( rusage => {
- ru_utime => timeval, # seconds
- ru_stime => timeval, # microseconds
- });
-
- struct( timeval => [
- tv_secs => '$',
- tv_usecs => '$',
- ]);
-
- # create an object:
- my $t = new rusage;
-
- # $t->ru_utime and $t->ru_stime are objects of type timeval.
- # set $t->ru_utime to 100.0 sec and $t->ru_stime to 5.0 sec.
- $t->ru_utime->tv_secs(100);
- $t->ru_utime->tv_usecs(0);
- $t->ru_stime->tv_secs(5);
- $t->ru_stime->tv_usecs(0);
-
-
-=item Example 2
-
-An accessor function can be redefined in order to provide
-additional checking of values, etc. Here, we want the C<count>
-element always to be nonnegative, so we redefine the C<count>
-accessor accordingly.
-
- package MyObj;
- use Automake::Struct;
-
- # declare the struct
- struct ( 'MyObj', { count => '$', stuff => '%' } );
-
- # override the default accessor method for 'count'
- sub count {
- my $self = shift;
- if ( @_ ) {
- die 'count must be nonnegative' if $_[0] < 0;
- $self->{'count'} = shift;
- warn "Too many args to count" if @_;
- }
- return $self->{'count'};
- }
-
- package main;
- $x = new MyObj;
- print "\$x->count(5) = ", $x->count(5), "\n";
- # prints '$x->count(5) = 5'
-
- print "\$x->count = ", $x->count, "\n";
- # prints '$x->count = 5'
-
- print "\$x->count(-5) = ", $x->count(-5), "\n";
- # dies due to negative argument!
-
-=item Example 3
-
-The constructor of a generated class can be passed a list
-of I<element>=>I<value> pairs, with which to initialize the struct.
-If no initializer is specified for a particular element, its default
-initialization is performed instead. Initializers for non-existent
-elements are silently ignored.
-
-Note that the initializer for a nested struct is specified
-as an anonymous hash of initializers, which is passed on to the nested
-struct's constructor.
-
-
- use Automake::Struct;
-
- struct Breed =>
- {
- name => '$',
- cross => '$',
- };
-
- struct Cat =>
- [
- name => '$',
- kittens => '@',
- markings => '%',
- breed => 'Breed',
- ];
-
-
- my $cat = Cat->new( name => 'Socks',
- kittens => ['Monica', 'Kenneth'],
- markings => { socks=>1, blaze=>"white" },
- breed => { name=>'short-hair', cross=>1 },
- );
-
- print "Once a cat called ", $cat->name, "\n";
- print "(which was a ", $cat->breed->name, ")\n";
- print "had two kittens: ", join(' and ', @{$cat->kittens}), "\n";
-
-=back
-
-=head1 Author and Modification History
-
-Modified by Akim Demaille, 2001-08-03
-
- Rename as Automake::Struct to avoid name clashes with
- Class::Struct.
-
- Make it compatible with Perl 5.5.
-
-Modified by Damian Conway, 1999-03-05, v0.58.
-
- Added handling of hash-like arg list to class ctor.
-
- Changed to two-argument blessing in ctor to support
- derivation from created classes.
-
- Added classname prefixes to keys in hash-based classes
- (refer to "Perl Cookbook", Recipe 13.12 for rationale).
-
- Corrected behavior of accessors for '*@' and '*%' struct
- elements. Package now implements documented behavior when
- returning a reference to an entire hash or array element.
- Previously these were returned as a reference to a reference
- to the element.
-
-
-Renamed to C<Class::Struct> and modified by Jim Miner, 1997-04-02.
-
- members() function removed.
- Documentation corrected and extended.
- Use of struct() in a subclass prohibited.
- User definition of accessor allowed.
- Treatment of '*' in element types corrected.
- Treatment of classes as element types corrected.
- Class name to struct() made optional.
- Diagnostic checks added.
-
-
-Originally C<Class::Template> by Dean Roehrich.
-
- # Template.pm --- struct/member template builder
- # 12mar95
- # Dean Roehrich
- #
- # changes/bugs fixed since 28nov94 version:
- # - podified
- # changes/bugs fixed since 21nov94 version:
- # - Fixed examples.
- # changes/bugs fixed since 02sep94 version:
- # - Moved to Class::Template.
- # changes/bugs fixed since 20feb94 version:
- # - Updated to be a more proper module.
- # - Added "use strict".
- # - Bug in build_methods, was using @var when @$var needed.
- # - Now using my() rather than local().
- #
- # Uses perl5 classes to create nested data types.
- # This is offered as one implementation of Tom Christiansen's "structs.pl"
- # idea.
-
-=cut
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index d5b3224..dde99ac 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -14,6 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::VarDef;
+
+use 5.006;
use strict;
use Carp;
use Automake::ChannelDefs;
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index f9ed7da..4d346f0 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -14,6 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::Variable;
+
+use 5.006;
use strict;
use Carp;
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 35cfe8b..423375b 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -14,6 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
package Automake::Version;
+
+use 5.006;
use strict;
use Automake::ChannelDefs;
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index cd898dc..34b349e 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -15,6 +15,7 @@
package Automake::Wrap;
+use 5.006;
use strict;
require Exporter;
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 1840f61..82edb23 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -69,7 +69,7 @@ and C<getlines> methods to translate C<\r\n> to C<\n>.
=cut
-require 5.000;
+use 5.006;
use strict;
use vars qw($VERSION @EXPORT @EXPORT_OK $AUTOLOAD @ISA);
use Carp;
diff --git a/tests/defs b/tests/defs
index 14648f5..447c89e 100644
--- a/tests/defs
+++ b/tests/defs
@@ -735,10 +735,6 @@ do
:) ;;
cc|c++|fortran|fortran77)
require_compiler_ $tool;;
- xsi-shell)
- require_xsi "$SHELL";;
- xsi-bin-sh)
- require_xsi "/bin/sh";;
xsi-lib-shell)
if test x"$am_test_prefer_config_shell" = x"yes"; then
require_xsi "$SHELL"
@@ -747,7 +743,8 @@ do
fi
;;
bzip2)
- # Do not use --version, bzip2 still tries to compress stdin.
+ # Do not use --version, older versions bzip2 still tries to compress
+ # stdin.
echo "$me: running bzip2 --help"
bzip2 --help \
|| skip_all_ "required program 'bzip2' not available"
@@ -762,16 +759,6 @@ do
echo "$me: running $CC -?"
$CC -? || skip_all_ "Microsoft C compiler '$CC' not available"
;;
- cscope)
- # Sun cscope is interactive without redirection.
- echo "$me: running cscope --version </dev/null"
- cscope --version </dev/null \
- || skip_all_ "required program 'cscope' not available"
- ;;
- cygpath)
- echo "$me: running cygpath --version"
- cygpath --version || skip_all_ "cygpath not available"
- ;;
etags)
# Exuberant Ctags will create a TAGS file even
# when asked for --help or --version. (Emacs's etags
@@ -857,8 +844,8 @@ do
# Make sure we have makeinfo, and it understands '--html'.
echo "$me: running makeinfo --html --version"
makeinfo --html --version \
- || skip_all_ "cannot find a makeinfo program that groks the" \
- "\'--html' option"
+ || skip_all_ "cannot find a makeinfo program that groks" \
+ "the '--html' option"
;;
mingw)
uname_s=`uname -s || echo UNKNOWN`
@@ -961,9 +948,11 @@ do
# Generic case: the tool must support --version.
echo "$me: running $tool --version"
# It is not likely but possible that $tool is a special builtin,
- # in which case the shell is allowed to exit after an error.
- # So, please leave the subshell here.
- ($tool --version) || skip_all_ "required program '$tool' not available"
+ # in which case the shell is allowed to exit after an error. So
+ # we need the subshell here. Also, some tools, like Sun cscope,
+ # can be interactive without redirection.
+ ($tool --version) </dev/null \
+ || skip_all_ "required program '$tool' not available"
;;
esac
done
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2055-g74a7f49,
Stefano Lattarini <=