some fix

include/pocketpy/common/_generated.h

@@ -0,0 +1,27 @@
+#pragma once
+// generated by prebuild.py
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const char kPythonLibs__enum[];
+extern const char kPythonLibs__long[];
+extern const char kPythonLibs__set[];
+extern const char kPythonLibs_bisect[];
+extern const char kPythonLibs_builtins[];
+extern const char kPythonLibs_cmath[];
+extern const char kPythonLibs_collections[];
+extern const char kPythonLibs_colorsys[];
+extern const char kPythonLibs_datetime[];
+extern const char kPythonLibs_functools[];
+extern const char kPythonLibs_heapq[];
+extern const char kPythonLibs_itertools[];
+extern const char kPythonLibs_operator[];
+extern const char kPythonLibs_pickle[];
+extern const char kPythonLibs_this[];
+extern const char kPythonLibs_typing[];
+
+#ifdef __cplusplus
+}   // extern "C"
+#endif

include/pocketpy/common/_generated.hpp

@@ -1,21 +0,0 @@
-#pragma once
-// generated by prebuild.py
-
-namespace pkpy{
-    extern const char kPythonLibs__enum[];
-    extern const char kPythonLibs__long[];
-    extern const char kPythonLibs__set[];
-    extern const char kPythonLibs_bisect[];
-    extern const char kPythonLibs_builtins[];
-    extern const char kPythonLibs_cmath[];
-    extern const char kPythonLibs_collections[];
-    extern const char kPythonLibs_colorsys[];
-    extern const char kPythonLibs_datetime[];
-    extern const char kPythonLibs_functools[];
-    extern const char kPythonLibs_heapq[];
-    extern const char kPythonLibs_itertools[];
-    extern const char kPythonLibs_operator[];
-    extern const char kPythonLibs_pickle[];
-    extern const char kPythonLibs_this[];
-    extern const char kPythonLibs_typing[];
-}    // namespace pkpy

prebuild.py

@@ -23,26 +23,31 @@ def get_sources():
 sources = get_sources()
 
 # use LF line endings instead of CRLF
-with open("include/pocketpy/common/_generated.hpp", "wt", encoding='utf-8', newline='\n') as f:
+with open("include/pocketpy/common/_generated.h", "wt", encoding='utf-8', newline='\n') as f:
     data = '''#pragma once
 // generated by prebuild.py
 
-namespace pkpy{
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 '''
     for key in sorted(sources.keys()):
         value = sources[key]
-        data += f'    extern const char kPythonLibs_{key}[];\n'
+        data += f'extern const char kPythonLibs_{key}[];\n'
-    data += '}    // namespace pkpy\n'
+    data += '''
+#ifdef __cplusplus
+}   // extern "C"
+#endif
+'''
     f.write(data)
 
-with open("src/common/_generated.cpp", "wt", encoding='utf-8', newline='\n') as f:
+with open("src/common/_generated.c", "wt", encoding='utf-8', newline='\n') as f:
     data = '''// generated by prebuild.py
-#include "pocketpy/common/_generated.hpp"
+#include "pocketpy/common/_generated.h"
 
-namespace pkpy{
 '''
     for key in sorted(sources.keys()):
         value = sources[key]
-        data += f'    const char kPythonLibs_{key}[] = {value};\n'
+        data += f'const char kPythonLibs_{key}[] = {value};\n'
-    data += '}    // namespace pkpy\n'
     f.write(data)

src/modules/modules.cpp

@@ -3,7 +3,7 @@
 #include "pocketpy/common/version.h"
 #include "pocketpy/common/export.h"
 
-#include "pocketpy/common/_generated.hpp"
+#include "pocketpy/common/_generated.h"
 
 #include <chrono>
 #include <cmath>

src/pocketpy.cpp

@@ -1,6 +1,6 @@
 #include "pocketpy/pocketpy.hpp"
 
-#include "pocketpy/common/_generated.hpp"
+#include "pocketpy/common/_generated.h"
 
 #include "pocketpy/modules/array2d.hpp"
 #include "pocketpy/modules/base64.hpp"