Added some checks for default constructors
This commit is contained in:
parent
eec45fe608
commit
df92a4d722
|
@ -0,0 +1,86 @@
|
||||||
|
module analysis.constructors;
|
||||||
|
|
||||||
|
import stdx.d.ast;
|
||||||
|
import stdx.d.lexer;
|
||||||
|
import analysis.base;
|
||||||
|
|
||||||
|
class ConstructorCheck : BaseAnalyzer
|
||||||
|
{
|
||||||
|
alias visit = BaseAnalyzer.visit;
|
||||||
|
|
||||||
|
this(string fileName)
|
||||||
|
{
|
||||||
|
super(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
|
override void visit(const ClassDeclaration classDeclaration)
|
||||||
|
{
|
||||||
|
bool oldHasDefault = hasDefaultArgConstructor;
|
||||||
|
bool oldHasNoArg = hasNoArgConstructor;
|
||||||
|
hasNoArgConstructor = false;
|
||||||
|
hasDefaultArgConstructor = false;
|
||||||
|
State prev = state;
|
||||||
|
state = State.inClass;
|
||||||
|
classDeclaration.accept(this);
|
||||||
|
if (hasNoArgConstructor && hasDefaultArgConstructor)
|
||||||
|
{
|
||||||
|
addErrorMessage(classDeclaration.name.line,
|
||||||
|
classDeclaration.name.column, "This class has a zero-argument"
|
||||||
|
~ " constructor as well as a constructor with one default"
|
||||||
|
~ " argument. This can be confusing");
|
||||||
|
}
|
||||||
|
hasDefaultArgConstructor = oldHasDefault;
|
||||||
|
hasNoArgConstructor = oldHasNoArg;
|
||||||
|
state = prev;
|
||||||
|
}
|
||||||
|
|
||||||
|
override void visit(const StructDeclaration structDeclaration)
|
||||||
|
{
|
||||||
|
State prev = state;
|
||||||
|
state = State.inStruct;
|
||||||
|
structDeclaration.accept(this);
|
||||||
|
state = prev;
|
||||||
|
}
|
||||||
|
|
||||||
|
override void visit(const Constructor constructor)
|
||||||
|
{
|
||||||
|
final switch (state)
|
||||||
|
{
|
||||||
|
case State.inStruct:
|
||||||
|
if (constructor.parameters.parameters.length == 1
|
||||||
|
&& constructor.parameters.parameters[0].default_ !is null)
|
||||||
|
{
|
||||||
|
addErrorMessage(constructor.line, constructor.column,
|
||||||
|
"This struct constructor can never be called with its "
|
||||||
|
~ "default argument.");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case State.inClass:
|
||||||
|
if (constructor.parameters.parameters.length == 1
|
||||||
|
&& constructor.parameters.parameters[0].default_ !is null)
|
||||||
|
{
|
||||||
|
hasDefaultArgConstructor = true;
|
||||||
|
}
|
||||||
|
else if (constructor.parameters.parameters.length == 0)
|
||||||
|
hasNoArgConstructor = true;
|
||||||
|
break;
|
||||||
|
case State.ignoring:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
enum State: ubyte
|
||||||
|
{
|
||||||
|
ignoring,
|
||||||
|
inClass,
|
||||||
|
inStruct
|
||||||
|
}
|
||||||
|
|
||||||
|
State state;
|
||||||
|
|
||||||
|
bool hasNoArgConstructor;
|
||||||
|
bool hasDefaultArgConstructor;
|
||||||
|
}
|
|
@ -20,6 +20,7 @@ import analysis.fish;
|
||||||
import analysis.numbers;
|
import analysis.numbers;
|
||||||
import analysis.objectconst;
|
import analysis.objectconst;
|
||||||
import analysis.range;
|
import analysis.range;
|
||||||
|
import analysis.constructors;
|
||||||
|
|
||||||
void messageFunction(string fileName, size_t line, size_t column, string message,
|
void messageFunction(string fileName, size_t line, size_t column, string message,
|
||||||
bool isError)
|
bool isError)
|
||||||
|
@ -70,6 +71,7 @@ void analyze(File output, string[] fileNames, bool staticAnalyze = true)
|
||||||
checks ~= new NumberStyleCheck(fileName);
|
checks ~= new NumberStyleCheck(fileName);
|
||||||
checks ~= new ObjectConstCheck(fileName);
|
checks ~= new ObjectConstCheck(fileName);
|
||||||
checks ~= new BackwardsRangeCheck(fileName);
|
checks ~= new BackwardsRangeCheck(fileName);
|
||||||
|
checks ~= new ConstructorCheck(fileName);
|
||||||
|
|
||||||
foreach (check; checks)
|
foreach (check; checks)
|
||||||
{
|
{
|
||||||
|
|
|
@ -955,6 +955,8 @@ public:
|
||||||
/** */ MemberFunctionAttribute[] memberFunctionAttributes;
|
/** */ MemberFunctionAttribute[] memberFunctionAttributes;
|
||||||
/** */ TemplateParameters templateParameters;
|
/** */ TemplateParameters templateParameters;
|
||||||
/** */ size_t location;
|
/** */ size_t location;
|
||||||
|
/** */ size_t line;
|
||||||
|
/** */ size_t column;
|
||||||
/** */ string comment;
|
/** */ string comment;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1468,6 +1468,8 @@ class ClassFour(A, B) if (someTest()) : Super {}}c;
|
||||||
auto t = expect(tok!"this");
|
auto t = expect(tok!"this");
|
||||||
if (t is null) return null;
|
if (t is null) return null;
|
||||||
node.location = t.index;
|
node.location = t.index;
|
||||||
|
node.line = t.line;
|
||||||
|
node.column = t.column;
|
||||||
auto p = peekPastParens();
|
auto p = peekPastParens();
|
||||||
bool isTemplate = false;
|
bool isTemplate = false;
|
||||||
if (p !is null && p.type == tok!"(")
|
if (p !is null && p.type == tok!"(")
|
||||||
|
|
Loading…
Reference in New Issue