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

Fix #11

This commit is contained in:
Hackerpilot 2015-01-25 10:57:31 -08:00
parent 49d06bb1b9
commit e4ed938515
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/dfmt.d
View File

@ -43,7 +43,7 @@ Formats D code.
"; ";
version (NoMain) version (NoMain)
{ } { }
else else
int main(string[] args) int main(string[] args)
{ {
@ -343,7 +343,7 @@ private:
case tok!";": case tok!";":
tempIndent = 0; tempIndent = 0;
writeToken(); writeToken();
if (current.type != tok!"comment") if (index >= tokens.length || current.type != tok!"comment")
newline(); newline();
if (peekImplementation(tok!"class",0)) if (peekImplementation(tok!"class",0))
newline(); newline();
@ -432,8 +432,9 @@ private:
else if (current.type == tok!"identifier") else if (current.type == tok!"identifier")
{ {
writeToken(); writeToken();
if (current.type == tok!"identifier" || isKeyword(current.type) if (index < tokens.length && (current.type == tok!"identifier"
|| current.type == tok!"@") || isKeyword(current.type) || isBasicType(current.type)
|| current.type == tok!"@"))
write(" "); write(" ");
} }
else else
@ -894,33 +895,32 @@ private:
string generateFixedLengthCases() string generateFixedLengthCases()
{ {
import std.algorithm:map; import std.algorithm : map;
import std.string:format; import std.string : format;
string[] fixedLengthTokens = [ string[] fixedLengthTokens = ["abstract", "alias", "align", "asm", "assert",
"abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", "auto", "body", "bool", "break", "byte", "case", "cast", "catch",
"break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", "cdouble", "cent", "cfloat", "char", "class", "const", "continue",
"char", "class", "const", "continue", "creal", "dchar", "debug", "default", "creal", "dchar", "debug", "default", "delegate", "delete", "deprecated",
"delegate", "delete", "deprecated", "do", "double", "else", "enum", "do", "double", "else", "enum", "export", "extern", "false", "final",
"export", "extern", "false", "final", "finally", "float", "for", "foreach", "finally", "float", "for", "foreach", "foreach_reverse", "function",
"foreach_reverse", "function", "goto", "idouble", "if", "ifloat", "goto", "idouble", "if", "ifloat", "immutable", "import", "in", "inout",
"immutable", "import", "in", "inout", "int", "interface", "invariant", "int", "interface", "invariant", "ireal", "is", "lazy", "long", "macro",
"ireal", "is", "lazy", "long", "macro", "mixin", "module", "new", "nothrow", "mixin", "module", "new", "nothrow", "null", "out", "override", "package",
"null", "out", "override", "package", "pragma", "private", "protected", "pragma", "private", "protected", "public", "pure", "real", "ref",
"public", "pure", "real", "ref", "return", "scope", "shared", "short", "return", "scope", "shared", "short", "static", "struct", "super",
"static", "struct", "super", "switch", "synchronized", "template", "this", "switch", "synchronized", "template", "this", "throw", "true", "try",
"throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", "ucent", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", "union",
"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, a
.length)).join("\n\t");
return fixedLengthTokens.map!(a => format(`case tok!"%s": return %d;`, a, a.length)).join("\n\t");
} }

1
tests/propertySpacing.d Normal file
View File

@ -0,0 +1 @@
@property double y();

1
tests/propertySpacing.d.ref Normal file
View File

@ -0,0 +1 @@
@property double y();