Reformatting

2018-03-28 21:00:44 +01:00
parent c90a87875a
commit 5f1a759c8f
18 changed files with 2204 additions and 2056 deletions
--- a/formrsctl.cc
+++ b/formrsctl.cc
@@ -11,313 +11,300 @@

 std::string BoolContexts::toStr(void) const
 {
-    if (oper == BCTX_PV)
-    {
-        return name;
+  if (oper == BCTX_PV) {
+    return name;
+  }
+  else if (oper == BCTX_TF) {
+    if (tf) {
+      return "true";
    }
-    else if (oper == BCTX_TF)
-    {
-        if (tf) return "true";
-        else return "false";
-    }
-    else if (oper == BCTX_AND)
-    {
-        return "(" + arg[0]->toStr() + " AND " + arg[1]->toStr() + ")";
-    }
-    else if (oper == BCTX_OR)
-    {
-        return "(" + arg[0]->toStr() + " OR " + arg[1]->toStr() + ")";
-    }
-    else if (oper == BCTX_XOR)
-    {
-        return "(" + arg[0]->toStr() + " XOR " + arg[1]->toStr() + ")";
-    }
-    else if (oper == BCTX_NOT)
-    {
-        return "~" + arg[0]->toStr();
-    }
-	
-	else
-    {
-        return "??";
-        assert(0);
+    else {
+      return "false";
    }
+  }
+  else if (oper == BCTX_AND) {
+    return "(" + arg[0]->toStr() + " AND " + arg[1]->toStr() + ")";
+  }
+  else if (oper == BCTX_OR) {
+    return "(" + arg[0]->toStr() + " OR " + arg[1]->toStr() + ")";
+  }
+  else if (oper == BCTX_XOR) {
+    return "(" + arg[0]->toStr() + " XOR " + arg[1]->toStr() + ")";
+  }
+  else if (oper == BCTX_NOT) {
+    return "~" + arg[0]->toStr();
+  }
+
+  else {
+    return "??";
+    assert(0);
+  }
 }

 BDD BoolContexts::getBDD(const SymRS *srs) const
 {
-	if (oper == BCTX_PV)
-	{
-		return srs->encActStrEntity(name);
-	}
-	else if (oper == BCTX_TF)
-	{
-		if (tf) return srs->getBDDtrue();
-		else return srs->getBDDfalse();
-	}
-	else if (oper == BCTX_AND)
-	{
-		return arg[0]->getBDD(srs) * arg[1]->getBDD(srs);
-	}
-	else if (oper == BCTX_OR)
-	{
-		return arg[0]->getBDD(srs) + arg[1]->getBDD(srs);
-	}
-	else if (oper == BCTX_XOR)
-	{
-		return arg[0]->getBDD(srs) ^ arg[1]->getBDD(srs);
-	}
-	else if (oper == BCTX_NOT)
-	{
-		return !arg[0]->getBDD(srs);
-	}
-	else
-	{
-		assert(0);
-		FERROR("Undefined operator used in Boolean context definition. This should not happen.");
-		return srs->getBDDfalse();
-	}
+  if (oper == BCTX_PV) {
+    return srs->encActStrEntity(name);
+  }
+  else if (oper == BCTX_TF) {
+    if (tf) {
+      return srs->getBDDtrue();
+    }
+    else {
+      return srs->getBDDfalse();
+    }
+  }
+  else if (oper == BCTX_AND) {
+    return arg[0]->getBDD(srs) * arg[1]->getBDD(srs);
+  }
+  else if (oper == BCTX_OR) {
+    return arg[0]->getBDD(srs) + arg[1]->getBDD(srs);
+  }
+  else if (oper == BCTX_XOR) {
+    return arg[0]->getBDD(srs) ^ arg[1]->getBDD(srs);
+  }
+  else if (oper == BCTX_NOT) {
+    return !arg[0]->getBDD(srs);
+  }
+  else {
+    assert(0);
+    FERROR("Undefined operator used in Boolean context definition. This should not happen.");
+    return srs->getBDDfalse();
+  }
 }

 std::string FormRSCTL::toStr(void) const
 {
-    if (oper == RSCTL_PV)
-    {
-        return name;
+  if (oper == RSCTL_PV) {
+    return name;
+  }
+  else if (oper == RSCTL_TF) {
+    if (tf) {
+      return "true";
    }
-    else if (oper == RSCTL_TF)
-    {
-        if (tf) return "true";
-        else return "false";
-    }
-    else if (oper == RSCTL_AND)
-    {
-        return "(" + arg[0]->toStr() + " AND " + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_OR)
-    {
-        return "(" + arg[0]->toStr() + " OR " + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_XOR)
-    {
-        return "(" + arg[0]->toStr() + " XOR " + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_IMPL)
-    {
-        return "(" + arg[0]->toStr() + " IMPLIES " + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_NOT)
-    {
-        return "~" + arg[0]->toStr();
-    }
-    else if (oper == RSCTL_EX)
-    {
-        return "EX(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_EG)
-    {
-        return "EG(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_EU)
-    {
-        return "EU(" + arg[0]->toStr() + "," + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_EF)
-    {
-        return "EF(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AX)
-    {
-        return "AX(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AG)
-    {
-        return "AG(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AU)
-    {
-        return "AU(" + arg[0]->toStr() + "," + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AF)
-    {
-        return "AF(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_EX_ACT)
-    {
-        return "E" + getActionsStr() + "X(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_EG_ACT)
-    {
-        return "E" + getActionsStr() + "G(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_EU_ACT)
-    {
-        return "E" + getActionsStr() + "U(" + arg[0]->toStr() + "," + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_EF_ACT)
-    {
-        return "E" + getActionsStr() + "F(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AX_ACT)
-    {
-        return "A" + getActionsStr() + "X(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AG_ACT)
-    {
-        return "A" + getActionsStr() + "G(" + arg[0]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AU_ACT)
-    {
-        return "A" + getActionsStr() + "U(" + arg[0]->toStr() + "," + arg[1]->toStr() + ")";
-    }
-    else if (oper == RSCTL_AF_ACT)
-    {
-        return "A" + getActionsStr() + "F(" + arg[0]->toStr() + ")";
+    else {
+      return "false";
    }
+  }
+  else if (oper == RSCTL_AND) {
+    return "(" + arg[0]->toStr() + " AND " + arg[1]->toStr() + ")";
+  }
+  else if (oper == RSCTL_OR) {
+    return "(" + arg[0]->toStr() + " OR " + arg[1]->toStr() + ")";
+  }
+  else if (oper == RSCTL_XOR) {
+    return "(" + arg[0]->toStr() + " XOR " + arg[1]->toStr() + ")";
+  }
+  else if (oper == RSCTL_IMPL) {
+    return "(" + arg[0]->toStr() + " IMPLIES " + arg[1]->toStr() + ")";
+  }
+  else if (oper == RSCTL_NOT) {
+    return "~" + arg[0]->toStr();
+  }
+  else if (oper == RSCTL_EX) {
+    return "EX(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_EG) {
+    return "EG(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_EU) {
+    return "EU(" + arg[0]->toStr() + "," + arg[1]->toStr() + ")";
+  }
+  else if (oper == RSCTL_EF) {
+    return "EF(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_AX) {
+    return "AX(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_AG) {
+    return "AG(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_AU) {
+    return "AU(" + arg[0]->toStr() + "," + arg[1]->toStr() + ")";
+  }
+  else if (oper == RSCTL_AF) {
+    return "AF(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_EX_ACT) {
+    return "E" + getActionsStr() + "X(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_EG_ACT) {
+    return "E" + getActionsStr() + "G(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_EU_ACT) {
+    return "E" + getActionsStr() + "U(" + arg[0]->toStr() + "," + arg[1]->toStr()
+           + ")";
+  }
+  else if (oper == RSCTL_EF_ACT) {
+    return "E" + getActionsStr() + "F(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_AX_ACT) {
+    return "A" + getActionsStr() + "X(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_AG_ACT) {
+    return "A" + getActionsStr() + "G(" + arg[0]->toStr() + ")";
+  }
+  else if (oper == RSCTL_AU_ACT) {
+    return "A" + getActionsStr() + "U(" + arg[0]->toStr() + "," + arg[1]->toStr()
+           + ")";
+  }
+  else if (oper == RSCTL_AF_ACT) {
+    return "A" + getActionsStr() + "F(" + arg[0]->toStr() + ")";
+  }

-    else
-    {
-        return "??";
-        assert(0);
-    }
+  else {
+    return "??";
+    assert(0);
+  }
 }

 bool FormRSCTL::hasOper(Oper op) const
 {
-    if (oper == op)
-        return true;
-    else
-    {
-        bool result = false;
-        if (arg[0] != nullptr) result = arg[0]->hasOper(op);
-        if (!result && arg[1] != nullptr) result = arg[1]->hasOper(op);
-        return result;
+  if (oper == op) {
+    return true;
+  }
+  else {
+    bool result = false;
+
+    if (arg[0] != nullptr) {
+      result = arg[0]->hasOper(op);
    }
+
+    if (!result && arg[1] != nullptr) {
+      result = arg[1]->hasOper(op);
+    }
+
+    return result;
+  }
 }

 void FormRSCTL::encodeEntities(const SymRS *srs)
 {
-    if (RSCTL_COND_1ARG(oper))
-    {
-        arg[0]->encodeEntities(srs);
-    }
-    else if (RSCTL_COND_2ARG(oper))
-    {
-        arg[0]->encodeEntities(srs);
-        arg[1]->encodeEntities(srs);
-    }
-    else if (oper == RSCTL_PV)
-    {
-        bdd = new BDD(srs->encEntity(name));
-    }
+  if (RSCTL_COND_1ARG(oper)) {
+    arg[0]->encodeEntities(srs);
+  }
+  else if (RSCTL_COND_2ARG(oper)) {
+    arg[0]->encodeEntities(srs);
+    arg[1]->encodeEntities(srs);
+  }
+  else if (oper == RSCTL_PV) {
+    bdd = new BDD(srs->encEntity(name));
+  }
 }

 bool FormRSCTL::isERSCTL(void) const
 {
-    if (oper == RSCTL_PV)
-    {
-        return true;
+  if (oper == RSCTL_PV) {
+    return true;
+  }
+
+  if (oper == RSCTL_NOT) {
+    if (arg[0]->getOper() == RSCTL_PV || arg[0]->getOper() == RSCTL_TF) {
+      return true;
    }
-
-    if (oper == RSCTL_NOT)
-    {
-        if (arg[0]->getOper() == RSCTL_PV || arg[0]->getOper() == RSCTL_TF)
-            return true;
-        else
-            return false;
+    else {
+      return false;
    }
+  }

-    if (RSCTL_COND_IS_UNIVERSAL(oper))
-    {
-        return false;
-    }
-
-    if (RSCTL_COND_1ARG(oper))
-    {
-        return arg[0]->isERSCTL();
-    }
-
-    if (RSCTL_COND_2ARG(oper))
-    {
-        return arg[0]->isERSCTL() && arg[1]->isERSCTL();
-    }
-
-    assert(0);
-
+  if (RSCTL_COND_IS_UNIVERSAL(oper)) {
    return false;
+  }
+
+  if (RSCTL_COND_1ARG(oper)) {
+    return arg[0]->isERSCTL();
+  }
+
+  if (RSCTL_COND_2ARG(oper)) {
+    return arg[0]->isERSCTL() && arg[1]->isERSCTL();
+  }
+
+  assert(0);
+
+  return false;
 }

 std::string FormRSCTL::getActionsStr(void) const
 {
-	if (actions != nullptr)
-	{
-	    std::string r = "[ ";
-	    bool firstact = true;
+  if (actions != nullptr) {
+    std::string r = "[ ";
+    bool firstact = true;

-	    for (ActionsVec_f::iterator act = actions->begin(); act != actions->end(); ++act)
-	    {
-	        if (!firstact) r += ",";
-	        else firstact = false;
-	        r += "{";
-	        bool firstent = true;
-	        for (Action_f::iterator ent = act->begin(); ent != act->end(); ++ent)
-	        {
-	            if (!firstent) r += ",";
-	            else firstent = false;
-	            r += *ent; 
-	        }
-	        r += "}";
-	    }
-		r += " ]";		
-	    return r;
-	}
-	else if (boolCtx != nullptr)
-	{
-		return "< " + boolCtx->toStr() + " >";
-	}
-	else
-	{
-		FERROR("Context not specified. This should not happen.");
-	}
+    for (ActionsVec_f::iterator act = actions->begin(); act != actions->end();
+         ++act) {
+      if (!firstact) {
+        r += ",";
+      }
+      else {
+        firstact = false;
+      }
+
+      r += "{";
+      bool firstent = true;
+
+      for (Action_f::iterator ent = act->begin(); ent != act->end(); ++ent) {
+        if (!firstent) {
+          r += ",";
+        }
+        else {
+          firstent = false;
+        }
+
+        r += *ent;
+      }
+
+      r += "}";
+    }
+
+    r += " ]";
+    return r;
+  }
+  else if (boolCtx != nullptr) {
+    return "< " + boolCtx->toStr() + " >";
+  }
+  else {
+    FERROR("Context not specified. This should not happen.");
+  }
 }

 void FormRSCTL::encodeActions(const SymRS *srs)
 {
-    if (RSCTL_COND_ACT(oper))
-    {
-        if (actions_bdd != nullptr) forgetActionsBDD();
-        actions_bdd = new BDD(srs->getBDDfalse());
-        assert(actions != nullptr || boolCtx != nullptr);
-		assert(!(actions != nullptr && boolCtx != nullptr));
-		if (actions != nullptr)
-		{
-	        for (ActionsVec_f::iterator act = actions->begin(); act != actions->end(); ++act)
-	        {
-	            BDD single_action = srs->getBDDtrue();
-	            for (Action_f::iterator ent = act->begin(); ent != act->end(); ++ent)
-	            {
-	                single_action *= srs->encActStrEntity(*ent); 
-	            }
-	            single_action = srs->compContext(single_action);
-	            *actions_bdd += single_action;
-	        }
-		}
-		else if (boolCtx != nullptr)
-		{
-			*actions_bdd = boolCtx->getBDD(srs);
-		}
-		else
-			assert(0);
+  if (RSCTL_COND_ACT(oper)) {
+    if (actions_bdd != nullptr) {
+      forgetActionsBDD();
    }

-    if (RSCTL_COND_1ARG(oper))
-    {
-        arg[0]->encodeActions(srs);
-    }
+    actions_bdd = new BDD(srs->getBDDfalse());
+    assert(actions != nullptr || boolCtx != nullptr);
+    assert(!(actions != nullptr && boolCtx != nullptr));

-    if (RSCTL_COND_2ARG(oper))
-    {
-        arg[0]->encodeActions(srs);
-        arg[1]->encodeActions(srs);
+    if (actions != nullptr) {
+      for (ActionsVec_f::iterator act = actions->begin(); act != actions->end();
+           ++act) {
+        BDD single_action = srs->getBDDtrue();
+
+        for (Action_f::iterator ent = act->begin(); ent != act->end(); ++ent) {
+          single_action *= srs->encActStrEntity(*ent);
+        }
+
+        single_action = srs->compContext(single_action);
+        *actions_bdd += single_action;
+      }
    }
+    else if (boolCtx != nullptr) {
+      *actions_bdd = boolCtx->getBDD(srs);
+    }
+    else {
+      assert(0);
+    }
+  }
+
+  if (RSCTL_COND_1ARG(oper)) {
+    arg[0]->encodeActions(srs);
+  }
+
+  if (RSCTL_COND_2ARG(oper)) {
+    arg[0]->encodeActions(srs);
+    arg[1]->encodeActions(srs);
+  }
 }