{
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()) {
f << indent_dec << "}\n";
}
};
-};
+}
class MyCXXRecordDecl : public CXXRecordDecl
bool isDerivedFrom(const char *baseStr, CXXBaseSpecifier const **Base = 0) const {
CXXBasePaths Paths(/*FindAmbiguities=*/false, /*RecordPaths=*/!!Base, /*DetectVirtual=*/false);
Paths.setOrigin(const_cast<MyCXXRecordDecl*>(this));
- if (!lookupInBases(&FindBaseClassString, const_cast<char*>(baseStr), Paths))
+ string qn(baseStr);
+ if (!lookupInBases(
+ [qn](const CXXBaseSpecifier *Specifier, CXXBasePath &Path) -> bool {
+ const RecordType *rt = Specifier->getType()->getAs<RecordType>();
+ assert(rt);
+ TagDecl *canon = rt->getDecl()->getCanonicalDecl();
+ return canon->getQualifiedNameAsString() == qn;
+ }, Paths) )
+ {
return false;
+ }
+
if (Base)
*Base = Paths.front().back().Base;
return true;
: 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();
+ const Type *DstStateType = E->getTemplateArgs()[0].getArgument().getAsType().getTypePtr();
CXXRecordDecl *DstState = DstStateType->getAsCXXRecordDecl();
CXXRecordDecl *Event = EventType->getAsCXXRecordDecl();
Model::Transition *T = new Model::Transition(SrcState->getName(), DstState->getName(), Event->getName());
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;
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; }
{
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, ++i) {
+ auto ReactRes = SrcState->lookup(DeclarationName(&II));
+ for (auto it = ReactRes.begin(), end=ReactRes.end(); it != end; ++it, ++i) {
if (i >= reactMethodInReactions.size() || reactMethodInReactions[i] == false) {
- CXXMethodDecl *React = dyn_cast<CXXMethodDecl>(*ReactRes.first);
+ CXXMethodDecl *React = dyn_cast<CXXMethodDecl>(*it);
Diag(React->getParamDecl(0)->getLocStart(), diag_warning)
<< React->getParamDecl(0)->getType().getAsString() << " missing in typedef reactions";
}
unsigned i = 0;
IdentifierInfo& II = ASTCtx->Idents.get("react");
// TODO: Lookup for react even in base classes - probably by using Sema::LookupQualifiedName()
- for (DeclContext::lookup_const_result ReactRes = SrcState->lookup(DeclarationName(&II));
- ReactRes.first != ReactRes.second; ++ReactRes.first) {
- if (CXXMethodDecl *React = dyn_cast<CXXMethodDecl>(*ReactRes.first)) {
+ auto ReactRes = SrcState->lookup(DeclarationName(&II));
+ for (auto it = ReactRes.begin(), end=ReactRes.end(); it != end; ++it) {
+ if (CXXMethodDecl *React = dyn_cast<CXXMethodDecl>(*it)) {
if (React->getNumParams() >= 1) {
const ParmVarDecl *p = React->getParamDecl(0);
const Type *ParmType = p->getType().getTypePtr();
Diag(React->getLocStart(), diag_warning)
<< React << "has not a parameter";
} else
- Diag((*ReactRes.first)->getSourceRange().getBegin(), diag_warning)
- << (*ReactRes.first)->getDeclKindName() << "is not supported as react method";
+ Diag((*it)->getSourceRange().getBegin(), diag_warning)
+ << (*it)->getDeclKindName() << "is not supported as react method";
i++;
}
return false;
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);
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);
} 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
TemplateArgumentLoc getTemplateArgLoc(const TypeLoc &T, unsigned ArgNum, bool ignore)
{
- if (const ElaboratedTypeLoc *ET = dyn_cast<ElaboratedTypeLoc>(&T))
- return getTemplateArgLoc(ET->getNamedTypeLoc(), ArgNum, ignore);
- else if (const TemplateSpecializationTypeLoc *TST = dyn_cast<TemplateSpecializationTypeLoc>(&T)) {
- if (TST->getNumArgs() >= ArgNum+1) {
- return TST->getArgLoc(ArgNum);
+ if (const ElaboratedTypeLoc ET = T.getAs<ElaboratedTypeLoc>())
+ return getTemplateArgLoc(ET.getNamedTypeLoc(), ArgNum, ignore);
+ else if (const TemplateSpecializationTypeLoc TST = T.getAs<TemplateSpecializationTypeLoc>()) {
+ if (TST.getNumArgs() >= ArgNum+1) {
+ return TST.getArgLoc(ArgNum);
} else
if (!ignore)
- Diag(TST->getBeginLoc(), diag_warning) << TST->getType()->getTypeClassName() << "has not enough arguments" << TST->getSourceRange();
+ Diag(TST.getBeginLoc(), diag_warning) << TST.getType()->getTypeClassName() << "has not enough arguments" << TST.getSourceRange();
} else
Diag(T.getBeginLoc(), diag_warning) << T.getType()->getTypeClassName() << "type as template argument is not supported" << T.getSourceRange();
return TemplateArgumentLoc();
IdentifierInfo& II = ASTCtx->Idents.get("reactions");
// TODO: Lookup for reactions even in base classes - probably by using Sema::LookupQualifiedName()
- for (DeclContext::lookup_result Reactions = RecordDecl->lookup(DeclarationName(&II));
- Reactions.first != Reactions.second; ++Reactions.first, typedef_num++)
- HandleReaction(*Reactions.first, RecordDecl);
+ auto Reactions = RecordDecl->lookup(DeclarationName(&II));
+ for (auto it = Reactions.begin(), end = Reactions.end(); it != end; ++it, typedef_num++)
+ HandleReaction(*it, RecordDecl);
if(typedef_num == 0) {
Diag(RecordDecl->getLocStart(), diag_warning)
<< RecordDecl->getName() << "state has no typedef for reactions";
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";
}
class VisualizeStatechartAction : public PluginASTAction
{
protected:
- ASTConsumer *CreateASTConsumer(CompilerInstance &CI, llvm::StringRef) {
+ std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI, llvm::StringRef) {
size_t dot = getCurrentFile().find_last_of('.');
std::string dest = getCurrentFile().substr(0, dot);
dest.append(".dot");
- return new VisualizeStatechartConsumer(&CI.getASTContext(), dest, CI.getDiagnostics());
+ return std::unique_ptr<ASTConsumer>( new VisualizeStatechartConsumer(&CI.getASTContext(), dest, CI.getDiagnostics()) );
}
bool ParseArgs(const CompilerInstance &CI,
if (args[i] == "-an-error") {
DiagnosticsEngine &D = CI.getDiagnostics();
unsigned DiagID = D.getCustomDiagID(
- DiagnosticsEngine::Error, "invalid argument '" + args[i] + "'");
+ DiagnosticsEngine::Error, "invalid argument '%0' expected '%1'");
D.Report(DiagID);
return false;
}
projects / boost-statechart-viewer.git / blobdiff