mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-09-10 12:03:16 +02:00
fix NPE from bug 74329
This commit is contained in:
parent
bea93881a3
commit
cfb7157606
1 changed files with 6 additions and 4 deletions
|
@ -3466,6 +3466,9 @@ public class Parser implements IParserData, IParser
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
int nameStart = (id != null) ? id.getOffset() : 0;
|
||||||
|
int nameEnd = (id != null) ? id.getEndOffset() : 0;
|
||||||
|
int nameLine = (id != null) ? id.getLineNumber() : 0;
|
||||||
returnValue.add(
|
returnValue.add(
|
||||||
astFactory.createTemplateParameter(
|
astFactory.createTemplateParameter(
|
||||||
kind,
|
kind,
|
||||||
|
@ -3475,10 +3478,9 @@ public class Parser implements IParserData, IParser
|
||||||
null,
|
null,
|
||||||
( parameterScope instanceof IASTCodeScope ) ? (IASTCodeScope) parameterScope : null,
|
( parameterScope instanceof IASTCodeScope ) ? (IASTCodeScope) parameterScope : null,
|
||||||
startingToken.getOffset(), startingToken.getLineNumber(),
|
startingToken.getOffset(), startingToken.getLineNumber(),
|
||||||
(id != null) ? id.getOffset() : 0,
|
nameStart, nameEnd, nameLine,
|
||||||
(id != null) ? id.getEndOffset() : 0,
|
(lastToken != null ) ? lastToken.getEndOffset() : nameEnd,
|
||||||
(id != null) ? id.getLineNumber() : 0,
|
(lastToken != null ) ? lastToken.getLineNumber() : nameLine, startingToken.getFilename() ));
|
||||||
lastToken.getEndOffset(), lastToken.getLineNumber(), lastToken.getFilename() ));
|
|
||||||
}
|
}
|
||||||
catch( ASTSemanticException ase )
|
catch( ASTSemanticException ase )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue