Skip to content

Commit

Permalink
Fix exceptions thrown by FGFunction and caught by FGAerodynamics (#1152)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bcoconni
bcoconni authored Sep 11, 2024
1 parent e607c27 commit 8e4803b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 37 deletions.
36 changes: 18 additions & 18 deletions src/math/FGFunction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@ constexpr unsigned int MaxArgs = 9999;

//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

class WrongNumberOfArguments : public runtime_error
class WrongNumberOfArguments : public BaseException
{
public:
WrongNumberOfArguments(const string &msg, const vector<FGParameter_ptr> &p,
Element* el)
: runtime_error(msg), Parameters(p), element(el) {}
: BaseException(msg), Parameters(p), element(el) {}
size_t NumberOfArguments(void) const { return Parameters.size(); }
FGParameter* FirstParameter(void) const { return *(Parameters.cbegin()); }
const Element* GetElement(void) const { return element; }

private:
const vector<FGParameter_ptr> Parameters;
const Element* element;
const Element_ptr element;
};

//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down Expand Up @@ -158,7 +158,7 @@ bool GetBinary(double val, const string &ctxMsg)
cerr << ctxMsg << FGJSBBase::fgred << FGJSBBase::highint
<< "Malformed conditional check in function definition."
<< FGJSBBase::reset << endl;
throw("Fatal Error.");
throw BaseException("Fatal Error.");
}
}

Expand Down Expand Up @@ -197,7 +197,7 @@ FGParameter_ptr VarArgsFn(const func_t& _f, FGFDMExec* fdmex, Element* el,
return e.FirstParameter();
}
else
throw e.what();
throw e;
}
}

Expand Down Expand Up @@ -272,15 +272,15 @@ void FGFunction::CheckOddOrEvenArguments(Element* el, OddEven odd_even)
cerr << el->ReadFrom() << fgred << highint
<< "<" << el->GetName() << "> must have an even number of arguments."
<< reset << endl;
throw("Fatal Error");
throw BaseException("Fatal Error");
}
break;
case OddEven::Odd:
if (Parameters.size() % 2 == 0) {
cerr << el->ReadFrom() << fgred << highint
<< "<" << el->GetName() << "> must have an odd number of arguments."
<< reset << endl;
throw("Fatal Error");
throw BaseException("Fatal Error");
}
break;
default:
Expand Down Expand Up @@ -310,7 +310,7 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
{
Name = el->GetAttributeValue("name");
Element* element = el->GetElement();

auto sum = [](const decltype(Parameters)& Parameters)->double {
double temp = 0.0;

Expand All @@ -319,7 +319,7 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,

return temp;
};

while (element) {
string operation = element->GetName();

Expand All @@ -338,7 +338,7 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
cerr << element->ReadFrom()
<< fgred << "Illegal use of the special character '#'"
<< reset << endl;
throw("Fatal Error.");
throw BaseException("Fatal Error.");
}
}

Expand Down Expand Up @@ -665,7 +665,7 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
cerr << ctxMsg << fgred << highint
<< "The switch function index (" << temp
<< ") is negative." << reset << endl;
throw("Fatal error");
throw BaseException("Fatal error");
}
size_t n = p.size()-1;
size_t i = static_cast<size_t>(temp+0.5);
Expand All @@ -678,7 +678,7 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
<< ") selected a value above the range of supplied values"
<< "[0:" << n-1 << "]"
<< " - not enough values were supplied." << reset << endl;
throw("Fatal error");
throw BaseException("Fatal error");
}
};
Parameters.push_back(new aFunc<decltype(f), 2>(f, fdmex, element, Prefix,
Expand Down Expand Up @@ -767,10 +767,10 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
double sina = sin(alpha_local);
double cosb;

if (fabs(cosa) > fabs(sina))
if (fabs(cosa) > fabs(sina))
cosb = wind_local(eX) / cosa;
else
cosb = wind_local(eZ) / sina;
cosb = wind_local(eZ) / sina;

return atan2(wind_local(eY), cosb)*radtodeg;
};
Expand Down Expand Up @@ -839,7 +839,7 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
cerr << ctxMsg << fgred << highint
<< "The index must be one of the integer value 1, 2 or 3."
<< reset << endl;
throw("Fatal error");
throw BaseException("Fatal error");
}

FGQuaternion qa(eY, -alpha), qb(eZ, beta), qc(eX, -gamma);
Expand Down Expand Up @@ -867,7 +867,7 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
cerr << ctxMsg << fgred << highint
<< "The index must be one of the integer value 1, 2 or 3."
<< reset << endl;
throw("Fatal error");
throw BaseException("Fatal error");
}

FGQuaternion qa(eY, -alpha), qb(eZ, beta), qc(eX, -gamma);
Expand Down Expand Up @@ -954,7 +954,7 @@ void FGFunction::cacheValue(bool cache)
cached = true;
}
}

//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

double FGFunction::GetValue(void) const
Expand Down Expand Up @@ -1007,7 +1007,7 @@ string FGFunction::CreateOutputNode(Element* el, const string& Prefix)
if (pNode->isTied()) {
cerr << el->ReadFrom()
<< "Property " << nName << " has already been successfully bound (late)." << endl;
throw("Failed to bind the property to an existing already tied node.");
throw BaseException("Failed to bind the property to an existing already tied node.");
}
}

Expand Down
27 changes: 8 additions & 19 deletions src/models/FGAerodynamics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,30 +372,19 @@ bool FGAerodynamics::Load(Element *document)
axis = axis_element->GetAttributeValue("name");
function_element = axis_element->FindElement("function");
while (function_element) {
string current_func_name = function_element->GetAttributeValue("name");
bool apply_at_cg = false;
if (function_element->HasAttribute("apply_at_cg")) {
if (function_element->GetAttributeValue("apply_at_cg") == "true") apply_at_cg = true;
}
if (!apply_at_cg) {
try {
ca.push_back( new FGFunction(FDMExec, function_element) );
} catch (const string& str) {
if (function_element->HasAttribute("apply_at_cg") &&
function_element->GetAttributeValue("apply_at_cg") == "true")
ca_atCG.push_back(new FGFunction(FDMExec, function_element));
else
ca.push_back(new FGFunction(FDMExec, function_element));
} catch (BaseException& e) {
string current_func_name = function_element->GetAttributeValue("name");
FGXMLLogging log(FDMExec->GetLogger(), axis_element, LogLevel::ERROR);
log << LogFormat::RED << "\nError loading aerodynamic function in "
<< current_func_name << ":" << str << " Aborting.\n" << LogFormat::RESET;
<< current_func_name << ":" << e.what() << " Aborting.\n" << LogFormat::RESET;
return false;
}
} else {
try {
ca_atCG.push_back( new FGFunction(FDMExec, function_element) );
} catch (const string& str) {
FGXMLLogging log(FDMExec->GetLogger(), axis_element, LogLevel::ERROR);
log << LogFormat::RED << "\nError loading aerodynamic function in "
<< current_func_name << ":" << str << " Aborting.\n" << LogFormat::RESET;
return false;
}
}
function_element = axis_element->FindNextElement("function");
}
AeroFunctions[AxisIdx[axis]] = ca;
Expand Down

0 comments on commit 8e4803b

Please sign in to comment.