Renamed StringBuilder to UnicodeBuilder

hpy/devel/include/common/runtime/ctx_unicodebuilder.h

@@ -0,0 +1,16 @@
+#ifndef HPY_COMMON_RUNTIME_UNICODEBUILDER_H
+#define HPY_COMMON_RUNTIME_UNICODEBUILDER_H
+
+#include <Python.h>
+#include "hpy.h"
+#include "common/hpytype.h"
+
+
+_HPy_HIDDEN HPyUnicodeBuilder ctx_UnicodeBuilder_New(HPyContext *ctx);
+_HPy_HIDDEN void ctx_UnicodeBuilder_Append(HPyContext *ctx, HPyUnicodeBuilder builder,
+                                          HPy h_item);
+_HPy_HIDDEN HPy ctx_UnicodeBuilder_Build(HPyContext *ctx, HPyUnicodeBuilder builder);
+_HPy_HIDDEN void ctx_UnicodeBuilder_Cancel(HPyContext *ctx, HPyUnicodeBuilder builder);
+
+
+#endif /* HPY_COMMON_RUNTIME_UNICODEBUILDER_H */

hpy/devel/include/cpython/hpy.h

@@ -31,7 +31,7 @@
 
 typedef struct { PyObject *_o; } HPy;
 typedef struct { Py_ssize_t _lst; } HPyListBuilder;
-typedef struct { Py_ssize_t _lst; } HPyStringBuilder;
+typedef struct { Py_ssize_t _lst; } HPyUnicodeBuilder;
 typedef struct { Py_ssize_t _tup; } HPyTupleBuilder;
 typedef struct { void *_o; } HPyTracker;
 typedef Py_ssize_t HPy_ssize_t;
@@ -281,7 +281,7 @@ HPy_AsPyObject(HPyContext *ctx, HPy h)
 #include "../common/runtime/ctx_object.h"
 #include "../common/runtime/ctx_type.h"
 #include "../common/runtime/ctx_listbuilder.h"
-#include "../common/runtime/ctx_stringbuilder.h"
+#include "../common/runtime/ctx_unicodebuilder.h"
 #include "../common/runtime/ctx_tracker.h"
 #include "../common/runtime/ctx_tuple.h"
 #include "../common/runtime/ctx_tuplebuilder.h"
@@ -380,29 +380,29 @@ HPyListBuilder_Cancel(HPyContext *ctx, HPyListBuilder builder)
     ctx_ListBuilder_Cancel(ctx, builder);
 }
 
-HPyAPI_FUNC(HPyStringBuilder)
-HPyStringBuilder_New(HPyContext *ctx)
+HPyAPI_FUNC(HPyUnicodeBuilder)
+HPyUnicodeBuilder_New(HPyContext *ctx)
 {
-    return ctx_StringBuilder_New(ctx);
+    return ctx_UnicodeBuilder_New(ctx);
 }
 
 HPyAPI_FUNC(void)
-HPyStringBuilder_Append(HPyContext *ctx, HPyStringBuilder builder,
+HPyUnicodeBuilder_Append(HPyContext *ctx, HPyUnicodeBuilder builder,
                         HPy h_item)
 {
-    ctx_StringBuilder_Append(ctx, builder, h_item);
+    ctx_UnicodeBuilder_Append(ctx, builder, h_item);
 }
 
 HPyAPI_FUNC(HPy)
-HPyStringBuilder_Build(HPyContext *ctx, HPyStringBuilder builder)
+HPyUnicodeBuilder_Build(HPyContext *ctx, HPyUnicodeBuilder builder)
 {
-    return ctx_StringBuilder_Build(ctx, builder);
+    return ctx_UnicodeBuilder_Build(ctx, builder);
 }
 
 HPyAPI_FUNC(void)
-HPyStringBuilder_Cancel(HPyContext *ctx, HPyStringBuilder builder)
+HPyUnicodeBuilder_Cancel(HPyContext *ctx, HPyUnicodeBuilder builder)
 {
-    ctx_StringBuilder_Cancel(ctx, builder);
+    ctx_UnicodeBuilder_Cancel(ctx, builder);
 }
 
 HPyAPI_FUNC(HPyTupleBuilder)

hpy/devel/include/universal/hpy.h

@@ -34,7 +34,7 @@ typedef intptr_t HPy_hash_t;
    the HPy structure contains an index in a global array. */
 typedef struct _HPy_s { HPy_ssize_t _i; } HPy;
 typedef struct { HPy_ssize_t _lst; } HPyListBuilder;
-typedef struct { HPy_ssize_t _lst; } HPyStringBuilder;
+typedef struct { HPy_ssize_t _lst; } HPyUnicodeBuilder;
 typedef struct { HPy_ssize_t _tup; } HPyTupleBuilder;
 typedef struct { HPy_ssize_t _i; } HPyTracker;
 

hpy/devel/src/runtime/ctx_stringbuilder.c → hpy/devel/src/runtime/ctx_unicodebuilder.c

@@ -9,17 +9,17 @@
 
 #include <stdio.h>
 
-_HPy_HIDDEN HPyStringBuilder
-ctx_StringBuilder_New(HPyContext *ctx)
+_HPy_HIDDEN HPyUnicodeBuilder
+ctx_UnicodeBuilder_New(HPyContext *ctx)
 {
     PyObject *lst = PyList_New(0);
     if (lst == NULL)
         PyErr_Clear();   /* delay the MemoryError */
-    return (HPyStringBuilder){(HPy_ssize_t)lst };
+    return (HPyUnicodeBuilder){(HPy_ssize_t)lst };
 }
 
 _HPy_HIDDEN void
-ctx_StringBuilder_Append(HPyContext *ctx, HPyStringBuilder builder, HPy h_item)
+ctx_UnicodeBuilder_Append(HPyContext *ctx, HPyUnicodeBuilder builder, HPy h_item)
 {
     PyObject *lst = (PyObject *)builder._lst;
     if (lst != NULL) {
@@ -29,7 +29,7 @@ ctx_StringBuilder_Append(HPyContext *ctx, HPyStringBuilder builder, HPy h_item)
 }
 
 _HPy_HIDDEN HPy
-ctx_StringBuilder_Build(HPyContext *ctx, HPyStringBuilder builder)
+ctx_UnicodeBuilder_Build(HPyContext *ctx, HPyUnicodeBuilder builder)
 {
     PyObject *lst = (PyObject *)builder._lst;
     if (lst == NULL) {
@@ -49,7 +49,7 @@ ctx_StringBuilder_Build(HPyContext *ctx, HPyStringBuilder builder)
 }
 
 _HPy_HIDDEN void
-ctx_StringBuilder_Cancel(HPyContext *ctx, HPyStringBuilder builder)
+ctx_UnicodeBuilder_Cancel(HPyContext *ctx, HPyUnicodeBuilder builder)
 {
     PyObject *lst = (PyObject *)builder._lst;
     if (lst == NULL) {

hpy/tools/autogen/parse.py

@@ -210,10 +210,10 @@ def _visit_hpyslot_slot(self, node):
     'HPyListBuilder_Set': None,
     'HPyListBuilder_Build': None,
     'HPyListBuilder_Cancel': None,
-    'HPyStringBuilder_New': None,
-    'HPyStringBuilder_Append': None,
-    'HPyStringBuilder_Build': None,
-    'HPyStringBuilder_Cancel': None,
+    'HPyUnicodeBuilder_New': None,
+    'HPyUnicodeBuilder_Append': None,
+    'HPyUnicodeBuilder_Build': None,
+    'HPyUnicodeBuilder_Cancel': None,
     'HPyTuple_FromArray': None,
     'HPyTupleBuilder_New': None,
     'HPyTupleBuilder_Set': None,

hpy/tools/autogen/public_api.h

@@ -12,7 +12,7 @@ typedef int size_t;
 typedef int HPyFunc_Signature;
 typedef int cpy_PyObject;
 typedef int HPyListBuilder;
-typedef int HPyStringBuilder;
+typedef int HPyUnicodeBuilder;
 typedef int HPyTupleBuilder;
 typedef int HPyTracker;
 typedef int HPy_RichCmpOp;
@@ -283,11 +283,11 @@ void HPyListBuilder_Set(HPyContext *ctx, HPyListBuilder builder,
 HPy HPyListBuilder_Build(HPyContext *ctx, HPyListBuilder builder);
 void HPyListBuilder_Cancel(HPyContext *ctx, HPyListBuilder builder);
 
-HPyStringBuilder HPyStringBuilder_New(HPyContext *ctx);
-void HPyStringBuilder_Append(HPyContext *ctx, HPyStringBuilder builder,
+HPyUnicodeBuilder HPyUnicodeBuilder_New(HPyContext *ctx);
+void HPyUnicodeBuilder_Append(HPyContext *ctx, HPyUnicodeBuilder builder,
                              HPy h_item);
-HPy HPyStringBuilder_Build(HPyContext *ctx, HPyStringBuilder builder);
-void HPyStringBuilder_Cancel(HPyContext *ctx, HPyStringBuilder builder);
+HPy HPyUnicodeBuilder_Build(HPyContext *ctx, HPyUnicodeBuilder builder);
+void HPyUnicodeBuilder_Cancel(HPyContext *ctx, HPyUnicodeBuilder builder);
 
 HPyTupleBuilder HPyTupleBuilder_New(HPyContext *ctx, HPy_ssize_t initial_size);
 void HPyTupleBuilder_Set(HPyContext *ctx, HPyTupleBuilder builder,

hpy/universal/src/ctx.c

@@ -6,7 +6,7 @@
 #include "common/runtime/ctx_module.h"
 #include "common/runtime/ctx_object.h"
 #include "common/runtime/ctx_listbuilder.h"
-#include "common/runtime/ctx_stringbuilder.h"
+#include "common/runtime/ctx_unicodebuilder.h"
 #include "common/runtime/ctx_tracker.h"
 #include "common/runtime/ctx_tuple.h"
 #include "common/runtime/ctx_tuplebuilder.h"

setup.py

@@ -59,9 +59,9 @@ def get_scm_config():
                    'hpy/devel/src/runtime/ctx_type.c',
                    'hpy/devel/src/runtime/ctx_tracker.c',
                    'hpy/devel/src/runtime/ctx_listbuilder.c',
-                   'hpy/devel/src/runtime/ctx_stringbuilder.c',
                    'hpy/devel/src/runtime/ctx_tuple.c',
                    'hpy/devel/src/runtime/ctx_tuplebuilder.c',
+                   'hpy/devel/src/runtime/ctx_unicodebuilder.c',
                    'hpy/debug/src/debug_ctx.c',
                    'hpy/debug/src/debug_ctx_cpython.c',
                    'hpy/debug/src/debug_handles.c',

test/test_hpystringbuilder.py

@@ -1,18 +1,18 @@
 from .support import HPyTest
 
 class TestString(HPyTest):
-    def test_StringBuilder(self, hpy_abi):
+    def test_UnicodeBuilder(self, hpy_abi):
         mod = self.make_module("""
             HPyDef_METH(f, "f", f_impl, HPyFunc_O)
             static HPy f_impl(HPyContext *ctx, HPy h_self, HPy h_arg)
             {
-                HPyStringBuilder builder = HPyStringBuilder_New(ctx);
+                HPyUnicodeBuilder builder = HPyUnicodeBuilder_New(ctx);
                 HPy h_s1 = HPyUnicode_FromString(ctx, "hello ");
                 HPy h_s2 = HPyUnicode_FromString(ctx, "!");
-                HPyStringBuilder_Append(ctx, builder, h_s1);
-                HPyStringBuilder_Append(ctx, builder, h_arg);
-                HPyStringBuilder_Append(ctx, builder, h_s2);
-                HPy h_string = HPyStringBuilder_Build(ctx, builder);
+                HPyUnicodeBuilder_Append(ctx, builder, h_s1);
+                HPyUnicodeBuilder_Append(ctx, builder, h_arg);
+                HPyUnicodeBuilder_Append(ctx, builder, h_s2);
+                HPy h_string = HPyUnicodeBuilder_Build(ctx, builder);
                 HPy_Close(ctx, h_s1);
                 HPy_Close(ctx, h_s2);
                 return h_string;