From 7d72930f9c5db2db6e1f1060a59f173a4beb3ca5 Mon Sep 17 00:00:00 2001
From: Ludovic 'Archivist' Lagouardette <ludovic@nekoit.xyz>
Date: Fri, 24 Feb 2023 17:13:54 +0100
Subject: [PATCH 1/2] Fixed faulty test

---
 tests/004.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/004.exp b/tests/004.exp
index d504d34..8305117 100644
--- a/tests/004.exp
+++ b/tests/004.exp
@@ -86,7 +86,7 @@ expect eof
 spawn -noecho $SUGAR_EXECUTABLE tests/004/incomplete-07.mol lex parse
 expect {
     eof { abort "should display failure line" }
-    {incomplete-07.mol:2}
+    {incomplete-07.mol:1}
 }
 expect {
     eof { abort "should display failure in incomplete-07" }

From 5b2cc8c9dd2eba5fbbdf967987f6c4660978eaed Mon Sep 17 00:00:00 2001
From: Ludovic 'Archivist' Lagouardette <ludovic@nekoit.xyz>
Date: Wed, 15 Mar 2023 19:55:28 +0100
Subject: [PATCH 2/2] Some random progress

---
 CMakeLists.txt                       |  2 +-
 include/molasses/parser_primitives.h |  7 ++++++-
 src/main.cpp                         | 13 ++++++++++++
 src/molasses/interpreter.cpp         | 30 ++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/molasses/interpreter.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2fa8b7..3697459 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ add_executable(sugar
         include/molasses/lexer.h
         src/molasses/parser_primitives.cpp
         include/molasses/parser_primitives.h
-        include/molasses/generator_primitives.h)
+        include/molasses/generator_primitives.h src/molasses/interpreter.cpp)
 
 function(add_expect_test [testname filename])
     add_test(
diff --git a/include/molasses/parser_primitives.h b/include/molasses/parser_primitives.h
index 99e98b2..1d31abc 100644
--- a/include/molasses/parser_primitives.h
+++ b/include/molasses/parser_primitives.h
@@ -214,6 +214,7 @@ namespace molasses {
 	std::vector<std::string> operator>>(std::vector<std::string> current_stack, const operation& next_op);
 	
 	std::optional<int32_t> try_parse_int32(const std::string& str);
+	std::optional<int64_t> try_parse_int64(const std::string& str);
 	
     struct parser_context {
         std::vector<std::shared_ptr<type>> types;
@@ -229,7 +230,11 @@ namespace molasses {
         parser_context parser;
         std::vector<std::shared_ptr<procedure_operation>> procedures;
     };
-	
+
+    using success_t = bool;
+
+    std::tuple<interpreter_stack, generate_context, std::optional<std::shared_ptr<std::runtime_error>>> interpret(interpreter_stack, generate_context, std::string );
+
     generate_context parse(parser_context, const lexed_output&);
     std::vector<std::string> generate(const generate_context&);
 
diff --git a/src/main.cpp b/src/main.cpp
index 56374f1..6c2a56d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -111,6 +111,19 @@ int main(int argc, char** argv) {
                     compile_stack.emplace(lexer_1);
                 } else
                     throw build_system_error("merge-all expects at least 1 lexed outputs\n");
+            } else if(elem == "interpret") {
+                if(not compile_stack.empty() and std::holds_alternative<molasses::generate_context>(compile_stack.top())) {
+                    auto context = std::get<molasses::generate_context>(compile_stack.top());
+                    compile_stack.pop();
+                    molasses::interpreter_stack stack;
+                    while(true) {
+                        std::cout << "%> ";
+                        std::string contents;
+                        std::getline(std::cin, contents);
+                        molasses::interpret(stack, context, contents);
+                    }
+                } else
+                    throw build_system_error("merge-all expects at least 1 lexed outputs\n");
             } else if(elem == "assemble") {
                 if(not compile_stack.empty() and std::holds_alternative<std::string>(compile_stack.top())) {
                     auto filename = std::get<std::string>(compile_stack.top());
diff --git a/src/molasses/interpreter.cpp b/src/molasses/interpreter.cpp
new file mode 100644
index 0000000..716b922
--- /dev/null
+++ b/src/molasses/interpreter.cpp
@@ -0,0 +1,30 @@
+#include <span>
+#include "molasses/parser_primitives.h"
+
+namespace molasses {
+    std::tuple<interpreter_stack, generate_context, std::optional<std::shared_ptr<std::runtime_error>>> interpret(interpreter_stack stack, generate_context context, std::string text){
+        auto copy_stack = stack;
+        auto copy_ctx = context;
+
+        try {
+            lexed_output new_lex = lex("%interpreter%", text);
+            context.lexer = concatenate(context.lexer, new_lex);
+            auto count_to_execute = new_lex.symbols.size();
+            auto executable_span = std::span(
+                context.lexer.symbols.begin()+((intptr_t)context.lexer.symbols.size() - (intptr_t)count_to_execute),
+                context.lexer.symbols.end()
+            );
+
+            for(const auto& l : executable_span) {
+                auto token = context.lexer.dictionary[l];
+                if(auto value_i32 = try_parse_int32(token); value_i32) stack.push(value_i32.value());
+                else if(auto value_i64 = try_parse_int64(token); value_i64) stack.push(value_i64.value());
+                else context.parser.lookup_operation(token)->execute(context, stack);
+            }
+        } catch (std::runtime_error& err) {
+            return {copy_stack, copy_ctx, std::make_shared<std::runtime_error>(err)};
+        }
+
+        return {stack, context, std::nullopt};
+    }
+}