Skip to content

Commit 8dec77b

Browse files
committed
fix field getter always return undefined
1 parent 9205747 commit 8dec77b

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

test-app/runtime/src/main/cpp/JsArgConverter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ JsArgConverter::JsArgConverter(const Local<Object> &caller,
2323
m_argsLen = 1 + v8ProvidedArgumentsLength;
2424

2525
if (m_argsLen > 0) {
26-
if ((entry != nullptr) && (entry->isResolved)) {
26+
if ((entry != nullptr) && (entry->getIsResolved())) {
2727
if (entry->parsedSig.empty()) {
2828
JniSignatureParser parser(m_methodSignature);
2929
entry->parsedSig = parser.Parse();
@@ -58,7 +58,7 @@ JsArgConverter::JsArgConverter(const v8::FunctionCallbackInfo<Value> &args,
5858
m_argsLen = !hasImplementationObject ? args.Length() : args.Length() - 1;
5959

6060
if (m_argsLen > 0) {
61-
if ((entry != nullptr) && (entry->isResolved)) {
61+
if ((entry != nullptr) && (entry->getIsResolved())) {
6262
if (entry->parsedSig.empty()) {
6363
JniSignatureParser parser(m_methodSignature);
6464
entry->parsedSig = parser.Parse();

test-app/runtime/src/main/cpp/MetadataNode.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ void MetadataNode::FieldAccessorGetterCallback(Local<Name> property, const Prope
331331

332332
if ((!fieldCallbackMetadata.isStatic && thiz->StrictEquals(info.Holder()))
333333
// check whether there's a declaring type to get the class from it
334-
|| (fieldCallbackMetadata.declaringType == "")) {
334+
|| (fieldCallbackMetadata.getDeclaringType() == "")) {
335335
info.GetReturnValue().SetUndefined();
336336
return;
337337
}
@@ -674,9 +674,10 @@ vector<MetadataNode::MethodCallbackData *> MetadataNode::SetInstanceMethodsFromS
674674
curPtr += sizeof(uint16_t);
675675
for (auto i = 0; i < instanceFieldCout; i++) {
676676
auto entry = MetadataReader::ReadInstanceFieldEntry(&curPtr);
677+
auto fieldName = entry.getName();
677678
auto fieldInfo = new FieldCallbackData(entry);
678679
fieldInfo->metadata.declaringType = curType;
679-
protoFiller.FillPrototypeField(isolate, entry.getName(), fieldInfo);
680+
protoFiller.FillPrototypeField(isolate, fieldName, fieldInfo);
680681
}
681682

682683
auto kotlinPropertiesCount = *reinterpret_cast<uint16_t*>(curPtr);
@@ -768,7 +769,6 @@ vector<MetadataNode::MethodCallbackData*> MetadataNode::SetInstanceMembersFromRu
768769

769770
entry.name = name;
770771
entry.sig = signature;
771-
// MetadataReader::FillReturnType(entry);
772772
entry.paramCount = paramCount;
773773
entry.isStatic = false;
774774

@@ -1239,7 +1239,7 @@ void MetadataNode::MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& inf
12391239
className = &c.getDeclaringType();
12401240
}
12411241
entry = &c;
1242-
DEBUG_WRITE("MetaDataEntry Method %s's signature is: %s", entry->name.c_str(), entry->sig.c_str());
1242+
DEBUG_WRITE("MetaDataEntry Method %s's signature is: %s", entry->name.c_str(), entry->getSig().c_str());
12431243
break;
12441244
}
12451245
}

test-app/runtime/src/main/cpp/MetadataReader.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ namespace tns {
163163
return isPackage;
164164
}
165165

166-
// inline static void FillReturnType(MetadataEntry* entry) {
167-
// entry->returnType = ParseReturnType(entry->getSig());
168-
// entry->retType = GetReturnType(entry->getReturnType());
169-
// }
170-
171166
inline static std::string ParseReturnType(const std::string &signature) {
172167
int idx = signature.find(')');
173168
auto returnType = signature.substr(idx + 1);

0 commit comments

Comments
 (0)