Sat Jul 10 04:47:25 2021 UTC ()

lint: merge duplicate code in declmods and declmod

No functional change.


(rillig)

diff -r1.278 -r1.279 src/usr.bin/xlint/lint1/cgram.y

--- src/usr.bin/xlint/lint1/cgram.y 2021/07/10 04:25:47	1.278
+++ src/usr.bin/xlint/lint1/cgram.y 2021/07/10 04:47:25	1.279

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.278 2021/07/10 04:25:47 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.279 2021/07/10 04:47:25 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.278 2021/07/10 04:25:47 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.279 2021/07/10 04:47:25 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration, used for symbol table entries.
  * 0 is the top-level, > 0 is inside a function body.
 @@ -539,43 +539,42 @@ declaration_specifiers:		/* C99 6.7 */
 		add_type($1);
+	  }
 	| declmods typespec {
 		add_type($2);
+	  }
 	| type_attribute declaration_specifiers
 	| declaration_specifiers declmod
 	| declaration_specifiers notype_typespec {
 		add_type($2);
+	  }
+	;
 declmods:
-	  clrtyp T_QUAL {
+	  clrtyp qualifier_or_storage_class
 		add_qualifier($2);
 	| clrtyp T_SCLASS {
 		add_storage_class($2);
 	| declmods declmod
+	;
 declmod:
 	  qualifier_or_storage_class
 	| type_attribute
+	;
 qualifier_or_storage_class:
 	  T_QUAL {
 		add_qualifier($1);
+	  }
 	| T_SCLASS {
 		add_storage_class($1);
+	  }
 	| type_attribute
+	;
 clrtyp_typespec:
 	  clrtyp notype_typespec {
 		$$ = $2;
+	  }
 	| T_TYPENAME clrtyp {
 		$$ = getsym($1)->s_type;
+	  }
+	;
 typespec:
 	  notype_typespec