Skip to content

Revert "Partially revert #303 until #317 is resolved" #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
Feb 13, 2018
Merged

Revert "Partially revert #303 until #317 is resolved" #319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions rdmd.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,26 +831,23 @@ string innerEvalCode(string[] eval)
import std.string : join, stripRight;
// assumeSafeAppend just to avoid unnecessary reallocation
string code = eval.join("\n").stripRight.assumeSafeAppend;
// Revert https://github.com/dlang/tools/pull/303 until
// https://github.com/dlang/tools/pull/317 has been resolved
//if (code.length > 0 && code[$ - 1] != ';')
//code ~= ';';
if (code.length > 0 && code[$ - 1] != ';')
code ~= ';';
return code;
}

// partially reverted until https://github.com/dlang/tools/pull/317 is resolved
unittest
{
//assert(innerEvalCode([`writeln("Hello!")`]) == `writeln("Hello!");`);
assert(innerEvalCode([`writeln("Hello!")`]) == `writeln("Hello!");`);
assert(innerEvalCode([`writeln("Hello!");`]) == `writeln("Hello!");`);

// test with trailing whitespace
//assert(innerEvalCode([`writeln("Hello!") `]) == `writeln("Hello!");`);
assert(innerEvalCode([`writeln("Hello!") `]) == `writeln("Hello!");`);
assert(innerEvalCode([`writeln("Hello!"); `]) == `writeln("Hello!");`);

// test with multiple entries
//assert(innerEvalCode([`writeln("Hello!"); `, `writeln("You!") `])
//== "writeln(\"Hello!\"); \nwriteln(\"You!\");");
assert(innerEvalCode([`writeln("Hello!"); `, `writeln("You!") `])
== "writeln(\"Hello!\"); \nwriteln(\"You!\");");
assert(innerEvalCode([`writeln("Hello!"); `, `writeln("You!"); `])
== "writeln(\"Hello!\"); \nwriteln(\"You!\");");
}
Expand Down Expand Up @@ -894,11 +891,10 @@ unittest
// innerEvalCode already tests the cases for different
// contents in `eval` array, so let's focus on testing
// the difference based on the `loop` flag
// partially reverted until https://github.com/dlang/tools/pull/317 is resolved
//assert(makeEvalCode([`writeln("Hello!") `], No.loop) ==
//importWorld
//~ "void main(char[][] args) {\n"
//~ "writeln(\"Hello!\");\n}");
assert(makeEvalCode([`writeln("Hello!") `], No.loop) ==
importWorld
~ "void main(char[][] args) {\n"
~ "writeln(\"Hello!\");\n}");

assert(makeEvalCode([`writeln("What!"); `], No.loop) ==
importWorld
Expand Down