From 48a7afc0caf69857a42b0fe1963db3440cb4000f Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 15 Mar 2020 14:32:12 +0100 Subject: Remove support for TCL (code is too buggy and unmaintained, language not very popular) --- Doxyfile | 1 - addon/doxmlparser/Doxyfile | 1 - addon/doxmlparser/Doxyfile.impl | 1 - doc/docblocks.doc | 72 +- doc/doxygen_manual.tex | 4 - doc/features.doc | 2 +- doc/starting.doc | 1 - examples/CMakeLists.txt | 1 - examples/tclexample.cfg | 14 - examples/tclexample.tcl | 82 - qtools/Doxyfile | 1 - src/CMakeLists.txt | 3 - src/commentcnv.l | 4 +- src/config.xml | 16 +- src/configimpl.l | 3 - src/context.cpp | 1 - src/definition.cpp | 3 +- src/docsets.cpp | 1 - src/doxygen.cpp | 3 - src/doxygen.md | 1 - src/entry.h | 2 +- src/memberdef.cpp | 33 - src/tclscanner.h | 63 - src/tclscanner.l | 3156 ------------------------ src/types.h | 2 +- src/util.cpp | 3 - templates/html/htmlmemdef.tpl | 1 - testing/057/057__caller__graphs_8tcl.xml | 92 - testing/057/__057__caller__graphs_8tcl.xml | 28 - testing/057/namespace1.xml | 113 - testing/057/namespace1_1_11.xml | 28 - testing/057/namespace1_1_11_1_11.xml | 26 - testing/057/namespace2.xml | 30 - testing/057/namespace2_1_12.xml | 29 - testing/057/namespace2_1_12_1_12.xml | 29 - testing/057/namespace2_1_12_1_12_1_12.xml | 29 - testing/057/namespace2_1_12_1_12_1_12_1_12.xml | 28 - testing/057/namespacebar.xml | 57 - testing/057/namespacefoo.xml | 27 - testing/057_caller_graphs.tcl | 155 -- testing/058/058__bracket__recursion_8tcl.xml | 384 --- testing/058_bracket_recursion.tcl | 157 -- testing/059/059__command__catch_8tcl.xml | 191 -- testing/059_command_catch.tcl | 87 - testing/060/060__command__switch_8tcl.xml | 326 --- testing/060_command_switch.tcl | 238 -- testing/061/class_test.xml | 70 - testing/061_bug_705503.tcl | 19 - testing/062/namespacen1.xml | 42 - testing/062/namespacen2.xml | 42 - testing/062/namespacen3.xml | 42 - testing/062_namespace_resolution.tcl | 68 - testing/063/namespaceoo.xml | 13 - testing/063/namespaceoo_1_1_helpers.xml | 27 - testing/063/namespaceoo_1_1define.xml | 27 - testing/063_bug_729092.tcl | 43 - testing/_057_caller_graphs.tcl | 4 - 57 files changed, 11 insertions(+), 5915 deletions(-) delete mode 100644 examples/tclexample.cfg delete mode 100644 examples/tclexample.tcl delete mode 100644 src/tclscanner.h delete mode 100644 src/tclscanner.l delete mode 100644 testing/057/057__caller__graphs_8tcl.xml delete mode 100644 testing/057/__057__caller__graphs_8tcl.xml delete mode 100644 testing/057/namespace1.xml delete mode 100644 testing/057/namespace1_1_11.xml delete mode 100644 testing/057/namespace1_1_11_1_11.xml delete mode 100644 testing/057/namespace2.xml delete mode 100644 testing/057/namespace2_1_12.xml delete mode 100644 testing/057/namespace2_1_12_1_12.xml delete mode 100644 testing/057/namespace2_1_12_1_12_1_12.xml delete mode 100644 testing/057/namespace2_1_12_1_12_1_12_1_12.xml delete mode 100644 testing/057/namespacebar.xml delete mode 100644 testing/057/namespacefoo.xml delete mode 100644 testing/057_caller_graphs.tcl delete mode 100644 testing/058/058__bracket__recursion_8tcl.xml delete mode 100644 testing/058_bracket_recursion.tcl delete mode 100644 testing/059/059__command__catch_8tcl.xml delete mode 100644 testing/059_command_catch.tcl delete mode 100644 testing/060/060__command__switch_8tcl.xml delete mode 100644 testing/060_command_switch.tcl delete mode 100644 testing/061/class_test.xml delete mode 100644 testing/061_bug_705503.tcl delete mode 100644 testing/062/namespacen1.xml delete mode 100644 testing/062/namespacen2.xml delete mode 100644 testing/062/namespacen3.xml delete mode 100644 testing/062_namespace_resolution.tcl delete mode 100644 testing/063/namespaceoo.xml delete mode 100644 testing/063/namespaceoo_1_1_helpers.xml delete mode 100644 testing/063/namespaceoo_1_1define.xml delete mode 100644 testing/063_bug_729092.tcl delete mode 100644 testing/_057_caller_graphs.tcl diff --git a/Doxyfile b/Doxyfile index 9e86b1e..8681c99 100644 --- a/Doxyfile +++ b/Doxyfile @@ -30,7 +30,6 @@ INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = -TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO diff --git a/addon/doxmlparser/Doxyfile b/addon/doxmlparser/Doxyfile index 2cef6cf..18359a0 100644 --- a/addon/doxmlparser/Doxyfile +++ b/addon/doxmlparser/Doxyfile @@ -40,7 +40,6 @@ INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = -TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO diff --git a/addon/doxmlparser/Doxyfile.impl b/addon/doxmlparser/Doxyfile.impl index 5bddcc4..9bfc85e 100644 --- a/addon/doxmlparser/Doxyfile.impl +++ b/addon/doxmlparser/Doxyfile.impl @@ -40,7 +40,6 @@ INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = -TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO diff --git a/doc/docblocks.doc b/doc/docblocks.doc index 23933c7..6c1edae 100644 --- a/doc/docblocks.doc +++ b/doc/docblocks.doc @@ -31,9 +31,9 @@ additional markings, so doxygen knows it is a piece of structured text that needs to end up in the generated documentation. The \ref cppblock "next" section presents the various styles supported by doxygen. -For Python, VHDL, Fortran, and Tcl code there are different commenting -conventions, which can be found in sections \ref pythonblocks, \ref vhdlblocks, -\ref fortranblocks, and \ref tclblocks respectively. +For Python, VHDL, and Fortran code there are different commenting +conventions, which can be found in sections \ref pythonblocks, \ref vhdlblocks, and +\ref fortranblocks respectively. \subsection cppblock Comment blocks for C-like languages (C/C++/C#/Objective-C/PHP/Java) @@ -564,72 +564,6 @@ C> input parameter end function A \endcode -\subsection tclblocks Comment blocks in Tcl - -Doxygen documentation can be included in normal Tcl comments. - -To start a new documentation block start a line with \c ## (two hashes). -All following comment lines and continuation lines will be added to this -block. The block ends with a line not starting with a \c # (hash sign). - -A brief documentation can be added with \c ;#< (semicolon, hash and -less-than sign). The brief documentation also ends at a line not starting -with a \c # (hash sign). - -Inside doxygen comment blocks all normal doxygen markings are supported. -The only exceptions are described in the following two paragraphs. - -If a doxygen comment block ends with a line containing only -\c #\\code or \c #\@code all code until a line only containing \c #\\endcode -or \c #\@endcode is added to the generated documentation as code block. - -If a doxygen comment block ends with a line containing only -\c #\\verbatim or \c #\@verbatim all code until a line only containing -\c #\\endverbatim or \c #\@endverbatim is added verbatim to the generated -documentation. - -To detect namespaces, classes, functions and variables the following -Tcl commands are recognized. Documentation blocks can be put on the lines -before the command. - - - - - -Following is an example using doxygen style comments: - -\include tclexample.tcl - \htmlonly - Click here - for the corresponding HTML documentation that is generated by doxygen. - \endhtmlonly - \latexonly - See \hyperlink{tcl_example}{TCL example} - for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen. - \endlatexonly - \section docstructure Anatomy of a comment block diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex index e350013..0148379 100644 --- a/doc/doxygen_manual.tex +++ b/doc/doxygen_manual.tex @@ -221,10 +221,6 @@ Written by Dimitri van Heesch\\[2ex] \begin{DoxygenSubAppendix} \subinputfrom{../html/examples/mux/latex/}{refman_doc} \end{DoxygenSubAppendix} - \doxysection{Tcl Example}\label{tcl_example}\hypertarget{tcl_example}{} - \begin{DoxygenSubAppendix} - \subinputfrom{../html/examples/tclexample/latex/}{refman_doc} - \end{DoxygenSubAppendix} \chapter{Class Example}\label{class_example}\hypertarget{class_example}{} \subinputfrom{../html/examples/class/latex/}{refman_doc} diff --git a/doc/features.doc b/doc/features.doc index 65fc343..461caef 100644 --- a/doc/features.doc +++ b/doc/features.doc @@ -29,7 +29,7 @@
  • Generates structured XML output for parsed sources, which can be used by external tools.
  • Supports C/C++, Java, (Corba and Microsoft) Java, Python, VHDL, PHP - IDL, C#, Fortran, TCL, Objective-C 2.0, and to some extent D sources. + IDL, C#, Fortran, Objective-C 2.0, and to some extent D sources.
  • Supports documentation of files, namespaces, packages, classes, structs, unions, templates, variables, functions, typedefs, enums and defines. diff --git a/doc/starting.doc b/doc/starting.doc index d419e92..ceb4cfc 100644 --- a/doc/starting.doc +++ b/doc/starting.doc @@ -119,7 +119,6 @@ Extension | Language | Extension | Language | Extension | Language .ixx |C / C++ | .php5 |PHP | .vhdl |VHDL .ipp |C / C++ | .inc |PHP | .ucf |VHDL .i++ |C / C++ | .phtml |PHP | .qsf |VHDL -.inl |C / C++ | .m |Objective-C | .tcl |TCL .h |C / C++ | .M |Objective-C | .md |Markdown .H |C / C++ | .py |Python | .markdown |Markdown .hh |C / C++ | .pyw |Python | .ice |Slice diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index c73d6f4..3f1c79b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -42,7 +42,6 @@ set(BASIC_EXAMPLES page:doc docstring:py pyexample:py - tclexample:tcl manual:c mux:vhdl ) diff --git a/examples/tclexample.cfg b/examples/tclexample.cfg deleted file mode 100644 index e151d14..0000000 --- a/examples/tclexample.cfg +++ /dev/null @@ -1,14 +0,0 @@ -PROJECT_NAME = "Tcl" -OUTPUT_DIRECTORY = ../html/examples/tclexample -GENERATE_LATEX = YES -GENERATE_MAN = NO -GENERATE_RTF = NO -CASE_SENSE_NAMES = NO -INPUT = tclexample.tcl -QUIET = YES -JAVADOC_AUTOBRIEF = YES -SEARCHENGINE = NO -INLINE_SOURCES = YES -HIDE_UNDOC_MEMBERS = YES -COMPACT_LATEX = YES -LATEX_HIDE_INDICES = YES diff --git a/examples/tclexample.tcl b/examples/tclexample.tcl deleted file mode 100644 index e512aee..0000000 --- a/examples/tclexample.tcl +++ /dev/null @@ -1,82 +0,0 @@ -## \file tclexample.tcl -# File documentation. -#\verbatim - -# Startup code:\ -exec tclsh "$0" "$@" -#\endverbatim -## Documented namespace \c ns . -# The code is inserted here: -#\code -namespace eval ns { - ## Documented proc \c ns_proc . - # \param[in] arg some argument - proc ns_proc {arg} {} - ## Documented var \c ns_var . - # Some documentation. - variable ns_var - ## Documented itcl class \c itcl_class . - itcl::class itcl_class { - ## Create object. - constructor {args} {eval $args} - ## Destroy object. - destructor {exit} - ## Documented itcl method \c itcl_method_x . - # \param[in] arg Argument - private method itcl_method_x {arg} - ## Documented itcl method \c itcl_method_y . - # \param[in] arg Argument - protected method itcl_method_y {arg} {} - ## Documented itcl method \c itcl_method_z . - # \param[in] arg Argument - public method itcl_method_z {arg} {} - ## Documented common itcl var \c itcl_Var . - common itcl_Var - ## \protectedsection - - variable itcl_var1;#< Documented itcl var \c itcl_var1 . - variable itcl_var2;#< Documented itcl var \c itcl_var2 . - } - ## Documented oo class \c oo_class . - oo::class create oo_class { - ## Create object. - # Configure with args - constructor {args} {eval $args} - ## Destroy object. - # Exit. - destructor {exit} - ## Documented oo var \c oo_var . - # Defined inside class - variable oo_var - ## \private Documented oo method \c oo_method_x . - # \param[in] arg Argument - method oo_method_x {arg} {} - ## \protected Documented oo method \c oo_method_y . - # \param[in] arg Argument - method oo_method_y {arg} {} - ## \public Documented oo method \c oo_method_z . - # \param[in] arg Argument - method oo_method_z {arg} {} - } -} -#\endcode - -itcl::body ::ns::itcl_class::itcl_method_x {argx} { - puts "$argx OK" -} - -oo::define ns::oo_class { - ## \public Outside defined variable \c oo_var_out . - # Inside oo_class - variable oo_var_out -} - -## Documented global proc \c glob_proc . -# \param[in] arg Argument -proc glob_proc {arg} {puts $arg} - -variable glob_var;#< Documented global var \c glob_var\ - with newline -#< and continued line - -# end of file diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 109d3dc..d3ab25a 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -28,7 +28,6 @@ INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = -TCL_SUBST = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 201b7c8..0a7a3ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -107,7 +107,6 @@ set(LEX_FILES scanner fortranscanner fortrancode vhdlcode - tclscanner pre declinfo defargs @@ -166,7 +165,6 @@ add_library(_doxygen STATIC ${GENERATED_SRC}/pyscanner.l.h ${GENERATED_SRC}/scanner.l.h ${GENERATED_SRC}/sqlcode.l.h - ${GENERATED_SRC}/tclscanner.l.h ${GENERATED_SRC}/vhdlcode.l.h ${GENERATED_SRC}/xmlcode.l.h ${GENERATED_SRC}/code.cpp @@ -184,7 +182,6 @@ add_library(_doxygen STATIC ${GENERATED_SRC}/pyscanner.cpp ${GENERATED_SRC}/scanner.cpp ${GENERATED_SRC}/sqlcode.cpp - ${GENERATED_SRC}/tclscanner.cpp ${GENERATED_SRC}/vhdlcode.cpp ${GENERATED_SRC}/xmlcode.cpp # diff --git a/src/commentcnv.l b/src/commentcnv.l index 9b91319..59d1a8b 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -291,7 +291,7 @@ MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z copyToOutput(yyscanner,yytext,(int)yyleng); } "/*"[*!]? { /* start of a C comment */ - if ((yyextra->lang==SrcLangExt_Python) || (yyextra->lang==SrcLangExt_Tcl)) + if (yyextra->lang==SrcLangExt_Python) { REJECT; } @@ -580,7 +580,6 @@ MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z } "/"+"*" { /* nested C comment */ if (yyextra->lang==SrcLangExt_Python || - yyextra->lang==SrcLangExt_Tcl || yyextra->lang==SrcLangExt_Markdown) { REJECT; @@ -591,7 +590,6 @@ MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z } "*"+"/" { /* end of C comment */ if (yyextra->lang==SrcLangExt_Python || - yyextra->lang==SrcLangExt_Tcl || yyextra->lang==SrcLangExt_Markdown) { REJECT; diff --git a/src/config.xml b/src/config.xml index 8258415..5b29b66 100644 --- a/src/config.xml +++ b/src/config.xml @@ -585,16 +585,6 @@ Go to the next section or return to the ]]> -