Le 14 déc. 2012 à 17:15, Théophile Ranquet <[email protected]> a écrit :
> 2012/12/12 Akim Demaille <[email protected]>: >> >> Le 12 déc. 2012 à 11:51, Theophile Ranquet <[email protected]> a >> écrit : >> >>> * doc/local.mk: Avoid overwriting Automake's rules. >> >> Please, install, but add in the commit message the URL of >> your message to the Automake list. And credit the person >> who suggested the solution (name in commit message, and >> name + email in THANKS). > > Installed, with the added credit to THANKS and the following commit message: > > commit f039b5180581b8aed982e4c3107ceebfb82703f8 > Author: Theophile Ranquet <[email protected]> > Date: Tue Dec 4 16:09:24 2012 +0100 > > doc: fix build dependencies > > Suggested by Nick Bowler > <http://lists.gnu.org/archive/html/bug-automake/2012-12/msg00001.html> > > * doc/local.mk: Avoid overwriting Automake's rules. I have installed what follows in master. commit d42e695e53bf9521593f074a58dd8165336df204 Author: Akim Demaille <[email protected]> Date: Sat Dec 15 08:19:59 2012 +0100 doc: fix dependencies * doc/local.mk: here. diff --git a/doc/local.mk b/doc/local.mk index cef4448..c8b72ac 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -124,7 +124,9 @@ nodist_man_MANS = doc/yacc.1 ## ----------------------------- ## CLEANDIRS += doc/figs -FIGS_DOT = doc/figs/example-reduce.dot doc/figs/example-shift.dot +FIGS_DOT = \ + doc/figs/example.dot \ + doc/figs/example-reduce.dot doc/figs/example-shift.dot EXTRA_DIST += \ $(FIGS_DOT) \ $(FIGS_DOT:.dot=.eps) $(FIGS_DOT:.dot=.pdf) $(FIGS_DOT:.dot=.png) commit a73aa764a1d4b4cdf352558f030bcfcccfe97d7f Author: Akim Demaille <[email protected]> Date: Fri Dec 14 16:38:02 2012 +0100 doc: style fixes * doc/bison.texi: Add a couple of missing @var and @code. diff --git a/doc/bison.texi b/doc/bison.texi index e0c321b..c1cafee 100644 --- a/doc/bison.texi +++ b/doc/bison.texi @@ -5077,7 +5077,7 @@ calling convention is used for the lexical analyzer function @code{yylex}. @xref{Pure Calling, ,Calling Conventions for Pure Parsers}, for the details of this. The variable @code{yynerrs} becomes local in @code{yyparse} in pull mode but it becomes a member -of yypstate in push mode. (@pxref{Error Reporting, ,The Error +of @code{yypstate} in push mode. (@pxref{Error Reporting, ,The Error Reporting Function @code{yyerror}}). The convention for calling @code{yyparse} itself is unchanged. @@ -6250,7 +6250,7 @@ function is available if either the @samp{%define api.push-pull push} or @samp{%define api.push-pull both} declaration is used. @xref{Push Decl, ,A Push Parser}. -@deftypefun int yypush_parse (yypstate *yyps) +@deftypefun int yypush_parse (yypstate *@var{yyps}) The value returned by @code{yypush_parse} is the same as for yyparse with the following exception: it returns @code{YYPUSH_MORE} if more input is required to finish parsing the grammar. @@ -6268,7 +6268,7 @@ stream. This function is available if the @samp{%define api.push-pull both} declaration is used. @xref{Push Decl, ,A Push Parser}. -@deftypefun int yypull_parse (yypstate *yyps) +@deftypefun int yypull_parse (yypstate *@var{yyps}) The value returned by @code{yypull_parse} is the same as for @code{yyparse}. @end deftypefun @@ -6303,7 +6303,7 @@ function is available if either the @samp{%define api.push-pull push} or @samp{%define api.push-pull both} declaration is used. @xref{Push Decl, ,A Push Parser}. -@deftypefun void yypstate_delete (yypstate *yyps) +@deftypefun void yypstate_delete (yypstate *@var{yyps}) This function will reclaim the memory associated with a parser instance. After this call, you should no longer attempt to use the parser instance. @end deftypefun @@ -12648,7 +12648,7 @@ Management}. @deffn {Variable} yynerrs Global variable which Bison increments each time it reports a syntax error. (In a pure parser, it is a local variable within @code{yyparse}. In a -pure push parser, it is a member of yypstate.) +pure push parser, it is a member of @code{yypstate}.) @xref{Error Reporting, ,The Error Reporting Function @code{yyerror}}. @end deffn
