Module Name: src
Committed By: rillig
Date: Sun Apr 24 17:32:23 UTC 2022
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: resolve 4 shift/reduce conflicts in labeled_statement
The attributes are already parsed as part of the statement.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.399 -r1.400 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.399 src/usr.bin/xlint/lint1/cgram.y:1.400
--- src/usr.bin/xlint/lint1/cgram.y:1.399 Sun Apr 24 16:54:09 2022
+++ src/usr.bin/xlint/lint1/cgram.y Sun Apr 24 17:32:22 2022
@@ -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 @@ anonymize(sym_t *s)
%}
-%expect 132
+%expect 128
%union {
val_t *y_val;
@@ -1648,7 +1648,7 @@ non_expr_statement: /* helper for C99 6
;
labeled_statement: /* C99 6.8.1 */
- label type_attribute_opt statement
+ label statement
;
label:
