re PR preprocessor/16192 (Bug in expression evaluation when operand is missing)

	* doc/cpp.texi: Don't document what we do for ill-formed expressions.
	* doc/cppopts.texi: Clarify processing of command-line defines.

libcpp:
	PR preprocessor/16192
	PR preprocessor/15913
	PR preprocessor/15572
	* expr.c (_cpp_parse_expr): Handle remaining cases where an
	expression is missing.
	* init.c (post_options): Traditional cpp doesn't do // comments.

testsuite:
	* gcc.dg/cpp/if-mop.c: Two new testcases.
	* gcc.dg/cpp/trad/comment-3.c: New.

From-SVN: r84080

9 files changed, 57 insertions, 20 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afe489f..5f635ca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-04  Neil Booth  <neil@duron.akihabara.co.uk>
+
+	* doc/cpp.texi: Don't document what we do for ill-formed expressions.
+	* doc/cppopts.texi: Clarify processing of command-line defines.
+
 2004-07-04  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* doc/contrib.texi (Contributors): Adjust link for GNU Classpath.
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index 6215164..631992d 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -2965,9 +2965,6 @@ expression, and may give different results in some cases.  If the value
 comes out to be nonzero, the @samp{#if} succeeds and the @var{controlled
 text} is included; otherwise it is skipped.
 
-If @var{expression} is not correctly formed, GCC issues an error and
-treats the conditional as having failed.
-
 @node Defined
 @subsection Defined
 
diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi
index 1b6307b..a6b7eb4 100644
--- a/gcc/doc/cppopts.texi
+++ b/gcc/doc/cppopts.texi
@@ -16,11 +16,14 @@
 Predefine @var{name} as a macro, with definition @code{1}.
 
 @item -D @var{name}=@var{definition}
-Predefine @var{name} as a macro, with definition @var{definition}.
-There are no restrictions on the contents of @var{definition}, but if
-you are invoking the preprocessor from a shell or shell-like program you
-may need to use the shell's quoting syntax to protect characters such as
-spaces that have a meaning in the shell syntax.
+The contents of @var{definition} are tokenized and processed as if
+they appeared during translation phase three in a @samp{#define}
+directive.  In particular, the definition will be truncated by
+embedded newline characters.
+
+If you are invoking the preprocessor from a shell or shell-like
+program you may need to use the shell's quoting syntax to protect
+characters such as spaces that have a meaning in the shell syntax.
 
 If you wish to define a function-like macro on the command line, write
 its argument list with surrounding parentheses before the equals sign
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1ca7e1a..9f03b45 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-04  Neil Booth  <neil@duron.akihabara.co.uk>
+
+	* gcc.dg/cpp/if-mop.c: Two new testcases.
+	* gcc.dg/cpp/trad/comment-3.c: New.
+
 2004-07-04  Paul Brook  <paul@codesourcery.com>
 
 	* gfortran.fortran-torture/compile/implicit_1.f90: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp/if-mop.c b/gcc/testsuite/gcc.dg/cpp/if-mop.c
index 9202740..119c739 100644
--- a/gcc/testsuite/gcc.dg/cpp/if-mop.c
+++ b/gcc/testsuite/gcc.dg/cpp/if-mop.c
@@ -23,3 +23,9 @@
 
 #if (2) 4 * 2  /* { dg-error "missing bin" "close paren then immediate" } */
 #endif
+
+#if == 2  /* { dg-error "no left op" } */
+#endif
+
+#if (==2)  /* { dg-error "no left op" } */
+#endif
diff --git a/gcc/testsuite/gcc.dg/cpp/trad/comment-3.c b/gcc/testsuite/gcc.dg/cpp/trad/comment-3.c
new file mode 100644
index 0000000..e2710ad
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/trad/comment-3.c
@@ -0,0 +1,6 @@
+/* Test we don't accept C++ comments.  */
+
+/* { dg-do preprocess } */
+
+#if 0
+#endif //  /* { dg-warning "extra tokens" } */
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 01cb565..2cdd784 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-04  Neil Booth  <neil@duron.akihabara.co.uk>
+
+	PR preprocessor/16192
+	PR preprocessor/15913
+	PR preprocessor/15572
+	* expr.c (_cpp_parse_expr): Handle remaining cases where an
+	expression is missing.
+	* init.c (post_options): Traditional cpp doesn't do // comments.
+
 2004-06-30  Per Bothner  <per@bothner.com>
 
 	* include/line-map.h (fileline):  Remove old typedef.
diff --git a/libcpp/expr.c b/libcpp/expr.c
index f49bd08..4768918 100644
--- a/libcpp/expr.c
+++ b/libcpp/expr.c
@@ -747,18 +747,22 @@ _cpp_parse_expr (cpp_reader *pfile)
 	}
       else if (want_value)
 	{
-	  /* Ordering here is subtle and intended to favor the
-	     missing parenthesis diagnostics over alternatives.  */
-	  if (op.op == CPP_CLOSE_PAREN)
-	    {
-	      if (top->op == CPP_OPEN_PAREN)
-		SYNTAX_ERROR ("void expression between '(' and ')'");
-	    }
-	  else if (top->op == CPP_EOF)
-	    SYNTAX_ERROR ("#if with no expression");
-	  if (top->op != CPP_EOF && top->op != CPP_OPEN_PAREN)
-	    SYNTAX_ERROR2 ("operator '%s' has no right operand",
-			   cpp_token_as_text (pfile, top->token));
+	  /* We want a number (or expression) and haven't got one.
+	     Try to emit a specific diagnostic.  */
+	  if (op.op == CPP_CLOSE_PAREN && top->op == CPP_OPEN_PAREN)
+	    SYNTAX_ERROR ("missing expression between '(' and ')'");
+
+	  if (op.op == CPP_EOF && top->op == CPP_EOF)
+ 	    SYNTAX_ERROR ("#if with no expression");
+
+ 	  if (top->op != CPP_EOF && top->op != CPP_OPEN_PAREN)
+ 	    SYNTAX_ERROR2 ("operator '%s' has no right operand",
+ 			   cpp_token_as_text (pfile, top->token));
+	  else if (op.op == CPP_CLOSE_PAREN || op.op == CPP_EOF)
+	    /* Complain about missing paren during reduction.  */;
+	  else
+	    SYNTAX_ERROR2 ("operator '%s' has no left operand",
+			   cpp_token_as_text (pfile, op.token));
 	}
 
       top = reduce (pfile, top, op.op);
diff --git a/libcpp/init.c b/libcpp/init.c
index 65cca9b..d1cc1e6 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -611,6 +611,8 @@ post_options (cpp_reader *pfile)
 
   if (CPP_OPTION (pfile, traditional))
     {
+      CPP_OPTION (pfile, cplusplus_comments) = 0;
+
       /* Traditional CPP does not accurately track column information.  */
       CPP_OPTION (pfile, show_column) = 0;
       CPP_OPTION (pfile, trigraphs) = 0;