forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #691 from BBasile/dparse-attrib-inloop 

Update dparse to fix possible infinite loop and adapt to ParameterAttribute
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-08-30 11:52:03 +02:00 committed by GitHub
parent 1b3d90d6b2 7494c5fb14
commit ed5bfe7269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -12,7 +12,7 @@
"StdLoggerDisableWarning" "StdLoggerDisableWarning"
], ],
"dependencies" : { "dependencies" : {
"libdparse" : "~>0.9.2", "libdparse" : "~>0.9.3",
"dsymbol" : "~>0.4.1", "dsymbol" : "~>0.4.1",
"inifiled" : "~>1.3.1", "inifiled" : "~>1.3.1",
"emsi_containers" : "~>0.8.0-alpha.7", "emsi_containers" : "~>0.8.0-alpha.7",

2
libdparse

@ -1 +1 @@
Subproject commit d9490f114cc1d0d2ea74662da61ebc2714c0b82b Subproject commit f04bd575fdcabf3f7934a63a0819e37d1ef4a9e3

4
src/dscanner/analysis/auto_ref_assignment.d
View File

@ -41,8 +41,8 @@ final class AutoRefAssignmentCheck : BaseAnalyzer
{ {
import std.algorithm.searching : canFind; import std.algorithm.searching : canFind;
immutable bool isAuto = param.parameterAttributes.canFind(cast(ubyte) tok!"auto"); immutable bool isAuto = param.parameterAttributes.canFind!(a => a.idType == cast(ubyte) tok!"auto");
immutable bool isRef = param.parameterAttributes.canFind(cast(ubyte) tok!"ref"); immutable bool isRef = param.parameterAttributes.canFind!(a => a.idType == cast(ubyte) tok!"ref");
if (!isAuto || !isRef) if (!isAuto || !isRef)
return; return;
addSymbol(param.name.text); addSymbol(param.name.text);

2
src/dscanner/analysis/unused.d
View File

@ -324,7 +324,7 @@ final class UnusedVariableCheck : BaseAnalyzer
if (parameter.name != tok!"") if (parameter.name != tok!"")
{ {
immutable bool isRef = !parameter.parameterAttributes immutable bool isRef = !parameter.parameterAttributes
.filter!(a => a.among(tok!"ref", tok!"out")).empty; .filter!(a => a.idType.among(tok!"ref", tok!"out")).empty;
immutable bool isPtr = parameter.type && !parameter.type immutable bool isPtr = parameter.type && !parameter.type
.typeSuffixes.filter!(a => a.star != tok!"").empty; .typeSuffixes.filter!(a => a.star != tok!"").empty;

14
src/dscanner/astprinter.d
View File

@ -675,15 +675,21 @@ class XMLPrinter : ASTVisitor
output.writeln("</orOrExpression>"); output.writeln("</orOrExpression>");
} }
override void visit(const ParameterAttribute pa)
{
output.writeln("<parameterAttribute>");
if (pa.atAttribute)
visit(pa.atAttribute);
else
writeln(str(pa.idType));
output.writeln("</parameterAttribute>");
}
override void visit(const Parameter param) override void visit(const Parameter param)
{ {
output.writeln("<parameter>"); output.writeln("<parameter>");
if (param.name.type == tok!"identifier") if (param.name.type == tok!"identifier")
writeName(param.name.text); writeName(param.name.text);
foreach (attribute; param.parameterAttributes)
{
output.writeln("<parameterAttribute>", str(attribute), "</parameterAttribute>");
}
param.accept(this); param.accept(this);
if (param.vararg) if (param.vararg)
output.writeln("<vararg/>"); output.writeln("<vararg/>");