mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-09-10 12:03:16 +02:00
Bug 250037 - Debug value view fails to update 'Value' column. Patch for CDI.
This commit is contained in:
Mikhail Khodjaiants
parent
7a66e99871
commit
58eec98b25
3 changed files with 189 additions and 0 deletions
|
|
@ -0,0 +1,47 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2006 QNX Software Systems and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* QNX Software Systems - Initial API and implementation
|
||||
* Marc-Andre Laperle - patch for bug #250037
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.mi.core.command.factories.macos;
|
||||
|
||||
import org.eclipse.cdt.debug.mi.core.MIException;
|
||||
import org.eclipse.cdt.debug.mi.core.command.MIVarUpdate;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIOutput;
|
||||
|
||||
/**
|
||||
*@see MIVarUpdate
|
||||
*
|
||||
* Apple gdb needs special handling for MIVarUpdateInfo so we need this class
|
||||
* to override getMIInfo to return a MacOSMIVarUpdateInfo instead
|
||||
*/
|
||||
class MacOSMIVarUpdate extends MIVarUpdate {
|
||||
|
||||
public MacOSMIVarUpdate(String miVersion) {
|
||||
super(miVersion);
|
||||
}
|
||||
|
||||
public MacOSMIVarUpdate(String miVersion, String name) {
|
||||
super(miVersion, name);
|
||||
}
|
||||
|
||||
public MIInfo getMIInfo() throws MIException {
|
||||
MIInfo info = null;
|
||||
MIOutput out = getMIOutput();
|
||||
if (out != null) {
|
||||
info = new MacOSMIVarUpdateInfo(out);
|
||||
if (info.isError()) {
|
||||
throwMIException(info, out);
|
||||
}
|
||||
}
|
||||
return info;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,131 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2006 QNX Software Systems and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* QNX Software Systems - Initial API and implementation
|
||||
* Marc-Andre Laperle - patch for bug #250037
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.mi.core.command.factories.macos;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIConst;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIList;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIOutput;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIResult;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIResultRecord;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MITuple;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIValue;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIVarChange;
|
||||
import org.eclipse.cdt.debug.mi.core.output.MIVarUpdateInfo;
|
||||
|
||||
/**
|
||||
* GDB/MI var-update for Apple gdb
|
||||
* -var-update *
|
||||
* ^done,changelist=[varobj={name="var1",in_scope="true",type_changed="false"}],time={.....}
|
||||
*/
|
||||
class MacOSMIVarUpdateInfo extends MIVarUpdateInfo {
|
||||
|
||||
MIVarChange[] changeList;
|
||||
|
||||
public MacOSMIVarUpdateInfo(MIOutput record) {
|
||||
super(record);
|
||||
parse();
|
||||
}
|
||||
|
||||
public MIVarChange[] getMIVarChanges() {
|
||||
return changeList;
|
||||
}
|
||||
|
||||
void parse() {
|
||||
List aList = new ArrayList();
|
||||
if (isDone()) {
|
||||
MIOutput out = getMIOutput();
|
||||
MIResultRecord rr = out.getMIResultRecord();
|
||||
if (rr != null) {
|
||||
MIResult[] results = rr.getMIResults();
|
||||
for (int i = 0; i < results.length; i++) {
|
||||
String var = results[i].getVariable();
|
||||
if (var.equals("changelist")) { //$NON-NLS-1$
|
||||
MIValue value = results[i].getMIValue();
|
||||
if (value instanceof MITuple) {
|
||||
parseChangeList((MITuple)value, aList);
|
||||
} else if (value instanceof MIList) {
|
||||
parseChangeList((MIList)value, aList);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
changeList = (MIVarChange[])aList.toArray(new MIVarChange[aList.size()]);
|
||||
}
|
||||
|
||||
/**
|
||||
* For MI2 the format is now a MIList.
|
||||
* @param tuple
|
||||
* @param aList
|
||||
*/
|
||||
void parseChangeList(MIList miList, List aList) {
|
||||
MIValue[] values = miList.getMIValues();
|
||||
for (int i = 0; i < values.length; ++i) {
|
||||
if (values[i] instanceof MITuple) {
|
||||
parseChangeList((MITuple)values[i], aList);
|
||||
} else if (values[i] instanceof MIList) {
|
||||
parseChangeList((MIList)values[i], aList);
|
||||
}
|
||||
}
|
||||
|
||||
// The MIList in Apple gdb contains MIResults instead of MIValues. It looks like:
|
||||
// ^done,changelist=[varobj={name="var1",in_scope="true",type_changed="false"}],time={.....}
|
||||
// Bug 250037
|
||||
MIResult[] results = miList.getMIResults();
|
||||
for (int i = 0; i < results.length; i++) {
|
||||
String var = results[i].getVariable();
|
||||
if (var.equals("varobj")) { //$NON-NLS-1$
|
||||
MIValue value = results[i].getMIValue();
|
||||
if (value instanceof MITuple) {
|
||||
parseChangeList((MITuple) value, aList);
|
||||
} else if (value instanceof MIList) {
|
||||
parseChangeList((MIList) value, aList);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void parseChangeList(MITuple tuple, List aList) {
|
||||
MIResult[] results = tuple.getMIResults();
|
||||
MIVarChange change = null;
|
||||
for (int i = 0; i < results.length; i++) {
|
||||
String var = results[i].getVariable();
|
||||
MIValue value = results[i].getMIValue();
|
||||
if (value instanceof MITuple) {
|
||||
parseChangeList((MITuple)value, aList);
|
||||
}
|
||||
else
|
||||
{
|
||||
String str = ""; //$NON-NLS-1$
|
||||
if (value instanceof MIConst) {
|
||||
str = ((MIConst)value).getString();
|
||||
}
|
||||
if (var.equals("name")) { //$NON-NLS-1$
|
||||
change = new MIVarChange(str);
|
||||
aList.add(change);
|
||||
} else if (var.equals("in_scope")) { //$NON-NLS-1$
|
||||
if (change != null) {
|
||||
change.setInScope("true".equals(str)); //$NON-NLS-1$
|
||||
}
|
||||
} else if (var.equals("type_changed")) { //$NON-NLS-1$
|
||||
if (change != null) {
|
||||
change.setChanged("true".equals(str)); //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
*
|
||||
* Contributors:
|
||||
* Nokia - Initial API and implementation
|
||||
* Marc-Andre Laperle - patch for bug #250037
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.mi.core.command.factories.macos;
|
||||
|
||||
|
|
@ -14,6 +15,7 @@ import java.io.File;
|
|||
|
||||
import org.eclipse.cdt.debug.mi.core.command.MIEnvironmentCD;
|
||||
import org.eclipse.cdt.debug.mi.core.command.MIInfoSharedLibrary;
|
||||
import org.eclipse.cdt.debug.mi.core.command.MIVarUpdate;
|
||||
import org.eclipse.cdt.debug.mi.core.command.factories.StandardCommandFactory;
|
||||
|
||||
public class StandardMacOSCommandFactory extends StandardCommandFactory {
|
||||
|
|
@ -44,4 +46,13 @@ public class StandardMacOSCommandFactory extends StandardCommandFactory {
|
|||
return new MIInfoSharedLibrary(getMIVersion());
|
||||
}
|
||||
|
||||
public MIVarUpdate createMIVarUpdate() {
|
||||
return new MacOSMIVarUpdate(getMIVersion());
|
||||
}
|
||||
|
||||
public MIVarUpdate createMIVarUpdate(String name) {
|
||||
return new MacOSMIVarUpdate(getMIVersion(), name);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue