 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.72 2015/10/13 16:09:33 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.73 2015/10/13 20:25:21 christos 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.72 2015/10/13 16:09:33 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.73 2015/10/13 20:25:21 christos Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration. 0 is extern.
  * Used for symbol table entries.
  */
 @@ -95,26 +95,34 @@ static inline void RESTORE(const char *f
 	if (olwarn != LWARN_BAD) {
 		lwarn = olwarn;
 		printf("%s, %d: restore flags %s %zu = %d\n", curr_pos.p_file,
 		    curr_pos.p_line, file, line, lwarn);
 		olwarn = LWARN_BAD;
 	} else
 		CLRWFLGS(file, line);
+}
 #else
 #define CLRWFLGS(f, l) clrwflgs(), olwarn = LWARN_BAD
 #define SAVE(f, l)	olwarn = lwarn
 #define RESTORE(f, l) (void)(olwarn == LWARN_BAD ? (clrwflgs(), 0) : (lwarn = olwarn))
 #endif
 /* unbind the anonymous struct members from the struct */
 static void
 anonymize(sym_t *s)
+{
 	for ( ; s; s = s->s_nxt)
 		s->s_styp = NULL;
+}
 %}
 %expect 80
 %union {
 	int	y_int;
 	val_t	*y_val;
 	sbuf_t	*y_sb;
 	sym_t	*y_sym;
 	op_t	y_op;
 	scl_t	y_scl;
 	tspec_t	y_tspec;
 	tqual_t	y_tqual;
 @@ -688,34 +696,42 @@ member_declaration:
 		/* too late, i know, but getsym() compensates it */
 		symtyp = FMOS;
 	  } notype_member_decls {
 		symtyp = FVFT;
 		$$ = $4;
+	  }
 	| noclass_declspecs deftyp {
 		symtyp = FMOS;
 	  } type_member_decls {
 		symtyp = FVFT;
 		$$ = $4;
+	  }
 	| noclass_declmods deftyp {
 		symtyp = FMOS;
 		/* struct or union member must be named */
-		warning(49);
+		if (!Sflag)
-		$$ = NULL;
+			warning(49);
 		/* add all the members of the anonymous struct/union */
 		$$ = dcs->d_type->t_str->memb;
 		anonymize($$);
+	  }
 	| noclass_declspecs deftyp {
 		symtyp = FMOS;
 		/* struct or union member must be named */
-		warning(49);
+		if (!Sflag)
-		$$ = NULL;
+			warning(49);
 		$$ = dcs->d_type->t_str->memb;
 		/* add all the members of the anonymous struct/union */
 		anonymize($$);
+	  }
 	| error {
 		symtyp = FVFT;
 		$$ = NULL;
+	  }
+	;
 noclass_declspecs:
 	  clrtyp_typespec {
 		addtype($1);
+	  }
 	| type_attribute noclass_declspecs
 	| noclass_declmods typespec {

 @@ -1,14 +1,14 @@
-/* $NetBSD: decl.c,v 1.59 2014/04/18 00:20:37 christos Exp $ */
+/* $NetBSD: decl.c,v 1.60 2015/10/13 20:25:21 christos 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
 @@ -28,27 +28,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.59 2014/04/18 00:20:37 christos Exp $");
+__RCSID("$NetBSD: decl.c,v 1.60 2015/10/13 20:25:21 christos Exp $");
 #endif
 #include <sys/param.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 const	char *unnamed = "<unnamed>";
 /* shared type structures for arithmtic types and void */
 static	type_t	*typetab;
 @@ -1768,26 +1768,29 @@ compltag(type_t *tp, sym_t *fmem)
 		sp = tp->t_str;
 		sp->align = dcs->d_stralign;
 		sp->memb = fmem;
 		if (tp->t_ispacked)
 			setpackedsize(tp);
 		else
 			sp->size = dcs->d_offset;
 		if (sp->size == 0) {
 			/* zero sized %s */
 			(void)c99ism(47, ttab[t].tt_name);
 		} else {
 			n = 0;
 			for (mem = fmem; mem != NULL; mem = mem->s_nxt) {
 				/* bind anonymous members to the structure */
 				if (mem->s_styp == NULL)
 					mem->s_styp = sp;
 				if (mem->s_name != unnamed)
 					n++;
+			}
 			if (n == 0) {
 				/* %s has no named members */
 				warning(65,
 					t == STRUCT ? "structure" : "union");
+			}
+		}
 	} else {
 		tp->t_enum->elem = fmem;
+	}
 	return (tp);