Cleanup warnings

Author: flexferrum

CMakeLists.txt

@@ -29,7 +29,6 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES
     endif ()
 else ()
     # MSVC
-
     if (NOT DEFINED MSVC_RUNTIME_TYPE)
         set (MSVC_RUNTIME_TYPE "/MD")
     endif ()

src/expression_parser.cpp

@@ -126,11 +126,11 @@ ExpressionEvaluatorPtr<Expression> ExpressionParser::ParseLogicalCompare(LexScan
         break;
     case Token::Is:
     {
-        Token tok = lexer.NextToken();
-        if (tok != Token::Identifier)
+        Token nextTok = lexer.NextToken();
+        if (nextTok != Token::Identifier)
             return ExpressionEvaluatorPtr<Expression>();
 
-        std::string name = tok.value.asString();
+        std::string name = nextTok.value.asString();
         bool valid = true;
         CallParams params;
 

src/lexer.cpp

@@ -71,7 +71,7 @@ bool Lexer::Preprocess()
     return result;
 }
 
-bool Lexer::ProcessNumber(const lexertk::token& token, Token& newToken)
+bool Lexer::ProcessNumber(const lexertk::token&, Token& newToken)
 {
     newToken.type = Token::FloatNum;
     newToken.value = m_helper->GetAsValue(newToken.range, newToken.type);

src/lexer.h

@@ -20,6 +20,21 @@ struct Token
     enum Type
     {
         Unknown,
+
+        // One-symbol operators
+        Lt = '<',
+        Gt = '>',
+        Plus = '+',
+        Minus = '-',
+        Percent = '%',
+        Mul = '*',
+        Div = '/',
+        LBracket = '(',
+        RBracket = ')',
+        LSqBracket = '[',
+        RSqBracket = ']',
+        LCrlBracket = '{',
+        RCrlBracket = '}',
         Eof = 256,
 
         // General

src/renderer.h

@@ -49,7 +49,7 @@ class RawTextRenderer : public RendererBase
     {
     }
 
-    void Render(OutStream& os, RenderContext& values) override
+    void Render(OutStream& os, RenderContext&) override
     {
         os.WriteChunk(m_offset, m_length);
     }

src/statements.cpp

@@ -120,7 +120,7 @@ void ElseBranchStatement::Render(OutStream& os, RenderContext& values)
     m_mainBody->Render(os, values);
 }
 
-void SetStatement::Render(OutStream& os, RenderContext& values)
+void SetStatement::Render(OutStream&, RenderContext& values)
 {
    if (m_expr)
    {

src/template_parser.cpp

@@ -87,7 +87,7 @@ bool StatementsParser::ParseFor(LexScanner& lexer, StatementInfoList& statements
     return true;
 }
 
-bool StatementsParser::ParseEndFor(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)
+bool StatementsParser::ParseEndFor(LexScanner& /*lexer*/, StatementInfoList& statementsInfo, size_t /*pos*/)
 {
     if (statementsInfo.empty())
         return false;
@@ -121,7 +121,7 @@ bool StatementsParser::ParseIf(LexScanner& lexer, StatementInfoList& statementsI
     return true;
 }
 
-bool StatementsParser::ParseElse(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)
+bool StatementsParser::ParseElse(LexScanner& /*lexer*/, StatementInfoList& statementsInfo, size_t pos)
 {
     auto renderer = std::make_shared<ElseBranchStatement>(ExpressionEvaluatorPtr<>());
     StatementInfo statementInfo = StatementInfo::Create(StatementInfo::ElseIfStatement, pos);
@@ -144,7 +144,7 @@ bool StatementsParser::ParseElIf(LexScanner& lexer, StatementInfoList& statement
     return true;
 }
 
-bool StatementsParser::ParseEndIf(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)
+bool StatementsParser::ParseEndIf(LexScanner& /*lexer*/, StatementInfoList& statementsInfo, size_t /*pos*/)
 {
     if (statementsInfo.empty())
         return false;
@@ -178,7 +178,7 @@ bool StatementsParser::ParseEndIf(LexScanner& lexer, StatementInfoList& statemen
     return true;
 }
 
-bool StatementsParser::ParseSet(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)
+bool StatementsParser::ParseSet(LexScanner& lexer, StatementInfoList& statementsInfo, size_t /*pos*/)
 {
     std::vector<std::string> vars;
 
@@ -220,7 +220,7 @@ bool StatementsParser::ParseSet(LexScanner& lexer, StatementInfoList& statements
     return true;
 }
 
-bool StatementsParser::ParseEndSet(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)
+bool StatementsParser::ParseEndSet(LexScanner& /*lexer*/, StatementInfoList& /*statementsInfo*/, size_t /*pos*/)
 {
     return false;
 }

src/template_parser.h

@@ -124,7 +124,7 @@ struct ParserTraits<wchar_t>
 #endif
         return result;
     }
-    static Value RangeToNum(const std::wstring& str, CharRange rante, Token::Type hint)
+    static Value RangeToNum(const std::wstring& /*str*/, CharRange /*range*/, Token::Type /*hint*/)
     {
         return Value();
     }
@@ -270,7 +270,7 @@ class TemplateParser : public LexerHelper
 
         return true;
     }
-    bool ParseRoughMatch(sregex_iterator& curMatch, const sregex_iterator& endMatch)
+    bool ParseRoughMatch(sregex_iterator& curMatch, const sregex_iterator& /*endMatch*/)
     {
         auto& match = *curMatch;
         int matchType = RM_Unknown;
@@ -502,7 +502,7 @@ class TemplateParser : public LexerHelper
 
         return Token::Unknown;
     }
-    char GetCharAt(size_t pos) override
+    char GetCharAt(size_t /*pos*/) override
     {
         return '\0';
     }

src/testers.cpp

@@ -6,7 +6,7 @@ namespace jinja2
 namespace testers
 {
 
-bool Defined::Test(const Value& baseVal, RenderContext& context)
+bool Defined::Test(const Value& baseVal, RenderContext& /*context*/)
 {
     return boost::get<EmptyValue>(&baseVal.data()) == nullptr;
 }

src/value.cpp

@@ -64,12 +64,12 @@ struct ValueRenderer : boost::static_visitor<std::string>
         return result;
     }
 
-    std::string operator() (const GenericMap& val) const
+    std::string operator() (const GenericMap& /*val*/) const
     {
         return "";
     }
 
-    std::string operator() (const GenericList& val) const
+    std::string operator() (const GenericList& /*val*/) const
     {
         return "";
     }
@@ -125,20 +125,10 @@ struct SubscriptionVisitor : public boost::static_visitor<Value>
     }
 
     template<typename T, typename U>
-    Value operator() (T&& first, U&& second) const
+    Value operator() (T&& /*first*/, U&& /*second*/) const
     {
-        return Test<U>::Foo(first);
+        return Value();
     }
-
-    template<typename U>
-    struct Test
-    {
-        template<typename T>
-        static Value Foo(T&&)
-        {
-            return Value();
-        }
-    };
 };
 
 } //