some fix

amalgamate.py

@@ -50,7 +50,7 @@ class Header:
 
 headers: Dict[str, Header] = {}
 
-for path in ['config.h', 'export.h', 'pocketpy.hpp', 'pocketpy_c.h']:
+for path in ['pocketpy.hpp', 'pocketpy_c.h']:
 	headers[path] = Header(path)
 
 directories = ['common', 'objects', 'interpreter', 'compiler', 'modules', 'tools']

docs/2_0_0.md

@@ -184,7 +184,7 @@ Please use config macros before `#include "pocketpy.h"` directly.
 #define PK_ENABLE_OS            1
 #define PK_ENABLE_THREAD        1
 #define PK_ENABLE_PROFILER      1
-// for all config macros, please refer to `include/pocketpy/config.h`
+// for all config macros, please refer to `include/pocketpy/common/config.h`
 #include "pocketpy.h"
 ```
 

include/pocketpy/common/namedict.hpp

@@ -2,8 +2,7 @@
 
 #include "pocketpy/common/utils.hpp"
 #include "pocketpy/common/str.hpp"
-
-#include "pocketpy/config.h"
+#include "pocketpy/common/config.h"
 
 #include <stdexcept>
 

include/pocketpy/interpreter/gc.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pocketpy/config.h"
+#include "pocketpy/common/config.h"
 #include "pocketpy/common/vector.hpp"
 #include "pocketpy/common/utils.hpp"
 #include "pocketpy/objects/object.hpp"

include/pocketpy/pocketpy_c.h

@@ -8,7 +8,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "pocketpy/export.h"
+#include "pocketpy/common/export.h"
 
 typedef struct pkpy_vm_handle pkpy_vm;
 typedef int (*pkpy_CFunction)(pkpy_vm*);

src/common/memorypool.cpp

@@ -1,6 +1,6 @@
 #include "pocketpy/common/memorypool.hpp"
 #include "pocketpy/common/gil.hpp"
-#include "pocketpy/config.h"
+#include "pocketpy/common/config.h"
 
 #include <cstdlib>
 #include <cstring>

src/compiler/compiler.cpp

@@ -1,5 +1,5 @@
 #include "pocketpy/compiler/compiler.hpp"
-#include "pocketpy/common/version.hpp"
+#include "pocketpy/common/version.h"
 #include "pocketpy/interpreter/vm.hpp"
 
 #include <stdexcept>

src/modules/modules.cpp

@@ -1,7 +1,7 @@
 #include "pocketpy/modules/modules.hpp"
 #include "pocketpy/interpreter/bindings.hpp"
-#include "pocketpy/common/version.hpp"
-#include "pocketpy/export.h"
+#include "pocketpy/common/version.h"
+#include "pocketpy/common/export.h"
 
 #include "pocketpy/common/_generated.hpp"
 

src/tools/repl.cpp

@@ -1,7 +1,7 @@
 #include "pocketpy/tools/repl.hpp"
 
-#include "pocketpy/common/version.hpp"
-#include "pocketpy/export.h"
+#include "pocketpy/common/version.h"
+#include "pocketpy/common/export.h"
 
 namespace pkpy {
     REPL::REPL(VM* vm) : vm(vm){