mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Changed the vizualization of arrays and structures.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2003-05-29 19:20:15 +00:00
parent a295e9b86c
commit 00d81cd9ef
2 changed files with 27 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2003-05-29 Mikhail Khodjaiants
Changed the vizualization of arrays and structures.
* CDTDebugModelPresentation.java
2003-05-14 Mikhail Khodjaiants 2003-05-14 Mikhail Khodjaiants
Created preference for the maximum number of disassembly instructions. Created preference for the maximum number of disassembly instructions.
* CDebugPreferencePage.java * CDebugPreferencePage.java

95
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
View file

@ -33,7 +33,6 @@ import org.eclipse.cdt.debug.core.model.IStackFrameInfo;
import org.eclipse.cdt.debug.core.model.IState; import org.eclipse.cdt.debug.core.model.IState;
import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage; import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage;
import org.eclipse.cdt.debug.internal.core.CDebugUtils; import org.eclipse.cdt.debug.internal.core.CDebugUtils;
import org.eclipse.cdt.debug.internal.core.model.CValue;
import org.eclipse.cdt.debug.internal.core.sourcelookup.DisassemblyManager; import org.eclipse.cdt.debug.internal.core.sourcelookup.DisassemblyManager;
import org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor; import org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor;
import org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditorInput; import org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditorInput;
@ -538,29 +537,40 @@ public class CDTDebugModelPresentation extends LabelProvider
protected String getVariableText( IVariable var ) throws DebugException protected String getVariableText( IVariable var ) throws DebugException
{ {
String label = new String(); StringBuffer label = new StringBuffer();
if ( var != null ) if ( var instanceof ICVariable )
{ {
if ( isShowVariableTypeNames() ) if ( isShowVariableTypeNames() )
{ {
String type = getVariableTypeName( var ); String type = getVariableTypeName( var );
if ( type != null && type.length() > 0 ) if ( type != null && type.length() > 0 )
label += type + " "; {
label.append( type );
label.append( ' ' );
}
} }
label += var.getName(); label.append( var.getName() );
IValue value = var.getValue(); IValue value = var.getValue();
if ( value != null ) if ( value != null )
{ {
if ( value instanceof CValue && ((CValue)value).isCharacter() ) if ( ((ICVariable)var).isArray() )
label += getCharacterValue( (CValue)value ); {
else if ( value instanceof CValue && ((CValue)value).isCharPointer() ) int[] dims = ((ICVariable)var).getArrayDimensions();
label += "= " + ((CValue)value).getUnderlyingValueString(); for ( int i = 0; i < dims.length; ++i )
else if ( value.getValueString() != null && value.getValueString().trim().length() > 0 ) {
label += getVariableValue( value.getValueString().trim() ); label.append( '[' );
// label += "= " + value.getValueString(); label.append( dims[i] );
label.append( ']' );
}
}
else if ( !((ICVariable)var).isStructure() && value.getValueString() != null && value.getValueString().trim().length() > 0 )
{
label.append( "= " );
label.append( value.getValueString().trim() );
}
} }
} }
return label; return label.toString();
} }
protected String getSharedLibraryText( ICSharedLibrary library, boolean qualified ) throws DebugException protected String getSharedLibraryText( ICSharedLibrary library, boolean qualified ) throws DebugException
@ -903,65 +913,6 @@ public class CDTDebugModelPresentation extends LabelProvider
return null; return null;
} }
private String getVariableValue( String value )
{
if ( value.startsWith( "[" ) )
return value;
if ( value.startsWith( "{" ) )
return "";
return "=" + value;
}
private String getCharacterValue( CValue value )
{
String result = null;
String uv = value.getUnderlyingValueString();
int index = uv.indexOf( '\\' );
try
{
if ( index == -1 && value.getValueString() != null )
return "=" + value.getValueString();
char ch = '.';
if ( uv.length() > index + 1 )
{
switch( uv.charAt( index + 1 ) )
{
case 'b':
ch = '\b';
break;
case 'f':
ch = '\f';
break;
case 'n':
ch = '\n';
break;
case 't':
ch = '\t';
break;
case 'r':
ch = '\r';
break;
case '\'':
ch = '\'';
break;
case '\"':
ch = '\"';
break;
case '\\':
ch = '\\';
break;
default:
return "=" + new String( new char[] { ch } );
}
result = "='" + new String( new char[] { ch } ) + '\'';
}
}
catch( DebugException e )
{
}
return result;
}
private String getVariableTypeName( IVariable variable ) private String getVariableTypeName( IVariable variable )
{ {
String type = null; String type = null;