throw std::runtime_error instead of std::string (PR AppleWin#1011)

+ add more information about location of yaml parser error.

source/AY8910.cpp

@@ -1105,7 +1105,7 @@ bool CAY8910::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, const std::string& su
 {
 	std::string unit = std::string(SS_YAML_KEY_AY8910) + suffix;
 	if (!yamlLoadHelper.GetSubMap(unit))
-		throw std::string("Card: Expected key: ") + unit;
+		throw std::runtime_error("Card: Expected key: " + unit);
 
 	ay_tone_tick[0] = yamlLoadHelper.LoadUint(SS_YAML_KEY_TONE0_TICK);
 	ay_tone_tick[1] = yamlLoadHelper.LoadUint(SS_YAML_KEY_TONE1_TICK);
@@ -1130,7 +1130,7 @@ bool CAY8910::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, const std::string& su
 	env_counter = yamlLoadHelper.LoadUint(SS_YAML_KEY_ENV_COUNTER);
 
 	if (!yamlLoadHelper.GetSubMap(SS_YAML_KEY_REGISTERS))
-		throw std::string("Card: Expected key: ") + SS_YAML_KEY_REGISTERS;
+		throw std::runtime_error("Card: Expected key: " SS_YAML_KEY_REGISTERS);
 
 	USHORT period = (USHORT) yamlLoadHelper.LoadUint(SS_YAML_KEY_REG_TONE0_PERIOD);
 	sound_ay_registers[0] = period & 0xff;
@@ -1174,7 +1174,7 @@ bool CAY8910::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, const std::string& su
 			unsigned int _val = 0;
 			if(4 != sscanf_s(value.c_str(), SS_YAML_VALUE_CHANGE_FORMAT,
 				&_tstates, &_ofs, &_reg, &_val))
-				throw std::string("Card: AY8910: Failed to scanf change list");
+				throw std::runtime_error("Card: AY8910: Failed to scanf change list");
 
 			ay_change[ay_change_count].tstates = _tstates;
 			ay_change[ay_change_count].ofs = _ofs;
@@ -1183,7 +1183,7 @@ bool CAY8910::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, const std::string& su
 
 			ay_change_count++;
 			if (ay_change_count > AY_CHANGE_MAX)
-				throw std::string("Card: AY8910: Too many changes");
+				throw std::runtime_error("Card: AY8910: Too many changes");
 		}
 
 		yamlLoadHelper.PopMap();

source/CPU.cpp

@@ -810,7 +810,7 @@ void CpuLoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 	eCpuType cpu;
 	if (cpuType == SS_YAML_VALUE_6502) cpu = CPU_6502;
 	else if (cpuType == SS_YAML_VALUE_65C02) cpu = CPU_65C02;
-	else throw std::string("Load: Unknown main CPU type");
+	else throw std::runtime_error("Load: Unknown main CPU type");
 	SetMainCpu(cpu);
 
 	regs.a  = (BYTE)     yamlLoadHelper.LoadUint(SS_YAML_KEY_REGA);

source/Disk.cpp

@@ -61,7 +61,7 @@ Disk2InterfaceCard::Disk2InterfaceCard(UINT slot) :
 	Card(CT_Disk2, slot)
 {
 	if (m_slot != 5 && m_slot != 6)	// fixme
-		throw std::string("Card: wrong slot");
+		throw std::runtime_error("Card: wrong slot");
 
 	ResetSwitches();
 
@@ -2095,7 +2095,7 @@ bool Disk2InterfaceCard::LoadSnapshotFloppy(YamlLoadHelper& yamlLoadHelper, UINT
 		m_floppyDrive[unit].m_disk.m_extraCycles = yamlLoadHelper.LoadDouble(SS_YAML_KEY_EXTRA_CYCLES);
 
 		if (m_floppyDrive[unit].m_disk.m_bitCount && (m_floppyDrive[unit].m_disk.m_bitOffset >= m_floppyDrive[unit].m_disk.m_bitCount))
-			throw std::string("Disk image: bitOffset >= bitCount");
+			throw std::runtime_error("Disk image: bitOffset >= bitCount");
 
 		if (ImageIsWOZ(m_floppyDrive[unit].m_disk.m_imagehandle))
 			UpdateBitStreamOffsets(m_floppyDrive[unit].m_disk);	// overwrites m_byte, inits m_bitMask
@@ -2116,7 +2116,7 @@ bool Disk2InterfaceCard::LoadSnapshotDriveUnitv3(YamlLoadHelper& yamlLoadHelper,
 
 	std::string disk2UnitName = std::string(SS_YAML_KEY_DISK2UNIT) + (unit == DRIVE_1 ? std::string("0") : std::string("1"));
 	if (!yamlLoadHelper.GetSubMap(disk2UnitName))
-		throw std::string("Card: Expected key: ") + disk2UnitName;
+		throw std::runtime_error("Card: Expected key: " + disk2UnitName);
 
 	bool bImageError = LoadSnapshotFloppy(yamlLoadHelper, unit, version, track);
 
@@ -2137,10 +2137,10 @@ bool Disk2InterfaceCard::LoadSnapshotDriveUnitv4(YamlLoadHelper& yamlLoadHelper,
 
 	std::string disk2UnitName = std::string(SS_YAML_KEY_DISK2UNIT) + (unit == DRIVE_1 ? std::string("0") : std::string("1"));
 	if (!yamlLoadHelper.GetSubMap(disk2UnitName))
-		throw std::string("Card: Expected key: ") + disk2UnitName;
+		throw std::runtime_error("Card: Expected key: " + disk2UnitName);
 
 	if (!yamlLoadHelper.GetSubMap(SS_YAML_KEY_FLOPPY))
-		throw std::string("Card: Expected key: ") + SS_YAML_KEY_FLOPPY;
+		throw std::runtime_error("Card: Expected key: " SS_YAML_KEY_FLOPPY);
 
 	bool bImageError = LoadSnapshotFloppy(yamlLoadHelper, unit, version, track);
 
@@ -2199,7 +2199,7 @@ void Disk2InterfaceCard::LoadSnapshotDriveUnit(YamlLoadHelper& yamlLoadHelper, U
 bool Disk2InterfaceCard::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version < 1 || version > kUNIT_VERSION)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	m_currDrive = yamlLoadHelper.LoadUint(SS_YAML_KEY_CURRENT_DRIVE);
 	m_magnetStates		= yamlLoadHelper.LoadUint(SS_YAML_KEY_PHASES);

source/DiskFormatTrack.cpp

@@ -357,7 +357,7 @@ void FormatTrack::SaveSnapshot(class YamlSaveHelper& yamlSaveHelper)
 void FormatTrack::LoadSnapshot(class YamlLoadHelper& yamlLoadHelper)
 {
 	if (!yamlLoadHelper.GetSubMap(SS_YAML_KEY_FORMAT_TRACK))
-		throw std::string("Card: Expected key: ") + std::string(SS_YAML_KEY_FORMAT_TRACK);
+		throw std::runtime_error("Card: Expected key: " SS_YAML_KEY_FORMAT_TRACK);
 
 	m_bmWrittenSectorAddrFields   = yamlLoadHelper.LoadUint(SS_YAML_KEY_WRITTEN_SECTOR_ADDR_FIELDS);
 	m_WriteTrackStartIndex        = yamlLoadHelper.LoadUint(SS_YAML_KEY_WRITE_TRACK_START_IDX);

source/FourPlay.cpp

@@ -149,7 +149,7 @@ void FourPlayCard::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
 bool FourPlayCard::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version < 1 || version > kUNIT_VERSION)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	return true;
 }

source/Harddisk.cpp

@@ -131,7 +131,7 @@ HarddiskInterfaceCard::HarddiskInterfaceCard(UINT slot) :
 	Card(CT_GenericHDD, slot)
 {
 	if (m_slot != SLOT7)	// fixme
-		throw std::string("Card: wrong slot");
+		throw std::runtime_error("Card: wrong slot");
 
 	m_unitNum = HARDDISK_1 << 7;	// b7=unit
 
@@ -823,7 +823,7 @@ bool HarddiskInterfaceCard::LoadSnapshotHDDUnit(YamlLoadHelper& yamlLoadHelper,
 {
 	std::string hddUnitName = std::string(SS_YAML_KEY_HDDUNIT) + (unit == HARDDISK_1 ? std::string("0") : std::string("1"));
 	if (!yamlLoadHelper.GetSubMap(hddUnitName))
-		throw std::string("Card: Expected key: ") + hddUnitName;
+		throw std::runtime_error("Card: Expected key: " + hddUnitName);
 
 	m_hardDiskDrive[unit].m_fullname.clear();
 	m_hardDiskDrive[unit].m_imagename.clear();
@@ -843,7 +843,7 @@ bool HarddiskInterfaceCard::LoadSnapshotHDDUnit(YamlLoadHelper& yamlLoadHelper,
 		m_hardDiskDrive[unit].m_buf_ptr = sizeof(m_hardDiskDrive[unit].m_buf) - 1;
 
 	if (!yamlLoadHelper.GetSubMap(SS_YAML_KEY_BUF))
-		throw hddUnitName + std::string(": Missing: ") + std::string(SS_YAML_KEY_BUF);
+		throw std::runtime_error(hddUnitName + ": Missing: " + SS_YAML_KEY_BUF);
 	yamlLoadHelper.LoadMemory(m_hardDiskDrive[unit].m_buf, HD_BLOCK_SIZE);
 
 	yamlLoadHelper.PopMap();
@@ -888,10 +888,10 @@ bool HarddiskInterfaceCard::LoadSnapshotHDDUnit(YamlLoadHelper& yamlLoadHelper,
 bool HarddiskInterfaceCard::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version < 1 || version > kUNIT_VERSION)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	if (version <= 2 && (regs.pc >> 8) == (0xC0|m_slot))
-		throw std::string("HDD card: 6502 is running old HDD firmware");
+		throw std::runtime_error("HDD card: 6502 is running old HDD firmware");
 
 	m_unitNum = yamlLoadHelper.LoadUint(SS_YAML_KEY_CURRENT_UNIT);	// b7=unit
 	m_command = yamlLoadHelper.LoadUint(SS_YAML_KEY_COMMAND);

source/LanguageCard.cpp

@@ -48,7 +48,7 @@ LanguageCardUnit::LanguageCardUnit(SS_CARDTYPE type, UINT slot) :
 	m_uLastRamWrite(0)
 {
 	if (m_slot != LanguageCardUnit::kSlot0)
-		throw std::string("Language Card: wrong slot");		// throws to the top-level catch-handler, and shuts down
+		throw std::runtime_error("Language Card: wrong slot");		// throws to the top-level catch-handler, and shuts down
 
 	SetMemMainLanguageCard(NULL, true);
 }
@@ -221,7 +221,7 @@ void LanguageCardSlot0::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
 bool LanguageCardSlot0::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version != kUNIT_LANGUAGECARD_VER)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	// "State"
 	LoadLCState(yamlLoadHelper);
@@ -232,7 +232,7 @@ bool LanguageCardSlot0::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT versio
 	}
 
 	if (!yamlLoadHelper.GetSubMap(GetSnapshotMemStructName()))
-		throw std::string("Memory: Missing map name: " + GetSnapshotMemStructName());
+		throw std::runtime_error("Memory: Missing map name: " + GetSnapshotMemStructName());
 
 	yamlLoadHelper.LoadMemory(m_pMemory, kMemBankSize);
 
@@ -419,7 +419,7 @@ void Saturn128K::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
 bool Saturn128K::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version != kUNIT_SATURN_VER)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	// "State"
 	LoadLCState(yamlLoadHelper);
@@ -428,7 +428,7 @@ bool Saturn128K::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 	UINT activeBank = yamlLoadHelper.LoadUint(SS_YAML_KEY_ACTIVE_SATURN_BANK);
 
 	if (numBanks < 1 || numBanks > kMaxSaturnBanks || activeBank >= numBanks)
-		throw std::string(SS_YAML_KEY_UNIT ": Bad Saturn card state");
+		throw std::runtime_error(SS_YAML_KEY_UNIT ": Bad Saturn card state");
 
 	m_uSaturnTotalBanks = numBanks;
 	m_uSaturnActiveBank = activeBank;
@@ -448,7 +448,7 @@ bool Saturn128K::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 		std::string memName = GetSnapshotMemStructName() + szBank;
 
 		if (!yamlLoadHelper.GetSubMap(memName))
-			throw std::string("Memory: Missing map name: " + memName);
+			throw std::runtime_error("Memory: Missing map name: " + memName);
 
 		yamlLoadHelper.LoadMemory(m_aSaturnBanks[uBank], kMemBankSize);
 

source/Memory.cpp

@@ -2293,7 +2293,7 @@ bool MemLoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT unitVersion)
 	//
 
 	if (!yamlLoadHelper.GetSubMap( MemGetSnapshotMainMemStructName() ))
-		throw std::string("Card: Expected key: ") + MemGetSnapshotMainMemStructName();
+		throw std::runtime_error("Card: Expected key: " + MemGetSnapshotMainMemStructName());
 
 	memset(memmain+0xC000, 0, LanguageCardSlot0::kMemBankSize);	// Clear it, as high 16K may not be in the save-state's "Main Memory" (eg. the case of II+ Saturn replacing //e LC)
 
@@ -2371,25 +2371,25 @@ static void MemLoadSnapshotAuxCommon(YamlLoadHelper& yamlLoadHelper, const std::
 	{
 		type = CT_80Col;
 		if (numAuxBanks != 0 || activeAuxBank != 0)
-			throw std::string(SS_YAML_KEY_UNIT ": AuxSlot: Bad aux slot card state");
+			throw std::runtime_error(SS_YAML_KEY_UNIT ": AuxSlot: Bad aux slot card state");
 	}
 	else if (card == SS_YAML_VALUE_CARD_EXTENDED80COL)
 	{
 		type = CT_Extended80Col;
 		if (numAuxBanks != 1 || activeAuxBank != 0)
-			throw std::string(SS_YAML_KEY_UNIT ": AuxSlot: Bad aux slot card state");
+			throw std::runtime_error(SS_YAML_KEY_UNIT ": AuxSlot: Bad aux slot card state");
 	}
 	else if (card == SS_YAML_VALUE_CARD_RAMWORKSIII)
 	{
 		type = CT_RamWorksIII;
 		if (numAuxBanks < 2 || numAuxBanks > 0x7F || (activeAuxBank+1) > numAuxBanks)
-			throw std::string(SS_YAML_KEY_UNIT ": AuxSlot: Bad aux slot card state");
+			throw std::runtime_error(SS_YAML_KEY_UNIT ": AuxSlot: Bad aux slot card state");
 	}
 	else
 	{
 		// todo: support empty slot
 		type = CT_Empty;
-		throw std::string(SS_YAML_KEY_UNIT ": AuxSlot: Unknown card: " + card);
+		throw std::runtime_error(SS_YAML_KEY_UNIT ": AuxSlot: Unknown card: " + card);
 	}
 
 	g_uMaxExPages = numAuxBanks;
@@ -2411,7 +2411,7 @@ static void MemLoadSnapshotAuxCommon(YamlLoadHelper& yamlLoadHelper, const std::
 		std::string auxMemName = MemGetSnapshotAuxMemStructName() + szBank;
 
 		if (!yamlLoadHelper.GetSubMap(auxMemName))
-			throw std::string("Memory: Missing map name: " + auxMemName);
+			throw std::runtime_error("Memory: Missing map name: " + auxMemName);
 
 		yamlLoadHelper.LoadMemory(pBank, _6502_MEM_LEN);
 
@@ -2436,7 +2436,7 @@ static void MemLoadSnapshotAuxVer2(YamlLoadHelper& yamlLoadHelper)
 	UINT cardVersion = yamlLoadHelper.LoadUint(SS_YAML_KEY_VERSION);
 
 	if (!yamlLoadHelper.GetSubMap(std::string(SS_YAML_KEY_STATE)))
-		throw std::string(SS_YAML_KEY_UNIT ": Expected sub-map name: " SS_YAML_KEY_STATE);
+		throw std::runtime_error(SS_YAML_KEY_UNIT ": Expected sub-map name: " SS_YAML_KEY_STATE);
 
 	MemLoadSnapshotAuxCommon(yamlLoadHelper, card);
 
@@ -2446,7 +2446,7 @@ static void MemLoadSnapshotAuxVer2(YamlLoadHelper& yamlLoadHelper)
 bool MemLoadSnapshotAux(YamlLoadHelper& yamlLoadHelper, UINT unitVersion)
 {
 	if (unitVersion < 1 || unitVersion > kUNIT_AUXSLOT_VER)
-		throw std::string(SS_YAML_KEY_UNIT ": AuxSlot: Version mismatch");
+		throw std::runtime_error(SS_YAML_KEY_UNIT ": AuxSlot: Version mismatch");
 
 	if (unitVersion == 1)
 		MemLoadSnapshotAuxVer1(yamlLoadHelper);

source/Mockingboard.cpp

@@ -1930,7 +1930,7 @@ void MB_SaveSnapshot(YamlSaveHelper& yamlSaveHelper, const UINT uSlot)
 static void LoadSnapshotSY6522(YamlLoadHelper& yamlLoadHelper, SY6522& sy6522, UINT version)
 {
 	if (!yamlLoadHelper.GetSubMap(SS_YAML_KEY_SY6522))
-		throw std::string("Card: Expected key: ") + std::string(SS_YAML_KEY_SY6522);
+		throw std::runtime_error("Card: Expected key: " SS_YAML_KEY_SY6522);
 
 	sy6522.ORB  = yamlLoadHelper.LoadUint(SS_YAML_KEY_SY6522_REG_ORB);
 	sy6522.ORA  = yamlLoadHelper.LoadUint(SS_YAML_KEY_SY6522_REG_ORA);
@@ -1968,10 +1968,10 @@ static void LoadSnapshotSY6522(YamlLoadHelper& yamlLoadHelper, SY6522& sy6522, U
 bool MB_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version)
 {
 	if (slot != 4 && slot != 5)	// fixme
-		throw std::string("Card: wrong slot");
+		throw std::runtime_error("Card: wrong slot");
 
 	if (version < 1 || version > kUNIT_VERSION)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	AY8910UpdateSetCycles();
 
@@ -1987,7 +1987,7 @@ bool MB_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version)
 		char szNum[2] = {char('0' + i), 0};
 		std::string unit = std::string(SS_YAML_KEY_MB_UNIT) + std::string(szNum);
 		if (!yamlLoadHelper.GetSubMap(unit))
-			throw std::string("Card: Expected key: ") + std::string(unit);
+			throw std::runtime_error("Card: Expected key: " + unit);
 
 		LoadSnapshotSY6522(yamlLoadHelper, pMB->sy6522, version);
 		UpdateIFR(pMB, 0, pMB->sy6522.IFR);					// Assert any pending IRQs (GH#677)
@@ -2053,7 +2053,7 @@ bool MB_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version)
 void Phasor_SaveSnapshot(YamlSaveHelper& yamlSaveHelper, const UINT uSlot)
 {
 	if (uSlot != 4)
-		throw std::string("Card: Phasor only supported in slot-4");
+		throw std::runtime_error("Card: Phasor only supported in slot-4");
 
 	UINT nDeviceNum = 0;
 	SY6522_AY8910* pMB = &g_MB[0];	// fixme: Phasor uses MB's slot4(2x6522), slot4(2xSSI263), but slot4+5(4xAY8910)
@@ -2091,10 +2091,10 @@ void Phasor_SaveSnapshot(YamlSaveHelper& yamlSaveHelper, const UINT uSlot)
 bool Phasor_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version)
 {
 	if (slot != 4)	// fixme
-		throw std::string("Card: wrong slot");
+		throw std::runtime_error("Card: wrong slot");
 
 	if (version < 1 || version > kUNIT_VERSION)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	if (version < 6)
 		yamlLoadHelper.LoadUint(SS_YAML_KEY_PHASOR_CLOCK_SCALE_FACTOR);	// Consume redundant data
@@ -2123,7 +2123,7 @@ bool Phasor_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version
 		char szNum[2] = {char('0' + i), 0};
 		std::string unit = std::string(SS_YAML_KEY_MB_UNIT) + std::string(szNum);
 		if (!yamlLoadHelper.GetSubMap(unit))
-			throw std::string("Card: Expected key: ") + std::string(unit);
+			throw std::runtime_error("Card: Expected key: " + unit);
 
 		LoadSnapshotSY6522(yamlLoadHelper, pMB->sy6522, version);
 		UpdateIFR(pMB, 0, pMB->sy6522.IFR);					// Assert any pending IRQs (GH#677)

source/MouseInterface.cpp

@@ -139,7 +139,7 @@ CMouseInterface::CMouseInterface(UINT slot) :
 	m_syncEvent(slot, 0, SyncEventCallback)	// use slot# as "unique" id for MouseInterfaces
 {
 	if (m_slot != 4)	// fixme
-		throw std::string("Card: wrong slot");
+		throw std::runtime_error("Card: wrong slot");
 
 	m_6821.SetListenerB( this, M6821_Listener_B );
 	m_6821.SetListenerA( this, M6821_Listener_A );
@@ -695,7 +695,7 @@ void CMouseInterface::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
 void CMouseInterface::LoadSnapshotMC6821(YamlLoadHelper& yamlLoadHelper, std::string key)
 {
 	if (!yamlLoadHelper.GetSubMap(key))
-		throw std::string("Card: Expected key: ") + key;
+		throw std::runtime_error("Card: Expected key: " + key);
 
 	mc6821_t mc6821;
 	mc6821.pra  = yamlLoadHelper.LoadUint(SS_YAML_KEY_PRA);
@@ -716,7 +716,7 @@ void CMouseInterface::LoadSnapshotMC6821(YamlLoadHelper& yamlLoadHelper, std::st
 bool CMouseInterface::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version != 1)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	LoadSnapshotMC6821(yamlLoadHelper, SS_YAML_KEY_MC6821);
 
@@ -726,7 +726,7 @@ bool CMouseInterface::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 	m_by6821A = yamlLoadHelper.LoadUint(SS_YAML_KEY_6821A);
 
 	if (!yamlLoadHelper.GetSubMap(SS_YAML_KEY_BUFF))
-		throw std::string("Card: Expected key: " SS_YAML_KEY_BUFF);
+		throw std::runtime_error("Card: Expected key: " SS_YAML_KEY_BUFF);
 	yamlLoadHelper.LoadMemory(m_byBuff, sizeof(m_byBuff));
 	yamlLoadHelper.PopMap();
 

source/ParallelPrinter.cpp

@@ -230,10 +230,10 @@ void Printer_SaveSnapshot(class YamlSaveHelper& yamlSaveHelper, const UINT uSlot
 bool Printer_LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version)
 {
 	if (slot != 1)	// fixme
-		throw std::string("Card: wrong slot");
+		throw std::runtime_error("Card: wrong slot");
 
 	if (version != 1)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	inactivity					= yamlLoadHelper.LoadUint(SS_YAML_KEY_INACTIVITY);
 	g_PrinterIdleLimit			= yamlLoadHelper.LoadUint(SS_YAML_KEY_IDLELIMIT);
@@ -245,7 +245,7 @@ bool Printer_LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT
 		g_bPrinterAppend = true;	// Re-open print-file in append mode
 		BOOL bRes = CheckPrint();
 		if (!bRes)
-			throw std::string("Printer Card: Unable to resume printing to file");
+			throw std::runtime_error("Printer Card: Unable to resume printing to file");
 	}
 	else
 	{