Re: several messages

[Joel E. Denny]

On Tue, 15 Dec 2009, Jonathan Nieder wrote:

> > 3. After committing in your local repo, email us the output of:
> > 
> >   git format-patch --stdout -1
> > 
> > That will make your patch easier to apply.
> 
> I am not sure I understand this one.

My mistake.  By the time I wrote that, I forgot you were actually using 
format-patch, and so I just wrote the usual recipe.

> Do you mean that I should keep
> the "From " mbox delimiter and From:, Date:, etc fields inline in my
> message?

I guess I'm just not used to seeing so many emails for one small issue.  
I'm used to seeing patches appended to the main email that introduces 
them.  However, feel free to send patches separately if that's somehow 
easier for you.

> >> --- a/data/yacc.c
> >> +++ b/data/yacc.c
> >> @@ -668,7 +668,7 @@ while (YYID (0))
> >>     we won't break user code: when these are the locations we know.  */
> >>  
> >>  #ifndef YY_LOCATION_PRINT
> >> -# if YYLTYPE_IS_TRIVIAL
> >> +]b4_locations_if([[# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
> >>  #  define YY_LOCATION_PRINT(File, Loc)                    \
> >>       fprintf (File, "%d.%d-%d.%d",                        \
> >>          (Loc).first_line, (Loc).first_column,     \
> >> @@ -676,7 +676,9 @@ while (YYID (0))
> >>  # else
> >>  #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
> >>  # endif
> >> -#endif
> >> +]], [[ /* This macro is maintained here in case user code is relying on 
> >> it. */
> >> +# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
> >> +]])[#endif
> >
> > How does the b4_locations_if part of this change help?
> 
> Not much, admittedly.  Here is why I did it anyway:

I understand your reasoning, but it sounds like this change is distinct 
from the rest of your changes, it does not fix any bugs, and it might 
somehow create a backward compatibility issue for someone somewhere.  
That is, even though neither YY_LOCATION_PRINT nor YYLTYPE_IS_TRIVIAL is 
actually documented for users, YY_LOCATION_PRINT was put there for some 
purpose, and the discrepancy you're eliminating between yacc.c and glr.c 
might somehow be intentional.

I want to include the rest of your changes in release 2.4.2, which is 
purely a bug fix release, so please submit the b4_locations_if change in a 
separate patch.