codegen IsRelease optional, always partial class, check struct values for using default instead of constant

Author: chaowlert

ExpressionDebugger/ExpressionCompilationOptions.cs

@@ -11,6 +11,6 @@ public class ExpressionCompilationOptions
         public IEnumerable<Assembly> References { get; set; }
         public bool EmitFile { get; set; }
         public string RootPath { get; set; }
-        public bool IsRelease { get; set; }
+        public bool? IsRelease { get; set; }
     }
 }

ExpressionDebugger/ExpressionCompiler.cs

@@ -4,6 +4,7 @@
 using Microsoft.CodeAnalysis.Text;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
@@ -85,12 +86,13 @@ from n in t.TypeNames
             var symbolsName = Path.ChangeExtension(assemblyName, "pdb");
 
             var metadataReferences = references.Select(it => MetadataReference.CreateFromFile(it.Location));
+            var isRelease = _options?.IsRelease ?? !Debugger.IsAttached;
             CSharpCompilation compilation = CSharpCompilation.Create(
                 assemblyName,
                 _codes,
                 metadataReferences,
                 new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, usings: new[] { "System" })
-                    .WithOptimizationLevel(_options?.IsRelease == true ? OptimizationLevel.Release : OptimizationLevel.Debug)
+                    .WithOptimizationLevel(isRelease ? OptimizationLevel.Release : OptimizationLevel.Debug)
                     .WithPlatform(Platform.AnyCpu)
             );
 

ExpressionDebugger/ExpressionDebuggerExtensions.cs

@@ -48,9 +48,10 @@ public static Delegate CreateDelegate(this ExpressionTranslator translator, Asse
             var type = assembly.GetType(typeName);
             var method = type.GetMethod(definitions.MethodName ?? "Main");
             var obj = definitions.IsStatic ? null : Activator.CreateInstance(type);
+            var flag = definitions.IsStatic ? BindingFlags.Static : BindingFlags.Instance;
             foreach (var kvp in translator.Constants)
             {
-                var field = type.GetField(kvp.Value);
+                var field = type.GetField(kvp.Value, BindingFlags.NonPublic | flag);
                 field.SetValue(obj, kvp.Key);
             }
             return method.CreateDelegate(translator.Expression.Type, obj);

ExpressionTranslator/ExpressionTranslator.cs

@@ -13,14 +13,15 @@ namespace ExpressionDebugger
 {
     public class ExpressionTranslator : ExpressionVisitor
     {
-        private const int Tabsize = 4;
+        private const int _tabsize = 4;
         private StringWriter _writer;
         private int _indentLevel;
         private StringWriter _appendWriter;
 
         private Dictionary<Type, string> _typeNames;
         private HashSet<string> _usings;
         private Dictionary<object, string> _constants;
+        private Dictionary<Type, object> _defaults;
 
         public Dictionary<object, string> Constants => _constants ?? (_constants = new Dictionary<object, string>());
         public Dictionary<Type, string> TypeNames => _typeNames ?? (_typeNames = new Dictionary<Type, string>());
@@ -74,7 +75,7 @@ private static int GetPrecedence(ExpressionType nodeType)
                 case ExpressionType.MultiplyAssign:
                 case ExpressionType.MultiplyAssignChecked:
                 case ExpressionType.OrAssign:
-                case ExpressionType.PowerAssign:
+                //case ExpressionType.PowerAssign:
                 case ExpressionType.Quote:
                 case ExpressionType.RightShiftAssign:
                 case ExpressionType.SubtractAssign:
@@ -156,9 +157,9 @@ private static int GetPrecedence(ExpressionType nodeType)
                 case ExpressionType.UnaryPlus:
                     return 13;
 
-                // Power
-                case ExpressionType.Power:
-                    return 14;
+                //// Power
+                //case ExpressionType.Power:
+                //    return 14;
 
                 default:
                     return 100;
@@ -191,7 +192,7 @@ private static bool ShouldGroup(Expression node, ExpressionType parentNodeType,
                 case ExpressionType.Divide:
                 case ExpressionType.Modulo:
                 case ExpressionType.LeftShift:
-                case ExpressionType.Power:
+                //case ExpressionType.Power:
                 case ExpressionType.RightShift:
                 case ExpressionType.Subtract:
                 case ExpressionType.SubtractChecked:
@@ -227,7 +228,7 @@ private void WriteLine()
         {
             _writer.WriteLine();
 
-            var spaceCount = _indentLevel * Tabsize;
+            var spaceCount = _indentLevel * _tabsize;
             _writer.Write(new string(' ', spaceCount));
         }
 
@@ -423,11 +424,6 @@ private string Translate(Type type)
                 return "ushort";
             if (type == typeof(void))
                 return "void";
-            if (type.GetTypeInfo().IsNotPublic)
-            {
-                HasDynamic = true;
-                return "dynamic";
-            }
 #if !NETSTANDARD1_3
             if (typeof(IDynamicMetaObjectProvider).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()))
             {
@@ -791,6 +787,22 @@ private void WriteValue(object value)
             }
             else
             {
+                var type = value.GetType();
+                if (type.GetTypeInfo().IsValueType)
+                {
+                    if (_defaults == null)
+                        _defaults = new Dictionary<Type, object>();
+                    if (!_defaults.TryGetValue(type, out var def))
+                    {
+                        def = Activator.CreateInstance(type);
+                        _defaults[type] = def;
+                    }
+                    if (value.Equals(def))
+                    {
+                        Write($"default({Translate(type)})");
+                        return;
+                    }
+                }
                 Write(GetConstant(value));
             }
         }
@@ -1792,7 +1804,7 @@ public override string ToString()
                     }
 
                     WriteModifier(true);
-                    Write("class ", Definitions.TypeName);
+                    Write("partial class ", Definitions.TypeName);
                     if (implements?.Any() == true)
                     {
                         Write(" : ", string.Join(", ", implements));
@@ -1803,7 +1815,7 @@ public override string ToString()
                 {
                     foreach (var constant in constants)
                     {
-                        WriteModifier(true);
+                        WriteModifier(false);
                         Write(constant);
                     }
                     WriteLine();

ExpressionTranslator/ExpressionTranslator.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard1.3;net45;net40</TargetFrameworks>