0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tstring: formatting cleanup

Browse source
This commit is contained in:
Charles Dang 2017-10-17 04:30:59 +11:00
parent f6c4f3d214
commit 9443fcdd5c
2 changed files with 164 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

248
src/tstring.cpp
View file

@ -18,18 +18,19 @@
* Routines for translatable strings.
*/
#include <map>
#include <vector>
#include <mutex>
#include "tstring.hpp"
#include "gettext.hpp"
#include "log.hpp"
#include <boost/functional/hash_fwd.hpp>
#include <boost/multi_index_container.hpp>
#include <boost/functional/hash_fwd.hpp>
#include <boost/multi_index/hashed_index.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/multi_index_container.hpp>
#include <map>
#include <mutex>
#include <vector>
static lg::log_domain log_config("config");
#define LOG_CF LOG_STREAM(info, log_config)
@ -37,18 +38,20 @@ static lg::log_domain log_config("config");
static unsigned language_counter = 0;
namespace {
const char TRANSLATABLE_PART = 0x01;
const char UNTRANSLATABLE_PART = 0x02;
const char TEXTDOMAIN_SEPARATOR = 0x03;
const char ID_TRANSLATABLE_PART = 0x04;
const char PLURAL_PART = 0x05;
namespace
{
const char TRANSLATABLE_PART = 0x01;
const char UNTRANSLATABLE_PART = 0x02;
const char TEXTDOMAIN_SEPARATOR = 0x03;
const char ID_TRANSLATABLE_PART = 0x04;
const char PLURAL_PART = 0x05;
std::vector<std::string> id_to_textdomain;
std::map<std::string, unsigned int> textdomain_to_id;
std::vector<std::string> id_to_textdomain;
std::map<std::string, unsigned int> textdomain_to_id;
}
size_t t_string_base::hash_value() const {
size_t t_string_base::hash_value() const
{
size_t seed = 0;
boost::hash_combine(seed, value_);
boost::hash_combine(seed, translatable_);
@ -56,35 +59,34 @@ size_t t_string_base::hash_value() const {
return seed;
}
t_string_base::walker::walker(const t_string_base& string) :
string_(string.value_),
begin_(0),
end_(string_.size()),
textdomain_(),
translatable_(false),
countable_(false),
count_(0)
t_string_base::walker::walker(const t_string_base& string)
: string_(string.value_)
, begin_(0)
, end_(string_.size())
, textdomain_()
, translatable_(false)
, countable_(false)
, count_(0)
{
if(string.translatable_) {
update();
}
}
static std::string mark = std::string(TRANSLATABLE_PART, 1) + UNTRANSLATABLE_PART +
ID_TRANSLATABLE_PART + PLURAL_PART;
static std::string mark = std::string(TRANSLATABLE_PART, 1) + UNTRANSLATABLE_PART + ID_TRANSLATABLE_PART + PLURAL_PART;
void t_string_base::walker::update()
{
unsigned int id;
if(begin_ == string_.size())
if(begin_ == string_.size()) {
return;
}
switch(string_[begin_]) {
case TRANSLATABLE_PART: {
// Format: [TRANSLATABLE_PART]textdomain[TEXTDOMAIN_SEPARATOR]msgid[...]
std::string::size_type textdomain_end =
string_.find(TEXTDOMAIN_SEPARATOR, begin_ + 1);
std::string::size_type textdomain_end = string_.find(TEXTDOMAIN_SEPARATOR, begin_ + 1);
if(textdomain_end == std::string::npos || textdomain_end >= string_.size() - 1) {
ERR_CF << "Error: invalid string: " << string_ << std::endl;
@ -93,10 +95,11 @@ void t_string_base::walker::update()
}
end_ = string_.find_first_of(mark, textdomain_end + 1);
if(end_ == std::string::npos)
if(end_ == std::string::npos) {
end_ = string_.size();
}
textdomain_ = std::string(string_, begin_+1, textdomain_end - begin_ - 1);
textdomain_ = std::string(string_, begin_ + 1, textdomain_end - begin_ - 1);
translatable_ = true;
begin_ = textdomain_end + 1;
@ -109,9 +112,11 @@ void t_string_base::walker::update()
begin_ = string_.size();
return;
}
end_ = string_.find_first_of(mark, begin_ + 3);
if(end_ == std::string::npos)
if(end_ == std::string::npos) {
end_ = string_.size();
}
id = string_[begin_ + 1] + string_[begin_ + 2] * 256;
if(id >= id_to_textdomain.size()) {
@ -119,6 +124,7 @@ void t_string_base::walker::update()
begin_ = string_.size();
return;
}
textdomain_ = id_to_textdomain[id];
begin_ += 3;
translatable_ = true;
@ -127,8 +133,9 @@ void t_string_base::walker::update()
case UNTRANSLATABLE_PART:
end_ = string_.find_first_of(mark, begin_ + 1);
if(end_ == std::string::npos)
if(end_ == std::string::npos) {
end_ = string_.size();
}
if(end_ <= begin_ + 1) {
ERR_CF << "Error: invalid string: " << string_ << std::endl;
@ -143,13 +150,16 @@ void t_string_base::walker::update()
case PLURAL_PART:
begin_ = string_.find_first_of(mark, end_ + 5);
if(begin_ == std::string::npos)
if(begin_ == std::string::npos) {
begin_ = string_.size();
}
if(string_[begin_] == PLURAL_PART) {
ERR_CF << "Error: invalid string: " << string_ << std::endl;
begin_ = string_.size();
return;
}
update();
break;
@ -167,17 +177,21 @@ void t_string_base::walker::update()
begin_ = string_.size();
return;
}
std::string::size_type real_end = string_.find_first_of(mark, end_ + 6);
if(real_end < string_.size() && string_[real_end] == PLURAL_PART) {
ERR_CF << "Error: invalid string: " << string_ << std::endl;
begin_ = string_.size();
return;
}
countable_ = true;
union {
int32_t count;
char data[4];
} cvt;
std::copy_n(string_.data() + end_ + 1, 4, cvt.data);
count_ = cvt.count;
} else {
@ -205,15 +219,16 @@ std::string::const_iterator t_string_base::walker::plural_end() const
if(pl_end == std::string::npos) {
pl_end = string_.size();
}
return string_.begin() + pl_end;
}
t_string_base::t_string_base() :
value_(),
translated_value_(),
translation_timestamp_(0),
translatable_(false),
last_untranslatable_(false)
t_string_base::t_string_base()
: value_()
, translated_value_()
, translation_timestamp_(0)
, translatable_(false)
, last_untranslatable_(false)
{
}
@ -221,32 +236,32 @@ t_string_base::~t_string_base()
{
}
t_string_base::t_string_base(const t_string_base& string) :
value_(string.value_),
translated_value_(string.translated_value_),
translation_timestamp_(string.translation_timestamp_),
translatable_(string.translatable_),
last_untranslatable_(string.last_untranslatable_)
t_string_base::t_string_base(const t_string_base& string)
: value_(string.value_)
, translated_value_(string.translated_value_)
, translation_timestamp_(string.translation_timestamp_)
, translatable_(string.translatable_)
, last_untranslatable_(string.last_untranslatable_)
{
}
t_string_base::t_string_base(const std::string& string) :
value_(string),
translated_value_(),
translation_timestamp_(0),
translatable_(false),
last_untranslatable_(false)
t_string_base::t_string_base(const std::string& string)
: value_(string)
, translated_value_()
, translation_timestamp_(0)
, translatable_(false)
, last_untranslatable_(false)
{
}
t_string_base::t_string_base(const std::string& string, const std::string& textdomain) :
value_(1, ID_TRANSLATABLE_PART),
translated_value_(),
translation_timestamp_(0),
translatable_(true),
last_untranslatable_(false)
t_string_base::t_string_base(const std::string& string, const std::string& textdomain)
: value_(1, ID_TRANSLATABLE_PART)
, translated_value_()
, translation_timestamp_(0)
, translatable_(true)
, last_untranslatable_(false)
{
if (string.empty()) {
if(string.empty()) {
value_.clear();
translatable_ = false;
return;
@ -268,14 +283,14 @@ t_string_base::t_string_base(const std::string& string, const std::string& textd
value_ += string;
}
t_string_base::t_string_base(const std::string& sing, const std::string& pl, int count, const std::string& textdomain) :
value_(1, ID_TRANSLATABLE_PART),
translated_value_(),
translation_timestamp_(0),
translatable_(true),
last_untranslatable_(false)
t_string_base::t_string_base(const std::string& sing, const std::string& pl, int count, const std::string& textdomain)
: value_(1, ID_TRANSLATABLE_PART)
, translated_value_()
, translation_timestamp_(0)
, translatable_(true)
, last_untranslatable_(false)
{
if (sing.empty() && pl.empty()) {
if(sing.empty() && pl.empty()) {
value_.clear();
translatable_ = false;
return;
@ -301,19 +316,21 @@ t_string_base::t_string_base(const std::string& sing, const std::string& pl, int
int32_t count;
char data[4];
} cvt;
cvt.count = count;
for(char c : cvt.data) {
value_ += c;
}
value_ += pl;
}
t_string_base::t_string_base(const char* string) :
value_(string),
translated_value_(),
translation_timestamp_(0),
translatable_(false),
last_untranslatable_(false)
t_string_base::t_string_base(const char* string)
: value_(string)
, translated_value_()
, translation_timestamp_(0)
, translatable_(false)
, last_untranslatable_(false)
{
}
@ -348,6 +365,7 @@ std::string t_string_base::base_str() const
for(walker w(*this); !w.eos(); w.next()) {
res += std::string(w.begin(), w.end());
}
return res;
}
@ -362,8 +380,7 @@ std::string t_string_base::to_serialized() const
if(w.translatable()) {
chunk.translatable_ = true;
chunk.last_untranslatable_ = false;
chunk.value_ = TRANSLATABLE_PART + w.textdomain() +
TEXTDOMAIN_SEPARATOR + substr;
chunk.value_ = TRANSLATABLE_PART + w.textdomain() + TEXTDOMAIN_SEPARATOR + substr;
} else {
chunk.translatable_ = false;
chunk.value_ = substr;
@ -431,9 +448,11 @@ t_string_base t_string_base::operator+(const char* string) const
t_string_base& t_string_base::operator+=(const t_string_base& string)
{
if (string.value_.empty())
if(string.value_.empty()) {
return *this;
if (value_.empty()) {
}
if(value_.empty()) {
*this = string;
return *this;
}
@ -443,19 +462,24 @@ t_string_base& t_string_base::operator+=(const t_string_base& string)
value_ = UNTRANSLATABLE_PART + value_;
translatable_ = true;
last_untranslatable_ = true;
} else
} else {
translated_value_ = "";
}
if(string.translatable_) {
if (last_untranslatable_ && string.value_[0] == UNTRANSLATABLE_PART)
if(last_untranslatable_ && string.value_[0] == UNTRANSLATABLE_PART) {
value_.append(string.value_.begin() + 1, string.value_.end());
else
} else {
value_ += string.value_;
}
last_untranslatable_ = string.last_untranslatable_;
} else {
if (!last_untranslatable_) {
if(!last_untranslatable_) {
value_ += UNTRANSLATABLE_PART;
last_untranslatable_ = true;
}
value_ += string.value_;
}
} else {
@ -467,18 +491,21 @@ t_string_base& t_string_base::operator+=(const t_string_base& string)
t_string_base& t_string_base::operator+=(const std::string& string)
{
if (string.empty())
if(string.empty()) {
return *this;
if (value_.empty()) {
}
if(value_.empty()) {
*this = string;
return *this;
}
if(translatable_) {
if (!last_untranslatable_) {
if(!last_untranslatable_) {
value_ += UNTRANSLATABLE_PART;
last_untranslatable_ = true;
}
value_ += string;
translated_value_ = "";
} else {
@ -490,18 +517,21 @@ t_string_base& t_string_base::operator+=(const std::string& string)
t_string_base& t_string_base::operator+=(const char* string)
{
if (string[0] == 0)
if(string[0] == 0) {
return *this;
if (value_.empty()) {
}
if(value_.empty()) {
*this = string;
return *this;
}
if(translatable_) {
if (!last_untranslatable_) {
if(!last_untranslatable_) {
value_ += UNTRANSLATABLE_PART;
last_untranslatable_ = true;
}
value_ += string;
translated_value_ = "";
} else {
@ -511,33 +541,35 @@ t_string_base& t_string_base::operator+=(const char* string)
return *this;
}
bool t_string_base::operator==(const t_string_base &that) const
bool t_string_base::operator==(const t_string_base& that) const
{
return that.translatable_ == translatable_ && that.value_ == value_;
}
bool t_string_base::operator==(const std::string &that) const
bool t_string_base::operator==(const std::string& that) const
{
return !translatable_ && value_ == that;
}
bool t_string_base::operator==(const char *that) const
bool t_string_base::operator==(const char* that) const
{
return !translatable_ && value_ == that;
}
bool t_string_base::operator<(const t_string_base &that) const
bool t_string_base::operator<(const t_string_base& that) const
{
return value_ < that.value_;
}
const std::string& t_string_base::str() const
{
if(!translatable_)
if(!translatable_) {
return value_;
}
if (translatable_ && !translated_value_.empty() && translation_timestamp_ == language_counter)
if(translatable_ && !translated_value_.empty() && translation_timestamp_ == language_counter) {
return translated_value_;
}
translated_value_.clear();
@ -547,9 +579,11 @@ const std::string& t_string_base::str() const
if(w.translatable()) {
if(w.countable()) {
std::string plural(w.plural_begin(), w.plural_end());
translated_value_ += translation::dsngettext(w.textdomain().c_str(), part.c_str(), plural.c_str(), w.count());
translated_value_ +=
translation::dsngettext(w.textdomain().c_str(), part.c_str(), plural.c_str(), w.count());
} else {
translated_value_ += translation::dsgettext(w.textdomain().c_str(), part.c_str());
translated_value_ +=
translation::dsgettext(w.textdomain().c_str(), part.c_str());
}
} else {
translated_value_ += part;
@ -560,7 +594,8 @@ const std::string& t_string_base::str() const
return translated_value_;
}
t_string::t_string() : val_(new base())
t_string::t_string()
: val_(new base())
{
}
@ -568,45 +603,50 @@ t_string::~t_string()
{
}
t_string::t_string(const t_string &o) : val_(o.val_)
t_string::t_string(const t_string& o)
: val_(o.val_)
{
}
t_string::t_string(const base &o) : val_(new base(o))
t_string::t_string(const base& o)
: val_(new base(o))
{
}
t_string::t_string(const char *o) : val_(new base(o))
t_string::t_string(const char* o)
: val_(new base(o))
{
}
t_string::t_string(const std::string &o) : val_(new base(o))
t_string::t_string(const std::string& o)
: val_(new base(o))
{
}
t_string::t_string(const std::string &o, const std::string &textdomain) : val_(new base(o, textdomain))
t_string::t_string(const std::string& o, const std::string& textdomain)
: val_(new base(o, textdomain))
{
}
t_string::t_string(const std::string &s, const std::string& pl, int c, const std::string &textdomain)
: val_(new base(s, pl, c, textdomain))
t_string::t_string(const std::string& s, const std::string& pl, int c, const std::string& textdomain)
: val_(new base(s, pl, c, textdomain))
{
}
t_string &t_string::operator=(const t_string &o)
t_string& t_string::operator=(const t_string& o)
{
val_ = o.val_;
return *this;
}
t_string &t_string::operator=(const char *o)
t_string& t_string::operator=(const char* o)
{
t_string o2(o);
swap(o2);
return *this;
}
void t_string::add_textdomain(const std::string &name, const std::string &path)
void t_string::add_textdomain(const std::string& name, const std::string& path)
{
LOG_CF << "Binding textdomain " << name << " to path " << path << "\n";

29
src/tstring.hpp
View file

@ -40,6 +40,7 @@ public:
std::string::const_iterator end() const { return string_.begin() + end_; }
std::string::const_iterator plural_begin() const;
std::string::const_iterator plural_end() const;
private:
void update();
@ -54,8 +55,10 @@ public:
friend class walker;
t_string_base();
/** Default implementation, but defined out-of-line for efficiency reasons. */
~t_string_base();
/** Default implementation, but defined out-of-line for efficiency reasons. */
t_string_base(const t_string_base&);
t_string_base(const std::string& string);
@ -99,12 +102,14 @@ public:
const std::string& str() const;
const char* c_str() const { return str().c_str(); }
bool translatable() const { return translatable_; }
// Warning: value() may contain platform dependent prefix bytes !
// Consider base_str() for a more reliable untranslated string
const std::string& value() const { return value_; }
std::string base_str() const;
size_t hash_value() const;
private:
std::string value_;
mutable std::string translated_value_;
@ -123,12 +128,15 @@ public:
/** Default implementation, but defined out-of-line for efficiency reasons. */
t_string();
/** Default implementation, but defined out-of-line for efficiency reasons. */
~t_string();
/** Default implementation, but defined out-of-line for efficiency reasons. */
t_string(const t_string &);
t_string(const t_string&);
/** Default implementation, but defined out-of-line for efficiency reasons. */
t_string &operator=(const t_string &);
t_string& operator=(const t_string&);
t_string(const base &);
t_string(const char *);
@ -136,7 +144,7 @@ public:
t_string(const std::string &str, const std::string &textdomain);
t_string(const std::string& sing, const std::string& pl, int count, const std::string& textdomain);
t_string &operator=(const char *o);
t_string& operator=(const char *o);
static t_string from_serialized(const std::string& string) { return t_string(base::from_serialized(string)); }
std::string to_serialized() const { return get().to_serialized(); }
@ -146,6 +154,7 @@ public:
t_string operator+(const t_string& o) const { return get() + o.get(); }
t_string operator+(const std::string& o) const { return get() + o; }
t_string operator+(const char* o) const { return get() + o; }
private:
template<typename T>
void increase_impl(const T& other)
@ -154,6 +163,7 @@ private:
*nw += other;
val_.reset(nw);
}
public:
t_string& operator+=(const t_string& o) { increase_impl(o.get()); return *this; }
t_string& operator+=(const std::string& o) { increase_impl(o); return *this; }
@ -184,6 +194,7 @@ public:
const t_string_base& get() const { return *val_; }
void swap(t_string& other) { val_.swap(other.val_); }
private:
//never null
std::shared_ptr<const t_string_base> val_;
@ -193,9 +204,9 @@ private:
void swap(t_string& lhs, t_string& rhs);
inline std::ostream& operator<<(std::ostream& os, const t_string& str) { return os << str.get(); }
inline bool operator==(const std::string &a, const t_string &b) { return b == a; }
inline bool operator==(const char *a, const t_string &b) { return b == a; }
inline bool operator!=(const std::string &a, const t_string &b) { return b != a; }
inline bool operator!=(const char *a, const t_string &b) { return b != a; }
inline t_string operator+(const std::string &a, const t_string &b) { return t_string(a) + b; }
inline t_string operator+(const char *a, const t_string &b) { return t_string(a) + b; }
inline bool operator==(const std::string &a, const t_string& b) { return b == a; }
inline bool operator==(const char *a, const t_string& b) { return b == a; }
inline bool operator!=(const std::string &a, const t_string& b) { return b != a; }
inline bool operator!=(const char *a, const t_string& b) { return b != a; }
inline t_string operator+(const std::string &a, const t_string& b) { return t_string(a) + b; }
inline t_string operator+(const char *a, const t_string& b) { return t_string(a) + b; }