Kaydet (Commit) 3ef7e85d authored tarafından Noel Grandin's avatar Noel Grandin

remove some dead code from unusedfields plugin

Change-Id: I268b32270a17c0c3fcf8236c3e0eebac9a57cb5d
üst 6feb40b9
...@@ -60,7 +60,6 @@ bool operator < (const MyFieldInfo &lhs, const MyFieldInfo &rhs) ...@@ -60,7 +60,6 @@ bool operator < (const MyFieldInfo &lhs, const MyFieldInfo &rhs)
// try to limit the voluminous output a little // try to limit the voluminous output a little
static std::set<MyFieldInfo> touchedFromInsideSet; static std::set<MyFieldInfo> touchedFromInsideSet;
static std::set<MyFieldInfo> touchedFromConstructorSet;
static std::set<MyFieldInfo> touchedFromOutsideSet; static std::set<MyFieldInfo> touchedFromOutsideSet;
static std::set<MyFieldInfo> readFromSet; static std::set<MyFieldInfo> readFromSet;
static std::set<MyFieldInfo> definitionSet; static std::set<MyFieldInfo> definitionSet;
...@@ -102,8 +101,6 @@ void UnusedFields::run() ...@@ -102,8 +101,6 @@ void UnusedFields::run()
std::string output; std::string output;
for (const MyFieldInfo & s : touchedFromInsideSet) for (const MyFieldInfo & s : touchedFromInsideSet)
output += "inside:\t" + s.parentClass + "\t" + s.fieldName + "\n"; output += "inside:\t" + s.parentClass + "\t" + s.fieldName + "\n";
for (const MyFieldInfo & s : touchedFromConstructorSet)
output += "constructor:\t" + s.parentClass + "\t" + s.fieldName + "\n";
for (const MyFieldInfo & s : touchedFromOutsideSet) for (const MyFieldInfo & s : touchedFromOutsideSet)
output += "outside:\t" + s.parentClass + "\t" + s.fieldName + "\n"; output += "outside:\t" + s.parentClass + "\t" + s.fieldName + "\n";
for (const MyFieldInfo & s : readFromSet) for (const MyFieldInfo & s : readFromSet)
...@@ -489,9 +486,6 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp ...@@ -489,9 +486,6 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp
// ignore move/copy operator, it's self->self // ignore move/copy operator, it's self->self
} else if (constructorDecl && (constructorDecl->isCopyConstructor() || constructorDecl->isMoveConstructor())) { } else if (constructorDecl && (constructorDecl->isCopyConstructor() || constructorDecl->isMoveConstructor())) {
// ignore move/copy constructor, it's self->self // ignore move/copy constructor, it's self->self
} else if (constructorDecl && memberExprParentFunction->getParent() == fieldDecl->getParent()) {
// if the field is touched from inside it's parent class constructor
touchedFromConstructorSet.insert(fieldInfo);
} else { } else {
if (memberExprParentFunction->getParent() == fieldDecl->getParent()) { if (memberExprParentFunction->getParent() == fieldDecl->getParent()) {
touchedFromInsideSet.insert(fieldInfo); touchedFromInsideSet.insert(fieldInfo);
......
...@@ -9,7 +9,6 @@ protectedAndPublicDefinitionSet = set() # set of tuple(type, name) ...@@ -9,7 +9,6 @@ protectedAndPublicDefinitionSet = set() # set of tuple(type, name)
definitionToSourceLocationMap = dict() definitionToSourceLocationMap = dict()
definitionToTypeMap = dict() definitionToTypeMap = dict()
touchedFromInsideSet = set() touchedFromInsideSet = set()
touchedFromConstructorSet = set()
readFromSet = set() readFromSet = set()
sourceLocationSet = set() sourceLocationSet = set()
touchedFromOutsideSet = set() touchedFromOutsideSet = set()
...@@ -48,8 +47,6 @@ with io.open("loplugin.unusedfields.log", "rb", buffering=1024*1024) as txt: ...@@ -48,8 +47,6 @@ with io.open("loplugin.unusedfields.log", "rb", buffering=1024*1024) as txt:
definitionToSourceLocationMap[fieldInfo] = tokens[5] definitionToSourceLocationMap[fieldInfo] = tokens[5]
elif tokens[0] == "inside:": elif tokens[0] == "inside:":
touchedFromInsideSet.add(parseFieldInfo(tokens)) touchedFromInsideSet.add(parseFieldInfo(tokens))
elif tokens[0] == "constructor:":
touchedFromConstructorSet.add(parseFieldInfo(tokens))
elif tokens[0] == "outside:": elif tokens[0] == "outside:":
touchedFromOutsideSet.add(parseFieldInfo(tokens)) touchedFromOutsideSet.add(parseFieldInfo(tokens))
elif tokens[0] == "read:": elif tokens[0] == "read:":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment