Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: c++20 compilation #274

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: c++20 compilation #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26edb53
fix: c++20 compilation
pminev Jan 24, 2025
17fb002
fix: warning for unused params
pminev Jan 24, 2025
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
74 changes: 37 additions & 37 deletions src/error_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,137 +126,137 @@ void RenderErrorInfo(std::basic_string<CharT>& result, const ErrorInfoTpl<CharT>
switch (errCode)
{
case ErrorCode::Unspecified:
format_to(std::back_inserter(out), UNIVERSAL_STR("Parse error").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Parse error").GetValue<CharT>());
break;
case ErrorCode::UnexpectedException:
{
auto& extraParams = errInfo.GetExtraParams();
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected exception occurred during template processing. Exception: {}").GetValue<CharT>(), extraParams[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected exception occurred during template processing. Exception: {}").GetValue<CharT>(), extraParams[0]);
break;
}
case ErrorCode::MetadataParseError:
{
auto& extraParams = errInfo.GetExtraParams();
format_to(std::back_inserter(out), UNIVERSAL_STR("Error occurred during template metadata parsing. Error: {}").GetValue<CharT>(), extraParams[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Error occurred during template metadata parsing. Error: {}").GetValue<CharT>(), extraParams[0]);
break;
}
case ErrorCode::YetUnsupported:
format_to(std::back_inserter(out), UNIVERSAL_STR("This feature has not been supported yet").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("This feature has not been supported yet").GetValue<CharT>());
break;
case ErrorCode::FileNotFound:
format_to(std::back_inserter(out), UNIVERSAL_STR("File not found").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("File not found").GetValue<CharT>());
break;
case ErrorCode::ExpectedStringLiteral:
format_to(std::back_inserter(out), UNIVERSAL_STR("String expected").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("String expected").GetValue<CharT>());
break;
case ErrorCode::ExpectedIdentifier:
format_to(std::back_inserter(out), UNIVERSAL_STR("Identifier expected").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Identifier expected").GetValue<CharT>());
break;
case ErrorCode::ExpectedSquareBracket:
format_to(std::back_inserter(out), UNIVERSAL_STR("']' expected").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("']' expected").GetValue<CharT>());
break;
case ErrorCode::ExpectedRoundBracket:
format_to(std::back_inserter(out), UNIVERSAL_STR("')' expected").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("')' expected").GetValue<CharT>());
break;
case ErrorCode::ExpectedCurlyBracket:
format_to(std::back_inserter(out), UNIVERSAL_STR("'}}' expected").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("'}}' expected").GetValue<CharT>());
break;
case ErrorCode::ExpectedToken:
{
auto& extraParams = errInfo.GetExtraParams();
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected token '{}'").GetValue<CharT>(), extraParams[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected token '{}'").GetValue<CharT>(), extraParams[0]);
if (extraParams.size() > 1)
{
format_to(std::back_inserter(out), UNIVERSAL_STR(". Expected: ").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR(". Expected: ").GetValue<CharT>());
for (std::size_t i = 1; i < extraParams.size(); ++ i)
{
if (i != 1)
format_to(std::back_inserter(out), UNIVERSAL_STR(", ").GetValue<CharT>());
format_to(std::back_inserter(out), UNIVERSAL_STR("\'{}\'").GetValue<CharT>(), extraParams[i]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR(", ").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("\'{}\'").GetValue<CharT>(), extraParams[i]);
}
}
break;
}
case ErrorCode::ExpectedExpression:
{
auto& extraParams = errInfo.GetExtraParams();
format_to(std::back_inserter(out), UNIVERSAL_STR("Expected expression, got: '{}'").GetValue<CharT>(), extraParams[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Expected expression, got: '{}'").GetValue<CharT>(), extraParams[0]);
break;
}
case ErrorCode::ExpectedEndOfStatement:
{
auto& extraParams = errInfo.GetExtraParams();
format_to(std::back_inserter(out), UNIVERSAL_STR("Expected end of statement, got: '{}'").GetValue<CharT>(), extraParams[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Expected end of statement, got: '{}'").GetValue<CharT>(), extraParams[0]);
break;
}
case ErrorCode::ExpectedRawEnd:
format_to(std::back_inserter(out), UNIVERSAL_STR("Expected end of raw block").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Expected end of raw block").GetValue<CharT>());
break;
case ErrorCode::ExpectedMetaEnd:
format_to(std::back_inserter(out), UNIVERSAL_STR("Expected end of meta block").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Expected end of meta block").GetValue<CharT>());
break;
case ErrorCode::UnexpectedToken:
{
auto& extraParams = errInfo.GetExtraParams();
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected token: '{}'").GetValue<CharT>(), extraParams[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected token: '{}'").GetValue<CharT>(), extraParams[0]);
break;
}
case ErrorCode::UnexpectedStatement:
{
auto& extraParams = errInfo.GetExtraParams();
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected statement: '{}'").GetValue<CharT>(), extraParams[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected statement: '{}'").GetValue<CharT>(), extraParams[0]);
break;
}
case ErrorCode::UnexpectedCommentBegin:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected comment begin").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected comment begin").GetValue<CharT>());
break;
case ErrorCode::UnexpectedCommentEnd:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected comment end").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected comment end").GetValue<CharT>());
break;
case ErrorCode::UnexpectedRawBegin:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected raw block begin").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected raw block begin").GetValue<CharT>());
break;
case ErrorCode::UnexpectedRawEnd:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected raw block end").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected raw block end").GetValue<CharT>());
break;
case ErrorCode::UnexpectedMetaBegin:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected meta block begin").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected meta block begin").GetValue<CharT>());
break;
case ErrorCode::UnexpectedMetaEnd:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected meta block end").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected meta block end").GetValue<CharT>());
break;
case ErrorCode::UnexpectedExprBegin:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected expression block begin").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected expression block begin").GetValue<CharT>());
break;
case ErrorCode::UnexpectedExprEnd:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected expression block end").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected expression block end").GetValue<CharT>());
break;
case ErrorCode::UnexpectedStmtBegin:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected statement block begin").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected statement block begin").GetValue<CharT>());
break;
case ErrorCode::UnexpectedStmtEnd:
format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected statement block end").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Unexpected statement block end").GetValue<CharT>());
break;
case ErrorCode::TemplateNotParsed:
format_to(std::back_inserter(out), UNIVERSAL_STR("Template not parsed").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Template not parsed").GetValue<CharT>());
break;
case ErrorCode::TemplateNotFound:
format_to(std::back_inserter(out), UNIVERSAL_STR("Template(s) not found: {}").GetValue<CharT>(), errInfo.GetExtraParams()[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Template(s) not found: {}").GetValue<CharT>(), errInfo.GetExtraParams()[0]);
break;
case ErrorCode::InvalidTemplateName:
format_to(std::back_inserter(out), UNIVERSAL_STR("Invalid template name: {}").GetValue<CharT>(), errInfo.GetExtraParams()[0]);
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Invalid template name: {}").GetValue<CharT>(), errInfo.GetExtraParams()[0]);
break;
case ErrorCode::InvalidValueType:
format_to(std::back_inserter(out), UNIVERSAL_STR("Invalid value type").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Invalid value type").GetValue<CharT>());
break;
case ErrorCode::ExtensionDisabled:
format_to(std::back_inserter(out), UNIVERSAL_STR("Extension disabled").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Extension disabled").GetValue<CharT>());
break;
case ErrorCode::TemplateEnvAbsent:
format_to(std::back_inserter(out), UNIVERSAL_STR("Template environment doesn't set").GetValue<CharT>());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("Template environment doesn't set").GetValue<CharT>());
break;
}
format_to(std::back_inserter(out), UNIVERSAL_STR("\n{}").GetValue<CharT>(), errInfo.GetLocationDescr());
fmt::format_to(std::back_inserter(out), UNIVERSAL_STR("\n{}").GetValue<CharT>(), errInfo.GetLocationDescr());
result = to_string(out);
}

Expand Down
10 changes: 5 additions & 5 deletions src/filters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ InternalValue Map::Filter(const InternalValue& baseVal, RenderContext& context)

return ListAdapter::CreateAdapter(std::move(resultList));
}
Random::Random(FilterParams params) {}
Random::Random(FilterParams) {}

InternalValue Random::Filter(const InternalValue&, RenderContext&)
{
Expand Down Expand Up @@ -458,7 +458,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte

if (!isConverted)
return result;

auto ProtectedValue = [&baseVal](InternalValue value) {
if (baseVal.ShouldExtendLifetime())
value.SetParentData(baseVal);
Expand Down Expand Up @@ -667,7 +667,7 @@ InternalValue Slice::Filter(const InternalValue& baseVal, RenderContext& context
value.SetParentData(baseVal);
return value;
};

InternalValue sliceLengthValue = GetArgumentValue("slices", context);
int64_t sliceLength = ConvertToInt(sliceLengthValue);
InternalValue fillWith = GetArgumentValue("fill_with", context);
Expand Down Expand Up @@ -719,13 +719,13 @@ InternalValue Slice::Batch(const InternalValue& baseVal, RenderContext& context)

InternalValueList resultList;
resultList.reserve(linecount);

auto ProtectedValue = [&baseVal](InternalValue value) {
if (baseVal.ShouldExtendLifetime())
value.SetParentData(baseVal);
return value;
};

const auto remainder = elementsCount % linecount;
const auto columns = elementsCount / linecount + (remainder > 0 ? 1 : 0);
for (std::size_t line = 0, idx = 0; line < linecount; ++line)
Expand Down
2 changes: 1 addition & 1 deletion src/serialize_filters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ struct PrettyPrinter : visitors::BaseVisitor<std::string>
const RenderContext* m_context;
};

PrettyPrint::PrettyPrint(FilterParams params) {}
PrettyPrint::PrettyPrint(FilterParams) {}

InternalValue PrettyPrint::Filter(const InternalValue& baseVal, RenderContext& context)
{
Expand Down