rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

Updated StringReplacer.quotedSplit() to accept more than one quote char.

Browse Source
This commit is contained in:
Cristian Maglie 2013-07-17 14:36:20 +02:00
parent c70cba8fcd
commit ee8110e731
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/processing/app/helpers/StringReplacer.java
View File

@ -34,7 +34,7 @@ public class StringReplacer {
String res;
// Recursive replace with a max depth of 10 levels.
for (int i=0; i<10; i++) {
for (int i = 0; i < 10; i++) {
// Do a replace with dictionary
res = StringReplacer.replaceFromMapping(src, dict);
if (!recursive)
@ -45,30 +45,31 @@ public class StringReplacer {
}
// Split the resulting string in arguments
return quotedSplit(src, '"', false);
return quotedSplit(src, "\"'", false);
}
public static String[] quotedSplit(String src, char escapeChar,
public static String[] quotedSplit(String src, String quoteChars,
boolean acceptEmptyArguments)
throws Exception {
String quote = "" + escapeChar;
List<String> res = new ArrayList<String>();
String escapedArg = null;
boolean escaping = false;
String escapingChar = null;
for (String i : src.split(" ")) {
if (!escaping) {
if (!i.startsWith(quote)) {
if (escapingChar == null) {
// If the first char is not an escape char..
String first = i.substring(0, 1);
if (!quoteChars.contains(first)) {
if (i.trim().length() != 0 || acceptEmptyArguments)
res.add(i);
continue;
}
escaping = true;
escapingChar = first;
i = i.substring(1);
escapedArg = "";
}
if (!i.endsWith(quote)) {
if (!i.endsWith(escapingChar)) {
escapedArg += i + " ";
continue;
}
@ -76,11 +77,11 @@ public class StringReplacer {
escapedArg += i.substring(0, i.length() - 1);
if (escapedArg.trim().length() != 0 || acceptEmptyArguments)
res.add(escapedArg);
escaping = false;
escapingChar = null;
}
if (escaping)
throw new Exception("Invalid quoting: no closing '" + escapeChar +
"' char found.");
if (escapingChar != null)
throw new Exception("Invalid quoting: no closing [" + escapingChar +
"] char found.");
return res.toArray(new String[0]);
}