From d111a38b49286f1f0596f1970f19182d6421d352 Mon Sep 17 00:00:00 2001 From: Andrej Mitrovic Date: Sat, 23 Mar 2013 03:07:01 +0100 Subject: [PATCH] Fixes Issue 9789 - Use new alias syntax for ddoc output. --- src/doc.c | 4 +-- test/compilable/ddoc9789.d | 11 +++++++++ test/compilable/extra-files/ddoc1.html | 2 +- test/compilable/extra-files/ddoc2273.html | 2 +- test/compilable/extra-files/ddoc5446.html | 30 +++++++++++------------ test/compilable/extra-files/ddoc7.html | 2 +- test/compilable/extra-files/ddoc9789.html | 18 ++++++++++++++ 7 files changed, 48 insertions(+), 21 deletions(-) create mode 100644 test/compilable/ddoc9789.d create mode 100644 test/compilable/extra-files/ddoc9789.html diff --git a/src/doc.c b/src/doc.c index fd82098c5bb8..e89dc9cb3260 100644 --- a/src/doc.c +++ b/src/doc.c @@ -937,7 +937,7 @@ void AliasDeclaration::toDocBuffer(OutBuffer *buf, Scope *sc) buf->writestring("deprecated "); emitProtection(buf, protection); - buf->writestring("alias "); + buf->printf("alias %s = ", toChars()); if (Dsymbol *s = aliassym) // ident alias { @@ -959,8 +959,6 @@ void AliasDeclaration::toDocBuffer(OutBuffer *buf, Scope *sc) } } - buf->writestring(" "); - buf->writestring(toChars()); buf->writestring(";\n"); } } diff --git a/test/compilable/ddoc9789.d b/test/compilable/ddoc9789.d new file mode 100644 index 000000000000..05a8c6a1ad75 --- /dev/null +++ b/test/compilable/ddoc9789.d @@ -0,0 +1,11 @@ +// PERMUTE_ARGS: +// REQUIRED_ARGS: -D -w -o- -c -Ddtest_results/compilable -o- +// POST_SCRIPT: compilable/extra-files/ddocAny-postscript.sh 9789 + +module ddoc9789; + +/// +struct S {} + +/// +alias A = S; diff --git a/test/compilable/extra-files/ddoc1.html b/test/compilable/extra-files/ddoc1.html index 32bf082d52f5..b2db8d4e880f 100644 --- a/test/compilable/extra-files/ddoc1.html +++ b/test/compilable/extra-files/ddoc1.html @@ -6,7 +6,7 @@

abc

This module is for ABC

-
alias int myint; +
alias myint = int;


diff --git a/test/compilable/extra-files/ddoc2273.html b/test/compilable/extra-files/ddoc2273.html index 4f48ef21109f..1cc0966a1da4 100644 --- a/test/compilable/extra-files/ddoc2273.html +++ b/test/compilable/extra-files/ddoc2273.html @@ -27,7 +27,7 @@

ddoc2273



-
alias staticIndexOf(T, TList...) IndexOf; +
alias IndexOf = staticIndexOf(T, TList...);


diff --git a/test/compilable/extra-files/ddoc5446.html b/test/compilable/extra-files/ddoc5446.html index 7dc7b5f266ec..eaf0e2aecf6a 100644 --- a/test/compilable/extra-files/ddoc5446.html +++ b/test/compilable/extra-files/ddoc5446.html @@ -4,69 +4,69 @@

ddoc5446



-
alias ddoc5446a.A_Foo This_Foo; +
alias This_Foo = ddoc5446a.A_Foo;


-
alias ddoc5446a.A_Foo This_Foo_Alias; +
alias This_Foo_Alias = ddoc5446a.A_Foo;


-
alias int This_Int; +
alias This_Int = int;


-
alias ddoc5446a.A_Enum This_Enum; +
alias This_Enum = ddoc5446a.A_Enum;


-
deprecated alias ddoc5446b.A_Enum_New A_Enum_New; +
deprecated alias A_Enum_New = ddoc5446b.A_Enum_New;


struct Bar;


-
alias ddoc5446a.A_Foo Bar_A_Foo; +
alias Bar_A_Foo = ddoc5446a.A_Foo;


-
alias ddoc5446a.A_Foo Bar_A_Foo_Alias; +
alias Bar_A_Foo_Alias = ddoc5446a.A_Foo;


-
alias int Bar_A_Int; +
alias Bar_A_Int = int;


-
alias ddoc5446a.A_Foo Bar_This_Foo; +
alias Bar_This_Foo = ddoc5446a.A_Foo;


-
alias ddoc5446a.A_Foo Bar_This_Foo_Alias; +
alias Bar_This_Foo_Alias = ddoc5446a.A_Foo;


-
alias int Bar_This_Int; +
alias Bar_This_Int = int;


-
alias Nested Nested_Alias; +
alias Nested_Alias = Nested;


-
alias .Nested Fake_Nested; +
alias Fake_Nested = .Nested;


struct Nested;


-
alias Bar Bar_Nested_Bar_Alias; +
alias Bar_Nested_Bar_Alias = Bar;


-
alias .Bar Bar_Alias; +
alias Bar_Alias = .Bar;


diff --git a/test/compilable/extra-files/ddoc7.html b/test/compilable/extra-files/ddoc7.html index 3578fa9fe36b..9f2ab7479cbe 100644 --- a/test/compilable/extra-files/ddoc7.html +++ b/test/compilable/extra-files/ddoc7.html @@ -79,7 +79,7 @@

ddoc7

Some doc

-
alias foo bar; +
alias bar = foo;
More doc

diff --git a/test/compilable/extra-files/ddoc9789.html b/test/compilable/extra-files/ddoc9789.html new file mode 100644 index 000000000000..544771281db3 --- /dev/null +++ b/test/compilable/extra-files/ddoc9789.html @@ -0,0 +1,18 @@ + + + ddoc9789 + +

ddoc9789

+

+
struct S; +
+


+
+
alias A = S; +
+


+
+
+ +
Page generated by Ddoc. +