diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-02 14:22:23 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-02 14:22:23 (GMT) |
commit | 4000b06713a958764df199560e82f1f5d62af018 (patch) | |
tree | b4a6cb35adbe1443ec1351980b09c1eb828a5d74 | |
parent | 8a0c9440a9f19db3fb9020d9cc087746c1c3fce1 (diff) | |
download | Doxygen-4000b06713a958764df199560e82f1f5d62af018.zip Doxygen-4000b06713a958764df199560e82f1f5d62af018.tar.gz Doxygen-4000b06713a958764df199560e82f1f5d62af018.tar.bz2 |
Bug 703170 - Segmentation fault parsing a fortran file
-rw-r--r-- | src/fortrancode.l | 5 | ||||
-rw-r--r-- | src/fortranscanner.l | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/fortrancode.l b/src/fortrancode.l index 4ad6144..80fc333 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -1142,6 +1142,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri (void)className; if (s.isEmpty()) return; + TooltipManager::instance()->clearTooltips(); g_code = &od; g_inputString = s; g_inputPosition = 0; @@ -1189,6 +1190,10 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri endFontClass(); g_code->endCodeLine(); } + if (fd) + { + TooltipManager::instance()->writeTooltips(*g_code); + } if (exBlock && g_sourceFileDef) { // delete the temporary file definition used for this example diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 08fe095..18764c7 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -567,7 +567,7 @@ SCOPENAME ({ID}{BS}"::"{BS})* /*------- type definition -------------------------------------------------------------------------------*/ -<Start,ModuleBody>^{BS}type { +<Start,ModuleBody>^{BS}type/[^a-z0-9] { if(YY_START == Start) { addModule(NULL); |