2002-05-09
2002-05-09 14:59:18 by Martin Stjernholm <mast@lysator.liu.se>
-
89a2adc211dd2698d2359fe2b6b663fa7f150e4b
(21 lines)
(+11/-10)
[
Show
| Annotate
]
Branch: 7.9
Oops part II.
Rev: src/program.c:1.426
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: program.c,v 1.425 2002/05/09 14:52:10 mast Exp $");
+ RCSID("$Id: program.c,v 1.426 2002/05/09 14:59:18 mast Exp $");
#include "program.h"
#include "object.h"
#include "dynamic_buffer.h"
1285:
continue;
/* Do not zapp inherited inline ('local') identifiers */
- if((Pike_compiler->new_program->identifier_references[z].id_flags &
+ if((Pike_compiler->new_program->identifier_references[cur_id].id_flags &
(ID_INLINE|ID_INHERITED)) == (ID_INLINE|ID_INHERITED))
continue;
1999: Inside #if defined(PIKE_DEBUG)
if (IDENTIFIER_IS_PIKE_FUNCTION(ID_FROM_PTR(p,ref)->identifier_flags)) {
INT32 line;
struct program *inh_p = INHERIT_FROM_PTR(p,ref)->prog;
- char *file = get_line (ID_FROM_PTR(p,ref)->func.offset + inh_p->program,
- inh_p, &line);
+ struct pike_string *file =
+ get_line (ID_FROM_PTR(p,ref)->func.offset + inh_p->program, inh_p, &line);
+ if (!file->size_shift)
fprintf (stderr, "%*s %s:%d\n",
- indent, "", file, line);
+ indent, "", file->str, line);
}
}
fprintf(stderr, "\n"
2012: Inside #if defined(PIKE_DEBUG)
for (d=0; d < p->num_inherits; d++) {
struct inherit *inh = p->inherits + d;
- fprintf(stderr, "%*s %4d: %5d %8d %6d %10d\n",
+ fprintf(stderr, "%*s %4d: %5d %8d %6d"/* %10d*/"\n",
indent, "",
d, inh->inherit_level, inh->identifier_level,
- inh->storage_offset, inh->identifier_ref_offset);
+ inh->storage_offset /*, inh->identifier_ref_offset*/);
}
fprintf(stderr, "\n"
"%*sIdentifier table:\n"
3995:
ref.inherit_offset = 0;
ref.id_flags = flags;
- override_identifier (%ref, name, 0);
+ override_identifier (&ref, name, 0);
#ifdef PIKE_DEBUG
if(MEMCMP(Pike_compiler->new_program->identifier_references+i, &ref,sizeof(ref)))
fatal("New function overloading algorithm failed!\n");
#endif
- }
+
return i;
}
make_a_new_def: