[runtime] Disable some tests in full-aot mode which cannot be AOTed because of type...

[mono.git] / mcs / tools / mdoc / Mono.Documentation / validate.cs

diff --git a/mcs/tools/mdoc/Mono.Documentation/validate.cs b/mcs/tools/mdoc/Mono.Documentation/validate.cs
index 6a6a353325065f6228ace3566c4f7b0877ddbb82..afaba40ff2226f1fb09b407bc35d2730d336b96a 100644 (file)
--- a/mcs/tools/mdoc/Mono.Documentation/validate.cs
+++ b/mcs/tools/mdoc/Mono.Documentation/validate.cs
@@ -1,20 +1,45 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Xml;
 using System.Xml.Schema;
 
+using Mono.Options;
+
 namespace Mono.Documentation
 {
-       public class MDocValidator
+       public class MDocValidator : MDocCommand
        {
-               static XmlValidatingReader reader;
-               static XmlSchema schema;
-               static long errors = 0;
-               static bool IsValid = true;
+               XmlReaderSettings settings;
+               long errors = 0;
+
+               public override void Run (IEnumerable<string> args)
+               {
+                       string[] validFormats = {
+                               "ecma",
+                       };
+                       string format = "ecma";
+                       var p = new OptionSet () {
+                               { "f|format=",
+                                       "The documentation {0:FORMAT} used within PATHS.  " + 
+                                               "Valid formats include:\n  " +
+                                               string.Join ("\n  ", validFormats) + "\n" +
+                                               "If no format provided, `ecma' is used.",
+                                       v => format = v },
+                       };
+                       List<string> files = Parse (p, args, "validate", 
+                                       "[OPTIONS]+ PATHS",
+                                       "Validate PATHS against the specified format schema.");
+                       if (files == null)
+                               return;
+                       if (Array.IndexOf (validFormats, format) < 0)
+                               Error ("Invalid documentation format: {0}.", format);
+                       Run (format, files);
+               }
        
-               public static void Run (string format, IEnumerable<string> files)
+               public void Run (string format, IEnumerable<string> files)
                {
                        Stream s = null;
 
@@ -30,8 +55,11 @@ namespace Mono.Documentation
                        if (s == null)
                                throw new NotSupportedException (string.Format ("The schema for `{0}' was not found.", format));
 
-                       schema = XmlSchema.Read (s, null);
-                       schema.Compile (null);
+                       settings = new XmlReaderSettings ();
+                       settings.Schemas.Add (XmlSchema.Read (s, null));
+                       settings.Schemas.Compile ();
+                       settings.ValidationType = ValidationType.Schema;
+                       settings.ValidationEventHandler += OnValidationEvent;
 
                        // skip args[0] because it is the provider name
                        foreach (string arg in files) {
@@ -44,28 +72,25 @@ namespace Mono.Documentation
                                }
                        }
 
-                       Console.WriteLine ("Total validation errors: {0}", errors);
+                       Message (errors == 0 ? TraceLevel.Info : TraceLevel.Error, 
+                                       "Total validation errors: {0}", errors);
                }
 
-               static void ValidateFile (string file)
+               void ValidateFile (string file)
                {
-                       IsValid = true;
                        try {
-                               reader = new XmlValidatingReader (new XmlTextReader (file));
-                               reader.ValidationType = ValidationType.Schema;
-                               reader.Schemas.Add (schema);
-                               reader.ValidationEventHandler += new ValidationEventHandler (OnValidationEvent);
-                               while (reader.Read ()) {
-                                       // do nothing
+                               using (var reader = XmlReader.Create (new XmlTextReader (file), settings)) {
+                                       while (reader.Read ()) {
+                                               // do nothing
+                                       }
                                }
-                               reader.Close ();
                        }
                        catch (Exception e) {
-                               Console.WriteLine ("mdvalidator: error: " + e.ToString ());
+                               Message (TraceLevel.Error, "mdoc: {0}", e.ToString ());
                        }
                }
 
-               static void RecurseDirectory (string dir)
+               void RecurseDirectory (string dir)
                {
                        string[] files = Directory.GetFiles (dir, "*.xml");
                        foreach (string f in files)
@@ -79,12 +104,10 @@ namespace Mono.Documentation
                                RecurseDirectory (d);
                }
 
-               static void OnValidationEvent (object sender, ValidationEventArgs a)
+               void OnValidationEvent (object sender, ValidationEventArgs a)
                {
-                       if (IsValid)
-                               IsValid = false;
                        errors ++;
-                       Console.WriteLine (a.Message);
+                       Message (TraceLevel.Error, "mdoc: {0}", a.Message);
                }
 
                static bool IsMonodocFile (string file)