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

Fix #27

This commit is contained in:
Hackerpilot 2015-03-15 18:13:28 -07:00
parent a6dda6d94c
commit 9f545cf6ff
9 changed files with 331 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

463
src/dfmt.d
View File

@ -85,8 +85,7 @@ else
if (isDir(path)) if (isDir(path))
{ {
inplace = true; inplace = true;
foreach (string name; dirEntries(path, "*.d", foreach (string name; dirEntries(path, "*.d", SpanMode.depth))
SpanMode.depth))
{ {
args ~= name; args ~= name;
} }
@ -173,42 +172,7 @@ private:
assert(index < tokens.length); assert(index < tokens.length);
if (currentIs(tok!"comment")) if (currentIs(tok!"comment"))
{ {
immutable bool currIsSlashSlash = tokens[index].text[0 .. 2] == "//"; formatComment();
if (index > 0)
{
immutable t = tokens[index - 1].type;
immutable bool prevWasSlashSlash = t == tok!"comment"
&& tokens[index - 1].text[0 .. 2] == "//";
immutable bool shouldSkipNewline = prevWasSlashSlash && !currIsSlashSlash
&& tokens[index - 1].line + 2 <= tokens[index].line;
if (!shouldSkipNewline && t != tok!";" && t != tok!"}"
&& tokens[index - 1].line + 1 < tokens[index].line)
{
newline();
}
else if (tokens[index - 1].line == tokens[index].line
|| (t == tok!")" && tokens[index + 1].type == tok!"{"))
write(" ");
}
writeToken();
immutable j = justAddedExtraNewline;
if (currIsSlashSlash)
{
newline();
justAddedExtraNewline = j;
}
else if (index < tokens.length)
{
if (tokens[index - 1].line == tokens[index].line)
{
if (tokens[index].type != tok!"{")
write(" ");
}
else if (!currentIs(tok!"{"))
newline();
}
else
newline();
} }
else if (isStringLiteral(current.type) || isNumberLiteral(current.type) else if (isStringLiteral(current.type) || isNumberLiteral(current.type)
|| currentIs(tok!"characterLiteral")) || currentIs(tok!"characterLiteral"))
@ -217,66 +181,7 @@ private:
} }
else if (currentIs(tok!"module") || currentIs(tok!"import")) else if (currentIs(tok!"module") || currentIs(tok!"import"))
{ {
auto t = current.type; formatModuleOrImport();
writeToken();
if (currentIs(tok!"("))
{
writeParens(false);
return;
}
write(" ");
while (index < tokens.length)
{
if (currentIs(tok!";"))
{
writeToken();
if (index >= tokens.length)
{
newline();
break;
}
if (currentIs(tok!"comment")
&& current.line == peekBack().line)
{
justAddedExtraNewline = true;
break;
}
else if ((t == tok!"import" && !currentIs(tok!"import")))
{
write("\n");
currentLineLength = 0;
justAddedExtraNewline = true;
newline();
}
else
newline();
break;
}
else if (currentIs(tok!","))
{
// compute length until next , or ;
int length_of_next_chunk = INVALID_TOKEN_LENGTH;
for (size_t i = index + 1; i < tokens.length; i++)
{
if (tokens[i].type == tok!"," || tokens[i].type == tok!";")
break;
const len = tokenLength(tokens[i]);
assert(len >= 0);
length_of_next_chunk += len;
}
assert(length_of_next_chunk > 0);
writeToken();
if (currentLineLength + 1 + length_of_next_chunk >= config.columnSoftLimit)
{
pushWrapIndent(tok!",");
newline();
}
else
write(" ");
}
else
formatStep();
}
} }
else if (currentIs(tok!"return")) else if (currentIs(tok!"return"))
{ {
@ -292,8 +197,8 @@ private:
write(" "); write(" ");
if (currentIs(tok!"(")) if (currentIs(tok!"("))
writeParens(false); writeParens(false);
if (!currentIs(tok!"switch") && !currentIs(tok!"with") if (!currentIs(tok!"switch") && !currentIs(tok!"with") && !currentIs(
&& !currentIs(tok!"{")) tok!"{"))
{ {
newline(); newline();
} }
@ -315,21 +220,17 @@ private:
else if ((isBlockHeader() || currentIs(tok!"version") else if ((isBlockHeader() || currentIs(tok!"version")
|| currentIs(tok!"debug")) && peekIs(tok!"(", false)) || currentIs(tok!"debug")) && peekIs(tok!"(", false))
{ {
immutable bool a = !currentIs(tok!"version") immutable bool a = !currentIs(tok!"version") && !currentIs(tok!"debug");
&& !currentIs(tok!"debug");
immutable bool b = a immutable bool b = a
|| astInformation.conditionalWithElseLocations.canFindIndex( || astInformation.conditionalWithElseLocations.canFindIndex(current.index);
current.index);
immutable bool shouldPushIndent = b immutable bool shouldPushIndent = b
|| astInformation.conditionalStatementLocations.canFindIndex( || astInformation.conditionalStatementLocations.canFindIndex(current.index);
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") if (currentIs(tok!"switch") || (currentIs(tok!"final") && peekIs(tok!"switch")))
&& peekIs(tok!"switch")))
write(" "); write(" ");
else if (currentIs(tok!"comment")) else if (currentIs(tok!"comment"))
formatStep(); formatStep();
@ -344,8 +245,8 @@ private:
else if (currentIs(tok!"else")) else if (currentIs(tok!"else"))
{ {
writeToken(); writeToken();
if (currentIs(tok!"if") || (currentIs(tok!"static") if (currentIs(tok!"if") || (currentIs(tok!"static") && peekIs(tok!"if"))
&& peekIs(tok!"if")) || currentIs(tok!"version")) || 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();
@ -413,20 +314,17 @@ private:
switch (current.type) switch (current.type)
{ {
case tok!"*": case tok!"*":
if (astInformation.spaceAfterLocations.canFindIndex( if (astInformation.spaceAfterLocations.canFindIndex(current.index))
current.index))
{ {
writeToken(); writeToken();
if (!currentIs(tok!"*") && !currentIs(tok!")") if (!currentIs(tok!"*") && !currentIs(tok!")") && !currentIs(
&& !currentIs(tok!"[") && !currentIs(tok!",") tok!"[") && !currentIs(tok!",") && !currentIs(tok!";"))
&& !currentIs(tok!";"))
{ {
write(" "); write(" ");
} }
break; break;
} }
else if (!astInformation.unaryLocations.canFindIndex( else if (!astInformation.unaryLocations.canFindIndex(current.index))
current.index))
goto binary; goto binary;
else else
writeToken(); writeToken();
@ -434,8 +332,8 @@ private:
case tok!"~": case tok!"~":
if (peekIs(tok!"this")) if (peekIs(tok!"this"))
{ {
if (!(index == 0 || peekBackIs(tok!"{") || peekBackIs(tok!"}") if (!(index == 0 || peekBackIs(tok!"{")
|| peekBackIs(tok!";"))) || peekBackIs(tok!"}") || peekBackIs(tok!";")))
{ {
write(" "); write(" ");
} }
@ -463,21 +361,25 @@ private:
spaceAfterParens = true; spaceAfterParens = true;
parenDepth++; parenDepth++;
} }
immutable bool arrayInitializerStart = p == tok!"[" immutable bool arrayInitializerStart = p == tok!"[" && linebreakHints.length != 0
&& linebreakHints.length != 0
&& astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index);
if (arrayInitializerStart || linebreakHints.canFindIndex(index - 1) if (arrayInitializerStart)
|| (linebreakHints.length == 0 && currentLineLength > config.columnSoftLimit {
&& !currentIs(tok!")"))) // Use the close bracket as the indent token to distinguish
// the array initialiazer from an array index in the newling
// handling code
pushWrapIndent(tok!"]");
newline();
immutable size_t j = expressionEndIndex(index);
linebreakHints = chooseLineBreakTokens(index,
tokens[index .. j], config, currentLineLength, indentLevel);
}
else if (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0
&& currentLineLength > config.columnSoftLimit && !currentIs(
tok!")")))
{ {
pushWrapIndent(p); pushWrapIndent(p);
newline(); newline();
if (arrayInitializerStart)
{
immutable size_t j = expressionEndIndex(index);
linebreakHints = chooseLineBreakTokens(index, tokens[index .. j],
config, currentLineLength, indentLevel);
}
} }
break; break;
case tok!")": case tok!")":
@ -492,8 +394,7 @@ private:
newline(); newline();
writeToken(); // in/out/body writeToken(); // in/out/body
} }
else if (peekIsLiteralOrIdent() || peekIsBasicType() else if (peekIsLiteralOrIdent() || peekIsBasicType() || peekIsKeyword())
|| peekIsKeyword())
{ {
writeToken(); writeToken();
if (spaceAfterParens || parenDepth > 0) if (spaceAfterParens || parenDepth > 0)
@ -514,13 +415,14 @@ private:
if (currentIs(tok!"(")) if (currentIs(tok!"("))
{ {
writeParens(false); writeParens(false);
if (index < tokens.length && tokens[index - 1].line < tokens[index].line) if (index < tokens.length && tokens[index - 1].line < tokens[
index].line)
newline(); newline();
else else
write(" "); write(" ");
} }
else if (index < tokens.length && (currentIs(tok!"@") || !isOperator( else if (index < tokens.length && (currentIs(tok!"@")
tokens[index].type))) || !isOperator(tokens[index].type)))
write(" "); write(" ");
break; break;
case tok!"!": case tok!"!":
@ -542,11 +444,10 @@ private:
if (!currentIs(tok!"{")) if (!currentIs(tok!"{"))
newline(); newline();
} }
else if (peekBackIs(tok!"identifier") else if (peekBackIs(tok!"identifier") && (peekBack2Is(tok!"{",
&& (peekBack2Is(tok!"{", true) true) || peekBack2Is(tok!"}", true) || peekBack2Is(tok!";",
|| peekBack2Is(tok!"}", true) || peekBack2Is(tok!";", true) || peekBack2Is(tok!":", true))
true) || peekBack2Is(tok!":", true)) && !(isBlockHeader(1) && !(isBlockHeader(1) && !peekIs(tok!"if")))
&& !peekIs(tok!"if")))
{ {
writeToken(); writeToken();
if (!currentIs(tok!"{")) if (!currentIs(tok!"{"))
@ -569,7 +470,9 @@ private:
} }
break; break;
case tok!"]": case tok!"]":
if (indents.length && indents.top == tok!"[") while (indents.length && isWrapIndent(indents.top))
indents.pop();
if (indents.length && indents.top == tok!"]")
newline(); newline();
writeToken(); writeToken();
if (currentIs(tok!"identifier")) if (currentIs(tok!"identifier"))
@ -592,53 +495,7 @@ private:
} }
break; break;
case tok!"{": case tok!"{":
if (astInformation.structInitStartLocations.canFindIndex(tokens[index].index)) formatLeftBrace();
{
writeToken();
}
else if (astInformation.funLitStartLocations.canFindIndex(
tokens[index].index))
{
if (peekBackIs(tok!")"))
write(" ");
writeToken();
write(" ");
}
else
{
if (!justAddedExtraNewline && !peekBackIs(tok!"{")
&& !peekBackIs(tok!"}") && !peekBackIs(tok!";")
&& !peekBackIs(tok!";"))
{
if (config.braceStyle == BraceStyle.otbs)
{
if (!astInformation.structInitStartLocations
.canFindIndex(tokens[index].index)
&& !astInformation.funLitStartLocations
.canFindIndex(tokens[index].index))
{
while (indents.length
&& isWrapIndent(indents.top))
indents.pop();
indents.push(tok!"{");
if (index == 1 || peekBackIs(tok!":", true)
|| peekBackIs(tok!"{", true)
|| peekBackIs(tok!"}", true)
|| peekBackIs(tok!")", true)
|| peekBackIs(tok!";", true))
{
indentLevel = indents.indentSize - 1;
}
}
write(" ");
}
else if (index > 0 && (!peekBackIs(tok!"comment")
|| tokens[index - 1].text[0 .. 2] != "//"))
newline();
}
writeToken();
newline();
}
break; break;
case tok!"}": case tok!"}":
if (astInformation.structInitEndLocations.canFindIndex(tokens[index].index)) if (astInformation.structInitEndLocations.canFindIndex(tokens[index].index))
@ -656,16 +513,14 @@ 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 if (config.braceStyle == BraceStyle.otbs && currentIs(tok!"else"))
&& currentIs(tok!"else"))
write(" "); write(" ");
if (!peekIs(tok!",") && !peekIs(tok!")")) if (!peekIs(tok!",") && !peekIs(tok!")"))
{ {
@ -702,8 +557,9 @@ private:
else else
{ {
writeToken(); writeToken();
if (!currentIs(tok!")", false) && !currentIs(tok!"]", false) && !currentIs( if (!currentIs(tok!")", false) && !currentIs(tok!"]",
tok!"}", false) && !currentIs(tok!"comment", false)) false) && !currentIs(tok!"}", false)
&& !currentIs(tok!"comment", false))
{ {
write(" "); write(" ");
} }
@ -787,13 +643,159 @@ private:
writeToken(); writeToken();
} }
void formatComment()
{
immutable bool prevIsComment = index > 0
&& tokens[index - 1].type == tok!"comment";
immutable bool currIsSlashSlash = tokens[index].text[0 .. 2] == "//";
immutable prevTokenEndLine = index == 0 ? size_t.max : tokenEndLine(tokens[index - 1]);
immutable size_t currTokenLine = tokens[index].line;
if (index > 0)
{
immutable t = tokens[index - 1].type;
immutable canAddNewline = currTokenLine - prevTokenEndLine < 1;
if (prevTokenEndLine == currTokenLine || (t == tok!")" && peekIs(tok!"{")))
write(" ");
else if (t != tok!";" && t != tok!"}" && canAddNewline)
{
newline();
}
}
writeToken();
immutable j = justAddedExtraNewline;
if (currIsSlashSlash)
{
newline();
justAddedExtraNewline = j;
}
else if (index < tokens.length)
{
if (index < tokens.length && prevTokenEndLine == tokens[index].line)
{
if (!currentIs(tok!"{"))
write(" ");
}
else if (!currentIs(tok!"{"))
newline();
}
else
newline();
}
void formatModuleOrImport()
{
auto t = current.type;
writeToken();
if (currentIs(tok!"("))
{
writeParens(false);
return;
}
write(" ");
while (index < tokens.length)
{
if (currentIs(tok!";"))
{
writeToken();
if (index >= tokens.length)
{
newline();
break;
}
if (currentIs(tok!"comment") && current.line == peekBack().line)
{
break;
}
else if ((t == tok!"import" && !currentIs(tok!"import")))
{
write("\n");
currentLineLength = 0;
justAddedExtraNewline = true;
newline();
}
else
newline();
break;
}
else if (currentIs(tok!","))
{
// compute length until next , or ;
int length_of_next_chunk = INVALID_TOKEN_LENGTH;
for (size_t i = index + 1; i < tokens.length; i++)
{
if (tokens[i].type == tok!"," || tokens[i].type == tok!";")
break;
const len = tokenLength(tokens[i]);
assert(len >= 0);
length_of_next_chunk += len;
}
assert(length_of_next_chunk > 0);
writeToken();
if (currentLineLength + 1 + length_of_next_chunk >= config.columnSoftLimit)
{
pushWrapIndent(tok!",");
newline();
}
else
write(" ");
}
else
formatStep();
}
}
void formatLeftBrace()
{
if (astInformation.structInitStartLocations.canFindIndex(tokens[index].index))
{
writeToken();
}
else if (astInformation.funLitStartLocations.canFindIndex(tokens[index].index))
{
if (peekBackIs(tok!")"))
write(" ");
writeToken();
write(" ");
}
else
{
if (!justAddedExtraNewline && !peekBackIs(tok!"{")
&& !peekBackIs(tok!"}") && !peekBackIs(tok!";") && !peekBackIs(tok!";"))
{
if (config.braceStyle == BraceStyle.otbs)
{
if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index)
&& !astInformation.funLitStartLocations.canFindIndex(tokens[
index].index))
{
while (indents.length && isWrapIndent(indents.top))
indents.pop();
indents.push(tok!"{");
if (index == 1 || peekBackIs(tok!":", true)
|| peekBackIs(tok!"{", true) || peekBackIs(tok!"}", true)
|| peekBackIs(tok!")", true) || peekBackIs(tok!";", true))
{
indentLevel = indents.indentSize - 1;
}
}
write(" ");
}
else if (index > 0 && (!peekBackIs(tok!"comment")
|| tokens[index - 1].text[0 .. 2] != "//"))
newline();
}
writeToken();
newline();
}
}
void regenLineBreakHintsIfNecessary(immutable size_t i) void regenLineBreakHintsIfNecessary(immutable size_t i)
{ {
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], config, currentLineLength, linebreakHints = chooseLineBreakTokens(i, tokens[i .. j], config,
indentLevel); currentLineLength, indentLevel);
} }
} }
@ -1018,7 +1020,8 @@ private:
return false; return false;
auto t = tokens[i + index].type; auto t = tokens[i + index].type;
return t == tok!"for" || t == tok!"foreach" || t == tok!"foreach_reverse" return t == tok!"for" || t == tok!"foreach" || t == tok!"foreach_reverse"
|| t == tok!"while" || t == tok!"if" || t == tok!"out" || t == tok!"catch" || t == tok!"with"; || t == tok!"while" || t == tok!"if" || t == tok!"out"
|| t == tok!"catch" || t == tok!"with";
} }
void newline() void newline()
@ -1026,13 +1029,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") && index > 0 && 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(astInformation.funLitEndLocations).equalRange( if (hasCurrent && tokens[index].type == tok!"}"
tokens[index].index).empty) && !assumeSorted(astInformation.funLitEndLocations).equalRange(tokens[
index].index).empty)
{ {
write(" "); write(" ");
return; return;
@ -1040,8 +1044,8 @@ private:
output.put("\n"); output.put("\n");
if (!justAddedExtraNewline && index > 0 && hasCurrent && tokens[index].line - tokenEndLine( if (!justAddedExtraNewline && index > 0 && hasCurrent
tokens[index - 1]) > 1) && tokens[index].line - tokenEndLine(tokens[index - 1]) > 1)
{ {
output.put("\n"); output.put("\n");
} }
@ -1093,15 +1097,15 @@ private:
indentLevel = l; indentLevel = l;
} }
else if (currentIs(tok!"{") && !astInformation.structInitStartLocations.canFindIndex( else if (currentIs(tok!"{") && !astInformation.structInitStartLocations.canFindIndex(
tokens[index].index) && !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!"{", if (index == 1 || peekBackIs(tok!":", true) || peekBackIs(tok!"{",
true) || peekBackIs(tok!"}", true) || peekBackIs(tok!")", true) || peekBackIs( true) || peekBackIs(tok!"}", true) || peekBackIs(tok!")", true)
tok!";", true)) || peekBackIs(tok!";", true))
{ {
indentLevel = indents.indentSize - 1; indentLevel = indents.indentSize - 1;
} }
@ -1116,16 +1120,21 @@ private:
indents.pop(); indents.pop();
} }
while (indents.length && isTempIndent(indents.top) while (indents.length && isTempIndent(indents.top)
&& ((indents.top != tok!"if" && indents.top != tok!"version") || !peekIs( && ((indents.top != tok!"if"
tok!"else"))) && indents.top != tok!"version") || !peekIs(tok!"else")))
{ {
indents.pop(); indents.pop();
} }
} }
else if (currentIs(tok!"]") && indents.length && indents.top == tok!"[") else if (currentIs(tok!"]"))
{ {
indents.pop(); while (indents.length && isWrapIndent(indents.top))
indentLevel = indents.indentSize; indents.pop();
if (indents.length && indents.top == tok!"]")
{
indents.pop();
indentLevel = indents.indentSize;
}
} }
else if (astInformation.attributeDeclarationLines.canFindIndex(current.line)) else if (astInformation.attributeDeclarationLines.canFindIndex(current.line))
{ {
@ -1232,7 +1241,7 @@ private:
bool isWrapIndent(IdType type) pure nothrow @nogc @safe bool isWrapIndent(IdType type) pure nothrow @nogc @safe
{ {
return type != tok!"{" && type != tok!":" && isOperator(type); return type != tok!"{" && type != tok!":" && type != tok!"]" && isOperator(type);
} }
bool isTempIndent(IdType type) pure nothrow @nogc @safe bool isTempIndent(IdType type) pure nothrow @nogc @safe
@ -1243,7 +1252,8 @@ bool isTempIndent(IdType type) pure nothrow @nogc @safe
/// The only good brace styles /// The only good brace styles
enum BraceStyle enum BraceStyle
{ {
allman, otbs allman,
otbs
} }
/// Configuration options for formatting /// Configuration options for formatting
@ -1454,7 +1464,8 @@ final class FormatVisitor : ASTVisitor
override void visit(const UnaryExpression unary) override void visit(const UnaryExpression unary)
{ {
if (unary.prefix.type == tok!"~" || unary.prefix.type == tok!"&" if (unary.prefix.type == tok!"~" || unary.prefix.type == tok!"&"
|| unary.prefix.type == tok!"*" || unary.prefix.type == tok!"+" || unary.prefix.type == tok!"-") || unary.prefix.type == tok!"*" || unary.prefix.type == tok!"+"
|| unary.prefix.type == tok!"-")
{ {
astInformation.unaryLocations ~= unary.prefix.index; astInformation.unaryLocations ~= unary.prefix.index;
} }
@ -1682,7 +1693,6 @@ struct State
immutable remainingCharsMultiplier = 40; immutable remainingCharsMultiplier = 40;
immutable newlinePenalty = 800; immutable newlinePenalty = 800;
this.breaks = breaks; this.breaks = breaks;
this._depth = depth; this._depth = depth;
import std.algorithm : map, sum; import std.algorithm : map, sum;
@ -1756,8 +1766,8 @@ struct State
int opCmp(ref const State other) const pure nothrow @safe int opCmp(ref const State other) const pure nothrow @safe
{ {
if (cost < other.cost || (cost == other.cost && ((breaks.length && other.breaks.length && breaks[ if (cost < other.cost || (cost == other.cost && ((breaks.length
0] > other.breaks[0]) || (_solved && !other.solved)))) && other.breaks.length && breaks[0] > other.breaks[0]) || (_solved && !other.solved))))
{ {
return -1; return -1;
} }
@ -1792,8 +1802,8 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens,
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, formatterConfig, open.insert(State(cast(size_t[])[], tokens[0 .. tokensEnd], depth,
currentLineLength, indentLevel)); formatterConfig, currentLineLength, indentLevel));
State lowest; State lowest;
GC.disable(); GC.disable();
scope(exit) GC.enable(); scope(exit) GC.enable();
@ -1808,8 +1818,8 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens,
current.breaks[] += index; current.breaks[] += index;
return current.breaks; return current.breaks;
} }
foreach (next; validMoves(tokens[0 .. tokensEnd], current, formatterConfig, foreach (next; validMoves(tokens[0 .. tokensEnd], current,
currentLineLength, indentLevel, depth)) formatterConfig, currentLineLength, indentLevel, depth))
{ {
open.insert(next); open.insert(next);
} }
@ -1843,8 +1853,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, currentLineLength, states ~= State(breaks, tokens, depth + 1, formatterConfig,
indentLevel); currentLineLength, indentLevel);
} }
return states; return states;
} }
@ -1872,7 +1882,7 @@ struct IndentStack
int tempIndentCount = 0; int tempIndentCount = 0;
for (size_t i = index; i > 0; i--) for (size_t i = index; i > 0; i--)
{ {
if (!isWrapIndent(arr[i])) if (!isWrapIndent(arr[i]) && arr[i] != tok!"]")
break; break;
tempIndentCount++; tempIndentCount++;
} }
@ -1903,8 +1913,9 @@ struct IndentStack
int size = 0; int size = 0;
foreach (i; 1 .. j + 1) foreach (i; 1 .. j + 1)
{ {
if ((i + 1 <= index && !isWrapIndent(arr[i]) && isTempIndent(arr[i]) && ( if ((i + 1 <= index && arr[i] != tok!"]" && !isWrapIndent(arr[i])
!isTempIndent(arr[i + 1]) || arr[i + 1] == tok!"switch"))) && isTempIndent(arr[i]) && (!isTempIndent(arr[i + 1])
|| arr[i + 1] == tok!"switch")))
{ {
continue; continue;
} }

2
tests/allman/comments.d.ref
View File

@ -3,5 +3,5 @@ int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/
// comment on its own line // comment on its own line
foo() // comment on same line foo() // comment on same line
.bar(); // also on same line .bar(); // also on same line
/* again */ // same line /* again */ // same line
} }

27
tests/allman/issue0027.d.ref
View File

@ -18,4 +18,31 @@ unittest
mangleNumber(sa.dim ? sa.dim.toInteger() : 0); mangleNumber(sa.dim ? sa.dim.toInteger() : 0);
cur = cur.nextOf(); cur = cur.nextOf();
} }
if (fd)
{
/* Use storage_class2 instead of storage_class otherwise when we do .di generation
* we'll wind up with 'const const' rather than 'const'.
*/
/* Don't think we need to worry about mutually exclusive storage classes here
*/
fd.storage_class2 |= stc;
}
} }
SignExtendedNumber opMul(const SignExtendedNumber a) const
{
/* Special handling for zeros:
*/
// like 0x10 * 0x10 == 0x100 == 0.
}
// Because int64_t and friends may be any integral type of the
// correct size, we have to explicitly ask for the correct
// integer type to get the correct mangling with ddmd
// Be careful not to care about sign when using dinteger_t
// use this instead of integer_t to
// avoid conflicts with system #include's

2
tests/allman/issue0082.d.ref
View File

@ -6,8 +6,6 @@ label:
} }
Label: Label:
// comment // comment
statement(); statement();
} }

1
tests/issue0023.d
View File

@ -6,4 +6,5 @@ string generateFixedLengthCases()
string[] fixedLengthTokens = ["abstract", "alias", "align", "asm", "assert", "auto", "body", "bool","break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat","char", "class", "const", "continue", "creal", "dchar", "debug","default", "delegate", "delete", "deprecated", "do", "double", "else","enum", "export", "extern", "false", "final", "finally", "float", "for","foreach", "foreach_reverse", "function", "goto", "idouble", "if","ifloat", "immutable", "import", "in", "inout", "int", "interface","invariant", "ireal", "is", "lazy", "long", "macro", "mixin", "module","new", "nothrow", "null", "out", "override", "package", "pragma","private", "protected", "public", "pure", "real", "ref", "return","scope", "shared", "short", "static", "struct", "super", "switch","synchronized", "template", "this", "throw", "true", "try", "typedef","typeid", "typeof", "ubyte", "ucent", "uint", "ulong", "union","unittest", "ushort", "version", "void", "volatile", "wchar", "while","with", "__DATE__", "__EOF__", "__FILE__", "__FUNCTION__", "__gshared","__LINE__", "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", string[] fixedLengthTokens = ["abstract", "alias", "align", "asm", "assert", "auto", "body", "bool","break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat","char", "class", "const", "continue", "creal", "dchar", "debug","default", "delegate", "delete", "deprecated", "do", "double", "else","enum", "export", "extern", "false", "final", "finally", "float", "for","foreach", "foreach_reverse", "function", "goto", "idouble", "if","ifloat", "immutable", "import", "in", "inout", "int", "interface","invariant", "ireal", "is", "lazy", "long", "macro", "mixin", "module","new", "nothrow", "null", "out", "override", "package", "pragma","private", "protected", "public", "pure", "real", "ref", "return","scope", "shared", "short", "static", "struct", "super", "switch","synchronized", "template", "this", "throw", "true", "try", "typedef","typeid", "typeof", "ubyte", "ucent", "uint", "ulong", "union","unittest", "ushort", "version", "void", "volatile", "wchar", "while","with", "__DATE__", "__EOF__", "__FILE__", "__FUNCTION__", "__gshared","__LINE__", "__MODULE__", "__parameters", "__PRETTY_FUNCTION__",
"__TIME__", "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__","__VERSION__", ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>","!<>=", "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")","*", "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=","<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>",">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}","~", "~=" ]; "__TIME__", "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__","__VERSION__", ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>","!<>=", "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")","*", "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=","<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>",">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}","~", "~=" ];
} }

50
tests/issue0027.d
View File

@ -1,22 +1,48 @@
SignExtendedNumber opMul(const SignExtendedNumber a) const SignExtendedNumber opMul(const SignExtendedNumber a) const
{ {
// like 0x10 * 0x10 == 0x100 == 0. // like 0x10 * 0x10 == 0x100 == 0.
/* Special handling for zeros: /* Special handling for zeros:
*/ */
} }
unittest unittest
{ {
if (Port.isNan(r1) || Port.isNan(r2)) // if unordered if (Port.isNan(r1) || Port.isNan(r2)) // if unordered
{ {
} }
while (cur && cur.ty == Tsarray)
// sizes of dimensions
{
TypeSArray sa = cast(TypeSArray) cur;
mangleNumber(sa.dim ? sa.dim.toInteger() : 0);
cur = cur.nextOf();
}
if (fd)
{
/* Use storage_class2 instead of storage_class otherwise when we do .di generation
* we'll wind up with 'const const' rather than 'const'.
*/
/* Don't think we need to worry about mutually exclusive storage classes here
*/
fd.storage_class2 |= stc;
}
while (cur && cur.ty == Tsarray)
// sizes of dimensions
{
TypeSArray sa = cast(TypeSArray) cur;
mangleNumber(sa.dim ? sa.dim.toInteger() : 0);
cur = cur.nextOf();
}
} }
SignExtendedNumber opMul(const SignExtendedNumber a) const
{
/* Special handling for zeros:
*/
// like 0x10 * 0x10 == 0x100 == 0.
}
// Because int64_t and friends may be any integral type of the
// correct size, we have to explicitly ask for the correct
// integer type to get the correct mangling with ddmd
// Be careful not to care about sign when using dinteger_t
// use this instead of integer_t to
// avoid conflicts with system #include's

2
tests/otbs/comments.d.ref
View File

@ -2,5 +2,5 @@ int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/ {
// comment on its own line // comment on its own line
foo() // comment on same line foo() // comment on same line
.bar(); // also on same line .bar(); // also on same line
/* again */ // same line /* again */ // same line
} }

27
tests/otbs/issue0027.d.ref
View File

@ -16,4 +16,29 @@ unittest {
mangleNumber(sa.dim ? sa.dim.toInteger() : 0); mangleNumber(sa.dim ? sa.dim.toInteger() : 0);
cur = cur.nextOf(); cur = cur.nextOf();
} }
}
if (fd) {
/* Use storage_class2 instead of storage_class otherwise when we do .di generation
* we'll wind up with 'const const' rather than 'const'.
*/
/* Don't think we need to worry about mutually exclusive storage classes here
*/
fd.storage_class2 |= stc;
}
}
SignExtendedNumber opMul(const SignExtendedNumber a) const {
/* Special handling for zeros:
*/
// like 0x10 * 0x10 == 0x100 == 0.
}
// Because int64_t and friends may be any integral type of the
// correct size, we have to explicitly ask for the correct
// integer type to get the correct mangling with ddmd
// Be careful not to care about sign when using dinteger_t
// use this instead of integer_t to
// avoid conflicts with system #include's

2
tests/otbs/issue0082.d.ref
View File

@ -4,8 +4,6 @@ label:
} }
Label: Label:
// comment // comment
statement(); statement();
} }