diff --git a/.gitignore b/.gitignore index 50fdfc56..8ddbc4ac 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ public dcd d-scanner extract_last_changelog_part +dexed-d/.dub +dub.selections.json diff --git a/dastworx/build.bat b/dastworx/build.bat deleted file mode 100644 index 1ea9dd23..00000000 --- a/dastworx/build.bat +++ /dev/null @@ -1,32 +0,0 @@ -:: D compiler and arch -if "%dc%"=="" set dc=dmd -if "%mflags%"=="" set mflags=-m32 - -::iz sources -set iz= -for /r "../etc/iz/import/" %%F in (*.d) do call set iz=%%iz%% "%%F" - -::dparse sources -set dparse= -for /r "../etc/libdparse/src/" %%F in (*.d) do call set dparse=%%dparse%% "%%F" - -::stdxalloc sources -set stdxalloc= -for /r "../etc/stdx-allocator/source/" %%F in (*.d) do call set stdxalloc=%%stdxalloc%% "%%F" - -::dast sources -set dast= -for /r "src/" %%F in (*.d) do call set dast=%%dast%% "%%F" - -echo building... - -::build -%dc% %dast% %dparse% %iz% %stdxalloc% ^ --O -release -inline -boundscheck=off %mflags% ^ --Isrc -I"..\etc\iz\import" -I"..\etc\libdparse\src" ^ -I"..\etc\stdx-allocator\source" ^ --of"..\bin\dastworx.exe" - -::cleanup -del ..\bin\dastworx.obj - -echo ...done diff --git a/dastworx/build.sh b/dastworx/build.sh deleted file mode 100755 index f6279929..00000000 --- a/dastworx/build.sh +++ /dev/null @@ -1,38 +0,0 @@ -if [[ -z "$DC" ]]; then DC=dmd; fi -if [[ "$DC" == "ldc" ]]; then DC=ldmd2; fi -if [[ "$DC" == "ldc2" ]]; then DC=ldmd2; fi -if [[ "$DC" == "gdc" ]]; then DC=gdmd; fi -if [[ -z "$MFLAGS" ]]; then MFLAGS=-m64; fi - -#iz sources -cd ../etc/iz/import/ -iz=$(find `pwd` -type f -name \*.d) -cd ../../../dastworx - -#dparse sources -cd ../etc/libdparse/src/ -dparse=$(find `pwd` -type f -name \*.d) -cd ../../../dastworx - -#stdx-alloc sources -cd ../etc/stdx-allocator/source/ -stdxalloc=$(find `pwd` -type f -name \*.d) -cd ../../../dastworx - -#dast sources -cd src/ -dast=$(find `pwd` -type f -name \*.d) -cd ../ - -echo building dastworx using $DC... - -#build -$DC ${dast[@]} ${dparse[@]} ${iz[@]} ${stdxalloc[@]} \ --O -release -inline -boundscheck=off $MFLAGS \ --Isrc -I../etc/iz/import -I../etc/libdparse/src -I../etc/stdx-allocator/source \ --of../bin/dastworx - -#cleanup -rm ../bin/dastworx.o - -echo ...done diff --git a/dastworx/dastworx.dprj b/dastworx/dastworx.dprj deleted file mode 100644 index b761a672..00000000 --- a/dastworx/dastworx.dprj +++ /dev/null @@ -1,52 +0,0 @@ -object CurrentProject: TCENativeProject - OptionsCollection = < - item - name = 'devel' - debugingOptions.generateInfos = True - outputOptions.boundsCheck = onAlways - outputOptions.versionIdentifiers.Strings = ( - 'devel' - ) - pathsOptions.outputFilename = '../bin/dastworx' - pathsOptions.extraSources.Strings = ( - '../etc/iz/import/*' - '../etc/libdparse/src/*' - '../etc/stdx-allocator/source/*' - ) - pathsOptions.importModulePaths.Strings = ( - '../etc/iz/import' - '../etc/libdparse/src' - '../etc/stdx-allocator/source' - ) - runOptions.options = [poUsePipes, poStderrToOutPut] - end - item - name = 'release' - outputOptions.boundsCheck = offAlways - outputOptions.optimizations = True - outputOptions.release = True - pathsOptions.outputFilename = '../bin/dastworx' - pathsOptions.extraSources.Strings = ( - '../etc/iz/import/*' - '../etc/libdparse/src/*' - '../etc/stdx-allocator/source/*' - ) - pathsOptions.importModulePaths.Strings = ( - '../etc/iz/import' - '../etc/libdparse/src' - '../etc/stdx-allocator/source' - ) - runOptions.options = [poUsePipes, poStderrToOutPut] - end> - Sources.Strings = ( - 'src/main.d' - 'src/todos.d' - 'src/symlist.d' - 'src/imports.d' - 'src/mainfun.d' - 'src/common.d' - 'src/halstead.d' - 'src/ddoc_template.d' - ) - ConfigurationIndex = 1 -end diff --git a/dastworx/readme.md b/dastworx/readme.md deleted file mode 100644 index b1ff3605..00000000 --- a/dastworx/readme.md +++ /dev/null @@ -1,22 +0,0 @@ -## Dastworx - -_D AST works_ is a tool that processes the AST of a D module to extract several information used by dexed. - -It's notably used by the _symbol list_ and the _todo list_ widgets. - -## Build - -If dexed is build manually you certainly have to build _dastworx_ too. -Two options exist. - -#### Using dexed & the submodules - -- If you've cloned this repository, make sure that the submodule are also here with `git submodule update --init`. -- In Dexed open the project `dastworx.dxp`. -- Select the `release` configuration. -- Click `Compile project` - -#### Using the scripts - -- Windows: `build.bat` -- Linux: `sh ./build.sh` diff --git a/dastworx/src/imports.d b/dastworx/src/imports.d deleted file mode 100644 index a8a2af1d..00000000 --- a/dastworx/src/imports.d +++ /dev/null @@ -1,126 +0,0 @@ -module imports; - -import - std.stdio, std.algorithm, std.array, std.file, std.functional; -import - iz.memory; -import - dparse.lexer, dparse.ast, dparse.parser, dparse.rollback_allocator; -import - common; - -/** - * Lists the modules imported by a module - * - * On the first line writes the module name or # between double quotes then - * each import is written in a new line. Import detection is not accurate, - * the imports injected by a mixin template or by a string variable are not detected, - * the imports deactivated by a static condition neither. - * - * The results are used by to detect which are the static libraries used by a - * runnable module. - */ -void listImports(const(Module) mod) -in -{ - assert(mod); -} -body -{ - mixin(logCall); - if (mod.moduleDeclaration) - writeln('"', mod.moduleDeclaration.moduleName.identifiers - .map!(a => a.text).join("."), '"'); - else - writeln("\"#\""); - construct!(ImportLister).visit(mod); -} - -/** - * Lists the modules imported by several modules - * - * The output consists of several consecutive lists, as formated for - * listImports. When no moduleDeclaration is available, the first line of - * a list matches the filename. - * - * The results are used by to detect which are the static libraries used by a - * runnable module. - */ -void listFilesImports(string[] files) -{ - mixin(logCall); - RollbackAllocator allocator; - StringCache cache = StringCache(StringCache.defaultBucketCount); - LexerConfig config = LexerConfig("", StringBehavior.source); - ImportLister il = construct!(ImportLister); - foreach(fname; files) - { - ubyte[] source = cast(ubyte[]) std.file.read(fname); - Module mod = parseModule(getTokensForParser(source, config, &cache), - fname, &allocator, toDelegate(&ignoreErrors)); - if (mod.moduleDeclaration) - writeln('"', mod.moduleDeclaration.moduleName.identifiers - .map!(a => a.text).join("."), '"'); - else - writeln('"', fname, '"'); - il.visit(mod); - } -} - -private final class ImportLister: ASTVisitor -{ - alias visit = ASTVisitor.visit; - size_t mixinDepth; - - override void visit(const(Module) mod) - { - mixinDepth = 0; - mod.accept(this); - } - - override void visit(const ConditionalDeclaration decl) - { - bool acc = true; - if (decl.compileCondition) - { - const ver = decl.compileCondition.versionCondition; - if (ver && ver.token.text in badVersions) - acc = false; - } - if (acc) - decl.accept(this); - } - - override void visit(const(ImportDeclaration) decl) - { - foreach (const(SingleImport) si; decl.singleImports) - { - if (!si.identifierChain.identifiers.length) - continue; - si.identifierChain.identifiers.map!(a => a.text).join(".").writeln; - } - if (decl.importBindings) with (decl.importBindings.singleImport) - identifierChain.identifiers.map!(a => a.text).join(".").writeln; - } - - override void visit(const(MixinExpression) mix) - { - ++mixinDepth; - mix.accept(this); - --mixinDepth; - } - - override void visit(const PrimaryExpression primary) - { - if (mixinDepth && primary.primary.type.isStringLiteral) - { - assert(primary.primary.text.length > 1); - - size_t startIndex = 1; - startIndex += primary.primary.text[0] == 'q'; - parseAndVisit!(ImportLister)(primary.primary.text[startIndex..$-1]); - } - primary.accept(this); - } -} - diff --git a/dastworx/src/main.d b/dastworx/src/main.d deleted file mode 100644 index 32ad14f2..00000000 --- a/dastworx/src/main.d +++ /dev/null @@ -1,156 +0,0 @@ -module dastworx; - -import - core.memory; -import - std.array, std.getopt, std.stdio, std.path, std.algorithm, std.functional, - std.file; -import - iz.memory: construct; -import - iz.options: Argument, ArgFlags, ArgFlag, handleArguments, CantThrow; -import - dparse.lexer, dparse.parser, dparse.ast, dparse.rollback_allocator; -import - common, todos, symlist, imports, mainfun, halstead, ddoc_template; - - -void main(string[] args) -{ - foreach(ref buffer; stdin.byChunk(4096)) - Launcher.source.put(buffer); - handleArguments!(CantThrow, Launcher)(args[1..$]); -} - -struct Launcher -{ - static this() - { - GC.disable; - source.reserve(1024^^2); - } - - __gshared @Argument("-l") int caretLine; - __gshared @Argument("-o") bool option1; - - __gshared Appender!(ubyte[]) source; - __gshared string[] files; - - // -o : deep visit the symbols - // alias deepSymList = option1; - // -o : outputs /++ +/ ddoc instead of /** */ - // alias plusComment = option1; - - /// Writes the list of files to process - @Argument("-f") - static void setFiles(string value) - { - files = value - .splitter(pathSeparator) - .filter!exists - .array; - } - - /// Writes the symbol list - @Argument("-s", "", ArgFlags(ArgFlag.stopper)) - static void handleSymListOption() - { - mixin(logCall); - - static Appender!(AstErrors) errors; - - static void handleErrors(string fname, size_t line, size_t col, string message, bool err) - { - errors ~= construct!(AstError)(cast(ErrorType) err, message, line, col); - } - - RollbackAllocator alloc; - StringCache cache = StringCache(StringCache.defaultBucketCount); - LexerConfig config = LexerConfig("", StringBehavior.source); - - source.data - .getTokensForParser(config, &cache) - .parseModule("", &alloc, &handleErrors) - .listSymbols(errors.data, option1); - } - - /// Writes the list of todo comments - @Argument("-t", "", ArgFlags(ArgFlag.stopper)) - static void handleTodosOption() - { - mixin(logCall); - if (files.length) - getTodos(files); - } - - /// Writes the import list - @Argument("-i", "", ArgFlags(ArgFlag.stopper)) - static void handleImportsOption() - { - mixin(logCall); - if (files.length) - { - listFilesImports(files); - } - else - { - RollbackAllocator alloc; - StringCache cache = StringCache(StringCache.defaultBucketCount); - LexerConfig config = LexerConfig("", StringBehavior.source); - - source.data - .getTokensForParser(config, &cache) - .parseModule("", &alloc, toDelegate(&ignoreErrors)) - .listImports(); - } - } - - /// Writes if a main() is present in the module - @Argument("-m", "", ArgFlags(ArgFlag.stopper)) - static void handleMainfunOption() - { - mixin(logCall); - - RollbackAllocator alloc; - StringCache cache = StringCache(StringCache.defaultBucketCount); - LexerConfig config = LexerConfig("", StringBehavior.source); - - source.data - .getTokensForParser(config, &cache) - .parseModule("", &alloc, toDelegate(&ignoreErrors)) - .detectMainFun(); - } - - /// Writes the halstead metrics - @Argument("-H", "", ArgFlags(ArgFlag.stopper)) - static void handleHalsteadOption() - { - mixin(logCall); - - RollbackAllocator alloc; - StringCache cache = StringCache(StringCache.defaultBucketCount); - LexerConfig config = LexerConfig("", StringBehavior.source); - - source.data - .getTokensForParser(config, &cache) - .parseModule("", &alloc, toDelegate(&ignoreErrors)) - .performHalsteadMetrics; - } - - /// Writes the ddoc template for a given declaration - @Argument("-K", "", ArgFlags(ArgFlag.stopper)) - static void handleDdocTemplateOption() - { - mixin(logCall); - - RollbackAllocator alloc; - StringCache cache = StringCache(StringCache.defaultBucketCount); - LexerConfig config = LexerConfig("", StringBehavior.source); - - source.data - .getTokensForParser(config, &cache) - .parseModule("", &alloc, toDelegate(&ignoreErrors)) - .getDdocTemplate(caretLine, option1); - } -} - diff --git a/dexed-d/dub.json b/dexed-d/dub.json new file mode 100644 index 00000000..447e6743 --- /dev/null +++ b/dexed-d/dub.json @@ -0,0 +1,13 @@ +{ + "name" : "dexed-d", + "targetType" : "dynamicLibrary", + "targetPath" : "../bin", + "dependencies" : { + "libdparse" : { + "path" : "../etc/libdparse" + }, + "iz" : { + "path" : "../etc/iz" + } + } +} \ No newline at end of file diff --git a/dastworx/src/common.d b/dexed-d/src/common.d similarity index 89% rename from dastworx/src/common.d rename to dexed-d/src/common.d index 47966e4f..09cc8dd9 100644 --- a/dastworx/src/common.d +++ b/dexed-d/src/common.d @@ -1,7 +1,9 @@ module common; import - std.array, std.traits, std.meta, std.conv; + core.stdc.string; +import + std.array, std.traits, std.meta, std.conv, std.algorithm, std.file, std.path; import dparse.lexer, dparse.ast, dparse.parser, dparse.rollback_allocator; import @@ -385,7 +387,7 @@ unittest * This function is used to handle the content of a MixinExpression in an * ASTVisitor. */ -T parseAndVisit(T : ASTVisitor)(const(char)[] source) +T parseAndVisit(T : ASTVisitor, A...)(const(char)[] source, A a) { import std.functional; @@ -394,7 +396,7 @@ T parseAndVisit(T : ASTVisitor)(const(char)[] source) StringCache cache = StringCache(StringCache.defaultBucketCount); const(Token)[] tokens = getTokensForParser(cast(ubyte[]) source, config, &cache); Module mod = parseModule(tokens, "", &allocator, toDelegate(&ignoreErrors)); - T result = construct!(T); + T result = construct!(T)(a); result.visit(mod); return result; } @@ -406,3 +408,38 @@ T parseAndVisit(T : ASTVisitor)(const(char)[] source) void ignoreErrors(string, size_t, size_t, string, bool) @system {} +/** + * Iterator used to pass an array of strings from Freepascal to D. + */ +struct PPCharRange(C) +{ +private: + C ppChars; + C base; + int count; +public: + this(C ppChars, int count) + { + this.ppChars= ppChars; + this.count = count; + base = ppChars; + } + void popFront() { ppChars += size_t.sizeof; } + typeof(**ppChars)[] front() { return (*ppChars)[0 .. (*ppChars).strlen]; } + bool empty() { return ((ppChars - base) / size_t.sizeof) >= count; } +} + +PPCharRange!C ppcharRange(C)(C ppChars, int count) +{ + return PPCharRange!C(ppChars, count); +} + +/** + * Split a C string representing a list of filenames into an array of strings. + * The filenames are separated with the system path separator. + */ +alias joinedFilesToFiles = (const char* a) => a[0 .. a.strlen] + .splitter(pathSeparator) + .filter!exists + .filter!(b => b != "") + .array; diff --git a/dexed-d/src/ddemangle.d b/dexed-d/src/ddemangle.d new file mode 100644 index 00000000..380bdf9b --- /dev/null +++ b/dexed-d/src/ddemangle.d @@ -0,0 +1,36 @@ +module ddemangle; + +import core.demangle : demangle; +import std.regex : replaceAll, Captures, regex, Regex; +import core.stdc.string : strlen; + +extern(C): + +const(char)* ddemangle(const(char)* line) +{ + __gshared Regex!char reDemangle; + __gshared bool reInit; + if (!reInit) + { + reInit = true; + reDemangle = regex(r"\b_?_D[0-9a-zA-Z_]+\b"); + } + return replaceAll!(demangleMatch)(line[0 .. line.strlen], reDemangle).ptr; +} + +extern(D): private: + +const(char)[] demangleMatch(Captures!(const(char)[]) m) +{ + // If the second character is an underscore, it may be a D symbol with double leading underscore; + if (m.hit.length > 0 && m.hit[1] != '_') + { + return demangle(m.hit); + } + else + { + auto result = demangle(m.hit[1..$]); + return result == m.hit[1..$] ? m.hit : result; + } +} + diff --git a/dastworx/src/ddoc_template.d b/dexed-d/src/ddoc_template.d similarity index 58% rename from dastworx/src/ddoc_template.d rename to dexed-d/src/ddoc_template.d index 36103f23..70e4a452 100644 --- a/dastworx/src/ddoc_template.d +++ b/dexed-d/src/ddoc_template.d @@ -1,20 +1,47 @@ module ddoc_template; import - std.stdio; + core.stdc.string; +import + std.array, std.conv; import iz.memory, iz.sugar; import dparse.ast, dparse.lexer, dparse.parser, dparse.rollback_allocator; +import + common; /** * Finds the declaration at caretLine and write its ddoc template - * in the standard output. + * and returns its DDOC template as a C string. + * + * Params: + * src = the module source code, as a C string. + * caretLine = the line where the declaration is located. + * plusComment = indicates if the template use the "*" or the "+" decoration. */ -void getDdocTemplate(const(Module) mod, int caretLine, bool plusComment) +extern(C) const(char)* ddocTemplate(const(char)* src, int caretLine, bool plusComment) { + LexerConfig config; + RollbackAllocator rba; + StringCache sCache = StringCache(StringCache.defaultBucketCount); + + scope mod = src[0 .. src.strlen] + .getTokensForParser(config, &sCache) + .parseModule("", &rba, &ignoreErrors); + DDocTemplateGenerator dtg = construct!DDocTemplateGenerator(caretLine, plusComment); + scope(exit) destruct(dtg); dtg.visit(mod); + + return dtg.result; +} + +private void putLine(T...)(ref Appender!string a, T t) +{ + static foreach (i; 0 .. T.length) + a.put(t[i].to!string); + a.put("\n"); } final class DDocTemplateGenerator: ASTVisitor @@ -26,6 +53,7 @@ private: immutable int _caretline; immutable char c1; immutable char[2] c2; + Appender!string app; bool _throws; public: @@ -37,6 +65,8 @@ public: c2 = plusComment ? "++" : "**"; } + const(char)* result() { return app.data.ptr; } + override void visit(const(ThrowStatement) ts) { _throws = true; @@ -53,26 +83,26 @@ public: if (decl.name.line == _caretline) { decl.accept(this); - writeln("/", c2, "\n ", c1, " \n ", c1, " \n ", c1, " ", c1); + app.putLine("/", c2, "\n ", c1, " \n ", c1, " \n ", c1, " ", c1); const TemplateParameterList tpl = safeAccess(decl).templateParameters.templateParameterList; if ((tpl && tpl.items.length) || (decl.parameters && decl.parameters.parameters.length)) { - writeln(" ", c1, " \n ", c1, " Params:"); + app.putLine(" ", c1, " \n ", c1, " Params:"); if (tpl) { foreach(const TemplateParameter p; tpl.items) { if (p.templateAliasParameter) - writeln(" ", c1, " ", p.templateAliasParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateAliasParameter.identifier.text, " = "); else if (p.templateTupleParameter) - writeln(" ", c1, " ", p.templateTupleParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateTupleParameter.identifier.text, " = "); else if (p.templateTypeParameter) - writeln(" ", c1, " ", p.templateTypeParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateTypeParameter.identifier.text, " = "); else if (p.templateValueParameter) - writeln(" ", c1, " ", p.templateValueParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateValueParameter.identifier.text, " = "); } } if (decl.parameters) @@ -80,9 +110,9 @@ public: foreach(i, const Parameter p; decl.parameters.parameters) { if (p.name.text != "") - writeln(" ", c1, " ", p.name.text, " = "); + app.putLine(" ", c1, " ", p.name.text, " = "); else - writeln(" ", c1, " __param", i, " = "); + app.putLine(" ", c1, " __param", i, " = "); } } } @@ -90,15 +120,15 @@ public: if (const Type2 tp2 = safeAccess(decl).returnType.type2) { if (tp2.builtinType != tok!"void") - writeln(" ", c1, " \n ", c1, " Returns: "); + app.putLine(" ", c1, " \n ", c1, " Returns: "); } if (_throws) { - writeln(" ", c1, " \n ", c1, " Throws: "); + app.putLine(" ", c1, " \n ", c1, " Throws: "); } - writeln(" ", c1, "/"); + app.putLine(" ", c1, "/"); } else if (decl.name.line > _caretline) @@ -141,26 +171,26 @@ public: if (_caretline == line) { - writeln("/", c2, "\n ", c1, " \n ", c1, " \n ", c1, " ", c1); + app.putLine("/", c2, "\n ", c1, " \n ", c1, " \n ", c1, " ", c1); const TemplateParameterList tpl = safeAccess(decl).templateParameters.templateParameterList; if (tpl && tpl.items.length) { - writeln(" ", c1, " \n ", c1, " Params:"); + app.putLine(" ", c1, " \n ", c1, " Params:"); foreach(const TemplateParameter p; tpl.items) { if (p.templateAliasParameter) - writeln(" ", c1, " ", p.templateAliasParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateAliasParameter.identifier.text, " = "); else if (p.templateTupleParameter) - writeln(" ", c1, " ", p.templateTupleParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateTupleParameter.identifier.text, " = "); else if (p.templateTypeParameter) - writeln(" ", c1, " ", p.templateTypeParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateTypeParameter.identifier.text, " = "); else if (p.templateValueParameter) - writeln(" ", c1, " ", p.templateValueParameter.identifier.text, " = "); + app.putLine(" ", c1, " ", p.templateValueParameter.identifier.text, " = "); } } - writeln(" ", c1, "/"); + app.putLine(" ", c1, "/"); } else if (line > _caretline) @@ -169,61 +199,3 @@ public: } } -version(unittest) -{ - DDocTemplateGenerator parseAndVisit(const(char)[] source, int caretLine, bool p = false) - { - writeln; - RollbackAllocator allocator; - LexerConfig config = LexerConfig("", StringBehavior.source, WhitespaceBehavior.skip); - StringCache cache = StringCache(StringCache.defaultBucketCount); - const(Token)[] tokens = getTokensForParser(cast(ubyte[]) source, config, &cache); - Module mod = parseModule(tokens, "", &allocator); - DDocTemplateGenerator result = construct!(DDocTemplateGenerator)(caretLine, p); - result.visit(mod); - return result; - } -} - -unittest -{ - q{ module a; - void foo(A...)(A a){} - }.parseAndVisit(2, true); -} - -unittest -{ - q{ module a; - void foo()(){} - }.parseAndVisit(2); -} - -unittest -{ - q{ module a; - int foo(int){} - }.parseAndVisit(2, true); -} - -unittest -{ - q{ module a; - class Foo(T, A...){} - }.parseAndVisit(2); -} - -unittest -{ - q{ module a; - struct Foo(alias Fun, A...){} - }.parseAndVisit(2); -} - -unittest -{ - q{ module a; - enum trait(alias Variable) = whatever; - }.parseAndVisit(2); -} - diff --git a/dastworx/src/halstead.d b/dexed-d/src/halstead.d similarity index 95% rename from dastworx/src/halstead.d rename to dexed-d/src/halstead.d index 47ab789f..83475057 100644 --- a/dastworx/src/halstead.d +++ b/dexed-d/src/halstead.d @@ -1,5 +1,7 @@ module halstead; +import + core.stdc.string; import std.algorithm, std.conv, std.json, std.meta; import @@ -13,14 +15,36 @@ version(unittest){} else import /** * Retrieves the count and unique count of the operands and operators of - * each function (inc. methods) of a module. After the call the results are - * serialized as JSON in te standard output. + * each function (inc. member functions) of a module, allowing the compute + * the halstead complexity of the functions. + * + * Params: + * src = The source code of the module to analyze, as a C string. + * + * Returns: a string representing a JSON array named "functions". + * Each array item is a JSON object containing + * - a function name, named "name" (as JSONString) + * - a line number, named "line" (as JSONNumber) + * - the count of operators, named "n1count" (as JSONNumber) + * - the sum of operators, named "n1sum" (as JSONNumber) + * - the count of operands, named "n2count" (as JSONNumber) + * - the sum of operands, named "n2sum" (as JSONNumber) */ -void performHalsteadMetrics(const(Module) mod) +extern(C) const(char)* halsteadMetrics(const(char)* src) { + LexerConfig config; + RollbackAllocator rba; + StringCache sCache = StringCache(StringCache.defaultBucketCount); + + scope mod = src[0 .. src.strlen] + .getTokensForParser(config, &sCache) + .parseModule("", &rba, &ignoreErrors); + HalsteadMetric hm = construct!(HalsteadMetric); + scope (exit) destruct(hm); + hm.visit(mod); - hm.serialize; + return hm.serialize(); } private struct Function @@ -57,11 +81,6 @@ private final class HalsteadMetric: ASTVisitor void processCallChain() { - version(none) - { - import std.array : join; - writeln("chain: ", chain.map!(a => a.identifier.text).join(".")); - } if (chain.length) { static Token getIdent(const(IdentifierOrTemplateInstance) i) @@ -115,11 +134,11 @@ private final class HalsteadMetric: ASTVisitor inFunctionCallChain.length++; } - void serialize() + const(char)* serialize() { JSONValue js; js["functions"] = fs; - js.toString.write; + return js.toString.ptr; } override void visit(const(PragmaExpression)){} diff --git a/dexed-d/src/imports.d b/dexed-d/src/imports.d new file mode 100644 index 00000000..5c4a55e4 --- /dev/null +++ b/dexed-d/src/imports.d @@ -0,0 +1,152 @@ +module imports; + +import + core.stdc.string; +import + std.algorithm, std.array, std.file, std.functional; +import + iz.memory; +import + dparse.lexer, dparse.ast, dparse.parser, dparse.rollback_allocator; +import + common; + +private alias moduleDeclarationToText = (ModuleDeclaration md) => md.moduleName + .identifiers + .map!(a => a.text) + .join("."); + +/** + * Lists the modules imported by a module + * + * On the first line writes the module name or # between double quotes then + * each import is written on a new line. Import detection is not accurate, + * the imports injected by a mixin template or by a string variable are not detected, + * the imports deactivated by a static condition neither. + * + * The results are used by to automatically detect the static libraries used by a + * dexed runnable module. + */ +extern(C) string[] listImports(const(char)* src) +{ + string[] result; + LexerConfig config; + RollbackAllocator rba; + StringCache sCache = StringCache(StringCache.defaultBucketCount); + + scope mod = src[0 .. src.strlen] + .getTokensForParser(config, &sCache) + .parseModule("", &rba, &ignoreErrors); + if (auto md = mod.moduleDeclaration) + result ~= '"' ~ moduleDeclarationToText(md) ~ '"'; + else + result ~= "\"#\""; + + ImportLister il = construct!(ImportLister)(&result); + scope (exit) destruct(il); + + il.visit(mod); + return result; +} + +/** + * Lists the modules imported by several modules + * + * The output consists of several consecutive lists, as formated for + * listImports. When no moduleDeclaration is available, the first line of + * a list matches the filename. + * + * The results are used by to build a key value store linking libraries to other + * libraries, which is part of dexed "libman". + */ +extern(C) string[] listFilesImports(const(char)* joinedFiles) +{ + string[] result; + RollbackAllocator rba; + StringCache sCache = StringCache(StringCache.defaultBucketCount); + LexerConfig config = LexerConfig("", StringBehavior.source); + ImportLister il = construct!(ImportLister)(&result); + + scope(exit) destruct(il); + + foreach(fname; joinedFilesToFiles(joinedFiles)) + { + scope mod = readText(fname) + .getTokensForParser(config, &sCache) + .parseModule("", &rba, &ignoreErrors); + if (auto md = mod.moduleDeclaration) + result ~= '"' ~ moduleDeclarationToText(md) ~ '"'; + else + result ~= '"' ~ cast(string)fname ~ '"'; + + il.visit(mod); + } + + return result; +} + +private final class ImportLister: ASTVisitor +{ + alias visit = ASTVisitor.visit; + size_t mixinDepth; + string[]* results; + + this(string[]* results) + { + assert(results); + this.results = results; + } + + override void visit(const(Module) mod) + { + mixinDepth = 0; + mod.accept(this); + } + + override void visit(const ConditionalDeclaration decl) + { + bool acc = true; + if (decl.compileCondition) + { + const ver = decl.compileCondition.versionCondition; + if (ver && ver.token.text in badVersions) + acc = false; + } + if (acc) + decl.accept(this); + } + + override void visit(const(ImportDeclaration) decl) + { + foreach (const(SingleImport) si; decl.singleImports) + { + if (!si.identifierChain.identifiers.length) + continue; + *results ~= si.identifierChain.identifiers.map!(a => a.text).join("."); + } + if (decl.importBindings) with (decl.importBindings.singleImport) + *results ~= identifierChain.identifiers.map!(a => a.text).join("."); + } + + override void visit(const(MixinExpression) mix) + { + ++mixinDepth; + mix.accept(this); + --mixinDepth; + } + + override void visit(const PrimaryExpression primary) + { + if (mixinDepth && primary.primary.type.isStringLiteral) + { + assert(primary.primary.text.length > 1); + + size_t startIndex = 1; + startIndex += primary.primary.text[0] == 'q'; + auto il = parseAndVisit!(ImportLister)(primary.primary.text[startIndex..$-1], results); + destruct(il); + } + primary.accept(this); + } +} + diff --git a/dastworx/src/mainfun.d b/dexed-d/src/mainfun.d similarity index 61% rename from dastworx/src/mainfun.d rename to dexed-d/src/mainfun.d index c837fc47..bac17098 100644 --- a/dastworx/src/mainfun.d +++ b/dexed-d/src/mainfun.d @@ -5,33 +5,40 @@ import import iz.memory, iz.sugar; import - dparse.lexer, dparse.ast, dparse.parser; + core.stdc.string; +import + dparse.lexer, dparse.parser, dparse.ast, dparse.rollback_allocator; import common; /** - * Detects wether a main function is declared in a module. - * - * Writes "1" if a main is found otherwise "0". The detection is not accurate, - * if the main is injected by a mixin template or by a string it is not detected, - * if the main is deactivated by a static condition neither. - * - * The result is used to determine if the "-main" switch has to be passed to - * the compiler when a runnable module is executed or a module tested. + * Params: + * src = The source code for the module, as a null terminated string. + * Returns: + * wether a module contains the main function. */ -void detectMainFun(const(Module) mod) +extern(C) bool hasMainFun(const(char)* src) { - mixin(logCall); + LexerConfig config; + RollbackAllocator rba; + StringCache sCache = StringCache(StringCache.defaultBucketCount); + + scope mod = src[0 .. src.strlen] + .getTokensForParser(config, &sCache) + .parseModule("", &rba, &ignoreErrors); + MainFunctionDetector mfd = construct!(MainFunctionDetector); + scope (exit) destruct(mfd); + mfd.visit(mod); - write(mfd.hasMain); + return mfd.hasMain; } private final class MainFunctionDetector: ASTVisitor { alias visit = ASTVisitor.visit; - ubyte hasMain; + bool hasMain; override void visit(const ConditionalDeclaration decl) { diff --git a/dastworx/src/symlist.d b/dexed-d/src/symlist.d similarity index 87% rename from dastworx/src/symlist.d rename to dexed-d/src/symlist.d index eb780a71..d8f5f594 100644 --- a/dastworx/src/symlist.d +++ b/dexed-d/src/symlist.d @@ -1,28 +1,53 @@ module symlist; import - std.stdio, std.array, std.traits, std.conv, std.json, std.format, + core.stdc.string; +import + std.array, std.traits, std.conv, std.json, std.format, std.algorithm; import - iz.memory: construct; + iz.memory: construct, destruct; import iz.containers : Array; import dparse.lexer, dparse.ast, dparse.parser, dparse.formatter : Formatter; +import + dparse.rollback_allocator; import common; /** - * Serializes the symbols in the standard output + * Visit and enumerate all the declaration of a module. + * + * Params: + * src = The module to visit, as source code. + * deep = Defines if the nested declarations are visited. + * Returns: + * The serialized symbols, as a C string. */ -void listSymbols(const(Module) mod, AstErrors errors, bool deep = true) +extern(C) const(char)* listSymbols(const(char)* src, bool deep) { - mixin(logCall); + Appender!(AstErrors) errors; + + void handleErrors(string fname, size_t line, size_t col, string message, bool err) + { + errors ~= construct!(AstError)(cast(ErrorType) err, message, line, col); + } + + LexerConfig config; + RollbackAllocator rba; + StringCache sCache = StringCache(StringCache.defaultBucketCount); + + scope mod = src[0 .. src.strlen] + .getTokensForParser(config, &sCache) + .parseModule("", &rba, &handleErrors); + alias SL = SymbolListBuilder!(ListFmt.Pas); - SL.addAstErrors(errors); - SL sl = construct!(SL)(deep); + SL sl = construct!(SL)(errors, deep); + scope(exit) destruct(sl); + sl.visit(mod); - sl.serialize.writeln; + return sl.serialize(); } private: @@ -68,27 +93,22 @@ final class SymbolListBuilder(ListFmt Fmt): ASTVisitor static if (Fmt == ListFmt.Pas) { - static Appender!string pasStream; + Appender!(char[]) pasStream; } else { - static JSONValue json; - static JSONValue* jarray; + JSONValue json; + JSONValue* jarray; } - static Array!(char) funcNameApp; - static Formatter!(typeof(&funcNameApp)) fmtVisitor; - static uint utc; + Array!char funcNameApp; + Formatter!(Array!char*) fmtVisitor; + uint utc; - this(bool deep) + this(Appender!(AstErrors) errors, bool deep) { _deep = deep; - } - - alias visit = ASTVisitor.visit; - - static this() - { + funcNameApp.length = 0; static if (Fmt == ListFmt.Pas) { pasStream.put("object TSymbolList\rsymbols=<"); @@ -99,9 +119,12 @@ final class SymbolListBuilder(ListFmt Fmt): ASTVisitor jarray = &json; } fmtVisitor = construct!(typeof(fmtVisitor))(&funcNameApp); + addAstErrors(errors.data); } - static void addAstErrors(AstErrors errors) + alias visit = ASTVisitor.visit; + + void addAstErrors(AstErrors errors) { foreach(error; errors) { @@ -129,21 +152,21 @@ final class SymbolListBuilder(ListFmt Fmt): ASTVisitor } } - string serialize() + const(char)* serialize() { static if (Fmt == ListFmt.Pas) { pasStream.put(">\rend"); - return pasStream.data; + return pasStream.data.ptr; } else { JSONValue result = parseJSON("{}"); result["items"] = json; version (assert) - return result.toPrettyString; + return result.toPrettyString.ptr; else - return result.toString; + return result.toString.ptr; } } diff --git a/dastworx/src/todos.d b/dexed-d/src/todos.d similarity index 82% rename from dastworx/src/todos.d rename to dexed-d/src/todos.d index 727690b3..56242e95 100644 --- a/dastworx/src/todos.d +++ b/dexed-d/src/todos.d @@ -8,27 +8,27 @@ import import common; -private __gshared Appender!string stream; - -void getTodos(string[] files) +extern(C) const(char)* todoItems(const(char)* joinedFiles) { - mixin(logCall); - stream.reserve(32 + 256 * files.length); + scope Appender!string stream; + stream.reserve(32); stream.put("object TTodoItems\ritems=<"); - foreach(fname; files) + foreach(fname; joinedFilesToFiles(joinedFiles)) { - StringCache cache = StringCache(StringCache.defaultBucketCount); - LexerConfig config = LexerConfig(fname, StringBehavior.source); + stream.reserve(256); + scope StringCache cache = StringCache(StringCache.defaultBucketCount); + scope LexerConfig config = LexerConfig("", StringBehavior.source); ubyte[] source = cast(ubyte[]) std.file.read(fname); - foreach(ref token; DLexer(source, config, &cache).array + foreach(ref token; DLexer(source, config, &cache) + .array .filter!((a) => a.type == tok!"comment")) - analyze(token, fname); + analyze(token, fname, stream); } stream.put(">end"); - writeln(stream.data); + return stream.data.ptr; } -private void analyze(const(Token) token, string fname) +private void analyze(const(Token) token, const(char)[] fname, ref Appender!string stream) { string text = token.text.strip.patchPascalString; string identifier; diff --git a/lazproj/dexed.lpi b/lazproj/dexed.lpi index 1b6adb5a..faaa8807 100644 --- a/lazproj/dexed.lpi +++ b/lazproj/dexed.lpi @@ -409,6 +409,7 @@ + @@ -443,6 +444,9 @@ + + + @@ -455,6 +459,7 @@ + @@ -487,6 +492,9 @@ + + + @@ -495,9 +503,20 @@ + + + + + - + + + + + + + @@ -526,7 +545,7 @@ - + @@ -789,63 +808,59 @@ - + - + - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -856,6 +871,7 @@ + @@ -880,13 +896,20 @@ + + + - + + + + + diff --git a/lazproj/dexed.lpr b/lazproj/dexed.lpr index 033969d3..c34e63d7 100644 --- a/lazproj/dexed.lpr +++ b/lazproj/dexed.lpr @@ -7,12 +7,12 @@ uses cthreads, {$ENDIF}{$ENDIF} Interfaces, Forms, lazcontrols, runtimetypeinfocontrols, anchordockpkg, - tachartlazaruspkg, u_sharedres, u_observer, u_libman, u_symstring, - u_tools, u_dcd, u_main, u_writableComponent, + tachartlazaruspkg, u_sharedres, u_dexed_d, u_observer, u_libman, + u_symstring, u_tools, u_dcd, u_main, u_writableComponent, u_inspectors, u_editoroptions, u_dockoptions, u_shortcutseditor, u_mru, u_processes, u_dialogs, u_dubprojeditor, u_controls, u_dfmt, u_lcldragdrop, u_stringrange, u_dlangmaps, u_projgroup, u_projutils, - u_d2synpresets, u_dastworx, u_dbgitf, u_ddemangle, u_dubproject, + u_d2synpresets, u_dbgitf, u_ddemangle, u_dubproject, u_halstead, u_diff, u_profileviewer, u_semver, u_term, u_simpleget; {$R *.res} diff --git a/lazproj/dside.sh b/lazproj/dside.sh new file mode 100644 index 00000000..1bdf40bd --- /dev/null +++ b/lazproj/dside.sh @@ -0,0 +1,11 @@ +cd ../dexed-d + +if [ "$1" == "RELEASE" ]; then + dub build --build=release --compiler=ldc2 +elif [ "$1" == "DEBUG" ]; then + dub build --build=debug --compiler=ldc2 +elif [ "$1" == "" ]; then + dub build --compiler=ldc2 +fi + +cd ../lazproj diff --git a/setup/build-release.sh b/setup/build-release.sh index 8be0ea51..175d7f36 100644 --- a/setup/build-release.sh +++ b/setup/build-release.sh @@ -8,10 +8,18 @@ dcd_ver="" dscanner_ver="" echo "building dexed release" $ver -# dastworx -cd dastworx -bash build.sh -cd .. +# libdexed-d shared objects +if [ ! -d "./bin" ]; then + mkdir "./bin" +fi +LDC_SHARED10=$(find "/dlang/" -iname "libdruntime-ldc-shared.so.*" 2>/dev/null | grep -m 1 "lib/libdruntime-ldc-shared") +LDC_SHARED11=$(find "/dlang/" -iname "libdruntime-ldc-shared.so" 2>/dev/null | grep -m 1 "lib/libdruntime-ldc-shared") +LDC_SHARED20=$(find "/dlang/" -iname "libphobos2-ldc-shared.so.*" 2>/dev/null | grep -m 1 "lib/libphobos2-ldc-shared") +LDC_SHARED21=$(find "/dlang/" -iname "libphobos2-ldc-shared.so" 2>/dev/null | grep -m 1 "lib/libphobos2-ldc-shared") +cp "$LDC_SHARED10" "./bin" +cp "$LDC_SHARED11" "./bin" +cp "$LDC_SHARED20" "./bin" +cp "$LDC_SHARED21" "./bin" # dexed echo "building dexed..." @@ -30,12 +38,12 @@ else cd dcd git pull fi -git submodule update --init --recursive git fetch --tags if [ ! -z "$dcd_ver" ]; then git checkout $dcd_ver fi -make ldc +dub build --build=release --config=client --compiler=$DC +dub build --build=release --config=server --compiler=$DC echo "...done" cd .. @@ -48,12 +56,11 @@ else cd d-scanner git pull fi -git submodule update --init --recursive git fetch --tags if [ ! -z "$dscanner_ver" ]; then git checkout $dscanner_ver fi -make ldc +dub build --build=release --compiler=$DC echo "...done" cd .. @@ -83,7 +90,11 @@ bash deb.sh echo "...done" SETUP_APP_NAME="dexed.$ver.linux64.setup" echo "building the custom setup program..." -ldmd2 setup.d -O -release -Jnux64 -J./ -of"output/"$SETUP_APP_NAME +SETUP_DC=$DC +if [ "$SETUP_DC" = ldc2 ]; then + SETUP_DC=ldmd +fi +$SETUP_DC setup.d -O -release -Jnux64 -J./ -of"output/"$SETUP_APP_NAME bash zip-nux64.sh bash setupzip-nux-noarch.sh $SETUP_APP_NAME echo "...done" @@ -102,7 +113,7 @@ if [ ! -z "$GITLAB_CI" ]; then ZP2_NAME="dexed.$ver.linux64.zip" # read the log - ldc2 extract_last_changelog_part.d + $DC extract_last_changelog_part.d LOG=$(./extract_last_changelog_part) LOG=$(echo "$LOG" | sed -z 's/\n/\\n/g' | sed -z 's/\"/\\"/g') diff --git a/setup/deb.sh b/setup/deb.sh index e1ee1322..1328bc95 100644 --- a/setup/deb.sh +++ b/setup/deb.sh @@ -25,7 +25,6 @@ mkdir -p $pixdir mkdir -p $shcdir cp nux64/dexed $bindir -cp nux64/dastworx $bindir cp nux64/dexed.png $pixdir echo "[Desktop Entry] diff --git a/setup/rpm.sh b/setup/rpm.sh index c027585b..a65ee031 100644 --- a/setup/rpm.sh +++ b/setup/rpm.sh @@ -44,7 +44,6 @@ mkdir -p $pixdir mkdir -p $shcdir cp nux64/dexed $bindir -cp nux64/dastworx $bindir cp nux64/dexed.png $pixdir echo "[Desktop Entry] @@ -71,7 +70,6 @@ Requires: gtk2, glibc, cairo, libX11, vte Dexed is an IDE for the DMD D compiler. %files -/usr/bin/dastworx /usr/bin/dexed /usr/share/applications/dexed.desktop /usr/share/pixmaps/dexed.png diff --git a/setup/setup.d b/setup/setup.d index 075633c7..4c8bf6b3 100644 --- a/setup/setup.d +++ b/setup/setup.d @@ -35,8 +35,7 @@ struct Resource immutable Resource[] ceResources = [ - Resource(cast(ImpType) import("dexed" ~ exeExt), "dexed" ~ exeExt, Kind.exe), - Resource(cast(ImpType) import("dastworx" ~ exeExt), "dastworx" ~ exeExt, Kind.exe), + Resource(cast(ImpType) import("dexed" ~ exeExt), "dexed" ~ exeExt, Kind.exe), Resource(cast(ImpType) import("dexed.ico"), "dexed.ico", Kind.dat), Resource(cast(ImpType) import("dexed.png"), "dexed.png", Kind.dat), Resource(cast(ImpType) import("dexed.license.txt"), "dexed.license.txt", Kind.doc) @@ -54,6 +53,7 @@ immutable Resource[] oldResources = [ Resource(cast(ImpType) [], "cesyms" ~ exeExt, Kind.exe), Resource(cast(ImpType) [], "cetodo" ~ exeExt, Kind.exe), + Resource(cast(ImpType) [], "dastworx" ~ exeExt, Kind.exe), ]; version(Windows) diff --git a/setup/zip-nux32.sh b/setup/zip-nux32.sh index 277a37ac..819f3e00 100644 --- a/setup/zip-nux32.sh +++ b/setup/zip-nux32.sh @@ -6,7 +6,7 @@ cp * $fld/ zip -9 \ ../output/dexed.${ver:1:100}.linux32.zip \ $fld/dcd.license.txt $fld/dexed.license.txt \ -$fld/dexed $fld/dastworx \ +$fld/dexed \ $fld/dexed.ico $fld/dexed.png \ $fld/dcd-server $fld/dcd-client $fld/dscanner rm -rf dexed-x86 diff --git a/setup/zip-nux64.sh b/setup/zip-nux64.sh index f284d316..754a368c 100644 --- a/setup/zip-nux64.sh +++ b/setup/zip-nux64.sh @@ -6,7 +6,7 @@ cp * $fld/ zip -9 \ ../output/dexed.${ver:1:100}.linux64.zip \ $fld/dcd.license.txt $fld/dexed.license.txt \ -$fld/dexed $fld/dastworx \ +$fld/dexed \ $fld/dexed.ico $fld/dexed.png \ $fld/dcd-server $fld/dcd-client $fld/dscanner rm -rf dexed-x86_64 diff --git a/setup/zip-win32.bat b/setup/zip-win32.bat index 8b3ac18c..92ab5632 100644 --- a/setup/zip-win32.bat +++ b/setup/zip-win32.bat @@ -5,7 +5,7 @@ cd win32 7z a -tzip -mx9^ ..\output\dexed.%ver%.win32.zip^ dcd.license.txt dexed.license.txt^ - dexed.exe dastworx.exe^ + dexed.exe^ dexed.ico dexed.png^ dcd-server.exe dcd-client.exe dscanner.exe^ - libeay32.dll ssleay32.dll \ No newline at end of file + libeay32.dll ssleay32.dll diff --git a/setup/zip-win64.bat b/setup/zip-win64.bat index c2227e64..d32c071c 100644 --- a/setup/zip-win64.bat +++ b/setup/zip-win64.bat @@ -5,7 +5,7 @@ cd win64 7z a -tzip -mx9^ ..\output\dexed.%ver%.win64.zip^ dcd.license.txt dexed.license.txt^ - dexed.exe dastworx.exe^ + dexed.exe^ dexed.ico dexed.png^ dcd-server.exe dcd-client.exe dscanner.exe^ - libeay32.dll ssleay32.dll \ No newline at end of file + libeay32.dll ssleay32.dll diff --git a/src/u_ceproject.pas b/src/u_ceproject.pas index b9f0bb9a..77284d46 100644 --- a/src/u_ceproject.pas +++ b/src/u_ceproject.pas @@ -13,7 +13,7 @@ uses {$ENDIF} Classes, SysUtils, process, strUtils, RegExpr, u_common, u_writableComponent, u_dmdwrap, u_observer, u_interfaces, - u_processes, LazFileUtils, u_dastworx; + u_processes, LazFileUtils, u_dexed_d; type diff --git a/src/u_dastworx.pas b/src/u_dastworx.pas deleted file mode 100644 index 61cd7ed3..00000000 --- a/src/u_dastworx.pas +++ /dev/null @@ -1,198 +0,0 @@ -unit u_dastworx; -{$I u_defines.inc} - -interface - -uses - Classes, SysUtils, process, jsonscanner, fpjson, jsonparser, - u_common; - -(** - * Gets the module name and the imports of the source code located in - * "source". The first line of "import" contains the module name, double quoted. - * Each following line contain an import. - *) -procedure getModuleImports(source, imports: TStrings); - -(** - * Gets the module names and the imports of the sources in "files". - * source. Each line in "import" that contains double quoted text indicates - * that a new group of import starts. - *) -procedure getModulesImports(files: string; results: TStrings); - -procedure getHalsteadMetrics(source: TStrings; out jsn: TJSONObject); - -procedure getDdocTemplate(source, res: TStrings;caretLine: integer; plusComment: boolean); - -implementation - -var - toolname: string; - -function getToolName: string; -begin - if toolname = '' then - toolname := exeFullName('dastworx' + exeExt); - exit(toolname); -end; - -procedure getModuleImports(source, imports: TStrings); -var - str: string; - prc: TProcess; -begin - str := getToolName; - if str.isEmpty then - exit; - prc := TProcess.Create(nil); - try - prc.Executable := str; - prc.Parameters.Add('-i'); - prc.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; - prc.ShowWindow := swoHIDE; - prc.Execute; - str := source.Text; - prc.Input.Write(str[1], str.length); - prc.CloseInput; - processOutputToStrings(prc, imports); - while prc.Running do ; - {$IFDEF DEBUG} - tryRaiseFromStdErr(prc); - {$ENDIF} - finally - prc.free; - end; -end; - -procedure getModulesImports(files: string; results: TStrings); -var - str: string; - prc: TProcess; - {$ifdef WINDOWS} - cdr: string = ''; - itm: string; - spl: TStringList; - i: integer; - {$endif} -begin - str := getToolName; - if str.isEmpty then - exit; - {$ifdef WINDOWS} - if files.length > 32760{not 8 : "-f -i" length} then - begin - spl := TStringList.Create; - try - spl.LineBreak := ';'; - spl.AddText(files); - cdr := commonFolder(spl); - if not cdr.dirExists then - begin - dlgOkError('Impossible to find the common directory in the list to analyze the imports: ' + shortenPath(files, 200)); - exit; - end; - for i:= 0 to spl.count-1 do - begin - itm := spl.strings[i]; - spl.strings[i] := itm[cdr.length + 2 .. itm.length]; - end; - files := spl.strictText; - if files.length > 32760 then - begin - dlgOkError('Too much files in the list to analyze the imports: ' + shortenPath(files, 200)); - exit; - end; - finally - spl.Free; - end; - end; - {$endif} - prc := TProcess.Create(nil); - try - prc.Executable := str; - prc.Parameters.Add('-f' + files); - prc.Parameters.Add('-i'); - prc.Options := [poUsePipes {$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; - prc.ShowWindow := swoHIDE; - {$ifdef WINDOWS} - if cdr.isNotEmpty then - prc.CurrentDirectory := cdr; - {$endif} - prc.Execute; - prc.CloseInput; - processOutputToStrings(prc, results); - while prc.Running do ; - {$IFDEF DEBUG} - tryRaiseFromStdErr(prc); - {$ENDIF} - finally - prc.free; - end; -end; - -procedure getHalsteadMetrics(source: TStrings; out jsn: TJSONObject); -var - prc: TProcess; - prs: TJSONParser; - jps: TJSONData; - str: string; - lst: TStringList; -begin - str := getToolName; - if str.isEmpty then - exit; - prc := TProcess.Create(nil); - lst := TStringList.create; - try - prc.Executable := str; - prc.Parameters.Add('-H'); - prc.Options := [poUsePipes {$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; - prc.ShowWindow := swoHIDE; - prc.Execute; - str := source.Text; - prc.Input.Write(str[1], str.length); - prc.CloseInput; - processOutputToStrings(prc, lst); - prs := TJSONParser.Create(lst.Text, [joIgnoreTrailingComma, joUTF8]); - jps := prs.Parse; - if jps.isNotNil and (jps.JSONType = jtObject) then - jsn := TJSONObject(jps.Clone); - jps.Free; - while prc.Running do ; - finally - prs.Free; - prc.Free; - lst.free; - end; -end; - -procedure getDdocTemplate(source, res: TStrings; caretLine: integer; plusComment: boolean); -var - prc: TProcess; - str: string; -begin - str := getToolName; - if str.isEmpty then - exit; - prc := TProcess.Create(nil); - try - prc.Executable := str; - prc.Parameters.Add('-l' + caretLine.ToString); - if plusComment then - prc.Parameters.Add('-o'); - prc.Parameters.Add('-K'); - prc.Options := [poUsePipes {$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; - prc.ShowWindow := swoHIDE; - prc.Execute; - str := source.Text; - prc.Input.Write(str[1], str.length); - prc.CloseInput; - processOutputToStrings(prc, res); - finally - prc.Free; - end; -end; - -end. - diff --git a/src/u_ddemangle.pas b/src/u_ddemangle.pas index 40a67c09..f273be2a 100644 --- a/src/u_ddemangle.pas +++ b/src/u_ddemangle.pas @@ -6,23 +6,7 @@ interface uses Classes, SysUtils, process, forms, - u_processes, u_common, u_stringrange; - -type - - TDDemangler = class - strict private - fActive: boolean; - fProc: TDexedProcess; - fList, fOut: TStringList; - procedure procTerminate(sender: TObject); - public - constructor create; - destructor destroy; override; - procedure demangle(const value: string); - property output: TStringList read fList; - property active: boolean read fActive; - end; + u_dexed_d; // demangle a D name function demangle(const value: string): string; @@ -31,96 +15,33 @@ procedure demangle(values, output: TStrings); implementation -var - demangler: TDDemangler; - -constructor TDDemangler.create; -begin - fList := TStringList.Create; - fOut := TStringList.Create; - fProc := TDexedProcess.create(nil); - fProc.Options:= [poUsePipes]; - fProc.OnTerminate:=@procTerminate; - fProc.ShowWindow:= swoHIDE; - fProc.Executable := exeFullName('ddemangle' + exeExt); - {$IFDEF POSIX} - // Arch Linux users can have the tool setup w/o DMD - if fProc.Executable.isEmpty then - fProc.Executable := exeFullName('dtools-ddemangle'); - {$ENDIF} - if fProc.Executable.isNotEmpty and - fProc.Executable.fileExists then - begin - fProc.execute; - fActive := true; - end; - fActive := fProc.Running; -end; - -destructor TDDemangler.destroy; -begin - if fProc.Running then - fProc.Terminate(0); - fProc.Free; - fOut.Free; - fList.Free; - inherited; -end; - -procedure TDDemangler.procTerminate(sender: TObject); -begin - fActive := false; -end; - -procedure TDDemangler.demangle(const value: string); -var - nb: integer; -begin - if value.isNotEmpty then - fProc.Input.Write(value[1], value.length); - fProc.Input.WriteByte(10); - while true do - begin - nb := fProc.NumBytesAvailable; - if nb <> 0 then - break; - end; - fProc.fillOutputStack; - fProc.getFullLines(fOut); - if fOut.Count <> 0 then - fList.Add(fOut[0]); -end; - function demangle(const value: string): string; +var + s: pchar; begin - if demangler.active and (pos('_D', value) > 0) then + if (value.Length > 0) and (pos('_D', value) > 0) then begin - demangler.output.Clear; - demangler.demangle(value); - if demangler.output.Count <> 0 then - result := demangler.output[0] - else - result := value; + s := pchar(value); + // note, assign to result has for effect to alloc a FPC string + // (by implicit convertion) so the D memory is not used. + result := ddemangle(s); end - else result := value; + else + result := value; end; procedure demangle(values, output: TStrings); var + i: integer; value: string; begin - if demangler.active then + for i := 0 to values.Count-1 do begin - for value in values do - demangler.demangle(value); - output.AddStrings(demangler.output); - demangler.output.Clear; - end - else output.AddStrings(values); + value := values[i]; + if pos('_D', value) > 0 then + value := demangle(PChar(value)); + output.AddStrings(value); + end; end; -initialization - demangler := TDDemangler.create; -finalization - demangler.Free; end. diff --git a/src/u_dexed_d.pas b/src/u_dexed_d.pas new file mode 100644 index 00000000..4f637d56 --- /dev/null +++ b/src/u_dexed_d.pas @@ -0,0 +1,122 @@ +// ObjFPC counterpart for the libdexed-d library. +unit u_dexed_d; + +{$I u_defines.inc} + +interface + +uses + Classes, SysUtils; + +type + + (** + * Provides a view on D builtin dynamic arrays. + * + * Note that it is only partially read-only. + * The content should never be modified as it's likely to be + * allocated in D GC memory pool. + *) + generic TDArray = record + type + PT = ^T; + strict private + fLength: PtrUInt; + fPtr: PT; + function getItem(index: PtrUint): T; + public + // The count of elements + property length: PtrUInt read fLength; + // Pointer to the first element. + property ptr: PT read fPtr; + // overload "[]" + property item[index: PtrUint]: T read getItem; default; + end; + + // Give a view on D `char[]` + TDString = specialize TDArray ; + + // Give a view on D `char[][]` + TDStrings = specialize TDArray; + +{$LINKLIB libphobos2-ldc-shared} +// Necessary to start the GC, run the static constructors, etc +procedure rt_init(); cdecl; external 'libdruntime-ldc-shared'; +// Cleanup +procedure rt_term(); cdecl; external 'libdruntime-ldc-shared'; +// Demangle a line possibly containing a D mangled name. +function ddemangle(const text: PChar): PChar; cdecl; external 'libdexed-d'; +// Detects wether the source code for the module `src` contains the main() function. +function hasMainFun(const src: PChar): Boolean; cdecl; external 'libdexed-d'; +// Returns the DDOC template for the declaration location at `caretLine` in the source code `src`. +function ddocTemplate(const src: PChar; caretLine: integer; plusComment: Boolean): PChar; cdecl; external 'libdexed-d'; +// List the imports of the module represented by `src`. +function listImports(const src: PChar): TDStrings; cdecl; external 'libdexed-d'; +// List the imports of the modules located in `files` (list of files joined with pathseparaotr and null terminated) +function listFilesImports(const files: PChar): TDStrings; cdecl; external 'libdexed-d'; +// Get the variables necessary to compute the Halstead metrics of the functions within a module. +function halsteadMetrics(const src: PChar): PChar; cdecl; external 'libdexed-d'; +// Get the list of declarations within a module. +function listSymbols(const src: PChar; deep: Boolean): PChar; cdecl; external 'libdexed-d'; +// Get the TODO items located in `files` (list of files joined with pathseparaotr and null terminated) +function todoItems(joinedFiles: PChar): PChar; cdecl; external 'libdexed-d'; + +(** + * Gets the module name and the imports of the source code located in + * "source". The first line of "import" contains the module name, double quoted. + * Each following line contain an import. + *) +procedure getModuleImports(source, imports: TStrings); + +(** + * Gets the module names and the imports of the sources in "files". + * source. Each line in "import" that contains double quoted text indicates + * that a new group of import starts. + *) +procedure getModulesImports(files: string; results: TStrings); + +implementation + +function TDArray.getItem(index: PtrUint): T; +begin + result := (fPtr + index)^; +end; + + +procedure getModuleImports(source, imports: TStrings); +var + i: TDStrings; + e: TDstring; + j: integer; + s: string; +begin + i := listImports(PChar(source.Text)); + for j := 0 to i.length-1 do + begin + e := i[j]; + s := e.ptr[0 .. e.length-1]; + imports.Add(s); + end; +end; + +procedure getModulesImports(files: string; results: TStrings); +var + i: TDStrings; + e: TDstring; + j: integer; + s: string; +begin + i := listFilesImports(PChar(files)); + for j := 0 to i.length-1 do + begin + e := i[j]; + s := e.ptr[0 .. e.length-1]; + results.Add(s); + end; +end; + +initialization + rt_init(); +finalization + rt_term(); +end. diff --git a/src/u_halstead.pas b/src/u_halstead.pas index 5b562bba..5b1d3818 100644 --- a/src/u_halstead.pas +++ b/src/u_halstead.pas @@ -5,8 +5,8 @@ unit u_halstead; interface uses - Classes, SysUtils, fpjson, math, - u_common, u_observer, u_interfaces, u_dastworx, u_writableComponent, + Classes, SysUtils, fpjson, math, jsonscanner, jsonparser, + u_common, u_observer, u_interfaces, u_dexed_d, u_writableComponent, u_synmemo; type @@ -65,6 +65,24 @@ begin result := fMetrics; end; +procedure getHalsteadMetrics(source: TStrings; out jsn: TJSONObject); +var + prs: TJSONParser; + jps: TJSONData; + str: string; +begin + str := halsteadMetrics(PChar(source.Text)); + prs := TJSONParser.Create(str, [joIgnoreTrailingComma, joUTF8]); + try + jps := prs.Parse(); + if jps.isNotNil and (jps.JSONType = jtObject) then + jsn := TJSONObject(jps.Clone); + jps.Free; + finally + prs.Free; + end; +end; + constructor THalsteadMetricsBase.create(aOwner: TComponent); begin inherited; diff --git a/src/u_libman.pas b/src/u_libman.pas index 14b5463e..c30df69d 100644 --- a/src/u_libman.pas +++ b/src/u_libman.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, FileUtil, u_common, u_writableComponent, LazFileUtils, ghashmap, ghashset, - u_dcd, u_projutils, u_interfaces, u_dlang, u_dastworx, + u_dcd, u_projutils, u_interfaces, u_dlang, u_dexed_d, u_compilers; type diff --git a/src/u_main.pas b/src/u_main.pas index 2fe67f70..2503516a 100644 --- a/src/u_main.pas +++ b/src/u_main.pas @@ -15,7 +15,7 @@ uses u_search, u_miniexplorer, u_libman, u_libmaneditor, u_todolist, u_observer, u_toolseditor, u_procinput, u_optionseditor, u_symlist, u_mru, u_processes, u_infos, u_dubproject, u_dialogs, u_dubprojeditor,{$IFDEF UNIX} u_gdb,{$ENDIF} - u_dfmt, u_lcldragdrop, u_projgroup, u_projutils, u_stringrange, u_dastworx, + u_dfmt, u_lcldragdrop, u_projgroup, u_projutils, u_stringrange, u_halstead, u_profileviewer, u_semver, u_dsgncontrols, u_term, u_newdubproj; type diff --git a/src/u_symlist.pas b/src/u_symlist.pas index 3010662f..e27ba582 100644 --- a/src/u_symlist.pas +++ b/src/u_symlist.pas @@ -8,7 +8,7 @@ uses Classes, SysUtils, TreeFilterEdit, Forms, Controls, Graphics, ExtCtrls, Menus, ComCtrls, u_widget, jsonparser, process, actnlist, Buttons, Clipbrd, LCLProc, u_common, u_observer, u_synmemo, u_interfaces, u_writableComponent, - u_processes, u_sharedres, u_dsgncontrols; + u_processes, u_sharedres, u_dsgncontrols, u_dexed_d; type @@ -70,7 +70,7 @@ type public constructor create(aOwner: TCOmponent); override; destructor destroy; override; - procedure LoadFromTool(str: TStream); + procedure LoadFromString(const s: string); end; TSymbolListOptions = class(TWritableLfmTextComponent) @@ -122,7 +122,6 @@ type fOptions: TSymbolListOptions; fSyms: TSymbolList; fMsgs: IMessagesDisplay; - fToolProc: TDexedProcess; fActCopyIdent: TAction; fActRefresh: TAction; fActRefreshOnChange: TAction; @@ -154,7 +153,6 @@ type procedure checkIfHasToolExe; procedure callToolProc; - procedure toolTerminated(sender: TObject); procedure docNew(document: TDexedMemo); procedure docClosing(document: TDexedMemo); @@ -236,15 +234,18 @@ begin fSymbols.Assign(value); end; -procedure TSymbolList.LoadFromTool(str: TStream); +procedure TSymbolList.LoadFromString(const s: string); var + txt: TmemoryStream; bin: TMemoryStream; begin + txt := TMemoryStream.Create; bin := TMemoryStream.Create; try - str.Position:=0; + txt.Write(s[1], s.length); + txt.Position:=0; try - ObjectTextToBinary(str, bin); + ObjectTextToBinary(txt, bin); except exit; end; @@ -252,6 +253,7 @@ begin bin.ReadComponent(self); finally bin.Free; + txt.Free; end; end; {$ENDREGION} @@ -449,13 +451,9 @@ end; destructor TSymbolListWidget.destroy; begin EntitiesConnector.removeObserver(self); - - killProcess(fToolProc); fSyms.Free; - fOptions.saveToFile(getDocPath + OptsFname); fOptions.Free; - inherited; end; @@ -573,8 +571,6 @@ procedure TSymbolListWidget.docClosing(document: TDexedMemo); begin if fDoc <> document then exit; - if fToolProc.Running then - fToolProc.Terminate(0); fDoc := nil; clearTree; updateVisibleCat; @@ -745,36 +741,6 @@ begin end; procedure TSymbolListWidget.callToolProc; -var - str: string; -begin - if not fHasToolExe or fDoc.isNil then - exit; - - if (fDoc.Lines.Count = 0) or not fDoc.isDSource then - begin - clearTree; - updateVisibleCat; - exit; - end; - - killProcess(fToolProc); - fToolProc := TDexedProcess.Create(nil); - fToolProc.ShowWindow := swoHIDE; - fToolProc.Options := [poUsePipes]; - fToolProc.Executable := fToolExeName; - fToolProc.OnTerminate := @toolTerminated; - fToolProc.CurrentDirectory := Application.ExeName.extractFileDir; - if fDeep then - fToolProc.Parameters.Add('-o'); - fToolProc.Parameters.Add('-s'); - fToolProc.Execute; - str := fDoc.Text; - fToolProc.Input.Write(str[1], str.length); - fToolProc.CloseInput; -end; - -procedure TSymbolListWidget.toolTerminated(sender: TObject); function getCatNode(node: TTreeNode; stype: TSymbolType ): TTreeNode; function newCat(const aCat: string): TTreeNode; @@ -856,24 +822,29 @@ procedure TSymbolListWidget.toolTerminated(sender: TObject); end; var + s: string; i: Integer; f: string; n: TTreeNode; begin - if ndAlias.isNil then - exit; - clearTree; - updateVisibleCat; if fDoc.isNil then exit; - fToolProc.OnTerminate := nil; - fToolProc.OnReadData := nil; - fToolProc.StdoutEx.Position:=0; - if fToolProc.StdoutEx.Size = 0 then + if (fDoc.Lines.Count = 0) or not fDoc.isDSource then + begin + clearTree; + updateVisibleCat; exit; - fSyms.LoadFromTool(fToolProc.StdoutEx); + end; + s := fDoc.Lines.Text; + s := listSymbols(PChar(s), fDeep); + if s.isEmpty or ndAlias.isNil then + exit; + + clearTree; + updateVisibleCat; + fSyms.LoadFromString(s); f := TreeFilterEdit1.Filter; TreeFilterEdit1.Text := ''; tree.BeginUpdate; diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas index 0bd16798..bb5f4218 100644 --- a/src/u_synmemo.pas +++ b/src/u_synmemo.pas @@ -12,7 +12,7 @@ uses md5, Spin, LCLIntf, LazFileUtils, LMessages, SynHighlighterCpp, math, //SynEditMarkupFoldColoring, Clipbrd, fpjson, jsonparser, LazUTF8, LazUTF8Classes, Buttons, StdCtrls, - u_common, u_writableComponent, u_d2syn, u_txtsyn, u_dialogs, u_dastworx, + u_common, u_writableComponent, u_d2syn, u_txtsyn, u_dialogs, u_sharedres, u_dlang, u_stringrange, u_dbgitf, u_observer, u_diff, u_processes; @@ -482,7 +482,7 @@ var implementation uses - u_interfaces, u_dcd, SynEditHighlighterFoldBase, u_lcldragdrop; + u_interfaces, u_dcd, SynEditHighlighterFoldBase, u_lcldragdrop, u_dexed_d; const DcdCompletionKindStrings: array[TDCDCompletionKind] of string = ( @@ -2402,30 +2402,8 @@ begin end; function TDexedMemo.implementMain: THasMain; -var - res: char = '0'; - prc: TProcess; - src: string; begin - if fDastWorxExename.length = 0 then - exit(mainDefaultBehavior); - src := Lines.Text; - prc := TProcess.Create(nil); - try - prc.Executable:= fDastWorxExename; - prc.Parameters.Add('-m'); - prc.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; - prc.ShowWindow := swoHIDE; - prc.Execute; - prc.Input.Write(src[1], src.length); - prc.CloseInput; - prc.Output.Read(res, 1); - while prc.Running do - sleep(1); - finally - prc.Free; - end; - case res = '1' of + case hasMainFun(PChar(self.Text)) of false:result := mainNo; true: result := mainYes; end; @@ -2629,7 +2607,7 @@ var begin d := TStringList.Create; try - getDdocTemplate(lines, d, CaretY, fInsertPlusDdoc); + d.Text := ddocTemplate(PChar(lines.Text), caretY, fInsertPlusDdoc); if d.Text.isNotEmpty then begin BeginUndoBlock; diff --git a/src/u_todolist.pas b/src/u_todolist.pas index 21a3b1ef..ae9d3c83 100644 --- a/src/u_todolist.pas +++ b/src/u_todolist.pas @@ -8,7 +8,7 @@ uses Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls, strutils, Graphics, Dialogs, ExtCtrls, Menus, Buttons, ComCtrls, u_widget, process, u_common, u_interfaces, u_synmemo, u_processes, - u_writableComponent, u_observer, u_sharedres, + u_writableComponent, u_observer, u_sharedres, u_dexed_d, u_dsgncontrols; type @@ -90,7 +90,6 @@ type fColumns: TTodoColumns; fProj: ICommonProject; fDoc: TDexedMemo; - fToolProc: TDexedProcess; fTodos: TTodoItems; fMsgs: IMessagesDisplay; fOptions: TTodoOptions; @@ -114,10 +113,7 @@ type function optionedOptionsModified: boolean; // TODOlist things function getContext: TTodoContext; - procedure killToolProcess; procedure callToolProcess; - procedure toolTerminated(Sender: TObject); - procedure procOutputDbg(Sender: TObject); procedure clearTodoList; procedure fillTodoList; procedure lstItemsColumnClick(Sender: TObject; Column: TListColumn); @@ -243,7 +239,6 @@ end; destructor TTodoListWidget.Destroy; begin fOptions.saveToFile(getDocPath + OptFname); - killToolProcess; inherited; end; @@ -348,7 +343,6 @@ begin fDoc := nil; if Visible and fAutoRefresh then clearTodoList; - killToolProcess(); end; {$ENDREGION} @@ -407,27 +401,15 @@ begin exit(tcFile); end; -procedure TTodoListWidget.killToolProcess; -begin - if fToolProc.isNil then - exit; - - fToolProc.Terminate(0); - fToolProc.Free; - fToolProc := nil; -end; - procedure TTodoListWidget.callToolProcess; var ctxt: TTodoContext; i,j: integer; nme: string; str: string = ''; + txt: TMemoryStream; begin clearTodoList; - if not exeInSysPath(ToolExeName) then - exit; - killToolProcess; ctxt := getContext; case ctxt of @@ -438,12 +420,6 @@ begin exit; end; - fToolProc := TDexedProcess.Create(nil); - fToolProc.Executable := exeFullName(ToolExeName); - fToolProc.Options := [poUsePipes]; - fToolProc.ShowWindow := swoHIDE; - fToolProc.CurrentDirectory := Application.ExeName.extractFileDir; - fToolProc.OnTerminate := @toolTerminated; // files passed to the tool argument if (ctxt = tcProject) then begin @@ -460,46 +436,19 @@ begin end; end else str := fDoc.fileName; - fToolProc.Parameters.Add('-f' + str); - fToolProc.Parameters.Add('-t'); - fToolProc.Execute; - fToolProc.CloseInput; -end; - -procedure TTodoListWidget.procOutputDbg(Sender: TObject); -var - str: TStringList; - msg: string; - ctxt: TTodoContext; -begin - getMessageDisplay(fMsgs); - str := TStringList.Create; - try - processOutputToStrings(fToolProc, str); - ctxt := getContext; - for msg in str do - case ctxt of - tcNone: fMsgs.message(msg, nil, amcMisc, amkAuto); - tcFile: fMsgs.message(msg, fDoc, amcEdit, amkAuto); - tcProject: fMsgs.message(msg, fProj, amcProj, amkAuto); - end; - finally - str.Free; - end; -end; - -procedure TTodoListWidget.toolTerminated(Sender: TObject); -begin - fToolProc.StdoutEx.Position := 0; - try - fTodos.loadFromTxtStream(fToolProc.StdoutEx); - except - fToolProc.OnTerminate := nil; + str := todoItems(PChar(str)); + if str.length < 10 then exit; + txt := TMemoryStream.create; + try + txt.Write(str[1], str.length); + txt.Position:=0; + fTodos.loadFromTxtStream(txt); + fillTodoList; + finally + txt.free; end; - fillTodoList; - fToolProc.OnTerminate := nil; end; procedure TTodoListWidget.clearTodoList;