Skip to content

Commit

Permalink
^ uglified template arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrew-gresyk
andrew-gresyk committed Nov 25, 2019
1 parent f30ac97 commit 0908278
Show file tree
Hide file tree
Showing 20 changed files with 1,734 additions and 1,734 deletions.
156 changes: 78 additions & 78 deletions include/hfsm2/detail/control.inl
View file
Expand Up @@ -3,9 +3,9 @@ namespace detail {

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
ControlT<TA>::Region::Region(ControlT& control_,
const RegionID id)
template <typename TArgs>
ControlT<TArgs>::Region::Region(ControlT& control_,
const RegionID id)
: control{control_}
, prevId{control._regionId}
{
Expand All @@ -14,36 +14,36 @@ ControlT<TA>::Region::Region(ControlT& control_,

//------------------------------------------------------------------------------

template <typename TA>
ControlT<TA>::Region::~Region() {
template <typename TArgs>
ControlT<TArgs>::Region::~Region() {
control.resetRegion(prevId);
}

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
template <typename TArgs>
void
ControlT<TA>::setRegion(const RegionID id) {
ControlT<TArgs>::setRegion(const RegionID id) {
HFSM_ASSERT(_regionId <= id && id < RegionList::SIZE);

_regionId = id;
}

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
ControlT<TA>::resetRegion(const RegionID id) { //-V524
ControlT<TArgs>::resetRegion(const RegionID id) { //-V524
HFSM_ASSERT(id <= _regionId && _regionId < RegionList::SIZE);

_regionId = id;
}

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
PlanControlT<TA>::Origin::Origin(PlanControlT& control_,
const StateID id)
template <typename TArgs>
PlanControlT<TArgs>::Origin::Origin(PlanControlT& control_,
const StateID id)
: control{control_}
, prevId{control._originId}
{
Expand All @@ -52,18 +52,18 @@ PlanControlT<TA>::Origin::Origin(PlanControlT& control_,

//------------------------------------------------------------------------------

template <typename TA>
PlanControlT<TA>::Origin::~Origin() {
template <typename TArgs>
PlanControlT<TArgs>::Origin::~Origin() {
control.resetOrigin(prevId);
}

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
PlanControlT<TA>::Region::Region(PlanControlT& control_,
const RegionID id,
const StateID index,
const LongIndex size)
template <typename TArgs>
PlanControlT<TArgs>::Region::Region(PlanControlT& control_,
const RegionID id,
const StateID index,
const LongIndex size)
: control{control_}
, prevId{control._regionId}
, prevIndex{control._regionIndex}
Expand All @@ -74,18 +74,18 @@ PlanControlT<TA>::Region::Region(PlanControlT& control_,

//------------------------------------------------------------------------------

template <typename TA>
PlanControlT<TA>::Region::~Region() {
template <typename TArgs>
PlanControlT<TArgs>::Region::~Region() {
control.resetRegion(prevId, prevIndex, prevSize);

control._status.clear();
}

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
template <typename TArgs>
void
PlanControlT<TA>::setOrigin(const StateID id) {
PlanControlT<TArgs>::setOrigin(const StateID id) {
HFSM_ASSERT(_regionId + _regionSize <= StateList::SIZE);
HFSM_ASSERT(_originId <= id && id < StateList::SIZE);

Expand All @@ -94,9 +94,9 @@ PlanControlT<TA>::setOrigin(const StateID id) {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
PlanControlT<TA>::resetOrigin(const StateID id) { //-V524
PlanControlT<TArgs>::resetOrigin(const StateID id) { //-V524
HFSM_ASSERT(_regionId + _regionSize <= StateList::SIZE);
HFSM_ASSERT(id <= _originId && _originId < StateList::SIZE);

Expand All @@ -105,11 +105,11 @@ PlanControlT<TA>::resetOrigin(const StateID id) { //-V524

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
PlanControlT<TA>::setRegion(const RegionID id,
const StateID index,
const LongIndex size)
PlanControlT<TArgs>::setRegion(const RegionID id,
const StateID index,
const LongIndex size)
{
HFSM_ASSERT(_regionId <= id && id < RegionList::SIZE);
HFSM_ASSERT(_regionIndex <= index && index + size <= _regionIndex + _regionSize);
Expand All @@ -121,11 +121,11 @@ PlanControlT<TA>::setRegion(const RegionID id,

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
PlanControlT<TA>::resetRegion(const RegionID id, //-V524
const StateID index,
const LongIndex size)
PlanControlT<TArgs>::resetRegion(const RegionID id, //-V524
const StateID index,
const LongIndex size)
{
HFSM_ASSERT(id <= _regionId && _regionId < RegionList::SIZE);
HFSM_ASSERT(index <= _regionIndex && _regionIndex + _regionSize <= index + size);
Expand All @@ -137,8 +137,8 @@ PlanControlT<TA>::resetRegion(const RegionID id, //-V524

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
FullControlT<TA>::Lock::Lock(FullControlT& control_)
template <typename TArgs>
FullControlT<TArgs>::Lock::Lock(FullControlT& control_)
: control(!control_._locked ? &control_ : nullptr)
{
if (control)
Expand All @@ -147,19 +147,19 @@ FullControlT<TA>::Lock::Lock(FullControlT& control_)

//------------------------------------------------------------------------------

template <typename TA>
FullControlT<TA>::Lock::~Lock() {
template <typename TArgs>
FullControlT<TArgs>::Lock::~Lock() {
if (control)
control->_locked = false;
}

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
template <typename TArgs>
template <typename TState>
Status
FullControlT<TA>::updatePlan(TState& headState,
const Status subStatus)
FullControlT<TArgs>::updatePlan(TState& headState,
const Status subStatus)
{
using State = TState;
static constexpr StateID STATE_ID = State::STATE_ID;
Expand Down Expand Up @@ -202,10 +202,10 @@ FullControlT<TA>::updatePlan(TState& headState,

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
template <typename TState>
Status
FullControlT<TA>::buildPlanStatus() {
FullControlT<TArgs>::buildPlanStatus() {
using State = TState;
static constexpr StateID STATE_ID = State::STATE_ID;

Expand Down Expand Up @@ -235,9 +235,9 @@ FullControlT<TA>::buildPlanStatus() {

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::changeTo(const StateID stateId) {
FullControlT<TArgs>::changeTo(const StateID stateId) {
if (!_locked) {
const Request request{Request::Type::CHANGE, stateId};
_requests << request;
Expand All @@ -251,10 +251,10 @@ FullControlT<TA>::changeTo(const StateID stateId) {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::changeTo(const StateID stateId,
const Payload& payload)
FullControlT<TArgs>::changeTo(const StateID stateId,
const Payload& payload)
{
if (!_locked) {
const Request request{Request::Type::CHANGE, stateId, payload};
Expand All @@ -269,9 +269,9 @@ FullControlT<TA>::changeTo(const StateID stateId,

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::restart(const StateID stateId) {
FullControlT<TArgs>::restart(const StateID stateId) {
if (!_locked) {
const Request request{Request::Type::RESTART, stateId};
_requests << request;
Expand All @@ -285,10 +285,10 @@ FullControlT<TA>::restart(const StateID stateId) {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::restart(const StateID stateId,
const Payload& payload)
FullControlT<TArgs>::restart(const StateID stateId,
const Payload& payload)
{
if (!_locked) {
const Request request{Request::Type::RESTART, stateId, payload};
Expand All @@ -303,9 +303,9 @@ FullControlT<TA>::restart(const StateID stateId,

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::resume(const StateID stateId) {
FullControlT<TArgs>::resume(const StateID stateId) {
if (!_locked) {
const Request request{Request::Type::RESUME, stateId};
_requests << request;
Expand All @@ -319,10 +319,10 @@ FullControlT<TA>::resume(const StateID stateId) {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::resume(const StateID stateId,
const Payload& payload)
FullControlT<TArgs>::resume(const StateID stateId,
const Payload& payload)
{
if (!_locked) {
const Request request{Request::Type::RESUME, stateId, payload};
Expand All @@ -337,9 +337,9 @@ FullControlT<TA>::resume(const StateID stateId,

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::utilize(const StateID stateId) {
FullControlT<TArgs>::utilize(const StateID stateId) {
if (!_locked) {
const Request request{Request::Type::UTILIZE, stateId};
_requests << request;
Expand All @@ -353,10 +353,10 @@ FullControlT<TA>::utilize(const StateID stateId) {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::utilize(const StateID stateId,
const Payload& payload)
FullControlT<TArgs>::utilize(const StateID stateId,
const Payload& payload)
{
if (!_locked) {
const Request request{Request::Type::UTILIZE, stateId, payload};
Expand All @@ -371,9 +371,9 @@ FullControlT<TA>::utilize(const StateID stateId,

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::randomize(const StateID stateId) {
FullControlT<TArgs>::randomize(const StateID stateId) {
if (!_locked) {
const Request request{Request::Type::RANDOMIZE, stateId};
_requests << request;
Expand All @@ -387,10 +387,10 @@ FullControlT<TA>::randomize(const StateID stateId) {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::randomize(const StateID stateId,
const Payload& payload)
FullControlT<TArgs>::randomize(const StateID stateId,
const Payload& payload)
{
if (!_locked) {
const Request request{Request::Type::RANDOMIZE, stateId, payload};
Expand All @@ -405,9 +405,9 @@ FullControlT<TA>::randomize(const StateID stateId,

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::schedule(const StateID stateId) {
FullControlT<TArgs>::schedule(const StateID stateId) {
const Request transition{Request::Type::SCHEDULE, stateId};
_requests << transition;

Expand All @@ -416,10 +416,10 @@ FullControlT<TA>::schedule(const StateID stateId) {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::schedule(const StateID stateId,
const Payload& payload)
FullControlT<TArgs>::schedule(const StateID stateId,
const Payload& payload)
{
const Request transition{Request::Type::SCHEDULE, stateId, payload};
_requests << transition;
Expand All @@ -429,9 +429,9 @@ FullControlT<TA>::schedule(const StateID stateId,

//------------------------------------------------------------------------------

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::succeed() {
FullControlT<TArgs>::succeed() {
_status.result = Status::SUCCESS;

_planData.tasksSuccesses.set(_originId);
Expand All @@ -448,9 +448,9 @@ FullControlT<TA>::succeed() {

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

template <typename TA>
template <typename TArgs>
void
FullControlT<TA>::fail() {
FullControlT<TArgs>::fail() {
_status.result = Status::FAILURE;

_planData.tasksFailures.set(_originId);
Expand All @@ -467,9 +467,9 @@ FullControlT<TA>::fail() {

////////////////////////////////////////////////////////////////////////////////

template <typename TA>
template <typename TArgs>
void
GuardControlT<TA>::cancelPendingTransitions() {
GuardControlT<TArgs>::cancelPendingTransitions() {
_cancelled = true;

HFSM_LOG_CANCELLED_PENDING(context(), _originId);
Expand Down

0 comments on commit 0908278

Please sign in to comment.