epl

src/main.cpp

@@ -1,14 +1,27 @@
+#include <fstream>
 #include <iostream>
+#include <optional>
+#include <sstream>
 #include <stdexcept>
 
 #include "MemoryContext.h"
 #include "Parser.h"
 #include "VM.h"
 
+std::optional<std::string> infile;
+
 void parse_options(int argc, char *argv[]) {
 
     for (int i = 1; i < argc; i++) {
         std::string arg = argv[i];
+
+        if (arg == "-f") {
+            if (++i >= argc) throw std::invalid_argument("-f given but no file");
+            infile = argv[i];
+            continue;
+        }
+
+
         if (arg.length() < 2 || arg.substr(0, 2) != "--") { throw std::invalid_argument("Can't parse argument " + arg); }
         std::string rest = arg.substr(2);
 
@@ -55,14 +68,43 @@ int main(int argc, char *argv[]) {
             parser.loadStr("(READ EVAL PRINT STOP)");
             repl = parser.parseExpr();
         }
+        Handle epl;
+        {
+            Parser parser;
+            parser.loadStr("(EVAL PRINT STOP)");
+            epl = parser.parseExpr();
+        }
+
         VM vm;
 
-        while (true) {
+        if (infile) {
-            std::cout << std::endl;
+            Handle parsed;
-            vm.loadControl(repl);
+            std::stringstream buffer;
-            vm.run();
+            buffer << "(";
-            std::cout << std::endl;
+            {
+                std::ifstream t(*infile);
+                buffer << t.rdbuf();
+            }
+            buffer << ")";
+            Parser parser;
+            parser.loadStr(buffer.str());
+            parsed = parser.parseExpr();
+
+            Handle cur_expr = parsed;
+            while (!cur_expr.null()) {
+                vm.loadStack(Handle::cons(cur_expr.car(), nullptr));
+                vm.loadControl(epl);
+                vm.run();
+                cur_expr = cur_expr.cdr();
+            }
         }
+        if (Options::get_bool("repl"))
+            while (true) {
+                std::cout << std::endl;
+                vm.loadControl(repl);
+                vm.run();
+                std::cout << std::endl;
+            }
     } catch (const std::exception &e) {
         std::cerr << "\nError: " << e.what() << std::endl;
         return -1;

src/support/include/Options.h

@@ -23,7 +23,8 @@ public:
 private:
     const static inline std::unordered_map<std::string, std::variant<size_t, bool>> _defaults{{"cell_limit", 50000U},
                                                                                               {"command_strs", false},
-                                                                                              {"default_log_level", 1U}};
+                                                                                              {"default_log_level", 1U},
+                                                                                              {"repl", true}};
 
     std::unordered_map<std::string, std::variant<size_t, bool>> _current = _defaults;
     std::shared_mutex _mutex;

src/vm/include/VM.h

@@ -24,6 +24,8 @@ public:
         _stop = false;
     }
 
+    void loadStack(const Handle &h) { _s = h; }
+
     void step();
 
 private:

src/vm/src/Parser.cpp

@@ -57,7 +57,7 @@ std::string Parser::Tokenizer::getNext() {
 std::string_view Parser::Tokenizer::peek() const { return _tokens.front(); }
 
 void Parser::Tokenizer::load(std::string_view input) {
-    std::string_view::size_type curpos = input.find_first_not_of(' ');
+    std::string_view::size_type curpos = input.find_first_not_of(std::string{' ', '\n', '\r'});
 
     static const std::string alnum = "-+><?=!0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
     static const std::string special = "().";
@@ -74,7 +74,7 @@ void Parser::Tokenizer::load(std::string_view input) {
         } else {
             throw std::invalid_argument("Unexpected symbol " + std::string(1, input.at(curpos)));
         }
-        curpos = input.find_first_not_of(' ', curpos);
+        curpos = input.find_first_not_of(std::string{' ', '\n', '\r'}, curpos);
     }
 }
 

src/vm/src/VM.cpp

@@ -159,7 +159,7 @@ void VM::step() {
     } else if (poppedCmd == LDG) {
         _globals_vals.append(Handle::cons(_c.pop(), _e));
     } else if (poppedCmd == PRINT) {
-        _outstream << _s.pop();
+        if (!_s.null()) _outstream << _s.pop() << std::endl;
     } else if (poppedCmd == READ) {
         std::string read;
         std::getline(_instream, read);