Cleanup warnings

flexferrum · flexferrum · commit fe8e7f9d7c6d · 2018-05-05T01:23:48.000+03:00
diff --git a/CMakeLists.txt b/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 ()
diff --git a/src/expression_parser.cpp b/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;
 
diff --git a/src/lexer.cpp b/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);
diff --git a/src/lexer.h b/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
diff --git a/src/renderer.h b/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);
     }
diff --git a/src/statements.cpp b/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)
    {
diff --git a/src/template_parser.cpp b/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;
 }
diff --git a/src/template_parser.h b/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';
     }
diff --git a/src/testers.cpp b/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;
 }
diff --git a/src/value.cpp b/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();
-        }
-    };
 };
 
 } //

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ bool Lexer::Preprocess()`
`71`	`71`	`return result;`
`72`	`72`	`}`
`73`	`73`
`74`		`-bool Lexer::ProcessNumber(const lexertk::token& token, Token& newToken)`
	`74`	`+bool Lexer::ProcessNumber(const lexertk::token&, Token& newToken)`
`75`	`75`	`{`
`76`	`76`	`newToken.type = Token::FloatNum;`
`77`	`77`	`newToken.value = m_helper->GetAsValue(newToken.range, newToken.type);`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class RawTextRenderer : public RendererBase`
`49`	`49`	`{`
`50`	`50`	`}`
`51`	`51`
`52`		`- void Render(OutStream& os, RenderContext& values) override`
	`52`	`+ void Render(OutStream& os, RenderContext&) override`
`53`	`53`	`{`
`54`	`54`	`os.WriteChunk(m_offset, m_length);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ void ElseBranchStatement::Render(OutStream& os, RenderContext& values)`
`120`	`120`	`m_mainBody->Render(os, values);`
`121`	`121`	`}`
`122`	`122`
`123`		`-void SetStatement::Render(OutStream& os, RenderContext& values)`
	`123`	`+void SetStatement::Render(OutStream&, RenderContext& values)`
`124`	`124`	`{`
`125`	`125`	`if (m_expr)`
`126`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ bool StatementsParser::ParseFor(LexScanner& lexer, StatementInfoList& statements`
`87`	`87`	`return true;`
`88`	`88`	`}`
`89`	`89`
`90`		`-bool StatementsParser::ParseEndFor(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)`
	`90`	`+bool StatementsParser::ParseEndFor(LexScanner& /lexer/, StatementInfoList& statementsInfo, size_t /pos/)`
`91`	`91`	`{`
`92`	`92`	`if (statementsInfo.empty())`
`93`	`93`	`return false;`
`@@ -121,7 +121,7 @@ bool StatementsParser::ParseIf(LexScanner& lexer, StatementInfoList& statementsI`
`121`	`121`	`return true;`
`122`	`122`	`}`
`123`	`123`
`124`		`-bool StatementsParser::ParseElse(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)`
	`124`	`+bool StatementsParser::ParseElse(LexScanner& /lexer/, StatementInfoList& statementsInfo, size_t pos)`
`125`	`125`	`{`
`126`	`126`	`auto renderer = std::make_shared<ElseBranchStatement>(ExpressionEvaluatorPtr<>());`
`127`	`127`	`StatementInfo statementInfo = StatementInfo::Create(StatementInfo::ElseIfStatement, pos);`
`@@ -144,7 +144,7 @@ bool StatementsParser::ParseElIf(LexScanner& lexer, StatementInfoList& statement`
`144`	`144`	`return true;`
`145`	`145`	`}`
`146`	`146`
`147`		`-bool StatementsParser::ParseEndIf(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)`
	`147`	`+bool StatementsParser::ParseEndIf(LexScanner& /lexer/, StatementInfoList& statementsInfo, size_t /pos/)`
`148`	`148`	`{`
`149`	`149`	`if (statementsInfo.empty())`
`150`	`150`	`return false;`
`@@ -178,7 +178,7 @@ bool StatementsParser::ParseEndIf(LexScanner& lexer, StatementInfoList& statemen`
`178`	`178`	`return true;`
`179`	`179`	`}`
`180`	`180`
`181`		`-bool StatementsParser::ParseSet(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)`
	`181`	`+bool StatementsParser::ParseSet(LexScanner& lexer, StatementInfoList& statementsInfo, size_t /pos/)`
`182`	`182`	`{`
`183`	`183`	`std::vector<std::string> vars;`
`184`	`184`
`@@ -220,7 +220,7 @@ bool StatementsParser::ParseSet(LexScanner& lexer, StatementInfoList& statements`
`220`	`220`	`return true;`
`221`	`221`	`}`
`222`	`222`
`223`		`-bool StatementsParser::ParseEndSet(LexScanner& lexer, StatementInfoList& statementsInfo, size_t pos)`
	`223`	`+bool StatementsParser::ParseEndSet(LexScanner& /lexer/, StatementInfoList& /statementsInfo/, size_t /pos/)`
`224`	`224`	`{`
`225`	`225`	`return false;`
`226`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ struct ParserTraits<wchar_t>`
`124`	`124`	`#endif`
`125`	`125`	`return result;`
`126`	`126`	`}`
`127`		`- static Value RangeToNum(const std::wstring& str, CharRange rante, Token::Type hint)`
	`127`	`+ static Value RangeToNum(const std::wstring& /str/, CharRange /range/, Token::Type /hint/)`
`128`	`128`	`{`
`129`	`129`	`return Value();`
`130`	`130`	`}`
`@@ -270,7 +270,7 @@ class TemplateParser : public LexerHelper`
`270`	`270`
`271`	`271`	`return true;`
`272`	`272`	`}`
`273`		`- bool ParseRoughMatch(sregex_iterator& curMatch, const sregex_iterator& endMatch)`
	`273`	`+ bool ParseRoughMatch(sregex_iterator& curMatch, const sregex_iterator& /endMatch/)`
`274`	`274`	`{`
`275`	`275`	`auto& match = *curMatch;`
`276`	`276`	`int matchType = RM_Unknown;`
`@@ -502,7 +502,7 @@ class TemplateParser : public LexerHelper`
`502`	`502`
`503`	`503`	`return Token::Unknown;`
`504`	`504`	`}`
`505`		`- char GetCharAt(size_t pos) override`
	`505`	`+ char GetCharAt(size_t /pos/) override`
`506`	`506`	`{`
`507`	`507`	`return '\0';`
`508`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace jinja2`
`6`	`6`	`namespace testers`
`7`	`7`	`{`
`8`	`8`
`9`		`-bool Defined::Test(const Value& baseVal, RenderContext& context)`
	`9`	`+bool Defined::Test(const Value& baseVal, RenderContext& /context/)`
`10`	`10`	`{`
`11`	`11`	`return boost::get<EmptyValue>(&baseVal.data()) == nullptr;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,12 @@ struct ValueRenderer : boost::static_visitor<std::string>`
`64`	`64`	`return result;`
`65`	`65`	`}`
`66`	`66`
`67`		`- std::string operator() (const GenericMap& val) const`
	`67`	`+ std::string operator() (const GenericMap& /val/) const`
`68`	`68`	`{`
`69`	`69`	`return "";`
`70`	`70`	`}`
`71`	`71`
`72`		`- std::string operator() (const GenericList& val) const`
	`72`	`+ std::string operator() (const GenericList& /val/) const`
`73`	`73`	`{`
`74`	`74`	`return "";`
`75`	`75`	`}`
`@@ -125,20 +125,10 @@ struct SubscriptionVisitor : public boost::static_visitor<Value>`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`template<typename T, typename U>`
`128`		`- Value operator() (T&& first, U&& second) const`
	`128`	`+ Value operator() (T&& /first/, U&& /second/) const`
`129`	`129`	`{`
`130`		`- return Test<U>::Foo(first);`
	`130`	`+ return Value();`
`131`	`131`	`}`
`132`		`-`
`133`		`- template<typename U>`
`134`		`- struct Test`
`135`		`- {`
`136`		`- template<typename T>`
`137`		`- static Value Foo(T&&)`
`138`		`- {`
`139`		`- return Value();`
`140`		`- }`
`141`		`- };`
`142`	`132`	`};`
`143`	`133`
`144`	`134`	`} //`