Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/xlint/lint1 lint: resolve 4 shift/reduce conflicts i...



details:   https://anonhg.NetBSD.org/src/rev/9be63854d6de
branches:  trunk
changeset: 365782:9be63854d6de
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Apr 24 17:32:22 2022 +0000

description:
lint: resolve 4 shift/reduce conflicts in labeled_statement

The attributes are already parsed as part of the statement.

No functional change intended.

diffstat:

 usr.bin/xlint/lint1/cgram.y |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 2e450e6bee16 -r 9be63854d6de usr.bin/xlint/lint1/cgram.y
--- a/usr.bin/xlint/lint1/cgram.y       Sun Apr 24 16:54:09 2022 +0000
+++ b/usr.bin/xlint/lint1/cgram.y       Sun Apr 24 17:32:22 2022 +0000
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.399 2022/04/24 16:54:09 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.400 2022/04/24 17:32:22 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.399 2022/04/24 16:54:09 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.400 2022/04/24 17:32:22 rillig Exp $");
 #endif
 
 #include <limits.h>
@@ -126,7 +126,7 @@
 
 %}
 
-%expect 132
+%expect 128
 
 %union {
        val_t   *y_val;
@@ -1648,7 +1648,7 @@
        ;
 
 labeled_statement:             /* C99 6.8.1 */
-         label type_attribute_opt statement
+         label statement
        ;
 
 label:



Home | Main Index | Thread Index | Old Index