sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

changed format of player parsing exceptions

tempestpy_adaptions
Stefan Pranger 4 years ago
parent
b3f5cd1c89
commit
e63faa485f
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/storm-parsers/parser/PrismParser.cpp

8
src/storm-parsers/parser/PrismParser.cpp
View File

@ -795,12 +795,12 @@ namespace storm {
if (moduleIndexPair != globalProgramInformation.moduleToIndexMap.end()) { if (moduleIndexPair != globalProgramInformation.moduleToIndexMap.end()) {
controlledModuleIndices.insert(std::pair<std::string, uint_fast64_t>(moduleIndexPair->first, moduleIndexPair->second)); controlledModuleIndices.insert(std::pair<std::string, uint_fast64_t>(moduleIndexPair->first, moduleIndexPair->second));
if (std::find(globalProgramInformation.playerControlledModules.begin(), globalProgramInformation.playerControlledModules.end(), moduleName) != globalProgramInformation.playerControlledModules.end()) { if (std::find(globalProgramInformation.playerControlledModules.begin(), globalProgramInformation.playerControlledModules.end(), moduleName) != globalProgramInformation.playerControlledModules.end()) {
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player " << playerName << ": Module '" << moduleName << "' already controlled by another player.");
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player '" << playerName << "': Module '" << moduleName << "' already controlled by another player.");
} else { } else {
globalProgramInformation.playerControlledModules.push_back(moduleName); globalProgramInformation.playerControlledModules.push_back(moduleName);
} }
} else { } else {
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player " << playerName << ": No module named '" << moduleName << "' present.");
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player '" << playerName << "': No module named '" << moduleName << "' present.");
} }
} }
for(std::string actionName : actionNames) { for(std::string actionName : actionNames) {
@ -808,12 +808,12 @@ namespace storm {
if (actionIndexPair != globalProgramInformation.actionIndices.end()) { if (actionIndexPair != globalProgramInformation.actionIndices.end()) {
controlledActionIndices.insert(std::pair<std::string, uint_fast64_t>(actionIndexPair->first, actionIndexPair->second)); controlledActionIndices.insert(std::pair<std::string, uint_fast64_t>(actionIndexPair->first, actionIndexPair->second));
if (std::find(globalProgramInformation.playerControlledCommands.begin(), globalProgramInformation.playerControlledCommands.end(), actionName) != globalProgramInformation.playerControlledCommands.end()) { if (std::find(globalProgramInformation.playerControlledCommands.begin(), globalProgramInformation.playerControlledCommands.end(), actionName) != globalProgramInformation.playerControlledCommands.end()) {
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player " << playerName << ": Command '" << actionName << "' already controlled by another player.");
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player '" << playerName << "': Command '" << actionName << "' already controlled by another player.");
} else { } else {
globalProgramInformation.playerControlledCommands.push_back(actionName); globalProgramInformation.playerControlledCommands.push_back(actionName);
} }
} else { } else {
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player " << playerName << ": No action named '" << actionName << "' present.");
STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << " for player '" << playerName << "': No action named '" << actionName << "' present.");
} }
} }
return storm::prism::Player(playerName, controlledModuleIndices, controlledActionIndices); return storm::prism::Player(playerName, controlledModuleIndices, controlledActionIndices);

Write Preview
Loading…
Cancel
Save