Work on the parser.

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MICommand.java

@@ -89,7 +89,14 @@ public class MICommand extends Command
 				command += " --";
 			}
 			for (int i = 0; i < parameters.length; i++) {
-				command += " " + parameters[i];
+				if (parameters[i].indexOf('-') != -1 ||
+				    parameters[i].indexOf('\n') != -1 ||
+				    parameters[i].indexOf('\"') != -1||
+				    parameters[i].indexOf(' ') != -1) {
+					command += " \"" + parameters[i] + "\"";
+				} else {
+					command += " \"" + parameters[i] + "\"";
+				}
 			}
 		}
 		return command + "\n";

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java

@@ -2,18 +2,13 @@ package org.eclipse.cdt.debug.mi.core.output;
 
 /**
  */
-public class MIAsyncRecord extends MIOOBRecord {
+public abstract class MIAsyncRecord extends MIOOBRecord {
-
-	public final static int EXEC_ASYNC = 0;
-	public final static int STATUS_ASYNC = 1;
-	public final static int NOTIFY_ASYNC = 2;
 
 	final static MIResult[] nullResults = new MIResult[0];
 
 	MIResult[] results = null;
 	String asynClass = "";
 	int token = -1;
-	int type = 0;
 
 	public int getToken() {
 		return token;
@@ -23,15 +18,6 @@ public class MIAsyncRecord extends MIOOBRecord {
 		token = t;
 	}
 
-	public int getType() {
-		return type;
-	}
-
-	public void setType(int t) {
-		type = t;
-	}
-
-
 	public String getAsyncClass() {
 		return asynClass;
 	}
@@ -40,14 +26,14 @@ public class MIAsyncRecord extends MIOOBRecord {
 		asynClass = a;
 	}
 
-	public MIResult[] getResults() {
+	public MIResult[] getMIResults() {
 		if (results == null) {
 			return nullResults;
 		}
 		return results;
 	}
 
-	public void setResults(MIResult[] res) {
+	public void setMIResults(MIResult[] res) {
 		results = res;
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIConst.java

@@ -1,13 +1,15 @@
 package org.eclipse.cdt.debug.mi.core.output;
 
 /**
- * @author alain
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
  */
 public class MIConst extends MIValue {
+	String cstring = "";
 
+	public String getCString() {
+		return cstring;
+	}
+
+	public void setCString(String str) {
+		cstring = str;
+	}
 }

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIList.java

@@ -1,13 +1,34 @@
 package org.eclipse.cdt.debug.mi.core.output;
 
 /**
- * @author alain
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
  */
 public class MIList extends MIValue {
 
+	final static MIResult[] nullResults = new MIResult[0];
+	final static MIValue[] nullValues = new MIValue[0];
+
+	MIResult[] results;
+	MIValue[] values;
+
+	public MIResult[] getMIResults() {
+		if (results == null) {
+			return nullResults;
+		}
+		return results;
+	}
+
+	public void setMIResults(MIResult[] res) {
+		results = res;
+	}
+
+	public MIValue[] getMIValues() {
+		if (values == null) {
+			return nullValues;
+		}
+		return values;
+	}
+
+	public void setMIValues(MIValue[] vals) {
+		values = vals;
+	}
 }

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIParser.java

@@ -6,9 +6,84 @@ import java.util.StringTokenizer;
 
 
 /**
+<pre>
+`OUTPUT ==>'
+     `( OUT-OF-BAND-RECORD )* [ RESULT-RECORD ] "(gdb)" NL'
+
+`RESULT-RECORD ==>'
+     ` [ TOKEN ] "^" RESULT-CLASS ( "," RESULT )* NL'
+
+`OUT-OF-BAND-RECORD ==>'
+     `ASYNC-RECORD | STREAM-RECORD'
+
+`ASYNC-RECORD ==>'
+     `EXEC-ASYNC-OUTPUT | STATUS-ASYNC-OUTPUT | NOTIFY-ASYNC-OUTPUT'
+
+`EXEC-ASYNC-OUTPUT ==>'
+     `[ TOKEN ] "*" ASYNC-OUTPUT'
+
+`STATUS-ASYNC-OUTPUT ==>'
+     `[ TOKEN ] "+" ASYNC-OUTPUT'
+
+`NOTIFY-ASYNC-OUTPUT ==>'
+     `[ TOKEN ] "=" ASYNC-OUTPUT'
+
+`ASYNC-OUTPUT ==>'
+     `ASYNC-CLASS ( "," RESULT )* NL'
+
+`RESULT-CLASS ==>'
+     `"done" | "running" | "connected" | "error" | "exit"'
+
+`ASYNC-CLASS ==>'
+     `"stopped" | OTHERS' (where OTHERS will be added depending on the
+     needs--this is still in development).
+
+`RESULT ==>'
+     ` VARIABLE "=" VALUE'
+
+`VARIABLE ==>'
+     ` STRING '
+
+`VALUE ==>'
+     ` CONST | TUPLE | LIST '
+
+`CONST ==>'
+     `C-STRING'
+
+`TUPLE ==>'
+     ` "{}" | "{" RESULT ( "," RESULT )* "}" '
+
+`LIST ==>'
+     ` "[]" | "[" VALUE ( "," VALUE )* "]" | "[" RESULT ( "," RESULT )*
+     "]" '
+
+`STREAM-RECORD ==>'
+     `CONSOLE-STREAM-OUTPUT | TARGET-STREAM-OUTPUT | LOG-STREAM-OUTPUT'
+
+`CONSOLE-STREAM-OUTPUT ==>'
+     `"~" C-STRING'
+
+`TARGET-STREAM-OUTPUT ==>'
+     `"@" C-STRING'
+
+`LOG-STREAM-OUTPUT ==>'
+     `"&" C-STRING'
+
+`NL ==>'
+     `CR | CR-LF'
+
+`TOKEN ==>'
+     _any sequence of digits_.
+
+`C-STRING ==>'
+     `""" SEVEN-BIT-ISO-C-STRING-CONTENT """'
+</pre>
  */
 public class MIParser {
 
+	/**
+	 * Construct the AST for MI.
+	 */
 	public MIOutput parse(String buffer) {
 		MIOutput mi = new MIOutput();
 		MIResultRecord rr = null;
@@ -33,12 +108,13 @@ public class MIParser {
 				token = token.substring(i);
 			}
 
+			// Process ResultRecord | Out-Of-Band Records
 			if (token.charAt(0) == '^') {
 					rr = processMIResultRecord(token.substring(1), id);
 			} else {
-					MIOOBRecord br = processMIOOBRecord(token.substring(1), id);
+					MIOOBRecord band = processMIOOBRecord(token.substring(1), id);
-					if (br != null) {
+					if (band != null) {
-						oobs.add(br);
+						oobs.add(band);
 					}
 			}
 		}
@@ -51,23 +127,29 @@ public class MIParser {
 	MIResultRecord processMIResultRecord(String buffer, int id) {
 		MIResultRecord rr = new MIResultRecord();
 		rr.setToken(id);
-		if (buffer.startsWith("done")) {
+		if (buffer.startsWith(MIResultRecord.DONE)) {
-			rr.setResultClass("done");
+			rr.setResultClass(MIResultRecord.DONE);
-		} else if (buffer.startsWith("error")) {
+			buffer = buffer.substring(MIResultRecord.DONE.length());
-			rr.setResultClass("error");
+		} else if (buffer.startsWith(MIResultRecord.ERROR)) {
-		} else if (buffer.startsWith("exit")) {
+			rr.setResultClass(MIResultRecord.ERROR);
-			rr.setResultClass("exit");
+			buffer = buffer.substring(MIResultRecord.ERROR.length());
-		} else if (buffer.startsWith("running")) {
+		} else if (buffer.startsWith(MIResultRecord.EXIT)) {
-			rr.setResultClass("running");
+			rr.setResultClass(MIResultRecord.EXIT);
-		} else if (buffer.startsWith("connected")) {
+			buffer = buffer.substring(MIResultRecord.EXIT.length());
-			rr.setResultClass("connected");
+		} else if (buffer.startsWith(MIResultRecord.RUNNING)) {
+			rr.setResultClass(MIResultRecord.RUNNING);
+			buffer = buffer.substring(MIResultRecord.RUNNING.length());
+		} else if (buffer.startsWith(MIResultRecord.CONNECTED)) {
+			rr.setResultClass(MIResultRecord.CONNECTED);
+			buffer = buffer.substring(MIResultRecord.CONNECTED.length());
 		} else {
 			// FIXME:
 			// Error throw an exception?
 		}
-		int i = buffer.indexOf( ',' );
+
-		if (i != -1) {
+		// Results are separated by commas.
-			String s = buffer.substring(i + 1);
+		if (buffer.charAt(0) == ',') {
+			String s = buffer.substring(1);
 			MIResult[] res = processMIResults(s);
 			rr.setResults(res);
 		}
@@ -75,10 +157,175 @@ public class MIParser {
 	}
 
 	MIOOBRecord processMIOOBRecord(String buffer, int id) {
-		return null;
+		MIOOBRecord oob = null;
+		char c = buffer.charAt(0);
+		if (c == '*' || c == '+' || c == '=') {
+			MIAsyncRecord async = null;
+			switch (c) {
+				case '*':
+					async = new MIExecAsyncOutput();
+				break;
+
+				case '+':
+					async = new MIStatusAsyncOutput();
+				break;
+
+				case '=':
+					async = new MINotifyAsyncOutput();
+				break;
+			}
+			async.setToken(id);
+			// Extract the Async-Class
+			int i = buffer.indexOf(',');
+			if (i != -1) {
+				String asyncClass = buffer.substring(1, i);
+				async.setAsyncClass(asyncClass);
+				buffer = buffer.substring(i + 1);
+			}
+			MIResult[] res = processMIResults(buffer);
+			async.setMIResults(res);
+			oob = async;
+		} else if (c == '~' || c == '@' || c == '&') {
+			MIStreamRecord stream = null;
+			switch (c) {
+				case '~':
+					stream = new MIConsoleStreamOutput();
+				break;
+
+				case '@':
+					stream = new MITargetStreamOutput();
+				break;
+
+				case '&':
+					stream = new MILogStreamOutput();
+				break;
+			}
+			stream.setCString(translate (new StringBuffer(buffer.substring(1))));
+			oob = stream;
+		}
+		return oob;
 	}
 
+	
 	MIResult[] processMIResults(String buffer) {
-		return new MIResult[0];
+		List aList = new ArrayList();
+		StringBuffer sb = new StringBuffer(buffer);
+		MIResult result = processMIResult(sb);
+		if (result != null) {
+			aList.add(result);
+		}
+		while (sb.length() > 0 && sb.charAt(0) == ',') {
+			sb.deleteCharAt(0);
+			result = processMIResult(sb);
+			if (result != null) {
+				aList.add(result);
+			}
+		}
+		return (MIResult[])aList.toArray(new MIResult[aList.size()]);
+	}
+
+	MIResult processMIResult(StringBuffer sb) {
+		MIResult result = new MIResult();
+		String buffer = sb.toString();
+		int equal;
+		if (Character.isLetter(buffer.charAt(0)) &&
+		    (equal = buffer.indexOf('=')) != -1) {
+			String variable = buffer.substring(0, equal);
+			result.setVariable(variable);
+			sb.delete(0, equal + 1);
+			MIValue value = processMIValue(sb);
+			result.setMIValue(value);
+		} else {
+			result.setVariable(buffer);
+			sb.setLength(0);
+		}
+		return result;
+	}
+
+	MIValue processMIValue(StringBuffer sb) {
+		MIValue value = null;
+		if (sb.charAt(0) == '{') {
+			sb.deleteCharAt(0);
+			value = processMITuple(sb);
+		} else if (sb.charAt(0) == '[') {
+			sb.deleteCharAt(0);
+			value = processMIList(sb);
+		} else if (sb.charAt(0) == '"') {
+			sb.deleteCharAt(0);
+			MIConst cnst = new MIConst();
+			cnst.setCString(translate(sb));
+			value = cnst;
+		}
+		return value;
+	}
+	
+	MIValue processMITuple(StringBuffer sb) {
+		MITuple tuple = new MITuple();
+		List aList = new ArrayList(1);
+		// Catch closing '}'
+		while (sb.length() > 0 && sb.charAt(0) != '}') {
+			MIResult res = processMIResult(sb);
+			if (res != null) {
+				aList.add(res);
+			}
+		}
+		MIResult[] results = (MIResult[])aList.toArray(new MIResult[aList.size()]);
+		tuple.setMIResults(results);
+		return tuple;
+	}
+	
+	MIValue processMIList(StringBuffer sb) {
+		// catch closing ']'
+		return new MIList();
+	}
+
+	// FIXME: TODO
+	// FIXME: Side effect in the loop
+	// FIXME: Deal with <repeat>
+	String translate(StringBuffer sb) {
+		boolean escape = false;
+		boolean quoteFound = false;
+		for (int i = 0; i < sb.length() || quoteFound; i++) {
+			switch (sb.charAt(i)) {
+				case '\\':
+					if (escape) {
+						sb.deleteCharAt(i - 1);
+						escape = false;
+					} else {
+						escape = true;
+					}
+					break;
+
+				case 'n':
+					if (escape) {
+						sb.setCharAt(i, '\n');
+						sb.deleteCharAt(i - 1);
+						escape = false;
+					}
+				break;
+
+				case 'r':
+					if (escape) {
+						sb.setCharAt(i, '\n');
+						sb.deleteCharAt(i - 1);
+						escape = false;
+					}
+				break;
+
+				case '"':
+					if (escape) {
+						sb.setCharAt(i, '"');
+						sb.deleteCharAt(i - 1);
+						escape = false;
+					} else {
+						quoteFound = true;
+					}
+				break;
+
+				default:
+					escape = false;
+			}
+		}
+		return sb.toString();
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIResult.java

@@ -1,13 +1,24 @@
 package org.eclipse.cdt.debug.mi.core.output;
 
 /**
- * @author alain
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
  */
-public abstract class MIResult {
+public class MIResult {
-	public abstract boolean interpret();
+	String variable = "";
+	MIValue value = null;
+		
+	public String getVariable() {
+		return variable;
+	}
+	
+	public void setVariable(String var) {
+		variable = var;
+	}
+
+	public MIValue getMIValue() {
+		return value;
+	}
+	
+	public void setMIValue(MIValue val) {
+		value = val;
+	}
 }

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java

@@ -4,7 +4,13 @@ package org.eclipse.cdt.debug.mi.core.output;
  */
 public class MIResultRecord {
 
-	public static final MIResult[] nullResults = new MIResult[0];
+	public final static String DONE ="done";
+	public final static String RUNNING ="running";
+	public final static String CONNECTED ="connected";
+	public final static String ERROR ="error";
+	public final static String EXIT ="exit";
+
+	static final MIResult[] nullResults = new MIResult[0];
 	MIResult[] results = null;
 	String resultClass = "";
 	int token = -1;

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java

@@ -2,5 +2,15 @@ package org.eclipse.cdt.debug.mi.core.output;
 
 /**
  */
-public class MIStreamRecord extends MIOOBRecord {
+public abstract class MIStreamRecord extends MIOOBRecord {
+
+	String cstring = "";
+
+	public String getCString() {
+		return cstring;
+	} 
+
+	public void setCString(String str) {
+		cstring = str;
+	} 
 }

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MITuple.java

@@ -1,13 +1,20 @@
 package org.eclipse.cdt.debug.mi.core.output;
 
 /**
- * @author alain
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
  */
 public class MITuple extends MIValue {
 
+	final static MIResult[] nullResults = new MIResult[0];
+	MIResult[] results = null;
+
+	public MIResult[] getMIResults() {
+		if (results == null) {
+			return nullResults;
+		}
+		return results;
+	}
+
+	public void setMIResults(MIResult[] res) {
+		results = res;
+	}
 }

debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIValue.java

@@ -8,6 +8,5 @@ package org.eclipse.cdt.debug.mi.core.output;
  * To enable and disable the creation of type comments go to
  * Window>Preferences>Java>Code Generation.
  */
-public class MIValue {
+public abstract class MIValue {
-
 }