Add location information to ArgumentList, AtAttribute and ModuleDeclaration
Amending previous commit
This commit is contained in:
parent
7bb8cdc837
commit
885d0d2ff5
|
@ -469,6 +469,8 @@ public:
|
||||||
}
|
}
|
||||||
mixin OpEquals;
|
mixin OpEquals;
|
||||||
/** */ AssignExpression[] items;
|
/** */ AssignExpression[] items;
|
||||||
|
/** */ size_t startLocation;
|
||||||
|
/** */ size_t endLocation;
|
||||||
}
|
}
|
||||||
|
|
||||||
///
|
///
|
||||||
|
@ -745,6 +747,8 @@ public:
|
||||||
/** */ FunctionCallExpression functionCallExpression;
|
/** */ FunctionCallExpression functionCallExpression;
|
||||||
/** */ ArgumentList argumentList;
|
/** */ ArgumentList argumentList;
|
||||||
/** */ Token identifier;
|
/** */ Token identifier;
|
||||||
|
/** */ size_t startLocation;
|
||||||
|
/** */ size_t endLocation;
|
||||||
mixin OpEquals;
|
mixin OpEquals;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1978,6 +1982,8 @@ public:
|
||||||
mixin (visitIfNotNull!(moduleName));
|
mixin (visitIfNotNull!(moduleName));
|
||||||
}
|
}
|
||||||
/** */ IdentifierChain moduleName;
|
/** */ IdentifierChain moduleName;
|
||||||
|
/** */ size_t startLocation;
|
||||||
|
/** */ size_t endLocation;
|
||||||
mixin OpEquals;
|
mixin OpEquals;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -273,7 +273,11 @@ alias core.sys.posix.stdio.fileno fileno;
|
||||||
ArgumentList parseArgumentList()
|
ArgumentList parseArgumentList()
|
||||||
{
|
{
|
||||||
mixin(traceEnterAndExit!(__FUNCTION__));
|
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__));
|
mixin(traceEnterAndExit!(__FUNCTION__));
|
||||||
auto node = allocate!AtAttribute;
|
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)
|
switch (current.type)
|
||||||
{
|
{
|
||||||
case tok!"identifier":
|
case tok!"identifier":
|
||||||
|
@ -735,6 +741,7 @@ alias core.sys.posix.stdio.fileno fileno;
|
||||||
error(`"(", or identifier expected`);
|
error(`"(", or identifier expected`);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
node.endLocation = current().index;
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3601,9 +3608,11 @@ invariant() foo();
|
||||||
ModuleDeclaration parseModuleDeclaration()
|
ModuleDeclaration parseModuleDeclaration()
|
||||||
{
|
{
|
||||||
auto node = allocate!ModuleDeclaration;
|
auto node = allocate!ModuleDeclaration;
|
||||||
expect(tok!"module");
|
auto start = expect(tok!"module");
|
||||||
node.moduleName = parseIdentifierChain();
|
node.moduleName = parseIdentifierChain();
|
||||||
expect(tok!";");
|
auto end = expect(tok!";");
|
||||||
|
node.startLocation = start.index;
|
||||||
|
node.endLocation = end.index;
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue