diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c1ab0e4080a..deef002100e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1998-09-08 Mumit Khan + + * parse.y (nomods_initdcl0): Set up the parser stack correctly. + 1998-09-08 Mark Mitchell * cp-tree.h (anonymous_namespace_name): Declare. diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c index c73312cd92c..4642f8d52ad 100644 --- a/gcc/cp/parse.c +++ b/gcc/cp/parse.c @@ -3593,7 +3593,7 @@ static const short yycheck[] = { 4, 77, 78, 79, 80, 81, 82, 83, 84 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/lib/bison.simple" +#line 3 "/usr/cygnus/gnupro-98r1/share/bison.simple" /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -3786,7 +3786,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/lib/bison.simple" +#line 196 "/usr/cygnus/gnupro-98r1/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -5813,7 +5813,7 @@ case 420: case 421: #line 1912 "parse.y" { /* Set things up as initdcl0_innards expects. */ - yyval.ttype = yyvsp[-1].ttype; + yyvsp[0].ttype = yyvsp[-1].ttype; yyvsp[-1].ttype = NULL_TREE; ; break;} case 422: @@ -7781,7 +7781,7 @@ case 870: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/lib/bison.simple" +#line 498 "/usr/cygnus/gnupro-98r1/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index 5bc8cb0bd93..29bfc9d90c1 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -1910,7 +1910,7 @@ notype_initdcl0: nomods_initdcl0: notype_declarator maybeasm { /* Set things up as initdcl0_innards expects. */ - $$ = $1; + $2 = $1; $1 = NULL_TREE; } initdcl0_innards {}