move headers

amalgamate.py

@@ -2,7 +2,7 @@ with open("src/opcodes.h", "rt", encoding='utf-8') as f:
 	OPCODES_TEXT = f.read()
 
 pipeline = [
-	["str.h", "builtins.h", "error.h"],
+	["__stl__.h", "str.h", "builtins.h", "error.h"],
 	["obj.h", "iter.h", "parser.h", "pointer.h", "codeobject.h"],
 	["vm.h", "compiler.h"],
 	["pocketpy.h"]

src/__stl__.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <sstream>
+#include <regex>
+#include <unordered_map>
+#include <memory>
+#include <variant>
+#include <functional>
+#include <stack>
+#include <cmath>
+#include <stdexcept>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <chrono>
+#include <string_view>
+#include <queue>
+#include <iomanip>

src/compiler.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#include <vector>
-#include <string>
-#include <cstring>
-
 #include "parser.h"
 #include "error.h"
 #include "vm.h"

src/error.h

@@ -1,9 +1,6 @@
 #pragma once
 
-#include <string>
+#include "__stl__.h"
-#include <vector>
-#include <stdexcept>
-
 #include "str.h"
 
 class NeedMoreLines {

src/main.cpp

@@ -1,7 +1,6 @@
 #include <iostream>
 #include <fstream>
 
-#include <chrono>
 #include "pocketpy.h"
 
 //#define PK_DEBUG_TIME

src/obj.h

@@ -1,13 +1,6 @@
 #pragma once
 
-#include <unordered_map>
+#include "__stl__.h"
-#include <memory>
-#include <variant>
-#include <functional>
-#include <stack>
-#include <cmath>
-#include <stdexcept>
-
 #include "str.h"
 
 typedef int64_t _Int;

src/parser.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#include <string_view>
-#include <cstring>
-#include <queue>
-
 #include "obj.h"
 
 typedef uint8_t _TokenType;

src/pocketpy.h

@@ -3,10 +3,6 @@
 #include "vm.h"
 #include "compiler.h"
 
-#include <iomanip>
-#include <cmath>
-#include <chrono>
-
 #define PK_VERSION "0.2.0"
 
 #define BIND_NUM_ARITH_OPT(name, op)                                                                    \

src/str.h

@@ -1,9 +1,6 @@
 #pragma once
 
-#include <vector>
+#include "__stl__.h"
-#include <string>
-#include <sstream>
-#include <regex>
 
 typedef std::stringstream _StrStream;