up

amalgamate.py

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

plugins/godot/godot-cpp

@@ -1 +1 @@
-Subproject commit ed849abe8ed709eb7e378d39f4b8709e4ff9667f
+Subproject commit 484bb4f281a60bda5ccb121b753b05fa4deead60

src/__stl__.h

@@ -23,7 +23,6 @@
 #include <atomic>
 #include <iostream>
 
-#define EMH_WYHASH_HASH 1
 #include "hash_table8.hpp"
 
 #ifdef POCKETPY_H

src/hash_table8.hpp

@@ -25,6 +25,11 @@
 
 #pragma once
 
+// Modification:
+// 1. Add #define EMH_WYHASH_HASH 1
+// 2. Add static for wymix
+#define EMH_WYHASH_HASH 1
+
 #include <cstring>
 #include <string>
 #include <cstdlib>