Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/Expressions.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ struct PlaceholderNode : LiteralNode {
: LiteralNode{defaultValue},
name{path}
{
retrieve = [](InitContext& context, char const* name){ return LiteralNode::var_t{context.options().get<T>(name)}; };
retrieve = [](InitContext& context, char const* name) { return LiteralNode::var_t{context.options().get<T>(name)}; };
}

void reset(InitContext& context)
Expand Down
20 changes: 10 additions & 10 deletions Framework/Core/src/Expressions.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ constexpr std::array<std::string_view, BasicOp::Conditional + 1> mapping{
"ifnode"};

constexpr std::array<std::string_view, 8> cfgtypes{
"uint16_t", // 0
"int16_t", // 1
"uint32_t", // 2
"int32_t", // 3
"uint64_t", // 4
"int64_t", // 5
"float", // 6
"double" // 7
"uint16_t", // 0
"int16_t", // 1
"uint32_t", // 2
"int32_t", // 3
"uint64_t", // 4
"int64_t", // 5
"float", // 6
"double" // 7
};

/// math constants to recognize in string expressions
Expand Down Expand Up @@ -825,7 +825,7 @@ Tokenizer::Tokenizer(std::string const& input)
LastChar = ' ';
if (!source.empty()) {
source.erase(std::remove_if(source.begin(), source.end(), ::isspace), source.end()); // strip whitespaces
source.erase(std::remove(source.begin(), source.end(), '\"'), source.end()); // strip quotes
source.erase(std::remove(source.begin(), source.end(), '\"'), source.end()); // strip quotes
}
current = source.begin();
}
Expand All @@ -840,7 +840,7 @@ void Tokenizer::reset(std::string const& input)
source = input;
if (!source.empty()) {
source.erase(std::remove_if(source.begin(), source.end(), ::isspace), source.end()); // strip whitespaces
source.erase(std::remove(source.begin(), source.end(), '\"'), source.end()); // strip quotes
source.erase(std::remove(source.begin(), source.end(), '\"'), source.end()); // strip quotes
}
current = source.begin();
currentToken = Token::Unexpected;
Expand Down