commit 172416823f7dc962a2ae7035d985f16e5318d27e Author: Paul Howarth <p...@city-fan.org> Date: Sat Feb 11 14:36:57 2012 +0000
Update to 1.967006 (#789560) - New upstream release 1.967006 (#789560) - Localize the OUT filehandle during Precompile - Document the <autotree:Base::Class> form of the <autotree> directive - Provide a simple test for the <autotree> directive, t/autotree.t; renamed basics.t to ensure it runs before autotree.t - Allow a global <skip:> directive that functions the same as modifying $Parse::RecDescent::skip prior to compiling a grammar - Require that the $file returned by caller() be eq '-', rather than merely starting with '-' - Warn on empty productions followed by other productions: the empty production always matches, so following productions will never be reached - NON-BACKWARDS COMPATIBLE CHANGE: a repetition directive such as 'id(s /,/)' correctly creates a temporary @item variable to hold the 'id's that are matched. That @item variable is then used to set the real $item[] entry for that repetition. The same treatment is now given to %item. Formerly, in a production like: id ',' id(s /,/) matched against: xxx, yyy, zzz The $item{id} entry that should be 'xxx' is overwritten by 'yyy' and then 'zzz' prior to the action being executed. Now 'yyy' and 'zzz' set $item{id}, but in the private %item, which goes out of scope once the repetition match completes. - EXPERIMENTAL: when precompiling, optionally create a standalone parser by including most of the contents of Parse::RecDescent in the resulting Precompiled output - Accept an optional $options hashref to Precompile, which can be used to specify $options->{-standalone}, which currently defaults to false - The subroutines import, Precompile and Save are not included in the Precompile'd parser - The included Parse::RecDescent module is renamed to Parse::RecDescent::_Runtime to avoid namespace conflicts with an installed and use'd Parse::RecDescent - Add a new t/precompile.t to test precompilation - Add a new $_FILENAME global to Parse::RecDescent to make it easy for the Precompile method to find the module - Remove the prototype from _generate; it is not required, and it caused t/precompile.t (which ends up re-defining a lot of Parse::RecDescent subroutines) to fail needlessly, as the calls to _generate in Replace and Extend normally do not see the prototype, but do when re-defined - POD documentation for standalone parsers added - Added ExtUtils::MakeMaker build/configure version requirements (CPAN RT#74787) - BR: perl(Test::Pod) and perl(Test::Warn) for additional test coverage - Use a patch rather than scripted iconv to fix character encoding - Improve %summary - Tidy %description - Make %files list more explicit - Don't use macros for commands - Don't need to specify compiler flags for pure-perl package - Drop redundant 'find' commands from %install .gitignore | 4 +- Parse-RecDescent-1.967002-utf8.patch | 33 ++++++++++ perl-Parse-RecDescent.spec | 118 ++++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 120 insertions(+), 37 deletions(-) --- diff --git a/.gitignore b/.gitignore index d7dcb73..f53ff7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -Parse-RecDescent-1.964.tar.gz -/Parse-RecDescent-1.965001.tar.gz -/Parse-RecDescent-1.967003.tar.gz +/Parse-RecDescent-[0-9.]*.tar.gz diff --git a/Parse-RecDescent-1.967002-utf8.patch b/Parse-RecDescent-1.967002-utf8.patch new file mode 100644 index 0000000..43bb884 --- /dev/null +++ b/Parse-RecDescent-1.967002-utf8.patch @@ -0,0 +1,33 @@ +diff -up Parse-RecDescent-1.967002/Changes.utf8 Parse-RecDescent-1.967002/Changes +--- Parse-RecDescent-1.967002/Changes.utf8 2012-01-30 03:13:13.000000000 +0000 ++++ Parse-RecDescent-1.967002/Changes 2012-01-30 16:22:52.599253728 +0000 +@@ -531,7 +531,7 @@ Revision history for Parse-RecDescent + + - Fixed nit in debugging of conditional regexes (thanks, Brian) + +- - Moved expectation creation to compile-time (thanks Fran�ois) ++ - Moved expectation creation to compile-time (thanks François) + + - Removed redundant inheritances (i.e. @ISA elements) + in internal namespace (thanks Hugo) +diff -up Parse-RecDescent-1.967002/demo/demo_dot.pl.utf8 Parse-RecDescent-1.967002/demo/demo_dot.pl +--- Parse-RecDescent-1.967002/demo/demo_dot.pl.utf8 2012-01-30 16:22:52.580253741 +0000 ++++ Parse-RecDescent-1.967002/demo/demo_dot.pl 2012-01-30 16:22:52.626253709 +0000 +@@ -10,7 +10,7 @@ Received: (from root@localhost) + Wed, 20 Oct 1999 21:29:05 +0200 + Date: Wed, 20 Oct 1999 21:29:05 +0200 + Message-Id: <199910201929.vaa00...@bib.adnintern.org> +-From: "St�phane Payrard -- s...@adnaccess.com (06 60 95 82 69)" <s...@adnaccess.com> ++From: "Stéphane Payrard -- s...@adnaccess.com (06 60 95 82 69)" <s...@adnaccess.com> + To: dam...@cs.monash.edu.au + Subject: parsing dot file + Reply-to: s...@adnaccess.com +@@ -39,7 +39,7 @@ my $graph = "$DOTSRC/graphs"; + # $::RD_AUTOSTUB=1; + # $::RD_TRACE=1; + +-# 'strict'(?) pas accept� ++# 'strict'(?) pas accepté + $gram = <<'EOF'; + + graph: comment(?) strict(?) ( 'digraph' | 'graph' ) id '{' stmt_list '}' diff --git a/perl-Parse-RecDescent.spec b/perl-Parse-RecDescent.spec index 1a82c7f..9b108f9 100644 --- a/perl-Parse-RecDescent.spec +++ b/perl-Parse-RecDescent.spec @@ -1,19 +1,22 @@ Name: perl-Parse-RecDescent -Version: 1.967003 +Version: 1.967006 Release: 1%{?dist} -Summary: Parse-RecDescent Perl module +Summary: Generate Recursive-Descent Parsers Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Parse-RecDescent/ Source0: http://search.cpan.org/CPAN/authors/id/J/JT/JTBRAUN/Parse-RecDescent-%{version}.tar.gz +Patch0: Parse-RecDescent-1.967002-utf8.patch BuildArch: noarch -BuildRequires: perl(version) BuildRequires: perl(Carp) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Module::Build) BuildRequires: perl(Text::Balanced) BuildRequires: perl(Test::More) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Warn) +BuildRequires: perl(version) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %{?perl_default_filter} @@ -21,42 +24,38 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi Parse::RecDescent incrementally generates top-down recursive-descent text parsers from simple yacc-like grammar specifications. It provides: - * Regular expressions or literal strings as terminals (tokens), - * Multiple (non-contiguous) productions for any rule, - * Repeated and optional subrules within productions, - * Full access to Perl within actions specified as part of the - grammar, - * Simple automated error reporting during parser generation and - parsing, - * The ability to commit to, uncommit to, or reject particular - productions during a parse, - * The ability to pass data up and down the parse tree ("down" via - subrule argument lists, "up" via subrule return values) - * Incremental extension of the parsing grammar (even during a - parse), - * Precompilation of parser objects, - -User-definable reduce-reduce conflict resolution via "scoring" of -matching productions. + + * Regular expressions or literal strings as terminals (tokens) + * Multiple (non-contiguous) productions for any rule + * Repeated and optional subrules within productions + * Full access to Perl within actions specified as part of the grammar + * Simple automated error reporting during parser generation and parsing + * The ability to commit to, uncommit to, or reject particular + productions during a parse + * The ability to pass data up and down the parse tree ("down" via + subrule argument lists, "up" via subrule return values) + * Incremental extension of the parsing grammar (even during a parse) + * Precompilation of parser objects + * User-definable reduce-reduce conflict resolution via "scoring" of + matching productions %prep %setup -q -n Parse-RecDescent-%{version} -chmod a-x demo/* tutorial/* -perl -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!%{__perl}|' demo/* -perl -pi -e 's|^#!\s?/opt/local/bin/perl5\.10\.0\b|#!%{__perl}|' demo/* -for f in Changes demo/demo_dot.pl; do - iconv -f iso-8859-1 -t utf-8 < "$f" > "${f}_" && mv -f "${f}_" "$f" -done + +# Recode as UTF8 +%patch0 -p1 + +# Fix permissions and script interpreters +chmod -c a-x demo/* tutorial/* +perl -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!/usr/bin/perl|' demo/* %build -perl Build.PL installdirs=vendor optimize="%{optflags}" +perl Build.PL installdirs=vendor ./Build %install ./Build install destdir=%{buildroot} create_packlist=0 -find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \; -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; -%{_fixperms} %{buildroot}/* +%{_fixperms} %{buildroot} %check ./Build test @@ -64,9 +63,62 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %files %doc Changes README ToDo demo/ tutorial/ %{perl_vendorlib}/Parse/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/Parse::RecDescent.3pm* %changelog +* Sat Feb 11 2012 Paul Howarth <p...@city-fan.org> - 1.967006-1 +- Update to 1.967006 (#789560) + - Localize the OUT filehandle during Precompile + - Document the <autotree:Base::Class> form of the <autotree> directive + - Provide a simple test for the <autotree> directive, t/autotree.t; renamed + basics.t to ensure it runs before autotree.t + - Allow a global <skip:> directive that functions the same as modifying + $Parse::RecDescent::skip prior to compiling a grammar + - Require that the $file returned by caller() be eq '-', rather than merely + starting with '-' + - Warn on empty productions followed by other productions: the empty + production always matches, so following productions will never be reached + - NON-BACKWARDS COMPATIBLE CHANGE: a repetition directive such as 'id(s /,/)' + correctly creates a temporary @item variable to hold the 'id's that are + matched. That @item variable is then used to set the real $item[] entry for + that repetition. The same treatment is now given to %%item. Formerly, in a + production like: + id ',' id(s /,/) + matched against: + xxx, yyy, zzz + The $item{id} entry that should be 'xxx' is overwritten by 'yyy' and then + 'zzz' prior to the action being executed. Now 'yyy' and 'zzz' set + $item{id}, but in the private %%item, which goes out of scope once the + repetition match completes. + - EXPERIMENTAL: when precompiling, optionally create a standalone parser by + including most of the contents of Parse::RecDescent in the resulting + Precompiled output + - Accept an optional $options hashref to Precompile, which can be used to + specify $options->{-standalone}, which currently defaults to false + - The subroutines import, Precompile and Save are not included in the + Precompile'd parser + - The included Parse::RecDescent module is renamed to + Parse::RecDescent::_Runtime to avoid namespace conflicts with an installed + and use'd Parse::RecDescent + - Add a new t/precompile.t to test precompilation + - Add a new $_FILENAME global to Parse::RecDescent to make it easy for the + Precompile method to find the module + - Remove the prototype from _generate; it is not required, and it caused + t/precompile.t (which ends up re-defining a lot of Parse::RecDescent + subroutines) to fail needlessly, as the calls to _generate in Replace and + Extend normally do not see the prototype, but do when re-defined + - POD documentation for standalone parsers added + - Added ExtUtils::MakeMaker build/configure version requirements + (CPAN RT#74787) +- BR: perl(Test::Pod) and perl(Test::Warn) for additional test coverage +- Use a patch rather than scripted iconv to fix character encoding +- Improve %%summary +- Tidy %%description +- Make %%files list more explicit +- Don't use macros for commands +- Don't need to specify compiler flags for pure-perl package +- Drop redundant 'find' commands from %%install + * Tue Jan 31 2012 Petr Šabata <con...@redhat.com> - 1.967003-1 - 1.967003 bump (backwards-incompatible changes) - Spec cleanup and modernization @@ -83,7 +135,7 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Tue Dec 21 2010 Marcela Maslanova <mmasl...@redhat.com> - 1.965001-2 -- 661697 rebuild for fixing problems with vendorach/lib +- rebuild to fix problems with vendorarch/lib (#661697) * Fri Sep 24 2010 Marcela Mašláňová <mmasl...@redhat.com> 1.965001-1 - update diff --git a/sources b/sources index aadbb9d..521b208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -061e5e1cf05b2978adb3ca8957c7c0e4 Parse-RecDescent-1.967003.tar.gz +d672da11944ffe0884471b975e47cd2d Parse-RecDescent-1.967006.tar.gz
-- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/perl-devel