Refactoring

Author: m039

Library/CppLang/Generator.cs

@@ -172,7 +172,7 @@ void ProcessClasses(YNamespace @namespace, NamespaceDeclarationSyntax inputNames
             }
         }
 
-        // todo here could be generics or reflection
+        // todo good place to use generics or reflection
 
         YStatement ProcessStatement(StatementSyntax statement)
         {
@@ -205,6 +205,8 @@ YExpr ProcessExpr(ExpressionSyntax expr)
                 return ProcessExpr((MemberAccessExpressionSyntax)expr);
             } else if (expr is ThisExpressionSyntax) {
                 return ProcessExpr((ThisExpressionSyntax)expr);
+            } else if (expr is AssignmentExpressionSyntax) {
+                return ProcessExpr((AssignmentExpressionSyntax)expr);
             }
 
             throw new TException("Unable to process expression");
@@ -220,7 +222,7 @@ YExpr ProcessExpr(LiteralExpressionSyntax expr)
             if (expr.Token.IsKind(SyntaxKind.NullKeyword)) {
                 return YLiteralExpr.Null;
             } else if (expr.Token.IsKind(SyntaxKind.NumericLiteralToken)) {
-                return new YLiteralExpr(expr.Token.Value); // looks same as YConstExpr
+                return new YLiteralExpr(expr.Token.Value); // Looks like YConstExpr, wtf?!
             }
 
             throw new TException("Unable to process expr");
@@ -267,17 +269,21 @@ YExpr ProcessExpr(BinaryExpressionSyntax binaryExpression)
             return new YBinaryExpr(left, right, operation);
         }
 
+        YExpr ProcessExpr(AssignmentExpressionSyntax assignmentExpression)
+        {
+            YExpr left = ProcessExpr(assignmentExpression.Left);
+            YExpr right = ProcessExpr(assignmentExpression.Right);
+
+            return new YAssign(left, right);
+        }
+
         YStatement ProcessStatement(IfStatementSyntax ifStatement)
         {
             YExpr condition = ProcessExpr(ifStatement.Condition);
             YStatement statement = ProcessStatement(ifStatement.Statement);
             YStatement elseStatement = ProcessStatement(ifStatement.Else.Statement);
 
-            if (condition != null && statement != null) {
-                return new YIf(condition, statement, elseStatement);
-            }
-
-            throw new TException("Unable to process statement");
+            return new YIf(condition, statement, elseStatement);
         }
 
         YStatement ProcessStatement(ReturnStatementSyntax statement)
@@ -298,18 +304,7 @@ YStatement ProcessStatement(BlockSyntax statement)
 
         YStatement ProcessStatement(ExpressionStatementSyntax statement)
         {
-            if (statement.Expression is AssignmentExpressionSyntax) { // ?!
-                var assignmentExpression = (AssignmentExpressionSyntax)statement.Expression;
-
-                YExpr left = ProcessExpr(assignmentExpression.Left);
-                YExpr right = ProcessExpr(assignmentExpression.Right);
-                             
-                if (left != null && right != null) {
-                    return new YAssign(left, right); // expression or statement?!
-                }
-            }
-
-            throw new TException("Unable to process statement");
+            return new YExprStatement(ProcessExpr(statement.Expression));
         }
 
         YOperator ProcessOperator(SyntaxToken token)

Library/CppLang/SourceCompiler.cs

@@ -124,13 +124,11 @@ static public void AppendEx(this StringBuilder builder, YStatement statement)
                 AppendEx(builder, @return.Value);
                 builder.Append(";");
 
-            } else if (statement is YAssign) {
-                var assign = (YAssign)statement;
+            } else if (statement is YExprStatement) {
 
-                AppendEx(builder, assign.Left);
-                builder.Append("=");
-                AppendEx(builder, assign.Right);
+                AppendEx(builder, ((YExprStatement)statement).Expression);
                 builder.Append(";");
+
             } else if (statement is YIf) {
                 var @if = (YIf)statement;
 
@@ -189,6 +187,12 @@ static public void AppendEx(this StringBuilder builder, YExpr expr)
 
                 // no arguments
                 builder.Append("()");
+            } else if (expr is YAssign) {
+                var assign = (YAssign)expr;
+
+                AppendEx(builder, assign.Left);
+                builder.Append("=");
+                AppendEx(builder, assign.Right);
             }
         }
 

Library/Library.csproj

@@ -78,19 +78,20 @@
     <Compile Include="YLang\YParameter.cs" />
     <Compile Include="YLang\Statements\YBlock.cs" />
     <Compile Include="YLang\Statements\YVar.cs" />
-    <Compile Include="YLang\Statements\YAssign.cs" />
     <Compile Include="YLang\Expresions\YMemberAccessExpr.cs" />
     <Compile Include="YLang\Expresions\YThisExpr.cs" />
     <Compile Include="YLang\Expresions\YIdentifierExpr.cs" />
     <Compile Include="YLang\YDestructor.cs" />
     <Compile Include="TUnsupportedException.cs" />
     <Compile Include="YLang\Types\YRefType.cs" />
-    <Compile Include="YLang\Operations\YOperator.cs" />
     <Compile Include="YLang\Statements\YIf.cs" />
     <Compile Include="YLang\Expresions\YBinaryExpr.cs" />
     <Compile Include="YLang\Expresions\YLiteralExpr.cs" />
     <Compile Include="YLang\Expresions\YPrefixUnaryExpr.cs" />
     <Compile Include="YLang\Expresions\YInvocation.cs" />
+    <Compile Include="YLang\YOperator.cs" />
+    <Compile Include="YLang\Statements\YExprStatement.cs" />
+    <Compile Include="YLang\Expresions\YAssign.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -101,7 +102,6 @@
     <Folder Include="YLang\Expresions\" />
     <Folder Include="YLang\Types\" />
     <Folder Include="YLang\Statements\" />
-    <Folder Include="YLang\Operations\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Configs\uncrustify.cfg" />

Library/Prettifier.cs

@@ -7,15 +7,15 @@ namespace SharpCpp
 {
     public class Prettifier : IDisposable
     {
-        private const string UncrustifyCommandName = "uncrustify";
+        const string UncrustifyCommandName = "uncrustify";
 
-        private const string UncrustifyConfigId = "SharpCpp.Configs.uncrustify.cfg";
+        const string UncrustifyConfigId = "SharpCpp.Configs.uncrustify.cfg";
 
-        private readonly string _uncrustifyFileName;
+        readonly string _uncrustifyFileName;
 
-        private readonly string _uncrustifyConfigFileName;
+        readonly string _uncrustifyConfigFileName;
 
-        private bool _disposed = false;
+        bool _disposed = false;
 
         public Prettifier()
         {

Library/YLang/Statements/YAssign.cs Library/YLang/Expresions/YAssign.csLibrary/YLang/Statements/YAssign.cs renamed to Library/YLang/Expresions/YAssign.cs

@@ -1,7 +1,7 @@
 using System;
 namespace SharpCpp
 {
-    public class YAssign : YStatement
+    public class YAssign : YExpr
     {
         public YExpr Left;
         public YExpr Right;

Library/YLang/Statements/YExprStatement.cs

@@ -0,0 +1,13 @@
+using System;
+namespace SharpCpp
+{
+    public class YExprStatement : YStatement
+    {
+        public YExpr Expression;
+
+        public YExprStatement(YExpr expression)
+        {
+            Expression = expression;
+        }
+    }
+}

Library/YLang/Operations/YOperator.cs Library/YLang/YOperator.csLibrary/YLang/Operations/YOperator.cs renamed to Library/YLang/YOperator.cs

@@ -7,7 +7,7 @@ public class YOperator
 
         public static readonly YOperator Minus = new YOperator();
 
-        private YOperator()
+        YOperator()
         {
         }
     }