[PATCH, stage1] Better error recovery for merge-conflict markers

[Joseph Myers]

On Fri, 17 Apr 2015, David Malcolm wrote:

> gcc/c-family/ChangeLog:
> 	* c-common.h (conflict_marker_get_final_tok_kind): New prototype.
> 	* c-lex.c (conflict_marker_get_final_tok_kind): New function.
> 
> gcc/c/ChangeLog:
> 	* c-parser.c (struct c_parser): Expand array "tokens_buf" from 2
> 	to 4.
> 	(c_parser_peek_nth_token): New function.
> 	(c_parser_peek_conflict_marker): New function.
> 	(c_parser_error): Detect patch conflict markers and report them as
> 	such.

The C front-end changes are OK.

-- 
Joseph S. Myers
joseph@codesourcery.com