King_DuckZ/mstch
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cmake restructure

Browse source
This commit is contained in:
Daniel Sipka 2015-04-12 15:25:16 +02:00
parent c6164ae8c8
commit c8152686df
16 changed files with 93 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/token.cpp
View file

@ -1,6 +1,7 @@
#include "token.h"
#include "utils.h"
#include <boost/algorithm/string/trim.hpp>
#include <regex>
using namespace mstch;
@ -9,7 +10,7 @@ token::token(const std::string& raw_token): raw_val(raw_token) {
std::regex token_match("\\{{2}[^\\}]*\\}{2}|\\{{3}[^\\}]*\\}{3}");
if(std::regex_match(raw_token, token_match)) {
std::string inside = raw_token.substr(2, raw_token.size() - 4);
inside = trim(inside);
boost::trim(inside);
if (inside.size() > 0 && inside.at(0) == '#') {
type_val = token_type::section_open;
content_val = inside.substr(1);
@ -37,7 +38,7 @@ token::token(const std::string& raw_token): raw_val(raw_token) {
type_val = token_type::variable;
content_val = inside;
}
content_val = trim(content_val);
boost::trim(content_val);
} else {
type_val = token_type::text;
content_val = raw_token;