Remove diagnostics initialization.

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

diff --git a/src/visualizer.cpp b/src/visualizer.cpp
index 102e356775167af0fa002c3656a2f2e2d47f59b5..1b9122d5b518ff9f25a4aacb092120ebadc22aee 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();
@@ -314,7 +324,7 @@ public:
            Diags.getCustomDiagID(DiagnosticsEngine::Error, "Unhandled reaction type '%0'");
        diag_unhandled_reaction_decl =
            Diags.getCustomDiagID(DiagnosticsEngine::Error, "Unhandled reaction decl '%0'");
-       diag_unhandled_reaction_decl =
+       diag_no_history =
            Diags.getCustomDiagID(DiagnosticsEngine::Error, "History is not yet supported");
        diag_missing_reaction =
            Diags.getCustomDiagID(DiagnosticsEngine::Error, "Missing react method for event '%0'");
@@ -401,6 +411,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();
+               listOfDefinedEvents.remove_if(testEventModel(Event->getNameAsString()));
+
+               Model::State *s = model.findState(SrcState->getName());
+               assert(s);
+               s->addInStateEvent(Event->getName());
+             
            } else
                Diag(Loc, diag_unhandled_reaction_type) << name;
        } else
@@ -523,8 +542,9 @@ public:
            return true;
        if (Declaration->getQualifiedNameAsString() == "boost::statechart::state" ||
            Declaration->getQualifiedNameAsString() == "TimedState" ||
-           Declaration->getQualifiedNameAsString() == "TimedSimpleState")
-           return true; // This is an "abstract class" not a real state
+           Declaration->getQualifiedNameAsString() == "TimedSimpleState" ||
+           Declaration->getQualifiedNameAsString() == "boost::statechart::assynchronous_state_machine")
+           return true; // This is an "abstract class" not a real state or real state machine
 
        MyCXXRecordDecl *RecordDecl = static_cast<MyCXXRecordDecl*>(Declaration);
        const CXXBaseSpecifier *Base;