This is an archive of the discontinued LLVM Phabricator instance.

Differential D7088

[Clang Tidy]: Minor cleanups in readability-container-size-empty checker
ClosedPublic

Authored by xazax.hun on Jan 21 2015, 3:45 AM.

Download Raw Diff

Details

Reviewers

alexfh

Summary

Minor cleanups in readability-container-size-empty checker:

Removed an unused header
Simplified the custom ast_matchers

Diff Detail

Event Timeline

xazax.hun updated this revision to Diff 18498.Jan 21 2015, 3:45 AM

xazax.hun retitled this revision from to [Clang Tidy]: Minor cleanups in readability-container-size-empty checker.

xazax.hun updated this object.

xazax.hun edited the test plan for this revision. (Show Details)

xazax.hun added a reviewer: alexfh.

xazax.hun added a subscriber: Unknown Object (MLST).

One more simplification in the ast_matcher expression.

Looks good!

I'll submit the patch for you.

This revision is now accepted and ready to land.Jan 22 2015, 4:25 AM

Committed revision 226810.

Revision Contents

Path

Size

clang-tidy/

readability/

ContainerSizeEmpty.cpp

19 lines

Diff 18506

clang-tidy/readability/ContainerSizeEmpty.cpp

Context not available.

	#include "clang/AST/ASTContext.h"	#include "clang/AST/ASTContext.h"
	#include "clang/ASTMatchers/ASTMatchers.h"	#include "clang/ASTMatchers/ASTMatchers.h"
	#include "clang/ASTMatchers/ASTMatchersInternal.h"
	#include "clang/Lex/Lexer.h"	#include "clang/Lex/Lexer.h"

	using namespace clang::ast_matchers;	using namespace clang::ast_matchers;
Context not available.

	namespace clang {	namespace clang {
	namespace ast_matchers {	namespace ast_matchers {
	AST_MATCHER_P(QualType, unqualifiedType, internal::Matcher<Type>,	AST_MATCHER(QualType, isBoolType) { return Node->isBooleanType(); }
	InnerMatcher) {
	return InnerMatcher.matches(*Node, Finder, Builder);
	}

	AST_MATCHER(Type, isBoolType) { return Node.isBooleanType(); }

	AST_MATCHER(NamedDecl, stlContainer) {	AST_MATCHER(NamedDecl, stlContainer) {
	return isContainer(Node.getQualifiedNameAsString());	return isContainer(Node.getQualifiedNameAsString());
	}	}
Context not available.
	hasLHS(integerLiteral(equals(1)))))))	hasLHS(integerLiteral(equals(1)))))))
	.bind("SizeBinaryOp")),	.bind("SizeBinaryOp")),
	hasParent(implicitCastExpr(	hasParent(implicitCastExpr(
	hasImplicitDestinationType(unqualifiedType(isBoolType())),	hasImplicitDestinationType(isBoolType()),
	anyOf(	anyOf(
	hasParent(unaryOperator(hasOperatorName("!")).bind("NegOnSize")),	hasParent(unaryOperator(hasOperatorName("!")).bind("NegOnSize")),
	anything()))),	anything()))),
	hasParent(	hasParent(explicitCastExpr(hasDestinationType(isBoolType()))));
	explicitCastExpr(hasDestinationType(unqualifiedType(isBoolType())))));

	Finder->addMatcher(	Finder->addMatcher(
	memberCallExpr(	memberCallExpr(
	on(expr(anyOf(hasType(namedDecl(stlContainer())),	on(expr(anyOf(hasType(namedDecl(stlContainer())),
	hasType(qualType(pointsTo(namedDecl(stlContainer())))),	hasType(pointsTo(namedDecl(stlContainer()))),
	hasType(qualType(references(	hasType(references(namedDecl(stlContainer())))))
	namedDecl(stlContainer())))))).bind("STLObject")),	.bind("STLObject")),
	callee(methodDecl(hasName("size"))), WrongUse).bind("SizeCallExpr"),	callee(methodDecl(hasName("size"))), WrongUse).bind("SizeCallExpr"),
	this);	this);
	}	}
Context not available.