Enable -Wall and -Werror

Author: manusharded

CMakeLists.txt

@@ -55,6 +55,10 @@ target_link_libraries(${LIB_TARGET_NAME} PUBLIC ThirdParty::nonstd boost_variant
 target_include_directories(${LIB_TARGET_NAME}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
+if(NOT MSVC)
+    target_compile_options(${LIB_TARGET_NAME} PRIVATE -Wall -Werror)
+endif()
+
 if (JINJA2CPP_BUILD_TESTS)
     enable_testing()
     add_subdirectory(thirdparty/gtest)

src/error_info.cpp

@@ -140,7 +140,7 @@ void RenderErrorInfo(std::basic_ostream<CharT>& os, const ErrorInfoTpl<CharT>& e
         if (extraParams.size() > 1)
         {
             os << UNIVERSAL_STR(". Expected: ");
-            for (int i = 1; i < extraParams.size(); ++ i)
+            for (std::size_t i = 1; i < extraParams.size(); ++ i)
             {
                 if (i != 1)
                     os << UNIVERSAL_STR(", ");

src/expression_evaluator.cpp

@@ -425,9 +425,9 @@ ParsedArguments ParseCallParamsImpl(const T& args, const CallParams& params, boo
         ++ argIdx;
     }
 
-    int startPosArg = firstMandatoryIdx == -1 ? 0 : firstMandatoryIdx;
-    int curPosArg = startPosArg;
-    int eatenPosArgs = 0;
+    std::size_t startPosArg = firstMandatoryIdx == -1 ? 0 : firstMandatoryIdx;
+    std::size_t curPosArg = startPosArg;
+    std::size_t eatenPosArgs = 0;
 
     // Determine the range for positional arguments scanning
     bool isFirstTime = true;
@@ -445,7 +445,7 @@ ParsedArguments ParseCallParamsImpl(const T& args, const CallParams& params, boo
         int prevNotFound = argsInfo[startPosArg].prevNotFound;
         if (prevNotFound != -1)
         {
-            startPosArg = prevNotFound;
+            startPosArg = static_cast<std::size_t>(prevNotFound);
         }
         else if (curPosArg == args.size())
         {
@@ -456,20 +456,20 @@ ParsedArguments ParseCallParamsImpl(const T& args, const CallParams& params, boo
             int nextPosArg = argsInfo[curPosArg].nextNotFound;
             if (nextPosArg == -1)
                 break;
-            curPosArg = nextPosArg;
+            curPosArg = static_cast<std::size_t>(nextPosArg);
         }
     }
 
     // Map positional params to the desired arguments
-    int curArg = startPosArg;
-    for (int idx = 0; idx < eatenPosArgs && curArg != -1; ++ idx, curArg = argsInfo[curArg].nextNotFound)
+    auto curArg = static_cast<int>(startPosArg);
+    for (std::size_t idx = 0; idx < eatenPosArgs && curArg != -1; ++ idx, curArg = argsInfo[curArg].nextNotFound)
     {
         result.args[argsInfo[curArg].info->name] = params.posParams[idx];
         argsInfo[curArg].state = Positional;
     }
 
     // Fill default arguments (if missing) and check for mandatory
-    for (int idx = 0; idx < argsInfo.size(); ++ idx)
+    for (std::size_t idx = 0; idx < argsInfo.size(); ++ idx)
     {
         auto& argInfo = argsInfo[idx];
         switch (argInfo.state)

src/filters.cpp

@@ -244,9 +244,9 @@ InternalValue DictSort::Filter(const InternalValue& baseVal, RenderContext& cont
 
     std::vector<KeyValuePair> tempVector;
     tempVector.reserve(map->GetSize());
-    for (int64_t idx = 0; idx < map->GetSize(); ++ idx)
+    for (std::size_t idx = 0; idx < map->GetSize(); ++ idx)
     {
-        auto val = map->GetValueByIndex(idx);
+        auto val = map->GetValueByIndex(static_cast<std::int64_t>(idx));
         auto kvVal = Get<KeyValuePair>(val);
         tempVector.push_back(std::move(kvVal));
     }
@@ -569,17 +569,6 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
         return ConvertToBool(cmpRes);
     };
 
-    auto equalComparator = [&attrName, &compType](auto& val1, auto& val2) {
-        InternalValue cmpRes;
-
-        if (IsEmpty(attrName))
-            cmpRes = Apply2<visitors::BinaryMathOperation>(val1, val2, BinaryExpression::LogicalEq, compType);
-        else
-            cmpRes = Apply2<visitors::BinaryMathOperation>(Subscript(val1, attrName), Subscript(val2, attrName), BinaryExpression::LogicalEq, compType);
-
-        return ConvertToBool(cmpRes);
-    };
-
     switch (m_mode)
     {
     case FirstItemMode:
@@ -618,7 +607,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
     case ReverseMode:
     {
         InternalValueList resultList(list.GetSize());
-        for (int n = 0; n < list.GetSize(); ++ n)
+        for (std::size_t n = 0; n < list.GetSize(); ++ n)
             resultList[list.GetSize() - n - 1] = list.GetValueByIndex(n);
 
         result = ListAdapter::CreateAdapter(std::move(resultList));

src/internal_value.h

@@ -294,7 +294,7 @@ class ListAdapter::Iterator
     void increment()
     {
         ++ m_current;
-        m_currentVal = m_current == m_list->GetSize() ? InternalValue() : m_list->GetValueByIndex(m_current);
+        m_currentVal = m_current == static_cast<int64_t>(m_list->GetSize()) ? InternalValue() : m_list->GetValueByIndex(m_current);
     }
 
     bool equal(const Iterator& other) const
@@ -303,7 +303,7 @@ class ListAdapter::Iterator
             return other.m_list == nullptr ? true : other.equal(*this);
 
         if (other.m_list == nullptr)
-            return m_current == m_list->GetSize();
+            return m_current == static_cast<int64_t>(m_list->GetSize());
 
         return this->m_list == other.m_list && this->m_current == other.m_current;
     }

src/lexertk.h

@@ -851,14 +851,12 @@ namespace lexertk
 
          ++s_itr_;
 
-         bool escaped_found = false;
          bool escaped       = false;
 
          while (!is_end(s_itr_))
          {
             if (!escaped && ('\\' == *s_itr_))
             {
-               escaped_found = true;
                escaped       = true;
                ++s_itr_;
 

src/string_converter_filter.cpp

@@ -162,6 +162,7 @@ StringConverter::StringConverter(FilterParams params, StringConverter::Mode mode
     case TruncateMode:
         ParseParams({{"length", false, static_cast<int64_t>(255)}, {"killwords", false, false}, {"end", false, std::string("...")}, {"leeway", false}}, params);
         break;
+    default: break;
     }
 }
 
@@ -245,12 +246,12 @@ InternalValue StringConverter::Filter(const InternalValue& baseVal, RenderContex
             auto killWords = ConvertToBool(this->GetArgumentValue("killwords", context));
             auto end = GetAsSameString(str, this->GetArgumentValue("end", context));
             auto leeway = ConvertToInt(this->GetArgumentValue("leeway", context), 5);
-            if (str.size() <= length)
+            if (static_cast<long long int>(str.size()) <= length)
                 return InternalValue(str);
 
             if (killWords)
             {
-                if (str.size() > (length + leeway))
+                if (static_cast<long long int>(str.size()) > (length + leeway))
                 {
                     str.erase(str.begin() + length, str.end());
                     str += end;

src/template_parser.h

@@ -701,7 +701,7 @@ class TemplateParser : public LexerHelper
 
         if (actualHeadLen == headLen)
         {
-            for (int i = 0; i < col - actualHeadLen - spacePrefixLen; ++ i)
+            for (std::size_t i = 0; i < col - actualHeadLen - spacePrefixLen; ++ i)
                 os << toCharT(' ');
         }
         for (int i = 0; i < actualHeadLen; ++ i)

src/testers.cpp

@@ -210,14 +210,14 @@ bool ValueTester::Test(const InternalValue& baseVal, RenderContext& context)
         if (valKind == ValueKind::Integer)
         {
             auto intVal = ConvertToInt(val);
-            result = testMode == (intVal & 1) == (EvenTest ? 0 : 1);
+            result = (testMode == (intVal & 1)) == (EvenTest ? 0 : 1);
         }
         else if (valKind == ValueKind::Double)
         {
             auto dblVal = ConvertToDouble(val);
             int64_t intVal = dblVal;
             if (dblVal == intVal)
-                result = testMode == (intVal & 1) == (EvenTest ? 0 : 1);
+                result = (testMode == (intVal & 1)) == (EvenTest ? 0 : 1);
         }
         return result;
     };

src/value_visitors.h

@@ -795,13 +795,8 @@ struct StringJoiner : BaseVisitor<>
     }
 };
 
-namespace
-{
-inline std::string GetSampleString();
-}
-
 template<typename Fn>
-struct StringConverterImpl : public BaseVisitor<decltype(std::declval<Fn>()(GetSampleString()))>
+struct StringConverterImpl : public BaseVisitor<decltype(std::declval<Fn>()(std::declval<std::string>()))>
 {
     using R = decltype(std::declval<Fn>()(std::string()));
     using BaseVisitor<R>::operator ();