forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

104, detect template prms in operands that are not part of a func call

This commit is contained in:
Basile Burg 2017-01-19 06:44:37 +01:00
parent 52f9eb4324
commit 1111f43172
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dastworx/src/halstead.d
View File

@ -160,6 +160,21 @@ private final class HalsteadMetric: ASTVisitor
functionNesting--;
}
override void visit(const(TemplateArguments) ta)
{
ta.accept(this);
if (ta.templateSingleArgument)
{
if (!isLiteral(ta.templateSingleArgument.token.type))
++operands[ta.templateSingleArgument.token.text];
else
{
import std.digest.crc: crc32Of, toHexString;
++operands["literal" ~ ta.templateSingleArgument.token.text.crc32Of.toHexString.idup];
}
}
}
override void visit(const(FunctionCallExpression) expr)
{
@ -273,7 +288,6 @@ private final class HalsteadMetric: ASTVisitor
++operands[expr.identifierOrTemplateInstance.identifier.text];
else
++operands[expr.identifierOrTemplateInstance.templateInstance.identifier.text];
}
}
@ -1184,7 +1198,6 @@ unittest
unittest
{
//FIXME: single template param without parens not detected
Function r =
q{
void foo()
@ -1192,7 +1205,7 @@ unittest
a.b!8.c = f;
}
}.test;
//assert(r.operandsKinds == 5);
assert(r.operandsKinds == 5);
assert(r.operatorsKinds == 2);
}