pike.git/ src/ language.yacc

Branch: Tag:

2008-06-29

2008-06-29 12:37:11 by Martin Nilsson <mani@lysator.liu.se>

ID_STATIC -> ID_PROTECTED

Rev: src/backend.cmod:1.229
Rev: src/builtin.cmod:1.217
Rev: src/errors.h:1.40
Rev: src/interpret_functions.h:1.208
Rev: src/iterators.cmod:1.70
Rev: src/language.yacc:1.440
Rev: src/object.c:1.299
Rev: src/pike_search.c:1.31
Rev: src/program.c:1.728
Rev: src/signal_handler.c:1.333
Rev: src/threads.c:1.259

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: language.yacc,v 1.439 2008/06/29 11:04:49 nilsson Exp $ + || $Id: language.yacc,v 1.440 2008/06/29 12:37:10 nilsson Exp $   */      %pure_parser
1246:       }    | TOK_FINAL_ID { $$ = ID_FINAL | ID_INLINE; } -  | TOK_STATIC { $$ = ID_STATIC; } +  | TOK_STATIC { $$ = ID_PROTECTED; }    | TOK_EXTERN { $$ = ID_EXTERN; }    | TOK_OPTIONAL { $$ = ID_OPTIONAL; } -  | TOK_PRIVATE { $$ = ID_PRIVATE | ID_STATIC; } +  | TOK_PRIVATE { $$ = ID_PRIVATE | ID_PROTECTED; }    | TOK_LOCAL_ID { $$ = ID_INLINE; }    | TOK_PUBLIC { $$ = ID_PUBLIC; }    | TOK_PROTECTED { $$ = ID_PROTECTED; }
2195:    type=compiler_pop_type();    Pike_compiler->compiler_frame->current_function_number =    define_function(name, type, -  ID_STATIC | ID_PRIVATE | ID_INLINE | ID_USED, +  ID_PROTECTED | ID_PRIVATE | ID_INLINE | ID_USED,    IDENTIFIER_PIKE_FUNCTION, NULL,    (unsigned INT16)    (Pike_compiler->compiler_frame->opt_flags));
2268:    f=dooptcode(name,    $8,    type, -  ID_STATIC | ID_PRIVATE | ID_INLINE | ID_USED); +  ID_PROTECTED | ID_PRIVATE | ID_INLINE | ID_USED);      #ifdef PIKE_DEBUG    if (f != Pike_compiler->compiler_frame->current_function_number) {
2396:    dooptcode(i->name,    $5,    i->type, -  ID_STATIC | ID_PRIVATE | ID_INLINE); +  ID_PROTECTED | ID_PRIVATE | ID_INLINE);       i->opt_flags = Pike_compiler->compiler_frame->opt_flags;   
2530:    dooptcode(i->name,    $6,    i->type, -  ID_STATIC | ID_PRIVATE | ID_INLINE); +  ID_PROTECTED | ID_PRIVATE | ID_INLINE);       i->opt_flags = Pike_compiler->compiler_frame->opt_flags;   
2660:    s=make_shared_string(buffer);    $3=mkstrnode(s);    free_string(s); -  $<number>0|=ID_STATIC | ID_PRIVATE | ID_INLINE; +  $<number>0|=ID_PROTECTED | ID_PRIVATE | ID_INLINE;    }    /* fprintf(stderr, "LANGUAGE.YACC: CLASS start\n"); */    if(Pike_compiler->compiler_pass==1)
2797:       Pike_compiler->compiler_frame->current_function_number=    define_function(create_string, type, -  ID_INLINE | ID_STATIC, +  ID_INLINE | ID_PROTECTED,    IDENTIFIER_PIKE_FUNCTION |    (Pike_compiler->num_create_args < 0?IDENTIFIER_VARARGS:0),    0,
2849:       /* Fifth: Define the function. */    -  f=dooptcode(create_string, create_code, type, ID_STATIC); +  f=dooptcode(create_string, create_code, type, ID_PROTECTED);      #ifdef PIKE_DEBUG    if(Pike_interpreter.recoveries &&
3519:    f=dooptcode(name,    $5,    type, -  ID_STATIC | ID_PRIVATE | ID_INLINE | ID_USED); +  ID_PROTECTED | ID_PRIVATE | ID_INLINE | ID_USED);       if(Pike_compiler->compiler_frame->lexical_scope & SCOPE_SCOPED) {    $$ = mktrampolinenode(f,Pike_compiler->compiler_frame->previous);
3576:    $$ = Pike_compiler->current_modifiers =    (THIS_COMPILATION->lex.pragmas & ID_MODIFIER_MASK);    } else { -  $$ = Pike_compiler->current_modifiers = ID_STATIC|ID_INLINE|ID_PRIVATE | +  $$ = Pike_compiler->current_modifiers = ID_PROTECTED|ID_INLINE|ID_PRIVATE |    (THIS_COMPILATION->lex.pragmas & ID_MODIFIER_MASK);    }    }