* parse.y (simple_stmt): Use getdecls() to check for decl.

From-SVN: r18032

gcc/cp/ChangeLog

+Tue Feb 17 11:54:16 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* parse.y (simple_stmt): Use getdecls() to check for decl.
+
 Sat Feb 14 11:50:51 1998  Manfred Hollstein  <manfred@s-direktnet.de>
 
 	* Make-lang.in (DEMANGLER_INSTALL_NAME, DEMANGLER_CROSS_NAME): New 

gcc/cp/parse.c

@@ -7483,7 +7483,7 @@ case 687:
 		  /* If the condition wasn't a declaration, clear out the
 		     block we made for it and start a new one here so the
 		     optimization in expand_end_loop will work.  */
-		  if (TREE_CODE (yyvsp[0].ttype) != VAR_DECL)
+		  if (getdecls () == NULL_TREE)
 		    {
 		      do_poplevel ();
 		      do_pushlevel ();
@@ -7615,7 +7615,7 @@ case 694:
 		  /* If the condition wasn't a declaration, clear out the
 		     block we made for it and start a new one here so the
 		     optimization in expand_end_loop will work.  */
-		  if (yyvsp[-1].ttype == NULL_TREE || TREE_CODE (yyvsp[-1].ttype) != VAR_DECL)
+		  if (getdecls () == NULL_TREE)
 		    {
 		      do_poplevel ();
 		      do_pushlevel ();

gcc/cp/parse.y

@@ -3658,7 +3658,7 @@ simple_stmt:
 		  /* If the condition wasn't a declaration, clear out the
 		     block we made for it and start a new one here so the
 		     optimization in expand_end_loop will work.  */
-		  if (TREE_CODE ($4) != VAR_DECL)
+		  if (getdecls () == NULL_TREE)
 		    {
 		      do_poplevel ();
 		      do_pushlevel ();
@@ -3776,7 +3776,7 @@ simple_stmt:
 		  /* If the condition wasn't a declaration, clear out the
 		     block we made for it and start a new one here so the
 		     optimization in expand_end_loop will work.  */
-		  if ($7 == NULL_TREE || TREE_CODE ($7) != VAR_DECL)
+		  if (getdecls () == NULL_TREE)
 		    {
 		      do_poplevel ();
 		      do_pushlevel ();