Changeset View
Changeset View
Standalone View
Standalone View
duchain/expressionvisitor.cpp
| Show First 20 Lines • Show All 642 Lines • ▼ Show 20 Line(s) | 633 | if (context) { | |||
|---|---|---|---|---|---|
| 643 | foreach ( Declaration* dec, context->findDeclarations(propertyId) ) { | 643 | foreach ( Declaration* dec, context->findDeclarations(propertyId) ) { | ||
| 644 | if ( node->isFunctionCall != -1 ) { | 644 | if ( node->isFunctionCall != -1 ) { | ||
| 645 | if ( dec->isFunctionDeclaration() ) { | 645 | if ( dec->isFunctionDeclaration() ) { | ||
| 646 | decs << dec; | 646 | decs << dec; | ||
| 647 | ifDebug(qCDebug(DUCHAIN) << "found:" << dec->toString();) | 647 | ifDebug(qCDebug(DUCHAIN) << "found:" << dec->toString();) | ||
| 648 | } | 648 | } | ||
| 649 | } else { | 649 | } else { | ||
| 650 | if ( !dec->isFunctionDeclaration() ) { | 650 | if ( !dec->isFunctionDeclaration() ) { | ||
| 651 | ClassMemberDeclaration *classDec = dynamic_cast<ClassMemberDeclaration*>(dec); | ||||
| 652 | if (classDec && classDec->accessPolicy() == Declaration::Private) { | ||||
| 653 | if (declaration == dec->context()->owner()) { | ||||
| 654 | decs << dec; | ||||
| 655 | ifDebug(qCDebug(DUCHAIN) << "found private:" << dec->toString();) | ||||
| 656 | } | ||||
| 657 | } else { | ||||
| 651 | decs << dec; | 658 | decs << dec; | ||
| 652 | ifDebug(qCDebug(DUCHAIN) << "found:" << dec->toString();) | 659 | ifDebug(qCDebug(DUCHAIN) << "found:" << dec->toString();) | ||
| 653 | } | 660 | } | ||
| 654 | } | 661 | } | ||
| 655 | } | 662 | } | ||
| 663 | } | ||||
| 656 | m_result.setDeclarations(decs); | 664 | m_result.setDeclarations(decs); | ||
| 657 | lock.unlock(); | 665 | lock.unlock(); | ||
| 658 | if (!m_result.allDeclarations().isEmpty()) { | 666 | if (!m_result.allDeclarations().isEmpty()) { | ||
| 659 | if ( !m_isAssignmentExpressionEqual ) { | 667 | if ( !m_isAssignmentExpressionEqual ) { | ||
| 660 | usingDeclaration(node->objectProperty->objectDimList->variableName, m_result.allDeclarations().last()); | 668 | usingDeclaration(node->objectProperty->objectDimList->variableName, m_result.allDeclarations().last()); | ||
| 661 | } | 669 | } | ||
| 662 | if (node->isFunctionCall != -1) { | 670 | if (node->isFunctionCall != -1) { | ||
| 663 | FunctionType::Ptr function = m_result.allDeclarations().last()->type<FunctionType>(); | 671 | FunctionType::Ptr function = m_result.allDeclarations().last()->type<FunctionType>(); | ||
| ▲ Show 20 Lines • Show All 352 Lines • Show Last 20 Lines | |||||