blueloveTH 2 лет назад
Родитель
Сommit
446438c2bc
3 измененных файлов с 287 добавлено и 8 удалено
  1. 9 8
      amalgamate.py
  2. 139 0
      plugins/flutter/src/pocketpy.cpp
  3. 139 0
      plugins/macos/pocketpy/pocketpy.cpp

+ 9 - 8
amalgamate.py

@@ -66,21 +66,22 @@ if sys.platform == 'linux':
 
 print("amalgamated/pocketpy.h")
 
-shutil.copy("amalgamated/pocketpy.h", "plugins/flutter/src/pocketpy.h")
-shutil.copy("amalgamated/pocketpy.h", "plugins/macos/pocketpy/pocketpy.h")
+with open("amalgamated/pocketpy.cpp", "wt", encoding='utf-8') as f:
+	for i in ["src/export.h", "c_bindings/pocketpy_c.h", "c_bindings/pocketpy_c.cpp"]:
+		with open(i, "rt", encoding='utf-8') as g:
+			f.write(g.read() + '\n\n')
 
-shutil.copy("c_bindings/pocketpy_c.h", "plugins/flutter/src")
-shutil.copy("c_bindings/pocketpy_c.cpp", "plugins/flutter/src/pocketpy.cpp")
+shutil.copy("amalgamated/pocketpy.h", "plugins/flutter/src/pocketpy.h")
+shutil.copy("amalgamated/pocketpy.cpp", "plugins/flutter/src/pocketpy.cpp")
 
-shutil.copy("c_bindings/pocketpy_c.h", "plugins/macos/pocketpy/pocketpy_c.h")
-shutil.copy("c_bindings/pocketpy_c.cpp", "plugins/macos/pocketpy/pocketpy.cpp")
+shutil.copy("amalgamated/pocketpy.h", "plugins/macos/pocketpy/pocketpy.h")
+shutil.copy("amalgamated/pocketpy.cpp", "plugins/macos/pocketpy/pocketpy.cpp")
 
 # unity plugin
 unity_ios_root = 'plugins/unity/PocketPyUnityPlugin/Assets/PocketPy/Plugins/iOS'
 if os.path.exists(unity_ios_root):
 	shutil.copy("amalgamated/pocketpy.h", unity_ios_root)
-	shutil.copy("c_bindings/pocketpy_c.h", unity_ios_root)
-	shutil.copy("c_bindings/pocketpy_c.cpp", unity_ios_root + '/pocketpy.cpp')
+	shutil.copy("amalgamated/pocketpy.cpp", unity_ios_root)
 
 # my custom things...
 if os.path.exists("/mnt/e/PainterEngine/project/pocketpy.h"):

+ 139 - 0
plugins/flutter/src/pocketpy.cpp

@@ -1,3 +1,140 @@
+#ifndef PK_EXPORT
+
+#ifdef _WIN32
+#define PK_EXPORT __declspec(dllexport)
+#elif __APPLE__
+#define PK_EXPORT __attribute__((visibility("default"))) __attribute__((used))
+#elif __EMSCRIPTEN__
+#include <emscripten.h>
+#define PK_EXPORT EMSCRIPTEN_KEEPALIVE
+#else
+#define PK_EXPORT
+#endif
+
+#define PK_LEGACY_EXPORT PK_EXPORT inline
+
+#endif
+
+#ifndef POCKETPY_C_H 
+#define POCKETPY_C_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "export.h"
+
+typedef struct pkpy_vm_handle pkpy_vm;
+
+//we we take a lot of inspiration from the lua api for these bindings
+//the key difference being most methods return a bool, 
+//true if it succeeded false if it did not
+
+//if a method returns false call the pkpy_clear_error method to check the error and clear it
+//if pkpy_clear_error returns false it means that no error was set, and it takes no action
+//if pkpy_clear_error returns true it means there was an error and it was cleared, 
+//it will provide a string summary of the error in the message parameter (if it is not NULL)
+//if null is passed in as message, and it will just print the message to stderr
+PK_EXPORT bool pkpy_clear_error(pkpy_vm*, char** message);
+//NOTE you are responsible for freeing message 
+
+//this will cause the vm to enter an error state and report the given message
+//when queried
+//note that at the moment this is more like a panic than throwing an error
+//the user will not be able to catch it with python code
+PK_EXPORT bool pkpy_error(pkpy_vm*, const char* message);
+
+PK_EXPORT pkpy_vm* pkpy_vm_create(bool use_stdio, bool enable_os);
+PK_EXPORT bool pkpy_vm_run(pkpy_vm*, const char* source);
+PK_EXPORT void pkpy_vm_destroy(pkpy_vm*);
+
+typedef int (*pkpy_function)(pkpy_vm*); 
+
+PK_EXPORT bool pkpy_pop(pkpy_vm*, int n);
+
+//push the item at index onto the top of the stack (as well as leaving it where
+//it is on the stack)
+PK_EXPORT bool pkpy_push(pkpy_vm*, int index);
+
+PK_EXPORT bool pkpy_push_function(pkpy_vm*, pkpy_function);
+PK_EXPORT bool pkpy_push_int(pkpy_vm*, int);
+PK_EXPORT bool pkpy_push_float(pkpy_vm*, double);
+PK_EXPORT bool pkpy_push_bool(pkpy_vm*, bool);
+PK_EXPORT bool pkpy_push_string(pkpy_vm*, const char*);
+PK_EXPORT bool pkpy_push_stringn(pkpy_vm*, const char*, int length);
+PK_EXPORT bool pkpy_push_voidp(pkpy_vm*, void*);
+PK_EXPORT bool pkpy_push_none(pkpy_vm*);
+
+PK_EXPORT bool pkpy_set_global(pkpy_vm*, const char* name);
+PK_EXPORT bool pkpy_get_global(pkpy_vm*, const char* name);
+
+//first push callable you want to call
+//then push the arguments to send
+//argc is the number of arguments that was pushed (not counting the callable)
+PK_EXPORT bool pkpy_call(pkpy_vm*, int argc);
+
+//first push the object the method belongs to (self)
+//then push the the argments
+//argc is the number of arguments that was pushed (not counting the callable or self)
+//name is the name of the method to call on the object
+PK_EXPORT bool pkpy_call_method(pkpy_vm*, const char* name, int argc);
+
+
+//we will break with the lua api here
+//lua uses 1 as the index to the first pushed element for all of these functions
+//but we will start counting at zero to match python
+//we will allow negative numbers to count backwards from the top
+PK_EXPORT bool pkpy_to_int(pkpy_vm*, int index, int* ret);
+PK_EXPORT bool pkpy_to_float(pkpy_vm*, int index, double* ret);
+PK_EXPORT bool pkpy_to_bool(pkpy_vm*, int index, bool* ret);
+PK_EXPORT bool pkpy_to_voidp(pkpy_vm*, int index, void** ret);
+
+//this method provides a strong reference, you are responsible for freeing the
+//string when you are done with it
+PK_EXPORT bool pkpy_to_string(pkpy_vm*, int index, char** ret);
+
+//this method provides a weak reference, it is only valid until the
+//next api call
+//it is not null terminated
+PK_EXPORT bool pkpy_to_stringn(pkpy_vm*, int index, const char** ret, int* size);
+
+
+//these do not follow the same error semantics as above, their return values
+//just say whether the check succeeded or not, or else return the value asked for
+
+PK_EXPORT bool pkpy_is_int(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_float(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_bool(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_string(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_voidp(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_none(pkpy_vm*, int index);
+
+
+//will return true if global exists
+PK_EXPORT bool pkpy_check_global(pkpy_vm*, const char* name);
+
+//will return true if the vm is currently in an error state
+PK_EXPORT bool pkpy_check_error(pkpy_vm*);
+
+//will return true if at least free empty slots remain on the stack
+PK_EXPORT bool pkpy_check_stack(pkpy_vm*, int free);
+
+//returns the number of elements on the stack
+PK_EXPORT int pkpy_stack_size(pkpy_vm*);
+
+typedef void (*OutputHandler)(pkpy_vm*, const char*);
+PK_EXPORT void pkpy_set_output_handlers(pkpy_vm*, OutputHandler stdout_handler, OutputHandler stderr_handler);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
 #include "pocketpy.h"
 #include "pocketpy_c.h"
 
@@ -584,3 +721,5 @@ bool pkpy_error(pkpy_vm* vm_handle, const char* message) {
     ERRHANDLER_CLOSE
 }
 
+
+

+ 139 - 0
plugins/macos/pocketpy/pocketpy.cpp

@@ -1,3 +1,140 @@
+#ifndef PK_EXPORT
+
+#ifdef _WIN32
+#define PK_EXPORT __declspec(dllexport)
+#elif __APPLE__
+#define PK_EXPORT __attribute__((visibility("default"))) __attribute__((used))
+#elif __EMSCRIPTEN__
+#include <emscripten.h>
+#define PK_EXPORT EMSCRIPTEN_KEEPALIVE
+#else
+#define PK_EXPORT
+#endif
+
+#define PK_LEGACY_EXPORT PK_EXPORT inline
+
+#endif
+
+#ifndef POCKETPY_C_H 
+#define POCKETPY_C_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "export.h"
+
+typedef struct pkpy_vm_handle pkpy_vm;
+
+//we we take a lot of inspiration from the lua api for these bindings
+//the key difference being most methods return a bool, 
+//true if it succeeded false if it did not
+
+//if a method returns false call the pkpy_clear_error method to check the error and clear it
+//if pkpy_clear_error returns false it means that no error was set, and it takes no action
+//if pkpy_clear_error returns true it means there was an error and it was cleared, 
+//it will provide a string summary of the error in the message parameter (if it is not NULL)
+//if null is passed in as message, and it will just print the message to stderr
+PK_EXPORT bool pkpy_clear_error(pkpy_vm*, char** message);
+//NOTE you are responsible for freeing message 
+
+//this will cause the vm to enter an error state and report the given message
+//when queried
+//note that at the moment this is more like a panic than throwing an error
+//the user will not be able to catch it with python code
+PK_EXPORT bool pkpy_error(pkpy_vm*, const char* message);
+
+PK_EXPORT pkpy_vm* pkpy_vm_create(bool use_stdio, bool enable_os);
+PK_EXPORT bool pkpy_vm_run(pkpy_vm*, const char* source);
+PK_EXPORT void pkpy_vm_destroy(pkpy_vm*);
+
+typedef int (*pkpy_function)(pkpy_vm*); 
+
+PK_EXPORT bool pkpy_pop(pkpy_vm*, int n);
+
+//push the item at index onto the top of the stack (as well as leaving it where
+//it is on the stack)
+PK_EXPORT bool pkpy_push(pkpy_vm*, int index);
+
+PK_EXPORT bool pkpy_push_function(pkpy_vm*, pkpy_function);
+PK_EXPORT bool pkpy_push_int(pkpy_vm*, int);
+PK_EXPORT bool pkpy_push_float(pkpy_vm*, double);
+PK_EXPORT bool pkpy_push_bool(pkpy_vm*, bool);
+PK_EXPORT bool pkpy_push_string(pkpy_vm*, const char*);
+PK_EXPORT bool pkpy_push_stringn(pkpy_vm*, const char*, int length);
+PK_EXPORT bool pkpy_push_voidp(pkpy_vm*, void*);
+PK_EXPORT bool pkpy_push_none(pkpy_vm*);
+
+PK_EXPORT bool pkpy_set_global(pkpy_vm*, const char* name);
+PK_EXPORT bool pkpy_get_global(pkpy_vm*, const char* name);
+
+//first push callable you want to call
+//then push the arguments to send
+//argc is the number of arguments that was pushed (not counting the callable)
+PK_EXPORT bool pkpy_call(pkpy_vm*, int argc);
+
+//first push the object the method belongs to (self)
+//then push the the argments
+//argc is the number of arguments that was pushed (not counting the callable or self)
+//name is the name of the method to call on the object
+PK_EXPORT bool pkpy_call_method(pkpy_vm*, const char* name, int argc);
+
+
+//we will break with the lua api here
+//lua uses 1 as the index to the first pushed element for all of these functions
+//but we will start counting at zero to match python
+//we will allow negative numbers to count backwards from the top
+PK_EXPORT bool pkpy_to_int(pkpy_vm*, int index, int* ret);
+PK_EXPORT bool pkpy_to_float(pkpy_vm*, int index, double* ret);
+PK_EXPORT bool pkpy_to_bool(pkpy_vm*, int index, bool* ret);
+PK_EXPORT bool pkpy_to_voidp(pkpy_vm*, int index, void** ret);
+
+//this method provides a strong reference, you are responsible for freeing the
+//string when you are done with it
+PK_EXPORT bool pkpy_to_string(pkpy_vm*, int index, char** ret);
+
+//this method provides a weak reference, it is only valid until the
+//next api call
+//it is not null terminated
+PK_EXPORT bool pkpy_to_stringn(pkpy_vm*, int index, const char** ret, int* size);
+
+
+//these do not follow the same error semantics as above, their return values
+//just say whether the check succeeded or not, or else return the value asked for
+
+PK_EXPORT bool pkpy_is_int(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_float(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_bool(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_string(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_voidp(pkpy_vm*, int index);
+PK_EXPORT bool pkpy_is_none(pkpy_vm*, int index);
+
+
+//will return true if global exists
+PK_EXPORT bool pkpy_check_global(pkpy_vm*, const char* name);
+
+//will return true if the vm is currently in an error state
+PK_EXPORT bool pkpy_check_error(pkpy_vm*);
+
+//will return true if at least free empty slots remain on the stack
+PK_EXPORT bool pkpy_check_stack(pkpy_vm*, int free);
+
+//returns the number of elements on the stack
+PK_EXPORT int pkpy_stack_size(pkpy_vm*);
+
+typedef void (*OutputHandler)(pkpy_vm*, const char*);
+PK_EXPORT void pkpy_set_output_handlers(pkpy_vm*, OutputHandler stdout_handler, OutputHandler stderr_handler);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
 #include "pocketpy.h"
 #include "pocketpy_c.h"
 
@@ -584,3 +721,5 @@ bool pkpy_error(pkpy_vm* vm_handle, const char* message) {
     ERRHANDLER_CLOSE
 }
 
+
+