From 4db5ba44b202b2d1890576ab5bd7fd14425ef429 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:09:14 -0800 Subject: [PATCH 1/7] Error out on lexer failure --- src/dfmt/formatter.d | 21 +++++++++++++++++++-- src/dfmt/main.d | 19 +++++++++++-------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 354401d..9dd1103 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -16,7 +16,17 @@ import dfmt.tokens; import dfmt.wrapping; import std.array; -void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, +/** + * Formats the code contained in `buffer` into `output`. + * Params: + * source_desc = A description of where `buffer` came from. Usually a file name. + * buffer = The raw source code. + * output = The output range that will have the formatted code written to it. + * formatterConfig = Formatter configuration. + * Returns: `true` if the formatting succeeded, `false` of a lexing error. This + * function can return `true` if parsing failed. + */ +bool format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, Config* formatterConfig) { LexerConfig config; @@ -33,11 +43,18 @@ void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, auto visitor = new FormatVisitor(&astInformation); visitor.visit(mod); astInformation.cleanup(); - auto tokens = byToken(buffer, config, &cache).array(); + auto tokenRange = byToken(buffer, config, &cache); + auto app = appender!(Token[])(); + for (; !tokenRange.empty(); tokenRange.popFront()) + app.put(tokenRange.front()); + auto tokens = app.data; + if (!tokenRange.messages.empty) + return false; auto depths = generateDepthInfo(tokens); auto tokenFormatter = TokenFormatter!OutputRange(buffer, tokens, depths, output, &astInformation, formatterConfig); tokenFormatter.format(); + return true; } immutable(short[]) generateDepthInfo(const Token[] tokens) pure nothrow @trusted diff --git a/src/dfmt/main.d b/src/dfmt/main.d index 6844cfc..ad45279 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -19,14 +19,14 @@ static immutable VERSION = () { version (built_with_dub) { - enum DFMT_VERSION = import("dubhash.txt").strip; + enum DFMT_VERSION = import("dubhash.txt").strip; } else { - /** - * Current build's Git commit hash - */ - enum DFMT_VERSION = import("githash.txt").strip; + /** + * Current build's Git commit hash + */ + enum DFMT_VERSION = import("githash.txt").strip; } return DFMT_VERSION ~ DEBUG_SUFFIX; @@ -211,7 +211,7 @@ else else break; } - format("stdin", buffer, output.lockingTextWriter(), &config); + return format("stdin", buffer, output.lockingTextWriter(), &config); } else { @@ -219,6 +219,7 @@ else if (args.length >= 2) inplace = true; + int retVal; while (args.length > 0) { const path = args.front; @@ -253,11 +254,13 @@ else f.rawRead(buffer); if (inplace) output = File(path, "wb"); - format(path, buffer, output.lockingTextWriter(), &config); + bool formatResult = format(path, buffer, output.lockingTextWriter(), &config); + if (!formatResult) + retVal = 1; } } + return retVal; } - return 0; } } From 977318214d93fa2f1cacd8c4c98923c46252b596 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:10:04 -0800 Subject: [PATCH 2/7] Add check for tests that are supposed to error out, and clean up code based on shellcheck suggestions --- tests/test.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/test.sh b/tests/test.sh index 7f11c5a..973bb54 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -6,9 +6,9 @@ do for source in *.d do echo "${source}.ref" "${braceStyle}/${source}.out" - argsFile=$(basename ${source} .d).args - if [ -e ${argsFile} ]; then - args=$(cat ${argsFile}) + argsFile=$(basename "${source}" .d).args + if [ -e "${argsFile}" ]; then + args=$(cat "${argsFile}") else args= fi @@ -16,3 +16,12 @@ do diff -u "${braceStyle}/${source}.ref" "${braceStyle}/${source}.out" done done + +set +e + +for source in expected_failures/*.d +do + if ../bin/dfmt "${source}" > /dev/null; then + exit 1 + fi +done From fbd8559ceb0caf46a7503e3fca973064713ad599 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:10:21 -0800 Subject: [PATCH 3/7] Test case for issue 469 --- tests/expected_failures/issue0469.d | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/expected_failures/issue0469.d diff --git a/tests/expected_failures/issue0469.d b/tests/expected_failures/issue0469.d new file mode 100644 index 0000000..971c8f7 --- /dev/null +++ b/tests/expected_failures/issue0469.d @@ -0,0 +1 @@ +import std.stdio; void main() { writeln("\eee8Hello"); int a = 5; } From 2dc19b657702661e0b79cc9621edf07ab07d69c6 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:11:20 -0800 Subject: [PATCH 4/7] Update submodule --- libdparse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdparse b/libdparse index f512cb0..597d9a6 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit f512cb0b4bc11ce64eb64a710163495e425a7ad8 +Subproject commit 597d9a697b1f8a51fb2f441c61d0c6cc4eadc6d1 From 63a29ab75780b9ee1175b7a459ea9fb4b3f91f1e Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:28:45 -0800 Subject: [PATCH 5/7] Update dependency --- dub.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dub.json b/dub.json index 6feb82e..6cf0dc5 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.13.0" + "libdparse": "~>0.14.0" }, "targetPath" : "bin/", "targetName" : "dfmt", From b17304accd26b44416a375d4f5bcfc059ac8eac5 Mon Sep 17 00:00:00 2001 From: Brian Schott Date: Sun, 8 Mar 2020 13:17:48 -0700 Subject: [PATCH 6/7] Update tests/test.sh Co-Authored-By: Jan Jurzitza --- tests/test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test.sh b/tests/test.sh index 973bb54..b465658 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -22,6 +22,7 @@ set +e for source in expected_failures/*.d do if ../bin/dfmt "${source}" > /dev/null; then + echo "Expected failure on test ${source} but passed" exit 1 fi done From e9034f4fec7d58fc9749e0f09822cc5cf5c4500e Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 8 Mar 2020 13:23:42 -0700 Subject: [PATCH 7/7] Fix return value when reading from stdin --- src/dfmt/main.d | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dfmt/main.d b/src/dfmt/main.d index ad45279..269f934 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -211,7 +211,9 @@ else else break; } - return format("stdin", buffer, output.lockingTextWriter(), &config); + immutable bool formatSuccess = format("stdin", buffer, + output.lockingTextWriter(), &config); + return formatSuccess ? 0 : 1; } else { @@ -254,8 +256,8 @@ else f.rawRead(buffer); if (inplace) output = File(path, "wb"); - bool formatResult = format(path, buffer, output.lockingTextWriter(), &config); - if (!formatResult) + immutable bool formatSuccess = format(path, buffer, output.lockingTextWriter(), &config); + if (!formatSuccess) retVal = 1; } }