Branch: Tag:

2013-10-31

2013-10-31 16:01:20 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Compiler: Rename the arguments to really_low_reference_inherited_identifier().

The arguments were confusing in that 'e' was the inherit number and
'i' was the reference number. They are now named 'i' for the inherit
number, and 'f' for the reference number.

4335:   }      PMOD_EXPORT int really_low_reference_inherited_identifier(struct program_state *q, -  int e, -  int i) +  int i, +  int f)   {    struct program *np=(q?q:Pike_compiler)->new_program;    struct reference funp;    struct program *p;    int d, num_id_refs;    -  if(i==-1) return -1; +  if(f==-1) return -1;    -  p = np->inherits[e].prog; +  p = np->inherits[i].prog;    -  funp = p->identifier_references[i]; -  funp.inherit_offset += e; +  funp = p->identifier_references[f]; +  funp.inherit_offset += i;    funp.id_flags = (funp.id_flags & ~ID_INHERITED) | ID_INLINE|ID_HIDDEN;       num_id_refs = np->num_identifier_references;
4360:       if ((refp->inherit_offset == funp.inherit_offset) &&    (refp->identifier_offset == funp.identifier_offset) && -  ((refp->id_flags | ID_USED) == (funp.id_flags | ID_USED))) +  ((refp->id_flags | ID_USED) == (funp.id_flags | ID_USED))) {    return d;    } -  +  }       funp.run_time_type = PIKE_T_UNKNOWN;   
4379: Inside #if defined(PIKE_DEBUG)
   num_id_refs, np->num_identifier_references-1);    }   #endif /* PIKE_DEBUG */ +     return num_id_refs; /* aka np->num_identifier_references - 1 */   }