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

Update to new libdparse

This commit is contained in:
Hackerpilot 2014-12-15 22:42:22 +00:00
parent f00026fde7
commit d1a7424a36
12 changed files with 1036 additions and 1079 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdparse

@ -1 +1 @@
Subproject commit 4e270c212daf0d2b55843604ecbdd1dcbd399a37
Subproject commit ccd01946add011c49e5cf92667cca1e1acd2bc33

22
src/analysis/duplicate_attribute.d
View File

@ -102,27 +102,23 @@ class DuplicateAttributeCheck : BaseAnalyzer
{
// Get the name from the attribute identifier
if (attribute
&& attribute.storageClass
&& attribute.storageClass.atAttribute
&& attribute.storageClass.atAttribute.identifier !is Token.init
&& attribute.storageClass.atAttribute.identifier.text
&& attribute.storageClass.atAttribute.identifier.text.length)
&& attribute.atAttribute
&& attribute.atAttribute.identifier !is Token.init
&& attribute.atAttribute.identifier.text
&& attribute.atAttribute.identifier.text.length)
{
auto token = attribute.storageClass.atAttribute.identifier;
auto token = attribute.atAttribute.identifier;
line = token.line;
column = token.column;
return token.text;
}
// Get the attribute from the storage class token
if (attribute
&& attribute.storageClass
&& attribute.storageClass.token !is Token.init)
if (attribute && attribute.attribute.type != tok!"")
{
auto token = attribute.storageClass.token;
line = token.line;
column = token.column;
return token.type.str;
line = attribute.attribute.line;
column = attribute.attribute.column;
return attribute.attribute.type.str;
}
return null;

16
src/analysis/enumarrayliteral.d
View File

@ -27,23 +27,9 @@ class EnumArrayLiteralCheck : BaseAnalyzer
mixin visitTemplate!UnionDeclaration;
mixin visitTemplate!StructDeclaration;
override void visit(const Declaration dec)
{
if (inAggregate) foreach (attr; dec.attributes)
{
if (attr.storageClass !is null &&
attr.storageClass.token == tok!"enum")
{
looking = true;
}
}
dec.accept(this);
looking = false;
}
override void visit(const AutoDeclaration autoDec)
{
if (looking)
if (autoDec.storageClass && autoDec.storageClass.token == tok!"enum")
{
foreach (i, initializer; autoDec.initializers)
{

23
src/analysis/function_attributes.d
View File

@ -48,11 +48,10 @@ class FunctionAttributeCheck : BaseAnalyzer
override void visit(const AttributeDeclaration dec)
{
if (inInterface > 0 && dec.attribute.storageClass !is null
&& dec.attribute.storageClass.token == tok!"abstract")
if (inInterface > 0 && dec.attribute.attribute == tok!"abstract")
{
addErrorMessage(dec.attribute.storageClass.token.line,
dec.attribute.storageClass.token.column, KEY, ABSTRACT_MESSAGE);
addErrorMessage(dec.attribute.attribute.line,
dec.attribute.attribute.column, KEY, ABSTRACT_MESSAGE);
}
}
@ -62,21 +61,21 @@ class FunctionAttributeCheck : BaseAnalyzer
goto end;
foreach (attr; dec.attributes)
{
if (attr.storageClass is null)
if (attr.attribute.type == tok!"")
continue;
if (attr.storageClass.token == tok!"abstract" && inInterface)
if (attr.attribute == tok!"abstract" && inInterface)
{
addErrorMessage(attr.storageClass.token.line,
attr.storageClass.token.column, KEY, ABSTRACT_MESSAGE);
addErrorMessage(attr.attribute.line,
attr.attribute.column, KEY, ABSTRACT_MESSAGE);
continue;
}
if (dec.functionDeclaration !is null
&& (attr.storageClass.token == tok!"const"
|| attr.storageClass.token == tok!"inout"
|| attr.storageClass.token == tok!"immutable"))
&& (attr.attribute == tok!"const"
|| attr.attribute == tok!"inout"
|| attr.attribute == tok!"immutable"))
{
import std.string : format;
immutable string attrString = str(attr.storageClass.token.type);
immutable string attrString = str(attr.attribute.type);
addErrorMessage(dec.functionDeclaration.name.line,
dec.functionDeclaration.name.column, KEY,
format("'%s' is not an attribute of the return type."

2
src/analysis/local_imports.d
View File

@ -36,7 +36,7 @@ class LocalImportCheck : BaseAnalyzer
}
foreach (attr; dec.attributes)
{
if (attr.storageClass !is null && attr.storageClass.token == tok!"static")
if (attr.attribute == tok!"static")
isStatic = true;
}
dec.accept(this);

9
src/analysis/objectconst.d
View File

@ -46,14 +46,13 @@ class ObjectConstCheck : BaseAnalyzer
private static bool hasConst(const Attribute[] attributes)
{
import std.algorithm;
return attributes.any!(a => a.attribute == tok!"const"
|| (a.storageClass !is null && a.storageClass.token == tok!"const"));
import std.algorithm : any;
return attributes.any!(a => a.attribute == tok!"const");
}
private static bool hasConst(const MemberFunctionAttribute[] attributes)
{
import std.algorithm;
import std.algorithm : any;
return attributes.any!(a => a.tokenType == tok!"const"
|| a.tokenType == tok!"immutable"
|| a.tokenType == tok!"inout");
@ -71,7 +70,7 @@ class ObjectConstCheck : BaseAnalyzer
unittest
{
import analysis.config;
import analysis.config : StaticAnalysisConfig;
StaticAnalysisConfig sac;
sac.object_const_check = true;
assertAnalyzerWarnings(q{

22
src/analysis/run.d
View File

@ -69,10 +69,10 @@ void writeJSON(string key, string fileName, size_t line, size_t column, string m
write( " }");
}
void syntaxCheck(string[] fileNames)
bool syntaxCheck(string[] fileNames)
{
StaticAnalysisConfig config = defaultStaticAnalysisConfig();
analyze(fileNames, config, false);
return analyze(fileNames, config, false);
}
void generateReport(string[] fileNames, const StaticAnalysisConfig config)
@ -112,8 +112,10 @@ void generateReport(string[] fileNames, const StaticAnalysisConfig config)
}
// For multiple files
void analyze(string[] fileNames, const StaticAnalysisConfig config, bool staticAnalyze = true)
// Returns: true if there were errors
bool analyze(string[] fileNames, const StaticAnalysisConfig config, bool staticAnalyze = true)
{
bool hasErrors = false;
foreach (fileName; fileNames)
{
File f = File(fileName);
@ -122,7 +124,12 @@ void analyze(string[] fileNames, const StaticAnalysisConfig config, bool staticA
f.rawRead(code);
ParseAllocator p = new ParseAllocator;
StringCache cache = StringCache(StringCache.defaultBucketCount);
const Module m = parseModule(fileName, code, p, cache, false);
uint errorCount = 0;
const Module m = parseModule(fileName, code, p, cache, false, null,
&errorCount, null);
assert (m);
if (errorCount > 0)
hasErrors = true;
MessageSet results = analyze(fileName, m, config, staticAnalyze);
if (results is null)
continue;
@ -130,10 +137,12 @@ void analyze(string[] fileNames, const StaticAnalysisConfig config, bool staticA
writefln("%s(%d:%d)[warn]: %s", result.fileName, result.line,
result.column, result.message);
}
return hasErrors;
}
const(Module) parseModule(string fileName, ubyte[] code, ParseAllocator p,
ref StringCache cache, bool report, ulong* linesOfCode = null)
ref StringCache cache, bool report, ulong* linesOfCode = null,
uint* errorCount = null, uint* warningCount = null)
{
import stats : isLineOfCode;
auto lexer = byToken(code);
@ -153,7 +162,8 @@ const(Module) parseModule(string fileName, ubyte[] code, ParseAllocator p,
message.isError);
}
return std.d.parser.parseModule(tokens, fileName, p,
report ? &messageFunctionJSON : &messageFunction);
report ? &messageFunctionJSON : &messageFunction,
errorCount, warningCount);
}
MessageSet analyze(string fileName, const Module m,

16
src/analysis/undocumented.d
View File

@ -35,10 +35,9 @@ class UndocumentedDeclarationCheck : BaseAnalyzer
if (dec.attributeDeclaration)
{
auto attr = dec.attributeDeclaration.attribute;
if (isProtection(attr.attribute))
set(attr.attribute);
else if (dec.attributeDeclaration.attribute.storageClass !is null
&& dec.attributeDeclaration.attribute.storageClass.token == tok!"override")
if (isProtection(attr.attribute.type))
set(attr.attribute.type);
else if (attr.attribute == tok!"override")
{
setOverride(true);
}
@ -50,16 +49,13 @@ class UndocumentedDeclarationCheck : BaseAnalyzer
bool ovr = false;
foreach (attribute; dec.attributes)
{
if (isProtection(attribute.attribute))
if (isProtection(attribute.attribute.type))
{
shouldPop = true;
push(attribute.attribute);
push(attribute.attribute.type);
}
else if (attribute.storageClass !is null
&& attribute.storageClass.token == tok!"override")
{
else if (attribute.attribute == tok!"override")
ovr = true;
}
}
if (ovr)
setOverride(true);

3
src/analysis/unused.d
View File

@ -34,8 +34,7 @@ class UnusedVariableCheck : BaseAnalyzer
override void visit(const Declaration declaration)
{
if (!isOverride) foreach (attribute; declaration.attributes)
isOverride = isOverride || (attribute.storageClass !is null &&
attribute.storageClass.token == tok!"override");
isOverride = isOverride || (attribute.attribute == tok!"override");
declaration.accept(this);
isOverride = false;
}

1994
src/astprinter.d
View File

File diff suppressed because it is too large Load Diff

4
src/ctags.d
View File

@ -72,9 +72,7 @@ class CTagsPrinter : ASTVisitor
override void visit(const TemplateDeclaration dec)
{
auto name = dec.eponymousTemplateDeclaration is null ? dec.name
: dec.eponymousTemplateDeclaration.name;
tagLines ~= "%s\t%s\t%d;\"\tT%s\n".format(name.text, fileName, name.line, context);
tagLines ~= "%s\t%s\t%d;\"\tT%s\n".format(dec.name.text, fileName, dec.name.line, context);
auto c = context;
context = "\ttemplate:" ~ dec.name.text;
dec.accept(this);

2
src/main.d
View File

@ -175,7 +175,7 @@ int run(string[] args)
}
else if (syntaxCheck)
{
.syntaxCheck(expandArgs(args));
return .syntaxCheck(expandArgs(args));
}
else
{