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

Fix #58

This commit is contained in:
Hackerpilot 2014-01-13 22:35:27 +00:00
parent ccd15bbd2e
commit 6f00a166c7
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctags.d
View File

@ -14,7 +14,7 @@ import std.stdio;
import std.array; import std.array;
import std.conv; import std.conv;
void doNothing(string, size_t, size_t, string) {} void doNothing(string, size_t, size_t, string, bool) {}
void printCtags(File output, string[] fileNames) void printCtags(File output, string[] fileNames)
{ {

13
stdx/d/parser.d
View File

@ -19,11 +19,12 @@ import std.string : format;
* tokens = the tokens parsed by std.d.lexer * tokens = the tokens parsed by std.d.lexer
* messageFunction = a function to call on error or warning messages. * messageFunction = a function to call on error or warning messages.
* The parameters are the file name, line number, column number, * The parameters are the file name, line number, column number,
* and the error or warning message. * the error or warning message, and a boolean (true means error, false
* means warning).
* Returns: the parsed module * Returns: the parsed module
*/ */
Module parseModule(const(Token)[] tokens, string fileName, Module parseModule(const(Token)[] tokens, string fileName,
void function(string, size_t, size_t, string) messageFunction = null) void function(string, size_t, size_t, string, bool) messageFunction = null)
{ {
auto parser = new Parser(); auto parser = new Parser();
parser.fileName = fileName; parser.fileName = fileName;
@ -5984,7 +5985,7 @@ q{doStuff(5)}c;
* The parameters are the file name, line number, column number, * The parameters are the file name, line number, column number,
* and the error or warning message. * and the error or warning message.
*/ */
void function(string, size_t, size_t, string) messageFunction; void function(string, size_t, size_t, string, bool) messageFunction;
bool isSliceExpression() bool isSliceExpression()
{ {
@ -6278,7 +6279,7 @@ protected:
if (messageFunction is null) if (messageFunction is null)
stderr.writefln("%s(%d:%d)[warn]: %s", fileName, line, column, message); stderr.writefln("%s(%d:%d)[warn]: %s", fileName, line, column, message);
else else
messageFunction(fileName, line, column, message); messageFunction(fileName, line, column, message, false);
} }
void error(lazy string message, bool shouldAdvance = true) void error(lazy string message, bool shouldAdvance = true)
@ -6294,7 +6295,7 @@ protected:
stderr.writefln("%s(%d:%d)[error]: %s", fileName, line, column, message); stderr.writefln("%s(%d:%d)[error]: %s", fileName, line, column, message);
} }
else else
messageFunction(fileName, line, column, message); messageFunction(fileName, line, column, message, true);
} }
while (shouldAdvance && moreTokens()) while (shouldAdvance && moreTokens())
{ {
@ -6502,7 +6503,7 @@ protected:
} }
version (unittest) static void doNothingErrorFunction(string fileName, version (unittest) static void doNothingErrorFunction(string fileName,
size_t line, size_t column, string message) {} size_t line, size_t column, string message, bool isError) {}
version (unittest) static Parser getParserForUnittest(string sourceCode, version (unittest) static Parser getParserForUnittest(string sourceCode,
string testName) string testName)

2
style.d
View File

@ -13,7 +13,7 @@ import std.regex;
import std.array; import std.array;
import std.conv; import std.conv;
void doNothing(string, size_t, size_t, string) {} void doNothing(string, size_t, size_t, string, bool) {}
void styleCheck(File output, string[] fileNames) void styleCheck(File output, string[] fileNames)
{ {