[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdev-python] duchain: removed more crashy debug statements
From:       Sven Brauch <svenbrauch () googlemail ! com>
Date:       2011-10-01 12:11:35
Message-ID: 20111001121135.667DFA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit ac8211ea0ceb8052af0ae8bc4f9b5c161e59396e by Sven Brauch.
Committed on 01/10/2011 at 14:09.
Pushed by brauch into branch 'master'.

removed more crashy debug statements

M  +41   -39   duchain/declarationbuilder.cpp

http://commits.kde.org/kdev-python/ac8211ea0ceb8052af0ae8bc4f9b5c161e59396e

diff --git a/duchain/declarationbuilder.cpp b/duchain/declarationbuilder.cpp
index a4ff1c0..6f62f7a 100644
--- a/duchain/declarationbuilder.cpp
+++ b/duchain/declarationbuilder.cpp
@@ -498,52 +498,54 @@ void DeclarationBuilder::visitCall(CallAst* node)
         ExpressionVisitor v(currentContext(), editor());
         v.visitNode(static_cast<AttributeAst*>(node->function)->value);
         if ( VariableLengthContainer::Ptr container = \
                v.lastType().cast<VariableLengthContainer>() ) {
-            /// DEBUG
-            kDebug() << "Got container type for eventual update: " << \
                container->toString();
-            kDebug() << "Eventual function declaration: " << \
                functionVisitor.lastFunctionDeclaration()->toString();
-            kDebug() << \
                functionVisitor.lastFunctionDeclaration()->isFunctionDeclaration();
-            /// END DEBUG
-            if ( functionVisitor.lastFunctionDeclaration()->isFunctionDeclaration() \
                ) {
-                FunctionDeclaration* f = \
                static_cast<FunctionDeclaration*>(functionVisitor.lastFunctionDeclaration().data());
                
-                if ( const Decorator* d = \
                Helper::findDecoratorByName<FunctionDeclaration>(f, "addsTypeOfArg") \
                ) {
-                    register const int offset = \
                d->additionalInformation().str().toInt();
-                    if ( node->arguments.length() > offset ) {
-                        ExpressionVisitor argVisitor(currentContext(), editor());
-                        argVisitor.visitNode(node->arguments.at(offset));
-                        if ( argVisitor.lastType() ) {
-                            kDebug() << "Adding content type: " << \
                argVisitor.lastType()->toString();
-                            container->addContentType(argVisitor.lastType());
-                            v.lastDeclaration()->setType(container);
+            if ( v.lastDeclaration() ) {
+//                 /// DEBUG
+//                 kDebug() << "Got container type for eventual update: " << \
container->toString(); +//                 kDebug() << "Eventual function \
declaration: " << functionVisitor.lastFunctionDeclaration()->toString(); +//          \
kDebug() << functionVisitor.lastFunctionDeclaration()->isFunctionDeclaration(); +//   \
/// END DEBUG +                if ( \
functionVisitor.lastFunctionDeclaration()->isFunctionDeclaration() ) { +              \
FunctionDeclaration* f = \
static_cast<FunctionDeclaration*>(functionVisitor.lastFunctionDeclaration().data()); \
+                    if ( const Decorator* d = \
Helper::findDecoratorByName<FunctionDeclaration>(f, "addsTypeOfArg") ) { +            \
register const int offset = d->additionalInformation().str().toInt(); +               \
if ( node->arguments.length() > offset ) { +                            \
ExpressionVisitor argVisitor(currentContext(), editor()); +                           \
argVisitor.visitNode(node->arguments.at(offset)); +                            if ( \
argVisitor.lastType() ) { +                                kDebug() << "Adding \
content type: " << argVisitor.lastType()->toString(); +                               \
container->addContentType(argVisitor.lastType()); +                                \
v.lastDeclaration()->setType(container); +                            }
                         }
                     }
-                }
-                if ( const Decorator* d = \
                Helper::findDecoratorByName<FunctionDeclaration>(f, \
                "addsTypeOfArgContent") ) {
-                    register const int offset = \
                d->additionalInformation().str().toInt();
-                    if ( node->arguments.length() > offset ) {
-                        ExpressionVisitor argVisitor(currentContext(), editor());
-                        argVisitor.visitNode(node->arguments.at(offset));
-                        if ( argVisitor.lastType() ) {
-                            if ( VariableLengthContainer::Ptr sourceContainer = \
                argVisitor.lastType().cast<VariableLengthContainer>() ) {
-                                if ( AbstractType::Ptr contentType = \
                sourceContainer->contentType().abstractType() ) {
-                                    kDebug() << "Adding content type: " << \
                contentType->toString();
-                                    container->addContentType(contentType);
-                                    v.lastDeclaration()->setType(container);
+                    if ( const Decorator* d = \
Helper::findDecoratorByName<FunctionDeclaration>(f, "addsTypeOfArgContent") ) { +     \
register const int offset = d->additionalInformation().str().toInt(); +               \
if ( node->arguments.length() > offset ) { +                            \
ExpressionVisitor argVisitor(currentContext(), editor()); +                           \
argVisitor.visitNode(node->arguments.at(offset)); +                            if ( \
argVisitor.lastType() ) { +                                if ( \
VariableLengthContainer::Ptr sourceContainer = \
argVisitor.lastType().cast<VariableLengthContainer>() ) { +                           \
if ( AbstractType::Ptr contentType = sourceContainer->contentType().abstractType() ) \
{ +                                        kDebug() << "Adding content type: " << \
contentType->toString(); +                                        \
container->addContentType(contentType); +                                        \
v.lastDeclaration()->setType(container); +                                    }
                                 }
-                            }
-                            else if ( argVisitor.lastType()->whichType() == \
                AbstractType::TypeUnsure ) {
-                                UnsureType::Ptr sourceUnsure = \
                argVisitor.lastType().cast<UnsureType>();
-                                FOREACH_FUNCTION ( const IndexedType& type, \
                sourceUnsure->types ) {
-                                    if ( AbstractType::Ptr p = type.abstractType() ) \
                {
-                                        if ( VariableLengthContainer::Ptr \
                sourceContainer = p.cast<VariableLengthContainer>() ) {
-                                            if ( AbstractType::Ptr contentType = \
                sourceContainer->contentType().abstractType() ) {
-                                                kDebug() << "Adding content type: " \
                << contentType->toString();
-                                                \
                container->addContentType(contentType);
-                                                \
v.lastDeclaration()->setType(container); +                                else if ( \
argVisitor.lastType()->whichType() == AbstractType::TypeUnsure ) { +                  \
UnsureType::Ptr sourceUnsure = argVisitor.lastType().cast<UnsureType>(); +            \
FOREACH_FUNCTION ( const IndexedType& type, sourceUnsure->types ) { +                 \
if ( AbstractType::Ptr p = type.abstractType() ) { +                                  \
if ( VariableLengthContainer::Ptr sourceContainer = p.cast<VariableLengthContainer>() \
) { +                                                if ( AbstractType::Ptr \
contentType = sourceContainer->contentType().abstractType() ) { +                     \
kDebug() << "Adding content type: " << contentType->toString(); +                     \
container->addContentType(contentType); +                                             \
v.lastDeclaration()->setType(container); +                                            \
}  }
                                         }
                                     }
+                                    v.lastDeclaration()->setType(container);
                                 }
-                                v.lastDeclaration()->setType(container);
                             }
                         }
                     }


[prev in list] [next in list] [prev in thread] [next in thread]