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

Add location information to ArgumentList, AtAttribute and ModuleDeclaration 

Amending previous commit
This commit is contained in:
Liran Zvibel 2014-05-26 21:06:11 +03:00
parent 7bb8cdc837
commit 885d0d2ff5
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
std/d/ast.d
View File

@ -469,6 +469,8 @@ public:
}
mixin OpEquals;
/** */ AssignExpression[] items;
/** */ size_t startLocation;
/** */ size_t endLocation;
}
///
@ -745,6 +747,8 @@ public:
/** */ FunctionCallExpression functionCallExpression;
/** */ ArgumentList argumentList;
/** */ Token identifier;
/** */ size_t startLocation;
/** */ size_t endLocation;
mixin OpEquals;
}
@ -1978,6 +1982,8 @@ public:
mixin (visitIfNotNull!(moduleName));
}
/** */ IdentifierChain moduleName;
/** */ size_t startLocation;
/** */ size_t endLocation;
mixin OpEquals;
}

17
std/d/parser.d
View File

@ -273,7 +273,11 @@ alias core.sys.posix.stdio.fileno fileno;
ArgumentList parseArgumentList()
{
mixin(traceEnterAndExit!(__FUNCTION__));
return parseCommaSeparatedRule!(ArgumentList, AssignExpression)(true);
size_t startLocation = current().index;
auto ret= parseCommaSeparatedRule!(ArgumentList, AssignExpression)(true);
ret.startLocation = startLocation;
ret.endLocation = current().index;
return ret;
}
/**
@ -717,7 +721,9 @@ alias core.sys.posix.stdio.fileno fileno;
{
mixin(traceEnterAndExit!(__FUNCTION__));
auto node = allocate!AtAttribute;
if (expect(tok!"@") is null) return null;
auto start = expect(tok!"@");
if (start is null) return null;
node.startLocation = start.index;
switch (current.type)
{
case tok!"identifier":
@ -735,6 +741,7 @@ alias core.sys.posix.stdio.fileno fileno;
error(`"(", or identifier expected`);
return null;
}
node.endLocation = current().index;
return node;
}
@ -3601,9 +3608,11 @@ invariant() foo();
ModuleDeclaration parseModuleDeclaration()
{
auto node = allocate!ModuleDeclaration;
expect(tok!"module");
auto start = expect(tok!"module");
node.moduleName = parseIdentifierChain();
expect(tok!";");
auto end = expect(tok!";");
node.startLocation = start.index;
node.endLocation = end.index;
return node;
}