diff options
| author | Andreas Regel <andreas.regel@newayselectronics.com> | 2018-05-28 11:12:22 (GMT) |
|---|---|---|
| committer | Andreas Regel <andreas.regel@newayselectronics.com> | 2018-05-28 11:12:22 (GMT) |
| commit | e7fe7109421e75b75c7f8d50dd0e1c165b880eea (patch) | |
| tree | 12a1a0410e689bacdcbce5541c6c1b2386379011 /src/tclscanner.l | |
| parent | 9f7406d151e4f5d021558e97f5d87a0d9cacecf9 (diff) | |
| parent | 63696c08425fc1662c5e76280e3cc74fb3769d80 (diff) | |
| download | Doxygen-e7fe7109421e75b75c7f8d50dd0e1c165b880eea.zip Doxygen-e7fe7109421e75b75c7f8d50dd0e1c165b880eea.tar.gz Doxygen-e7fe7109421e75b75c7f8d50dd0e1c165b880eea.tar.bz2 | |
Merge branch 'master' into vhdl-localization
# Conflicts:
# src/translator.h
Diffstat (limited to 'src/tclscanner.l')
| -rw-r--r-- | src/tclscanner.l | 17 |
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(); |