diff --git a/src/encode.c b/src/encode.c
index 7041dc19c2a55f67a92115bdf4cb706f8220c877..cb6b7293d76c4bdb35b5549f35d27d89d97a33d3 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -2,7 +2,7 @@
|| 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: encode.c,v 1.282 2008/06/28 18:35:58 mast Exp $
+|| $Id: encode.c,v 1.283 2008/06/29 12:50:03 nilsson Exp $
*/
#include "global.h"
@@ -959,7 +959,7 @@ static void encode_value2(struct svalue *val, struct encode_data *data, int forc
if(really_low_find_shared_string_identifier(
ID_FROM_INT(val->u.object->prog, val->subtype)->name,
val->u.object->prog,
- SEE_STATIC|SEE_PRIVATE)==val->subtype)
+ SEE_PROTECTED|SEE_PRIVATE)==val->subtype)
{
/* We have to remove ourself from the cache for now */
struct svalue tmp = entry_id;
@@ -1449,7 +1449,7 @@ static void encode_value2(struct svalue *val, struct encode_data *data, int forc
}
if (symbol) {
int i = really_low_find_shared_string_identifier(symbol, p,
- SEE_STATIC|SEE_PRIVATE);
+ SEE_PROTECTED|SEE_PRIVATE);
if (i >= 0) {
/* Found the symbol. */
gs_flags = PTR_FROM_INT(p, i)->id_flags;
@@ -1472,7 +1472,7 @@ static void encode_value2(struct svalue *val, struct encode_data *data, int forc
}
if (symbol) {
int i = really_low_find_shared_string_identifier(symbol, p,
- SEE_STATIC|SEE_PRIVATE);
+ SEE_PROTECTED|SEE_PRIVATE);
if (i >= 0) {
/* Found the symbol. */
gs_flags = PTR_FROM_INT(p, i)->id_flags;
@@ -3041,7 +3041,7 @@ static void decode_value2(struct decode_data *data)
int f = really_low_find_shared_string_identifier(
Pike_sp[-1].u.string,
p->inherits[Pike_sp[-2].subtype].prog,
- SEE_STATIC|SEE_PRIVATE);
+ SEE_PROTECTED|SEE_PRIVATE);
debug_malloc_touch(p);
if (f >= 0) {
struct svalue func;
diff --git a/src/language.yacc b/src/language.yacc
index b70e2f6d3be6b493e2862afb94bff491b871d59e..2c9e2debef6f3e88b132a7704d7d62c02fe7815b 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -2,7 +2,7 @@
|| 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.440 2008/06/29 12:37:10 nilsson Exp $
+|| $Id: language.yacc,v 1.441 2008/06/29 12:50:04 nilsson Exp $
*/
%pure_parser
@@ -3711,7 +3711,7 @@ idents2: idents
Pike_compiler->new_program)) >= 0) ||
((i = really_low_find_shared_string_identifier(Pike_compiler->last_identifier,
Pike_compiler->new_program,
- SEE_STATIC|
+ SEE_PROTECTED|
SEE_PRIVATE)) >= 0)) {
struct reference *ref = Pike_compiler->new_program->identifier_references + i;
if (!TEST_COMPAT (7, 2) &&
@@ -4017,11 +4017,11 @@ low_idents: TOK_IDENTIFIER
id = low_reference_inherited_identifier(inherit_state,
$1,
Pike_compiler->last_identifier,
- SEE_STATIC);
+ SEE_PROTECTED);
else
id = really_low_find_shared_string_identifier(Pike_compiler->last_identifier,
inherit_state->new_program,
- SEE_STATIC|SEE_PRIVATE);
+ SEE_PROTECTED|SEE_PRIVATE);
if (id != -1) {
if (inherit_depth > 0) {
@@ -4065,7 +4065,7 @@ low_idents: TOK_IDENTIFIER
for(e=1;e<(int)Pike_compiler->new_program->num_inherits;e++)
{
if(Pike_compiler->new_program->inherits[e].inherit_level!=1) continue;
- i=low_reference_inherited_identifier(0,e,$2->u.sval.u.string,SEE_STATIC);
+ i=low_reference_inherited_identifier(0,e,$2->u.sval.u.string,SEE_PROTECTED);
if(i==-1) continue;
if($$)
{
diff --git a/src/object.c b/src/object.c
index 6c48d9521aeb2096af61756a0ac1f8a0cb56c202..57247e77470412346c1ab7b99b136468529cba9f 100644
--- a/src/object.c
+++ b/src/object.c
@@ -2,7 +2,7 @@
|| 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: object.c,v 1.299 2008/06/29 12:37:10 nilsson Exp $
+|| $Id: object.c,v 1.300 2008/06/29 12:50:04 nilsson Exp $
*/
#include "global.h"
@@ -2433,7 +2433,7 @@ static void f_magic_index(INT32 args)
break;
case 1:
inherit = MAGIC_THIS->inherit;
- f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_STATIC);
+ f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_PROTECTED);
break;
case 2:
inherit = o->prog->inherits + 0;
@@ -2441,7 +2441,7 @@ static void f_magic_index(INT32 args)
break;
case 3:
inherit = o->prog->inherits + 0;
- f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_STATIC);
+ f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_PROTECTED);
break;
default:
Pike_error("Unknown indexing type: %d.\n", type);
@@ -2510,7 +2510,7 @@ static void f_magic_set_index(INT32 args)
break;
case 1:
inherit = MAGIC_THIS->inherit;
- f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_STATIC);
+ f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_PROTECTED);
break;
case 2:
inherit = o->prog->inherits + 0;
@@ -2518,7 +2518,7 @@ static void f_magic_set_index(INT32 args)
break;
case 3:
inherit = o->prog->inherits + 0;
- f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_STATIC);
+ f = really_low_find_shared_string_identifier (s, inherit->prog, SEE_PROTECTED);
break;
default:
Pike_error("Unknown indexing type.\n");
diff --git a/src/program.c b/src/program.c
index 74a9f5976ac3c0dc040b8a78dc34ab0c4b052321..7c83f2260eb70de0588e7286ebe7f69cd4a7d50f 100644
--- a/src/program.c
+++ b/src/program.c
@@ -2,7 +2,7 @@
|| 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.728 2008/06/29 12:37:10 nilsson Exp $
+|| $Id: program.c,v 1.729 2008/06/29 12:50:04 nilsson Exp $
*/
#include "global.h"
@@ -1574,7 +1574,7 @@ struct node_s *find_module_identifier(struct pike_string *ident,
{
i=really_low_find_shared_string_identifier(ident,
p->new_program,
- SEE_STATIC|SEE_PRIVATE);
+ SEE_PROTECTED|SEE_PRIVATE);
if(i!=-1)
{
if ((p->flags & COMPILATION_FORCE_RESOLVE) &&
@@ -2264,7 +2264,7 @@ void fixate_program(void)
e=find_shared_string_identifier(name,p);
if(e == -1)
e=really_low_find_shared_string_identifier(name, p,
- SEE_STATIC|SEE_PRIVATE);
+ SEE_PROTECTED|SEE_PRIVATE);
if((e != i) && (e != -1))
{
@@ -3437,7 +3437,7 @@ struct program *end_first_pass(int finish)
{
int id;
if(Pike_compiler->new_program->inherits[e].inherit_level!=1) continue;
- id=low_reference_inherited_identifier(0, e, s, SEE_STATIC);
+ id=low_reference_inherited_identifier(0, e, s, SEE_PROTECTED);
if(id!=-1)
{
Pike_compiler->init_node=mknode(F_COMMA_EXPR,
@@ -3979,7 +3979,7 @@ node *reference_inherited_identifier(struct pike_string *super_name,
id=low_reference_inherited_identifier(0,
e,
function_name,
- SEE_STATIC);
+ SEE_PROTECTED);
if(id!=-1)
return mkidentifiernode(id);
@@ -4021,7 +4021,7 @@ node *reference_inherited_identifier(struct pike_string *super_name,
if(super_name != p->inherits[e].name)
continue;
- id=low_reference_inherited_identifier(state,e,function_name,SEE_STATIC);
+ id=low_reference_inherited_identifier(state,e,function_name,SEE_PROTECTED);
if(id!=-1)
return mkexternalnode(p, id);
@@ -4580,7 +4580,7 @@ int isidentifier(struct pike_string *s)
{
return really_low_find_shared_string_identifier(s,
Pike_compiler->new_program,
- SEE_STATIC|SEE_PRIVATE);
+ SEE_PROTECTED|SEE_PRIVATE);
}
/* Define an alias for a (possibly extern) identifier.
@@ -5896,7 +5896,7 @@ int really_low_find_shared_string_identifier(struct pike_string *name,
funp = prog->identifier_references + i;
if(funp->id_flags & ID_HIDDEN) continue;
if(funp->id_flags & ID_PROTECTED)
- if(!(flags & SEE_STATIC))
+ if(!(flags & SEE_PROTECTED))
continue;
fun = ID_FROM_PTR(prog, funp);
/* if(fun->func.offset == -1) continue; * Prototype */
@@ -5944,7 +5944,7 @@ PMOD_EXPORT int low_find_lfun(struct program *p, ptrdiff_t lfun)
really_low_find_shared_string_identifier(lfun_name,
dmalloc_touch(struct program *,
p),
- SEE_STATIC);
+ SEE_PROTECTED);
#if 0
if (i < 0 || !(p->flags & PROGRAM_FIXED)) return i;
id = ID_FROM_INT(p, i);