Refactoring

Author: m039

Library/CppLang/Generator.cs

@@ -176,8 +176,6 @@ public TFile[] Generate(SyntaxNode input)
 
     static partial class Extensions
     {
-        #region Utils
-
         static public string GetName(this NamespaceDeclarationSyntax syntax)
         {
             return syntax.Name.ToString();
@@ -221,7 +219,5 @@ static public YType GetYType(this TypeSyntax typeSyntax)
 
             throw new TException("Unsupported return type");
         }
-
-        #endregion
     }
 }

Library/CppLang/SourceCompiler.cs

@@ -68,71 +68,76 @@ internal protected override void Visit(StringBuilder builder, YMethod method)
                 builder.Append(_typeMapper.ValueOf(method.Signature.Parameters));
                 builder.Append(")");
 
-                Append(builder, method.Body);
+                builder.AppendEx(method.Body);
             }
 
-            static void Append(StringBuilder builder, YStatement statement)
+            internal protected override void FinalizeBuilder(StringBuilder builder)
             {
-                if (statement is YBlock) {
-                    var block = (YBlock)statement;
+                base.FinalizeBuilder(builder);
 
-                    builder.Append("{");
+                builder.Replace(IncludesMark, "");
 
-                    foreach (var s in block.Statements) {
-                        Append(builder, s);
-                    }
+                // only default constructor supported
+                _constructor.Append("{}");
 
-                    builder.Append("}");
-                } else if (statement is YReturn) {
-                    var @return = (YReturn)statement;
+                builder.Replace(ConstructorsMark, _constructor.ToString());
+            }
+        }
 
-                    builder.Append("return ");
-                    Append(builder, @return.Value);
-                    builder.Append(";");
+        public override UnitWalker CreateUnitWalker(YClass @class)
+        {
+            return new SourceWalker(@class);
+        }
+    }
 
-                } else if (statement is YAssign) {
-                    var assign = (YAssign)statement;
+    public static partial class Extensions
+    {
 
-                    Append(builder, assign.Left);
-                    builder.Append("=");
-                    Append(builder, assign.Right);
-                    builder.Append(";");
-                }
-            }
+        static public void AppendEx(this StringBuilder builder, YStatement statement)
+        {
+            if (statement is YBlock) {
+                var block = (YBlock)statement;
 
-            static void Append(StringBuilder builder, YExpr expr)
-            {
-                if (expr is YConstExpr) {
-                    builder.Append("" + expr);
-                } else if (expr is YThisExpr) {
-                    builder.Append("this");
-                } else if (expr is YMemberAccessExpr) {
-                    var memberAccess = (YMemberAccessExpr)expr;
-
-                    Append(builder, memberAccess.Expression);
-                    builder.Append("->"); // But what with "this."?
-                    builder.Append(memberAccess.Name);
-                } else if (expr is YIdentifierExpr) {
-                    builder.Append(((YIdentifierExpr)expr).Name);
+                builder.Append("{");
+
+                foreach (var s in block.Statements) {
+                    AppendEx(builder, s);
                 }
-            }
 
-            internal protected override void FinalizeBuilder(StringBuilder builder)
-            {
-                base.FinalizeBuilder(builder);
+                builder.Append("}");
+            } else if (statement is YReturn) {
+                var @return = (YReturn)statement;
 
-                builder.Replace(IncludesMark, "");
+                builder.Append("return ");
+                AppendEx(builder, @return.Value);
+                builder.Append(";");
 
-                // only default constructor supported
-                _constructor.Append("{}");
+            } else if (statement is YAssign) {
+                var assign = (YAssign)statement;
 
-                builder.Replace(ConstructorsMark, _constructor.ToString());
+                AppendEx(builder, assign.Left);
+                builder.Append("=");
+                AppendEx(builder, assign.Right);
+                builder.Append(";");
             }
         }
 
-        public override UnitWalker CreateUnitWalker(YClass @class)
+        static public void AppendEx(this StringBuilder builder, YExpr expr)
         {
-            return new SourceWalker(@class);
+            if (expr is YConstExpr) {
+                builder.Append("" + expr);
+            } else if (expr is YThisExpr) {
+                builder.Append("this");
+            } else if (expr is YMemberAccessExpr) {
+                var memberAccess = (YMemberAccessExpr)expr;
+
+                AppendEx(builder, memberAccess.Expression);
+                builder.Append("->"); // But what with "this."?
+                builder.Append(memberAccess.Name);
+            } else if (expr is YIdentifierExpr) {
+                builder.Append(((YIdentifierExpr)expr).Name);
+            }
         }
+
     }
 }