1 files changed, 13 insertions, 8 deletions

diff --git a/src/code.l b/src/code.l
index bab6b0c..fb609e5 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3861,25 +3861,30 @@ static void restoreObjCContext(yyscan_t yyscanner)
   }
 }
 
-struct CodeScanner::Private
+struct CCodeParser::Private
 {
   yyscan_t yyscanner;
   codeYY_state state;
 };
 
-CodeScanner::CodeScanner()
+CCodeParser::CCodeParser() : p(std::make_unique<CCodeParser::Private>())
 {
-  p = new Private;
   codeYYlex_init_extra(&p->state,&p->yyscanner);
+#ifdef FLEX_DEBUG
+  codeYYset_debug(1,p->yyscanner);
+#endif
 }
 
-CodeScanner::~CodeScanner()
+CCodeParser::~CCodeParser()
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+  yyextra->classScopeLengthStack.clear();
+  delete yyextra->codeClassSDict;
+  yyextra->codeClassSDict=0;
   codeYYlex_destroy(p->yyscanner);
-  delete p;
 }
 
-void CodeScanner::reset()
+void CCodeParser::resetCodeParserState()
 {
   struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
   //printf("***CodeParser::reset()\n");
@@ -3895,7 +3900,7 @@ void CodeScanner::reset()
   yyextra->anchorCount = 0;
 }
 
-void CodeScanner::parseCCode(CodeOutputInterface &od,const char *className,const QCString &s, 
+void CCodeParser::parseCode(CodeOutputInterface &od,const char *className,const QCString &s, 
                 SrcLangExt lang,bool exBlock, const char *exName,FileDef *fd,
 		int startLine,int endLine,bool inlineFragment,
 		const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
@@ -3912,7 +3917,7 @@ void CodeScanner::parseCCode(CodeOutputInterface &od,const char *className,const
 
   if (yyextra->codeClassSDict==0)
   {
-    reset();
+    resetCodeParserState();
   }
   yyextra->code = &od;
   yyextra->inputString   = s;