Re: [pph] Refactor pth/pph code out of cp/parser.c

[Diego Novillo <dnovillo at google dot com>]

On Tue, Jan 4, 2011 at 11:11, Diego Novillo <dnovillo@google.com> wrote:
> On Thu, Dec 2, 2010 at 18:28, Jason Merrill <jason@redhat.com> wrote:
>> On 12/02/2010 04:55 PM, Diego Novillo wrote:
>>>
>>> Jason, would it be OK if I ported cp/parser.h to mainline now?
>>> It does not change anything in terms of functionality but it
>>> would simplify future merges from trunk into the branch.
>>
>> Yeah, OK.
>
> [ I thought this had gone out before, but it got stuck in my mailbox.
> Sending again. ]
>
> All cosmetic/factoring changes:
>
> - Moved structure definitions to cp/parser.h
> - Tweaked token dumping routines.
> - Changed token buffer to be a VEC and simplify the main lexing loop.
>
> OK for mainline? ÂTested on x86_64.
>
>
> Thanks.
>
>
> 2010-12-28 ÂDiego Novillo Â<dnovillo@google.com>
>
> Â Â Â Â* cp/Make-lang.in (CXX_PARSER_H): New.
> Â Â Â Â(cp/parser.o): Add dependency on CXX_PARSER_H.
> Â Â Â ÂAdd dependency on tree-pretty-print.h
> Â Â Â Â(cp/cp-lang.o): Add dependency on CXX_PARSER_H.
> Â Â Â Â* cp/cp-lang.c: Include parser.h.
> Â Â Â Â* cp/parser.c: Include parser.h.
> Â Â Â Â(struct cp_token): Add bitfield purged_p.
> Â Â Â ÂUpdate all users.
> Â Â Â ÂMove to parser.h.
> Â Â Â Â(CPP_PURGED): Remove. ÂUpdate all users.
> Â Â Â Â(struct cp_lexer): Change field buffer to be a VEC of cp_token.
> Â Â Â ÂRemove field buffer_length.
> Â Â Â ÂUpdate all users.
> Â Â Â ÂMove to parser.h.
> Â Â Â Â(struct tree_check): Move to parser.h.
> Â Â Â Â(cp_token_position): Likewise.
> Â Â Â Â(struct cp_token_cache): Likewise.
> Â Â Â Â(CPP_KEYWORD): Likewise.
> Â Â Â Â(CPP_TEMPLATE_ID): Likewise.
> Â Â Â Â(CPP_NESTED_NAME_SPECIFIER): Likewise.
> Â Â Â Â(N_CP_TTYPES): Likewise.
> Â Â Â Â(enum cp_parser_status_kind): Likewise.
> Â Â Â Â(struct cp_parser_context): Likewise.
> Â Â Â Â(struct cp_default_arg_entry_d): Likewise.
> Â Â Â Â(struct cp_unparsed_functions_entry_d): Likewise.
> Â Â Â Â(struct cp_parser): Likewise.
> Â Â Â Â(cp_lexer_dump_tokens): New.
> Â Â Â Â(cp_lexer_debug_tokens): New.
> Â Â Â Â(cp_lexer_finished_p): New.
> Â Â Â Â(cp_lexer_alloc): Factor out of cp_lexer_new_main.
> Â Â Â Â(cp_lexer_new_main): Re-write main lexing loop to push
> Â Â Â Âtokens into the new VEC buffer.
> Â Â Â Â(cp_lexer_print_token): Improve printing of CPP_NUMBER tokens.
> Â Â Â ÂDo not abort if the token type is not recognized, just print
> Â Â Â Âits code.
> Â Â Â Â* cp/parser.h: New file.
> Â Â Â Â* cp/config-lang.in (gtfiles): Add cp/parser.h.
>

Jason, Dodji,

Now that we are in stage 1, I am planning to commit this to trunk
soonish.  Would this cause any conflicts with any branch you're
planning to merge?


Diego.