summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-04-22 09:18:48 (GMT)
committerGitHub <noreply@github.com>2018-04-22 09:18:48 (GMT)
commitc3c2b5d5ad10be422a2b5403a68aa1755a49e1b4 (patch)
treed4c6e7d6073e7a276a9a3ccdb2613cabfb4c2885
parent994ce9c5ccc2cd39b20376a3631d268eb9e634a1 (diff)
parent05bec28930831888b6dfb610307a04da2d345924 (diff)
downloadDoxygen-c3c2b5d5ad10be422a2b5403a68aa1755a49e1b4.zip
Doxygen-c3c2b5d5ad10be422a2b5403a68aa1755a49e1b4.tar.gz
Doxygen-c3c2b5d5ad10be422a2b5403a68aa1755a49e1b4.tar.bz2
Merge pull request #662 from albert-github/feature/bug_793702
Bug 793702 - Examples of TCL files fail to display
-rw-r--r--src/tclscanner.l17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 791ecc4..56d2e3d 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -703,6 +703,7 @@ static void tcl_codify(const char *s,const char *str)
}
else
{
+ if (*(p-2)==0x1A) *(p-2) = '\0'; // remove ^Z
tcl.code->codify(sp);
done=TRUE;
}
@@ -3024,11 +3025,6 @@ void TclLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
}
tcl_inf("%s (%d,%d) %d %d\n",myStr.ascii(),startLine,endLine,isExampleBlock,inlineFragment);
//tcl_inf("%s\n"input.data());
- if (isExampleBlock)
- {
- tcl_codify(NULL,input);
- return;
- }
tcl_init();
tcl.collectXRefs = collectXRefs;
tcl.memberdef = memberDef;
@@ -3047,8 +3043,15 @@ tcl_inf("%s (%d,%d) %d %d\n",myStr.ascii(),startLine,endLine,isExampleBlock,inli
}
tcl.file_name = "";
tcl.this_parser = NULL;
- tcl.entry_main = tcl_entry_new();
- tcl_parse(myNs,myCls);
+ if (isExampleBlock)
+ {
+ tcl_codify(NULL,input);
+ }
+ else
+ {
+ tcl.entry_main = tcl_entry_new();
+ tcl_parse(myNs,myCls);
+ }
tcl.code->endCodeLine();
tcl.scan.clear();
tcl.ns.clear();