utils::wide_string was a std::vector<wchar_t>
On most unix systems, this is 32 bits wide, and therefore a UCS-4 encoding.
On windows however, wchar_t is 16 bits wide, and the naive approach results
in UCS-2, which can only represent the Basic Multilingual Plane.
Most functions that used wide_string have been moved over to ucs4_string.
The Win32 API has been moved over to a specially created utf16_string instead.
Specialty tolower #ifdefs have been removed, as the towlower function has
been available since OS X 10.3, OpenBSD 3.7 and probably ancient versions of
all other BSDs too. The only issue is that on windows, the function cannot
be applied to characters outside the BMP.
On the advise of 8680, the unicode string was replaced by the hex
transcription of the corresponding codepoints (which he kindly
provided).
This might help to pass the overzealous encoding check of clang.
This commit also fixes a discrepancy between the signature of u8index in
declaration and definition.
Add the following function in `src/util.hpp`:
template<typename N> inline unsigned int count_leading_ones(N n);
This function returns the quantity of leading `1` bits in `n`.
Add the following function in `src/util.hpp`:
template<typename N> inline unsigned int count_leading_zeros(N n);
This function returns the quantity of leading `0` bits in `n`.
Add the following function in `src/util.hpp`:
template<typename N> inline unsigned int count_ones(N n);
This function returns the quantity of `1` bits in `n` — i.e., `n`’s
population count.
In `src/util.hpp`, change the following function signature:
template<typename T> inline std::size_t bit_width(T x);
To the following function signature:
template<typename T> inline std::size_t bit_width(const T& x);
This avoids needing to call `T`’s copy-constructor, which could be
annoying.
For manipulation of UTF-8 encoded strings (insert, delete, truncate, and
size), usually conversion to wstring and back was necessary. This has
two disadvantages:
* the size of wstring is implementation defined
* the
double conversion is slow
The purpose of this patch is to add functions
to handle these tasks by a layer handling the different indexing between
codepoints and characters.
This commit applies these functions in
several places to replace the old implementations.
The byte_size_from_utf8_first() implementation will be replaced in a
separate commit as it relies on the count_leading_ones function by 8680.
Signed-off-by: aquileia <sk.aquileia@gmail.com>
The problam was that mp::configure is not used for reloaded games and so
mp_game_settings will not be fully initialised. This leads to using default
values rather than values set using mp::configure screen or from reloaded game
config.
The optimal solution would be to either display mp::configure for reloaded games
or to populate mp_game_settings using reloaded game config. However, both
solutions require rather a lot of code restructing and are probably not suitable
for a feature freeze.
Changed from cfg["foo"] > number, to !cfg["foo"].blank(). Turned a cfg call into
just a default assignment. Added a .to_int to a cfg["foo"] call to prepare
against bad user input. Finally added whitespace to 2 lines to get them to line
up with the rest of the lines.
Add the following functions in `src/util.hpp`:
template<typename T> inline std::size_t bit_width();
template<typename T> inline std::size_t bit_width(T x);
These functions compute the size, in bits, of a type or value, providing
a convenient and self-documenting name for the underlying expression,
`sizeof(…) * std::numeric_limits<unsigned char>::digits`.
This commit adds two additional header `#include` directives in
`src/util.hpp`. The newly included headers are as follows:
- `<cstddef>`, for `std::size_t`; and
- `<limits>`, for `std::numeric_limits`.
At first, I obtained the bit width of a byte using the C preprocessor
macro `CHAR_BIT`, defined in the C standard library header `<climits>`,
rather than using `std::numeric_limits<unsigned char>::digits`, but I
subsequently switched to using `std::numeric_limits` per Soliton’s
recommendation at 2014-03-17 21:36Z in the `#wesnoth-dev` IRC channel on
the freenode IRC network (<irc://chat.freenode.net/%23wesnoth-dev>).
Here the changes to get whiteboard to work are mostly cosmetic, the
right cost for each unit is displayed on the unit in question. This
is mostly for peace of mind as the user looks at the screen they don't
get confused. The proper gold is also taken for each recall and
replaced for each canceled/undone recall while in whiteboard.
The previous implementation was not strongly exception safe.
This code is nearly identical logically, but with strong exception safety.
It's also good practice and more readable.
Codeblocks made some of my tabs into spaces and I had to fix it.
Also, forgot to mention this before, but I cleaned up some of the code
for astarsearch.cpp as well.
In many places, std::copy was used with back_inserters, or other
std::inserters. These have in most cases been replaced by using the
ranged insert member function of each stl container. Firstly, this makes more
readable code. Also, this is often more efficient because,
if the compiler can find the distance between the source iterators,
it only has to make one block allocation and then fill it
with values. In other cases, containers were being default constructed
and then std::copy'd into with some form of inserter. These were cleaned up
by using the iterator range constructor instead.
Use of std::copy was especially egregious in the case of associative
containers such as map and set. Sometimes back_inserter was
being used, other times std::inserter set at front, but it doesn't matter
because there is no front or back when inserting, and it's much cleaner
to just use set or map::insert(iterator begin, iterator end).
