feat: handle function commands and bootstrap code

This commit is contained in:
2026-04-08 00:07:44 +01:00
parent fba936ea53
commit 641a4085b7
4 changed files with 209 additions and 10 deletions
+46 -8
View File
@@ -3,6 +3,7 @@
#include <fstream>
#include <iostream>
#include <regex>
#include <sstream>
#include <string>
#include <vector>
@@ -11,13 +12,43 @@
#include "utils.hpp"
int process(std::string inputPath, std::string outputPath,
std::ios_base::openmode outputStreamMode) {
std::ios_base::openmode outputStreamMode, bool &init) {
std::ifstream ifs(inputPath);
std::ofstream ofs(outputPath, outputStreamMode);
std::string fileName = getFileNameFromFilePath(inputPath);
std::string line;
std::string output;
if (init) {
std::ostringstream initStream;
Command cmd;
initStream << "// " << "SP = 256" << std::endl;
initStream << std::endl;
initStream << "@256" << std::endl;
initStream << "D=A" << std::endl;
initStream << "@SP" << std::endl;
initStream << "M=D" << std::endl;
cmd.label = "Sys.init";
cmd.commandType = CommandType::CALL;
cmd.index = 0;
initStream << std::endl;
initStream << "// " << "call Sys.init 0" << std::endl;
initStream << std::endl;
if (translateFunctionCall(initStream, cmd) != 0)
exit(1);
initStream << std::endl;
output = initStream.str();
ofs << output;
init = false;
}
std::vector<Command> commands;
while (getline(ifs, line)) {
@@ -32,17 +63,15 @@ int process(std::string inputPath, std::string outputPath,
}
for (const Command &cmd : commands) {
int translateResult;
if ((translateResult = translateCommand(output, fileName, cmd)) != 0) {
return translateResult;
}
if (translateCommand(output, fileName, cmd) != 0)
exit(1);
ofs << output;
}
ifs.close();
ofs.close();
return 0;
}
@@ -53,8 +82,10 @@ int main(int argc, char **argv) {
exit(1);
}
bool init = false;
if (regex_match(argv[1], std::regex("^.+\\.vm")))
return process(argv[1], getOutputPath(argv[1]), std::ofstream::trunc);
return process(argv[1], getOutputPath(argv[1]), std::ofstream::trunc, init);
if (!std::filesystem::is_directory(argv[1])) {
std::cerr << "Argument is not a VM file!" << std::endl;
@@ -67,9 +98,16 @@ int main(int argc, char **argv) {
std::filesystem::remove(outputPath);
}
for (const auto &entry : std::filesystem::directory_iterator(argv[1])) {
if (entry.is_regular_file() && entry.path().filename() == "Sys.vm") {
init = true;
}
}
for (const auto &entry : std::filesystem::directory_iterator(argv[1])) {
if (entry.is_regular_file() && entry.path().extension() == ".vm") {
if (process(entry.path().string(), outputPath, std::ofstream::app) != 0)
if (process(entry.path().string(), outputPath, std::ofstream::app,
init) != 0)
exit(1);
}
}