From 9f216160f891e009f878c3726f8e925cd242cc6b Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 29 May 2013 06:45:12 -0400 Subject: [PATCH] [mdoc] Fix export-msxdoc regression, updated expected output. Commit 44b2b4a8 completely broke `mdoc export-msxdoc` because EcmaDoc.GetCref() was removed. Expected: Actual: i.e. useless. The fix: bring back GetCref(), this time within monodocs2slashdoc.cs. Commit 0ad6ffde changed the HTML-generating stylesheet and moved some @id attributes around, thus breaking the mdoc unit tests (expected output likewise changed). Fix the monodoc XSLTs so that we don't emit id="" attributes (id's with no value). Update mdoc's expected output so that tests pass[*]. [*]: tests will NOT actually pass, as 04bf9add -- attempted fix for an OS X stackoverflow caused by 3d3fe6af -- results in a gigantic 216MB diff because String.get_Chars() is repeated over and over and over... The updated expected output in this commit is the "ideal" update needed after locally reverting 3d3fe6af and 04bf9add.) --- .../monodoc/Resources/mdoc-sections-css.xsl | 8 +- .../Mono.Documentation/monodocs2slashdoc.cs | 48 +++++++- mcs/tools/mdoc/Resources/defaulttemplate.xsl | 3 +- .../Mono.DocTest.Generic/Extensions.html | 4 +- .../Mono.DocTest.Generic/Func`2.html | 4 +- .../GenericBase`1+FooEventArgs.html | 14 +-- ...ricBase`1+NestedCollection+Enumerator.html | 4 +- .../GenericBase`1+NestedCollection.html | 14 +-- .../Mono.DocTest.Generic/GenericBase`1.html | 14 +-- .../Mono.DocTest.Generic/IFoo`1.html | 4 +- .../MyList`1+Helper`2.html | 14 +-- .../Mono.DocTest.Generic/MyList`1.html | 52 ++++----- .../Mono.DocTest.Generic/MyList`2.html | 104 +++++++++--------- .../html.expected/Mono.DocTest/Color.html | 4 +- .../Test/html.expected/Mono.DocTest/D.html | 4 +- .../Mono.DocTest/DocAttribute.html | 4 +- .../Mono.DocTest/DocValueType.html | 4 +- .../html.expected/Mono.DocTest/IProcess.html | 4 +- .../html.expected/Mono.DocTest/UseLists.html | 14 +-- .../Mono.DocTest/Widget+Del.html | 4 +- .../Mono.DocTest/Widget+Direction.html | 4 +- .../Mono.DocTest/Widget+IMenuItem.html | 14 +-- ...t+NestedClass+Double+Triple+Quadruple.html | 14 +-- .../Widget+NestedClass+Double+Triple.html | 14 +-- .../Widget+NestedClass+Double.html | 14 +-- .../Mono.DocTest/Widget+NestedClass.html | 14 +-- .../Mono.DocTest/Widget+NestedClass`1.html | 14 +-- .../html.expected/Mono.DocTest/Widget.html | 24 ++-- .../mdoc/Test/html.expected/NoNamespace.html | 14 +-- .../Test/html.expected/System/Action`1.html | 4 +- .../mdoc/Test/html.expected/System/Array.html | 14 +-- .../html.expected/System/AsyncCallback.html | 4 +- .../System/Environment+SpecialFolder.html | 4 +- .../html.expected/System/Environment.html | 4 +- 34 files changed, 262 insertions(+), 219 deletions(-) diff --git a/mcs/class/monodoc/Resources/mdoc-sections-css.xsl b/mcs/class/monodoc/Resources/mdoc-sections-css.xsl index 11772ee344b..243406214ce 100644 --- a/mcs/class/monodoc/Resources/mdoc-sections-css.xsl +++ b/mcs/class/monodoc/Resources/mdoc-sections-css.xsl @@ -116,9 +116,11 @@

Syntax

- - - + + + + +
diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs b/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs index 4bfe5962a28..b818401eca1 100644 --- a/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs +++ b/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs @@ -119,12 +119,10 @@ public class MDocToMSXDocConverter : MDocCommand { XmlElement members = outputfiles [assemblyname]; if (members == null) continue; // assembly is strangely not listed in the index - //CreateMember(EcmaDoc.GetCref (type.DocumentElement), type.DocumentElement, members); + CreateMember (GetCref (type.DocumentElement), type.DocumentElement, members); foreach (XmlElement memberdoc in type.SelectNodes("Type/Members/Member")) { - //string name = EcmaDoc.GetCref (memberdoc); - // FIXME - string name = ns + "." + typename + "." + memberdoc.GetAttribute ("MemberName"); + string name = GetCref (memberdoc); CreateMember(name, memberdoc, members); } } @@ -133,6 +131,48 @@ public class MDocToMSXDocConverter : MDocCommand { AddNamespaceSummary(nsSummaries, basepath, nsnode.GetAttribute("Name")); } } + + static string GetCref (XmlElement member) + { + string typeName = XmlDocUtils.ToEscapedTypeName (member.SelectSingleNode("/Type/@FullName").InnerText); + if (member.Name == "Type") + return "T:" + typeName; + string memberType = member.SelectSingleNode("MemberType").InnerText; + switch (memberType) { + case "Constructor": + return "C:" + typeName + MakeArgs(member); + case "Event": + return "E:" + typeName + "." + XmlDocUtils.ToEscapedMemberName (member.GetAttribute("MemberName")); + case "Field": + return "F:" + typeName + "." + XmlDocUtils.ToEscapedMemberName (member.GetAttribute("MemberName")); + case "Method": { + string name = "M:" + typeName + "." + XmlDocUtils.ToEscapedMemberName (member.GetAttribute("MemberName")) + MakeArgs(member); + if (member.GetAttribute("MemberName") == "op_Implicit" || member.GetAttribute("MemberName") == "op_Explicit") + name += "~" + XmlDocUtils.ToTypeName (member.SelectSingleNode("ReturnValue/ReturnType").InnerText, member); + return name; + } + case "Property": + return "P:" + typeName + "." + XmlDocUtils.ToEscapedMemberName (member.GetAttribute("MemberName")) + MakeArgs(member); + default: + throw new NotSupportedException ("MemberType '" + memberType + "' is not supported."); + } + } + + static string MakeArgs (XmlElement member) + { + XmlNodeList parameters = member.SelectNodes ("Parameters/Parameter"); + if (parameters.Count == 0) + return ""; + StringBuilder args = new StringBuilder (); + args.Append ("("); + args.Append (XmlDocUtils.ToTypeName (parameters [0].Attributes ["Type"].Value, member)); + for (int i = 1; i < parameters.Count; ++i) { + args.Append (","); + args.Append (XmlDocUtils.ToTypeName (parameters [i].Attributes ["Type"].Value, member)); + } + args.Append (")"); + return args.ToString (); + } private static void AddNamespaceSummary(XmlDocument nsSummaries, string basepath, string currentNs) { foreach (var filename in new [] { diff --git a/mcs/tools/mdoc/Resources/defaulttemplate.xsl b/mcs/tools/mdoc/Resources/defaulttemplate.xsl index e98f0a12958..a44b91988ad 100644 --- a/mcs/tools/mdoc/Resources/defaulttemplate.xsl +++ b/mcs/tools/mdoc/Resources/defaulttemplate.xsl @@ -230,7 +230,7 @@ @@ -249,6 +249,7 @@ # + Signature diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Extensions.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Extensions.html index 9da902d5dd3..00b54d75199 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Extensions.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Extensions.html @@ -207,9 +207,9 @@

Extensions Class

extension methods!

-
+

Syntax

-
public static class Extensions
+
public static class Extensions

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Func`2.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Func`2.html index 78e190fc140..1336f30720e 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Func`2.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/Func`2.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
[Mono.DocTest.Doc("method")]
[return:Mono.DocTest.Doc("return", Field=false)]
public delegate TRet Func<[Mono.DocTest.Doc("arg!")] TArg, [Mono.DocTest.Doc("ret!")] TRet> ([Mono.DocTest.Doc("arg-actual")] TArg a)
where TArg : Exception
where TRet :
+
[Mono.DocTest.Doc("method")]
[return:Mono.DocTest.Doc("return", Field=false)]
public delegate TRet Func<[Mono.DocTest.Doc("arg!")] TArg, [Mono.DocTest.Doc("ret!")] TRet> ([Mono.DocTest.Doc("arg-actual")] TArg a)
where TArg : Exception

Type Parameters

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+FooEventArgs.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+FooEventArgs.html index ad1ce4e5fb5..640edea5d15 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+FooEventArgs.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+FooEventArgs.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class GenericBase<U>.FooEventArgs : EventArgs
+
public class GenericBase<U>.FooEventArgs : EventArgs

Remarks

@@ -237,7 +237,7 @@ @@ -268,19 +268,19 @@

Member Details

-

GenericBase Constructor

-
+

GenericBase Constructor

+

Documentation for this section has not yet been entered.

Syntax

public GenericBase ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection+Enumerator.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection+Enumerator.html index 73d94d0ed42..93df5378c0a 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection+Enumerator.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection+Enumerator.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
protected struct GenericBase<U>.NestedCollection.Enumerator
+
protected struct GenericBase<U>.NestedCollection.Enumerator

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection.html index ff94eab5013..5eaccf47248 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1+NestedCollection.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class GenericBase<U>.NestedCollection
+
public class GenericBase<U>.NestedCollection

Remarks

@@ -237,7 +237,7 @@ @@ -268,19 +268,19 @@

Member Details

-

GenericBase Constructor

-
+

GenericBase Constructor

+

Documentation for this section has not yet been entered.

Syntax

public GenericBase ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html index 59dd7e0721f..340dfd00077 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/GenericBase`1.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class GenericBase<U>
+
public class GenericBase<U>

Type Parameters

@@ -247,7 +247,7 @@ @@ -384,19 +384,19 @@

Member Details

-

GenericBase Constructor

-
+

GenericBase Constructor

+

Documentation for this section has not yet been entered.

Syntax

public GenericBase ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/IFoo`1.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/IFoo`1.html index 44da611b8bd..2a71d47683c 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/IFoo`1.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/IFoo`1.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public interface IFoo<T>
+
public interface IFoo<T>

Type Parameters

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1+Helper`2.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1+Helper`2.html index d38aa369c1d..4ce462af161 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1+Helper`2.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1+Helper`2.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class MyList<T, U, V>
+
public class MyList<T, U, V>

Type Parameters

@@ -251,7 +251,7 @@
- MyList + MyList ()
@@ -299,19 +299,19 @@

Member Details

-

MyList Constructor

-
+

MyList Constructor

+

Documentation for this section has not yet been entered.

Syntax

public MyList ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html index da02046714c..312b3c4385e 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`1.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class MyList<[Mono.DocTest.Doc("Type Parameter!")] T> : GenericBase<T>, IEnumerable<Int32[]>
+
public class MyList<[Mono.DocTest.Doc("Type Parameter!")] T> : GenericBase<T>, IEnumerable<Int32[]>

Type Parameters

@@ -247,7 +247,7 @@
- MyList + MyList ()
@@ -299,7 +299,7 @@ - GetEnumerator + GetEnumerator () : IEnumerator<Int32[]>
Documentation for this section has not yet been entered.
@@ -309,7 +309,7 @@ - GetHelper<U,V> + GetHelper<U,V> () : MyList<T>.Helper<U, V>
Documentation for this section has not yet been entered.
@@ -398,7 +398,7 @@
- + IEnumerable.GetEnumerator @@ -450,50 +450,50 @@

Member Details

-

MyList Constructor

-
+

MyList Constructor

+

Documentation for this section has not yet been entered.

Syntax

public MyList ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

GetEnumerator Method

-
+

GetEnumerator Method

+

Documentation for this section has not yet been entered.

Syntax

public IEnumerator<Int32[]> GetEnumerator ()

Returns

-
+
Documentation for this section has not yet been entered.

Remarks

-
+
M:Mono.DocTest.MyList`1.GetEnumerator.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

GetHelper<U,V> Generic Method

-
+

GetHelper<U,V> Generic Method

+

Documentation for this section has not yet been entered.

Syntax

public MyList<T>.Helper<U, V> GetHelper<U, V> ()

Type Parameters

-
+
U @@ -510,13 +510,13 @@

Returns

-
+
null.

Remarks

-
+
M:Mono.DocTest.Generic.MyList`1.GetHelper``2.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
@@ -601,8 +601,8 @@ Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

System.Collections.IEnumerable.GetEnumerator Method

-
+

System.Collections.IEnumerable.GetEnumerator Method

+

Documentation for this section has not yet been entered.

@@ -610,14 +610,14 @@
IEnumerator System.Collections.IEnumerable.GetEnumerator ()

Returns

-
+
Documentation for this section has not yet been entered.

Remarks

-
+
M:Mono.DocTest.MyList`1.System#Collections#GetEnumerator.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html index 4766687f9fb..75444ea1c4a 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest.Generic/MyList`2.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class MyList<A, B> : GenericBase<Dictionary<A, B>>, IFoo<A>, ICollection<A>, IEnumerable<A>, IEnumerator<A>
where A : class, IList<B>, new()
where B : class, A
+
public class MyList<A, B> : GenericBase<Dictionary<A, B>>, IFoo<A>, ICollection<A>, IEnumerable<A>, IEnumerator<A>
where A : class, IList<B>, new()
where B : class, A

Type Parameters

@@ -251,7 +251,7 @@
- MyList + MyList ()
@@ -344,7 +344,7 @@ - Dispose + Dispose ()
Documentation for this section has not yet been entered.
@@ -354,7 +354,7 @@ - Foo + Foo () : KeyValuePair<IEnumerable<A>, IEnumerable<B>>
Documentation for this section has not yet been entered.
@@ -364,7 +364,7 @@ - GetEnumerator + GetEnumerator () : List<A>.Enumerator
Documentation for this section has not yet been entered.
@@ -374,7 +374,7 @@ - MoveNext + MoveNext () : bool
Documentation for this section has not yet been entered.
@@ -384,7 +384,7 @@ - Reset + Reset ()
Documentation for this section has not yet been entered.
@@ -447,7 +447,7 @@
- + ICollection<A>.Clear @@ -499,7 +499,7 @@
- + IEnumerable<A>.GetEnumerator @@ -513,7 +513,7 @@
- + IEnumerable.GetEnumerator @@ -624,19 +624,19 @@

Member Details

-

MyList Constructor

-
+

MyList Constructor

+

Documentation for this section has not yet been entered.

Syntax

public MyList ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
@@ -702,53 +702,53 @@ Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

Dispose Method

-
+

Dispose Method

+

Documentation for this section has not yet been entered.

Syntax

public void Dispose ()

Remarks

-
+
M:Mono.DocTest.MyList`2.Dispose.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

Foo Method

-
+

Foo Method

+

Documentation for this section has not yet been entered.

Syntax

public KeyValuePair<IEnumerable<A>, IEnumerable<B>> Foo ()

Returns

-
+
Documentation for this section has not yet been entered.

Remarks

-
M:Mono.DocTest.Generic.MyList`2.Foo
+
M:Mono.DocTest.Generic.MyList`2.Foo

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

GetEnumerator Method

-
+

GetEnumerator Method

+

Documentation for this section has not yet been entered.

Syntax

public List<A>.Enumerator GetEnumerator ()

Returns

-
A List<`0>.Enumerator.
+
A List<`0>.Enumerator.

Remarks

-
+
M:Mono.DocTest.MyList`2.GetEnumerator.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
@@ -798,37 +798,37 @@ Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

MoveNext Method

-
+

MoveNext Method

+

Documentation for this section has not yet been entered.

Syntax

public bool MoveNext ()

Returns

-
+
bool

Remarks

-
+
M:Mono.DocTest.MyList`2.MoveNext.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

Reset Method

-
+

Reset Method

+

Documentation for this section has not yet been entered.

Syntax

public void Reset ()

Remarks

-
+
M:Mono.DocTest.MyList`2.Reset.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
@@ -857,8 +857,8 @@ Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

System.Collections.Generic.ICollection<A>.Clear Method

-
+

System.Collections.Generic.ICollection<A>.Clear Method

+

Documentation for this section has not yet been entered.

@@ -866,10 +866,10 @@
void System.Collections.Generic.ICollection<A>.Clear ()

Remarks

-
+
M:Mono.DocTest.MyList`2.System#Collections#Generic#ICollection{A}#Clear.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
@@ -945,8 +945,8 @@ Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

System.Collections.Generic.IEnumerable<A>.GetEnumerator Method

-
+

System.Collections.Generic.IEnumerable<A>.GetEnumerator Method

+

Documentation for this section has not yet been entered.

@@ -954,12 +954,12 @@
IEnumerator<A> System.Collections.Generic.IEnumerable<A>.GetEnumerator ()

Returns

-
A IEnumerator<`0>.
+
A IEnumerator<`0>.

Remarks

-
+
M:Mono.DocTest.MyList`2.System#Collections#Generic#IEnumerable{A}#GetEnumerator.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
@@ -981,8 +981,8 @@ Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

System.Collections.IEnumerable.GetEnumerator Method

-
+

System.Collections.IEnumerable.GetEnumerator Method

+

Documentation for this section has not yet been entered.

@@ -990,14 +990,14 @@
IEnumerator System.Collections.IEnumerable.GetEnumerator ()

Returns

-
+
Documentation for this section has not yet been entered.

Remarks

-
+
M:Mono.DocTest.MyList`2.System#Collections#GetEnumerator.

Requirements

-
+
Namespace: Mono.DocTest.Generic
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Color.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Color.html index d438287e94f..dae529e4670 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Color.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Color.html @@ -207,9 +207,9 @@

Color Enum

Possible colors

-
+

Syntax

-
public enum Color
+
public enum Color

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/D.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/D.html index b69c1eb4e42..a3bb5ddffef 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/D.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/D.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public delegate object D (Func<string, object, object> value)
+
public delegate object D (Func<string, object, object> value)

Parameters

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocAttribute.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocAttribute.html index 9c293849c14..609837edbcc 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocAttribute.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocAttribute.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
[System.AttributeUsage(System.AttributeTargets.All)]
public class DocAttribute : Attribute
+
[System.AttributeUsage(System.AttributeTargets.All)]
public class DocAttribute : Attribute

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocValueType.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocValueType.html index 0cd98cc3cb4..bad6608916c 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocValueType.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/DocValueType.html @@ -207,9 +207,9 @@

DocValueType Struct

Process interface

-
+

Syntax

-
public struct DocValueType : IProcess
+
public struct DocValueType : IProcess

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/IProcess.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/IProcess.html index 278dfe86f58..75443ba178a 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/IProcess.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/IProcess.html @@ -207,9 +207,9 @@

IProcess Interface

Process interface

-
+

Syntax

-
public interface IProcess
+
public interface IProcess

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/UseLists.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/UseLists.html index fba5a9f6ccd..7e45227c71b 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/UseLists.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/UseLists.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class UseLists
+
public class UseLists

Remarks

@@ -238,7 +238,7 @@ @@ -336,19 +336,19 @@

Member Details

-

UseLists Constructor

-
+

UseLists Constructor

+

Documentation for this section has not yet been entered.

Syntax

public UseLists ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Del.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Del.html index 47cce1db759..ba4e2ac9660 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Del.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Del.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public delegate void Widget.Del (int i)
+
public delegate void Widget.Del (int i)

Parameters

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Direction.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Direction.html index 1962c75179f..0d2bc273e90 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Direction.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+Direction.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
[System.Flags]
protected enum Widget.Direction
+
[System.Flags]
protected enum Widget.Direction

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+IMenuItem.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+IMenuItem.html index a98e7c74827..05beb05f4c9 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+IMenuItem.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+IMenuItem.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public interface Widget.IMenuItem
+
public interface Widget.IMenuItem

Remarks

@@ -255,7 +255,7 @@ - A + A ()
Documentation for this section has not yet been entered.
@@ -282,18 +282,18 @@

Member Details

-

A Method

-
+

A Method

+

Documentation for this section has not yet been entered.

Syntax

public void A ()

Remarks

-
+
M:Mono.DocTest.Widget.IMenuItem.A.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple+Quadruple.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple+Quadruple.html index 1e9918bd722..8e2397f2c41 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple+Quadruple.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple+Quadruple.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class Widget.NestedClass.Double.Triple.Quadruple
+
public class Widget.NestedClass.Double.Triple.Quadruple

Remarks

@@ -238,7 +238,7 @@ @@ -269,19 +269,19 @@

Member Details

-

Widget.NestedClass.Double.Triple.Quadruple Constructor

-
+

Widget.NestedClass.Double.Triple.Quadruple Constructor

+

Documentation for this section has not yet been entered.

Syntax

public Widget.NestedClass.Double.Triple.Quadruple ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple.html index b004c0872d5..dd28c310b2a 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double+Triple.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class Widget.NestedClass.Double.Triple
+
public class Widget.NestedClass.Double.Triple

Remarks

@@ -238,7 +238,7 @@ @@ -269,19 +269,19 @@

Member Details

-

Widget.NestedClass.Double.Triple Constructor

-
+

Widget.NestedClass.Double.Triple Constructor

+

Documentation for this section has not yet been entered.

Syntax

public Widget.NestedClass.Double.Triple ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double.html index 5aad9ed459e..2b6640cdde2 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass+Double.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class Widget.NestedClass.Double
+
public class Widget.NestedClass.Double

Remarks

@@ -238,7 +238,7 @@ @@ -269,19 +269,19 @@

Member Details

-

Widget.NestedClass.Double Constructor

-
+

Widget.NestedClass.Double Constructor

+

Documentation for this section has not yet been entered.

Syntax

public Widget.NestedClass.Double ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass.html index e6eea8d8dd9..4b2f9b768f5 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class Widget.NestedClass
+
public class Widget.NestedClass

Remarks

@@ -238,7 +238,7 @@ @@ -308,19 +308,19 @@

Member Details

-

Widget.NestedClass Constructor

-
+

Widget.NestedClass Constructor

+

Documentation for this section has not yet been entered.

Syntax

public Widget.NestedClass ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass`1.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass`1.html index cb38b39455b..160b3ca1e72 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass`1.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget+NestedClass`1.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class Widget.NestedClass<T>
+
public class Widget.NestedClass<T>

Type Parameters

@@ -249,7 +249,7 @@ @@ -319,19 +319,19 @@

Member Details

-

Widget.NestedClass Constructor

-
+

Widget.NestedClass Constructor

+

Documentation for this section has not yet been entered.

Syntax

public Widget.NestedClass ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget.html b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget.html index 75dce842815..5ad4e29f829 100644 --- a/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget.html +++ b/mcs/tools/mdoc/Test/html.expected/Mono.DocTest/Widget.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class Widget : IProcess
+
public class Widget : IProcess

See Also

@@ -244,7 +244,7 @@
- Widget + Widget ()
@@ -623,7 +623,7 @@ - M0 + M0 ()
Documentation for this section has not yet been entered.
@@ -853,15 +853,15 @@

Member Details

-

Widget Constructor

-
+

Widget Constructor

+

Documentation for this section has not yet been entered.

Syntax

public Widget ()

Remarks

-
+

C:Mono.DocTest.Widget.

@@ -874,7 +874,7 @@

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
@@ -1430,18 +1430,18 @@ Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
-

M0 Method

-
+

M0 Method

+

Documentation for this section has not yet been entered.

Syntax

public static void M0 ()

Remarks

-
+
M:Mono.DocTest.Widget.M0.

Requirements

-
+
Namespace: Mono.DocTest
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/NoNamespace.html b/mcs/tools/mdoc/Test/html.expected/NoNamespace.html index 057984a71ba..e0711675d7f 100644 --- a/mcs/tools/mdoc/Test/html.expected/NoNamespace.html +++ b/mcs/tools/mdoc/Test/html.expected/NoNamespace.html @@ -207,9 +207,9 @@

NoNamespace Class

Namespace Test: [Mono.DocTest]

-
+

Syntax

-
public class NoNamespace
+
public class NoNamespace

Remarks

@@ -239,7 +239,7 @@ @@ -270,19 +270,19 @@

Member Details

-

NoNamespace Constructor

-
+

NoNamespace Constructor

+

Documentation for this section has not yet been entered.

Syntax

public NoNamespace ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace:
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/System/Action`1.html b/mcs/tools/mdoc/Test/html.expected/System/Action`1.html index d012d7772fb..4a0f413147c 100644 --- a/mcs/tools/mdoc/Test/html.expected/System/Action`1.html +++ b/mcs/tools/mdoc/Test/html.expected/System/Action`1.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public delegate void Action<T> (T obj)
+
public delegate void Action<T> (T obj)

Type Parameters

diff --git a/mcs/tools/mdoc/Test/html.expected/System/Array.html b/mcs/tools/mdoc/Test/html.expected/System/Array.html index fe4d7ed74ba..4e82fe559ac 100644 --- a/mcs/tools/mdoc/Test/html.expected/System/Array.html +++ b/mcs/tools/mdoc/Test/html.expected/System/Array.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public class Array
+
public class Array

Remarks

@@ -239,7 +239,7 @@
- Array + Array ()
@@ -304,19 +304,19 @@

Member Details

-

Array Constructor

-
+

Array Constructor

+

Documentation for this section has not yet been entered.

Syntax

public Array ()

Remarks

-
+
Documentation for this section has not yet been entered.

Requirements

-
+
Namespace: System
Assembly: DocTest (in DocTest.dll)
Assembly Versions: 0.0.0.0
diff --git a/mcs/tools/mdoc/Test/html.expected/System/AsyncCallback.html b/mcs/tools/mdoc/Test/html.expected/System/AsyncCallback.html index 308f3060ea4..906eaab1e5a 100644 --- a/mcs/tools/mdoc/Test/html.expected/System/AsyncCallback.html +++ b/mcs/tools/mdoc/Test/html.expected/System/AsyncCallback.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public delegate void AsyncCallback (IAsyncResult ar)
+
public delegate void AsyncCallback (IAsyncResult ar)

Parameters

diff --git a/mcs/tools/mdoc/Test/html.expected/System/Environment+SpecialFolder.html b/mcs/tools/mdoc/Test/html.expected/System/Environment+SpecialFolder.html index a99c87ca88f..edb7aa38195 100644 --- a/mcs/tools/mdoc/Test/html.expected/System/Environment+SpecialFolder.html +++ b/mcs/tools/mdoc/Test/html.expected/System/Environment+SpecialFolder.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public enum Environment.SpecialFolder
+
public enum Environment.SpecialFolder

Remarks

diff --git a/mcs/tools/mdoc/Test/html.expected/System/Environment.html b/mcs/tools/mdoc/Test/html.expected/System/Environment.html index d279fea30f4..f63fc35b9f2 100644 --- a/mcs/tools/mdoc/Test/html.expected/System/Environment.html +++ b/mcs/tools/mdoc/Test/html.expected/System/Environment.html @@ -209,9 +209,9 @@

Documentation for this section has not yet been entered.

-
+

Syntax

-
public static class Environment
+
public static class Environment

Remarks

-- 2.25.1