can serialize zero member struct, improve Unity struct formatter seri…

…alization performance
neuecc · Dec 11, 2016 · 93a65c9 · 93a65c9
1 parent 7015f97
commit 93a65c9
Show file tree

Hide file tree

Showing 40 changed files with 546 additions and 258 deletions.
diff --git a/nuget/ZeroFormatter.Interfaces.nuspec b/nuget/ZeroFormatter.Interfaces.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Interfaces</id>
-        <version>1.5.4</version>
+        <version>1.5.5</version>
         <title>ZeroFormatter.Interfaces</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>

diff --git a/nuget/ZeroFormatter.Unity.nuspec b/nuget/ZeroFormatter.Unity.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Unity</id>
-        <version>1.5.4</version>
+        <version>1.5.5</version>
         <title>ZeroFormatter.Unity</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,7 +17,7 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework="Unity Full v3.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.4" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.5" />
             </group>
         </dependencies>
     </metadata>

diff --git a/nuget/ZeroFormatter.nuspec b/nuget/ZeroFormatter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter</id>
-        <version>1.5.4</version>
+        <version>1.5.5</version>
         <title>ZeroFormatter</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,10 +17,10 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.4" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.5" />
             </group>
             <group targetFramework=".NETStandard1.6">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.4" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.5" />
                 <dependency id="System.Reflection.Emit" version="4.0.1" />
                 <dependency id="System.Runtime" version="4.1.0" />
                 <dependency id="System.Runtime.Extensions" version="4.1.0" />

diff --git a/nuget/check_zfc.bat b/nuget/check_zfc.bat
@@ -1 +1 @@
-zfc -i "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\sandbox\Sandbox.Shared\Sandbox.Shared.csproj" -o "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\tests\ZeroFormatter.UnityTests\Assets\ZeroFormatterGenerated.cs" -c UNITY -u
+zfc -i "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\sandbox\Sandbox.Shared\Sandbox.Shared.csproj" -o "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\tests\ZeroFormatter.UnityTests\Assets\ZeroFormatterGenerated.cs" -c UNITY -u
diff --git a/nuget/push.bat b/nuget/push.bat
@@ -1,4 +1,4 @@
 REM nuget push ZeroFormatter.Analyzer.1.1.1.0.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.1.5.4.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Interfaces.1.5.4.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Unity.1.5.4.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.1.5.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Interfaces.1.5.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Unity.1.5.5.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs b/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/sandbox/Sandbox.NETCore/project.json b/sandbox/Sandbox.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.5.4-*",
+  "version": "1.5.5-*",
   "buildOptions": {
     "emitEntryPoint": true
   },
@@ -9,8 +9,8 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "ZeroFormatter.Interfaces.NETCore": "1.5.4",
-    "ZeroFormatter.NETCore": "1.5.4"
+    "ZeroFormatter.Interfaces.NETCore": "1.5.5",
+    "ZeroFormatter.NETCore": "1.5.5"
   },
 
   "frameworks": {

diff --git a/sandbox/Sandbox.NETCore/project.lock.json b/sandbox/Sandbox.NETCore/project.lock.json
@@ -1992,7 +1992,7 @@
           "lib/netstandard1.3/_._": {}
         }
       },
-      "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.5": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2006,7 +2006,7 @@
           "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {}
         }
       },
-      "ZeroFormatter.NETCore/1.5.4": {
+      "ZeroFormatter.NETCore/1.5.5": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
@@ -2024,7 +2024,7 @@
           "System.Text.Encoding": "4.0.11",
           "System.Text.Encoding.Extensions": "4.0.11",
           "System.Threading": "4.0.11",
-          "ZeroFormatter.Interfaces.NETCore": "1.5.4"
+          "ZeroFormatter.Interfaces.NETCore": "1.5.5"
         },
         "compile": {
           "netstandard1.6/ZeroFormatter.NETCore.dll": {}
@@ -6627,12 +6627,12 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.5": {
       "type": "project",
       "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
     },
-    "ZeroFormatter.NETCore/1.5.4": {
+    "ZeroFormatter.NETCore/1.5.5": {
       "type": "project",
       "path": "../../src/ZeroFormatter.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.NETCore/ZeroFormatter.NETCore.xproj"
@@ -6641,8 +6641,8 @@
   "projectFileDependencyGroups": {
     "": [
       "Microsoft.NETCore.App >= 1.0.0",
-      "ZeroFormatter.Interfaces.NETCore >= 1.5.4",
-      "ZeroFormatter.NETCore >= 1.5.4"
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.5",
+      "ZeroFormatter.NETCore >= 1.5.5"
     ],
     ".NETCoreApp,Version=v1.0": []
   },

diff --git a/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs b/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/sandbox/Sandbox.Shared/Sandbox.Shared.csproj b/sandbox/Sandbox.Shared/Sandbox.Shared.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion Condition="'$(Configuration)|$(Platform)' != 'Unity|AnyCPU'">v4.5</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition="'$(Configuration)|$(Platform)' == 'Unity|AnyCPU'">v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,8 +42,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -59,6 +58,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnionType.cs" />
     <Compile Include="Versioning.cs" />
+    <Compile Include="ZeroArgument.cs" />
     <Compile Include="ZeroFormatter.Tests\TestClasses.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/sandbox/Sandbox.Shared/ZeroArgument.cs b/sandbox/Sandbox.Shared/ZeroArgument.cs
@@ -0,0 +1,17 @@
+
+using ZeroFormatter;
+
+namespace Sandbox.Shared
+{
+    [ZeroFormattable]
+    public class ZeroClass
+    {
+
+    }
+
+    [ZeroFormattable]
+    public struct ZeroStruct
+    {
+
+    }
+}
diff --git a/sandbox/Sandbox/Program.cs b/sandbox/Sandbox/Program.cs
@@ -241,15 +241,18 @@ public class Nest
     }
 
 
+    [ZeroFormattable]
+    public struct ZeroA
+    {
+    }
+
     class Program
     {
         static void Main(string[] args)
         {
-            var a = ZeroFormatterSerializer.Convert(new InnerClassA.InnerObject());
-            var b = ZeroFormatterSerializer.Convert(new InnerClassB.InnerObject());
+            var a = ZeroFormatterSerializer.Serialize(default(ZeroA));
+
 
-            Console.WriteLine(a.GetType().FullName);
-            Console.WriteLine(b.GetType().FullName);
         }
     }
 

diff --git a/sandbox/Sandbox/Properties/AssemblyInfo.cs b/sandbox/Sandbox/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest b/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.4" Language="en-US" Publisher="neuecc"/>
+        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.5" Language="en-US" Publisher="neuecc"/>
         <DisplayName>ZeroFormatterAnalyzer</DisplayName>
         <Description xml:space="preserve">New Launcher of ZeroFormatter.Analyzer</Description>
     </Metadata>

diff --git a/src/ZeroFormatter.CodeGenerator/GeneratorPartial.cs b/src/ZeroFormatter.CodeGenerator/GeneratorPartial.cs
@@ -87,6 +87,8 @@ public int[] ElementFixedSizes
         {
             get
             {
+                if (Properties.Length == 0) return new int[0];
+
                 var schemaLastIndex = Properties.Select(x => x.Index).LastOrDefault();
                 var dict = Properties.Where(x => x.IsFixedSize).ToDictionary(x => x.Index, x => x.FixedSize);
                 var elementSizes = new int[schemaLastIndex + 1];
@@ -101,6 +103,20 @@ public int[] ElementFixedSizes
                 return elementSizes;
             }
         }
+
+        public int? GetLength()
+        {
+            if (Properties.Length == 0) return 0;
+
+            var sum = 0;
+            foreach (var item in Properties)
+            {
+                if (!item.IsFixedSize) return null;
+                sum += item.FixedSize;
+            }
+
+            return sum;
+        }
     }
 
     public partial class InitializerGenerator

diff --git a/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs b/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		zfc -i "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\sandbox\Sandbox.Shared\Sandbox.Shared.csproj" -o "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\tests\ZeroFormatter.UnityTests\Assets\ZeroFormatterGenerated.cs" -c UNITY -u
		zfc -i "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\sandbox\Sandbox.Shared\Sandbox.Shared.csproj" -o "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\tests\ZeroFormatter.UnityTests\Assets\ZeroFormatterGenerated.cs" -c UNITY -u