Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend typecasting to support pointer/address types. 

We now parse the user's input to see if it should be a pointer/reference
type and create a derived type accordingly. This allows casting to e.g.
StyledEditApp*.
This commit is contained in:
Rene Gollent 2012-11-05 17:53:41 +01:00
parent ab7a2ea818
commit 9e7a46be20
2 changed files with 99 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
View File

@ -1645,19 +1645,20 @@ VariablesView::MessageReceived(BMessage* message)
case MSG_TYPECAST_NODE:
{
ModelNode* node = NULL;
if (message->FindPointer("node", reinterpret_cast<void **>(&node)) != B_OK)
break;
TeamDebugInfo* info = fThread->GetTeam()->DebugInfo();
if (info == NULL)
break;
Type* type = NULL;
if (info->LookupTypeByName(message->FindString("text"),
TypeLookupConstraints(), type) != B_OK) {
// TODO: notify user
if (message->FindPointer("node", reinterpret_cast<void **>(&node))
!= B_OK) {
break;
}
Type* type = NULL;
BString typeName = message->FindString("text");
if (typeName.Length() == 0)
break;
if (_ParseInputType(typeName, type) != B_OK)
break;
ValueNode* valueNode = NULL;
if (TypeHandlerRoster::Default()->CreateValueNode(
node->NodeChild(), type, valueNode) != B_OK) {
@ -2139,6 +2140,89 @@ VariablesView::_ApplyViewStateDescendentNodeInfos(VariablesViewState* viewState,
}
status_t
VariablesView::_ParseInputType(const BString& typeName,
Type*& _resultType) const
{
status_t result = B_OK;
Type* baseType = NULL;
TeamDebugInfo* info = fThread->GetTeam()->DebugInfo();
if (info == NULL)
return B_NO_MEMORY;
BString parsedName = typeName;
BString baseTypeName;
parsedName.RemoveAll(" ");
// TODO: this is fairly C/C++-specific and should probably be
// language-agnostic in the long run
int32 modifierIndex = -1;
for (int32 i = parsedName.Length() - 1; i >= 0; i--) {
if (parsedName[i] == '*' || parsedName[i] == '&')
modifierIndex = i;
}
if (modifierIndex >= 0) {
parsedName.CopyInto(baseTypeName, 0, modifierIndex);
parsedName.Remove(0, modifierIndex);
} else
baseTypeName = parsedName;
result = info->LookupTypeByName(baseTypeName, TypeLookupConstraints(),
baseType);
if (result != B_OK)
return result;
BReference<Type> typeRef;
typeRef.SetTo(baseType, true);
if (!parsedName.IsEmpty()) {
AddressType* derivedType = NULL;
// walk the list of modifiers trying to add each.
for (int32 i = 0; i < parsedName.Length(); i++) {
address_type_kind typeKind;
switch (parsedName[i]) {
case '*':
{
typeKind = DERIVED_TYPE_POINTER;
break;
}
case '&':
{
typeKind = DERIVED_TYPE_REFERENCE;
break;
}
default:
{
return B_BAD_VALUE;
}
}
if (derivedType == NULL) {
result = baseType->CreateDerivedAddressType(typeKind,
derivedType);
} else {
result = derivedType->CreateDerivedAddressType(typeKind,
derivedType);
}
if (result != B_OK)
return result;
typeRef.SetTo(derivedType, true);
}
_resultType = derivedType;
} else
_resultType = baseType;
typeRef.Detach();
return result;
}
// #pragma mark - Listener

5
src/apps/debugger/user_interface/gui/team_window/VariablesView.h
View File

@ -1,5 +1,6 @@
/*
* Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2012, Rene Gollent, rene@gollent.com.
* Distributed under the terms of the MIT License.
*/
#ifndef VARIABLES_VIEW_H
@ -16,6 +17,7 @@ class CpuState;
class SettingsMenu;
class StackFrame;
class Thread;
class Type;
class TypeComponentPath;
class ValueNode;
class ValueNodeContainer;
@ -80,6 +82,9 @@ private:
VariablesViewState* viewState, void* parent,
TreeTablePath& path);
status_t _ParseInputType(const BString& typeName,
Type*& _outputType) const;
private:
Thread* fThread;
StackFrame* fStackFrame;