mirror of
https://github.com/HowardHinnant/date.git
synced 2025-01-14 01:37:57 +08:00
Correct problems with load_timezone_mappings_from_xml_file
* Move outside of HAS_REMOTE_API. * Ignore non-empty lines full of white space.
This commit is contained in:
Howard Hinnant
parent
56cec17500
commit
bee4f27d4a
313
tz.cpp
313
tz.cpp
@ -391,6 +391,163 @@ native_to_standard_timezone_name(const std::string& native_tz_name,
|
||||
return false;
|
||||
}
|
||||
|
||||
// Parse this XML file:
|
||||
// http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml
|
||||
// The parsing method is designed to be simple and quick. It is not overly
|
||||
// forgiving of change but it should diagnose basic format issues.
|
||||
// See timezone_mapping structure for more info.
|
||||
static
|
||||
std::vector<detail::timezone_mapping>
|
||||
load_timezone_mappings_from_xml_file(const std::string& input_path)
|
||||
{
|
||||
std::size_t line_num = 0;
|
||||
std::vector<detail::timezone_mapping> mappings;
|
||||
std::string line;
|
||||
|
||||
std::ifstream is(input_path);
|
||||
if (!is.is_open())
|
||||
{
|
||||
// We don't emit file exceptions because that's an implementation detail.
|
||||
std::string msg = "Error opening time zone mapping file \"";
|
||||
msg += input_path;
|
||||
msg += "\".";
|
||||
throw std::runtime_error(msg);
|
||||
}
|
||||
|
||||
auto error = [&input_path, &line_num](const char* info)
|
||||
{
|
||||
std::string msg = "Error loading time zone mapping file \"";
|
||||
msg += input_path;
|
||||
msg += "\" at line ";
|
||||
msg += std::to_string(line_num);
|
||||
msg += ": ";
|
||||
msg += info;
|
||||
throw std::runtime_error(msg);
|
||||
};
|
||||
// [optional space]a="b"
|
||||
auto read_attribute = [&line_num, &line, &error]
|
||||
(const char* name, std::string& value, std::size_t startPos)
|
||||
->std::size_t
|
||||
{
|
||||
value.clear();
|
||||
// Skip leading space before attribute name.
|
||||
std::size_t spos = line.find_first_not_of(' ', startPos);
|
||||
if (spos == std::string::npos)
|
||||
spos = startPos;
|
||||
// Assume everything up to next = is the attribute name
|
||||
// and that an = will always delimit that.
|
||||
std::size_t epos = line.find('=', spos);
|
||||
if (epos == std::string::npos)
|
||||
error("Expected \'=\' right after attribute name.");
|
||||
std::size_t name_len = epos - spos;
|
||||
// Expect the name we find matches the name we expect.
|
||||
if (line.compare(spos, name_len, name) != 0)
|
||||
{
|
||||
std::string msg;
|
||||
msg = "Expected attribute name \'";
|
||||
msg += name;
|
||||
msg += "\' around position ";
|
||||
msg += std::to_string(spos);
|
||||
msg += " but found something else.";
|
||||
error(msg.c_str());
|
||||
}
|
||||
++epos; // Skip the '=' that is after the attribute name.
|
||||
spos = epos;
|
||||
if (spos < line.length() && line[spos] == '\"')
|
||||
++spos; // Skip the quote that is before the attribute value.
|
||||
else
|
||||
{
|
||||
std::string msg = "Expected '\"' to begin value of attribute \'";
|
||||
msg += name;
|
||||
msg += "\'.";
|
||||
error(msg.c_str());
|
||||
}
|
||||
epos = line.find('\"', spos);
|
||||
if (epos == std::string::npos)
|
||||
{
|
||||
std::string msg = "Expected '\"' to end value of attribute \'";
|
||||
msg += name;
|
||||
msg += "\'.";
|
||||
error(msg.c_str());
|
||||
}
|
||||
// Extract everything in between the quotes. Note no escaping is done.
|
||||
std::size_t value_len = epos - spos;
|
||||
value.assign(line, spos, value_len);
|
||||
++epos; // Skip the quote that is after the attribute value;
|
||||
return epos;
|
||||
};
|
||||
|
||||
// Quick but not overly forgiving XML mapping file processing.
|
||||
bool mapTimezonesOpenTagFound = false;
|
||||
bool mapTimezonesCloseTagFound = false;
|
||||
bool mapZoneOpenTagFound = false;
|
||||
bool mapTZoneCloseTagFound = false;
|
||||
std::size_t mapZonePos = std::string::npos;
|
||||
std::size_t mapTimezonesPos = std::string::npos;
|
||||
CONSTDATA char mapTimeZonesOpeningTag[] = { "<mapTimezones " };
|
||||
CONSTDATA char mapZoneOpeningTag[] = { "<mapZone " };
|
||||
CONSTDATA std::size_t mapZoneOpeningTagLen = sizeof(mapZoneOpeningTag) /
|
||||
sizeof(mapZoneOpeningTag[0]) - 1;
|
||||
while (!mapTimezonesOpenTagFound)
|
||||
{
|
||||
std::getline(is, line);
|
||||
++line_num;
|
||||
if (is.eof())
|
||||
{
|
||||
// If there is no mapTimezones tag is it an error?
|
||||
// Perhaps if there are no mapZone mappings it might be ok for
|
||||
// its parent mapTimezones element to be missing?
|
||||
// We treat this as an error though on the assumption that if there
|
||||
// really are no mappings we should still get a mapTimezones parent
|
||||
// element but no mapZone elements inside. Assuming we must
|
||||
// find something will hopefully at least catch more drastic formatting
|
||||
// changes or errors than if we don't do this and assume nothing found.
|
||||
error("Expected a mapTimezones opening tag.");
|
||||
}
|
||||
mapTimezonesPos = line.find(mapTimeZonesOpeningTag);
|
||||
mapTimezonesOpenTagFound = (mapTimezonesPos != std::string::npos);
|
||||
}
|
||||
|
||||
// NOTE: We could extract the version info that follows the opening
|
||||
// mapTimezones tag and compare that to the version of other data we have.
|
||||
// I would have expected them to be kept in synch but testing has shown
|
||||
// it is typically does not match anyway. So what's the point?
|
||||
while (!mapTimezonesCloseTagFound)
|
||||
{
|
||||
std::ws(is);
|
||||
std::getline(is, line);
|
||||
++line_num;
|
||||
if (is.eof())
|
||||
error("Expected a mapTimezones closing tag.");
|
||||
if (line.empty())
|
||||
continue;
|
||||
mapZonePos = line.find(mapZoneOpeningTag);
|
||||
if (mapZonePos != std::string::npos)
|
||||
{
|
||||
mapZonePos += mapZoneOpeningTagLen;
|
||||
detail::timezone_mapping zm{};
|
||||
std::size_t pos = read_attribute("other", zm.other, mapZonePos);
|
||||
pos = read_attribute("territory", zm.territory, pos);
|
||||
read_attribute("type", zm.type, pos);
|
||||
mappings.push_back(std::move(zm));
|
||||
|
||||
continue;
|
||||
}
|
||||
mapTimezonesPos = line.find("</mapTimezones>");
|
||||
mapTimezonesCloseTagFound = (mapTimezonesPos != std::string::npos);
|
||||
if (!mapTimezonesCloseTagFound)
|
||||
{
|
||||
std::size_t commentPos = line.find("<!--");
|
||||
if (commentPos == std::string::npos)
|
||||
error("Unexpected mapping record found. A xml mapZone or comment "
|
||||
"attribute or mapTimezones closing tag was expected.");
|
||||
}
|
||||
}
|
||||
|
||||
is.close();
|
||||
return mappings;
|
||||
}
|
||||
|
||||
#endif // _WIN32
|
||||
|
||||
// Parsing helpers
|
||||
@ -2850,162 +3007,6 @@ get_download_mapping_file(const std::string& version)
|
||||
return file;
|
||||
}
|
||||
|
||||
// Parse this XML file:
|
||||
// http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml
|
||||
// The parsing method is designed to be simple and quick. It is not overly
|
||||
// forgiving of change but it should diagnose basic format issues.
|
||||
// See timezone_mapping structure for more info.
|
||||
static
|
||||
std::vector<detail::timezone_mapping>
|
||||
load_timezone_mappings_from_xml_file(const std::string& input_path)
|
||||
{
|
||||
std::size_t line_num = 0;
|
||||
std::vector<detail::timezone_mapping> mappings;
|
||||
std::string line;
|
||||
|
||||
std::ifstream is(input_path);
|
||||
if (!is.is_open())
|
||||
{
|
||||
// We don't emit file exceptions because that's an implementation detail.
|
||||
std::string msg = "Error opening time zone mapping file \"";
|
||||
msg += input_path;
|
||||
msg += "\".";
|
||||
throw std::runtime_error(msg);
|
||||
}
|
||||
|
||||
auto error = [&input_path, &line_num](const char* info)
|
||||
{
|
||||
std::string msg = "Error loading time zone mapping file \"";
|
||||
msg += input_path;
|
||||
msg += "\" at line ";
|
||||
msg += std::to_string(line_num);
|
||||
msg += ": ";
|
||||
msg += info;
|
||||
throw std::runtime_error(msg);
|
||||
};
|
||||
// [optional space]a="b"
|
||||
auto read_attribute = [&line_num, &line, &error]
|
||||
(const char* name, std::string& value, std::size_t startPos)
|
||||
->std::size_t
|
||||
{
|
||||
value.clear();
|
||||
// Skip leading space before attribute name.
|
||||
std::size_t spos = line.find_first_not_of(' ', startPos);
|
||||
if (spos == std::string::npos)
|
||||
spos = startPos;
|
||||
// Assume everything up to next = is the attribute name
|
||||
// and that an = will always delimit that.
|
||||
std::size_t epos = line.find('=', spos);
|
||||
if (epos == std::string::npos)
|
||||
error("Expected \'=\' right after attribute name.");
|
||||
std::size_t name_len = epos - spos;
|
||||
// Expect the name we find matches the name we expect.
|
||||
if (line.compare(spos, name_len, name) != 0)
|
||||
{
|
||||
std::string msg;
|
||||
msg = "Expected attribute name \'";
|
||||
msg += name;
|
||||
msg += "\' around position ";
|
||||
msg += std::to_string(spos);
|
||||
msg += " but found something else.";
|
||||
error(msg.c_str());
|
||||
}
|
||||
++epos; // Skip the '=' that is after the attribute name.
|
||||
spos = epos;
|
||||
if (spos < line.length() && line[spos] == '\"')
|
||||
++spos; // Skip the quote that is before the attribute value.
|
||||
else
|
||||
{
|
||||
std::string msg = "Expected '\"' to begin value of attribute \'";
|
||||
msg += name;
|
||||
msg += "\'.";
|
||||
error(msg.c_str());
|
||||
}
|
||||
epos = line.find('\"', spos);
|
||||
if (epos == std::string::npos)
|
||||
{
|
||||
std::string msg = "Expected '\"' to end value of attribute \'";
|
||||
msg += name;
|
||||
msg += "\'.";
|
||||
error(msg.c_str());
|
||||
}
|
||||
// Extract everything in between the quotes. Note no escaping is done.
|
||||
std::size_t value_len = epos - spos;
|
||||
value.assign(line, spos, value_len);
|
||||
++epos; // Skip the quote that is after the attribute value;
|
||||
return epos;
|
||||
};
|
||||
|
||||
// Quick but not overly forgiving XML mapping file processing.
|
||||
bool mapTimezonesOpenTagFound = false;
|
||||
bool mapTimezonesCloseTagFound = false;
|
||||
bool mapZoneOpenTagFound = false;
|
||||
bool mapTZoneCloseTagFound = false;
|
||||
std::size_t mapZonePos = std::string::npos;
|
||||
std::size_t mapTimezonesPos = std::string::npos;
|
||||
CONSTDATA char mapTimeZonesOpeningTag[] = { "<mapTimezones " };
|
||||
CONSTDATA char mapZoneOpeningTag[] = { "<mapZone " };
|
||||
CONSTDATA std::size_t mapZoneOpeningTagLen = sizeof(mapZoneOpeningTag) /
|
||||
sizeof(mapZoneOpeningTag[0]) - 1;
|
||||
while (!mapTimezonesOpenTagFound)
|
||||
{
|
||||
std::getline(is, line);
|
||||
++line_num;
|
||||
if (is.eof())
|
||||
{
|
||||
// If there is no mapTimezones tag is it an error?
|
||||
// Perhaps if there are no mapZone mappings it might be ok for
|
||||
// its parent mapTimezones element to be missing?
|
||||
// We treat this as an error though on the assumption that if there
|
||||
// really are no mappings we should still get a mapTimezones parent
|
||||
// element but no mapZone elements inside. Assuming we must
|
||||
// find something will hopefully at least catch more drastic formatting
|
||||
// changes or errors than if we don't do this and assume nothing found.
|
||||
error("Expected a mapTimezones opening tag.");
|
||||
}
|
||||
mapTimezonesPos = line.find(mapTimeZonesOpeningTag);
|
||||
mapTimezonesOpenTagFound = (mapTimezonesPos != std::string::npos);
|
||||
}
|
||||
|
||||
// NOTE: We could extract the version info that follows the opening
|
||||
// mapTimezones tag and compare that to the version of other data we have.
|
||||
// I would have expected them to be kept in synch but testing has shown
|
||||
// it is typically does not match anyway. So what's the point?
|
||||
while (!mapTimezonesCloseTagFound)
|
||||
{
|
||||
std::getline(is, line);
|
||||
++line_num;
|
||||
if (is.eof())
|
||||
error("Expected a mapTimezones closing tag.");
|
||||
if (line.empty())
|
||||
continue;
|
||||
mapZonePos = line.find(mapZoneOpeningTag);
|
||||
if (mapZonePos != std::string::npos)
|
||||
{
|
||||
mapZonePos += mapZoneOpeningTagLen;
|
||||
detail::timezone_mapping zm{};
|
||||
std::size_t pos = read_attribute("other", zm.other, mapZonePos);
|
||||
pos = read_attribute("territory", zm.territory, pos);
|
||||
read_attribute("type", zm.type, pos);
|
||||
mappings.push_back(std::move(zm));
|
||||
|
||||
continue;
|
||||
}
|
||||
mapTimezonesPos = line.find("</mapTimezones>");
|
||||
mapTimezonesCloseTagFound = (mapTimezonesPos != std::string::npos);
|
||||
if (!mapTimezonesCloseTagFound)
|
||||
{
|
||||
std::size_t commentPos = line.find("<!--");
|
||||
if (commentPos == std::string::npos)
|
||||
error("Unexpected mapping record found. A xml mapZone or comment "
|
||||
"attribute or mapTimezones closing tag was expected.");
|
||||
}
|
||||
}
|
||||
|
||||
is.close();
|
||||
return mappings;
|
||||
}
|
||||
|
||||
# else // !_WIN32
|
||||
|
||||
# if !USE_SHELL_API
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user