generate safe path on multiple if

itn3000 · Mar 4, 2019 · ba43428 · ba43428
1 parent 5cff4a9
commit ba43428
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/MessagePackCompiler/MessagePackCompiler.csproj b/src/MessagePackCompiler/MessagePackCompiler.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MicroBatchFramework" Version="0.3.1-beta3" />
+    <PackageReference Include="MicroBatchFramework" Version="0.4.0-beta4" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.0.0-beta3-final" />
     <PackageReference Include="System.CodeDom" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/MessagePackCompiler/Program.cs b/src/MessagePackCompiler/Program.cs
@@ -124,7 +124,7 @@ static async Task Main(string[] args)
                     }
                     else
                     {
-                        var fname = Path.GetFileNameWithoutExtension(output) + "." + multioutSymbol + ".cs";
+                        var fname = Path.GetFileNameWithoutExtension(output) + "." + MultiSymbolToSafeFilePath(multioutSymbol) + ".cs";
                         var text = $"#if {multioutSymbol}" + Environment.NewLine + sb.ToString() + Environment.NewLine + "#endif";
                         await OutputAsync(Path.Combine(Path.GetDirectoryName(output), fname), text, Context.CancellationToken);
                     }
@@ -192,7 +192,7 @@ static Task OutputToDirAsync(string dir, string ns, string name, string multiple
             else
             {
                 text = $"#if {multipleOutSymbol}" + Environment.NewLine + text + Environment.NewLine + "#endif";
-                return OutputAsync(Path.Combine(dir, multipleOutSymbol, $"{ns}_{name}".Replace(".", "_").Replace("global::", "") + ".cs"), text, cancellationToken);
+                return OutputAsync(Path.Combine(dir, MultiSymbolToSafeFilePath(multipleOutSymbol), $"{ns}_{name}".Replace(".", "_").Replace("global::", "") + ".cs"), text, cancellationToken);
             }
         }
 
@@ -211,5 +211,10 @@ static Task OutputAsync(string path, string text, CancellationToken cancellation
 
             return System.IO.File.WriteAllTextAsync(path, text, Encoding.UTF8, cancellationToken);
         }
+
+        static string MultiSymbolToSafeFilePath(string symbol)
+        {
+            return symbol.Replace("!", "NOT_").Replace("(", "").Replace(")", "").Replace("||", "_OR_").Replace("&&", "_AND_");
+        }
     }
 }