[hackers] [scc] Revert "[tests] Update scc-tests.lst after cd855" || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Sun, 19 Feb 2017 19:23:35 +0100 (CET)

commit 4245a62bb1889b95733793a3c05f5686f2a2ed26
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
AuthorDate: Sun Feb 19 19:22:14 2017 +0100
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
CommitDate: Sun Feb 19 19:23:07 2017 +0100

    Revert "[tests] Update scc-tests.lst after cd855"
    
    This reverts commit 5e4fb6e5ad284273341f9056c927a3910b01adcf.

diff --git a/cc1/decl.c b/cc1/decl.c
index de4d92b..5cc2dc2 100644
--- a/cc1/decl.c
+++ b/cc1/decl.c
_AT_@ -17,7 +17,7 @@ static char sccsid[] = "@(#) ./cc1/decl.c";
 
 
 struct declarators {
- unsigned char nr, ns;
+ unsigned char nr;
         struct declarator {
                 unsigned char op;
                 TINT nelem;
_AT_@ -272,13 +272,10 @@ static void
 fundcl(struct declarators *dp)
 {
         Type *types[NR_FUNPARAM], type;
- Symbol *sym, *syms[NR_FUNPARAM+1], **pars;
+ Symbol *syms[NR_FUNPARAM+1], **pars;
         int k_r, ntypes, nsyms;
         size_t size;
 
- sym = dp->d[0].sym;
- if ((sym->flags&SDECLARED) == 0)
- install(dp->ns, sym);
         pushctx();
         expect('(');
         type.n.elem = 0;
_AT_@ -751,23 +748,14 @@ identifier(struct decl *dcl)
                 errorp("declared variable '%s' of incomplete type", name);
         }
 
- if (tp->op != FTN) {
- sym = install(NS_IDEN, sym);
- } else {
+ sym = install(NS_IDEN, sym);
+ if (tp->op == FTN) {
                 if (sclass == NOSCLASS)
                         sclass = EXTERN;
                 if (!strcmp(name, "main") && tp->type != inttype) {
                         errorp("main shall be defined with a return type of int");
                         errorp("please contact __20h__ on irc.freenode.net (#bitreich-en) via IRC");
                 }
- /*
- * function identifiers are installed in fundcl() because
- * we have to add a context for the parameters, and if we
- * delay the install until here then we will install the
- * symbol of the function after the parameters.
- */
- if ((sym->flags&SEMITTED) != 0)
- sym = NULL;
         }
 
         if (sym == NULL) {
_AT_@ -829,7 +817,6 @@ dodcl(int rep, Symbol *(*fun)(struct decl *), unsigned ns, Type *parent)
 
         do {
                 stack.nr = 0;
- stack.ns = ns;
                 dcl.pars = NULL;
                 dcl.type = base;
 
_AT_@ -865,8 +852,7 @@ decl(void)
          * against GLOBALCTX+1
          */
         if (curctx != GLOBALCTX+1 || yytoken == ';') {
- if (!(sym->flags & SEMITTED))
- emit(ODECL, sym);
+ emit(ODECL, sym);
                 /*
                  * avoid non used warnings in prototypes
                  */
Received on Sun Feb 19 2017 - 19:23:35 CET