mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

[241072] - added command line parser utility and tests

Browse source
This commit is contained in:
Alena Laskavaia 2008-11-04 17:34:34 +00:00
parent 6d27bb8b4e
commit aec8c7fadc
4 changed files with 292 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
View file

@ -76,6 +76,7 @@ import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator2;
import org.eclipse.cdt.newmake.core.IMakeBuilderInfo;
import org.eclipse.cdt.newmake.internal.core.StreamMonitor;
import org.eclipse.cdt.utils.CommandLineUtil;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker;
@ -1897,21 +1898,12 @@ public class CommonBuilder extends ACBuilder {
// Set the environment
String[] env = calcEnvironment(builder);
String[] buildArguments = targets;
// if (builder.isDefaultBuildCmd()) {
// if (!builder.isStopOnError()) {
// buildArguments = new String[targets.length + 1];
// buildArguments[0] = "-k"; //$NON-NLS-1$
// System.arraycopy(targets, 0, buildArguments, 1, targets.length);
// }
// } else {
String args = builder.getBuildArguments();
if (args != null && !(args = args.trim()).equals("")) { //$NON-NLS-1$
String[] newArgs = makeArray(args);
buildArguments = new String[targets.length + newArgs.length];
System.arraycopy(newArgs, 0, buildArguments, 0, newArgs.length);
System.arraycopy(targets, 0, buildArguments, newArgs.length, targets.length);
}
// }
String[] newArgs = argumentsToArray(builder.getBuildArguments());
buildArguments = new String[targets.length + newArgs.length];
System.arraycopy(newArgs, 0, buildArguments, 0, newArgs.length);
System.arraycopy(targets, 0, buildArguments, newArgs.length, targets.length);
// MakeRecon recon = new MakeRecon(buildCommand, buildArguments, env, workingDirectory, makeMonitor, cos);
// recon.invokeMakeRecon();
// cos = recon;
@ -2060,50 +2052,19 @@ public class CommonBuilder extends ACBuilder {
break;
}
targetsArray = makeArray(targets);
targetsArray = argumentsToArray(targets);
}
return targetsArray;
}
// Turn the string into an array.
private String[] makeArray(String string) {
string = string.trim();
char[] array = string.toCharArray();
ArrayList<String> aList = new ArrayList<String>();
StringBuilder buffer = new StringBuilder();
boolean inComment = false;
for (int i = 0; i < array.length; i++) {
char c = array[i];
boolean needsToAdd = true;
if (array[i] == '"' || array[i] == '\'') {
if (i > 0 && array[i - 1] == '\\') {
inComment = false;
} else {
inComment = !inComment;
needsToAdd = false; // skip it
}
}
if (c == ' ' && !inComment) {
if (buffer.length() > 0){
String str = buffer.toString().trim();
if(str.length() > 0){
aList.add(str);
}
}
buffer = new StringBuilder();
} else {
if (needsToAdd)
buffer.append(c);
}
}
if (buffer.length() > 0){
String str = buffer.toString().trim();
if(str.length() > 0){
aList.add(str);
}
}
return aList.toArray(new String[aList.size()]);
/**
* Parsing arguments in a shell style
* @param builder
* @return
*/
private String[] argumentsToArray(String args) {
return CommandLineUtil.argumentsToArray(args);
}
private void removeAllMarkers(IProject currProject) throws CoreException {

152
core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/CommandLineUtilTest.java Normal file
View file

@ -0,0 +1,152 @@
package org.eclipse.cdt.utils;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class CommandLineUtilTest extends TestCase {
public static Test suite() {
return new TestSuite(CommandLineUtilTest.class);
}
public void testArgumentsToArraySimple() {
// [A=B C]
String[] args = CommandLineUtil.argumentsToArray("A=B C");
assertEquals(2, args.length);
assertEquals("A=B", args[0]);
assertEquals("C", args[1]);
}
public void testArgumentsToArraySpaces() {
// [A=B C]
String[] args = CommandLineUtil.argumentsToArray("A=B C");
assertEquals(2, args.length);
assertEquals("A=B", args[0]);
assertEquals("C", args[1]);
}
public void testArgumentsToArraySpaces2() {
// [ A=B C ]
String[] args = CommandLineUtil.argumentsToArray(" A=B C ");
assertEquals(2, args.length);
assertEquals("A=B", args[0]);
assertEquals("C", args[1]);
}
public void testArgumentsToArrayDoubleQuotes() {
// [Arg="a b c"]
String[] args = CommandLineUtil.argumentsToArray("Arg=\"a b c\"");
assertEquals(1, args.length);
assertEquals("Arg=a b c", args[0]);
}
public void testArgumentsToArrayDoubleQuotes2() {
// [Arg="\"quoted\""]
String[] args = CommandLineUtil.argumentsToArray("Arg=\"\\\"quoted\\\"\"");
assertEquals(1, args.length);
assertEquals("Arg=\"quoted\"", args[0]);
}
public void testArgumentsToArraySingleQuotes() {
// [Arg='"quoted"']
String[] args = CommandLineUtil.argumentsToArray("Arg='\"quoted\"'");
assertEquals(1, args.length);
assertEquals("Arg=\"quoted\"", args[0]);
}
public void testArgumentsToArrayQuote() {
// [\"]
String[] args = CommandLineUtil.argumentsToArray("\\\"");
assertEquals(1, args.length);
assertEquals("\"", args[0]);
}
public void testArgumentsToArrayQuotSpaces() {
// [ \"]
String[] args = CommandLineUtil.argumentsToArray(" \\\"");
assertEquals(1, args.length);
assertEquals("\"", args[0]);
}
public void testArgumentsToArrayOnlySpaces() {
// [" "]
String[] args = CommandLineUtil.argumentsToArray("\" \"");
assertEquals(1, args.length);
assertEquals(" ", args[0]);
}
public void testArgumentsToArrayJumbledString() {
// ["a b"-c]
String[] args = CommandLineUtil.argumentsToArray("\"a b\"-c");
assertEquals(1, args.length);
assertEquals("a b-c", args[0]);
}
public void testArgumentsToArrayJumbledString2() {
// [x "a b"-c]
String[] args = CommandLineUtil.argumentsToArray(" x \"a b\"-c");
assertEquals(2, args.length);
assertEquals("x", args[0]);
assertEquals("a b-c", args[1]);
}
public void testArgumentsToArrayJumbledSQ() {
// [x' 'x y]
String[] args = CommandLineUtil.argumentsToArray("x' 'x y");
assertEquals(2, args.length);
assertEquals("x x", args[0]);
assertEquals("y", args[1]);
}
public void testArgumentsToArrayEmptyString() {
// [""]
String[] args = CommandLineUtil.argumentsToArray("\"\"");
assertEquals(1, args.length);
assertEquals("", args[0]);
}
public void testArgumentsToArrayEmptyString2() {
// ['']
String[] args = CommandLineUtil.argumentsToArray("''");
assertEquals(1, args.length);
assertEquals("", args[0]);
}
public void testArgumentsToArrayEmpty3() {
// ['' a]
String[] args = CommandLineUtil.argumentsToArray("'' a");
assertEquals(2, args.length);
assertEquals("", args[0]);
assertEquals("a", args[1]);
}
public void testArgumentsToArrayQuot1() {
// ['"']
String[] args = CommandLineUtil.argumentsToArray("'\"'");
assertEquals(1, args.length);
assertEquals("\"", args[0]);
}
public void testArgumentsToArrayQuot2() {
// ["\""]
String[] args = CommandLineUtil.argumentsToArray("\"\\\"\"");
assertEquals(1, args.length);
assertEquals("\"", args[0]);
}
public void testArgumentsToArrayNull() {
// []
String[] args = CommandLineUtil.argumentsToArray(null);
assertEquals(0, args.length);
}
public void testArgumentsToArrayEmpty() {
// []
String[] args = CommandLineUtil.argumentsToArray("");
assertEquals(0, args.length);
}
public void testArgumentsToArrayEmptySpaces() {
// [ ]
String[] args = CommandLineUtil.argumentsToArray(" ");
assertEquals(0, args.length);
}
}

3
core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
View file

@ -30,6 +30,8 @@ import org.eclipse.cdt.core.parser.tests.rewrite.RewriteTests;
import org.eclipse.cdt.core.tests.templateengine.AllTemplateEngineTests;
import org.eclipse.cdt.internal.index.tests.IndexTests;
import org.eclipse.cdt.internal.pdom.tests.PDOMTests;
import org.eclipse.cdt.utils.CommandLineUtil;
import org.eclipse.cdt.utils.CommandLineUtilTest;
/**
* @author vhirsl
@ -66,6 +68,7 @@ public class AutomatedIntegrationSuite extends TestSuite {
suite.addTest(StringBuilderTest.suite());
suite.addTest(AllLanguageTests.suite());
suite.addTest(RewriteTests.suite());
suite.addTest(CommandLineUtilTest.suite());
// Add in PDOM tests
suite.addTest(PDOMTests.suite());

122
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/CommandLineUtil.java Normal file
View file

@ -0,0 +1,122 @@
package org.eclipse.cdt.utils;
import java.util.ArrayList;
/**
* Utils to work with command line, parse arguments, etc.
* @since 5.1
*/
public class CommandLineUtil {
/**
* Parsing arguments in a shell style.
* i.e.
* <code>
* ["a b c" d] -> [[a b c],[d]]
* [a d] -> [[a],[d]]
* ['"quoted"'] -> [["quoted"]]
* [\\ \" \a] -> [[\],["],[a]]
* ["str\\str\a"] -> [[str\str\a]]
* </code>
* @param line
* @return array of arguments, or empty array if line is null or empty
*/
public static String[] argumentsToArray(String line) {
final int INITIAL = 0;
final int IN_DOUBLE_QUOTES = 1;
final int IN_DOUBLE_QUOTES_ESCAPED = 2;
final int ESCAPED = 3;
final int IN_SINGLE_QUOTES = 4;
final int IN_ARG = 5;
if (line == null) {
line = ""; //$NON-NLS-1$
}
char[] array = line.trim().toCharArray();
ArrayList<String> aList = new ArrayList<String>();
StringBuilder buffer = new StringBuilder();
int state = INITIAL;
for (int i = 0; i < array.length; i++) {
char c = array[i];
switch (state) {
case IN_ARG:
// fall through
case INITIAL:
switch (c) {
case ' ':
if (state == INITIAL) break; // ignore extra spaces
// add argument
state = INITIAL;
String arg = buffer.toString();
buffer = new StringBuilder();
aList.add(arg);
break;
case '\\':
state = ESCAPED;
break;
case '\'':
state = IN_SINGLE_QUOTES;
break;
case '\"':
state = IN_DOUBLE_QUOTES;
break;
default:
state = IN_ARG;
buffer.append(c);
break;
}
break;
case IN_DOUBLE_QUOTES:
switch (c) {
case '\\':
state = IN_DOUBLE_QUOTES_ESCAPED;
break;
case '\"':
state = IN_ARG;
break;
default:
buffer.append(c);
break;
}
break;
case IN_SINGLE_QUOTES:
switch (c) {
case '\'':
state = IN_ARG;
break;
default:
buffer.append(c);
break;
}
break;
case IN_DOUBLE_QUOTES_ESCAPED:
switch (c) {
case '\"':
case '\\':
buffer.append(c);
break;
case 'n':
buffer.append('\n');
break;
default:
buffer.append('\\');
buffer.append(c);
break;
}
state = IN_DOUBLE_QUOTES;
break;
case ESCAPED:
buffer.append(c);
state = IN_ARG;
break;
}
}
if (state!=INITIAL) { // this allow to process empty string as an argument
aList.add(buffer.toString());
}
return aList.toArray(new String[aList.size()]);
}
}