From 4ffed7a11968cd869d784b79c71abd550fe2dd95 Mon Sep 17 00:00:00 2001 From: Roberto Raggi <roberto.raggi@trolltech.com> Date: Thu, 5 Feb 2009 13:00:50 +0100 Subject: [PATCH] Fixes: Parsing of #import directives. --- src/libs/cplusplus/pp-engine.cpp | 3 +++ src/libs/cplusplus/pp-engine.h | 1 + 2 files changed, 4 insertions(+) diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index e7d3011a767..974af656a65 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -727,6 +727,7 @@ void Preprocessor::processDirective(TokenIterator firstToken, TokenIterator last case PP_INCLUDE: case PP_INCLUDE_NEXT: + case PP_IMPORT: if (! skipping()) processInclude(d == PP_INCLUDE_NEXT, firstToken, lastToken); break; @@ -1069,6 +1070,8 @@ Preprocessor::PP_DIRECTIVE_TYPE Preprocessor::classifyDirective (const QByteArra case 6: if (__directive[0] == 'i' && __directive == "ifndef") return PP_IFNDEF; + else if (__directive[0] == 'i' && __directive == "import") + return PP_IMPORT; else if (__directive[0] == 'd' && __directive == "define") return PP_DEFINE; break; diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index 24e1ac13de0..033db4cb933 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -150,6 +150,7 @@ namespace CPlusPlus { { PP_UNKNOWN_DIRECTIVE, PP_DEFINE, + PP_IMPORT, PP_INCLUDE, PP_INCLUDE_NEXT, PP_ELIF, -- GitLab