RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2024-12-17 23:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have location numbers that are stable throughout translation unit editing

Browse Source 
* src/abg-irc.cc (location_manager::create_new_location): Just
	append the new expanded location to the end of the location
	vectors, and return the new size of the vector as the location
	number.  That way we don't change the location number of an
	expanded location that is already in the vector -- that change
	happens if we keep the vector sorted during the insertion.
	(location_manager::expand_location):  The index of the expanded
	location is the location number - 1.
This commit is contained in:
Dodji Seketeli 2013-05-23 17:23:29 +02:00 committed by Dodji Seketeli
parent dae05596a6
commit a0a6ce46a5
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/abg-ir.cc
View File

@ -118,27 +118,14 @@ location_manager::create_new_location(const std::string& file_path,
{
expanded_location l(file_path, line, col);
std::vector<expanded_location>::iterator i =
std::upper_bound(m_priv->locs.begin(),
m_priv->locs.end(),
l);
if (i == m_priv->locs.end())
{
m_priv->locs.push_back(l);
i = m_priv->locs.end();
i--;
}
else
{
std::vector<expanded_location>::iterator prev = i;
prev--;
if (*prev == l)
i = prev;
else
i = m_priv->locs.insert(i, l);
}
return location(std::distance (m_priv->locs.begin(), i));
// Just append the new expanded location to the end of the vector
// and return its index. Note that indexes start at 1. This way
// the returning location number is doesn't grow monotonically
// with respect to the expanded locations, but it has the advantage
// to keep the location numbers stable accross the filling of the
// expanded location vector.
m_priv->locs.push_back(l);
return location(m_priv->locs.size());
}
/// Given an instance of location type, return the triplet
@ -157,7 +144,9 @@ location_manager::expand_location(const location location,
unsigned& line,
unsigned& column) const
{
expanded_location &l = m_priv->locs[location.m_value];
if (location.m_value == 0)
return;
expanded_location &l = m_priv->locs[location.m_value - 1];
path = l.m_path;
line = l.m_line;
column = l.m_column;