Merge pull request #88 from SofiaCPP/feature/clang-tidy

Feature support running clang-tidy

1 files changed, 25 insertions, 22 deletions

diff --git a/JSImpl/src/Parser.cpp b/JSImpl/src/Parser.cpp
index 4bc97ce..8f415fb 100644
--- a/JSImpl/src/Parser.cpp
+++ b/JSImpl/src/Parser.cpp
@@ -140,7 +140,8 @@ ExpressionPtr Parser::PrimaryExpression(NormalType a)
 {
 	if (a == NormalType::Initial)
 	{
-		return SimpleExpression();
+		auto simple = SimpleExpression();
+		return simple;
 	}
 
 	if (auto simple = SimpleExpression())
@@ -373,12 +374,12 @@ ExpressionPtr Parser::LeftSideExpression(NormalType a)
 {
 	ExpressionPtr result;
 	auto ss = Snapshot();
-	if (result = CallExpression(a))
+	if ((result = CallExpression(a)))
 	{
 		return result;
 	}
 	Restore(ss);
-	if (result = ShortNewExpression())
+	if ((result = ShortNewExpression()))
 	{
 		return result;
 	}
@@ -464,12 +465,12 @@ ExpressionPtr Parser::ShortNewSubexpression()
 {
 	ExpressionPtr result;
 	auto ss = Snapshot();
-	if (result = FullNewSubexpression())
+	if ((result = FullNewSubexpression()))
 	{
 		return result;
 	}
 	Restore(ss);
-	if (result = ShortNewExpression())
+	if ((result = ShortNewExpression()))
 	{
 		return result;
 	}
@@ -490,7 +491,7 @@ ExpressionPtr Parser::FullNewExpression()
 ExpressionPtr Parser::FullNewSubexpression()
 {
 	ExpressionPtr result;
-	if (result = PrimaryExpression(NormalType::Normal))
+	if ((result = PrimaryExpression(NormalType::Normal)))
 	{
 		return result;
 	}
@@ -682,9 +683,11 @@ ExpressionPtr Parser::ConditionalExpression(NormalType a, AllowType b)
 	if (Match(TokenType::QuestionMark))
 	{
 		auto trueExpr= AssignmentExpression(NormalType::Normal, b);
+		(void)trueExpr;
 		if (Match(TokenType::Colon))
 		{
 			auto falseExpr = AssignmentExpression(NormalType::Normal, b);
+			(void)falseExpr;
 			// TODO implement trinary operator
 			assert(false);
 			return ExpressionPtr();
@@ -764,22 +767,22 @@ ExpressionPtr Parser::Expression(NormalType a, AllowType b)
 ExpressionPtr Parser::Statement()
 {
 	ExpressionPtr result;
-	if (result = EmptyStatement()) return result;
-	if (result = Expression(NormalType::Initial, AllowType::AllowIn)) return result;
-	if (result = VariableDefinition(AllowType::AllowIn)) return result;
-	if (result = Block()) return result;
-	if (result = LabeledStatement()) return result;
-	if (result = IfStatementfull()) return result;
-	if (result = SwitchStatement()) return result;
-	if (result = DoStatement()) return result;
-	if (result = WhileStatement()) return result;
-	if (result = ForStatement()) return result;
-	if (result = WithStatement()) return result;
-	if (result = ContinueStatement()) return result;
-	if (result = BreakStatement()) return result;
-	if (result = OptionalLabel()) return result;
-	if (result = ReturnStatement()) return result;
-	if (result = TryStatement()) return result;
+	if ((result = EmptyStatement())) return result;
+	if ((result = Expression(NormalType::Initial, AllowType::AllowIn))) return result;
+	if ((result = VariableDefinition(AllowType::AllowIn))) return result;
+	if ((result = Block())) return result;
+	if ((result = LabeledStatement())) return result;
+	if ((result = IfStatementfull())) return result;
+	if ((result = SwitchStatement())) return result;
+	if ((result = DoStatement())) return result;
+	if ((result = WhileStatement())) return result;
+	if ((result = ForStatement())) return result;
+	if ((result = WithStatement())) return result;
+	if ((result = ContinueStatement())) return result;
+	if ((result = BreakStatement())) return result;
+	if ((result = OptionalLabel())) return result;
+	if ((result = ReturnStatement())) return result;
+	if ((result = TryStatement())) return result;
 	return result;
 }