c-parse.in (bison parser, [...]): Remove uses of doing_objc_thang.

	* c-parse.in (bison parser, init_reswords): Remove uses of
	doing_objc_thang.
	* c-tree.h (doing_objc_thang): Remove.

From-SVN: r42000

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1839c19c896f172d118bc8c388eaced8151e1ce8..8ea9949d9f722978a8363042f861999e516c411d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-12  Neil Booth  <neil@cat.daikokuya.demon.co.uk>
+
+       * c-parse.in (bison parser, init_reswords): Remove uses of
+       doing_objc_thang.
+       * c-tree.h (doing_objc_thang): Remove.
+
 2001-05-12  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * cpplex.c (_cpp_lex_token): Ensure we warn at most once

diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 253cb292b66d82279e78807990e8adf46c80f46b..ab2073e8dfff01ab60177556889cec7185c346cc 100644 (file)
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -701,32 +701,22 @@ primary:
        | primary '.' identifier
                {
 ifobjc
-                  if (doing_objc_thang)
-                    {
-                     if (is_public ($1, $3))
-                       $$ = build_component_ref ($1, $3);
-                     else
-                       $$ = error_mark_node;
-                   }
-                  else
+                   if (!is_public ($1, $3))
+                     $$ = error_mark_node;
+                   else
 end ifobjc
-                   $$ = build_component_ref ($1, $3);
+                     $$ = build_component_ref ($1, $3);
                }
        | primary POINTSAT identifier
                {
                   tree expr = build_indirect_ref ($1, "->");
 
 ifobjc
-                  if (doing_objc_thang)
-                    {
-                     if (is_public (expr, $3))
-                       $$ = build_component_ref (expr, $3);
-                     else
+                     if (!is_public (expr, $3))
                        $$ = error_mark_node;
-                   }
-                  else
+                     else
 end ifobjc
-                    $$ = build_component_ref (expr, $3);
+                       $$ = build_component_ref (expr, $3);
                }
        | primary PLUSPLUS
                { $$ = build_unary_op (POSTINCREMENT_EXPR, $1, 0); }
@@ -3592,10 +3582,12 @@ init_reswords ()
 {
   unsigned int i;
   tree id;
-  int mask = ((doing_objc_thang ? 0 : D_OBJC)
-             | (flag_isoc99 ? 0 : D_C89)
+  int mask = (flag_isoc99 ? 0 : D_C89)
              | (flag_traditional ? D_TRAD : 0)
-             | (flag_no_asm ? (flag_isoc99 ? D_EXT : D_EXT|D_EXT89) : 0));
+             | (flag_no_asm ? (flag_isoc99 ? D_EXT : D_EXT|D_EXT89) : 0);
+
+  if (c_language != clk_objective_c)
+     mask |= D_OBJC;
 
   /* It is not necessary to register ridpointers as a GC root, because
      all the trees it points to are permanently interned in the
@@ -3715,7 +3707,8 @@ yylexname ()
       if (TREE_CODE (decl) == TYPE_DECL)
        return TYPENAME;
     }
-  else if (doing_objc_thang)
+ifobjc
+  else
     {
       tree objc_interface_decl = is_class_name (yylval.ttype);
 
@@ -3725,6 +3718,7 @@ yylexname ()
          return CLASSNAME;
        }
     }
+end ifobjc
 
   return IDENTIFIER;
 }

diff --git a/gcc/c-tree.h b/gcc/c-tree.h
index 543a310280f27a596640ae182963c0d1b4aca8e5..c34bd9c201b5d3b1b2353af1563b4abfd0fab1a4 100644 (file)
--- a/gcc/c-tree.h
+++ b/gcc/c-tree.h
@@ -359,11 +359,6 @@ extern int system_header_p;
 /* Warn about implicit declarations.  1 = warning, 2 = error.  */
 extern int mesg_implicit_function_declaration;
 
-/* Nonzero enables objc features.  */
-
-#define doing_objc_thang \
-  (c_language == clk_objective_c)
-
 /* In c-decl.c */
 extern void finish_incomplete_decl PARAMS ((tree));