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

Fix #140

This commit is contained in:
Hackerpilot 2015-04-27 15:34:35 -07:00
parent 04f6684a50
commit bb3ee5df18
17 changed files with 104 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdparse

@ -1 +1 @@
Subproject commit 256b979f3b53c3367b6556c5b68e9cc76ceaf391
Subproject commit ccb3d98996f89cfb35799aee6358e640f6f71f67

78
src/dfmt/formatter.d
View File

@ -475,7 +475,18 @@ private:
linebreakHints = [];
while (indents.topIs(tok!"enum"))
indents.pop();
newline();
if (config.dfmt_brace_style == BraceStyle.allman)
{
if (!currentIs(tok!"{"))
newline();
}
else
{
if (currentIs(tok!"{"))
indents.popTempIndents();
indentLevel = indents.indentSize;
newline();
}
}
}
@ -518,31 +529,29 @@ private:
}
else
{
if (!justAddedExtraNewline && !peekBackIsOneOf(false, tok!"{",
tok!"}", tok!";", tok!";"))
indents.popWrapIndents();
if (indents.length && isTempIndent(indents.top))
indentLevel = indents.indentSize - 1;
else
indentLevel = indents.indentSize;
if (!peekBackIsSlashSlash())
{
if (config.dfmt_brace_style != BraceStyle.allman)
{
if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index)
&& !astInformation.funLitStartLocations.canFindIndex(
tokens[index].index))
{
indents.popWrapIndents();
indents.push(tok!"{");
if (index == 1 || peekBackIsOneOf(true, tok!":", tok!"{",
tok!"}", tok!")", tok!";"))
{
indentLevel = indents.indentSize - 1;
}
}
write(" ");
}
else if (index > 0 && (!peekBackIs(tok!"comment")
|| tokens[index - 1].text[0 .. 2] != "//"))
if (config.dfmt_brace_style == BraceStyle.allman || peekBackIsOneOf(true, tok!"{", tok!"}"))
newline();
else if (!peekBackIsOneOf(true, tok!"{", tok!"}", tok!";"))
write(" ");
writeToken();
}
writeToken();
newline();
else
{
writeToken();
indents.popTempIndents();
indentLevel = indents.indentSize - 1;
}
indents.push(tok!"{");
if (!currentIs(tok!"{"))
newline();
linebreakHints = [];
}
}
@ -584,9 +593,9 @@ private:
currentLineLength = 0;
justAddedExtraNewline = true;
}
if (config.dfmt_brace_style == BraceStyle.otbs && currentIs(tok!"else"))
if (config.dfmt_brace_style != BraceStyle.allman && currentIs(tok!"else"))
write(" ");
if (!peekIs(tok!",") && !peekIs(tok!")") && !peekIs(tok!";"))
if (!peekIs(tok!",") && !peekIs(tok!")") && !peekIs(tok!";") && !peekIs(tok!"{"))
{
index++;
newline();
@ -967,7 +976,7 @@ private:
if (currentIs(tok!"comment") && index > 0 && current.line == tokenEndLine(tokens[index - 1]))
return;
immutable bool hasCurrent = index + 1 < tokens.length;
immutable bool hasCurrent = index < tokens.length;
if (niBraceDepth > 0 && !peekBackIsSlashSlash() && hasCurrent
&& tokens[index].type == tok!"}" && !assumeSorted(
@ -1031,16 +1040,13 @@ private:
if (l != -1)
indentLevel = l;
}
else if (currentIs(tok!"{")
&& !astInformation.structInitStartLocations.canFindIndex(tokens[index].index)
&& !astInformation.funLitStartLocations.canFindIndex(tokens[index].index))
else if (currentIs(tok!"{"))
{
indents.popWrapIndents();
indents.push(tok!"{");
if (index == 1 || peekBackIsOneOf(true, tok!":", tok!"{",
tok!"}", tok!")", tok!";", tok!"identifier") || peekBackIsKeyword())
if (peekBackIsSlashSlash())
{
indentLevel = indents.indentSize - 1;
indents.popTempIndents();
indentLevel = indents.indentSize;
}
}
else if (currentIs(tok!"}"))
@ -1051,8 +1057,7 @@ private:
indentLevel = indents.indentToMostRecent(tok!"{");
indents.pop();
}
while (indents.length && isTempIndent(indents.top)
&& ((indents.top != tok!"if"
while (indents.topIsTemp() && ((indents.top != tok!"if"
&& indents.top != tok!"version") || !peekIs(tok!"else")))
{
indents.pop();
@ -1075,8 +1080,7 @@ private:
}
else
{
while (indents.length && (peekBackIsOneOf(true, tok!"}",
tok!";") && indents.top != tok!";") && isTempIndent(indents.top()))
while (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}", tok!";") && indents.top != tok!";"))
{
indents.pop();
}

10
src/dfmt/indentation.d
View File

@ -75,6 +75,16 @@ struct IndentStack
return index > 0 && arr[index] == type;
}
bool topIsTemp()
{
return index > 0 && index < arr.length && isTempIndent(arr[index]);
}
bool topIsWrap()
{
return index > 0 && index < arr.length && isWrapIndent(arr[index]);
}
bool topIsOneOf(IdType[] types...) const pure nothrow @safe @nogc
{
if (index <= 0)

1
tests/allman/issue0023.d.ref
View File

@ -32,4 +32,5 @@ string generateFixedLengthCases()
"=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "]", "^",
"^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~="
];
}

0
tests/allman/issue0051.d.d.ref Normal file
View File

1
tests/allman/issue0054.d.ref
View File

@ -24,4 +24,5 @@ struct ClassFlags
alias isAbstract = Enum.isAbstract;
alias isCPPclass = Enum.isCPPclass;
alias hasDtor = Enum.hasDtor;
}

0
tests/allman/issue0095.d.d.ref Normal file
View File

6
tests/allman/issue0140.d.ref Normal file
View File

@ -0,0 +1,6 @@
class C
{
int foo;
}

6
tests/issue0140.d Normal file
View File

@ -0,0 +1,6 @@
class C
{
int foo;
}

1
tests/otbs/issue0023.d.ref
View File

@ -31,4 +31,5 @@ string generateFixedLengthCases() {
"=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "]", "^",
"^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~="
];
}

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

@ -7,38 +7,38 @@ SignExtendedNumber opMul(const SignExtendedNumber a) const {
unittest {
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();
}
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
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
/* Don't think we need to worry about mutually exclusive storage classes here
*/
fd.storage_class2 |= stc;
}
fd.storage_class2 |= stc;
}
}
}
SignExtendedNumber opMul(const SignExtendedNumber a) const {
/* Special handling for zeros:
SignExtendedNumber opMul(const SignExtendedNumber a) const {
/* Special handling for zeros:
*/
// like 0x10 * 0x10 == 0x100 == 0.
}
// 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
// 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
// Be careful not to care about sign when using dinteger_t
// use this instead of integer_t to
// avoid conflicts with system #include's

0
tests/otbs/issue0051.d.d.ref Normal file
View File

12
tests/otbs/issue0051.d.ref
View File

@ -2,11 +2,11 @@ void f() {
if (a) {
}
else // wat
{
if (!is_temp_arg_ref) {
if (global.params.isOSX)
buf.writeByte('_');
}
{
if (!is_temp_arg_ref) {
if (global.params.isOSX)
buf.writeByte('_');
}
return;
}
return;
}

1
tests/otbs/issue0054.d.ref
View File

@ -22,4 +22,5 @@ struct ClassFlags {
alias isAbstract = Enum.isAbstract;
alias isCPPclass = Enum.isCPPclass;
alias hasDtor = Enum.hasDtor;
}

0
tests/otbs/issue0095.d.d.ref Normal file
View File

4
tests/otbs/issue0098.d.ref
View File

@ -1,6 +1,6 @@
unittest {
if (!fdmatch)
goto Lfd; // comment
{
}
{
}
}

5
tests/otbs/issue0140.d.ref Normal file
View File

@ -0,0 +1,5 @@
class C {
int foo;
}