Skip to content

Commit 0de3ea6

Browse files
committed
feat: rename enum property names
1 parent 4dbb80a commit 0de3ea6

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

ApiDesign.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ class T {
5353
}
5454
5555
/**
56-
* C++ 侧的原始枚举名
56+
* 原始枚举名(带命名空间)
5757
*/
58-
static get $c_type() {
58+
static get $raw_name() {
5959
/* native code */
6060
}
6161
6262
/**
63-
* 注册到 engine 的枚举名
63+
* 枚举别名(当前注册到 JsEngine 的枚举名
6464
*/
6565
static get $nick_name() {
6666
/* native code */
@@ -163,7 +163,7 @@ class Actor {
163163
}
164164
165165
//! engine helper api
166-
static get $c_type() {
166+
static get $raw_name() {
167167
/* native code */
168168
}
169169
@@ -173,7 +173,7 @@ class Actor {
173173
174174
/**
175175
* 对两个对象进行相等性比较
176-
* 由于 js 侧的比较无法准确判断两个对象是否相等,所以引擎提供了此方法,此方法会调用 C++ 侧的 operator==
176+
* 此方法会调用 C++ 侧的 operator==
177177
*/
178178
static $equals(a, b) {
179179
/* native code */

generator/binder/BindGenerator.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ def process_classes(self, namespace: NamespaceInfo):
336336

337337
def process_enums(self, namespace: NamespaceInfo):
338338
result = create_result_data_struct()
339-
# TODO: 处理 impl (EnumBuilder)
340339
# TODO: 处理 dts (EnumDecl)
341340

342341
decl_enum_builder = self.get_template("decl_enum_builder.h.j2")

generator/binder/templates/dts_enum.d.ts.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ declare class {{enum_info.name}} {
1717

1818

1919
// helper functions
20-
static get $c_type(): string;
20+
static get $raw_name(): string;
2121

2222
static get $nick_name(): string;
2323

generator/binder/templates/impl_enum_builder.cc.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
ClassDefine<void> {{fixed_enum_name}}_EnumBuilder = EnumDefineBuilder<{{enum_full_name}}>("{{enum_info.name}}", "{{fixed_enum_name}}")
2+
ClassDefine<void> {{fixed_enum_name}}_EnumBuilder = EnumDefineBuilder<{{enum_full_name}}>("{{enum_full_name}}", "{{fixed_enum_name}}")
33
{% for enum_value_info in enum_info.values %}
44
{% if str_to_num(enum_value_info.value) >= 128 or str_to_num(enum_value_info.value) < -128: %}
55
.supplementEnum("{{enum_value_info.name}}", {{enum_full_name}}::{{enum_value_info.name}})

src/helper/EnumDefineBuilder.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ namespace jse {
1515
template <typename T>
1616
struct EnumDefineBuilder {
1717
std::string mNickName;
18-
std::string mOriginName;
18+
std::string mRawName;
1919

20-
explicit EnumDefineBuilder<T>(std::string originName)
21-
: mOriginName(std::move(originName)),
22-
mNickName(mOriginName) {}
23-
explicit EnumDefineBuilder<T>(std::string originName, std::string nickName)
24-
: mOriginName(std::move(originName)),
20+
explicit EnumDefineBuilder<T>() = delete;
21+
explicit EnumDefineBuilder<T>(std::string rawName, std::string nickName)
22+
: mRawName(std::move(rawName)),
2523
mNickName(std::move(nickName)) {}
2624

2725

@@ -35,9 +33,9 @@ struct EnumDefineBuilder {
3533
}
3634

3735
inline void registerHelperFunc(script::ClassDefineBuilder<void>& builder) {
38-
builder.property("$c_type", [=]() -> Local<Value> {
36+
builder.property("$raw_name", [=]() -> Local<Value> {
3937
try {
40-
return String::newString(mOriginName);
38+
return String::newString(mRawName);
4139
} catch (script::Exception const& e) {
4240
} catch (std::exception const& e) {}
4341
return {};

0 commit comments

Comments
 (0)