From 98cd73ec8035b703727dd8a6eb63fa07e7711dd2 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 22:06:57 +0100 Subject: [PATCH] Fix 2D (assoc) arrays & add tests Fix #312 --- src/dfmt/formatter.d | 47 ++++++++++++++------ src/dfmt/indentation.d | 12 +++-- tests/2d_arrays.d | 17 +++++++ tests/allman/2d_arrays.d.ref | 38 ++++++++++++++++ tests/allman/associative_array.d.ref | 20 ++++----- tests/allman/associative_array_complex.d.ref | 25 +++++++++++ tests/allman/issue0017.d.ref | 4 +- tests/allman/issue0023.d.ref | 41 +++++++++-------- tests/associative_array_complex.d | 11 +++++ tests/otbs/2d_arrays.d.ref | 21 +++++++++ tests/otbs/associative_array.d.ref | 20 ++++----- tests/otbs/associative_array_complex.d.ref | 24 ++++++++++ tests/otbs/issue0017.d.ref | 4 +- tests/otbs/issue0023.d.ref | 41 +++++++++-------- 14 files changed, 246 insertions(+), 79 deletions(-) create mode 100644 tests/2d_arrays.d create mode 100644 tests/allman/2d_arrays.d.ref create mode 100644 tests/allman/associative_array_complex.d.ref create mode 100644 tests/associative_array_complex.d create mode 100644 tests/otbs/2d_arrays.d.ref create mode 100644 tests/otbs/associative_array_complex.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 846b5ff..7b5f6a5 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -578,13 +578,16 @@ private: // handling code IndentStack.Details detail; detail.wrap = false; - detail.temp = true; - // wrap and temp are set manually to the values it would actually - // receive here because we want to set isAA for the ] token to know if - // we should definitely always new-line after every comma for a big AA - detail.isAA = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); - pushWrapIndent(tok!"]", detail); + detail.temp = false; + // wrap and temp are set manually to the values it would actually + // receive here because we want to set breakEveryItem for the ] token to know if + // we should definitely always new-line after every comma for a big AA + detail.breakEveryItem = astInformation.assocArrayStartLocations.canFindIndex( + tokens[index - 1].index); + detail.preferLongBreaking = true; + + indents.push(tok!"]", detail); newline(); immutable size_t j = expressionEndIndex(index); linebreakHints = chooseLineBreakTokens(index, tokens[index .. j], @@ -592,14 +595,21 @@ private: } else if (arrayInitializerStart) { - // This is a short (non-breaking) AA value + // This is a short (non-breaking) array/AA value IndentStack.Details detail; detail.wrap = false; - detail.temp = true; - detail.isAA = true; + detail.temp = false; + + detail.breakEveryItem = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); + // array of (possibly associative) array, let's put each item on its own line + if (!detail.breakEveryItem && index < tokens.length && current == tok!"[") + detail.breakEveryItem = true; + + // the '[' is immediately followed by an item instead of a newline here so + // we set mini, that the ']' also follows an item immediately without newline. detail.mini = true; - pushWrapIndent(tok!"]", detail); + indents.push(tok!"]", detail); } else if (!currentIs(tok!")") && !currentIs(tok!"]") && (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0 @@ -739,7 +749,7 @@ private: } else { - const inAA = indents.topIs(tok!"]") && indents.topDetails.isAA; + const inAA = indents.topIs(tok!"]") && indents.topDetails.breakEveryItem; if (inAA && !config.dfmt_space_before_aa_colon) write(": "); @@ -1400,10 +1410,21 @@ private: writeToken(); newline(); } - else if (indents.topIs(tok!"]") && indents.topDetails.isAA && !indents.topDetails.mini) + else if (indents.topIs(tok!"]") && indents.topDetails.breakEveryItem + && !indents.topDetails.mini) { writeToken(); newline(); + regenLineBreakHints(index - 1); + } + else if (indents.topIs(tok!"]") && indents.topDetails.preferLongBreaking + && !currentIs(tok!")") && !currentIs(tok!"]") && !currentIs(tok!"}") + && !currentIs(tok!"comment") && index + 1 < tokens.length + && isMultilineAt(index + 1, true)) + { + writeToken(); + newline(); + regenLineBreakHints(index - 1); } else if (!peekIs(tok!"}") && (linebreakHints.canFind(index) || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) @@ -1535,7 +1556,7 @@ private: else if (currentIs(tok!"{")) { indents.popWrapIndents(); - if (peekBackIsSlashSlash() && peekBack2Is(tok!";")) + if ((peekBackIsSlashSlash() && peekBack2Is(tok!";")) || indents.topIs(tok!"]")) { indents.popTempIndents(); indentLevel = indents.indentLevel; diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d index ce39c79..c80c86c 100644 --- a/src/dfmt/indentation.d +++ b/src/dfmt/indentation.d @@ -41,8 +41,11 @@ struct IndentStack bool, "temp", 1, // emit minimal newlines bool, "mini", 1, - bool, "isAA", 1, - uint, "", 28)); + // for associative arrays or arrays containing them, break after every item + bool, "breakEveryItem", 1, + // when an item inside an array would break mid-item, definitely break at the comma first + bool, "preferLongBreaking", 1, + uint, "", 27)); } /** @@ -254,10 +257,9 @@ private: parenCount = pc; continue; } + if (i + 1 < index) { - if (arr[i] == tok!"]" && details[i].temp) - continue; immutable currentIsNonWrapTemp = !details[i].wrap && details[i].temp && arr[i] != tok!")" && arr[i] != tok!"!"; if (arr[i] == tok!"static" @@ -276,8 +278,10 @@ private: } else if (parenCount == 0 && arr[i] == tok!"(") size++; + if (arr[i] == tok!"!") size++; + parenCount = pc; size++; } diff --git a/tests/2d_arrays.d b/tests/2d_arrays.d new file mode 100644 index 0000000..14a1590 --- /dev/null +++ b/tests/2d_arrays.d @@ -0,0 +1,17 @@ +unittest +{ + targets = [[RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), vec2(16 * scale, + 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0))], + [RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), vec2(16 * scale, + 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), RectangleShape.create(tex, + vec2(-8 * scale, -8 * scale), vec2(16 * scale, 16 * scale), + vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0))]]; + + int[][] foo = [[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32], [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32]]; + + float[3][3] mat = [[234.3456,42435.8653,23.5],[3.245,235.3,234.664],[14324.6453,23434.645,9678.345]]; +} + +string[][] globalArray = [["123456789012345678901234567890", "123456789012345678901234567890"], ["123456789012345678901234567890", "123456789012345678901234567890"]]; diff --git a/tests/allman/2d_arrays.d.ref b/tests/allman/2d_arrays.d.ref new file mode 100644 index 0000000..628be8b --- /dev/null +++ b/tests/allman/2d_arrays.d.ref @@ -0,0 +1,38 @@ +unittest +{ + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; + + int[][] foo = [ + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ], + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ] + ]; + + float[3][3] mat = [ + [234.3456, 42435.8653, 23.5], [3.245, 235.3, 234.664], + [14324.6453, 23434.645, 9678.345] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/allman/associative_array.d.ref b/tests/allman/associative_array.d.ref index 0a0e9d8..d1db193 100644 --- a/tests/allman/associative_array.d.ref +++ b/tests/allman/associative_array.d.ref @@ -2,19 +2,19 @@ unittest { Bson base = Bson([ "maps": Bson([ - Bson(["id": Bson(4), "comment": Bson("hello")]), - Bson(["id": Bson(49), "comment": Bson(null)]) - ]), + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), "short": Bson(["a": "b", "c": "d"]), "numbers": Bson([ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 - ]), + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]), "shuffleOnReset": serializeToBson([ - "all": false, - "selected": true, - "maybe": false - ]), + "all": false, + "selected": true, + "maybe": false + ]), "resetOnEmpty": Bson(false), "applyMods": Bson(true), "sendComments": Bson(true) diff --git a/tests/allman/associative_array_complex.d.ref b/tests/allman/associative_array_complex.d.ref new file mode 100644 index 0000000..c7b803b --- /dev/null +++ b/tests/allman/associative_array_complex.d.ref @@ -0,0 +1,25 @@ +auto find() +{ + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/allman/issue0017.d.ref b/tests/allman/issue0017.d.ref index 67b8931..541c22a 100644 --- a/tests/allman/issue0017.d.ref +++ b/tests/allman/issue0017.d.ref @@ -1,4 +1,4 @@ immutable NameId[] namesA = [ -{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS -{"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; diff --git a/tests/allman/issue0023.d.ref b/tests/allman/issue0023.d.ref index 67aa5f5..64e52e3 100644 --- a/tests/allman/issue0023.d.ref +++ b/tests/allman/issue0023.d.ref @@ -9,25 +9,28 @@ 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__", "__TIME__", "__TIMESTAMP__", - "__traits", "__vector", "__VENDOR__", "__VERSION__", ",", ".", "..", - "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", "!=", "!>", "!>=", - "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", - "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>", "<>=", - "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", - "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~=" + "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__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" ]; } diff --git a/tests/associative_array_complex.d b/tests/associative_array_complex.d new file mode 100644 index 0000000..c61c83b --- /dev/null +++ b/tests/associative_array_complex.d @@ -0,0 +1,11 @@ +auto find() +{ + return Map.findRange(["$and": [ + ["deleted": Bson(false)], + ["$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson(["info.approved": ["$eq": Bson(1)], "fetchDate": ["$lte": Bson(BsonDate(currentTime - 60.days))]]), + serializeToBson(["info.approved": ["$ne": Bson(1)], "fetchDate": ["$lte": Bson(BsonDate(currentTime - 14.days))]]) + ])] + ]]); +} diff --git a/tests/otbs/2d_arrays.d.ref b/tests/otbs/2d_arrays.d.ref new file mode 100644 index 0000000..33ed6a8 --- /dev/null +++ b/tests/otbs/2d_arrays.d.ref @@ -0,0 +1,21 @@ +unittest { + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/otbs/associative_array.d.ref b/tests/otbs/associative_array.d.ref index f167877..39f18c6 100644 --- a/tests/otbs/associative_array.d.ref +++ b/tests/otbs/associative_array.d.ref @@ -1,19 +1,19 @@ unittest { Bson base = Bson([ "maps": Bson([ - Bson(["id": Bson(4), "comment": Bson("hello")]), - Bson(["id": Bson(49), "comment": Bson(null)]) - ]), + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), "short": Bson(["a": "b", "c": "d"]), "numbers": Bson([ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 - ]), + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]), "shuffleOnReset": serializeToBson([ - "all": false, - "selected": true, - "maybe": false - ]), + "all": false, + "selected": true, + "maybe": false + ]), "resetOnEmpty": Bson(false), "applyMods": Bson(true), "sendComments": Bson(true) diff --git a/tests/otbs/associative_array_complex.d.ref b/tests/otbs/associative_array_complex.d.ref new file mode 100644 index 0000000..ddcbcd7 --- /dev/null +++ b/tests/otbs/associative_array_complex.d.ref @@ -0,0 +1,24 @@ +auto find() { + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/otbs/issue0017.d.ref b/tests/otbs/issue0017.d.ref index 67b8931..541c22a 100644 --- a/tests/otbs/issue0017.d.ref +++ b/tests/otbs/issue0017.d.ref @@ -1,4 +1,4 @@ immutable NameId[] namesA = [ -{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS -{"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; diff --git a/tests/otbs/issue0023.d.ref b/tests/otbs/issue0023.d.ref index d9488ea..c724640 100644 --- a/tests/otbs/issue0023.d.ref +++ b/tests/otbs/issue0023.d.ref @@ -8,25 +8,28 @@ 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__", "__TIME__", "__TIMESTAMP__", - "__traits", "__vector", "__VENDOR__", "__VERSION__", ",", ".", "..", - "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", "!=", "!>", "!>=", - "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", - "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>", "<>=", - "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", - "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~=" + "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__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" ]; }