diff --git a/libdparse b/libdparse index 4c846b6..16b75e7 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 4c846b616bb38c74c69eb63ed39aeb7ac4511f9e +Subproject commit 16b75e718643bd0ca75ed2bcea6ce2a3dd6ebf37 diff --git a/src/astprinter.d b/src/astprinter.d index 6828b92..94dfa78 100644 --- a/src/astprinter.d +++ b/src/astprinter.d @@ -271,8 +271,13 @@ class XMLPrinter : ASTVisitor override void visit(const Deprecated deprecated_) { - if (deprecated_.stringLiteral.type != tok!"") - output.writeln("", deprecated_.stringLiteral.text, ""); + if (deprecated_.stringLiterals.length > 0) + { + output.writeln(""); + foreach (literal; deprecated_.stringLiterals) + output.writeln("", xmlEscape(literal.text), ""); + output.writeln(""); + } else output.writeln(""); } @@ -287,17 +292,17 @@ class XMLPrinter : ASTVisitor output.writeln(""); } - override void visit(const AnonymousEnumMember enumMember) - { - output.writeln(""); - writeDdoc(enumMember.comment); - if (enumMember.type !is null) - visit(enumMember.type); - output.write("", enumMember.name.text, ""); - if (enumMember.assignExpression !is null) - visit(enumMember.assignExpression); - output.writeln(""); - } + override void visit(const AnonymousEnumMember enumMember) + { + output.writeln(""); + writeDdoc(enumMember.comment); + if (enumMember.type !is null) + visit(enumMember.type); + output.write("", enumMember.name.text, ""); + if (enumMember.assignExpression !is null) + visit(enumMember.assignExpression); + output.writeln(""); + } override void visit(const EnumMember enumMem) { @@ -964,7 +969,7 @@ class XMLPrinter : ASTVisitor override void visit(const AliasInitializer aliasInitializer) { mixin (tagAndAccept!"aliasInitializer"); } override void visit(const AliasThisDeclaration aliasThisDeclaration) { mixin (tagAndAccept!"aliasThisDeclaration"); } - override void visit(const AnonymousEnumDeclaration anonymousEnumDeclaration) { mixin (tagAndAccept!"anonymousEnumDeclaration"); } + override void visit(const AnonymousEnumDeclaration anonymousEnumDeclaration) { mixin (tagAndAccept!"anonymousEnumDeclaration"); } override void visit(const ArgumentList argumentList) { mixin (tagAndAccept!"argumentList"); } override void visit(const Arguments arguments) { mixin (tagAndAccept!"arguments"); } override void visit(const ArrayInitializer arrayInitializer) { mixin (tagAndAccept!"arrayInitializer"); } @@ -1096,10 +1101,10 @@ class XMLPrinter : ASTVisitor '\"' : """, '\'' : "'"]); } - private void writeName(string name) - { - output.write("", name, ""); - } + private void writeName(string name) + { + output.write("", name, ""); + } private void writeDdoc(string comment) { @@ -1107,9 +1112,9 @@ class XMLPrinter : ASTVisitor output.writeln("", xmlEscape(comment), ""); } - /** - * File that output is written to. - */ + /** + * File that output is written to. + */ File output; }