{
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);
};
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()) {
: 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();
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> reactMethodVector;
+ std::vector<bool> reactMethodInReactions; // Indicates whether i-th react method is referenced from typedef reactions.
+ std::list<eventModel> unusedEvents;
public:
bool shouldVisitTemplateInstantiations() const { return true; }
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'");
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<reactMethodVector.size()) {
- if (reactMethodVector[i] == true) {
- CXXMethodDecl *React = dyn_cast<CXXMethodDecl>(*ReactRes.first);
- Diag(React->getParamDecl(0)->getLocStart(), diag_warning)
- << React->getParamDecl(0)->getType().getAsString() << " missing in typedef";
- }
- } 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)
- << React->getParamDecl(0)->getType().getAsString() << " missing in typedef";
+ Diag(React->getParamDecl(0)->getLocStart(), diag_warning)
+ << React->getParamDecl(0)->getType().getAsString() << " missing in typedef reactions";
}
- i++;
}
- reactMethodVector.clear();
}
bool HandleCustomReaction(const CXXRecordDecl *SrcState, const Type *EventType)
if (React->getNumParams() >= 1) {
const ParmVarDecl *p = React->getParamDecl(0);
const Type *ParmType = p->getType().getTypePtr();
- if (i == reactMethodVector.size()) reactMethodVector.push_back(false);
+ if (i == reactMethodInReactions.size()) reactMethodInReactions.push_back(false);
if (ParmType->isLValueReferenceType())
ParmType = dyn_cast<LValueReferenceType>(ParmType)->getPointeeType().getTypePtr();
if (ParmType == EventType) {
FindTransitVisitor(model, SrcState, EventType).TraverseStmt(React->getBody());
- reactMethodVector[i] = true;
+ reactMethodInReactions[i] = true;
return true;
}
} else
const Type *DstStateType = TST->getArg(1).getAsType().getTypePtr();
CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
CXXRecordDecl *DstState = DstStateType->getAsCXXRecordDecl();
+ unusedEvents.remove_if(testEventModel(Event->getNameAsString()));
Model::Transition *T = new Model::Transition(SrcState->getName(), DstState->getName(), Event->getName());
model.transitions.push_back(T);
if (!HandleCustomReaction(SrcState, EventType)) {
Diag(SrcState->getLocation(), diag_missing_reaction) << EventType->getAsCXXRecordDecl()->getName();
}
+ unusedEvents.remove_if(testEventModel(EventType->getAsCXXRecordDecl()->getNameAsString()));
} else if (name == "boost::statechart::deferral") {
const Type *EventType = TST->getArg(0).getAsType().getTypePtr();
CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
+ unusedEvents.remove_if(testEventModel(Event->getNameAsString()));
Model::State *s = model.findState(SrcState->getName());
assert(s);
} 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(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
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
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();
}
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;
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());
- }
+ unusedEvents.push_back(eventModel(RecordDecl->getNameAsString(), RecordDecl->getLocation()));
return true;
}
+ void printUnusedEventDefinitions() {
+ 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";
+ }
};
virtual void HandleTranslationUnit(clang::ASTContext &Context) {
visitor.TraverseDecl(Context.getTranslationUnitDecl());
+ visitor.printUnusedEventDefinitions();
model.write_as_dot_file(destFileName);
}
};
projects / boost-statechart-viewer.git / blobdiff