From efb600665d3cb277d330974bcfd90a1da8dc6395 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Thu, 12 Aug 2010 12:18:49 +0200 Subject: Remember the T_TEMPLATE token we use to force the parser to recognize a template-id. --- src/shared/cplusplus/Parser.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/shared/cplusplus/Parser.cpp') diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index 07b0a018a5..ad20ef7af4 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -419,14 +419,14 @@ bool Parser::parseClassOrNamespaceName(NameAST *&node) } } else if (LA() == T_TEMPLATE) { unsigned template_token = consumeToken(); - if (parseTemplateId(node)) + if (parseTemplateId(node, template_token)) return true; rewind(template_token); } return false; } -bool Parser::parseTemplateId(NameAST *&node) +bool Parser::parseTemplateId(NameAST *&node, unsigned template_token) { DEBUG_THIS_RULE(); @@ -434,6 +434,7 @@ bool Parser::parseTemplateId(NameAST *&node) if (LA() == T_IDENTIFIER && LA(2) == T_LESS) { TemplateIdAST *ast = new (_pool) TemplateIdAST; + ast->template_token = template_token; ast->identifier_token = consumeToken(); ast->less_token = consumeToken(); if (LA() == T_GREATER || parseTemplateArgumentList( @@ -2642,7 +2643,7 @@ bool Parser::parseUnqualifiedName(NameAST *&node, bool acceptTemplateId) return true; } else if (LA() == T_TEMPLATE) { unsigned template_token = consumeToken(); - if (parseTemplateId(node)) + if (parseTemplateId(node, template_token)) return true; rewind(template_token); } -- cgit v1.2.1