Module Name: src
Committed By: rillig
Date: Wed Jul 21 21:17:57 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl_struct_member.c
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: rename grammar rules for specifier-qualifier-list
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/usr.bin/xlint/lint1/decl_struct_member.c
cvs rdiff -u -r1.332 -r1.333 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/tests/usr.bin/xlint/lint1/decl_struct_member.c
diff -u src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.9 src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.10
--- src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.9 Thu Jul 15 21:00:05 2021
+++ src/tests/usr.bin/xlint/lint1/decl_struct_member.c Wed Jul 21 21:17:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl_struct_member.c,v 1.9 2021/07/15 21:00:05 rillig Exp $ */
+/* $NetBSD: decl_struct_member.c,v 1.10 2021/07/21 21:17:57 rillig Exp $ */
# 3 "decl_struct_member.c"
struct multi_attributes {
@@ -8,7 +8,7 @@ struct multi_attributes {
int deprecated;
};
-struct cover_begin_type_noclass_declspecs {
+struct cover_begin_type_specifier_qualifier_list {
int m1;
__attribute__((deprecated)) int m2;
const int m3;
@@ -24,7 +24,7 @@ struct cover_begin_type_typespec {
number m2;
};
-struct cover_begin_type_noclass_declmods {
+struct cover_begin_type_qualifier_list {
const m1;
const volatile m2;
};
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.332 src/usr.bin/xlint/lint1/cgram.y:1.333
--- src/usr.bin/xlint/lint1/cgram.y:1.332 Wed Jul 21 21:11:19 2021
+++ src/usr.bin/xlint/lint1/cgram.y Wed Jul 21 21:17:57 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.332 2021/07/21 21:11:19 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.333 2021/07/21 21:17:57 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.332 2021/07/21 21:11:19 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.333 2021/07/21 21:17:57 rillig Exp $");
#endif
#include <limits.h>
@@ -773,21 +773,21 @@ begin_type_declmods: /* see C99 6.7 */
| begin_type_declmods declmod
;
-begin_type_noclass_declspecs:
+begin_type_specifier_qualifier_list: /* see C11 6.7.2.1 */
begin_type_typespec {
add_type($1);
}
- | type_attribute begin_type_noclass_declspecs
- | begin_type_noclass_declmods type_specifier {
+ | type_attribute begin_type_specifier_qualifier_list
+ | begin_type_qualifier_list type_specifier {
add_type($2);
}
- | begin_type_noclass_declspecs T_QUAL {
+ | begin_type_specifier_qualifier_list T_QUAL {
add_qualifier($2);
}
- | begin_type_noclass_declspecs notype_type_specifier {
+ | begin_type_specifier_qualifier_list notype_type_specifier {
add_type($2);
}
- | begin_type_noclass_declspecs type_attribute
+ | begin_type_specifier_qualifier_list type_attribute
;
begin_type_typespec:
@@ -799,11 +799,11 @@ begin_type_typespec:
}
;
-begin_type_noclass_declmods:
+begin_type_qualifier_list:
begin_type T_QUAL {
add_qualifier($2);
}
- | begin_type_noclass_declmods T_QUAL {
+ | begin_type_qualifier_list T_QUAL {
add_qualifier($2);
}
;
@@ -948,25 +948,25 @@ struct_declaration_list: /* C99 6.7.2.1
;
struct_declaration: /* C99 6.7.2.1 */
- begin_type_noclass_declmods end_type {
+ begin_type_qualifier_list end_type {
/* too late, i know, but getsym() compensates it */
symtyp = FMEMBER;
} notype_struct_declarators type_attribute_opt T_SEMI {
symtyp = FVFT;
$$ = $4;
}
- | begin_type_noclass_declspecs end_type {
+ | begin_type_specifier_qualifier_list end_type {
symtyp = FMEMBER;
} type_struct_declarators type_attribute_opt T_SEMI {
symtyp = FVFT;
$$ = $4;
}
- | begin_type_noclass_declmods end_type type_attribute_opt T_SEMI {
+ | begin_type_qualifier_list end_type type_attribute_opt T_SEMI {
/* syntax error '%s' */
error(249, "member without type");
$$ = NULL;
}
- | begin_type_noclass_declspecs end_type type_attribute_opt T_SEMI {
+ | begin_type_specifier_qualifier_list end_type type_attribute_opt T_SEMI {
symtyp = FVFT;
if (!Sflag)
/* anonymous struct/union members is a C9X feature */
@@ -1363,16 +1363,16 @@ type_name: /* C99 6.7.6 */
;
abstract_declaration:
- begin_type_noclass_declmods end_type {
+ begin_type_qualifier_list end_type {
$$ = declare_1_abstract(abstract_name());
}
- | begin_type_noclass_declspecs end_type {
+ | begin_type_specifier_qualifier_list end_type {
$$ = declare_1_abstract(abstract_name());
}
- | begin_type_noclass_declmods end_type abstract_declarator {
+ | begin_type_qualifier_list end_type abstract_declarator {
$$ = declare_1_abstract($3);
}
- | begin_type_noclass_declspecs end_type abstract_declarator {
+ | begin_type_specifier_qualifier_list end_type abstract_declarator {
$$ = declare_1_abstract($3);
}
;
