 @@ -1,15 +1,15 @@
 %{
-/*	$NetBSD: gram.y,v 1.34 2012/03/11 08:21:53 dholland Exp $	*/
+/*	$NetBSD: gram.y,v 1.35 2012/03/11 19:27:26 dholland Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -165,52 +165,52 @@ static	struct nvlist *mk_ns(const char *
 %token	ROOT
 %token	SINGLE SOURCE
 %token	TYPE
 %token	VECTOR VERSION
 %token	WITH
 %token	<num> NUMBER
 %token	<str> PATHNAME QSTRING WORD EMPTYSTRING
 %token	ENDDEFS
 %type	<condexpr>	fopts condexpr condatom
 %type	<condexpr>	cond_or_expr cond_and_expr cond_prefix_expr
 %type	<condexpr>	 cond_base_expr
 %type	<str>	fs_spec
-%type	<val>	fflgs fflag oflgs oflag
+%type	<val>	fflags fflag oflags oflag
 %type	<str>	rule
 %type	<attr>	depend
 %type	<devb>	devbase
 %type	<deva>	devattach_opt
 %type	<list>	atlist interface_opt
 %type	<str>	atname
 %type	<list>	loclist locdef
 %type	<str>	locdefault
 %type	<list>	values locdefaults
 %type	<attrlist>	depend_list depends
 %type	<list>	locators locator
 %type	<list>	dev_spec
 %type	<str>	device_instance
 %type	<str>	attachment
 %type	<str>	value
 %type	<val>	major_minor npseudo
 %type	<num>	signed_number
 %type	<val>	device_flags
 %type	<str>	deffs
 %type	<list>	deffses
 %type	<list>	defopt
 %type	<list>	defopts
-%type	<str>	optdep
+%type	<str>	optdepend
-%type	<list>	optdeps
+%type	<list>	optdepends
-%type	<list>	defoptdeps
+%type	<list>	optdepend_list
 %type	<str>	optfile_opt
 %type	<list>	subarches
 %type	<str>	filename stringvalue locname mkvarname
 %type	<val>	device_major_block device_major_char
 %type	<list>	devnodes devnodetype devnodeflags devnode_dims
 %%
 /*
  * A complete configuration consists of both the configuration part (a
  * kernel config such as GENERIC or SKYNET, plus also the various
  * std.* files), which selects the material to be in the kernel, and
  * also the definition part (files, files.*, etc.) that declares what
 @@ -289,94 +289,94 @@ definitions:
 	| definitions '\n'
 	| definitions definition '\n'	{ wrap_continue(); }
 	| definitions error '\n'	{ wrap_cleanup(); }
 	| definitions ENDFILE		{ enddefs(); checkfiles(); }
+;
 /* A single definition. */
 definition:
 	  file
 	| object
 	| device_major			{ do_devsw = 1; }
 	| prefix
 	| DEVCLASS WORD			{ (void)defattr($2, NULL, NULL, 1); }
-	| DEFFS deffses defoptdeps	{ deffilesystem($2, $3); }
+	| DEFFS deffses optdepend_list	{ deffilesystem($2, $3); }
 	| DEFINE WORD interface_opt depend_list
 					{ (void)defattr($2, $3, $4, 0); }
-	| DEFOPT optfile_opt defopts defoptdeps
+	| DEFOPT optfile_opt defopts optdepend_list
 					{ defoption($2, $3, $4); }
-	| DEFFLAG optfile_opt defopts defoptdeps
+	| DEFFLAG optfile_opt defopts optdepend_list
 					{ defflag($2, $3, $4, 0); }
 	| OBSOLETE DEFFLAG optfile_opt defopts
 					{ defflag($3, $4, NULL, 1); }
-	| DEFPARAM optfile_opt defopts defoptdeps
+	| DEFPARAM optfile_opt defopts optdepend_list
 					{ defparam($2, $3, $4, 0); }
 	| OBSOLETE DEFPARAM optfile_opt defopts
 					{ defparam($3, $4, NULL, 1); }
 	| DEVICE devbase interface_opt depend_list
 					{ defdev($2, $3, $4, 0); }
 	| ATTACH devbase AT atlist devattach_opt depend_list
 					{ defdevattach($5, $2, $4, $6); }
 	| MAXPARTITIONS NUMBER		{ maxpartitions = $2.val; }
 	| MAXUSERS NUMBER NUMBER NUMBER
 				    { setdefmaxusers($2.val, $3.val, $4.val); }
 	| MAKEOPTIONS condmkopt_list
 	/* interface_opt in DEFPSEUDO is for backwards compatibility */
 	| DEFPSEUDO devbase interface_opt depend_list
 					{ defdev($2, $3, $4, 1); }
 	| DEFPSEUDODEV devbase interface_opt depend_list
 					{ defdev($2, $3, $4, 2); }
 	| MAJOR '{' majorlist '}'
 	| VERSION NUMBER		{ setversion($2.val); }
+;
 /* source file: file foo/bar.c bar|baz needs-flag compile-with blah */
 file:
-	XFILE filename fopts fflgs rule	{ addfile($2, $3, $4, $5); }
+	XFILE filename fopts fflags rule	{ addfile($2, $3, $4, $5); }
+;
 /* file options: optional expression of conditions */
 fopts:
 	  /* empty */			{ $$ = NULL; }
 	| condexpr			{ $$ = $1; }
+;
 /* zero or more flags for a file */
-fflgs:
+fflags:
 	  /* empty */			{ $$ = 0; }
-	| fflgs fflag			{ $$ = $1 | $2; }
+	| fflags fflag			{ $$ = $1 | $2; }
+;
 /* one flag for a file */
 fflag:
 	  NEEDS_COUNT			{ $$ = FI_NEEDSCOUNT; }
 	| NEEDS_FLAG			{ $$ = FI_NEEDSFLAG; }
+;
 /* extra compile directive for a source file */
 rule:
 	  /* empty */			{ $$ = NULL; }
 	| COMPILE_WITH stringvalue	{ $$ = $2; }
+;
 /* object file: object zot.o foo|zot needs-flag */
 object:
-	XOBJECT filename fopts oflgs	{ addobject($2, $3, $4); }
+	XOBJECT filename fopts oflags	{ addobject($2, $3, $4); }
+;
 /* zero or more flags for an object file */
-oflgs:
+oflags:
 	  /* empty */			{ $$ = 0; }
-	| oflgs oflag			{ $$ = $1 | $2; }
+	| oflags oflag			{ $$ = $1 | $2; }
+;
 /* a single flag for an object file */
 oflag:
 	NEEDS_FLAG			{ $$ = OI_NEEDSFLAG; }
+;
 /* device major declaration */
 device_major:
 	DEVICE_MAJOR WORD device_major_char device_major_block fopts devnodes
 					{ adddevm($2, $3, $4, $5, $6); }
+;
 @@ -496,26 +496,44 @@ depend_list:
+;
 /* one or more depend items */
 depends:
 	  depend			{ $$ = MK2(attrlist, NULL, $1); }
 	| depends ',' depend		{ $$ = MK2(attrlist, $1, $3); }
+;
 /* one depend item (which is an attribute) */
 depend:
 	WORD				{ $$ = getattr($1); }
+;
 /* list of option depends, may be empty */
 optdepend_list:
 	  /* empty */			{ $$ = NULL; }
 	| ':' optdepends		{ $$ = $2; }
+;
 /* a list of option dependencies */
 optdepends:
 	  optdepend			{ $$ = new_n($1); }
 	| optdepends ',' optdepend	{ $$ = new_nx($3, $1); }
+;
 /* one option depend, which is an option name */
 optdepend:
 	WORD				{ $$ = $1; }
+;
 /* list of places to attach: attach blah at ... */
 atlist:
 	  atname			{ $$ = new_n($1); }
 	| atlist ',' atname		{ $$ = new_nx($3, $1); }
+;
 /* a place to attach a device */
 atname:
 	  WORD				{ $$ = $1; }
 	| ROOT				{ $$ = NULL; }
+;
 /* one or more defined options */
 @@ -530,43 +548,26 @@ defopt:
 	| WORD '=' value		{ $$ = new_ns($1, $3); }
 	| WORD COLONEQ value		{
 		struct nvlist *__nv = new_n($1);
 		$$ = new_nsx("", $3, __nv);
+	  }
 	| WORD '=' value COLONEQ value	{
 		struct nvlist *__nv = new_n($1);
 		$$ = new_nsx("", $5, __nv);
+	  }
+;
 /* option dependencies (read as "defopt deps") which are optional */
 defoptdeps:
 	  /* empty */			{ $$ = NULL; }
 	| ':' optdeps			{ $$ = $2; }
 /* a list of option dependencies */
 optdeps:
 	  optdep			{ $$ = new_n($1); }
 	| optdeps ',' optdep		{ $$ = new_nx($3, $1); }
 /* one option dependence */
 optdep:
 	WORD				{ $$ = $1; }
 /* list of conditional makeoptions */
 condmkopt_list:
 	  condmkoption
 	| condmkopt_list ',' condmkoption
+;
 /* one conditional make option */
 condmkoption:
 	condexpr mkvarname PLUSEQ value	{ appendcondmkoption($1, $2, $4); }
+;
 /* device name */
 devbase: