add a fake C construct __lint_equal__ which will be used to generate

alias entries for weak symbols and such
also let ; at the top scope be legal

2 files changed, 43 insertions, 14 deletions

diff --git a/usr.bin/xlint/lint1/cgram.y b/usr.bin/xlint/lint1/cgram.y
index 61a98296e2c..001591dc300 100644
--- a/usr.bin/xlint/lint1/cgram.y
+++ b/usr.bin/xlint/lint1/cgram.y
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: cgram.y,v 1.6 2005/11/23 08:53:37 deraadt Exp $	*/
+/*	$OpenBSD: cgram.y,v 1.7 2005/11/23 09:05:42 deraadt Exp $	*/
 /*	$NetBSD: cgram.y,v 1.8 1995/10/02 17:31:35 jpo Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: cgram.y,v 1.6 2005/11/23 08:53:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cgram.y,v 1.7 2005/11/23 09:05:42 deraadt Exp $";
 #endif
 
 #include <stdlib.h>
@@ -130,6 +130,7 @@ static	void	ignuptorp(void);
 %token			T_BREAK
 %token			T_RETURN
 %token			T_ASM
+%token			T_LEQUAL
 %token			T_ATTRIBUTE
 
 %left	T_COMMA
@@ -238,18 +239,45 @@ ext_decl:
 		glclup(0);
 		clrwflgs();
 	  }
-	;
-
-data_def:
-	  T_SEMI {
-		if (sflag) {
-			/* syntax error: empty declaration */
-			error(0);
-		} else if (!tflag) {
-			/* syntax error: empty declaration */
-			warning(0);
+	| T_LEQUAL T_LPARN identifier T_COMMA identifier T_RPARN T_SEMI {
+		sym_t *new, *old;
+
+		if ($5->sb_sym && $3->sb_sym /*== NULL*/) {
+			new = getsym($5);
+			old = $3->sb_sym;
+			new->s_dpos = old->s_dpos;
+			new->s_spos = old->s_spos;
+			new->s_upos = old->s_upos;
+			new->s_kind = old->s_kind;
+			new->s_keyw = old->s_keyw;
+			new->s_field = old->s_field;
+			new->s_set = old->s_set;
+			new->s_used = old->s_used;
+			new->s_arg = old->s_arg;
+			new->s_reg = old->s_reg;
+			new->s_defarg = old->s_defarg;
+			new->s_rimpl = old->s_rimpl;
+			new->s_osdef = old->s_osdef;
+			new->s_inline = old->s_inline;
+			new->s_def = old->s_def;
+			new->s_scl = old->s_scl;
+			new->s_blklev = old->s_blklev;
+			new->s_type = old->s_type;
+			new->s_value = old->s_value;
+			new->u = old->u;
+
+			/* XXX missing 'r' because do not know return type
+			   of parent... */
+			/* outsym(new, new->s_scl, DEF); */
+			outfdef(new, &csrc_pos,
+			    new->s_rimpl || new->s_type->t_subt->t_tspec != VOID,
+			    0, NULL);
 		}
+
 	  }
+	;
+
+data_def: T_SEMI
 	| clrtyp deftyp notype_init_decls T_SEMI {
 		if (sflag) {
 			/* old style declaration; add "int" */
diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l
index 856a3c45178..7fd6be53c60 100644
--- a/usr.bin/xlint/lint1/scan.l
+++ b/usr.bin/xlint/lint1/scan.l
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: scan.l,v 1.8 2005/11/23 08:53:37 deraadt Exp $	*/
+/*	$OpenBSD: scan.l,v 1.9 2005/11/23 09:05:42 deraadt Exp $	*/
 /*	$NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: scan.l,v 1.8 2005/11/23 08:53:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: scan.l,v 1.9 2005/11/23 09:05:42 deraadt Exp $";
 #endif
 
 #include <stdlib.h>
@@ -192,6 +192,7 @@ static	struct	kwtab {
 	{ "__asm",	T_ASM,		0,	0,	0,	  0, 0 },
 	{ "__asm__",	T_ASM,		0,	0,	0,	  0, 0 },
 	{ "__attribute__", T_ATTRIBUTE,	0,	0,	0,	  0, 0 },
+	{ "__lint_equal__", T_LEQUAL,	0,	0,	0,	  0, 0 },
 	{ "auto",	T_SCLASS,	AUTO,	0,	0,	  0, 0 },
 	{ "break",	T_BREAK,	0,	0,	0,	  0, 0 },
 	{ "case",	T_CASE,		0,	0,	0,	  0, 0 },