up

amalgamate.py

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

src/common.h

@@ -28,16 +28,13 @@
 // #include <filesystem>
 // namespace fs = std::filesystem;
 
-#define EMH_EXT 1
-#define EMH_FIND_HIT 1
-
 #ifdef POCKETPY_H
 #define UNREACHABLE() throw std::runtime_error( "L" + std::to_string(__LINE__) + " UNREACHABLE()!");
 #else
 #define UNREACHABLE() throw std::runtime_error( __FILE__ + std::string(":") + std::to_string(__LINE__) + " UNREACHABLE()!");
 #endif
 
-#define PK_VERSION "0.8.9"
+#define PK_VERSION "0.9.0"
 
 #if defined(__EMSCRIPTEN__) || defined(__arm__) || defined(__i386__)
 typedef int32_t i64;

src/error.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "safestl.h"
+#include "namedict.h"
+#include "tuplelist.h"
 
 struct NeedMoreLines {
     NeedMoreLines(bool is_compiling_class) : is_compiling_class(is_compiling_class) {}

src/memory.h

@@ -147,3 +147,8 @@ struct SmallArrayPool {
         }
     }
 };
+
+
+typedef pkpy::shared_ptr<PyObject> PyVar;
+typedef PyVar PyVarOrNull;
+typedef PyVar PyVarRef;

src/namedict.h

@@ -1,14 +1,18 @@
 #pragma once
 
-#include "safestl.h"
+#include "common.h"
+#include "memory.h"
+#include "str.h"
 
-struct NameDictNode{
+namespace pkpy{
+
+    struct NameDictNode{
         StrName first;
         PyVar second;
         inline bool empty() const { return first.empty(); }
-};
+    };
 
-struct NameDict {
+    struct NameDict {
         int _capacity;
         int _size;
         float _load_factor;
@@ -40,8 +44,8 @@ struct NameDict {
 
         int size() const { return _size; }
 
-//https://github.com/python/cpython/blob/main/Objects/dictobject.c#L175
-#define HASH_PROBE(key, ok, i) \
+    //https://github.com/python/cpython/blob/main/Objects/dictobject.c#L175
+    #define HASH_PROBE(key, ok, i) \
         int i = (key).index % _capacity; \
         bool ok = false; \
         while(!_a[i].empty()) { \
@@ -49,7 +53,7 @@ struct NameDict {
             i = (5*i + 1) % _capacity; \
         }
 
-#define HASH_PROBE_OVERRIDE(key, ok, i) \
+    #define HASH_PROBE_OVERRIDE(key, ok, i) \
         i = (key).index % _capacity; \
         ok = false; \
         while(!_a[i].empty()) { \
@@ -85,6 +89,7 @@ struct NameDict {
             for(int i=0; i<old_capacity; i++){
                 if(old_a[i].empty()) continue;
                 HASH_PROBE(old_a[i].first, ok, j);
+                if(ok) UNREACHABLE();
                 _a[j].first = old_a[i].first;
                 _a[j].second = std::move(old_a[i].second);
                 _size++;
@@ -155,6 +160,8 @@ struct NameDict {
         inline iterator begin() const { return iterator(this, 0); }
         inline iterator end() const { return iterator(this, _capacity); }
 
-#undef HASH_PROBE
-#undef HASH_PROBE_OVERRIDE
-};
+    #undef HASH_PROBE
+    #undef HASH_PROBE_OVERRIDE
+    };
+
+} // namespace pkpy

src/obj.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "safestl.h"
+#include "namedict.h"
+#include "tuplelist.h"
 
 struct CodeObject;
 struct Frame;

src/tuplelist.h

@@ -4,18 +4,7 @@
 #include "memory.h"
 #include "str.h"
 
-struct PyObject;
-typedef pkpy::shared_ptr<PyObject> PyVar;
-typedef PyVar PyVarOrNull;
-typedef PyVar PyVarRef;
-
-#include "hash_table5.hpp"
 namespace pkpy {
-    #include "namedict.h"
-	// template<typename... Args>
-	// using HashMap = emhash5::HashMap<Args...>;
-    // typedef HashMap<StrName, PyVar> NameDict;
-    
     class List: public std::vector<PyVar> {
         PyVar& at(size_t) = delete;