From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26384 invoked by alias); 18 May 2003 17:38:39 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 26374 invoked from network); 18 May 2003 17:38:38 -0000 Received: from unknown (HELO mout1.freenet.de) (194.97.50.132) by sources.redhat.com with SMTP; 18 May 2003 17:38:38 -0000 Received: from [194.97.50.135] (helo=mx2.freenet.de) by mout1.freenet.de with asmtp (Exim 4.20) id 19HS7J-0006cF-Mu for gdb-patches@sources.redhat.com; Sun, 18 May 2003 19:38:37 +0200 Received: from b04d8.pppool.de ([213.7.4.216] helo=whitebox.local) by mx2.freenet.de with esmtp (Exim 4.20 #1) id 19HS7I-00038c-NN for gdb-patches@sources.redhat.com; Sun, 18 May 2003 19:38:37 +0200 Received: from whitebox.local (localhost [127.0.0.1]) by whitebox.local (8.12.7/8.12.7/SuSE Linux 0.6) with ESMTP id h4IHauIk010205 for ; Sun, 18 May 2003 19:36:56 +0200 Received: (from andreas@localhost) by whitebox.local (8.12.7/8.12.7/Submit) id h4IHatb2010202; Sun, 18 May 2003 19:36:55 +0200 X-Authentication-Warning: whitebox.local: andreas set sender to schwab@suse.de using -f To: gdb-patches@sources.redhat.com Subject: Kill reduce/reduce conflicts X-Yow: Am I elected yet? From: Andreas Schwab Date: Sun, 18 May 2003 17:38:00 -0000 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2003-05/txt/msg00322.txt.bz2 This kills 16 reduce/reduce conflicts in the C parser. Committed as obvious. Andreas. 2003-05-18 Andreas Schwab * c-exp.y (typebase): Remove duplicate occurence of `SIGNED_KEYWORD LONG LONG'. Use builtin_type_long_long instead of lookup_signed_typename. Index: gdb/c-exp.y =================================================================== RCS file: /cvs/src/src/gdb/c-exp.y,v retrieving revision 1.20 diff -u -a -p -r1.20 c-exp.y --- gdb/c-exp.y 14 May 2003 17:43:16 -0000 1.20 +++ gdb/c-exp.y 18 May 2003 17:15:30 -0000 @@ -1,6 +1,6 @@ /* YACC parser for C expressions, for GDB. Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000 + 1998, 1999, 2000, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -831,6 +831,8 @@ typebase /* Implements (approximately): { $$ = builtin_type_long_long; } | SIGNED_KEYWORD LONG LONG { $$ = builtin_type_long_long; } + | SIGNED_KEYWORD LONG LONG INT_KEYWORD + { $$ = builtin_type_long_long; } | UNSIGNED LONG LONG { $$ = builtin_type_unsigned_long_long; } | UNSIGNED LONG LONG INT_KEYWORD @@ -839,10 +841,6 @@ typebase /* Implements (approximately): { $$ = builtin_type_unsigned_long_long; } | LONG LONG UNSIGNED INT_KEYWORD { $$ = builtin_type_unsigned_long_long; } - | SIGNED_KEYWORD LONG LONG - { $$ = lookup_signed_typename ("long long"); } - | SIGNED_KEYWORD LONG LONG INT_KEYWORD - { $$ = lookup_signed_typename ("long long"); } | SHORT INT_KEYWORD { $$ = builtin_type_short; } | SHORT SIGNED_KEYWORD INT_KEYWORD