Add a trailing 's' to the name of EU::Typemap

This is to prevent collisions on case-insensitive file systems with
lib/typemap.

diff --git a/MANIFEST b/MANIFEST
index 9572c7d..06b6d29 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -2977,10 +2977,10 @@ dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm        ExtUtils::ParseXS guts
 dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm                  converts Perl XS code into C code
 dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod                 ExtUtils::ParseXS documentation
 dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm                ExtUtils::ParseXS guts
-dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/InputMap.pm         ExtUtils::Typemap guts
-dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/OutputMap.pm                ExtUtils::Typemap guts
-dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap.pm                  ExtUtils::Typemap, a PXS helper
-dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/Type.pm             ExtUtils::Typemap guts
+dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm                ExtUtils::Typemaps guts
+dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm       ExtUtils::Typemaps guts
+dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm                 ExtUtils::Typemaps, a PXS helper
+dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm            ExtUtils::Typemaps guts
 dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp                      External subroutine preprocessor
 dist/ExtUtils-ParseXS/t/001-basic.t                            See if ExtUtils::ParseXS works
 dist/ExtUtils-ParseXS/t/002-more.t                             Extended ExtUtils::ParseXS testing
@@ -3000,14 +3000,14 @@ dist/ExtUtils-ParseXS/t/111-analyze_preprocessor_statements.t   ExtUtils::ParseXS
 dist/ExtUtils-ParseXS/t/112-set_cond.t                         ExtUtils::ParseXS tests
 dist/ExtUtils-ParseXS/t/113-check_cond_preproc_statements.t    ExtUtils::ParseXS tests
 dist/ExtUtils-ParseXS/t/114-blurt_death_Warn.t                 ExtUtils::ParseXS tests
-dist/ExtUtils-ParseXS/t/501-t-compile.t                                ExtUtils::Typemap tests
-dist/ExtUtils-ParseXS/t/510-t-bare.t                           ExtUtils::Typemap tests
-dist/ExtUtils-ParseXS/t/511-t-whitespace.t                     ExtUtils::Typemap tests
-dist/ExtUtils-ParseXS/t/512-t-file.t                           ExtUtils::Typemap tests
-dist/ExtUtils-ParseXS/t/513-t-merge.t                          ExtUtils::Typemap tests
-dist/ExtUtils-ParseXS/t/data/combined.typemap                  ExtUtils::Typemap test data
-dist/ExtUtils-ParseXS/t/data/other.typemap                     ExtUtils::Typemap test data
-dist/ExtUtils-ParseXS/t/data/simple.typemap                    ExtUtils::Typemap test data
+dist/ExtUtils-ParseXS/t/501-t-compile.t                                ExtUtils::Typemaps tests
+dist/ExtUtils-ParseXS/t/510-t-bare.t                           ExtUtils::Typemaps tests
+dist/ExtUtils-ParseXS/t/511-t-whitespace.t                     ExtUtils::Typemaps tests
+dist/ExtUtils-ParseXS/t/512-t-file.t                           ExtUtils::Typemaps tests
+dist/ExtUtils-ParseXS/t/513-t-merge.t                          ExtUtils::Typemaps tests
+dist/ExtUtils-ParseXS/t/data/combined.typemap                  ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/data/other.typemap                     ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/data/simple.typemap                    ExtUtils::Typemaps test data
 dist/ExtUtils-ParseXS/t/lib/IncludeTester.pm                   ExtUtils::ParseXS testing utility
 dist/ExtUtils-ParseXS/t/lib/PrimitiveCapture.pm                        Primitive STDOUT/ERR capturing for tests
 dist/ExtUtils-ParseXS/t/pseudotypemap1                         A test-typemap

diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm
similarity index 91%
rename from dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap.pm
rename to dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm
index c190682..ae7ef1a 100644 (file)
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm
@@ -1,4 +1,4 @@
-package ExtUtils::Typemap;
+package ExtUtils::Typemaps;
 use 5.006001;
 use strict;
 use warnings;
@@ -7,22 +7,22 @@ use Carp qw(croak);
 
 our $Proto_Regexp = "[" . quotemeta('\$%&*@;[]') . "]";
 
-require ExtUtils::Typemap::InputMap;
-require ExtUtils::Typemap::OutputMap;
-require ExtUtils::Typemap::Type;
+require ExtUtils::Typemaps::InputMap;
+require ExtUtils::Typemaps::OutputMap;
+require ExtUtils::Typemaps::Type;
 
 =head1 NAME
 
-ExtUtils::Typemap - Read/Write/Modify Perl/XS typemap files
+ExtUtils::Typemaps - Read/Write/Modify Perl/XS typemap files
 
 =head1 SYNOPSIS
 
   # read/create file
-  my $typemap = ExtUtils::Typemap->new(file => 'typemap');
+  my $typemap = ExtUtils::Typemaps->new(file => 'typemap');
   # alternatively create an in-memory typemap
-  # $typemap = ExtUtils::Typemap->new();
+  # $typemap = ExtUtils::Typemaps->new();
   # alternatively create an in-memory typemap by parsing a string
-  # $typemap = ExtUtils::Typemap->new(string => $sometypemap);
+  # $typemap = ExtUtils::Typemaps->new(string => $sometypemap);
   
   # add a mapping
   $typemap->add_typemap(ctype => 'NV', xstype => 'T_NV');
@@ -126,7 +126,7 @@ Optional named arguments: C<replace =E<gt> 1> forces removal/replacement of
 existing C<TYPEMAP> entries of the same C<ctype>.
 
 As an alternative to the named parameters usage, you may pass in
-an C<ExtUtils::Typemap::Type> object, a copy of which will be
+an C<ExtUtils::Typemaps::Type> object, a copy of which will be
 added to the typemap.
 
 =cut
@@ -146,7 +146,7 @@ sub add_typemap {
     my $xstype = $args{xstype};
     croak("Need xstype argument") if not defined $xstype;
 
-    $type = ExtUtils::Typemap::Type->new(
+    $type = ExtUtils::Typemaps::Type->new(
       xstype      => $xstype,
       'prototype' => $args{'prototype'},
       ctype       => $ctype,
@@ -174,7 +174,7 @@ and the C<code> to associate with it for input.
 Optional named arguments: C<replace =E<gt> 1> forces removal/replacement of
 existing C<INPUT> entries of the same C<xstype>.
 
-You may pass in a single C<ExtUtils::Typemap::InputMap> object instead,
+You may pass in a single C<ExtUtils::Typemaps::InputMap> object instead,
 a copy of which will be added to the typemap.
 
 =cut
@@ -194,7 +194,7 @@ sub add_inputmap {
     my $code = $args{code};
     croak("Need code argument") if not defined $code;
 
-    $input = ExtUtils::Typemap::InputMap->new(
+    $input = ExtUtils::Typemaps::InputMap->new(
       xstype => $xstype,
       code   => $code,
     );
@@ -231,7 +231,7 @@ sub add_outputmap {
     my $code = $args{code};
     croak("Need code argument") if not defined $code;
 
-    $output = ExtUtils::Typemap::OutputMap->new(
+    $output = ExtUtils::Typemaps::OutputMap->new(
       xstype => $xstype,
       code   => $code,
     );
@@ -260,7 +260,7 @@ sub add_string {
   croak("Need 'string' argument") if not defined $args{string};
 
   # no, this is not elegant.
-  my $other = ExtUtils::Typemap->new(string => $args{string});
+  my $other = ExtUtils::Typemaps->new(string => $args{string});
   $self->merge(typemap => $other);
 }
 
@@ -270,7 +270,7 @@ Removes a C<TYPEMAP> entry from the typemap.
 
 Required named argument: C<ctype> to specify the entry to remove from the typemap.
 
-Alternatively, you may pass a single C<ExtUtils::Typemap::Type> object.
+Alternatively, you may pass a single C<ExtUtils::Typemaps::Type> object.
 
 =cut
 
@@ -296,7 +296,7 @@ Removes an C<INPUT> entry from the typemap.
 
 Required named argument: C<xstype> to specify the entry to remove from the typemap.
 
-Alternatively, you may pass a single C<ExtUtils::Typemap::InputMap> object.
+Alternatively, you may pass a single C<ExtUtils::Typemaps::InputMap> object.
 
 =cut
 
@@ -321,7 +321,7 @@ Removes an C<OUTPUT> entry from the typemap.
 
 Required named argument: C<xstype> to specify the entry to remove from the typemap.
 
-Alternatively, you may pass a single C<ExtUtils::Typemap::OutputMap> object.
+Alternatively, you may pass a single C<ExtUtils::Typemaps::OutputMap> object.
 
 =cut
 
@@ -364,7 +364,7 @@ Fetches an entry of the TYPEMAP section of the typemap.
 
 Mandatory named arguments: The C<ctype> of the entry.
 
-Returns the C<ExtUtils::Typemap::Type>
+Returns the C<ExtUtils::Typemaps::Type>
 object for the entry if found.
 
 =cut
@@ -390,7 +390,7 @@ typemap.
 Mandatory named arguments: The C<xstype> of the
 entry.
 
-Returns the C<ExtUtils::Typemap::InputMap>
+Returns the C<ExtUtils::Typemaps::InputMap>
 object for the entry if found.
 
 =cut
@@ -415,7 +415,7 @@ typemap.
 Mandatory named arguments: The C<xstype> of the
 entry.
 
-Returns the C<ExtUtils::Typemap::InputMap>
+Returns the C<ExtUtils::Typemaps::InputMap>
 object for the entry if found.
 
 =cut
@@ -506,8 +506,8 @@ sub merge {
   my $self = shift;
   my %args = @_;
   my $typemap = $args{typemap};
-  croak("Need ExtUtils::Typemap as argument")
-    if not ref $typemap or not $typemap->isa('ExtUtils::Typemap');
+  croak("Need ExtUtils::Typemaps as argument")
+    if not ref $typemap or not $typemap->isa('ExtUtils::Typemaps');
 
   my $replace = $args{replace};
 
@@ -620,7 +620,7 @@ sub _parse {
       #$proto = '$' unless $proto;
       #warn("Warning: File '$filename' Line $lineno '$line' Invalid prototype '$proto'\n")
       #  unless _valid_proto_string($proto);
-      push @typemap_expr, ExtUtils::Typemap::Type->new(
+      push @typemap_expr, ExtUtils::Typemaps::Type->new(
         xstype => $kind, proto => $proto, ctype => $type
       );
     } elsif (/^\s/) {
@@ -640,8 +640,8 @@ sub _parse {
   } # end while lines
 
   $self->{typemap_section} = \@typemap_expr;
-  $self->{input_section}   = [ map {ExtUtils::Typemap::InputMap->new(%$_) } @input_expr ];
-  $self->{output_section}  = [ map {ExtUtils::Typemap::OutputMap->new(%$_) } @output_expr ];
+  $self->{input_section}   = [ map {ExtUtils::Typemaps::InputMap->new(%$_) } @input_expr ];
+  $self->{output_section}  = [ map {ExtUtils::Typemaps::OutputMap->new(%$_) } @output_expr ];
   
   return $self->validate();
 }

diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/InputMap.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm
similarity index 86%
rename from dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/InputMap.pm
rename to dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm
index 08c54cb..bbe7ad1 100644 (file)
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/InputMap.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm
@@ -1,4 +1,4 @@
-package ExtUtils::Typemap::InputMap;
+package ExtUtils::Typemaps::InputMap;
 use 5.006001;
 use strict;
 use warnings;
@@ -7,11 +7,11 @@ use Carp qw(croak);
 
 =head1 NAME
 
-ExtUtils::Typemap::InputMap - Entry in the INPUT section of a typemap
+ExtUtils::Typemaps::InputMap - Entry in the INPUT section of a typemap
 
 =head1 SYNOPSIS
 
-  use ExtUtils::Typemap;
+  use ExtUtils::Typemaps;
   ...
   my $input = $typemap->get_input_map('T_NV');
   my $code = $input->code();
@@ -19,7 +19,7 @@ ExtUtils::Typemap::InputMap - Entry in the INPUT section of a typemap
 
 =head1 DESCRIPTION
 
-Refer to L<ExtUtils::Typemap> for details.
+Refer to L<ExtUtils::Typemaps> for details.
 
 =head1 METHODS
 
@@ -77,7 +77,7 @@ sub xstype {
 
 =head1 SEE ALSO
 
-L<ExtUtils::Typemap>
+L<ExtUtils::Typemaps>
 
 =head1 AUTHOR
 

diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/OutputMap.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm
similarity index 86%
rename from dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/OutputMap.pm
rename to dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm
index c543386..7d6878f 100644 (file)
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/OutputMap.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm
@@ -1,4 +1,4 @@
-package ExtUtils::Typemap::OutputMap;
+package ExtUtils::Typemaps::OutputMap;
 use 5.006001;
 use strict;
 use warnings;
@@ -7,11 +7,11 @@ use Carp qw(croak);
 
 =head1 NAME
 
-ExtUtils::Typemap::OutputMap - Entry in the OUTPUT section of a typemap
+ExtUtils::Typemaps::OutputMap - Entry in the OUTPUT section of a typemap
 
 =head1 SYNOPSIS
 
-  use ExtUtils::Typemap;
+  use ExtUtils::Typemaps;
   ...
   my $output = $typemap->get_output_map('T_NV');
   my $code = $output->code();
@@ -19,7 +19,7 @@ ExtUtils::Typemap::OutputMap - Entry in the OUTPUT section of a typemap
 
 =head1 DESCRIPTION
 
-Refer to L<ExtUtils::Typemap> for details.
+Refer to L<ExtUtils::Typemaps> for details.
 
 =head1 METHODS
 
@@ -77,7 +77,7 @@ sub xstype {
 
 =head1 SEE ALSO
 
-L<ExtUtils::Typemap>
+L<ExtUtils::Typemaps>
 
 =head1 AUTHOR
 

diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/Type.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm
similarity index 86%
rename from dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/Type.pm
rename to dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm
index 9be7a94..1a27add 100644 (file)
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemap/Type.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm
@@ -1,25 +1,25 @@
-package ExtUtils::Typemap::Type;
+package ExtUtils::Typemaps::Type;
 use 5.006001;
 use strict;
 use warnings;
 our $VERSION = '0.05';
 use Carp qw(croak);
-use ExtUtils::Typemap;
+use ExtUtils::Typemaps;
 
 =head1 NAME
 
-ExtUtils::Typemap::Type - Entry in the TYPEMAP section of a typemap
+ExtUtils::Typemaps::Type - Entry in the TYPEMAP section of a typemap
 
 =head1 SYNOPSIS
 
-  use ExtUtils::Typemap;
+  use ExtUtils::Typemaps;
   ...
   my $type = $typemap->get_type_map('char*');
   my $input = $typemap->get_input_map($type->xstype);
 
 =head1 DESCRIPTION
 
-Refer to L<ExtUtils::Typemap> for details.
+Refer to L<ExtUtils::Typemaps> for details.
 Object associates C<ctype> with C<xstype>, which is the index
 into the in- and output mapping tables.
 
@@ -53,7 +53,7 @@ sub new {
 
   $self->{xstype} = $args{xstype} if defined $args{xstype};
   $self->{ctype} = $args{ctype} if defined $args{ctype};
-  $self->{tidy_ctype} = ExtUtils::Typemap::_tidy_type($self->{ctype});
+  $self->{tidy_ctype} = ExtUtils::Typemaps::_tidy_type($self->{ctype});
   $self->{proto} = $args{'prototype'} if defined $args{'prototype'};
 
   return $self;
@@ -102,7 +102,7 @@ sub tidy_ctype {
 
 =head1 SEE ALSO
 
-L<ExtUtils::Typemap>
+L<ExtUtils::Typemaps>
 
 =head1 AUTHOR
 

diff --git a/dist/ExtUtils-ParseXS/t/501-t-compile.t b/dist/ExtUtils-ParseXS/t/501-t-compile.t
index b782ec2..5681cd2 100644 (file)
--- a/dist/ExtUtils-ParseXS/t/501-t-compile.t
+++ b/dist/ExtUtils-ParseXS/t/501-t-compile.t
@@ -11,4 +11,4 @@ use Test::More tests => 2;
 ok( $] >= 5.006001, "Your perl is new enough" );
 
 # Does the module load
-use_ok( 'ExtUtils::Typemap'   );
+use_ok( 'ExtUtils::Typemaps'   );

diff --git a/dist/ExtUtils-ParseXS/t/510-t-bare.t b/dist/ExtUtils-ParseXS/t/510-t-bare.t
index ae373e6..b76b10a 100644 (file)
--- a/dist/ExtUtils-ParseXS/t/510-t-bare.t
+++ b/dist/ExtUtils-ParseXS/t/510-t-bare.t
@@ -3,11 +3,11 @@ use strict;
 use warnings;
 
 use Test::More tests => 29;
-use ExtUtils::Typemap;
+use ExtUtils::Typemaps;
 
 # typemap only
 SCOPE: {
-  my $map = ExtUtils::Typemap->new();
+  my $map = ExtUtils::Typemaps->new();
   $map->add_typemap(ctype => 'unsigned int', xstype => 'T_IV');
   is($map->as_string(), <<'HERE', "Simple typemap matches expectations");
 TYPEMAP
@@ -15,7 +15,7 @@ unsigned int  T_IV
 HERE
 
   my $type = $map->get_typemap(ctype => 'unsigned int');
-  isa_ok($type, 'ExtUtils::Typemap::Type');
+  isa_ok($type, 'ExtUtils::Typemaps::Type');
   is($type->ctype, 'unsigned int');
   is($type->xstype, 'T_IV');
   is($type->tidy_ctype, 'unsigned int');
@@ -23,7 +23,7 @@ HERE
 
 # typemap & input
 SCOPE: {
-  my $map = ExtUtils::Typemap->new();
+  my $map = ExtUtils::Typemaps->new();
   $map->add_typemap(ctype => 'unsigned int', xstype => 'T_UV');
   $map->add_inputmap(xstype => 'T_UV', code => '$var = ($type)SvUV($arg);');
   is($map->as_string(), <<'HERE', "Simple typemap (with input) matches expectations");
@@ -36,20 +36,20 @@ T_UV
 HERE
 
   my $type = $map->get_typemap(ctype => 'unsigned int');
-  isa_ok($type, 'ExtUtils::Typemap::Type');
+  isa_ok($type, 'ExtUtils::Typemaps::Type');
   is($type->ctype, 'unsigned int');
   is($type->xstype, 'T_UV');
   is($type->tidy_ctype, 'unsigned int');
 
   my $in = $map->get_inputmap(xstype => 'T_UV');
-  isa_ok($in, 'ExtUtils::Typemap::InputMap');
+  isa_ok($in, 'ExtUtils::Typemaps::InputMap');
   is($in->xstype, 'T_UV');
 }
 
 
 # typemap & output
 SCOPE: {
-  my $map = ExtUtils::Typemap->new();
+  my $map = ExtUtils::Typemaps->new();
   $map->add_typemap(ctype => 'unsigned int', xstype => 'T_UV');
   $map->add_outputmap(xstype => 'T_UV', code => 'sv_setuv($arg, (UV)$var);');
   is($map->as_string(), <<'HERE', "Simple typemap (with output) matches expectations");
@@ -62,19 +62,19 @@ T_UV
 HERE
 
   my $type = $map->get_typemap(ctype => 'unsigned int');
-  isa_ok($type, 'ExtUtils::Typemap::Type');
+  isa_ok($type, 'ExtUtils::Typemaps::Type');
   is($type->ctype, 'unsigned int');
   is($type->xstype, 'T_UV');
   is($type->tidy_ctype, 'unsigned int');
 
   my $in = $map->get_outputmap(xstype => 'T_UV');
-  isa_ok($in, 'ExtUtils::Typemap::OutputMap');
+  isa_ok($in, 'ExtUtils::Typemaps::OutputMap');
   is($in->xstype, 'T_UV');
 }
 
 # typemap & input & output
 SCOPE: {
-  my $map = ExtUtils::Typemap->new();
+  my $map = ExtUtils::Typemaps->new();
   $map->add_typemap(ctype => 'unsigned int', xstype => 'T_UV');
   $map->add_inputmap(xstype => 'T_UV', code => '$var = ($type)SvUV($arg);');
   $map->add_outputmap(xstype => 'T_UV', code => 'sv_setuv($arg, (UV)$var);');
@@ -94,7 +94,7 @@ HERE
 
 # two typemaps & input & output
 SCOPE: {
-  my $map = ExtUtils::Typemap->new();
+  my $map = ExtUtils::Typemaps->new();
   $map->add_typemap(ctype => 'unsigned int', xstype => 'T_UV');
   $map->add_inputmap(xstype => 'T_UV', code => '$var = ($type)SvUV($arg);');
   $map->add_outputmap(xstype => 'T_UV', code => 'sv_setuv($arg, (UV)$var);');
@@ -120,16 +120,16 @@ T_IV
        sv_setiv($arg, (IV)$var);
 HERE
   my $type = $map->get_typemap(ctype => 'unsigned int');
-  isa_ok($type, 'ExtUtils::Typemap::Type');
+  isa_ok($type, 'ExtUtils::Typemaps::Type');
   is($type->ctype, 'unsigned int');
   is($type->xstype, 'T_UV');
   is($type->tidy_ctype, 'unsigned int');
 
   my $in = $map->get_outputmap(xstype => 'T_UV');
-  isa_ok($in, 'ExtUtils::Typemap::OutputMap');
+  isa_ok($in, 'ExtUtils::Typemaps::OutputMap');
   is($in->xstype, 'T_UV');
   $in = $map->get_outputmap(xstype => 'T_IV');
-  isa_ok($in, 'ExtUtils::Typemap::OutputMap');
+  isa_ok($in, 'ExtUtils::Typemaps::OutputMap');
   is($in->xstype, 'T_IV');
 }
 

diff --git a/dist/ExtUtils-ParseXS/t/511-t-whitespace.t b/dist/ExtUtils-ParseXS/t/511-t-whitespace.t
index 3d2ceeb..003d7e5 100644 (file)
--- a/dist/ExtUtils-ParseXS/t/511-t-whitespace.t
+++ b/dist/ExtUtils-ParseXS/t/511-t-whitespace.t
@@ -3,10 +3,10 @@ use strict;
 use warnings;
 
 use Test::More tests => 2;
-use ExtUtils::Typemap;
+use ExtUtils::Typemaps;
 
 SCOPE: {
-  my $map = ExtUtils::Typemap->new();
+  my $map = ExtUtils::Typemaps->new();
   $map->add_typemap(ctype => 'unsigned int', xstype => 'T_UV');
   $map->add_inputmap(xstype => 'T_UV', code => '  $var = ($type)SvUV($arg);');
   is($map->as_string(), <<'HERE', "Simple typemap (with input and code including leading whitespace) matches expectations");
@@ -21,7 +21,7 @@ HERE
 
 
 SCOPE: {
-  my $map = ExtUtils::Typemap->new();
+  my $map = ExtUtils::Typemaps->new();
   $map->add_typemap(ctype => 'unsigned int', xstype => 'T_UV');
   $map->add_inputmap(xstype => 'T_UV', code => "  \$var =\n(\$type)\n          SvUV(\$arg);");
   is($map->as_string(), <<'HERE', "Simple typemap (with input and multi-line code) matches expectations");

diff --git a/dist/ExtUtils-ParseXS/t/512-t-file.t b/dist/ExtUtils-ParseXS/t/512-t-file.t
index e13bf5b..3bf1add 100644 (file)
--- a/dist/ExtUtils-ParseXS/t/512-t-file.t
+++ b/dist/ExtUtils-ParseXS/t/512-t-file.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 use Test::More tests => 6;
-use ExtUtils::Typemap;
+use ExtUtils::Typemaps;
 use File::Spec;
 use File::Temp;
 
@@ -20,7 +20,7 @@ sub slurp {
 my $cmp_typemap_file = File::Spec->catfile($datadir, 'simple.typemap');
 my $cmp_typemap_str  = slurp($cmp_typemap_file);
 
-my $map = ExtUtils::Typemap->new();
+my $map = ExtUtils::Typemaps->new();
 $map->add_typemap(ctype => 'unsigned int', xstype => 'T_UV');
 $map->add_inputmap(xstype => 'T_UV', code => '$var = ($type)SvUV($arg);');
 $map->add_outputmap(xstype => 'T_UV', code => 'sv_setuv($arg, (UV)$var);');
@@ -35,15 +35,15 @@ my $tmpfile = File::Spec->catdir($tmpdir, 'simple.typemap');
 
 $map->write(file => $tmpfile);
 is($map->as_string(), slurp($tmpfile), "Simple typemap write matches as_string");
-is(ExtUtils::Typemap->new(file => $cmp_typemap_file)->as_string(), $cmp_typemap_str, "Simple typemap roundtrips");
-is(ExtUtils::Typemap->new(file => $tmpfile)->as_string(), $cmp_typemap_str, "Simple typemap roundtrips (2)");
+is(ExtUtils::Typemaps->new(file => $cmp_typemap_file)->as_string(), $cmp_typemap_str, "Simple typemap roundtrips");
+is(ExtUtils::Typemaps->new(file => $tmpfile)->as_string(), $cmp_typemap_str, "Simple typemap roundtrips (2)");
 
 SCOPE: {
   local $map->{file} = $cmp_typemap_file;
-  is_deeply(ExtUtils::Typemap->new(file => $cmp_typemap_file), $map, "Simple typemap roundtrips (in memory)");
+  is_deeply(ExtUtils::Typemaps->new(file => $cmp_typemap_file), $map, "Simple typemap roundtrips (in memory)");
 }
 
 # test that we can also create them from a string
-my $map_from_str = ExtUtils::Typemap->new(string => $map->as_string());
+my $map_from_str = ExtUtils::Typemaps->new(string => $map->as_string());
 is_deeply($map_from_str, $map);
 

diff --git a/dist/ExtUtils-ParseXS/t/513-t-merge.t b/dist/ExtUtils-ParseXS/t/513-t-merge.t
index 34ae064..28e7f5f 100644 (file)
--- a/dist/ExtUtils-ParseXS/t/513-t-merge.t
+++ b/dist/ExtUtils-ParseXS/t/513-t-merge.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 use Test::More tests => 5;
-use ExtUtils::Typemap;
+use ExtUtils::Typemaps;
 use File::Spec;
 use File::Temp;
 
@@ -23,10 +23,10 @@ my $combined_typemap_file = File::Spec->catfile($datadir, 'combined.typemap');
 
 
 SCOPE: {
-  my $first = ExtUtils::Typemap->new(file => $first_typemap_file);
-  isa_ok($first, 'ExtUtils::Typemap');
-  my $second = ExtUtils::Typemap->new(file => $second_typemap_file);
-  isa_ok($second, 'ExtUtils::Typemap');
+  my $first = ExtUtils::Typemaps->new(file => $first_typemap_file);
+  isa_ok($first, 'ExtUtils::Typemaps');
+  my $second = ExtUtils::Typemaps->new(file => $second_typemap_file);
+  isa_ok($second, 'ExtUtils::Typemaps');
 
   $first->merge(typemap => $second);
 
@@ -34,8 +34,8 @@ SCOPE: {
 }
 
 SCOPE: {
-  my $first = ExtUtils::Typemap->new(file => $first_typemap_file);
-  isa_ok($first, 'ExtUtils::Typemap');
+  my $first = ExtUtils::Typemaps->new(file => $first_typemap_file);
+  isa_ok($first, 'ExtUtils::Typemaps');
   my $second_str = slurp($second_typemap_file);
 
   $first->add_string(string => $second_str);

diff --git a/lib/.gitignore b/lib/.gitignore
index 5005ecc..7502200 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -173,6 +173,8 @@
 /ExtUtils/ParseXS.pm
 /ExtUtils/ParseXS.pod
 /ExtUtils/ParseXS/
+/ExtUtils/Typemaps.pm
+/ExtUtils/Typemaps/
 /ExtUtils/testlib.pm
 /ExtUtils/xsubpp
 /Fatal.pm