In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/83c4ee5311e1ab11459daaf9e21713d91730b4c8?hp=617373b760aef94d6f3359e8c264ad9bd2bd642a>
- Log ----------------------------------------------------------------- commit 83c4ee5311e1ab11459daaf9e21713d91730b4c8 Author: Steffen Mueller <[email protected]> Date: Fri Jan 20 20:10:35 2012 +0100 Copyright update for ExtUtils::{ParseXS,Typemaps} Also removes a few lines of dead code M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm commit a17f434ae8e7fbbbd76d75524d95a2e29783c6f8 Author: Steffen Mueller <[email protected]> Date: Fri Jan 20 20:08:55 2012 +0100 Fix parse problem with embedded typemaps If an embedded typemap was found in certain locations, we got spurious parse failures. Mea culpa. M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm M dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm ----------------------------------------------------------------------- Summary of changes: dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm | 5 ++--- dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod | 2 +- .../lib/ExtUtils/ParseXS/Constants.pm | 2 +- .../lib/ExtUtils/ParseXS/CountLines.pm | 2 +- .../lib/ExtUtils/ParseXS/Utilities.pm | 2 +- dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm | 4 ++-- .../lib/ExtUtils/Typemaps/InputMap.pm | 3 +-- .../lib/ExtUtils/Typemaps/OutputMap.pm | 3 +-- .../ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm | 4 +--- 9 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm index 07d5909..6a314f8 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm @@ -11,7 +11,7 @@ use Symbol; our $VERSION; BEGIN { - $VERSION = '3.12'; + $VERSION = '3.13'; } use ExtUtils::ParseXS::Constants $VERSION; use ExtUtils::ParseXS::CountLines $VERSION; @@ -1727,8 +1727,7 @@ sub fetch_para { ); $self->{typemap}->merge(typemap => $tmap, replace => 1); - last unless defined($self->{lastline} = readline($self->{FH})); - next; + $self->{lastline} = ""; } if ($self->{lastline} !~ /^\s*#/ || diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod index 7b6895d..e0d1511 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod @@ -143,7 +143,7 @@ Steffen Mueller, <[email protected]> =head1 COPYRIGHT -Copyright 2002-2011 by Ken Williams, David Golden and other contributors. All +Copyright 2002-2012 by Ken Williams, David Golden and other contributors. All rights reserved. This library is free software; you can redistribute it and/or diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm index 403a0a8..5d62af7 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm @@ -3,7 +3,7 @@ use strict; use warnings; use Symbol; -our $VERSION = '3.12'; +our $VERSION = '3.13'; =head1 NAME diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm index 3934718..da14606 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm @@ -1,7 +1,7 @@ package ExtUtils::ParseXS::CountLines; use strict; -our $VERSION = '3.12'; +our $VERSION = '3.13'; our $SECTION_END_MARKER; diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm index 6e3fb95..3851092 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm @@ -6,7 +6,7 @@ use File::Spec; use lib qw( lib ); use ExtUtils::ParseXS::Constants (); -our $VERSION = '3.12'; +our $VERSION = '3.13'; our (@ISA, @EXPORT_OK); @ISA = qw(Exporter); diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm index b39884c..d8e1f5a 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm @@ -2,7 +2,7 @@ package ExtUtils::Typemaps; use 5.006001; use strict; use warnings; -our $VERSION = '1.03'; +our $VERSION = '1.04'; #use Carp qw(croak); require ExtUtils::ParseXS; @@ -1020,7 +1020,7 @@ Steffen Mueller C<<[email protected]>> =head1 COPYRIGHT & LICENSE -Copyright 2009-2011 Steffen Mueller +Copyright 2009, 2010, 2011, 2012 Steffen Mueller This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm index b8adbe6..bf8ee06 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/InputMap.pm @@ -2,7 +2,6 @@ package ExtUtils::Typemaps::InputMap; use 5.006001; use strict; use warnings; -#use Carp qw(croak); =head1 NAME @@ -105,7 +104,7 @@ Steffen Mueller C<<[email protected]>> =head1 COPYRIGHT & LICENSE -Copyright 2009-2011 Steffen Mueller +Copyright 2009, 2010, 2011, 2012 Steffen Mueller This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm index 52baa54..b505969 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/OutputMap.pm @@ -2,7 +2,6 @@ package ExtUtils::Typemaps::OutputMap; use 5.006001; use strict; use warnings; -#use Carp qw(croak); =head1 NAME @@ -184,7 +183,7 @@ Steffen Mueller C<<[email protected]>> =head1 COPYRIGHT & LICENSE -Copyright 2009-2011 Steffen Mueller +Copyright 2009, 2010, 2011, 2012 Steffen Mueller This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm index 0f0ed2c..d089aa3 100644 --- a/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm +++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps/Type.pm @@ -2,8 +2,6 @@ package ExtUtils::Typemaps::Type; use 5.006001; use strict; use warnings; -our $VERSION = '0.06'; -#use Carp qw(croak); require ExtUtils::Typemaps; =head1 NAME @@ -110,7 +108,7 @@ Steffen Mueller C<<[email protected]>> =head1 COPYRIGHT & LICENSE -Copyright 2009-2011 Steffen Mueller +Copyright 2009, 2010, 2011, 2012 Steffen Mueller This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. -- Perl5 Master Repository
