* c-parse.in (expr_no_commas, primary), c-typeck.c

	(parser_build_binary_op): Use IS_EXPR_CODE_CLASS.

From-SVN: r46619

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5cd6c8db334db1e2540f933ad06360290a40bace..c03b10315ea9a99f1670a60dc68c545e8f6505b3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * c-parse.in (expr_no_commas, primary), c-typeck.c
+       (parser_build_binary_op): Use IS_EXPR_CODE_CLASS.
+
 2001-10-29  David Edelsohn  <edelsohn@gnu.org>
 
        Undo assemble_name change in earlier patch.

diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 8c1b26fff54e36326c9ba34c1f55484ba6c3fb65..b3d9b2fb6cffa4b3263edab705d4bac614a7728c 100644 (file)
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -605,8 +605,7 @@ expr_no_commas:
                { char class;
                  $$ = build_modify_expr ($1, NOP_EXPR, $3);
                  class = TREE_CODE_CLASS (TREE_CODE ($$));
-                 if (class == 'e' || class == '1'
-                     || class == '2' || class == '<')
+                 if (IS_EXPR_CODE_CLASS (class))
                    C_SET_EXP_ORIGINAL_CODE ($$, MODIFY_EXPR);
                }
        | expr_no_commas ASSIGN expr_no_commas
@@ -614,8 +613,7 @@ expr_no_commas:
                  $$ = build_modify_expr ($1, $2, $3);
                  /* This inhibits warnings in truthvalue_conversion.  */
                  class = TREE_CODE_CLASS (TREE_CODE ($$));
-                 if (class == 'e' || class == '1'
-                     || class == '2' || class == '<')
+                 if (IS_EXPR_CODE_CLASS (class))
                    C_SET_EXP_ORIGINAL_CODE ($$, ERROR_MARK);
                }
        ;
@@ -663,8 +661,7 @@ primary:
                }
        | '(' expr ')'
                { char class = TREE_CODE_CLASS (TREE_CODE ($2));
-                 if (class == 'e' || class == '1'
-                     || class == '2' || class == '<')
+                 if (IS_EXPR_CODE_CLASS (class))
                    C_SET_EXP_ORIGINAL_CODE ($2, ERROR_MARK);
                  $$ = $2; }
        | '(' error ')'

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 881e7ffbc0dcd2806b084688285bb241de461863..41ca8ffe8a54b3a9663e3990326de9fe37fec35a 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -1752,11 +1752,9 @@ parser_build_binary_op (code, arg1, arg2)
   enum tree_code code1 = ERROR_MARK;
   enum tree_code code2 = ERROR_MARK;
 
-  if (class1 == 'e' || class1 == '1'
-      || class1 == '2' || class1 == '<')
+  if (IS_EXPR_CODE_CLASS (class1))
     code1 = C_EXP_ORIGINAL_CODE (arg1);
-  if (class2 == 'e' || class2 == '1'
-      || class2 == '2' || class2 == '<')
+  if (IS_EXPR_CODE_CLASS (class2))
     code2 = C_EXP_ORIGINAL_CODE (arg2);
 
   /* Check for cases such as x+y<<z which users are likely
@@ -1826,8 +1824,7 @@ parser_build_binary_op (code, arg1, arg2)
 
   /* Record the code that was specified in the source,
      for the sake of warnings about confusing nesting.  */
-  if (class == 'e' || class == '1'
-      || class == '2' || class == '<')
+  if (IS_EXPR_CODE_CLASS (class))
     C_SET_EXP_ORIGINAL_CODE (result, code);
   else
     {