artur/reactics
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Includes, clean-up

Browse Source 
We are trying to avoid including stuff whenever possible.
Forward declarations are prefered in most cases, just in case...
This commit is contained in:
Artur Meski
2018-09-22 20:05:35 +01:00
parent d4ac425963
commit a36ed9651f
15 changed files with 103 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
formrsctlk.cc
View File

@@ -9,12 +9,12 @@
#include "formrsctlk.hh"
std::string BoolContexts::toStr(void) const
std::string StateConstr::toStr(void) const
{
if (oper == BCTX_PV) {
if (oper == STC_PV) {
return proc_name + "." + entity_name;
}
else if (oper == BCTX_TF) {
else if (oper == STC_TF) {
if (tf) {
return "true";
}
@@ -22,16 +22,16 @@ std::string BoolContexts::toStr(void) const
return "false";
}
}
else if (oper == BCTX_AND) {
else if (oper == STC_AND) {
return "(" + arg[0]->toStr() + " AND " + arg[1]->toStr() + ")";
}
else if (oper == BCTX_OR) {
else if (oper == STC_OR) {
return "(" + arg[0]->toStr() + " OR " + arg[1]->toStr() + ")";
}
else if (oper == BCTX_XOR) {
else if (oper == STC_XOR) {
return "(" + arg[0]->toStr() + " XOR " + arg[1]->toStr() + ")";
}
else if (oper == BCTX_NOT) {
else if (oper == STC_NOT) {
return "~" + arg[0]->toStr();
}
@@ -41,12 +41,12 @@ std::string BoolContexts::toStr(void) const
}
}
BDD BoolContexts::getBDD(const SymRS *srs) const
BDD StateConstr::getBDD(const SymRS *srs) const
{
if (oper == BCTX_PV) {
if (oper == STC_PV) {
return srs->encActStrEntity(proc_name, entity_name);
}
else if (oper == BCTX_TF) {
else if (oper == STC_TF) {
if (tf) {
return srs->getBDDtrue();
}
@@ -54,16 +54,16 @@ BDD BoolContexts::getBDD(const SymRS *srs) const
return srs->getBDDfalse();
}
}
else if (oper == BCTX_AND) {
else if (oper == STC_AND) {
return arg[0]->getBDD(srs) * arg[1]->getBDD(srs);
}
else if (oper == BCTX_OR) {
else if (oper == STC_OR) {
return arg[0]->getBDD(srs) + arg[1]->getBDD(srs);
}
else if (oper == BCTX_XOR) {
else if (oper == STC_XOR) {
return arg[0]->getBDD(srs) ^ arg[1]->getBDD(srs);
}
else if (oper == BCTX_NOT) {
else if (oper == STC_NOT) {
return !arg[0]->getBDD(srs);
}
else {