template<typename Stringpool_char>
Stringpool_template<Stringpool_char>::Stringpool_template()
: string_set_(), key_to_offset_(), strings_(), strtab_size_(0),
- zero_null_(true), optimize_(false)
+ zero_null_(true), optimize_(false), offset_(sizeof(Stringpool_char))
{
if (parameters->options_valid() && parameters->options().optimize() >= 2)
this->optimize_ = true;
this->string_set_.swap(new_string_set);
}
-// Return the length of a string of arbitrary character type.
-
-template<typename Stringpool_char>
-size_t
-Stringpool_template<Stringpool_char>::string_length(const Stringpool_char* p)
-{
- size_t len = 0;
- for (; *p != 0; ++p)
- ++len;
- return len;
-}
-
-// Specialize string_length for char. Maybe we could just use
-// std::char_traits<>::length?
-
-template<>
-inline size_t
-Stringpool_template<char>::string_length(const char* p)
-{
- return strlen(p);
-}
-
// Compare two strings of arbitrary character type for equality.
template<typename Stringpool_char>
alc = sizeof(Stringdata) + buffer_size;
else
{
- Stringdata *psd = this->strings_.front();
+ Stringdata* psd = this->strings_.front();
if (len > psd->alc - psd->len)
alc = sizeof(Stringdata) + buffer_size;
else
}
}
- Stringdata *psd = reinterpret_cast<Stringdata*>(new char[alc]);
+ Stringdata* psd = reinterpret_cast<Stringdata*>(new char[alc]);
psd->alc = alc - sizeof(Stringdata);
memcpy(psd->data, s, len - sizeof(Stringpool_char));
memset(psd->data + len - sizeof(Stringpool_char), 0,
return this->add_with_length(s, string_length(s), copy, pkey);
}
+// Add a new key offset entry.
+
+template<typename Stringpool_char>
+void
+Stringpool_template<Stringpool_char>::new_key_offset(size_t length)
+{
+ section_offset_type offset;
+ if (this->zero_null_ && length == 0)
+ offset = 0;
+ else
+ {
+ offset = this->offset_;
+ this->offset_ += (length + 1) * sizeof(Stringpool_char);
+ }
+ this->key_to_offset_.push_back(offset);
+}
+
template<typename Stringpool_char>
const Stringpool_char*
Stringpool_template<Stringpool_char>::add_with_length(const Stringpool_char* s,
{
// We just added the string. The key value has now been
// used.
- this->key_to_offset_.push_back(0);
+ this->new_key_offset(length);
}
else
{
return p->first.string;
}
- this->key_to_offset_.push_back(0);
+ this->new_key_offset(length);
hk.string = this->add_string(s, length);
// The contents of the string stay the same, so we don't need to
// take the time to sort when the user asks for heavy optimization.
if (!this->optimize_)
{
- for (typename String_set_type::iterator curr = this->string_set_.begin();
- curr != this->string_set_.end();
- curr++)
- {
- section_offset_type* poff = &this->key_to_offset_[curr->second - 1];
- if (this->zero_null_ && curr->first.string[0] == 0)
- *poff = 0;
- else
- {
- *poff = offset;
- offset += (curr->first.length + 1) * charsize;
- }
- }
+ // If we are not optimizing, the offsets are already assigned.
+ offset = this->offset_;
}
else
{