Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/xlint/lint1 lint: move main part of idecl over to de...



details:   https://anonhg.NetBSD.org/src/rev/4a1db964b88a
branches:  trunk
changeset: 1019638:4a1db964b88a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Mar 17 01:38:31 2021 +0000

description:
lint: move main part of idecl over to decl.c and rename it

No functional change.

diffstat:

 usr.bin/xlint/lint1/cgram.y    |  61 ++++++++---------------------------------
 usr.bin/xlint/lint1/decl.c     |  46 ++++++++++++++++++++++++++++++-
 usr.bin/xlint/lint1/externs1.h |   3 +-
 3 files changed, 58 insertions(+), 52 deletions(-)

diffs (202 lines):

diff -r 94359ad7de68 -r 4a1db964b88a usr.bin/xlint/lint1/cgram.y
--- a/usr.bin/xlint/lint1/cgram.y       Wed Mar 17 01:22:55 2021 +0000
+++ b/usr.bin/xlint/lint1/cgram.y       Wed Mar 17 01:38:31 2021 +0000
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.173 2021/03/17 01:22:55 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.174 2021/03/17 01:38:31 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.173 2021/03/17 01:22:55 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.174 2021/03/17 01:38:31 rillig Exp $");
 #endif
 
 #include <limits.h>
@@ -67,7 +67,7 @@
 static int olwarn = LWARN_BAD;
 
 static int     to_int_constant(tnode_t *, int);
-static void    idecl(sym_t *, int, sbuf_t *);
+static void    cgram_declare(sym_t *, bool, sbuf_t *);
 static void    ignore_up_to_rparen(void);
 static sym_t   *symbolrename(sym_t *, sbuf_t *);
 
@@ -998,11 +998,11 @@
 
 notype_init_decl:
          notype_decl opt_asm_or_symbolrename {
-               idecl($1, 0, $2);
+               cgram_declare($1, false, $2);
                check_size($1);
          }
        | notype_decl opt_asm_or_symbolrename {
-               idecl($1, 1, $2);
+               cgram_declare($1, true, $2);
          } T_ASSIGN initializer {
                check_size($1);
          }
@@ -1010,11 +1010,11 @@
 
 type_init_decl:
          type_decl opt_asm_or_symbolrename {
-               idecl($1, 0, $2);
+               cgram_declare($1, false, $2);
                check_size($1);
          }
        | type_decl opt_asm_or_symbolrename {
-               idecl($1, 1, $2);
+               cgram_declare($1, true, $2);
          } T_ASSIGN initializer {
                check_size($1);
          }
@@ -1975,7 +1975,7 @@
          }
        | T_LPAREN type_name T_RPAREN                   %prec T_UNARY {
                sym_t *tmp = mktempsym($2);
-               idecl(tmp, 1, NULL);
+               cgram_declare(tmp, true, NULL);
          } init_lbrace init_expr_list init_rbrace {
                if (!Sflag)
                         /* compound literals are a C9X/GCC extension */
@@ -2134,48 +2134,11 @@
 }
 
 static void
-idecl(sym_t *decl, int initflg, sbuf_t *renaming)
+cgram_declare(sym_t *decl, bool initflg, sbuf_t *renaming)
 {
-       char *s;
-
-       initerr = false;
-       initsym = decl;
-
-       switch (dcs->d_ctx) {
-       case EXTERN:
-               if (renaming != NULL) {
-                       lint_assert(decl->s_rename == NULL);
-
-                       s = getlblk(1, renaming->sb_len + 1);
-                       (void)memcpy(s, renaming->sb_name, renaming->sb_len + 1);
-                       decl->s_rename = s;
-                       freeyyv(&renaming, T_NAME);
-               }
-               decl1ext(decl, initflg);
-               break;
-       case ARG:
-               if (renaming != NULL) {
-                       /* symbol renaming can't be used on function arguments */
-                       error(310);
-                       freeyyv(&renaming, T_NAME);
-                       break;
-               }
-               (void)declare_argument(decl, initflg);
-               break;
-       default:
-               lint_assert(dcs->d_ctx == AUTO);
-               if (renaming != NULL) {
-                       /* symbol renaming can't be used on automatic variables */
-                       error(311);
-                       freeyyv(&renaming, T_NAME);
-                       break;
-               }
-               declare_local(decl, initflg);
-               break;
-       }
-
-       if (initflg && !initerr)
-               initstack_init();
+       declare(decl, initflg, renaming);
+       if (renaming != NULL)
+               freeyyv(&renaming, T_NAME);
 }
 
 /*
diff -r 94359ad7de68 -r 4a1db964b88a usr.bin/xlint/lint1/decl.c
--- a/usr.bin/xlint/lint1/decl.c        Wed Mar 17 01:22:55 2021 +0000
+++ b/usr.bin/xlint/lint1/decl.c        Wed Mar 17 01:38:31 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.144 2021/03/17 01:15:31 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.145 2021/03/17 01:38:31 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.144 2021/03/17 01:15:31 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.145 2021/03/17 01:38:31 rillig Exp $");
 #endif
 
 #include <sys/param.h>
@@ -1881,6 +1881,48 @@
        return sym;
 }
 
+void
+declare(sym_t *decl, bool initflg, sbuf_t *renaming)
+{
+       char *s;
+
+       initerr = false;
+       initsym = decl;
+
+       switch (dcs->d_ctx) {
+       case EXTERN:
+               if (renaming != NULL) {
+                       lint_assert(decl->s_rename == NULL);
+
+                       s = getlblk(1, renaming->sb_len + 1);
+                       (void)memcpy(s, renaming->sb_name, renaming->sb_len + 1);
+                       decl->s_rename = s;
+               }
+               decl1ext(decl, initflg);
+               break;
+       case ARG:
+               if (renaming != NULL) {
+                       /* symbol renaming can't be used on function arguments */
+                       error(310);
+                       break;
+               }
+               (void)declare_argument(decl, initflg);
+               break;
+       default:
+               lint_assert(dcs->d_ctx == AUTO);
+               if (renaming != NULL) {
+                       /* symbol renaming can't be used on automatic variables */
+                       error(311);
+                       break;
+               }
+               declare_local(decl, initflg);
+               break;
+       }
+
+       if (initflg && !initerr)
+               initstack_init();
+}
+
 /*
  * Process a single external declarator.
  */
diff -r 94359ad7de68 -r 4a1db964b88a usr.bin/xlint/lint1/externs1.h
--- a/usr.bin/xlint/lint1/externs1.h    Wed Mar 17 01:22:55 2021 +0000
+++ b/usr.bin/xlint/lint1/externs1.h    Wed Mar 17 01:38:31 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: externs1.h,v 1.73 2021/03/17 01:15:31 rillig Exp $     */
+/*     $NetBSD: externs1.h,v 1.74 2021/03/17 01:38:31 rillig Exp $     */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -171,6 +171,7 @@
 extern type_t  *complete_tag_struct_or_union(type_t *, sym_t *);
 extern type_t  *complete_tag_enum(type_t *, sym_t *);
 extern sym_t   *enumeration_constant(sym_t *, int, bool);
+extern void    declare(sym_t *, bool, sbuf_t *);
 extern void    decl1ext(sym_t *, bool);
 extern void    copy_usage_info(sym_t *, sym_t *);
 extern bool    check_redeclaration(sym_t *, bool *);



Home | Main Index | Thread Index | Old Index