* cppinit.c (cpp_start_read): Turn off -Wtraditional if

	processing C++.
	* cpplib.c (_cpp_handle_directive): Improve warnings for
	traditional C and indented directives.

	* enquire.c, gsyslimits.h, limity.h, config/convex/fixinc.convex,
	fixinc/fixinc.irix, fixinc/fixinc.sco, fixinc/fixinc.wrap,
	fixinc/inclhack.def: Indent the # of #include_next one space.
	* cp/rtti.c: Un-indent #if and #endif.

	* cppexp.c (_cpp_parse_expr): If lex returns '#', it's a
	syntax error, but an error has already been printed.
	* cpplex.c (_cpp_parse_assertion): Give a more specific error
	message when called with nothing remaining on the line.
	(_cpp_lex_token): If _cpp_parse_assertion fails, return an
	OTHER token, not an ASSERTION.
	* cpplib.c (do_assert): When we create a 'base' node, clear
	its aschain pointer.

	* gcc.c-torture/compile/981211-1.c: Move to...
	* gcc.dg/cpp-as1.c: ...here.
	* gcc.dg/cpp-as2.c: New file.

	* gcc.dg/cpp-tradwarn1.c: Change warning regexps to match the
	compiler.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32870 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 0 deletions

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index a2c60b71935..b89eca8e58e 100644
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -785,6 +785,11 @@ _cpp_parse_expr (pfile)
 	  cpp_ice (pfile, "lex returns a NAME");
 	case ERROR:
 	  goto syntax_error;
+	case '#':
+	  /* We get '#' when get_directive_token hits a syntactically
+	     invalid assertion predicate.  _cpp_parse_assertion has
+	     already issued an error.  */
+	  goto syntax_error;
 	default:
 	  cpp_error (pfile, "invalid character in #if");
 	  goto syntax_error;