Fix problem when trying another version of Clang.

[boost-statechart-viewer.git] / src / visualizer.cpp

diff --git a/src/visualizer.cpp b/src/visualizer.cpp
index bc83530e5d14e44b70685d625e4d3efc04c3150a..102e356775167af0fa002c3656a2f2e2d47f59b5 100644 (file)
--- a/src/visualizer.cpp
+++ b/src/visualizer.cpp
@@ -278,12 +278,27 @@ public:
 
 class Visitor : public RecursiveASTVisitor<Visitor>
 {
+    struct eventModel {
+       string name;
+       SourceLocation loc;
+       eventModel(string ev, SourceLocation sourceLoc) : name(ev), loc(sourceLoc){}
+    };
+    struct testEventModel {
+       string eventName;
+       testEventModel(string name) : eventName(name){}
+       bool operator() (const eventModel& model) {
+           if (eventName.compare(model.name) == 0)
+               return true;
+           return false;
+       }
+    };
     ASTContext *ASTCtx;
     Model::Model &model;
     DiagnosticsEngine &Diags;
     unsigned diag_unhandled_reaction_type, diag_unhandled_reaction_decl,
        diag_found_state, diag_found_statemachine, diag_no_history, diag_missing_reaction, diag_warning;
     std::vector<bool> reactMethodInReactions; // Indicates whether i-th react method is referenced from typedef reactions.
+    std::list<eventModel> listOfDefinedEvents;
 
 public:
     bool shouldVisitTemplateInstantiations() const { return true; }
@@ -314,21 +329,13 @@ public:
        unsigned i = 0;
        IdentifierInfo& II = ASTCtx->Idents.get("react");
        for (DeclContext::lookup_const_result ReactRes = SrcState->lookup(DeclarationName(&II));
-            ReactRes.first != ReactRes.second; ++ReactRes.first) {
-           if (i < reactMethodInReactions.size()) {
-               if (reactMethodInReactions[i] == false) {
-                   CXXMethodDecl *React = dyn_cast<CXXMethodDecl>(*ReactRes.first);
-                   Diag(React->getParamDecl(0)->getLocStart(), diag_warning) 
-                       << React->getParamDecl(0)->getType().getAsString() << " missing in typedef reactions";
-               }
-           } else {
+            ReactRes.first != ReactRes.second; ++ReactRes.first, ++i) {
+           if (i >= reactMethodInReactions.size() || reactMethodInReactions[i] == false) {
                CXXMethodDecl *React = dyn_cast<CXXMethodDecl>(*ReactRes.first);
-               Diag(React->getParamDecl(0)->getLocStart(), diag_warning) 
+               Diag(React->getParamDecl(0)->getLocStart(), diag_warning)
                    << React->getParamDecl(0)->getType().getAsString() << " missing in typedef reactions";
            }
-           i++;
        }
-       reactMethodInReactions.clear();
     }
     
     bool HandleCustomReaction(const CXXRecordDecl *SrcState, const Type *EventType)
@@ -373,6 +380,7 @@ public:
                const Type *DstStateType = TST->getArg(1).getAsType().getTypePtr();
                CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
                CXXRecordDecl *DstState = DstStateType->getAsCXXRecordDecl();
+               listOfDefinedEvents.remove_if(testEventModel(Event->getNameAsString()));
 
                Model::Transition *T = new Model::Transition(SrcState->getName(), DstState->getName(), Event->getName());
                model.transitions.push_back(T);
@@ -381,9 +389,11 @@ public:
                if (!HandleCustomReaction(SrcState, EventType)) {
                    Diag(SrcState->getLocation(), diag_missing_reaction) << EventType->getAsCXXRecordDecl()->getName();
                }
+               listOfDefinedEvents.remove_if(testEventModel(EventType->getAsCXXRecordDecl()->getNameAsString()));
            } else if (name == "boost::statechart::deferral") {
                const Type *EventType = TST->getArg(0).getAsType().getTypePtr();
                CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
+               listOfDefinedEvents.remove_if(testEventModel(Event->getNameAsString()));
 
                Model::State *s = model.findState(SrcState->getName());
                assert(s);
@@ -450,6 +460,7 @@ public:
        int typedef_num = 0;
        string name(RecordDecl->getName()); //getQualifiedNameAsString());
        Diag(RecordDecl->getLocStart(), diag_found_state) << name;
+       reactMethodInReactions.clear();
 
        Model::State *state;
        // Either we saw a reference to forward declared state
@@ -475,8 +486,8 @@ public:
                InnerInitialState->isDerivedFrom("boost::statechart::state_machine")) {
                  state->setInitialInnerState(InnerInitialState->getName());
            }
-           else
-               Diag(Loc.getTypeSourceInfo()->getTypeLoc().getLocStart(), diag_warning)
+           else if (!InnerInitialState->getNameAsString().compare("boost::mpl::list<>"))
+             Diag(Loc.getTypeSourceInfo()->getTypeLoc().getBeginLoc(), diag_warning)
                    << InnerInitialState->getName() << " as inner initial state is not supported" << Loc.getSourceRange();
        }
 
@@ -523,11 +534,14 @@ public:
        else if (RecordDecl->isDerivedFrom("boost::statechart::state_machine", &Base))
            handleStateMachine(RecordDecl, Base);
        else if (RecordDecl->isDerivedFrom("boost::statechart::event"))
-       {
-           //sc.events.push_back(RecordDecl->getNameAsString());
-       }
+           listOfDefinedEvents.push_back(eventModel(RecordDecl->getNameAsString(), RecordDecl->getLocation()));
        return true;
     }
+    void printUnusedEventDefinitions() {
+       for(list<eventModel>::iterator it = listOfDefinedEvents.begin(); it!=listOfDefinedEvents.end(); it++)
+           Diag((*it).loc, diag_warning)
+               << (*it).name << "event defined but not used in any state";
+    }
 };
 
 
@@ -543,6 +557,7 @@ public:
 
     virtual void HandleTranslationUnit(clang::ASTContext &Context) {
        visitor.TraverseDecl(Context.getTranslationUnitDecl());
+       visitor.printUnusedEventDefinitions();
        model.write_as_dot_file(destFileName);
     }
 };