Rename testEventModel to evantHasName

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

diff --git a/src/visualizer.cpp b/src/visualizer.cpp
index 4bcd68ece2111752e9b9016a5b3bb63508f943a8..e3f4e8b543fa54a9d6635919fcb615c9c1a9b4f1 100644 (file)
--- a/src/visualizer.cpp
+++ b/src/visualizer.cpp
@@ -63,12 +63,14 @@ namespace Model
     {
        string initialInnerState;
        list<string> defferedEvents;
+       list<string> inStateEvents;
        bool noTypedef;
     public:
        const string name;
        explicit State(string name) : noTypedef(false), name(name) {}
        void setInitialInnerState(string name) { initialInnerState = name; }
        void addDeferredEvent(const string &name) { defferedEvents.push_back(name); }
+       void addInStateEvent(const string &name) { inStateEvents.push_back(name); }
        void setNoTypedef() { noTypedef = true;}
        friend ostream& operator<<(ostream& os, const State& s);
     };
@@ -100,6 +102,8 @@ namespace Model
        string label = s.name;
        for (list<string>::const_iterator i = s.defferedEvents.begin(), e = s.defferedEvents.end(); i != e; ++i)
            label.append("<br />").append(*i).append(" / defer");
+       for (list<string>::const_iterator i = s.inStateEvents.begin(), e = s.inStateEvents.end(); i != e; ++i)
+           label.append("<br />").append(*i).append(" / in state");
        if (s.noTypedef) os << indent << s.name << " [label=<" << label << ">, color=\"red\"]\n";
        else os << indent << s.name << " [label=<" << label << ">]\n";
        if (s.size()) {
@@ -263,7 +267,13 @@ public:
        : model(model), SrcState(SrcState), EventType(EventType) {}
 
     bool VisitMemberExpr(MemberExpr *E) {
-       if (E->getMemberNameInfo().getAsString() != "transit")
+       if (E->getMemberNameInfo().getAsString() == "defer_event") {
+               CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
+
+               Model::State *s = model.findState(SrcState->getName());
+               assert(s);
+               s->addDeferredEvent(Event->getName());
+       } else if (E->getMemberNameInfo().getAsString() != "transit")
            return true;
        if (E->hasExplicitTemplateArgs()) {
            const Type *DstStateType = E->getExplicitTemplateArgs()[0].getArgument().getAsType().getTypePtr();
@@ -283,14 +293,11 @@ class Visitor : public RecursiveASTVisitor<Visitor>
        SourceLocation loc;
        eventModel(string ev, SourceLocation sourceLoc) : name(ev), loc(sourceLoc){}
     };
-    struct testEventModel {
+
+    struct eventHasName {
        string eventName;
-       testEventModel(string name) : eventName(name){}
-       bool operator() (const eventModel& model) {
-           if (eventName.compare(model.name) == 0)
-               return true;
-           return false;
-       }
+       eventHasName(string name) : eventName(name){}
+       bool operator() (const eventModel& model) { return (eventName.compare(model.name) == 0); }
     };
     ASTContext *ASTCtx;
     Model::Model &model;
@@ -298,7 +305,7 @@ class Visitor : public RecursiveASTVisitor<Visitor>
     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;
+    std::list<eventModel> unusedEvents;
 
 public:
     bool shouldVisitTemplateInstantiations() const { return true; }
@@ -324,12 +331,6 @@ public:
 
     DiagnosticBuilder Diag(SourceLocation Loc, unsigned DiagID) { return Diags.Report(Loc, DiagID); }
 
-    void initializeDiagnostic()
-    {
-       /*Initialization of diagnostics. If this is not done. No notes are printed before first warning or error.*/
-       Diags.Report(SourceLocation(), Diags.getCustomDiagID(DiagnosticsEngine::Warning, "Visualizer plugin is running!\n\n"));
-    }
-
     void checkAllReactMethods(const CXXRecordDecl *SrcState) 
     {
        unsigned i = 0;
@@ -386,7 +387,7 @@ public:
                const Type *DstStateType = TST->getArg(1).getAsType().getTypePtr();
                CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
                CXXRecordDecl *DstState = DstStateType->getAsCXXRecordDecl();
-               listOfDefinedEvents.remove_if(testEventModel(Event->getNameAsString()));
+               unusedEvents.remove_if(eventHasName(Event->getNameAsString()));
 
                Model::Transition *T = new Model::Transition(SrcState->getName(), DstState->getName(), Event->getName());
                model.transitions.push_back(T);
@@ -395,11 +396,11 @@ public:
                if (!HandleCustomReaction(SrcState, EventType)) {
                    Diag(SrcState->getLocation(), diag_missing_reaction) << EventType->getAsCXXRecordDecl()->getName();
                }
-               listOfDefinedEvents.remove_if(testEventModel(EventType->getAsCXXRecordDecl()->getNameAsString()));
+               unusedEvents.remove_if(eventHasName(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()));
+               unusedEvents.remove_if(eventHasName(Event->getNameAsString()));
 
                Model::State *s = model.findState(SrcState->getName());
                assert(s);
@@ -407,6 +408,15 @@ public:
            } else if (name == "boost::mpl::list") {
                for (TemplateSpecializationType::iterator Arg = TST->begin(), End = TST->end(); Arg != End; ++Arg)
                    HandleReaction(Arg->getAsType().getTypePtr(), Loc, SrcState);
+           } else if (name == "boost::statechart::in_state_reaction") {
+               const Type *EventType = TST->getArg(0).getAsType().getTypePtr();
+               CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
+               unusedEvents.remove_if(eventHasName(Event->getNameAsString()));
+
+               Model::State *s = model.findState(SrcState->getName());
+               assert(s);
+               s->addInStateEvent(Event->getName());
+             
            } else
                Diag(Loc, diag_unhandled_reaction_type) << name;
        } else
@@ -540,12 +550,14 @@ public:
            handleSimpleState(RecordDecl, Base);
        else if (RecordDecl->isDerivedFrom("boost::statechart::state_machine", &Base))
            handleStateMachine(RecordDecl, Base);
-       else if (RecordDecl->isDerivedFrom("boost::statechart::event"))
-           listOfDefinedEvents.push_back(eventModel(RecordDecl->getNameAsString(), RecordDecl->getLocation()));
+       else if (RecordDecl->isDerivedFrom("boost::statechart::event")) {
+           // Mark the event as unused until we found that somebody uses it
+           unusedEvents.push_back(eventModel(RecordDecl->getNameAsString(), RecordDecl->getLocation()));
+       }
        return true;
     }
     void printUnusedEventDefinitions() {
-       for(list<eventModel>::iterator it = listOfDefinedEvents.begin(); it!=listOfDefinedEvents.end(); it++)
+       for(list<eventModel>::iterator it = unusedEvents.begin(); it!=unusedEvents.end(); it++)
            Diag((*it).loc, diag_warning)
                << (*it).name << "event defined but not used in any state";
     }
@@ -563,7 +575,6 @@ public:
        : visitor(Context, model, D), destFileName(destFileName) {}
 
     virtual void HandleTranslationUnit(clang::ASTContext &Context) {
-       visitor.initializeDiagnostic();
        visitor.TraverseDecl(Context.getTranslationUnitDecl());
        visitor.printUnusedEventDefinitions();
        model.write_as_dot_file(destFileName);