[haiku-commits] haiku: hrev48164 - src/apps/debugger/source_language/expression_evaluators
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 30 Oct 2014 14:55:35 +0100 (CET)
hrev48164 adds 1 changeset to branch 'master'
old head: 824404e31faf781825b818267068bf44e1a0b7a0
new head: 5cd3ae7c0d0e32f6926e40511f642f6d49e0fd17
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=5cd3ae7+%5E824404e
----------------------------------------------------------------------------
5cd3ae7: Debugger: Implement member dereferencing in expressions.
CLanguageExpressionEvaluator:
- Add tokenizer handling for operators . and ->.
- Rework _ParseIdentifier() to work recursively if it sees a deref
operator immediately following the current token. This allows
one to refer to the value of structure/class members in an
expression.
[ Rene Gollent <rene@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48164
Commit: 5cd3ae7c0d0e32f6926e40511f642f6d49e0fd17
URL: http://cgit.haiku-os.org/haiku/commit/?id=5cd3ae7
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Thu Oct 30 13:51:45 2014 UTC
----------------------------------------------------------------------------
2 files changed, 78 insertions(+), 32 deletions(-)
.../CLanguageExpressionEvaluator.cpp | 108 +++++++++++++------
.../CLanguageExpressionEvaluator.h | 2 +-
----------------------------------------------------------------------------
diff --git
a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
index c1d7579..76563bf 100644
---
a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
+++
b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.cpp
@@ -58,7 +58,9 @@ enum {
TOKEN_GT,
TOKEN_GE,
TOKEN_LT,
- TOKEN_LE
+ TOKEN_LE,
+
+ TOKEN_MEMBER_PTR
};
static BString TokenTypeToString(int32 type)
@@ -150,6 +152,10 @@ static BString TokenTypeToString(int32 type)
token = "<=";
break;
+ case TOKEN_MEMBER_PTR:
+ token = "->";
+ break;
+
default:
token.SetToFormat("Unknown token type %" B_PRId32,
type);
break;
@@ -295,6 +301,17 @@ class CLanguageExpressionEvaluator::Tokenizer {
}
int32 length = fCurrentChar - begin;
+ if (length == 1 && decimal) {
+ // check for . operator
+ fCurrentChar = begin;
+ if (!_ParseOperator()) {
+ throw ParseException("unexpected
character",
+ _CurrentPos());
+ }
+
+ return fCurrentToken;
+ }
+
BString test = temp;
test << "&_";
double value;
@@ -361,16 +378,20 @@ class CLanguageExpressionEvaluator::Tokenizer {
break;
case '-':
- type = TOKEN_MINUS;
- length = 1;
+ if (Peek() == '>') {
+ type = TOKEN_MEMBER_PTR;
+ length = 2;
+ } else {
+ type = TOKEN_MINUS;
+ length = 1;
+ }
break;
case '*':
if (Peek() == '*') {
type = TOKEN_POWER;
length = 2;
- }
- else {
+ } else {
type = TOKEN_STAR;
length = 1;
}
@@ -453,6 +474,11 @@ class CLanguageExpressionEvaluator::Tokenizer {
length = 1;
break;
+ case '.':
+ type = TOKEN_MEMBER_PTR;
+ length = 1;
+ break;
+
default:
break;
}
@@ -764,7 +790,7 @@ CLanguageExpressionEvaluator::_ParseUnary()
Number
-CLanguageExpressionEvaluator::_ParseIdentifier()
+CLanguageExpressionEvaluator::_ParseIdentifier(ValueNode* parentNode)
{
Token token = fTokenizer->NextToken();
Number value;
@@ -780,34 +806,41 @@ CLanguageExpressionEvaluator::_ParseIdentifier()
AutoLocker<ValueNodeContainer> containerLocker(container);
ValueNodeChild* child = NULL;
- ValueNodeChild* thisChild = NULL;
- for (int32 i = 0; i < container->CountChildren(); i++) {
- ValueNodeChild* current = container->ChildAt(i);
- const BString& nodeName = current->Name();
- if (nodeName == identifierName) {
- child = current;
- break;
- } else if (nodeName == "this")
- thisChild = current;
- }
-
- if (child == NULL && thisChild != NULL) {
- // the name was not found in the variables or parameters,
- // but we have a class pointer. Try to find the name in the
- // list of members.
- _RequestValueIfNeeded(token, thisChild);
- ValueNode* thisNode = thisChild->Node();
- // skip the intermediate pointer
- if (thisNode->GetType()->Kind() == TYPE_ADDRESS
- && thisNode->CountChildren() == 1) {
- thisChild = thisNode->ChildAt(0);
+ if (parentNode == NULL) {
+ ValueNodeChild* thisChild = NULL;
+ for (int32 i = 0; i < container->CountChildren(); i++) {
+ ValueNodeChild* current = container->ChildAt(i);
+ const BString& nodeName = current->Name();
+ if (nodeName == identifierName) {
+ child = current;
+ break;
+ } else if (nodeName == "this")
+ thisChild = current;
+ }
+ if (child == NULL && thisChild != NULL) {
+ // the name was not found in the variables or
parameters,
+ // but we have a class pointer. Try to find the name in
the
+ // list of members.
_RequestValueIfNeeded(token, thisChild);
- thisNode = thisChild->Node();
+ ValueNode* thisNode = thisChild->Node();
+ fTokenizer->RewindToken();
+ return _ParseIdentifier(thisNode);
+ }
+ } else {
+ // skip intermediate address nodes
+ if (parentNode->GetType()->Kind() == TYPE_ADDRESS
+ && parentNode->CountChildren() == 1) {
+ child = parentNode->ChildAt(0);
+
+ _RequestValueIfNeeded(token, child);
+ parentNode = child->Node();
+ fTokenizer->RewindToken();
+ return _ParseIdentifier(parentNode);
}
- for (int32 i = 0; i < thisNode->CountChildren(); i++) {
- ValueNodeChild* current = thisNode->ChildAt(i);
+ for (int32 i = 0; i < parentNode->CountChildren(); i++) {
+ ValueNodeChild* current = parentNode->ChildAt(i);
const BString& nodeName = current->Name();
if (nodeName == identifierName) {
child = current;
@@ -824,8 +857,21 @@ CLanguageExpressionEvaluator::_ParseIdentifier()
}
_RequestValueIfNeeded(token, child);
-
ValueNode* node = child->Node();
+
+ token = fTokenizer->NextToken();
+ if (token.type == TOKEN_MEMBER_PTR) {
+ token = fTokenizer->NextToken();
+ if (token.type == TOKEN_IDENTIFIER) {
+ fTokenizer->RewindToken();
+ return _ParseIdentifier(node);
+ } else {
+ throw ParseException("Expected identifier after member "
+ "dereference.", token.position);
+ }
+ } else
+ fTokenizer->RewindToken();
+
BVariant variant;
Value* nodeValue = node->GetValue();
nodeValue->ToVariant(variant);
diff --git
a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
index 45f9778..f20271b 100644
---
a/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
+++
b/src/apps/debugger/source_language/expression_evaluators/CLanguageExpressionEvaluator.h
@@ -72,7 +72,7 @@ class CLanguageExpressionEvaluator {
Number _ParseProduct();
Number _ParsePower();
Number _ParseUnary();
- Number _ParseIdentifier();
+ Number
_ParseIdentifier(ValueNode* parentNode = NULL);
Number _ParseAtom();
void _EatToken(int32 type);
Other related posts:
- » [haiku-commits] haiku: hrev48164 - src/apps/debugger/source_language/expression_evaluators - anevilyak
