pike.git/ src/ program.c

2007-12-28

2007-12-28 13:38:16 by Martin Nilsson <mani@lysator.liu.se>

• ab0d47ea5113be265dba690b9edefd99220c22f7 (25 lines) (+13/-12) ^{[ Show | Annotate ]}
  Branch: 7.9

nomask -> final

Rev: lib/modules/Stdio.pmod/module.pmod:1.231
Rev: lib/modules/Thread.pmod:1.44
Rev: src/gc.c:1.301
Rev: src/language.yacc:1.391
Rev: src/modules/_Charset/charsetmod.c:1.63
Rev: src/modules/_Charset/iso2022.c:1.45
Rev: src/program.c:1.632
Rev: src/program.h:1.236

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: program.c,v 1.631 2007/11/15 17:41:52 grubba Exp $ + || $Id: program.c,v 1.632 2007/12/28 13:38:15 nilsson Exp $   */      #include "global.h"
2226:    {    for(i=0;i<(int)p->num_identifier_references;i++)    { -  if((p->identifier_references[i].id_flags & (ID_NOMASK|ID_HIDDEN)) == -  ID_NOMASK) +  if((p->identifier_references[i].id_flags & (ID_FINAL|ID_HIDDEN)) == +  ID_FINAL)    {    struct pike_string *name=ID_FROM_INT(p, i)->name;   
4311:    name=ID_FROM_PTR(p,&fun)->name;    fun.inherit_offset += inherit_offset;    -  if (fun.id_flags & ID_NOMASK) +  if (fun.id_flags & ID_FINAL)    {    Pike_compiler->flags |= COMPILATION_CHECK_FINAL;    }
4609:    }       if (!(IDENTIFIERP(n)->id_flags & ID_EXTERN)) { -  if (IDENTIFIERP(n)->id_flags & ID_NOMASK) -  my_yyerror("Illegal to redefine 'nomask/final' " +  if (IDENTIFIERP(n)->id_flags & ID_FINAL) +  my_yyerror("Illegal to redefine 'final' "    "variable/functions %S", name);       /* FIXME: More. */
4784:    }       if (!(IDENTIFIERP(n)->id_flags & ID_EXTERN)) { -  if (IDENTIFIERP(n)->id_flags & ID_NOMASK) -  my_yyerror("Illegal to redefine 'nomask/final' " +  if (IDENTIFIERP(n)->id_flags & ID_FINAL) +  my_yyerror("Illegal to redefine 'final' "    "variable/functions %S", name);       if(!(IDENTIFIERP(n)->id_flags & ID_INLINE) ||
5075:    {    int overridden;    -  if(IDENTIFIERP(n)->id_flags & ID_NOMASK) -  my_yyerror("Illegal to redefine 'nomask' identifier %S", name); +  if(IDENTIFIERP(n)->id_flags & ID_FINAL) +  my_yyerror("Illegal to redefine 'final' identifier %S", name);       if(!TEST_COMPAT(7,2) &&    IDENTIFIER_IS_VARIABLE(ID_FROM_INT(Pike_compiler->new_program,
5495:    compilation_depth, " ");   #endif    -  if((ref.id_flags & ID_NOMASK) +  if((ref.id_flags & ID_FINAL)   #if 0    && !(funp->func.offset == -1)   #endif    )    { -  my_yyerror("Illegal to redefine 'nomask' function %S.", name); +  my_yyerror("Illegal to redefine 'final' function %S.", name);    }