Refactor CodeGenerator.GenerateMethodSpecifier to allow explicit specifier kind.

Author: tritao

src/Generator/Generators/C/CCodeGenerator.cs

@@ -332,10 +332,16 @@ public virtual string GetMethodIdentifier(Function function,
                 function.Name : function.OriginalName;
         }
 
-        public override void GenerateMethodSpecifier(Method method, Class @class)
+        public override void GenerateMethodSpecifier(Method method,
+            MethodSpecifierKind? kind = null)
         {
-            var isHeaderFile = FileExtension == "h";
-            if (isHeaderFile)
+            bool isDeclaration;
+            if (kind.HasValue)
+                isDeclaration = kind == MethodSpecifierKind.Declaration;
+            else
+                isDeclaration = FileExtension == "h";
+
+            if (isDeclaration)
             {
                 if (method.IsVirtual || method.IsOverride)
                     Write("virtual ");
@@ -363,7 +369,7 @@ public override void GenerateMethodSpecifier(Method method, Class @class)
 
             Write(")");
 
-            if (method.IsOverride && isHeaderFile)
+            if (method.IsOverride && isDeclaration)
                 Write(" override");
         }
 
@@ -376,7 +382,7 @@ public override bool VisitMethodDecl(Method method)
         {
             PushBlock(BlockKind.Method, method);
 
-            GenerateMethodSpecifier(method, method.Namespace as Class);
+            GenerateMethodSpecifier(method);
             Write(";");
 
             PopBlock(NewLineKind.BeforeNextBlock);
@@ -406,7 +412,7 @@ public override bool VisitProperty(Property property)
 
         public virtual void GeneratePropertyAccessorSpecifier(Method method)
         {
-            GenerateMethodSpecifier(method, method.Namespace as Class);
+            GenerateMethodSpecifier(method);
         }
 
         public virtual void GeneratePropertyGetter(Method method)

src/Generator/Generators/C/CppHeaders.cs

@@ -546,7 +546,7 @@ public override bool VisitMethodDecl(Method method)
             PushBlock(BlockKind.Method, method);
             GenerateDeclarationCommon(method);
 
-            GenerateMethodSpecifier(method, method.Namespace as Class);
+            GenerateMethodSpecifier(method);
             WriteLine(";");
 
             PopBlock(NewLineKind.BeforeNextBlock);

src/Generator/Generators/C/CppSources.cs

@@ -348,7 +348,7 @@ public override bool VisitMethodDecl(Method method)
 
             PushBlock(BlockKind.Method, method);
 
-            GenerateMethodSpecifier(method, method.Namespace as Class);
+            GenerateMethodSpecifier(method);
             NewLine();
 
             var @class = method.Namespace as Class;

src/Generator/Generators/CLI/CLIHeaders.cs

@@ -676,7 +676,8 @@ public void GenerateProperty(Property property)
             PopBlock(NewLineKind.BeforeNextBlock);
         }
 
-        public override void GenerateMethodSpecifier(Method method, Class @class)
+        public override void GenerateMethodSpecifier(Method method,
+            MethodSpecifierKind? kind = null)
         {
             if ((method.IsVirtual || method.IsOverride) && !method.IsOperator)
                 Write("virtual ");
@@ -712,7 +713,7 @@ public void GenerateMethod(Method method)
             PushBlock(BlockKind.Method, method);
             GenerateDeclarationCommon(method);
 
-            GenerateMethodSpecifier(method, method.Namespace as Class);
+            GenerateMethodSpecifier(method);
             WriteLine(";");
 
             if (method.OperatorKind == CXXOperatorKind.EqualEqual)

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -2340,7 +2340,8 @@ public void GenerateFunction(Function function, string parentName)
             PopBlock(NewLineKind.BeforeNextBlock);
         }
 
-        public override void GenerateMethodSpecifier(Method method, Class @class)
+        public override void GenerateMethodSpecifier(Method method,
+            MethodSpecifierKind? kind = null)
         {
             bool isTemplateMethod = method.Parameters.Any(
                 p => p.Kind == ParameterKind.Extension);
@@ -2392,7 +2393,7 @@ public void GenerateMethod(Method method, Class @class)
                 Write(Helpers.GetAccess(method.Access));
             }
 
-            GenerateMethodSpecifier(method, @class);
+            GenerateMethodSpecifier(method);
 
             if (method.SynthKind == FunctionSynthKind.DefaultValueOverload && method.IsConstructor && !method.IsPure)
             {

src/Generator/Generators/CodeGenerator.cs

@@ -222,7 +222,14 @@ public virtual void GenerateClassSpecifier(Class @class)
 
         #region Method generation
 
-        public virtual void GenerateMethodSpecifier(Method method, Class @class)
+        public enum MethodSpecifierKind
+        {
+            Declaration,
+            Definition
+        }
+
+        public virtual void GenerateMethodSpecifier(Method method,
+            MethodSpecifierKind? kind = null)
         {
         }