Commit b55e4e1a authored by Maximilien Colange's avatar Maximilien Colange

Add 'override' keyword, and fix compilation warnings.

parent 4af063c7
......@@ -596,7 +596,7 @@ void AbstractBuilder::exprSumEnd(const char *name)
throw NotSupportedException("exprSumEnd is not supported");
}
void AbstractBuilder::exprSimulate(int,int,int)
void AbstractBuilder::exprSimulate(int,int,int,bool,int)
{
throw NotSupportedException("exprSimulate is not supported");
}
......@@ -655,7 +655,7 @@ void AbstractBuilder::exprProbaQualitative(int,Constants::kind_t,Constants::kind
throw NotSupportedException("exprProbaQualitative is not supported");
}
void AbstractBuilder::exprProbaQuantitative(int,Constants::kind_t)
void AbstractBuilder::exprProbaQuantitative(int,Constants::kind_t,bool)
{
throw NotSupportedException("exprProbaQuantitative is not supported");
}
......
......@@ -532,27 +532,7 @@ void PrettyPrinter::procBegin(const char *id, const bool isTA,
void PrettyPrinter::procState(const char *id, bool hasInvariant)
{
if (first)
{
first = false;
indent();
*o.top() << "state\n";
}
else
{
*o.top() << ",\n";
}
level++;
indent();
level--;
*o.top() << id;
if (hasInvariant)
{
*o.top() << '{' << st.back() << '}';
st.pop_back();
}
this->procState(id, hasInvariant, false);
}
void PrettyPrinter::procState(const char *id, bool hasInvariant, bool hasExpRate)
......@@ -1021,7 +1001,7 @@ void PrettyPrinter::exprBinary(kind_t op)
}
void PrettyPrinter::exprTernary(kind_t op)
void PrettyPrinter::exprTernary(kind_t op, bool)
{
string exp3 = st.back(); st.pop_back();
string exp2 = st.back(); st.pop_back();
......
This diff is collapsed.
......@@ -346,7 +346,8 @@ namespace UTAP
// Extension for SMC.
virtual void exprSMCControl(int) = 0;
virtual void exprProbaQualitative(int,Constants::kind_t,Constants::kind_t,double) = 0;
virtual void exprProbaQuantitative(int,Constants::kind_t,bool=false) = 0;
virtual void exprProbaQuantitative(int,Constants::kind_t,bool) = 0;
void exprProbaQuantitative(int i, Constants::kind_t k) { exprProbaQuantitative(i,k,false); }
virtual void exprProbaCompare(int,Constants::kind_t,int,Constants::kind_t) = 0;
virtual void exprProbaExpected(int,const char*) = 0;
virtual void exprBuiltinFunction1(Constants::kind_t) = 0;
......@@ -363,7 +364,9 @@ namespace UTAP
virtual void exprMitlDiamond (int,int) = 0;
virtual void exprMitlBox (int,int) = 0;
virtual void exprSimulate(int,int,int,bool=false,int = 0) = 0;
virtual void exprSimulate(int,int,int,bool,int) = 0;
void exprSimulate(int i,int j,int k,bool b) { exprSimulate(i,j,k,b,0); }
void exprSimulate(int i,int j,int k) { exprSimulate(i,j,k,false); }
/********************************************************************
* System declaration
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment