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

Run dfmt on itself

This commit is contained in:
Hackerpilot 2015-03-16 12:22:00 -07:00
parent df6e218ff6
commit 0702a50c2b
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/dfmt.d
View File

@ -223,8 +223,7 @@ private:
write(" "); write(" ");
if (currentIs(tok!"(")) if (currentIs(tok!"("))
writeParens(false); writeParens(false);
if (!currentIs(tok!"switch") && !currentIs(tok!"with") && !currentIs( if (!currentIs(tok!"switch") && !currentIs(tok!"with") && !currentIs(tok!"{"))
tok!"{"))
{ {
newline(); newline();
} }
@ -267,8 +266,7 @@ private:
{ {
writeToken(); writeToken();
if (index < tokens.length && (currentIs(tok!"identifier") if (index < tokens.length && (currentIs(tok!"identifier")
|| isKeyword(current.type) || isBasicType(current.type) || currentIs( || isKeyword(current.type) || isBasicType(current.type) || currentIs(tok!"@")))
tok!"@")))
{ {
write(" "); write(" ");
} }
@ -529,15 +527,16 @@ private:
if (config.braceStyle == BraceStyle.otbs) if (config.braceStyle == BraceStyle.otbs)
{ {
if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index) if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index)
&& !astInformation.funLitStartLocations.canFindIndex(tokens[ && !astInformation.funLitStartLocations.canFindIndex(
index].index)) 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) 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) || peekBackIs(tok!";",
true))
{ {
indentLevel = indents.indentSize - 1; indentLevel = indents.indentSize - 1;
} }
@ -570,8 +569,9 @@ private:
if (peekBackIsLiteralOrIdent() || peekBackIs(tok!",")) if (peekBackIsLiteralOrIdent() || peekBackIs(tok!","))
newline(); newline();
write("}"); write("}");
if (index < tokens.length - 1 && astInformation.doubleNewlineLocations.canFindIndex( if (index < tokens.length - 1
tokens[index].index) && !peekIs(tok!"}")) && astInformation.doubleNewlineLocations.canFindIndex(tokens[index].index)
&& !peekIs(tok!"}"))
{ {
write("\n"); write("\n");
currentLineLength = 0; currentLineLength = 0;
@ -600,8 +600,8 @@ private:
void formatBlockHeader() void formatBlockHeader()
{ {
immutable bool a = !currentIs(tok!"version") && !currentIs(tok!"debug"); immutable bool a = !currentIs(tok!"version") && !currentIs(tok!"debug");
immutable bool b = a || astInformation.conditionalWithElseLocations.canFindIndex( immutable bool b = a
current.index); || astInformation.conditionalWithElseLocations.canFindIndex(current.index);
immutable bool shouldPushIndent = b immutable bool shouldPushIndent = b
|| astInformation.conditionalStatementLocations.canFindIndex(current.index); || astInformation.conditionalStatementLocations.canFindIndex(current.index);
if (shouldPushIndent) if (shouldPushIndent)
@ -695,8 +695,8 @@ private:
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(" ");
} }
@ -710,8 +710,8 @@ private:
case tok!"~": case tok!"~":
if (peekIs(tok!"this")) if (peekIs(tok!"this"))
{ {
if (!(index == 0 || peekBackIs(tok!"{") || peekBackIs(tok!"}") || peekBackIs( if (!(index == 0 || peekBackIs(tok!"{") || peekBackIs(tok!"}")
tok!";"))) || peekBackIs(tok!";")))
{ {
write(" "); write(" ");
} }
@ -861,8 +861,8 @@ private:
else else
{ {
writeToken(); writeToken();
if (!currentIs(tok!")", false) && !currentIs(tok!"]", false) && !currentIs( if (!currentIs(tok!")", false) && !currentIs(tok!"]", false)
tok!"}", false) && !currentIs(tok!"comment", false)) && !currentIs(tok!"}", false) && !currentIs(tok!"comment", false))
{ {
write(" "); write(" ");
} }
@ -875,8 +875,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], depths[i .. j], linebreakHints = chooseLineBreakTokens(i, tokens[i .. j],
config, currentLineLength, indentLevel); depths[i .. j], config, currentLineLength, indentLevel);
} }
} }
@ -1078,8 +1078,7 @@ private:
immutable bool hasCurrent = index + 1 < tokens.length; immutable bool hasCurrent = index + 1 < tokens.length;
if (hasCurrent && tokens[index].type == tok!"}" if (hasCurrent && tokens[index].type == tok!"}"
&& !assumeSorted(astInformation.funLitEndLocations).equalRange(tokens[ && !assumeSorted(astInformation.funLitEndLocations).equalRange(tokens[index].index).empty)
index].index).empty)
{ {
write(" "); write(" ");
return; return;
@ -1147,8 +1146,8 @@ private:
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) true) || peekBackIs(tok!"}", true) || peekBackIs(tok!")",
|| peekBackIs(tok!";", true)) true) || peekBackIs(tok!";", true))
{ {
indentLevel = indents.indentSize - 1; indentLevel = indents.indentSize - 1;
} }
@ -1544,8 +1543,8 @@ string generateFixedLengthCases()
">>", ">>=", ">>>", ">>>=", "?", "@", "^", "^=", "^^", "^^=", "|", "|=", "||", ">>", ">>=", ">>>", ">>>=", "?", "@", "^", "^=", "^^", "^^=", "|", "|=", "||",
"~", "~=" "~", "~="
]; ];
immutable spacedOperatorTokenCases = spacedOperatorTokens.map!(a => format( immutable spacedOperatorTokenCases = spacedOperatorTokens.map!(
`case tok!"%s": return %d + 1;`, a, a.length)).join("\n\t"); a => format(`case tok!"%s": return %d + 1;`, a, a.length)).join("\n\t");
string[] identifierTokens = [ string[] identifierTokens = [
"abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool",
@ -1567,8 +1566,8 @@ string generateFixedLengthCases()
"__TIME__", "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__TIME__", "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__",
"__VERSION__", "$", "++", "--", ".", "[", "]", "(", ")", "{", "}" "__VERSION__", "$", "++", "--", ".", "[", "]", "(", ")", "{", "}"
]; ];
immutable identifierTokenCases = identifierTokens.map!(a => format( immutable identifierTokenCases = identifierTokens.map!(
`case tok!"%s": return %d;`, a, a.length)).join("\n\t"); a => format(`case tok!"%s": return %d;`, a, a.length)).join("\n\t");
return spacedOperatorTokenCases ~ identifierTokenCases; return spacedOperatorTokenCases ~ identifierTokenCases;
} }
@ -1846,8 +1845,8 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens, immutable sho
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], depths[0 .. tokensEnd], open.insert(State(cast(size_t[])[], tokens[0 .. tokensEnd],
depth, formatterConfig, currentLineLength, indentLevel)); depths[0 .. tokensEnd], depth, formatterConfig, currentLineLength, indentLevel));
State lowest; State lowest;
GC.disable(); GC.disable();
scope(exit) GC.enable(); scope(exit) GC.enable();
@ -1863,7 +1862,7 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens, immutable sho
return current.breaks; return current.breaks;
} }
foreach (next; validMoves(tokens[0 .. tokensEnd], depths[0 .. tokensEnd], foreach (next; validMoves(tokens[0 .. tokensEnd], depths[0 .. tokensEnd],
current,formatterConfig, currentLineLength, indentLevel, depth)) current, formatterConfig, currentLineLength, indentLevel, depth))
{ {
open.insert(next); open.insert(next);
} }