From 052b582c1989569b9494ed9fb933b27a009353f0 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 19 Nov 2004 03:38:57 +0000 Subject: [PATCH] 2004-11-19 Alain Magloire No need for stackframe when creating the Type class, but rather use the target in the constructor. --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 4 + .../debug/mi/core/cdi/FunctionFinished.java | 4 +- .../cdt/debug/mi/core/cdi/SourceManager.java | 103 +++++++++--------- .../debug/mi/core/cdi/VariableManager.java | 8 +- .../debug/mi/core/cdi/model/Expression.java | 14 +-- .../mi/core/cdi/model/VariableDescriptor.java | 34 +++--- .../mi/core/cdi/model/type/AggregateType.java | 6 +- .../mi/core/cdi/model/type/ArrayType.java | 6 +- .../mi/core/cdi/model/type/BoolType.java | 10 +- .../mi/core/cdi/model/type/CharType.java | 10 +- .../mi/core/cdi/model/type/DerivedType.java | 13 +-- .../mi/core/cdi/model/type/DoubleType.java | 10 +- .../mi/core/cdi/model/type/EnumType.java | 10 +- .../mi/core/cdi/model/type/FloatType.java | 10 +- .../cdi/model/type/FloatingPointType.java | 6 +- .../mi/core/cdi/model/type/FunctionType.java | 6 +- .../core/cdi/model/type/IncompleteType.java | 6 +- .../debug/mi/core/cdi/model/type/IntType.java | 10 +- .../mi/core/cdi/model/type/IntegralType.java | 6 +- .../mi/core/cdi/model/type/LongLongType.java | 10 +- .../mi/core/cdi/model/type/LongType.java | 10 +- .../mi/core/cdi/model/type/PointerType.java | 6 +- .../mi/core/cdi/model/type/ReferenceType.java | 6 +- .../mi/core/cdi/model/type/ShortType.java | 10 +- .../mi/core/cdi/model/type/StructType.java | 6 +- .../debug/mi/core/cdi/model/type/Type.java | 12 +- .../mi/core/cdi/model/type/VoidType.java | 10 +- .../mi/core/cdi/model/type/WCharType.java | 10 +- 28 files changed, 180 insertions(+), 176 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index ffbedea4fb6..821e1c4aacf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,7 @@ +2004-11-19 Alain Magloire + No need for stackframe when creating the Type class, + but rather use the target in the constructor. + 2004-11-19 Alain Magloire Fix for 78816 * src/org/eclipse/cdt/debug/mi/core/MIPlugin.java diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java index e39c40370aa..fe6d5c87b96 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java @@ -42,14 +42,12 @@ public class FunctionFinished extends EndSteppingRange implements ICDIFunctionFi public ICDIType getReturnType() throws CDIException { Session session = (Session)getSession(); Target target = session.getTarget(fMIEvent.getMISession()); - Thread thread = (Thread)target.getCurrentThread(); - StackFrame frame = thread.getCurrentStackFrame(); String rType = fMIEvent.getReturnType(); if (rType == null || rType.length() == 0) { throw new CDIException(CdiResources.getString("cdi.VariableManager.Unknown_type")); //$NON-NLS-1$ } SourceManager srcMgr = session.getSourceManager(); - return srcMgr.getType(frame, rType); + return srcMgr.getType(target, rType); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java index de6e195c0df..135306480e3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java @@ -183,7 +183,7 @@ public class SourceManager extends Manager { public void update(Target target) throws CDIException { } - public Type getType(StackFrame frame, String name) throws CDIException { + public Type getType(Target target, String name) throws CDIException { if (name == null) { name = new String(); } @@ -201,21 +201,21 @@ public class SourceManager extends Manager { switch(gdbType.getType()) { case GDBType.ARRAY: int d = ((GDBDerivedType)gdbType).getDimension(); - aType = new ArrayType(frame, gdbType.toString(), d); + aType = new ArrayType(target, gdbType.toString(), d); break; case GDBType.FUNCTION: - aType = new FunctionType(frame, gdbType.toString()); + aType = new FunctionType(target, gdbType.toString()); break; case GDBType.POINTER: - aType = new PointerType(frame, gdbType.toString()); + aType = new PointerType(target, gdbType.toString()); break; case GDBType.REFERENCE: - aType = new ReferenceType(frame, gdbType.toString()); + aType = new ReferenceType(target, gdbType.toString()); break; } gdbType = ((GDBDerivedType)gdbType).getChild(); } else { - aType = toCDIType(frame, gdbType.toString()); + aType = toCDIType(target, gdbType.toString()); gdbType = null; } if (type instanceof DerivedType) { @@ -233,7 +233,7 @@ public class SourceManager extends Manager { throw new CDIException(CdiResources.getString("cdi.SourceManager.Unknown_type")); //$NON-NLS-1$ } - Type toCDIType(StackFrame frame, String name) throws CDIException { + Type toCDIType(Target target, String name) throws CDIException { // Check the derived types and agregate types if (name == null) { name = new String(); @@ -242,50 +242,50 @@ public class SourceManager extends Manager { // Check the primitives. if (typename.equals("char")) { //$NON-NLS-1$ - return new CharType(frame, typename); + return new CharType(target, typename); } else if (typename.equals("wchar_t")) { //$NON-NLS-1$ - return new WCharType(frame, typename); + return new WCharType(target, typename); } else if (typename.equals("short")) { //$NON-NLS-1$ - return new ShortType(frame, typename); + return new ShortType(target, typename); } else if (typename.equals("int")) { //$NON-NLS-1$ - return new IntType(frame, typename); + return new IntType(target, typename); } else if (typename.equals("long")) { //$NON-NLS-1$ - return new LongType(frame, typename); + return new LongType(target, typename); } else if (typename.equals("unsigned")) { //$NON-NLS-1$ - return new IntType(frame, typename, true); + return new IntType(target, typename, true); } else if (typename.equals("signed")) { //$NON-NLS-1$ - return new IntType(frame, typename); + return new IntType(target, typename); } else if (typename.equals("bool")) { //$NON-NLS-1$ - return new BoolType(frame, typename); + return new BoolType(target, typename); } else if (typename.equals("_Bool")) { //$NON-NLS-1$ - return new BoolType(frame, typename); + return new BoolType(target, typename); } else if (typename.equals("float")) { //$NON-NLS-1$ - return new FloatType(frame, typename); + return new FloatType(target, typename); } else if (typename.equals("double")) { //$NON-NLS-1$ - return new DoubleType(frame, typename); + return new DoubleType(target, typename); } else if (typename.equals("void")) { //$NON-NLS-1$ - return new VoidType(frame, typename); + return new VoidType(target, typename); } else if (typename.equals("enum")) { //$NON-NLS-1$ - return new EnumType(frame, typename); + return new EnumType(target, typename); } else if (typename.equals("union")) { //$NON-NLS-1$ - return new StructType(frame, typename); + return new StructType(target, typename); } else if (typename.equals("struct")) { //$NON-NLS-1$ - return new StructType(frame, typename); + return new StructType(target, typename); } else if (typename.equals("class")) { //$NON-NLS-1$ - return new StructType(frame, typename); + return new StructType(target, typename); } // GDB has some special types for int if (typename.equals("int8_t")) { //$NON-NLS-1$ - return new CharType(frame, typename); + return new CharType(target, typename); } else if (typename.equals("int16_t")) { //$NON-NLS-1$ - return new ShortType(frame, typename); + return new ShortType(target, typename); } else if (typename.equals("int32_t")) { //$NON-NLS-1$ - return new LongType(frame, typename); + return new LongType(target, typename); } else if (typename.equals("int64_t")) { //$NON-NLS-1$ - return new LongLongType(frame, typename); + return new LongLongType(target, typename); } else if (typename.equals("int128_t")) { //$NON-NLS-1$ - return new IntType(frame, typename); // ???? + return new IntType(target, typename); // ???? } @@ -318,27 +318,27 @@ public class SourceManager extends Manager { boolean isEnum = first.equals("enum"); //$NON-NLS-1$ if (isChar && (isSigned || isUnsigned)) { - return new CharType(frame, typename, isUnsigned); + return new CharType(target, typename, isUnsigned); } else if (isShort && (isSigned || isUnsigned)) { - return new ShortType(frame, typename, isUnsigned); + return new ShortType(target, typename, isUnsigned); } else if (isInt && (isSigned || isUnsigned)) { - return new IntType(frame, typename, isUnsigned); + return new IntType(target, typename, isUnsigned); } else if (isLong && (isInt || isSigned || isUnsigned)) { - return new LongType(frame, typename, isUnsigned); + return new LongType(target, typename, isUnsigned); } else if (isLongLong) { - return new LongLongType(frame, typename); + return new LongLongType(target, typename); } else if (isDouble && (isLong || isComplex || isImaginery)) { - return new DoubleType(frame, typename, isComplex, isImaginery, isLong); + return new DoubleType(target, typename, isComplex, isImaginery, isLong); } else if (isFloat && (isComplex || isImaginery)) { - return new FloatType(frame, typename, isComplex, isImaginery); + return new FloatType(target, typename, isComplex, isImaginery); } else if (isStruct) { - return new StructType(frame, typename); + return new StructType(target, typename); } else if (isClass) { - return new StructType(frame, typename); + return new StructType(target, typename); } else if (isUnion) { - return new StructType(frame, typename); + return new StructType(target, typename); } else if (isEnum) { - return new EnumType(frame, typename); + return new EnumType(target, typename); } } else if (count == 3) { // ISOC allows permutation. replace short by: long or short @@ -366,13 +366,13 @@ public class SourceManager extends Manager { if (isShort && isInt && (isSigned || unSigned)) { - return new ShortType(frame, typename, unSigned); + return new ShortType(target, typename, unSigned); } else if (isLong && isInt && (isSigned || unSigned)) { - return new LongType(frame, typename, unSigned); + return new LongType(target, typename, unSigned); } else if (isLongLong && (isSigned || unSigned)) { - return new LongLongType(frame, typename, unSigned); + return new LongLongType(target, typename, unSigned); } else if (isDouble && isLong && (isComplex || isImaginery)) { - return new DoubleType(frame, typename, isComplex, isImaginery, isLong); + return new DoubleType(target, typename, isComplex, isImaginery, isLong); } } else if (count == 4) { // ISOC allows permutation: @@ -392,18 +392,26 @@ public class SourceManager extends Manager { || (third.equals("long") && fourth.equals("long")); //$NON-NLS-1$ //$NON-NLS-2$ if (isLongLong && isInt && (isSigned || unSigned)) { - return new LongLongType(frame, typename, unSigned); + return new LongLongType(target, typename, unSigned); } } throw new CDIException(CdiResources.getString("cdi.SourceManager.Unknown_type")); //$NON-NLS-1$ } - public String getDetailTypeName(StackFrame frame, String typename) throws CDIException { + public String getDetailTypeNameFromVariable(StackFrame frame, String variable) throws CDIException { Target target = (Target)frame.getTarget(); Thread currentThread = (Thread)target.getCurrentThread(); StackFrame currentFrame = currentThread.getCurrentStackFrame(); target.setCurrentThread(frame.getThread(), false); ((Thread)frame.getThread()).setCurrentStackFrame(frame, false); + try { + return getDetailTypeName(target, variable); + } finally { + target.setCurrentThread(currentThread, false); + currentThread.setCurrentStackFrame(currentFrame, false); + } + } + public String getDetailTypeName(Target target, String typename) throws CDIException { try { MISession mi = target.getMISession(); CommandFactory factory = mi.getCommandFactory(); @@ -416,13 +424,10 @@ public class SourceManager extends Manager { return info.getType(); } catch (MIException e) { throw new MI2CDIException(e); - } finally { - target.setCurrentThread(currentThread, false); - currentThread.setCurrentStackFrame(currentFrame, false); } } - public String getTypeName(StackFrame frame, String variable) throws CDIException { + public String getTypeNameFromVariable(StackFrame frame, String variable) throws CDIException { Target target = (Target)frame.getTarget(); Thread currentThread = null; StackFrame currentFrame = null; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java index 66090a1c50c..8d3349a391a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java @@ -548,7 +548,13 @@ public class VariableManager extends Manager { // Fire a destroyEvent ? Target target = (Target)variable.getTarget(); MISession mi = target.getMISession(); - removeMIVar(mi, variable.getMIVar()); + // no need to call -var-delete for variable that are not in + // the list most probaby they are children of other variables and in this case + // we should not delete them + List varList = getVariablesList(target); + if (varList.contains(variable)) { + removeMIVar(mi, variable.getMIVar()); + } MIVarDeletedEvent del = new MIVarDeletedEvent(mi, variable.getMIVar().getVarName()); mi.fireEvent(del); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java index b1d17d0d2e3..46f547849f0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java @@ -63,28 +63,28 @@ public class Expression extends CObject implements ICDIExpression { Target target = (Target)getTarget(); Session session = (Session) (target.getSession()); SourceManager sourceMgr = session.getSourceManager(); - String nametype = sourceMgr.getTypeName((StackFrame)frame, getExpressionText()); + String nametype = sourceMgr.getTypeNameFromVariable((StackFrame)frame, getExpressionText()); try { - type = sourceMgr.getType((StackFrame)frame, nametype); + type = sourceMgr.getType(target, nametype); } catch (CDIException e) { // Try with ptype. try { - String ptype = sourceMgr.getDetailTypeName((StackFrame)frame, nametype); - type = sourceMgr.getType((StackFrame)frame, ptype); + String ptype = sourceMgr.getDetailTypeName(target, nametype); + type = sourceMgr.getType(target, ptype); } catch (CDIException ex) { // Some version of gdb does not work with the name of the class // ex: class data foo --> ptype data --> fails // ex: class data foo --> ptype foo --> succeed try { - String ptype = sourceMgr.getDetailTypeName((StackFrame)frame, getExpressionText()); - type = sourceMgr.getType((StackFrame)frame, ptype); + String ptype = sourceMgr.getDetailTypeNameFromVariable((StackFrame)frame, getExpressionText()); + type = sourceMgr.getType(target, ptype); } catch (CDIException e2) { // give up. } } } if (type == null) { - type = new IncompleteType((StackFrame)frame, nametype); + type = new IncompleteType(target, nametype); } return type; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java index d7ded7a5232..fc9a1539388 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java @@ -170,38 +170,38 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable if (fType == null) { String nametype = getTypeName(); Target target = (Target)getTarget(); - StackFrame frame = (StackFrame)getStackFrame(); - if (frame == null) { - Thread thread = (Thread)getThread(); - if (thread != null) { - frame = thread.getCurrentStackFrame(); - } else { - frame = ((Thread)target.getCurrentThread()).getCurrentStackFrame(); - } - } Session session = (Session) target.getSession(); SourceManager sourceMgr = session.getSourceManager(); try { - fType = sourceMgr.getType(frame, nametype); + fType = sourceMgr.getType(target, nametype); } catch (CDIException e) { // Try with ptype. try { - String ptype = sourceMgr.getDetailTypeName(frame, nametype); - fType = sourceMgr.getType(frame, ptype); + String ptype = sourceMgr.getDetailTypeName(target, nametype); + fType = sourceMgr.getType(target, ptype); } catch (CDIException ex) { - // Some version of gdb does not work woth the name of the class + // Some version of gdb does not work on the name of the class // ex: class data foo --> ptype data --> fails // ex: class data foo --> ptype foo --> succeed + StackFrame frame = (StackFrame)getStackFrame(); + if (frame == null) { + Thread thread = (Thread)getThread(); + if (thread != null) { + frame = thread.getCurrentStackFrame(); + } else { + frame = ((Thread)target.getCurrentThread()).getCurrentStackFrame(); + } + } try { - String ptype = sourceMgr.getDetailTypeName(frame, getQualifiedName()); - fType = sourceMgr.getType(frame, ptype); + String ptype = sourceMgr.getDetailTypeNameFromVariable(frame, getQualifiedName()); + fType = sourceMgr.getType(target, ptype); } catch (CDIException e2) { // give up. } } } if (fType == null) { - fType = new IncompleteType(frame, nametype); + fType = new IncompleteType(target, nametype); } } return fType; @@ -284,7 +284,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable } Session session = (Session) target.getSession(); SourceManager sourceMgr = session.getSourceManager(); - fTypename = sourceMgr.getTypeName(frame, getQualifiedName()); + fTypename = sourceMgr.getTypeNameFromVariable(frame, getQualifiedName()); } return fTypename; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/AggregateType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/AggregateType.java index 2bb06630061..566c226499b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/AggregateType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/AggregateType.java @@ -12,13 +12,13 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIAggregateType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ public abstract class AggregateType extends Type implements ICDIAggregateType { - public AggregateType(StackFrame frame, String typename) { - super(frame, typename); + public AggregateType(Target target, String typename) { + super(target, typename); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java index cc4557b0afa..5b63362e4e6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayType; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -24,8 +24,8 @@ public class ArrayType extends DerivedType implements ICDIArrayType { /** * @param typename */ - public ArrayType(StackFrame frame, String typename,int dim) { - super(frame, typename); + public ArrayType(Target target, String typename,int dim) { + super(target, typename); dimension = dim; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolType.java index 40f625dff45..d258b1216f4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIBoolType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,12 +21,12 @@ public class BoolType extends IntegralType implements ICDIBoolType { /** * @param typename */ - public BoolType(StackFrame frame, String typename) { - this(frame, typename, false); + public BoolType(Target target, String typename) { + this(target, typename, false); } - public BoolType(StackFrame frame, String typename, boolean usigned) { - super(frame, typename, usigned); + public BoolType(Target target, String typename, boolean usigned) { + super(target, typename, usigned); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharType.java index b3a8252631a..9575d2055e9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/CharType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDICharType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,11 +21,11 @@ public class CharType extends IntegralType implements ICDICharType { /** * @param typename */ - public CharType(StackFrame frame, String typename) { - this(frame, typename, false); + public CharType(Target target, String typename) { + this(target, typename, false); } - public CharType(StackFrame frame, String typename, boolean usigned) { - super(frame, typename, usigned); + public CharType(Target target, String typename, boolean usigned) { + super(target, typename, usigned); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DerivedType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DerivedType.java index b8194781951..aca1f3641dd 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DerivedType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DerivedType.java @@ -16,7 +16,6 @@ import org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType; import org.eclipse.cdt.debug.mi.core.cdi.Session; import org.eclipse.cdt.debug.mi.core.cdi.SourceManager; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** @@ -25,8 +24,8 @@ public abstract class DerivedType extends Type implements ICDIDerivedType { ICDIType derivedType; - public DerivedType(StackFrame frame, String typename) { - super(frame, typename); + public DerivedType(Target target, String typename) { + super(target, typename); } public void setComponentType(ICDIType dtype) { @@ -38,17 +37,17 @@ public abstract class DerivedType extends Type implements ICDIDerivedType { Session session = (Session)target.getSession(); SourceManager sourceMgr = session.getSourceManager(); try { - derivedType = sourceMgr.getType((StackFrame)getStackFrame(), name); + derivedType = sourceMgr.getType((Target)getTarget(), name); } catch (CDIException e) { // Try after ptype. try { - String ptype = sourceMgr.getDetailTypeName((StackFrame)getStackFrame(), name); - derivedType = sourceMgr.getType((StackFrame)getStackFrame(), ptype); + String ptype = sourceMgr.getDetailTypeName((Target)getTarget(), name); + derivedType = sourceMgr.getType((Target)getTarget(), ptype); } catch (CDIException ex) { } } if (derivedType == null) { - derivedType = new IncompleteType((StackFrame)getStackFrame(), name); + derivedType = new IncompleteType((Target)getTarget(), name); } } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleType.java index bbbf4d26e9b..483e1ec8196 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/DoubleType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIDoubleType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,11 +21,11 @@ public class DoubleType extends FloatingPointType implements ICDIDoubleType { /** * @param typename */ - public DoubleType(StackFrame frame, String typename) { - this(frame, typename, false, false, false); + public DoubleType(Target target, String typename) { + this(target, typename, false, false, false); } - public DoubleType(StackFrame frame, String typename, boolean isComplex, boolean isImg, boolean isLong) { - super(frame, typename, isComplex, isImg, isLong); + public DoubleType(Target target, String typename, boolean isComplex, boolean isImg, boolean isLong) { + super(target, typename, isComplex, isImg, isLong); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumType.java index 067919a5608..0db2216899c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/EnumType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIEnumType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,11 +21,11 @@ public class EnumType extends IntegralType implements ICDIEnumType { /** * @param typename */ - public EnumType(StackFrame frame, String typename) { - this(frame, typename, false); + public EnumType(Target target, String typename) { + this(target, typename, false); } - public EnumType(StackFrame frame, String typename, boolean usigned) { - super(frame, typename, usigned); + public EnumType(Target target, String typename, boolean usigned) { + super(target, typename, usigned); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatType.java index 6af55b31603..f67a66311f7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,11 +21,11 @@ public class FloatType extends FloatingPointType implements ICDIFloatType { /** * @param typename */ - public FloatType(StackFrame frame, String typename) { - this(frame, typename, false, false); + public FloatType(Target target, String typename) { + this(target, typename, false, false); } - public FloatType(StackFrame frame, String typename, boolean isComplex, boolean isImg) { - super(frame, typename, isComplex, isImg, false); + public FloatType(Target target, String typename, boolean isComplex, boolean isImg) { + super(target, typename, isComplex, isImg, false); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java index c2fdc1a9ac1..cb4223cb80c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -22,8 +22,8 @@ public abstract class FloatingPointType extends Type implements ICDIFloatingPoin boolean imaginary; boolean islong; - public FloatingPointType(StackFrame frame, String typename, boolean comp, boolean img, boolean l) { - super(frame, typename); + public FloatingPointType(Target target, String typename, boolean comp, boolean img, boolean l) { + super(target, typename); complex = comp; imaginary = img; islong = l; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java index d46ea905460..375e433fc3e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIFunctionType; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,8 +21,8 @@ public class FunctionType extends DerivedType implements ICDIFunctionType { String params = ""; //$NON-NLS-1$ - public FunctionType(StackFrame frame, String typename) { - super(frame, typename); + public FunctionType(Target target, String typename) { + super(target, typename); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IncompleteType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IncompleteType.java index 4530898977d..bbbf3f96760 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IncompleteType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IncompleteType.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -20,8 +20,8 @@ public class IncompleteType extends Type { /** * @param name */ - public IncompleteType(StackFrame frame, String name) { - super(frame, name); + public IncompleteType(Target target, String name) { + super(target, name); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntType.java index df8a43273cc..0357aff9ef9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIIntType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,12 +21,12 @@ public class IntType extends IntegralType implements ICDIIntType { /** * @param typename */ - public IntType(StackFrame frame, String typename) { - this(frame, typename, false); + public IntType(Target target, String typename) { + this(target, typename, false); } - public IntType(StackFrame frame, String typename, boolean isUnsigned) { - super(frame, typename, isUnsigned); + public IntType(Target target, String typename, boolean isUnsigned) { + super(target, typename, isUnsigned); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java index d314ee54be8..8a68eb009b1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIIntegralType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -20,8 +20,8 @@ public abstract class IntegralType extends Type implements ICDIIntegralType { boolean unSigned; - public IntegralType(StackFrame frame, String typename, boolean isUnsigned) { - super(frame, typename); + public IntegralType(Target target, String typename, boolean isUnsigned) { + super(target, typename); unSigned = isUnsigned; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongType.java index b0b003a5111..8abe43b767d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongLongType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDILongLongType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,11 +21,11 @@ public class LongLongType extends IntegralType implements ICDILongLongType { /** * @param typename */ - public LongLongType(StackFrame frame, String typename) { - this(frame, typename, false); + public LongLongType(Target target, String typename) { + this(target, typename, false); } - public LongLongType(StackFrame frame, String typename, boolean usigned) { - super(frame, typename, usigned); + public LongLongType(Target target, String typename, boolean usigned) { + super(target, typename, usigned); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongType.java index 010d1f838b1..5c015d1ef19 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/LongType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDILongType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,11 +21,11 @@ public class LongType extends IntegralType implements ICDILongType { /** * @param typename */ - public LongType(StackFrame frame, String typename) { - this(frame, typename, false); + public LongType(Target target, String typename) { + this(target, typename, false); } - public LongType(StackFrame frame, String typename, boolean usigned) { - super(frame, typename, usigned); + public LongType(Target target, String typename, boolean usigned) { + super(target, typename, usigned); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java index 5b0c3c9e683..68f1a9b8e1c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java @@ -13,14 +13,14 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerType; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ public class PointerType extends DerivedType implements ICDIPointerType { - public PointerType(StackFrame frame, String typename) { - super(frame, typename); + public PointerType(Target target, String typename) { + super(target, typename); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java index fd3423cafd9..4d71c6fa02b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIReferenceType; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -22,8 +22,8 @@ public class ReferenceType extends DerivedType implements ICDIReferenceType { /** * @param name */ - public ReferenceType(StackFrame frame, String name) { - super(frame, name); + public ReferenceType(Target target, String name) { + super(target, name); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortType.java index 5b37f942001..e085f5cfb54 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ShortType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIShortType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,11 +21,11 @@ public class ShortType extends IntegralType implements ICDIShortType { /** * @param typename */ - public ShortType(StackFrame frame, String typename) { - this(frame, typename, false); + public ShortType(Target target, String typename) { + this(target, typename, false); } - public ShortType(StackFrame frame, String typename, boolean usigned) { - super(frame, typename, usigned); + public ShortType(Target target, String typename, boolean usigned) { + super(target, typename, usigned); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java index c8a1650e617..4bf4730942a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -21,8 +21,8 @@ public class StructType extends AggregateType implements ICDIStructType { /** * @param typename */ - public StructType(StackFrame frame, String typename) { - super(frame, typename); + public StructType(Target target, String typename) { + super(target, typename); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java index 6a375953ccf..1ee225567d0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java @@ -11,28 +11,20 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; -import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType; import org.eclipse.cdt.debug.mi.core.cdi.model.CObject; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ public abstract class Type extends CObject implements ICDIType { - StackFrame fStackFrame; String typename; String detailName; - public Type(StackFrame frame, String name) { - super((Target)frame.getTarget()); + public Type(Target target, String name) { + super(target); typename = name; - fStackFrame = frame; - } - - public ICDIStackFrame getStackFrame() { - return fStackFrame; } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/VoidType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/VoidType.java index 71b6a1aa807..0271cf44400 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/VoidType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/VoidType.java @@ -12,16 +12,16 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIVoidType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ public class VoidType extends Type implements ICDIVoidType { - public VoidType(StackFrame frame) { - this(frame, "void"); //$NON-NLS-1$ + public VoidType(Target target) { + this(target, "void"); //$NON-NLS-1$ } - public VoidType(StackFrame frame, String typename) { - super(frame, typename); + public VoidType(Target target, String typename) { + super(target, typename); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharType.java index ecf24298cf1..038692fe35a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/WCharType.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model.type; import org.eclipse.cdt.debug.core.cdi.model.type.ICDIWCharType; -import org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame; +import org.eclipse.cdt.debug.mi.core.cdi.model.Target; /** */ @@ -22,11 +22,11 @@ public class WCharType extends IntegralType implements ICDIWCharType { /** * @param typename */ - public WCharType(StackFrame frame, String typename) { - this(frame, typename, false); + public WCharType(Target target, String typename) { + this(target, typename, false); } - public WCharType(StackFrame frame, String typename, boolean usigned) { - super(frame, typename, usigned); + public WCharType(Target target, String typename, boolean usigned) { + super(target, typename, usigned); } }