support command arguments with parentheses.

Author: hecomi

Assets/uREPL/Scripts/Core/Core.cs

@@ -24,6 +24,25 @@ public static class Core
 	static private bool isInitialized = false;
 	static private List<CompletionPlugin> completionPlugins = new List<CompletionPlugin>();
 
+	internal class ParseBlockResult
+	{
+		public List<string> matches = new List<string>();
+		public string input;
+		public string output;
+		public string pattern;
+		public string placeholder;
+
+		public ParseBlockResult(
+			string input,
+			string pattern,
+			string placeholder)
+		{
+			this.input = this.output = input;
+			this.pattern = pattern;
+			this.placeholder = placeholder;
+		}
+	}
+
 #if UNITY_EDITOR
 	[UnityEditor.MenuItem("Assets/Create/uREPL")]
 	[UnityEditor.MenuItem("GameObject/Create Other/uREPL")]
@@ -82,6 +101,36 @@ static public void UnregisterCompletionPlugins(CompletionPlugin plugin)
 		}
 	}
 
+	static private ParseBlockResult ConvertBlockToPlaceholder(
+		string input,
+		string pattern,
+		string placeholder)
+	{
+		var result = new ParseBlockResult(input, pattern, placeholder);
+
+		var regex = new Regex(pattern);
+		var n = 0;
+		for (var m = regex.Match(input); m.Success; m = m.NextMatch(), ++n) {
+			result.matches.Add(m.Value);
+			result.output = regex.Replace(result.output, string.Format(placeholder, n), 1);
+		}
+
+		return result;
+	}
+
+	static private string ConvertPlaceholderToBlock(
+		string input,
+		ParseBlockResult result)
+	{
+		for (int i = 0; i < result.matches.Count; ++i) {
+			var placeholder = string.Format(result.placeholder, i);
+			input = input.Replace(placeholder, result.matches[i]);
+		}
+
+		return input;
+	}
+
+
 	static private string ConvertIntoCodeIfCommand(string code)
 	{
 		// NOTE: If two or more commands that have a same name are registered,
@@ -96,31 +145,33 @@ static private string ConvertIntoCodeIfCommand(string code)
 			return code;
 		}
 
-		var argsTmp = code.Substring(commandInfo.command.Length).TrimEnd(';').Split(
-			new string[] { " ", "\t" },
-			System.StringSplitOptions.None).ToList();
-
-		// Check arguments with spaces inner semicolons (e.g. $ print "foo \"bar\"").
-		var args = new List<string>();
-		var semicolonCount = 0;
-		for (int i = 0; i < argsTmp.Count; ++i) {
-			bool isPartial = semicolonCount % 2 == 1;
-			var arg = argsTmp[i];
-			var regex = new Regex("(^|[^\\\\]+)\"");
-			semicolonCount += regex.Matches(arg).Count;
-			if (isPartial) {
-				args[args.Count - 1] += " " + arg;
-			} else if (!string.IsNullOrEmpty(arg)) {
-				args.Add(arg);
-			}
-		}
+		// Remove last semicolon.
+		code = code.TrimEnd(';');
+
+		// Remove command and get only arguments.
+		code = code.Substring(commandInfo.command.Length);
+
+		// Store parentheses.
+		var parentheses = ConvertBlockToPlaceholder(code, "\\([^\\)]+\\)", "<%paren{0}%>");
+		code = parentheses.output;
+
+		// Store quatation blocks.
+		var quates = ConvertBlockToPlaceholder(code, "\"[^\"(\\\")]+\"", "<%quate{0}%>");
+		code = quates.output;
+
+		// Split arguments with space.
+		var args = code.Split(new string[] { " " }, System.StringSplitOptions.RemoveEmptyEntries);
 
 		// Convert the command into the code.
-		if (commandInfo != null) {
-			code  = string.Format("{0}.{1}(", commandInfo.className, commandInfo.methodName);
-			code += string.Join(", ", args.ToArray());
-			code += ");";
-		}
+		code  = string.Format("{0}.{1}(", commandInfo.className, commandInfo.methodName);
+		code += string.Join(", ", args);
+		code += ");";
+
+		// Replace temporary quates placeholders to actual expressions.
+		code = ConvertPlaceholderToBlock(code, quates);
+
+		// Replace temporary parentheses placeholders to actual expressions.
+		code = ConvertPlaceholderToBlock(code, parentheses);
 
 		return code;
 	}
@@ -206,6 +257,12 @@ static public void ShowUsing()
 	{
 		Log.Output(GetUsing());
 	}
+
+	[Command(name = "test", description = "Show all using")]
+	static public void Test(string hoge, float fuga)
+	{
+		Debug.Log(hoge + " " + fuga);
+	}
 }
 
 }