update pocketpy to v1.0

CMakeLists.txt

@@ -401,8 +401,15 @@ target_include_directories(squirrel PRIVATE ${SQUIRREL_DIR}/sqstdlib)
 ################################
 
 set(POCKETPY_DIR ${THIRDPARTY_DIR}/pocketpy)
+
+if (${CMAKE_VERSION} VERSION_LESS "3.12.0") 
+    set(Python3_EXECUTABLE "python3")
+else()
+    find_package(Python3 COMPONENTS Interpreter)
+endif()
+
 execute_process(
-    COMMAND python3 preprocess.py
+    COMMAND ${Python3_EXECUTABLE} preprocess.py
     WORKING_DIRECTORY ${POCKETPY_DIR}
     RESULT_VARIABLE EXIT_CODE
 )
@@ -426,6 +433,16 @@ else()
     target_compile_features(python PRIVATE cxx_std_17)
 endif()
 
+# the export.h normally lives in the src subdirecty file, but needs to be seen
+# by the c bindings
+add_custom_command(
+    TARGET python PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy
+    ${POCKETPY_DIR}/src/export.h
+    ${POCKETPY_DIR}/c_bindings/export.h
+)
+
+
 ################################
 # GIFLIB
 ################################

README.md

@@ -249,3 +249,4 @@ You can find iOS/tvOS version here
 * Thorben Krüger - [Mastodon @benthor@chaos.social](https://chaos.social/@benthor)
 * David St-Hilaire - [GitHub @sthilaid](https://github.com/sthilaid)
 * Alec Troemel - [Github @alectroemel](https://github.com/AlecTroemel)
+* Kolten Pearson - [Github @koltenpearson](https://github.com/koltenpearson)

build/assets/pythonmark.tic.dat

@@ -1 +1 @@
-0x05, 0x02, 0x00, 0x00, 0x0c, 0x30, 
+0x78, 0xda, 0xed, 0x55, 0x4f, 0x6f, 0xe3, 0x44, 0x14, 0x77, 0x0f, 0x20, 0x6a, 0x6d, 0xa4, 0xf8, 0x8a, 0x38, 0x3c, 0xed, 0x6a, 0x85, 0x4d, 0xd3, 0xd4, 0xe9, 0x9f, 0x80, 0x42, 0x5b, 0x89, 0x45, 0x5a, 0x09, 0x71, 0x59, 0x69, 0x11, 0x7b, 0x40, 0x55, 0xe4, 0xc6, 0x93, 0xc4, 0xc2, 0x19, 0x9b, 0xf1, 0x78, 0x8b, 0x0f, 0x5c, 0xf9, 0x04, 0x7c, 0x00, 0x4e, 0x70, 0x85, 0x13, 0x77, 0x6e, 0x48, 0xa9, 0xd4, 0x0f, 0x50, 0x57, 0xcb, 0x07, 0x20, 0xcb, 0xa1, 0x82, 0x23, 0xbc, 0x99, 0xf1, 0x9f, 0xb1, 0x81, 0x14, 0xb8, 0xc0, 0x4a, 0x9d, 0xe4, 0x39, 0xe3, 0xe7, 0xf7, 0x7e, 0xef, 0xcf, 0xcf, 0xf3, 0x72, 0xc7, 0x35, 0x8c, 0x57, 0x5f, 0xeb, 0x9d, 0xbc, 0x7e, 0xf2, 0xed, 0xf1, 0xe3, 0xe7, 0x9f, 0x3d, 0xf9, 0xed, 0x3c, 0xfd, 0xfa, 0xe7, 0xf8, 0xad, 0xef, 0xfc, 0xfb, 0x9f, 0x64, 0xce, 0x30, 0x7a, 0xfb, 0xe4, 0x87, 0x77, 0xbe, 0xfa, 0x25, 0x79, 0xfe, 0xeb, 0xf5, 0xf5, 0xf5, 0x17, 0xdf, 0x7c, 0xff, 0x61, 0xf8, 0xf9, 0xde, 0xe1, 0x93, 0x8d, 0x2f, 0x5f, 0x36, 0x6e, 0x5a, 0x96, 0x65, 0xa1, 0x6c, 0xe4, 0x28, 0xe7, 0x2d, 0x11, 0xba, 0xdc, 0xe8, 0xe2, 0xa5, 0x63, 0x5d, 0x2c, 0x5b, 0x72, 0x99, 0x1b, 0xb9, 0x58, 0x02, 0x21, 0xcf, 0xbb, 0xd6, 0xf2, 0xb2, 0x29, 0xe7, 0xa8, 0x13, 0xfa, 0x9b, 0x96, 0x71, 0xbb, 0xfe, 0xd3, 0x55, 0xf2, 0x5c, 0xca, 0x86, 0x71, 0x91, 0xff, 0xb8, 0xba, 0x42, 0x59, 0xe1, 0xfe, 0xd9, 0x55, 0x07, 0x39, 0xee, 0xe4, 0xc5, 0xea, 0xe0, 0xc3, 0x7c, 0x99, 0x2b, 0x51, 0xeb, 0x02, 0x39, 0xbe, 0x28, 0xb8, 0x56, 0xd2, 0x31, 0xaa, 0x87, 0xb8, 0x6f, 0xf3, 0x2d, 0xde, 0x88, 0x4e, 0x21, 0xdd, 0x5b, 0xfe, 0xff, 0x0f, 0xfc, 0xaf, 0xd6, 0x49, 0x7e, 0xbe, 0x5c, 0xe6, 0xcb, 0x96, 0x08, 0x5d, 0xb5, 0xba, 0xd6, 0x65, 0x4b, 0x72, 0x4d, 0x6e, 0xcf, 0xff, 0x8b, 0xcc, 0xbf, 0x65, 0xe4, 0x3f, 0xe1, 0x20, 0x58, 0xad, 0x56, 0x1d, 0xb4, 0xed, 0x16, 0x67, 0xb6, 0x14, 0xb1, 0xae, 0x90, 0xe3, 0x15, 0xca, 0xb3, 0x2b, 0xfc, 0xa3, 0x58, 0x35, 0xc5, 0x32, 0x6e, 0xa4, 0xdf, 0x7a, 0xc9, 0x7a, 0xc5, 0xb8, 0x07, 0x3c, 0xe0, 0x21, 0x19, 0xc1, 0x83, 0x94, 0xd2, 0x6c, 0xe1, 0xb1, 0x8f, 0x21, 0xa0, 0xf0, 0x28, 0xe3, 0xf3, 0x88, 0x9a, 0xf7, 0xc0, 0x4b, 0x71, 0xc3, 0x46, 0xf0, 0x7e, 0x14, 0x72, 0x82, 0x7a, 0xe2, 0xb1, 0x44, 0x3e, 0xf0, 0x49, 0x32, 0x41, 0x27, 0x42, 0x27, 0x73, 0xe1, 0x14, 0xd0, 0x19, 0xf0, 0x28, 0x0a, 0xf1, 0x02, 0x09, 0x21, 0x30, 0x8f, 0xce, 0x60, 0xe1, 0xd1, 0x0c, 0x4e, 0x11, 0x36, 0x20, 0x09, 0x4c, 0x3c, 0x0a, 0xd3, 0x30, 0x03, 0x8f, 0x45, 0x29, 0xf5, 0x81, 0xcf, 0x09, 0x24, 0x13, 0x46, 0x08, 0xed, 0x41, 0x9a, 0x08, 0xef, 0x2a, 0x64, 0x40, 0xe3, 0x94, 0x8f, 0x60, 0xe6, 0x2d, 0x48, 0xec, 0xf9, 0xa8, 0x40, 0xbb, 0x20, 0x46, 0x4d, 0x5c, 0x5a, 0x3c, 0x25, 0x2c, 0x09, 0x22, 0x3a, 0x02, 0xb7, 0x8f, 0x1f, 0x33, 0x58, 0xc4, 0x11, 0xe3, 0xc0, 0x3c, 0xea, 0x47, 0x0b, 0x30, 0x4d, 0x85, 0x3b, 0x3e, 0x0b, 0x7c, 0x3e, 0x87, 0x23, 0xd8, 0xdd, 0x77, 0x4b, 0xd5, 0x9c, 0x04, 0xb3, 0x39, 0x47, 0xdd, 0x60, 0x6f, 0x68, 0x8a, 0x74, 0x4f, 0x3d, 0x56, 0x2b, 0x51, 0x85, 0x57, 0xd7, 0x34, 0xcd, 0x49, 0xe8, 0x25, 0x89, 0xea, 0x08, 0x8c, 0x4c, 0x73, 0xd3, 0x27, 0x53, 0x18, 0x8f, 0x03, 0x1a, 0xf0, 0xf1, 0xd8, 0x4e, 0x48, 0x38, 0x75, 0x50, 0xbd, 0xb9, 0x29, 0x76, 0xfd, 0x2a, 0xcc, 0xb0, 0xd4, 0x54, 0x80, 0x7b, 0xbb, 0xa5, 0xea, 0x53, 0xbc, 0x53, 0xf9, 0xf5, 0xc5, 0x4f, 0x40, 0xb9, 0xed, 0xf6, 0xa0, 0x91, 0xe8, 0x36, 0xd4, 0x70, 0x4e, 0xe9, 0x97, 0xad, 0xf3, 0x2b, 0xe2, 0x14, 0x8e, 0xea, 0xae, 0xf2, 0x4c, 0x62, 0x42, 0xfc, 0xb1, 0x16, 0x37, 0xa5, 0xc1, 0x34, 0x62, 0x0b, 0x7b, 0x7b, 0xe0, 0x62, 0xd3, 0x7a, 0x20, 0x7f, 0x1c, 0xd8, 0x81, 0xa1, 0xe8, 0x61, 0xc3, 0x2b, 0xfb, 0xc7, 0x5e, 0x2c, 0xe0, 0x44, 0xb4, 0x15, 0x35, 0xaa, 0x5b, 0x3e, 0xf3, 0xce, 0xf4, 0x4e, 0xc5, 0xcc, 0xd6, 0x4c, 0x7b, 0x20, 0x2a, 0x51, 0x9d, 0x71, 0xb4, 0x9b, 0x0c, 0x6f, 0x06, 0xf2, 0xeb, 0xca, 0xef, 0x3e, 0x7e, 0x9d, 0x0a, 0x33, 0x8d, 0x7d, 0x8f, 0x93, 0x76, 0xff, 0x45, 0x89, 0xc5, 0x66, 0x0b, 0xf4, 0xd2, 0xf5, 0x1e, 0x16, 0x9b, 0x86, 0x41, 0x26, 0x81, 0x37, 0x83, 0x29, 0xd8, 0x4d, 0x7f, 0xc5, 0xc7, 0x71, 0x83, 0x1e, 0x15, 0x50, 0x8b, 0xf8, 0x57, 0xd4, 0x55, 0x56, 0x35, 0x01, 0x8d, 0xdb, 0x37, 0x60, 0x7b, 0x20, 0x3b, 0xa7, 0x87, 0xae, 0x32, 0x2b, 0x28, 0x3d, 0x6e, 0x52, 0xac, 0x07, 0xcf, 0xea, 0xe0, 0x7f, 0xc6, 0x7f, 0x2b, 0x7c, 0xd6, 0x0c, 0x9f, 0xd5, 0xe1, 0x5b, 0xa5, 0x1f, 0x82, 0xdb, 0x2e, 0xd1, 0xfd, 0x97, 0xa5, 0x1c, 0x42, 0xf3, 0x64, 0xb5, 0xb3, 0x6f, 0x3e, 0xfd, 0xfb, 0x09, 0x63, 0x1c, 0x75, 0x2e, 0x1f, 0x3e, 0x7a, 0x2c, 0x20, 0xd7, 0x1f, 0xcb, 0xa7, 0x5e, 0x98, 0x92, 0xa2, 0x0a, 0xa9, 0x98, 0x32, 0x1c, 0x28, 0x89, 0xae, 0x41, 0x30, 0x3e, 0xe6, 0xc1, 0xa2, 0x34, 0x53, 0x80, 0x33, 0xc2, 0xc7, 0xd2, 0x59, 0x43, 0x14, 0xd5, 0x09, 0x43, 0xdb, 0x29, 0xbb, 0x5d, 0xfb, 0x1e, 0x1e, 0x89, 0x43, 0xd1, 0xe8, 0x5e, 0x15, 0x4a, 0xbf, 0xdb, 0x92, 0xa7, 0x83, 0x84, 0x09, 0xd1, 0x2c, 0xcb, 0x2c, 0x35, 0xc3, 0x3f, 0xa2, 0xd4, 0x44, 0xe8, 0x19, 0xab, 0x7c, 0x0a, 0x26, 0x19, 0xe1, 0x29, 0xa3, 0x50, 0x63, 0x8a, 0x72, 0xa6, 0xb1, 0xf0, 0xc6, 0x6e, 0xa1, 0x99, 0x59, 0xce, 0xe1, 0x23, 0xf8, 0x48, 0xce, 0x35, 0xdb, 0x39, 0x31, 0x4d, 0x51, 0xef, 0x07, 0xef, 0xbd, 0x6b, 0xcb, 0xe4, 0x67, 0x61, 0x74, 0xea, 0xe1, 0x00, 0x17, 0x9d, 0xc5, 0x82, 0x71, 0x80, 0x61, 0x68, 0x99, 0xeb, 0x02, 0x27, 0xf4, 0xc4, 0x76, 0x1d, 0xfd, 0xc9, 0x10, 0x99, 0x19, 0xee, 0xe3, 0x65, 0xb7, 0xbf, 0xf7, 0xe6, 0x81, 0x66, 0x36, 0x50, 0x07, 0x96, 0xc3, 0x96, 0x9c, 0x07, 0xd2, 0xe3, 0x94, 0x53, 0xbb, 0xe8, 0x10, 0x4e, 0x13, 0x08, 0xc4, 0x5f, 0x0c, 0x0e, 0x98, 0x19, 0xb1, 0x0f, 0x8a, 0xbe, 0x15, 0xe9, 0xf5, 0xbd, 0x38, 0x26, 0xd4, 0xb7, 0x8b, 0x14, 0x1d, 0xcd, 0x7f, 0xb0, 0xd6, 0x1f, 0x8d, 0x42, 0x42, 0xed, 0x02, 0xc6, 0xc1, 0x13, 0xa4, 0x52, 0xaf, 0x91, 0xe3, 0x28, 0xb6, 0x25, 0x9e, 0x40, 0x38, 0x95, 0xa3, 0x1d, 0x51, 0xca, 0xb6, 0x08, 0x5b, 0xa9, 0xec, 0x17, 0x53, 0x46, 0x55, 0x31, 0x09, 0x13, 0x7b, 0x70, 0xe0, 0xdc, 0xe8, 0x24, 0xc7, 0x9d, 0x72, 0x61, 0x64, 0x22, 0x87, 0x74, 0x6b, 0xbe, 0xf7, 0x5a, 0xef, 0x3d, 0x1a, 0xa0, 0x3d, 0x4e, 0x43, 0x9c, 0x7d, 0x77, 0x1f, 0x28, 0xc0, 0x11, 0xdc, 0x15, 0x83, 0x80, 0x33, 0x5b, 0xaf, 0xc5, 0x29, 0x07, 0xe2, 0x00, 0x7f, 0x1e, 0x7a, 0xf8, 0x02, 0x49, 0x85, 0xdc, 0xd5, 0x10, 0x48, 0x73, 0xed, 0x8e, 0xcc, 0xf7, 0xeb, 0xf7, 0x58, 0x20, 0xe8, 0xa9, 0xec, 0xec, 0xec, 0xae, 0xc1, 0xfb, 0x1d, 0xbb, 0x21, 0x27, 0x1d, 

src/api/python.c

@@ -337,7 +337,7 @@ static int py_key(pkpy_vm* vm)
         return 0;
 
     if (key_id >= tic_keys_count) {
-        pkpy_error(vm, "unknown keyboard code\n");
+        pkpy_error(vm, "tic80-panic!", "unknown keyboard code\n");
         return 0;
     }
 
@@ -361,7 +361,7 @@ static int py_keyp(pkpy_vm* vm)
         return 0;
 
     if (key_id >= tic_keys_count) {
-        pkpy_error(vm, "unknown keyboard code\n");
+        pkpy_error(vm, "tic80-panic!", "unknown keyboard code\n");
         return 0;
     }
 
@@ -570,7 +570,7 @@ static int py_music(pkpy_vm* vm) {
         return 0;
 
     if (track > MUSIC_TRACKS - 1 )
-        pkpy_error(vm, "invalid music track index\n");
+        pkpy_error(vm, "tic80-panic!", "invalid music track index\n");
 
     //stop the music first I guess
     tic_api_music(tic, -1, 0, 0, false, false, -1, -1);
@@ -687,7 +687,7 @@ static int py_pmem(pkpy_vm* vm) {
         return 0;
 
     if (index >= TIC_PERSISTENT_SIZE) {
-        pkpy_error(vm, "invalid persistent tic index\n");
+        pkpy_error(vm, "tic80-panic!", "invalid persistent tic index\n");
         return 0;
     }
 
@@ -882,7 +882,7 @@ static int py_sfx(pkpy_vm* vm)
 
     if (parse_note) {
         if(!tic_tool_parse_note(string_note, &note, &octave)) {
-            pkpy_error(vm, "invalid note, should like C#4\n");
+            pkpy_error(vm, "tic80-panic!", "invalid note, should like C#4\n");
             goto cleanup; //error in future;
         }
 
@@ -892,12 +892,12 @@ static int py_sfx(pkpy_vm* vm)
     }
 
     if (channel < 0 || channel >= TIC_SOUND_CHANNELS) {
-        pkpy_error(vm, "unknown channel\n");
+        pkpy_error(vm, "tic80-panic!", "unknown channel\n");
         goto cleanup;
     }
 
     if (sfx_id >= SFX_COUNT) {
-        pkpy_error(vm, "unknown sfx index\n");
+        pkpy_error(vm, "tic80-panic!", "unknown sfx index\n");
         goto cleanup;
     }
 
@@ -969,7 +969,7 @@ static int py_sync(pkpy_vm* vm)
         return 0;
 
     if (bank < 0 || bank >= TIC_BANKS) {
-        pkpy_error(vm, "sync() error, invalid bank\n");
+        pkpy_error(vm, "tic80-panic!", "sync() error, invalid bank\n");
         return 0;
     }
 
@@ -1139,142 +1139,142 @@ static int py_vbank(pkpy_vm* vm) {
 
 static bool setup_c_bindings(pkpy_vm* vm) {
 
-    pkpy_push_function(vm, py_trace);
+    pkpy_push_function(vm, py_trace, 2);
     pkpy_set_global(vm, "_trace");
 
-    pkpy_push_function(vm, py_cls);
+    pkpy_push_function(vm, py_cls, 1);
     pkpy_set_global(vm, "_cls");
 
-    pkpy_push_function(vm, py_btn);
+    pkpy_push_function(vm, py_btn, 1);
     pkpy_set_global(vm, "_btn");
 
-    pkpy_push_function(vm, py_btnp);
+    pkpy_push_function(vm, py_btnp, 3);
     pkpy_set_global(vm, "_btnp");
 
-    pkpy_push_function(vm, py_circ);
+    pkpy_push_function(vm, py_circ, 4);
     pkpy_set_global(vm, "_circ");
 
-    pkpy_push_function(vm, py_circb);
+    pkpy_push_function(vm, py_circb, 4);
     pkpy_set_global(vm, "_circb");
 
-    pkpy_push_function(vm, py_clip);
+    pkpy_push_function(vm, py_clip, 4);
     pkpy_set_global(vm, "_clip");
 
-    pkpy_push_function(vm, py_elli);
+    pkpy_push_function(vm, py_elli, 5);
     pkpy_set_global(vm, "_elli");
 
-    pkpy_push_function(vm, py_ellib);
+    pkpy_push_function(vm, py_ellib, 5);
     pkpy_set_global(vm, "_ellib");
 
-    pkpy_push_function(vm, py_exit);
+    pkpy_push_function(vm, py_exit, 0);
     pkpy_set_global(vm, "_exit");
 
-    pkpy_push_function(vm, py_fget);
+    pkpy_push_function(vm, py_fget, 2);
     pkpy_set_global(vm, "_fget");
 
-    pkpy_push_function(vm, py_fget);
+    pkpy_push_function(vm, py_fset, 3);
     pkpy_set_global(vm, "_fset");
 
-    pkpy_push_function(vm, py_font);
+    pkpy_push_function(vm, py_font, 9);
     pkpy_set_global(vm, "_font");
 
-    pkpy_push_function(vm, py_key);
+    pkpy_push_function(vm, py_key, 1);
     pkpy_set_global(vm, "_key");
 
-    pkpy_push_function(vm, py_keyp);
+    pkpy_push_function(vm, py_keyp, 3);
     pkpy_set_global(vm, "_keyp");
 
-    pkpy_push_function(vm, py_line);
+    pkpy_push_function(vm, py_line, 5);
     pkpy_set_global(vm, "_line");
 
-    pkpy_push_function(vm, py_map);
+    pkpy_push_function(vm, py_map, 9);
     pkpy_set_global(vm, "_map");
 
-    pkpy_push_function(vm, py_memcpy);
+    pkpy_push_function(vm, py_memcpy, 3);
     pkpy_set_global(vm, "_memcpy");
 
-    pkpy_push_function(vm, py_memset);
+    pkpy_push_function(vm, py_memset, 3);
     pkpy_set_global(vm, "_memset");
 
-    pkpy_push_function(vm, py_mget);
+    pkpy_push_function(vm, py_mget, 2);
     pkpy_set_global(vm, "_mget");
 
-    pkpy_push_function(vm, py_mouse);
+    pkpy_push_function(vm, py_mouse, 0);
     pkpy_set_global(vm, "_mouse");
 
-    pkpy_push_function(vm, py_mset);
+    pkpy_push_function(vm, py_mset, 3);
     pkpy_set_global(vm, "_mset");
 
-    pkpy_push_function(vm, py_music);
+    pkpy_push_function(vm, py_music, 7);
     pkpy_set_global(vm, "_music");
 
-    pkpy_push_function(vm, py_peek);
+    pkpy_push_function(vm, py_peek, 2);
     pkpy_set_global(vm, "_peek");
 
-    pkpy_push_function(vm, py_peek1);
+    pkpy_push_function(vm, py_peek1, 1);
     pkpy_set_global(vm, "_peek1");
 
-    pkpy_push_function(vm, py_peek1);
+    pkpy_push_function(vm, py_peek2, 1);
     pkpy_set_global(vm, "_peek2");
 
-    pkpy_push_function(vm, py_peek1);
+    pkpy_push_function(vm, py_peek4, 1);
     pkpy_set_global(vm, "_peek4");
 
-    pkpy_push_function(vm, py_pix);
+    pkpy_push_function(vm, py_pix, 3);
     pkpy_set_global(vm, "_pix");
 
-    pkpy_push_function(vm, py_pmem);
+    pkpy_push_function(vm, py_pmem, 2);
     pkpy_set_global(vm, "_pmem");
 
-    pkpy_push_function(vm, py_poke);
+    pkpy_push_function(vm, py_poke, 3);
     pkpy_set_global(vm, "_poke");
 
-    pkpy_push_function(vm, py_poke1);
+    pkpy_push_function(vm, py_poke1, 2);
     pkpy_set_global(vm, "_poke1");
 
-    pkpy_push_function(vm, py_poke1);
+    pkpy_push_function(vm, py_poke2, 2);
     pkpy_set_global(vm, "_poke2");
 
-    pkpy_push_function(vm, py_poke1);
+    pkpy_push_function(vm, py_poke4, 2);
     pkpy_set_global(vm, "_poke4");
 
-    pkpy_push_function(vm, py_print);
+    pkpy_push_function(vm, py_print, 8);
     pkpy_set_global(vm, "_print");
 
-    pkpy_push_function(vm, py_rect);
+    pkpy_push_function(vm, py_rect, 5);
     pkpy_set_global(vm, "_rect");
 
-    pkpy_push_function(vm, py_rectb);
+    pkpy_push_function(vm, py_rectb, 5);
     pkpy_set_global(vm, "_rectb");
 
-    pkpy_push_function(vm, py_reset);
+    pkpy_push_function(vm, py_reset, 0);
     pkpy_set_global(vm, "_reset");
 
-    pkpy_push_function(vm, py_sfx);
+    pkpy_push_function(vm, py_sfx, 6);
     pkpy_set_global(vm, "_sfx");
 
-    pkpy_push_function(vm, py_spr);
+    pkpy_push_function(vm, py_spr, 9);
     pkpy_set_global(vm, "_spr");
 
-    pkpy_push_function(vm, py_sync);
+    pkpy_push_function(vm, py_sync, 3);
     pkpy_set_global(vm, "_sync");
 
-    pkpy_push_function(vm, py_time);
+    pkpy_push_function(vm, py_time, 0);
     pkpy_set_global(vm, "_time");
 
-    pkpy_push_function(vm, py_tri);
+    pkpy_push_function(vm, py_tri, 7);
     pkpy_set_global(vm, "_tri");
 
-    pkpy_push_function(vm, py_trib);
+    pkpy_push_function(vm, py_trib, 7);
     pkpy_set_global(vm, "_trib");
 
-    pkpy_push_function(vm, py_tstamp);
+    pkpy_push_function(vm, py_tstamp, 0);
     pkpy_set_global(vm, "_tstamp");
 
-    pkpy_push_function(vm, py_ttri);
+    pkpy_push_function(vm, py_ttri, 17);
     pkpy_set_global(vm, "_ttri");
 
-    pkpy_push_function(vm, py_vbank);
+    pkpy_push_function(vm, py_vbank, 1);
     pkpy_set_global(vm, "_vbank");
 
     if(pkpy_check_error(vm))