Version 0.0.27. Attempt to resolve rule groups conflict.

Author: konard

Platform.RegularExpressions.Transformer.CSharpToCpp/CSharpToCppTransformer.cs

@@ -47,15 +47,6 @@ public class CSharpToCppTransformer : Transformer
             // (this 
             // (
             (new Regex(@"\(this "), "(", null, 0),
-            // Func<TElement> treeCount
-            // std::function<TElement()> treeCount
-            (new Regex(@"Func<([a-zA-Z0-9]+)> ([a-zA-Z0-9]+)"), "std::function<$1()> $2", null, 0),
-            // Action<TElement> free
-            // std::function<void(TElement)> free
-            (new Regex(@"Action<([a-zA-Z0-9]+)> ([a-zA-Z0-9]+)"), "std::function<void($1)> $2", null, 0),
-            // Predicate<TArgument> predicate
-            // std::function<bool(TArgument)> predicate
-            (new Regex(@"Predicate<([a-zA-Z0-9]+)> ([a-zA-Z0-9]+)"), "std::function<bool($1)> $2", null, 0),
             // public static readonly EnsureAlwaysExtensionRoot Always = new EnsureAlwaysExtensionRoot();
             // inline static EnsureAlwaysExtensionRoot Always;
             (new Regex(@"public static readonly (?<type>[a-zA-Z0-9]+) (?<name>[a-zA-Z0-9_]+) = new \k<type>\(\);"), "inline static ${type} ${name};", null, 0),
@@ -113,6 +104,15 @@ public class CSharpToCppTransformer : Transformer
             // Count => GetSizeOrZero(Root);
             // GetCount() { return GetSizeOrZero(Root); }
             (new Regex(@"([A-Z][a-z]+)\s+=>\s+([^;\r\n]+);"), "Get$1() { return $2; }", null, 0),
+            // Func<TElement> treeCount
+            // std::function<TElement()> treeCount
+            (new Regex(@"Func<([a-zA-Z0-9]+)> ([a-zA-Z0-9]+)"), "std::function<$1()> $2", null, 0),
+            // Action<TElement> free
+            // std::function<void(TElement)> free
+            (new Regex(@"Action<([a-zA-Z0-9]+)> ([a-zA-Z0-9]+)"), "std::function<void($1)> $2", null, 0),
+            // Predicate<TArgument> predicate
+            // std::function<bool(TArgument)> predicate
+            (new Regex(@"Predicate<([a-zA-Z0-9]+)> ([a-zA-Z0-9]+)"), "std::function<bool($1)> $2", null, 0),
             // var
             // auto
             (new Regex(@"(\W)var(\W)"), "$1auto$2", null, 0),

Platform.RegularExpressions.Transformer.CSharpToCpp/Platform.RegularExpressions.Transformer.CSharpToCpp.csproj

@@ -4,7 +4,7 @@
     <Description>LinksPlatform's Platform.RegularExpressions.Transformer.CSharpToCpp Class Library</Description>
     <Copyright>Konstantin Diachenko</Copyright>
     <AssemblyTitle>Platform.RegularExpressions.Transformer.CSharpToCpp</AssemblyTitle>
-    <VersionPrefix>0.0.26</VersionPrefix>
+    <VersionPrefix>0.0.27</VersionPrefix>
     <Authors>Konstantin Diachenko</Authors>
     <TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>Platform.RegularExpressions.Transformer.CSharpToCpp</AssemblyName>
@@ -24,7 +24,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <LangVersion>latest</LangVersion>
-    <PackageReleaseNotes>Better support for C# inline methods.</PackageReleaseNotes>
+    <PackageReleaseNotes>Attempt to resolve rule groups conflict.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) AND '$(MSBuildRuntimeType)' == 'Core' AND '$(OS)' != 'Windows_NT'">