meerge bug20855 into default

Author: Matthias Radestock

src/apigen/Apigen.cs

@@ -166,9 +166,10 @@ public static string MangleMethodClass(AmqpClass c, AmqpMethod m) {
         public int majorVersion;
         public int minorVersion;
         public string apiName;
+        public bool m_emitComments = false;
 
         public Type modelType = typeof(RabbitMQ.Client.Impl.IFullModel);
-	public ArrayList modelTypes = new ArrayList();
+        public ArrayList modelTypes = new ArrayList();
         public ArrayList constants = new ArrayList();
         public ArrayList classes = new ArrayList();
         public Hashtable domains = new Hashtable();
@@ -177,7 +178,7 @@ public static string MangleMethodClass(AmqpClass c, AmqpMethod m) {
         public static Hashtable primitiveTypeFlagMap;
         static Apigen() {
             primitiveTypeMap = new Hashtable();
-	    primitiveTypeFlagMap = new Hashtable();
+            primitiveTypeFlagMap = new Hashtable();
             InitPrimitiveType("octet", "byte", false);
             InitPrimitiveType("shortstr", "string", true);
             InitPrimitiveType("longstr", "byte[]", true);
@@ -206,6 +207,8 @@ public void HandleOption(string opt) {
                 versionOverridden = true;
                 majorVersion = int.Parse(parts[0]);
                 minorVersion = int.Parse(parts[1]);
+            } else if (opt == "/c") {
+                m_emitComments = true;
             } else {
                 Console.Error.WriteLine("Unsupported command-line option: " + opt);
                 Usage();
@@ -333,6 +336,11 @@ public void Emit(object o) {
         public void EmitLine(object o) {
             this.outputFile.WriteLine(o);
         }
+        
+        public void EmitSpecComment(object o) {
+            if (m_emitComments)
+                EmitLine(o);
+        }
 
         public void EmitPrelude() {
             EmitLine("// Autogenerated code. Do not edit.");
@@ -384,10 +392,10 @@ public void EmitClassMethods(AmqpClass c) {
             foreach (AmqpMethod m in c.Methods) {
                 EmitAutogeneratedSummary("  ",
                                          "AMQP specification method \""+c.Name+"."+m.Name+"\".");
-                EmitLine(m.DocumentationCommentVariant("  ", "remarks"));
+                EmitSpecComment(m.DocumentationCommentVariant("  ", "remarks"));
                 EmitLine("  public interface I"+MangleMethodClass(c, m)+": IMethod {");
                 foreach (AmqpField f in m.Fields) {
-                    EmitLine(f.DocumentationComment("    "));
+                    EmitSpecComment(f.DocumentationComment("    "));
                     EmitLine("    "+MapDomain(f.Domain)+" "+MangleClass(f.Name)+" { get; }");
                 }
                 EmitLine("  }");
@@ -426,7 +434,7 @@ public void EmitClassProperties(AmqpClass c) {
             EmitAutogeneratedSummary("  ",
                                      "AMQP specification content header properties for "+
                                      "content class \""+c.Name+"\"");
-            EmitLine(c.DocumentationCommentVariant("  ", "remarks"));
+            EmitSpecComment(c.DocumentationCommentVariant("  ", "remarks"));
             EmitLine("  public class "+MangleClass(c.Name)
                      +"Properties: "+propertiesBaseClass+" {");
             foreach (AmqpField f in c.Fields) {
@@ -440,7 +448,7 @@ public void EmitClassProperties(AmqpClass c) {
             }
             EmitLine("");
             foreach (AmqpField f in c.Fields) {
-                EmitLine(f.DocumentationComment("    ", "@label"));
+                EmitSpecComment(f.DocumentationComment("    ", "@label"));
                 EmitLine("    public "+maybeOverride+MapDomain(f.Domain)+" "+MangleClass(f.Name)+" {");
                 EmitLine("      get {");
                 EmitLine("        return m_"+MangleMethod(f.Name)+";");