clang-tidy: modernize-concat-nested-namespaces (NFC)

This commit is contained in:
Peter Johnson
2020-12-28 01:19:59 -08:00
parent 67e03e625d
commit 6131f4e32b
162 changed files with 324 additions and 656 deletions

View File

@@ -8,11 +8,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAccelerometer() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
void HAL_SetAccelerometerActive(HAL_Bool active) {

View File

@@ -24,8 +24,7 @@ static LimitedHandleResource<HAL_AddressableLEDHandle, AddressableLED,
kNumAddressableLEDs,
HAL_HandleEnum::AddressableLED>* ledHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAddressableLED() {
static LimitedHandleResource<HAL_AddressableLEDHandle, AddressableLED,
kNumAddressableLEDs,
@@ -33,8 +32,7 @@ void InitializeAddressableLED() {
dcH;
ledHandles = &dcH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_AddressableLEDHandle HAL_InitializeAddressableLED(

View File

@@ -9,11 +9,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogAccumulator() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_Bool HAL_IsAccumulatorChannel(HAL_AnalogInputHandle analogPortHandle,

View File

@@ -23,16 +23,14 @@ using namespace hal;
static IndexedHandleResource<HAL_GyroHandle, AnalogGyro, kNumAccumulators,
HAL_HandleEnum::AnalogGyro>* analogGyroHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogGyro() {
static IndexedHandleResource<HAL_GyroHandle, AnalogGyro, kNumAccumulators,
HAL_HandleEnum::AnalogGyro>
agH;
analogGyroHandles = &agH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_GyroHandle HAL_InitializeAnalogGyro(HAL_AnalogInputHandle analogHandle,

View File

@@ -13,11 +13,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogInput() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(HAL_PortHandle portHandle,

View File

@@ -12,13 +12,11 @@ IndexedHandleResource<HAL_AnalogInputHandle, hal::AnalogPort, kNumAnalogInputs,
HAL_HandleEnum::AnalogInput>* analogInputHandles;
} // namespace hal
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogInternal() {
static IndexedHandleResource<HAL_AnalogInputHandle, hal::AnalogPort,
kNumAnalogInputs, HAL_HandleEnum::AnalogInput>
aiH;
analogInputHandles = &aiH;
}
} // namespace init
} // namespace hal
} // namespace hal::init

View File

@@ -23,16 +23,14 @@ static IndexedHandleResource<HAL_AnalogOutputHandle, AnalogOutput,
kNumAnalogOutputs, HAL_HandleEnum::AnalogOutput>*
analogOutputHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogOutput() {
static IndexedHandleResource<HAL_AnalogOutputHandle, AnalogOutput,
kNumAnalogOutputs, HAL_HandleEnum::AnalogOutput>
aoH;
analogOutputHandles = &aoH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_AnalogOutputHandle HAL_InitializeAnalogOutputPort(HAL_PortHandle portHandle,

View File

@@ -28,8 +28,7 @@ static LimitedHandleResource<HAL_AnalogTriggerHandle, AnalogTrigger,
kNumAnalogTriggers, HAL_HandleEnum::AnalogTrigger>*
analogTriggerHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogTrigger() {
static LimitedHandleResource<HAL_AnalogTriggerHandle, AnalogTrigger,
kNumAnalogTriggers,
@@ -37,8 +36,7 @@ void InitializeAnalogTrigger() {
atH;
analogTriggerHandles = &atH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
int32_t hal::GetAnalogTriggerInputIndex(HAL_AnalogTriggerHandle handle,
int32_t* status) {

View File

@@ -8,11 +8,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeCAN() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

View File

@@ -6,8 +6,6 @@
#include "hal/Types.h"
namespace hal {
namespace can {
namespace hal::can {
int32_t GetCANModuleFromHandle(HAL_CANHandle handle, int32_t* status);
} // namespace can
} // namespace hal
} // namespace hal::can

View File

@@ -12,11 +12,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeCompressor() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

View File

@@ -8,11 +8,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeConstants() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
int32_t HAL_GetSystemClockTicksPerMicrosecond(void) {

View File

@@ -16,16 +16,14 @@ LimitedHandleResource<HAL_CounterHandle, Counter, kNumCounters,
HAL_HandleEnum::Counter>* counterHandles;
} // namespace hal
namespace hal {
namespace init {
namespace hal::init {
void InitializeCounter() {
static LimitedHandleResource<HAL_CounterHandle, Counter, kNumCounters,
HAL_HandleEnum::Counter>
cH;
counterHandles = &cH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_CounterHandle HAL_InitializeCounter(HAL_Counter_Mode mode, int32_t* index,

View File

@@ -18,8 +18,7 @@ static LimitedHandleResource<HAL_DigitalPWMHandle, uint8_t,
kNumDigitalPWMOutputs, HAL_HandleEnum::DigitalPWM>*
digitalPWMHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDIO() {
static LimitedHandleResource<HAL_DigitalPWMHandle, uint8_t,
kNumDigitalPWMOutputs,
@@ -27,8 +26,7 @@ void InitializeDIO() {
dpH;
digitalPWMHandles = &dpH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

View File

@@ -31,14 +31,12 @@ static std::atomic<HALSIM_SendErrorHandler> sendErrorHandler{nullptr};
static std::atomic<HALSIM_SendConsoleLineHandler> sendConsoleLineHandler{
nullptr};
namespace hal {
namespace init {
namespace hal::init {
void InitializeDriverStation() {
static wpi::condition_variable nddaC;
newDSDataAvailableCond = &nddaC;
}
} // namespace init
} // namespace hal
} // namespace hal::init
using namespace hal;

View File

@@ -23,16 +23,14 @@ struct Empty {};
static LimitedHandleResource<HAL_DutyCycleHandle, DutyCycle, kNumDutyCycles,
HAL_HandleEnum::DutyCycle>* dutyCycleHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDutyCycle() {
static LimitedHandleResource<HAL_DutyCycleHandle, DutyCycle, kNumDutyCycles,
HAL_HandleEnum::DutyCycle>
dcH;
dutyCycleHandles = &dcH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_DutyCycleHandle HAL_InitializeDutyCycle(HAL_Handle digitalSourceHandle,

View File

@@ -31,8 +31,7 @@ static LimitedHandleResource<HAL_EncoderHandle, Encoder,
static LimitedHandleResource<HAL_FPGAEncoderHandle, Empty, kNumEncoders,
HAL_HandleEnum::FPGAEncoder>* fpgaEncoderHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeEncoder() {
static LimitedHandleResource<HAL_FPGAEncoderHandle, Empty, kNumEncoders,
HAL_HandleEnum::FPGAEncoder>
@@ -44,8 +43,7 @@ void InitializeEncoder() {
eH;
encoderHandles = &eH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_EncoderHandle HAL_InitializeEncoder(

View File

@@ -40,11 +40,9 @@ static std::vector<std::pair<const char*, void*>> gExtensionRegistry;
static std::vector<std::pair<void*, void (*)(void*, const char*, void*)>>
gExtensionListeners;
namespace hal {
namespace init {
namespace hal::init {
void InitializeExtensions() {}
} // namespace init
} // namespace hal
} // namespace hal::init
static bool& GetShowNotFoundMessage() {
static bool showMsg = true;

View File

@@ -57,8 +57,7 @@ static std::vector<std::pair<void*, void (*)(void*)>> gOnShutdown;
static SimPeriodicCallbackRegistry gSimPeriodicBefore;
static SimPeriodicCallbackRegistry gSimPeriodicAfter;
namespace hal {
namespace init {
namespace hal::init {
void InitializeHAL() {
InitializeAccelerometerData();
InitializeAddressableLEDData();
@@ -116,8 +115,7 @@ void InitializeHAL() {
InitializeSPI();
InitializeThreads();
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

View File

@@ -6,11 +6,9 @@
#include "hal/HALBase.h"
namespace hal {
namespace init {
namespace hal::init {
std::atomic_bool HAL_IsInitialized{false};
void RunInitialize() {
HAL_Initialize(500, 0);
}
} // namespace init
} // namespace hal
} // namespace hal::init

View File

@@ -9,11 +9,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeI2C() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
void HAL_InitializeI2C(HAL_I2CPort port, int32_t* status) {

View File

@@ -69,8 +69,7 @@ static UnlimitedHandleResource<SynchronousWaitDataHandle, SynchronousWaitData,
HAL_HandleEnum::Vendor>*
synchronousInterruptHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeInterrupts() {
static LimitedHandleResource<HAL_InterruptHandle, Interrupt, kNumInterrupts,
HAL_HandleEnum::Interrupt>
@@ -81,8 +80,7 @@ void InitializeInterrupts() {
siH;
synchronousInterruptHandles = &siH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_InterruptHandle HAL_InitializeInterrupts(HAL_Bool watcher,

View File

@@ -20,13 +20,11 @@ static std::atomic<uint64_t> programStartTime{0};
static std::atomic<uint64_t> programPauseTime{0};
static std::atomic<uint64_t> programStepTime{0};
namespace hal {
namespace init {
namespace hal::init {
void InitializeMockHooks() {
wpi::SetNowImpl(GetFPGATime);
}
} // namespace init
} // namespace hal
} // namespace hal::init
namespace hal {
void RestartTiming() {

View File

@@ -19,11 +19,9 @@ static constexpr HAL_CANManufacturer manufacturer =
static constexpr HAL_CANDeviceType deviceType =
HAL_CANDeviceType::HAL_CAN_Dev_kPowerDistribution;
namespace hal {
namespace init {
namespace hal::init {
void InitializePDP() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_PDPHandle HAL_InitializePDP(int32_t module, int32_t* status) {

View File

@@ -13,11 +13,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializePWM() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

View File

@@ -8,11 +8,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializePorts() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
int32_t HAL_GetNumAccumulators(void) {

View File

@@ -8,11 +8,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializePower() {}
} // namespace init
} // namespace hal
} // namespace hal::init
// TODO: Fix the naming in here
extern "C" {

View File

@@ -21,16 +21,14 @@ struct Relay {
static IndexedHandleResource<HAL_RelayHandle, Relay, kNumRelayChannels,
HAL_HandleEnum::Relay>* relayHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeRelay() {
static IndexedHandleResource<HAL_RelayHandle, Relay, kNumRelayChannels,
HAL_HandleEnum::Relay>
rH;
relayHandles = &rH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_RelayHandle HAL_InitializeRelayPort(HAL_PortHandle portHandle, HAL_Bool fwd,

View File

@@ -9,11 +9,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeSPI() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

View File

@@ -6,11 +6,9 @@
#include "HALInitializer.h"
namespace hal {
namespace init {
namespace hal::init {
void InitializeSerialPort() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_SerialPortHandle HAL_InitializeSerialPort(HAL_SerialPort port,

View File

@@ -12,11 +12,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeSimDevice() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

View File

@@ -24,8 +24,7 @@ static IndexedHandleResource<HAL_SolenoidHandle, Solenoid,
kNumPCMModules * kNumSolenoidChannels,
HAL_HandleEnum::Solenoid>* solenoidHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeSolenoid() {
static IndexedHandleResource<HAL_SolenoidHandle, Solenoid,
kNumPCMModules * kNumSolenoidChannels,
@@ -33,8 +32,7 @@ void InitializeSolenoid() {
sH;
solenoidHandles = &sH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {
HAL_SolenoidHandle HAL_InitializeSolenoidPort(HAL_PortHandle portHandle,

View File

@@ -4,11 +4,9 @@
#include "hal/Threads.h"
namespace hal {
namespace init {
namespace hal::init {
void InitializeThreads() {}
} // namespace init
} // namespace hal
} // namespace hal::init
int32_t HAL_GetThreadPriority(NativeThreadHandle handle, HAL_Bool* isRealTime,
int32_t* status) {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAccelerometerData() {
static AccelerometerData sad[1];
::hal::SimAccelerometerData = sad;
}
} // namespace init
} // namespace hal
} // namespace hal::init
AccelerometerData* hal::SimAccelerometerData;
void AccelerometerData::ResetData() {

View File

@@ -10,14 +10,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAddressableLEDData() {
static AddressableLEDData sad[kNumAddressableLEDs];
::hal::SimAddressableLEDData = sad;
}
} // namespace init
} // namespace hal
} // namespace hal::init
AddressableLEDData* hal::SimAddressableLEDData;

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogGyroData() {
static AnalogGyroData agd[kNumAccumulators];
::hal::SimAnalogGyroData = agd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
AnalogGyroData* hal::SimAnalogGyroData;
void AnalogGyroData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogInData() {
static AnalogInData sind[kNumAnalogInputs];
::hal::SimAnalogInData = sind;
}
} // namespace init
} // namespace hal
} // namespace hal::init
AnalogInData* hal::SimAnalogInData;
void AnalogInData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogOutData() {
static AnalogOutData siod[kNumAnalogOutputs];
::hal::SimAnalogOutData = siod;
}
} // namespace init
} // namespace hal
} // namespace hal::init
AnalogOutData* hal::SimAnalogOutData;
void AnalogOutData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogTriggerData() {
static AnalogTriggerData satd[kNumAnalogTriggers];
::hal::SimAnalogTriggerData = satd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
AnalogTriggerData* hal::SimAnalogTriggerData;
void AnalogTriggerData::ResetData() {

View File

@@ -6,14 +6,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeCanData() {
static CanData scd;
::hal::SimCanData = &scd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
CanData* hal::SimCanData;

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDIOData() {
static DIOData sdd[kNumDigitalChannels];
::hal::SimDIOData = sdd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
DIOData* hal::SimDIOData;
void DIOData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDigitalPWMData() {
static DigitalPWMData sdpd[kNumDigitalPWMOutputs];
::hal::SimDigitalPWMData = sdpd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
DigitalPWMData* hal::SimDigitalPWMData;
void DigitalPWMData::ResetData() {

View File

@@ -9,14 +9,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDriverStationData() {
static DriverStationData dsd;
::hal::SimDriverStationData = &dsd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
DriverStationData* hal::SimDriverStationData;

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDutyCycleData() {
static DutyCycleData sed[kNumDutyCycles];
::hal::SimDutyCycleData = sed;
}
} // namespace init
} // namespace hal
} // namespace hal::init
DutyCycleData* hal::SimDutyCycleData;

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeEncoderData() {
static EncoderData sed[kNumEncoders];
::hal::SimEncoderData = sed;
}
} // namespace init
} // namespace hal
} // namespace hal::init
EncoderData* hal::SimEncoderData;
void EncoderData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeI2CData() {
static I2CData sid[2];
::hal::SimI2CData = sid;
}
} // namespace init
} // namespace hal
} // namespace hal::init
I2CData* hal::SimI2CData;

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializePCMData() {
static PCMData spd[kNumPCMModules];
::hal::SimPCMData = spd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
PCMData* hal::SimPCMData;
void PCMData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializePDPData() {
static PDPData spd[kNumPDPModules];
::hal::SimPDPData = spd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
PDPData* hal::SimPDPData;
void PDPData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializePWMData() {
static PWMData spd[kNumPWMChannels];
::hal::SimPWMData = spd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
PWMData* hal::SimPWMData;
void PWMData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeRelayData() {
static RelayData srd[kNumRelayHeaders];
::hal::SimRelayData = srd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
RelayData* hal::SimRelayData;
void RelayData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeRoboRioData() {
static RoboRioData srrd;
::hal::SimRoboRioData = &srrd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
RoboRioData* hal::SimRoboRioData;
void RoboRioData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeSPIAccelerometerData() {
static SPIAccelerometerData ssad[5];
::hal::SimSPIAccelerometerData = ssad;
}
} // namespace init
} // namespace hal
} // namespace hal::init
SPIAccelerometerData* hal::SimSPIAccelerometerData;
void SPIAccelerometerData::ResetData() {

View File

@@ -7,14 +7,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeSPIData() {
static SPIData ssd[5];
::hal::SimSPIData = ssd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
SPIData* hal::SimSPIData;
void SPIData::ResetData() {

View File

@@ -10,14 +10,12 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeSimDeviceData() {
static SimDeviceData sdd;
::hal::SimSimDeviceData = &sdd;
}
} // namespace init
} // namespace hal
} // namespace hal::init
SimDeviceData* hal::SimSimDeviceData;