refactoring to use oop

daniithethomp · daniithethomp · commit 5910d3d4f4b7 · 2025-05-23T21:08:55.000+01:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "editor.tabSize": 4,
+    "editor.detectIndentation": false
+}
diff --git a/src/command.cpp b/src/command.cpp
diff --git a/src/command.h b/src/command.h
@@ -0,0 +1,9 @@
+#pragma once
+#include <string>
+
+class Command {
+    public:
+        virtual ~Command() = default;
+        virtual void execute(const std::string& args) = 0;
+        virtual std::string type() = 0;
+};
diff --git a/src/command_factory.cpp b/src/command_factory.cpp
@@ -0,0 +1,11 @@
+#include "command_factory.h"
+
+CommandFactory::CommandFactory() {
+        commands["exit"] = std::make_unique<ExitCommand>();
+        commands["echo"] = std::make_unique<EchoCommand>();
+}
+
+Command* CommandFactory::get(const std::string& name) {
+    auto it = commands.find(name);
+    return it != commands.end() ? it->second.get() : nullptr;
+}
diff --git a/src/command_factory.h b/src/command_factory.h
@@ -0,0 +1,14 @@
+#pragma once
+#include <map>
+#include <memory>
+#include <string>
+#include "command.h"
+#include "exit_command.h"
+#include "echo_command.h"
+
+class CommandFactory {
+    std::map<std::string, std::unique_ptr<Command>> commands;
+public:
+    CommandFactory();
+    Command* get(const std::string& name);
+};
diff --git a/src/echo_command.cpp b/src/echo_command.cpp
@@ -0,0 +1,10 @@
+#include "echo_command.h"
+#include <iostream>
+
+void EchoCommand::execute(const std::string& args) {
+    std::cout << args << std::endl;
+}
+
+std::string EchoCommand::type() {
+    return "builtin";
+}
diff --git a/src/echo_command.h b/src/echo_command.h
@@ -0,0 +1,10 @@
+#pragma once
+#include <string>
+#include "command.h"
+
+class EchoCommand : public Command {
+    public:
+        void execute(const std::string& args) override;
+
+        std::string type() override;
+};
diff --git a/src/exit_command.cpp b/src/exit_command.cpp
@@ -0,0 +1,11 @@
+#include "exit_command.h"
+#include <iostream>
+
+void ExitCommand::execute(const std::string& args) {
+    int exit_code = std::stoi(args);
+    exit(exit_code);
+}
+
+std::string ExitCommand::type() {
+    return "builtin";
+}
diff --git a/src/exit_command.h b/src/exit_command.h
@@ -0,0 +1,10 @@
+#pragma once
+#include <string>
+#include "command.h"
+
+class ExitCommand : public Command {
+    public:
+        void execute(const std::string& args) override;
+
+        std::string type() override;
+};
diff --git a/src/shell.cpp b/src/shell.cpp
@@ -0,0 +1,36 @@
+#include "shell.h"
+#include <iostream>
+#include <sstream>
+
+void Shell::run() {
+    // Flush after every std::cout / std:cerr
+    std::cout << std::unitbuf;
+    std::cerr << std::unitbuf;
+
+    std::string input;
+    while (true) {
+        std::cout << "$ ";
+        if(!std::getline(std::cin, input) || input.empty()) {
+            break;
+        }
+        std::istringstream iss(input);
+        std::string cmd, args;
+        iss >> cmd;
+        std::getline(iss, args);
+
+
+        // trim leading whitespace
+        size_t start = args.find_first_not_of(" ");
+        if (start != std::string::npos) {
+            args = args.substr(start);
+        } else {
+            args.clear();
+        }
+        
+        if(auto* command = commandFactory.get(cmd)) {
+            command->execute(args);
+        } else {
+            std::cout << cmd << ": command not found" << std::endl;
+        }
+    }
+};
diff --git a/src/shell.h b/src/shell.h
@@ -0,0 +1,9 @@
+#pragma once
+#include "command_factory.h"
+#include <string>
+
+class Shell {
+    CommandFactory commandFactory;
+public:
+    void run();
+};

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +    "editor.tabSize": 4,
 +    "editor.detectIndentation": false
 +}