Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/usr.bin/xlint/lint1/cgram.y,v rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/xlint/lint1/cgram.y,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.76.2.1 retrieving revision 1.76.2.2 diff -u -p -r1.76.2.1 -r1.76.2.2 --- src/usr.bin/xlint/lint1/cgram.y 2016/07/26 03:24:24 1.76.2.1 +++ src/usr.bin/xlint/lint1/cgram.y 2016/08/06 00:19:12 1.76.2.2 @@ -1,5 +1,5 @@ %{ -/* $NetBSD: cgram.y,v 1.76.2.1 2016/07/26 03:24:24 pgoyette Exp $ */ +/* $NetBSD: cgram.y,v 1.76.2.2 2016/08/06 00:19:12 pgoyette Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -35,7 +35,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: cgram.y,v 1.76.2.1 2016/07/26 03:24:24 pgoyette Exp $"); +__RCSID("$NetBSD: cgram.y,v 1.76.2.2 2016/08/06 00:19:12 pgoyette Exp $"); #endif #include @@ -1233,14 +1233,17 @@ opt_asm_or_symbolrename: /* expect only ; initializer: - init_expr + init_assign_expr ; -init_expr: - | expr %prec T_COMMA { +init_assign_expr: + | init_by_name init_base_expr %prec T_COMMA + | init_base_expr + +init_base_expr: + expr %prec T_COMMA { mkinit($1); } - | init_by_name init_expr %prec T_COMMA | init_lbrace init_rbrace | init_lbrace init_expr_list init_rbrace | init_lbrace init_expr_list T_COMMA init_rbrace @@ -1248,8 +1251,8 @@ init_expr: ; init_expr_list: - init_expr %prec T_COMMA - | init_expr_list T_COMMA init_expr + init_assign_expr %prec T_COMMA + | init_expr_list T_COMMA init_assign_expr ; lorange: