quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unique names debugging (please revert when the bug is fixed)

Browse Source
This commit is contained in:
Rudolf Polzer 2010-02-09 21:11:42 +01:00
parent c6252fe3fc
commit f0c84c72af
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/uniquenames.h
View File

@ -39,7 +39,7 @@ public:
{ {
return m_value; return m_value;
} }
void write(char* buffer) void write(char* buffer) const
{ {
sprintf(buffer, "%u", m_value); sprintf(buffer, "%u", m_value);
} }
@ -136,9 +136,11 @@ inline name_t name_read(const char* name)
class PostFixes class PostFixes
{ {
public:
typedef std::map<Postfix, unsigned int> postfixes_t; typedef std::map<Postfix, unsigned int> postfixes_t;
postfixes_t m_postfixes; postfixes_t m_postfixes;
private:
Postfix find_first_empty() const Postfix find_first_empty() const
{ {
Postfix postfix("1"); Postfix postfix("1");
@ -207,15 +209,33 @@ class UniqueNames
public: public:
name_t make_unique(const name_t& name) const name_t make_unique(const name_t& name) const
{ {
char buf[80];
name_t r("","");
name_write(buf, name);
globalErrorStream() << "find unique name for " << buf << "\n";
globalErrorStream() << "> currently registered names:\n";
for(names_t::const_iterator i = m_names.begin(); i != m_names.end(); ++i)
{
globalErrorStream() << ">> " << i->first.c_str() << ": ";
for(PostFixes::postfixes_t::const_iterator j = i->second.m_postfixes.begin(); j != i->second.m_postfixes.end(); ++j)
{
j->first.write(buf);
globalErrorStream() << " '" << buf << "'";
}
globalErrorStream() << "\n";
}
names_t::const_iterator i = m_names.find(name.first); names_t::const_iterator i = m_names.find(name.first);
if(i == m_names.end()) if(i == m_names.end())
{ {
return name; r = name;
} }
else else
{ {
return name_t(name.first, (*i).second.make_unique(name.second)); r = name_t(name.first, (*i).second.make_unique(name.second));
} }
name_write(buf, r);
globalErrorStream() << "> unique name is " << buf << "\n";
return r;
} }
void insert(const name_t& name) void insert(const name_t& name)