forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Fix behavior when spaces are in the path (fixes #6)

This commit is contained in:
Sam Harwell 2013-08-05 19:37:39 -05:00
parent a2a1eef6c3
commit c9a02cd707
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs
View File

@ -42,6 +42,7 @@ namespace Antlr4.Build.Tasks
#else
using Registry = Microsoft.Win32.Registry;
#endif
using StringBuilder = System.Text.StringBuilder;
internal class AntlrClassGenerationTaskInternal : MarshalByRefObject
{
@ -243,11 +244,11 @@ namespace Antlr4.Build.Tasks
List<string> arguments = new List<string>();
arguments.Add("-cp");
arguments.Add('"' + ToolPath + '"');
arguments.Add(ToolPath);
arguments.Add("org.antlr.v4.CSharpTool");
arguments.Add("-o");
arguments.Add('"' + OutputPath + '"');
arguments.Add(OutputPath);
if (GenerateListener)
arguments.Add("-listener");
@ -288,7 +289,7 @@ namespace Antlr4.Build.Tasks
arguments.AddRange(SourceCodeFiles);
ProcessStartInfo startInfo = new ProcessStartInfo(java, string.Join(" ", arguments.ToArray()))
ProcessStartInfo startInfo = new ProcessStartInfo(java, JoinArguments(arguments))
{
UseShellExecute = false,
CreateNoWindow = true,
@ -330,6 +331,35 @@ namespace Antlr4.Build.Tasks
}
}
private static string JoinArguments(IEnumerable<string> arguments)
{
if (arguments == null)
throw new ArgumentNullException("arguments");
StringBuilder builder = new StringBuilder();
foreach (string argument in arguments)
{
if (builder.Length > 0)
builder.Append(' ');
if (argument.IndexOfAny(new[] { '"', ' ' }) < 0)
{
builder.Append(argument);
continue;
}
// escape a backslash appearing before a quote
string arg = argument.Replace("\\\"", "\\\\\"");
// escape double quotes
arg = arg.Replace("\"", "\\\"");
// wrap the argument in outer quotes
builder.Append('"').Append(arg).Append('"');
}
return builder.ToString();
}
private static readonly Regex GeneratedFileMessageFormat = new Regex(@"^Generating file '(?<OUTPUT>.*?)' for grammar '(?<GRAMMAR>.*?)'$", RegexOptions.Compiled);
private void HandleErrorDataReceived(object sender, DataReceivedEventArgs e)