forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #63

This commit is contained in:
Hackerpilot 2015-03-14 18:18:39 -07:00
parent 381640614b
commit 12060fb92c
8 changed files with 232 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

280
src/dfmt.d
View File

@ -35,7 +35,8 @@ import std.d.ast;
import std.array; import std.array;
version (NoMain) version (NoMain)
{ } {
}
else else
int main(string[] args) int main(string[] args)
{ {
@ -44,14 +45,12 @@ int main(string[] args)
bool inplace = false; bool inplace = false;
bool show_usage = false; bool show_usage = false;
FormatterConfig formatterConfig; FormatterConfig formatterConfig;
getopt(args, getopt(args, "help|h", &show_usage, "inplace", &inplace, "tabs|t",
"help|h", &show_usage, &formatterConfig.useTabs, "braces", &formatterConfig.braceStyle);
"inplace", &inplace,
"tabs|t", &formatterConfig.useTabs,
"braces", &formatterConfig.braceStyle);
if (show_usage) if (show_usage)
{ {
import std.path : baseName; import std.path : baseName;
writef(USAGE, baseName(args[0])); writef(USAGE, baseName(args[0]));
return 0; return 0;
} }
@ -132,8 +131,8 @@ void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output,
visitor.visit(mod); visitor.visit(mod);
astInformation.cleanup(); astInformation.cleanup();
auto tokens = byToken(buffer, config, &cache).array(); auto tokens = byToken(buffer, config, &cache).array();
auto tokenFormatter = TokenFormatter!OutputRange(tokens, output, &astInformation, auto tokenFormatter = TokenFormatter!OutputRange(tokens, output,
formatterConfig); &astInformation, formatterConfig);
tokenFormatter.format(); tokenFormatter.format();
} }
@ -173,9 +172,8 @@ private:
{ {
if (index > 0) if (index > 0)
{ {
if (tokens[index - 1].type != tok!";" if (tokens[index - 1].type != tok!";" && tokens[index - 1].type != tok!"}" && tokens[index - 1].line + 1 < tokens[index]
&& tokens[index - 1].type != tok!"}" .line)
&& tokens[index - 1].line + 1 < tokens[index].line)
{ {
newline(); newline();
} }
@ -227,7 +225,8 @@ private:
newline(); newline();
break; break;
} }
if (currentIs(tok!"comment") && current.line == peekBack().line) if (currentIs(tok!"comment")
&& current.line == peekBack().line)
{ {
justAddedExtraNewline = true; justAddedExtraNewline = true;
break; break;
@ -259,8 +258,7 @@ private:
writeToken(); writeToken();
if (currentLineLength + 1 + length_of_next_chunk >= config.columnSoftLimit) if (currentLineLength + 1 + length_of_next_chunk >= config.columnSoftLimit)
{ {
if (indents.tempIndents < 2) pushWrapIndent(tok!",");
indents.push(tok!",");
newline(); newline();
} }
else else
@ -304,20 +302,24 @@ private:
writeToken(); writeToken();
write(" "); write(" ");
} }
else if ((isBlockHeader() || currentIs(tok!"version") || currentIs(tok!"debug")) else if ((isBlockHeader() || currentIs(tok!"version")
&& peekIs(tok!"(", false)) || currentIs(tok!"debug")) && peekIs(tok!"(", false))
{ {
immutable bool a = !currentIs(tok!"version") && !currentIs(tok!"debug") ; immutable bool a = !currentIs(tok!"version")
immutable bool b = a || astInformation.conditionalWithElseLocations && !currentIs(tok!"debug");
.canFindIndex(current.index); immutable bool b = a
immutable bool shouldPushIndent = b || astInformation.conditionalStatementLocations || astInformation.conditionalWithElseLocations.canFindIndex(
.canFindIndex(current.index); current.index);
immutable bool shouldPushIndent = b
|| astInformation.conditionalStatementLocations.canFindIndex(
current.index);
if (shouldPushIndent) if (shouldPushIndent)
indents.push(current.type); indents.push(current.type);
writeToken(); writeToken();
write(" "); write(" ");
writeParens(false); writeParens(false);
if (currentIs(tok!"switch") || (currentIs(tok!"final") && peekIs(tok!"switch"))) if (currentIs(tok!"switch") || (currentIs(tok!"final")
&& peekIs(tok!"switch")))
write(" "); write(" ");
else if (currentIs(tok!"comment")) else if (currentIs(tok!"comment"))
formatStep(); formatStep();
@ -332,8 +334,8 @@ private:
else if (currentIs(tok!"else")) else if (currentIs(tok!"else"))
{ {
writeToken(); writeToken();
if (currentIs(tok!"if") || (currentIs(tok!"static") && peekIs(tok!"if")) if (currentIs(tok!"if") || (currentIs(tok!"static")
|| currentIs(tok!"version")) && peekIs(tok!"if")) || currentIs(tok!"version"))
{ {
if (indents.top() == tok!"if" || indents.top == tok!"version") if (indents.top() == tok!"if" || indents.top == tok!"version")
indents.pop(); indents.pop();
@ -394,17 +396,20 @@ private:
switch (current.type) switch (current.type)
{ {
case tok!"*": case tok!"*":
if (astInformation.spaceAfterLocations.canFindIndex(current.index)) if (astInformation.spaceAfterLocations.canFindIndex(
current.index))
{ {
writeToken(); writeToken();
if (!currentIs(tok!"*") && !currentIs(tok!")") && !currentIs(tok!"[") if (!currentIs(tok!"*") && !currentIs(tok!")")
&& !currentIs(tok!",") && !currentIs(tok!";")) && !currentIs(tok!"[") && !currentIs(tok!",")
&& !currentIs(tok!";"))
{ {
write(" "); write(" ");
} }
break; break;
} }
else if (!astInformation.unaryLocations.canFindIndex(current.index)) else if (!astInformation.unaryLocations.canFindIndex(
current.index))
goto binary; goto binary;
else else
writeToken(); writeToken();
@ -435,10 +440,12 @@ private:
spaceAfterParens = true; spaceAfterParens = true;
writeToken(); writeToken();
parenDepth++; parenDepth++;
if (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0 if (linebreakHints.canFindIndex(index - 1)
&& currentLineLength > config.columnSoftLimit && !currentIs(tok!")"))) || (linebreakHints.length == 0
&& currentLineLength > config.columnSoftLimit
&& !currentIs(tok!")")))
{ {
indents.push(tok!"("); pushWrapIndent(tok!"(");
newline(); newline();
} }
regenLineBreakHintsIfNecessary(index - 1); regenLineBreakHintsIfNecessary(index - 1);
@ -455,7 +462,8 @@ private:
newline(); newline();
writeToken(); // in/out/body writeToken(); // in/out/body
} }
else if (peekIsLiteralOrIdent() || peekIsBasicType() || peekIsKeyword()) else if (peekIsLiteralOrIdent() || peekIsBasicType()
|| peekIsKeyword())
{ {
writeToken(); writeToken();
if (spaceAfterParens || parenDepth > 0) if (spaceAfterParens || parenDepth > 0)
@ -490,9 +498,10 @@ private:
if (!currentIs(tok!"{")) if (!currentIs(tok!"{"))
newline(); newline();
} }
else if (peekBackIs(tok!"identifier") && (peekBack2Is(tok!"{", true) else if (peekBackIs(tok!"identifier")
|| peekBack2Is(tok!"}", true) || peekBack2Is(tok!";", true) && (peekBack2Is(tok!"{", true)
|| peekBack2Is(tok!":", true)) && !(isBlockHeader(1) || peekBack2Is(tok!"}", true) || peekBack2Is(tok!";",
true) || peekBack2Is(tok!":", true)) && !(isBlockHeader(1)
&& !peekIs(tok!"if"))) && !peekIs(tok!"if")))
{ {
writeToken(); writeToken();
@ -537,8 +546,7 @@ private:
} }
break; break;
case tok!"{": case tok!"{":
if (astInformation.structInitStartLocations.canFindIndex( if (astInformation.structInitStartLocations.canFindIndex(tokens[index].index))
tokens[index].index))
{ {
writeToken(); writeToken();
} }
@ -558,14 +566,19 @@ private:
{ {
if (config.braceStyle == BraceStyle.otbs) if (config.braceStyle == BraceStyle.otbs)
{ {
if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index) if (!astInformation.structInitStartLocations
&& !astInformation.funLitStartLocations.canFindIndex(tokens[index].index)) .canFindIndex(tokens[index].index)
&& !astInformation.funLitStartLocations
.canFindIndex(tokens[index].index))
{ {
while (indents.length && isWrapIndent(indents.top)) while (indents.length
&& isWrapIndent(indents.top))
indents.pop(); indents.pop();
indents.push(tok!"{"); indents.push(tok!"{");
if (index == 1 || peekBackIs(tok!":", true) || peekBackIs(tok!"{", true) if (index == 1 || peekBackIs(tok!":", true)
|| peekBackIs(tok!"}", true) || peekBackIs(tok!")", true) || peekBackIs(tok!"{", true)
|| peekBackIs(tok!"}", true)
|| peekBackIs(tok!")", true)
|| peekBackIs(tok!";", true)) || peekBackIs(tok!";", true))
{ {
indentLevel = indents.indentSize - 1; indentLevel = indents.indentSize - 1;
@ -573,7 +586,8 @@ private:
} }
write(" "); write(" ");
} }
else if (index > 0 && (!peekBackIs(tok!"comment") || tokens[index - 1].text[0 .. 2] != "//")) else if (index > 0 && (!peekBackIs(tok!"comment")
|| tokens[index - 1].text[0 .. 2] != "//"))
newline(); newline();
} }
writeToken(); writeToken();
@ -581,13 +595,11 @@ private:
} }
break; break;
case tok!"}": case tok!"}":
if (astInformation.structInitEndLocations.canFindIndex( if (astInformation.structInitEndLocations.canFindIndex(tokens[index].index))
tokens[index].index))
{ {
writeToken(); writeToken();
} }
else if (astInformation.funLitEndLocations.canFindIndex( else if (astInformation.funLitEndLocations.canFindIndex(tokens[index].index))
tokens[index].index))
{ {
write(" "); write(" ");
writeToken(); writeToken();
@ -598,15 +610,16 @@ private:
if (peekBackIsLiteralOrIdent() || peekBackIs(tok!",")) if (peekBackIsLiteralOrIdent() || peekBackIs(tok!","))
newline(); newline();
write("}"); write("}");
if (index < tokens.length - 1 && if (index < tokens.length - 1
astInformation.doubleNewlineLocations.canFindIndex( && astInformation.doubleNewlineLocations.canFindIndex(
tokens[index].index) && !peekIs(tok!"}")) tokens[index].index) && !peekIs(tok!"}"))
{ {
write("\n"); write("\n");
currentLineLength = 0; currentLineLength = 0;
justAddedExtraNewline = true; justAddedExtraNewline = true;
} }
if (config.braceStyle == BraceStyle.otbs && currentIs(tok!"else")) if (config.braceStyle == BraceStyle.otbs
&& currentIs(tok!"else"))
write(" "); write(" ");
if (!peekIs(tok!",") && !peekIs(tok!")")) if (!peekIs(tok!",") && !peekIs(tok!")"))
{ {
@ -619,10 +632,10 @@ private:
break; break;
case tok!".": case tok!".":
if (linebreakHints.canFind(index) || (linebreakHints.length == 0 if (linebreakHints.canFind(index) || (linebreakHints.length == 0
&& currentLineLength + nextTokenLength() > config.columnHardLimit)) && currentLineLength + nextTokenLength(
) > config.columnHardLimit))
{ {
if (indents.tempIndents < 2) pushWrapIndent();
indents.push(tok!".");
newline(); newline();
} }
writeToken(); writeToken();
@ -633,15 +646,15 @@ private:
&& currentLineLength > config.columnSoftLimit))) && currentLineLength > config.columnSoftLimit)))
{ {
writeToken(); writeToken();
if (indents.tempIndents < 2) pushWrapIndent(tok!",");
indents.push(tok!",");
newline(); newline();
} }
else else
{ {
writeToken(); writeToken();
if (!currentIs(tok!")", false) && !currentIs(tok!"]", false) if (!currentIs(tok!")", false) && !currentIs(tok!"]", false)
&& !currentIs(tok!"}", false) && !currentIs(tok!"comment", false)) && !currentIs(tok!"}", false)
&& !currentIs(tok!"comment", false))
{ {
write(" "); write(" ");
} }
@ -698,8 +711,7 @@ private:
binary: binary:
if (linebreakHints.canFind(index)) if (linebreakHints.canFind(index))
{ {
if (indents.tempIndents < 2) pushWrapIndent();
indents.push(current.type);
newline(); newline();
} }
else else
@ -736,8 +748,8 @@ private:
if (linebreakHints.length == 0 || linebreakHints[$ - 1] <= i - 1) if (linebreakHints.length == 0 || linebreakHints[$ - 1] <= i - 1)
{ {
immutable size_t j = expressionEndIndex(i); immutable size_t j = expressionEndIndex(i);
linebreakHints = chooseLineBreakTokens(i, tokens[i .. j], linebreakHints = chooseLineBreakTokens(i, tokens[i .. j], config,
config, currentLineLength, indentLevel); currentLineLength, indentLevel);
} }
} }
@ -831,8 +843,7 @@ private:
return tokenLength(tokens[i]); return tokenLength(tokens[i]);
} }
ref current() const @property ref current() const @property in
in
{ {
assert(index < tokens.length); assert(index < tokens.length);
} }
@ -849,7 +860,8 @@ private:
bool peekBackIsLiteralOrIdent() bool peekBackIsLiteralOrIdent()
{ {
if (index == 0) return false; if (index == 0)
return false;
switch (tokens[index - 1].type) switch (tokens[index - 1].type)
{ {
case tok!"doubleLiteral": case tok!"doubleLiteral":
@ -875,7 +887,8 @@ private:
bool peekIsLiteralOrIdent() bool peekIsLiteralOrIdent()
{ {
if (index + 1 >= tokens.length) return false; if (index + 1 >= tokens.length)
return false;
switch (tokens[index + 1].type) switch (tokens[index + 1].type)
{ {
case tok!"doubleLiteral": case tok!"doubleLiteral":
@ -942,6 +955,7 @@ private:
size_t tokenEndLine(const Token t) size_t tokenEndLine(const Token t)
{ {
import std.algorithm : count; import std.algorithm : count;
switch (t.type) switch (t.type)
{ {
case tok!"comment": case tok!"comment":
@ -959,10 +973,9 @@ private:
if (i + index < 0 || i + index >= tokens.length) if (i + index < 0 || i + index >= tokens.length)
return false; return false;
auto t = tokens[i + index].type; auto t = tokens[i + index].type;
return t == tok!"for" || t == tok!"foreach" return t == tok!"for" || t == tok!"foreach" || t == tok!"foreach_reverse"
|| t == tok!"foreach_reverse" || t == tok!"while" || t == tok!"while" || t == tok!"if" || t == tok!"out" || t == tok!"catch"
|| t == tok!"if" || t == tok!"out" || t == tok!"with";
|| t == tok!"catch" || t == tok!"with";
} }
void newline() void newline()
@ -970,13 +983,14 @@ private:
import std.range : assumeSorted; import std.range : assumeSorted;
import std.algorithm : max; import std.algorithm : max;
if (currentIs(tok!"comment") && current.line == tokenEndLine(tokens[index - 1])) if (currentIs(tok!"comment")
&& current.line == tokenEndLine(tokens[index - 1]))
return; return;
immutable bool hasCurrent = index + 1 < tokens.length; immutable bool hasCurrent = index + 1 < tokens.length;
if (hasCurrent && tokens[index].type == tok!"}" && !assumeSorted( if (hasCurrent && tokens[index].type == tok!"}"
astInformation.funLitEndLocations).equalRange(tokens[index].index).empty) && !assumeSorted(astInformation.funLitEndLocations).equalRange(tokens[index].index).empty)
{ {
write(" "); write(" ");
return; return;
@ -984,8 +998,8 @@ private:
output.put("\n"); output.put("\n");
if (!justAddedExtraNewline && index > 0 if (!justAddedExtraNewline && index > 0 && hasCurrent && tokens[index].line - tokenEndLine(
&& hasCurrent && tokens[index].line - tokenEndLine(tokens[index - 1]) > 1) tokens[index - 1]) > 1)
{ {
output.put("\n"); output.put("\n");
} }
@ -1036,14 +1050,17 @@ private:
indentLevel = l; indentLevel = l;
} }
else if (currentIs(tok!"{") else if (currentIs(tok!"{")
&& !astInformation.structInitStartLocations.canFindIndex(tokens[index].index) && !astInformation.structInitStartLocations.canFindIndex(
&& !astInformation.funLitStartLocations.canFindIndex(tokens[index].index)) tokens[index].index)
&& !astInformation.funLitStartLocations.canFindIndex(
tokens[index].index))
{ {
while (indents.length && isWrapIndent(indents.top)) while (indents.length && isWrapIndent(indents.top))
indents.pop(); indents.pop();
indents.push(tok!"{"); indents.push(tok!"{");
if (index == 1 || peekBackIs(tok!":", true) || peekBackIs(tok!"{", true) if (index == 1 || peekBackIs(tok!":", true)
|| peekBackIs(tok!"}", true) || peekBackIs(tok!")", true) || peekBackIs(tok!"{", true) || peekBackIs(tok!"}",
true) || peekBackIs(tok!")", true)
|| peekBackIs(tok!";", true)) || peekBackIs(tok!";", true))
{ {
indentLevel = indents.indentSize - 1; indentLevel = indents.indentSize - 1;
@ -1065,7 +1082,8 @@ private:
indents.pop(); indents.pop();
} }
} }
else if (astInformation.attributeDeclarationLines.canFindIndex(current.line)) else if (astInformation.attributeDeclarationLines.canFindIndex(
current.line))
{ {
auto l = indents.indentToMostRecent(tok!"{"); auto l = indents.indentToMostRecent(tok!"{");
if (l != -1) if (l != -1)
@ -1117,6 +1135,18 @@ private:
} }
} }
void pushWrapIndent(IdType type = tok!"")
{
immutable t = type == tok!"" ? tokens[index].type : type;
if (parenDepth == 0)
{
if (indents.wrapIndents == 0)
indents.push(t);
}
else if (indents.wrapIndents < 1)
indents.push(t);
}
int indentLevel; int indentLevel;
/// Current index into the tokens array /// Current index into the tokens array
@ -1163,8 +1193,7 @@ bool isTempIndent(IdType type) pure nothrow @nogc @safe
/// The only good brace styles /// The only good brace styles
enum BraceStyle enum BraceStyle
{ {
allman, allman, otbs
otbs
} }
/// Configuration options for formatting /// Configuration options for formatting
@ -1187,6 +1216,7 @@ struct FormatterConfig
bool canFindIndex(const size_t[] items, size_t index) bool canFindIndex(const size_t[] items, size_t index)
{ {
import std.range : assumeSorted; import std.range : assumeSorted;
return !assumeSorted(items).equalRange(index).empty; return !assumeSorted(items).equalRange(index).empty;
} }
@ -1197,6 +1227,7 @@ struct ASTInformation
void cleanup() void cleanup()
{ {
import std.algorithm : sort; import std.algorithm : sort;
sort(doubleNewlineLocations); sort(doubleNewlineLocations);
sort(spaceAfterLocations); sort(spaceAfterLocations);
sort(unaryLocations); sort(unaryLocations);
@ -1257,13 +1288,11 @@ final class FormatVisitor : ASTVisitor
auto condition = dec.compileCondition; auto condition = dec.compileCondition;
if (condition.versionCondition !is null) if (condition.versionCondition !is null)
{ {
astInformation.conditionalWithElseLocations ~= astInformation.conditionalWithElseLocations ~= condition.versionCondition.versionIndex;
condition.versionCondition.versionIndex;
} }
else if (condition.debugCondition !is null) else if (condition.debugCondition !is null)
{ {
astInformation.conditionalWithElseLocations ~= astInformation.conditionalWithElseLocations ~= condition.debugCondition.debugIndex;
condition.debugCondition.debugIndex;
} }
// Skip "static if" because the formatting for normal "if" handles // Skip "static if" because the formatting for normal "if" handles
// it properly // it properly
@ -1276,23 +1305,19 @@ final class FormatVisitor : ASTVisitor
auto condition = statement.compileCondition; auto condition = statement.compileCondition;
if (condition.versionCondition !is null) if (condition.versionCondition !is null)
{ {
astInformation.conditionalStatementLocations ~= astInformation.conditionalStatementLocations ~= condition.versionCondition.versionIndex;
condition.versionCondition.versionIndex;
} }
else if (condition.debugCondition !is null) else if (condition.debugCondition !is null)
{ {
astInformation.conditionalStatementLocations ~= astInformation.conditionalStatementLocations ~= condition.debugCondition.debugIndex;
condition.debugCondition.debugIndex;
} }
statement.accept(this); statement.accept(this);
} }
override void visit(const FunctionLiteralExpression funcLit) override void visit(const FunctionLiteralExpression funcLit)
{ {
astInformation.funLitStartLocations ~= funcLit.functionBody astInformation.funLitStartLocations ~= funcLit.functionBody.blockStatement.startLocation;
.blockStatement.startLocation; astInformation.funLitEndLocations ~= funcLit.functionBody.blockStatement.endLocation;
astInformation.funLitEndLocations ~= funcLit.functionBody
.blockStatement.endLocation;
funcLit.accept(this); funcLit.accept(this);
} }
@ -1318,7 +1343,8 @@ final class FormatVisitor : ASTVisitor
{ {
if (functionBody.blockStatement !is null) if (functionBody.blockStatement !is null)
astInformation.doubleNewlineLocations ~= functionBody.blockStatement.endLocation; astInformation.doubleNewlineLocations ~= functionBody.blockStatement.endLocation;
if (functionBody.bodyStatement !is null && functionBody.bodyStatement.blockStatement !is null) if (functionBody.bodyStatement !is null
&& functionBody.bodyStatement.blockStatement !is null)
astInformation.doubleNewlineLocations ~= functionBody.bodyStatement.blockStatement.endLocation; astInformation.doubleNewlineLocations ~= functionBody.bodyStatement.blockStatement.endLocation;
functionBody.accept(this); functionBody.accept(this);
} }
@ -1398,28 +1424,26 @@ string generateFixedLengthCases()
import std.string : format; import std.string : format;
string[] fixedLengthTokens = ["abstract", "alias", "align", "asm", "assert", string[] fixedLengthTokens = ["abstract", "alias", "align", "asm", "assert",
"auto", "body", "bool", "break", "byte", "case", "cast", "catch", "auto", "body", "bool", "break", "byte", "case", "cast", "catch", "cdouble",
"cdouble", "cent", "cfloat", "char", "class", "const", "continue", "cent", "cfloat", "char", "class", "const", "continue", "creal", "dchar",
"creal", "dchar", "debug", "default", "delegate", "delete", "deprecated", "debug", "default", "delegate", "delete", "deprecated", "do", "double",
"do", "double", "else", "enum", "export", "extern", "false", "final", "else", "enum", "export", "extern", "false", "final", "finally", "float",
"finally", "float", "for", "foreach", "foreach_reverse", "function", "for", "foreach", "foreach_reverse", "function", "goto", "idouble", "if",
"goto", "idouble", "if", "ifloat", "immutable", "import", "in", "inout", "ifloat", "immutable", "import", "in", "inout", "int", "interface",
"int", "interface", "invariant", "ireal", "is", "lazy", "long", "macro", "invariant", "ireal", "is", "lazy", "long", "macro", "mixin", "module", "new",
"mixin", "module", "new", "nothrow", "null", "out", "override", "package", "nothrow", "null", "out", "override", "package", "pragma", "private",
"pragma", "private", "protected", "public", "pure", "real", "ref", "protected", "public", "pure", "real", "ref", "return", "scope", "shared",
"return", "scope", "shared", "short", "static", "struct", "super", "short", "static", "struct", "super", "switch", "synchronized", "template",
"switch", "synchronized", "template", "this", "throw", "true", "try", "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte",
"typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", "union", "ucent", "uint", "ulong", "union", "unittest", "ushort", "version", "void",
"unittest", "ushort", "version", "void", "volatile", "wchar", "while", "volatile", "wchar", "while", "with", "__DATE__", "__EOF__", "__FILE__",
"with", "__DATE__", "__EOF__", "__FILE__", "__FUNCTION__", "__gshared", "__FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters",
"__LINE__", "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", "__traits", "__vector",
"__TIME__", "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__VENDOR__", "__VERSION__", ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=",
"__VERSION__", ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>", "!<>=", "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*",
"!<>=", "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>",
"*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "]",
"<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~="];
"@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~",
"~="];
return fixedLengthTokens.map!(a => format(`case tok!"%s": return %d;`, a, return fixedLengthTokens.map!(a => format(`case tok!"%s": return %d;`, a,
a.length)).join("\n\t"); a.length)).join("\n\t");
} }
@ -1427,6 +1451,7 @@ string generateFixedLengthCases()
int tokenLength(ref const Token t) pure @safe @nogc int tokenLength(ref const Token t) pure @safe @nogc
{ {
import std.algorithm : countUntil; import std.algorithm : countUntil;
switch (t.type) switch (t.type)
{ {
case tok!"doubleLiteral": case tok!"doubleLiteral":
@ -1584,8 +1609,7 @@ struct State
this._depth = depth; this._depth = depth;
import std.algorithm : map, sum; import std.algorithm : map, sum;
this._cost = breaks.map!(b => breakCost(tokens[b].type)).sum() this._cost = breaks.map!(b => breakCost(tokens[b].type)).sum() + (depth * 500);
+ (depth * 500);
int ll = currentLineLength; int ll = currentLineLength;
size_t breakIndex = 0; size_t breakIndex = 0;
size_t i = 0; size_t i = 0;
@ -1593,15 +1617,15 @@ struct State
if (breaks.length == 0) if (breaks.length == 0)
{ {
_cost = int.max; _cost = int.max;
immutable int l = currentLineLength + tokens.map!(a => tokenLength(a)).sum(); immutable int l = currentLineLength + tokens.map!(a => tokenLength(
a)).sum();
s = l < formatterConfig.columnSoftLimit; s = l < formatterConfig.columnSoftLimit;
} }
else else
{ {
do do
{ {
immutable size_t j = breakIndex < breaks.length immutable size_t j = breakIndex < breaks.length ? breaks[breakIndex] : tokens.length;
? breaks[breakIndex] : tokens.length;
ll += tokens[i .. j].map!(a => tokenLength(a)).sum(); ll += tokens[i .. j].map!(a => tokenLength(a)).sum();
if (ll > formatterConfig.columnSoftLimit) if (ll > formatterConfig.columnSoftLimit)
{ {
@ -1660,15 +1684,16 @@ private:
bool _solved; bool _solved;
} }
size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens, size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens, const FormatterConfig* formatterConfig, int currentLineLength,
const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel) int indentLevel)
{ {
import std.container.rbtree : RedBlackTree; import std.container.rbtree : RedBlackTree;
import std.algorithm : filter, min; import std.algorithm : filter, min;
import core.memory : GC; import core.memory : GC;
enum ALGORITHMIC_COMPLEXITY_SUCKS = 25; enum ALGORITHMIC_COMPLEXITY_SUCKS = 25;
immutable size_t tokensEnd = min(tokens.length, ALGORITHMIC_COMPLEXITY_SUCKS); immutable size_t tokensEnd = min(tokens.length,
ALGORITHMIC_COMPLEXITY_SUCKS);
int depth = 0; int depth = 0;
auto open = new RedBlackTree!State; auto open = new RedBlackTree!State;
open.insert(State(cast(size_t[])[], tokens[0 .. tokensEnd], depth, open.insert(State(cast(size_t[])[], tokens[0 .. tokensEnd], depth,
@ -1722,8 +1747,8 @@ State[] validMoves(const Token[] tokens, ref const State current,
breaks ~= current.breaks; breaks ~= current.breaks;
breaks ~= i; breaks ~= i;
sort(breaks); sort(breaks);
states ~= State(breaks, tokens, depth + 1, formatterConfig, states ~= State(breaks, tokens, depth + 1, formatterConfig, currentLineLength,
currentLineLength, indentLevel); indentLevel);
} }
return states; return states;
} }
@ -1744,14 +1769,14 @@ struct IndentStack
} }
} }
int tempIndents() const pure nothrow @property int wrapIndents() const pure nothrow @property
{ {
if (index == 0) if (index == 0)
return 0; return 0;
int tempIndentCount = 0; int tempIndentCount = 0;
for (size_t i = index; i > 0; i--) for (size_t i = index; i > 0; i--)
{ {
if (!isTempIndent(arr[i])) if (!isWrapIndent(arr[i]))
break; break;
tempIndentCount++; tempIndentCount++;
} }
@ -1805,6 +1830,7 @@ private:
unittest unittest
{ {
import std.string : format; import std.string : format;
auto sourceCode = q{const Token[] tokens, ref const State current, const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, int depth}; auto sourceCode = q{const Token[] tokens, ref const State current, const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, int depth};
LexerConfig config; LexerConfig config;
config.stringBehavior = StringBehavior.source; config.stringBehavior = StringBehavior.source;

4
tests/allman/issue0063.d.ref Normal file
View File

@ -0,0 +1,4 @@
import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration, ddmd.dmodule,
ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func, ddmd.globals,
ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array, ddmd.root.file,
ddmd.root.rootobject, ddmd.statement;

1
tests/issue0063.d Normal file
View File

@ -0,0 +1 @@
import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration, ddmd.dmodule, ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func, ddmd.globals, ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array, ddmd.root.file, ddmd.root.rootobject, ddmd.statement;

4
tests/otbs/issue0063.d.ref Normal file
View File

@ -0,0 +1,4 @@
import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration, ddmd.dmodule,
ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func, ddmd.globals,
ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array, ddmd.root.file,
ddmd.root.rootobject, ddmd.statement;