6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Adjusted rules so as not to type unnecessary spaces in the name, and to include the extension if AMSDOS won't imply it.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-16 22:24:37 -04:00
parent b476f06524
commit 76c6b715a2
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
StaticAnalyser/AmstradCPC/StaticAnalyser.cpp
View File

@ -21,8 +21,30 @@ static bool strcmp_insensitive(const char *a, const char *b) {
return true;
}
static bool is_implied_extension(const std::string &extension) {
return
extension == " " ||
strcmp_insensitive(extension.c_str(), "BAS") ||
strcmp_insensitive(extension.c_str(), "BIN");
}
static std::string RunCommandFor(const Storage::Disk::CPM::File &file) {
return "run\"" + file.name + "\n";
// Trim spaces from the name.
std::string name = file.name;
name.erase(std::find_if(name.rbegin(), name.rend(), [](int ch) {
return !std::isspace(ch);
}).base(), name.end());
// Form the basic command.
std::string command = "run\"" + name;
// Consider whether the extension is required.
if(!is_implied_extension(file.type)) {
command += "." + file.type;
}
// Add a newline and return.
return command + "\n";
}
static void InspectDataCatalogue(
@ -62,11 +84,7 @@ static void InspectDataCatalogue(
}
// Check suffix for emptiness.
if(
candidate_files[c].type == " " ||
strcmp_insensitive(candidate_files[c].type.c_str(), "BAS") ||
strcmp_insensitive(candidate_files[c].type.c_str(), "BIN")
) {
if(is_implied_extension(candidate_files[c].type)) {
implicit_suffixed_files++;
last_implicit_suffixed_file = c;
}