GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-06-26 10:54:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rules: Fixed bug where all values were tokenized, thereby introducing spaces

Browse source
This commit is contained in:
Paul Beckingham 2016-05-10 19:54:27 -04:00
parent d7ad32b6d3
commit bd5121e2c8
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Rules.cpp
View file

@ -31,6 +31,7 @@
#include <format.h>
#include <sstream>
#include <tuple>
#include <cassert>
#include <inttypes.h>
////////////////////////////////////////////////////////////////////////////////
@ -267,12 +268,13 @@ void Rules::parse (const std::string& input, int nest /* = 1 */)
else if (tokens.size () >= 3 &&
std::get <0> (tokens[1]) == "=")
{
// Extract the words from the 3rd - Nth tuple.
std::vector <std::string> words;
for (auto& token : std::vector <std::tuple <std::string, Lexer::Type>> (tokens.begin () + 2, tokens.end ()))
words.push_back (std::get <0> (token));
// If this line is an assignment, then tokenizing it is a mistake, so
// use the raw data from 'line'.
auto equals = line.find ('=');
assert (equals != std::string::npos);
set (firstWord, join (" ", words));
set (trim (line.substr (indent, equals - indent)),
trim (line.substr (equals + 1)));
}
// Top-level settings, with no value: