r21988 - in /trunk/libparse-yapp-perl: ./ debian/ debian/patches/ lib/Parse/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri Jun 20 18:09:06 UTC 2008
Author: gregoa
Date: Fri Jun 20 18:09:05 2008
New Revision: 21988
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21988
Log:
* Refresh debian/rules, no functional changes.
* Remove debian/libparse-yapp-perl.docs, don't install README any more.
* Remove debian/libparse-yapp-perl.examples, install examples from
debian/rules.
* Remove unneeded debian/libparse-yapp-perl.install.
* Revert POD changes in upstream code.
* Split out changes to Makefile.PL into a patch, add quilt framework.
Added:
trunk/libparse-yapp-perl/debian/patches/
trunk/libparse-yapp-perl/debian/patches/man-section.patch
trunk/libparse-yapp-perl/debian/patches/series
Removed:
trunk/libparse-yapp-perl/debian/libparse-yapp-perl.docs
trunk/libparse-yapp-perl/debian/libparse-yapp-perl.examples
trunk/libparse-yapp-perl/debian/libparse-yapp-perl.install
Modified:
trunk/libparse-yapp-perl/Makefile.PL
trunk/libparse-yapp-perl/debian/changelog
trunk/libparse-yapp-perl/debian/control
trunk/libparse-yapp-perl/debian/rules
trunk/libparse-yapp-perl/lib/Parse/Yapp.pm
trunk/libparse-yapp-perl/yapp
Modified: trunk/libparse-yapp-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/Makefile.PL?rev=21988&op=diff
==============================================================================
--- trunk/libparse-yapp-perl/Makefile.PL (original)
+++ trunk/libparse-yapp-perl/Makefile.PL Fri Jun 20 18:09:05 2008
@@ -2,9 +2,19 @@
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
WriteMakefile(
- 'NAME' => 'Parse::Yapp',
- 'VERSION_FROM' => 'lib/Parse/Yapp/Driver.pm', # finds $VERSION
- 'EXE_FILES' => [ 'yapp' ],
+ 'NAME' => 'Parse::Yapp',
+ 'VERSION_FROM' => 'lib/Parse/Yapp/Driver.pm', # finds $VERSION
+ 'MAN3PODS' => { 'lib/Parse/Yapp.pm' => '$(INST_MAN3DIR)/Parse::Yapp.3' },
+ 'PM' => {
+ 'lib/Parse/Yapp.pm' => '$(INST_LIBDIR)/Yapp.pm',
+ 'lib/Parse/Yapp/Options.pm' => '$(INST_LIBDIR)/Yapp/Options.pm',
+ 'lib/Parse/Yapp/Driver.pm' => '$(INST_LIBDIR)/Yapp/Driver.pm',
+ 'lib/Parse/Yapp/Grammar.pm' => '$(INST_LIBDIR)/Yapp/Grammar.pm',
+ 'lib/Parse/Yapp/Lalr.pm' => '$(INST_LIBDIR)/Yapp/Lalr.pm',
+ 'lib/Parse/Yapp/Output.pm' => '$(INST_LIBDIR)/Yapp/Output.pm',
+ 'lib/Parse/Yapp/Parse.pm' => '$(INST_LIBDIR)/Yapp/Parse.pm'
+ },
+ 'EXE_FILES' => [ 'yapp' ],
);
sub MY::postamble {
Modified: trunk/libparse-yapp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/debian/changelog?rev=21988&op=diff
==============================================================================
--- trunk/libparse-yapp-perl/debian/changelog (original)
+++ trunk/libparse-yapp-perl/debian/changelog Fri Jun 20 18:09:05 2008
@@ -5,6 +5,13 @@
* Set Maintainer to Debian Perl Group.
* Use dist-based URL in debian/watch.
* debian/rules: delete /usr/lib/perl5 only if it exists.
+ * Refresh debian/rules, no functional changes.
+ * Remove debian/libparse-yapp-perl.docs, don't install README any more.
+ * Remove debian/libparse-yapp-perl.examples, install examples from
+ debian/rules.
+ * Remove unneeded debian/libparse-yapp-perl.install.
+ * Revert POD changes in upstream code.
+ * Split out changes to Makefile.PL into a patch, add quilt framework.
-- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 01 Dec 2007 18:55:12 +0100
Modified: trunk/libparse-yapp-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/debian/control?rev=21988&op=diff
==============================================================================
--- trunk/libparse-yapp-perl/debian/control (original)
+++ trunk/libparse-yapp-perl/debian/control Fri Jun 20 18:09:05 2008
@@ -7,7 +7,7 @@
Homepage: http://search.cpan.org/dist/Parse-Yapp/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libparse-yapp-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/
-Build-Depends: debhelper (>= 4.1)
+Build-Depends: debhelper (>= 4.1), quilt (>= 0.40)
Build-Depends-Indep: perl
Package: libparse-yapp-perl
Added: trunk/libparse-yapp-perl/debian/patches/man-section.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/debian/patches/man-section.patch?rev=21988&op=file
==============================================================================
--- trunk/libparse-yapp-perl/debian/patches/man-section.patch (added)
+++ trunk/libparse-yapp-perl/debian/patches/man-section.patch Fri Jun 20 18:09:05 2008
@@ -1,0 +1,19 @@
+--- libparse-yapp-perl-1.05.orig/Makefile.PL
++++ libparse-yapp-perl-1.05/Makefile.PL
+@@ -4,16 +4,6 @@
+ WriteMakefile(
+ 'NAME' => 'Parse::Yapp',
+ 'VERSION_FROM' => 'lib/Parse/Yapp/Driver.pm', # finds $VERSION
+- 'MAN3PODS' => { 'lib/Parse/Yapp.pm' => '$(INST_MAN3DIR)/Parse::Yapp.3' },
+- 'PM' => {
+- 'lib/Parse/Yapp.pm' => '$(INST_LIBDIR)/Yapp.pm',
+- 'lib/Parse/Yapp/Options.pm' => '$(INST_LIBDIR)/Yapp/Options.pm',
+- 'lib/Parse/Yapp/Driver.pm' => '$(INST_LIBDIR)/Yapp/Driver.pm',
+- 'lib/Parse/Yapp/Grammar.pm' => '$(INST_LIBDIR)/Yapp/Grammar.pm',
+- 'lib/Parse/Yapp/Lalr.pm' => '$(INST_LIBDIR)/Yapp/Lalr.pm',
+- 'lib/Parse/Yapp/Output.pm' => '$(INST_LIBDIR)/Yapp/Output.pm',
+- 'lib/Parse/Yapp/Parse.pm' => '$(INST_LIBDIR)/Yapp/Parse.pm'
+- },
+ 'EXE_FILES' => [ 'yapp' ],
+ );
+
Added: trunk/libparse-yapp-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/debian/patches/series?rev=21988&op=file
==============================================================================
--- trunk/libparse-yapp-perl/debian/patches/series (added)
+++ trunk/libparse-yapp-perl/debian/patches/series Fri Jun 20 18:09:05 2008
@@ -1,0 +1,1 @@
+man-section.patch
Modified: trunk/libparse-yapp-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/debian/rules?rev=21988&op=diff
==============================================================================
--- trunk/libparse-yapp-perl/debian/rules (original)
+++ trunk/libparse-yapp-perl/debian/rules Fri Jun 20 18:09:05 2008
@@ -1,52 +1,63 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-# export DH_COMPAT=4
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+include /usr/share/quilt/quilt.make
-build:
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
- # Add here commands to compile the package.
- perl Makefile.PL verbose INSTALLDIRS=vendor
-clean:
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE)
+ $(MAKE) test
+ touch $@
+
+clean: unpatch
dh_testdir
dh_testroot
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || ( touch Makefile && $(MAKE) realclean )
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f Makefile.old
- dh_clean
-
-install:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ touch $@
- $(MAKE) PREFIX=$(CURDIR)/debian/libparse-yapp-perl/usr OPTIMIZE="-O2 -g -Wall" test install
- [ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+binary-arch:
+# We have nothing to do here for an architecture-independent package
-binary-arch:;
binary-indep: build install
dh_testdir
dh_testroot
+ dh_installexamples Calc.yp YappParse.yp
dh_installdocs
- dh_installman
dh_installchangelogs Changes
- dh_installexamples
- dh_link
- dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/libparse-yapp-perl/lib/Parse/Yapp.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/lib/Parse/Yapp.pm?rev=21988&op=diff
==============================================================================
--- trunk/libparse-yapp-perl/lib/Parse/Yapp.pm (original)
+++ trunk/libparse-yapp-perl/lib/Parse/Yapp.pm Fri Jun 20 18:09:05 2008
@@ -28,7 +28,7 @@
=head1 SYNOPSIS
- yapp \-m MyParser grammar_file.yp
+ yapp -m MyParser grammar_file.yp
...
@@ -56,13 +56,13 @@
=over 4
-=item Comments
+=item C<Comments>
Through all your files, comments are either Perl style, introduced by I<#>
up to the end of line, or C style, enclosed between I</*> and I<*/>.
-=item Tokens and string literals
+=item C<Tokens and string literals>
Through all the grammar files, two kind of symbols may appear:
@@ -91,7 +91,7 @@
I<error> token, which is certainly NOT what you meant.
-=item Grammar file syntax
+=item C<Grammar file syntax>
It is very close to yacc syntax (in fact, I<Parse::Yapp> should compile
a clean I<yacc> grammar without any modification, whereas the opposite
@@ -121,9 +121,9 @@
=item *
Precedence declarations, introduced by C<%left>, C<%right> and C<%nonassoc>
-specifying associativity, followed by the list of tokens or literals
+specifying associativity, followed by the list of tokens or litterals
having the same precedence and associativity.
-The precedence being the latter declared will be having the highest level.
+The precedence beeing the latter declared will be having the highest level.
(see the yacc or bison manuals for a full explanation of how they work,
as they are implemented exactly the same way in Parse::Yapp)
@@ -172,7 +172,7 @@
A rhs may be followed by an optional C<%prec> directive, followed
by a token, giving the rule an explicit precedence (see yacc manuals
-for its precise meaning) and optional semantic action code block (see
+for its precise meaning) and optionnal semantic action code block (see
below).
exp: '-' exp %prec NEG { -$_[1] }
@@ -184,13 +184,13 @@
a rule name (This differs from yacc).
-=item The footer section
+=item C<The footer section>
may contain any valid Perl code and will be appended at the very end
of your parser module. Here you can write your lexer, error report
subs and anything relevant to you parser.
-=item Semantic actions
+=item C<Semantic actions>
Semantic actions are run every time a I<reduction> occurs in the
parsing flow and they must return a semantic value.
@@ -229,7 +229,7 @@
$_[1] to $_[n] are the parameters just as $1 to $n in yacc, while
$_[0] is the parser object itself.
-Having $_[0] being the parser object itself allows you to call
+Having $_[0] beeing the parser object itself allows you to call
parser methods. Thats how the yacc macros are implemented:
yyerrok is done by calling $_[0]->YYErrok
@@ -252,7 +252,7 @@
its semantic value (both can be used to modify their values too, but
I<know what you are doing> ! See I<Error reporting routine> section for
an example), a list which contains the tokens the parser expected when
-the failure occurred and a reference to the lexer routine.
+the failure occured and a reference to the lexer routine.
Note that if C<$_[0]-E<gt>YYCurtok> is declared as a C<%nonassoc> token,
it can be included in C<$_[0]-E<gt>YYExpect> list whenever the input
@@ -274,7 +274,7 @@
where index is an integer. Its value being I<1 .. n> returns the same values
than I<$_[1] .. $_[n]>, but I<-n .. 0> returns values on the left of the rule
-being reduced (It is related to I<$-n .. $0 .. $n> in yacc, but you
+beeing reduced (It is related to I<$-n .. $0 .. $n> in yacc, but you
cannot use I<$_[0]> or I<$_[-n]> constructs in Parse::Yapp for obvious reasons)
@@ -289,19 +289,19 @@
That's how you can make you parser module reentrant: all of your
module states and variables are held inside the parser object.
-Note: unfortunately, method calls in Perl have a lot of overhead,
+Note: unfortunatly, method calls in Perl have a lot of overhead,
and when YYData is used, it may be called a huge number
of times. If your are not a *real* purist and efficiency
is your concern, you may access directly the user-space
- in the object: $parser->{USER} which is a reference to an
+ in the object: $parser->{USER} wich is a reference to an
anonymous hash array, and then benchmark.
-If no action is specified for a rule, the equivalent of a default
+If no action is specified for a rule, the equivalant of a default
action is run, which returns the first parameter:
{ $_[1] }
-=item In rule actions
+=item C<In rule actions>
It is also possible to embed semantic actions inside of a rule:
@@ -323,12 +323,12 @@
I<in rule actions> can produce, in some cases, spurious conflicts
that wouldn't happen otherwise.
-=item Generating the Parser Module
+=item C<Generating the Parser Module>
Now that you grammar file is written, you can use yapp on it
to generate your parser module:
- yapp \-v Calc.yp
+ yapp -v Calc.yp
will create two files F<Calc.pm>, your parser module, and F<Calc.output>
a verbose output of your parser rules, conflicts, warnings, states
@@ -336,7 +336,7 @@
What your are missing now is a lexer routine.
-=item The Lexer sub
+=item C<The Lexer sub>
is called each time the parser need to read the next token.
@@ -350,7 +350,7 @@
It is its duty to return the next token and value to the parser.
They C<must> be returned as a list of two variables, the first one
is the token known by the parser (symbolic or literal), the second
-one being anything you want (usually the content of the token, or the
+one beeing anything you want (usualy the content of the token, or the
literal value) from a simple scalar value to any complex reference,
as the parsing driver never use it but to call semantic actions:
@@ -375,14 +375,14 @@
So you will need an Error reporting sub.
-=item Error reporting routine
+item C<Error reporting routine>
If you want one, write it knowing that it is passed as parameter
-the parser object. So you can share information with the lexer
+the parser object. So you can share information whith the lexer
routine quite easily.
You can also use the C<$_[0]-E<gt>YYErrok> method in it, which will
-resume parsing as if no error occurred. Of course, since the invalid
+resume parsing as if no error occured. Of course, since the invalid
token is still invalid, you're supposed to fix the problem by
yourself.
@@ -398,7 +398,7 @@
and know what you're doing...
-=item Parsing
+=item C<Parsing>
Now you've got everything to do the parsing.
@@ -433,11 +433,11 @@
which returns the total number of time the error reporting sub has been called.
-=item Error Recovery
+=item C<Error Recovery>
in Parse::Yapp is implemented the same way it is in yacc.
-=item Debugging Parser
+=item C<Debugging Parser>
To debug your parser, you can call the YYParse method with a debug parameter:
@@ -452,14 +452,14 @@
0x08 Parse Stack dump
0x10 Error Recovery tracing
-To have a full debugging output, use
+To have a full debugging ouput, use
debug => 0x1F
Debugging output is sent to STDERR, and be aware that it can produce
C<huge> outputs.
-=item Standalone Parsers
+=item C<Standalone Parsers>
By default, the parser modules generated will need the Parse::Yapp
module installed on the system to run. They use the Parse::Yapp::Driver
@@ -473,7 +473,7 @@
If you do so, please remember to include Parse::Yapp's copyright notice
in your main module copyright, so others can know about Parse::Yapp module.
-=item Source file line numbers
+=item C<Source file line numbers>
by default will be included in the generated parser module, which will help
to find the guilty line in your source file in case of a syntax error.
Modified: trunk/libparse-yapp-perl/yapp
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparse-yapp-perl/yapp?rev=21988&op=diff
==============================================================================
--- trunk/libparse-yapp-perl/yapp (original)
+++ trunk/libparse-yapp-perl/yapp Fri Jun 20 18:09:05 2008
@@ -76,11 +76,11 @@
generated parser is directly an executable script, you can specifie one
with the I<-b> option, ie:
- yapp \-b '/usr/local/bin/perl \-w' \-o myscript.pl myscript.yp
+ yapp -b '/usr/local/bin/perl -w' -o myscript.pl myscript.yp
This will output a file called F<myscript.pl> whose very first line is:
- #!/usr/local/bin/perl \-w
+ #!/usr/local/bin/perl -w
The argument is mandatory, but if you specify an empty string, the value
of I<$Config{perlpath}> will be used instead.
More information about the Pkg-perl-cvs-commits
mailing list