StarMirror
/
tars2node
mirror of https://github.com/tars-node/tars2node
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tars2node js&&ts fix JSON_VERSION support bug

pull/7/head
kivenchen 2021-10-13 19:35:44 +08:00
parent b3c317fbd1
commit f5799d8369
3 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/linux/tars2node
View File

Binary file not shown.

4
src/gen_server.cpp
View File

@ -241,7 +241,7 @@ string CodeGenerator::generateDispatch(const NamespacePtr &nPtr, const Interface
StructPtr sPtr = StructPtr::dynamicCast(vParamDecl[i]->getTypeIdPtr()->getTypePtr());
if (sPtr)
{
dstr << TAB << "var " << vParamDecl[i]->getTypeIdPtr()->getId()
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
<< " = " << getDefault(vParamDecl[i]->getTypeIdPtr(), "", nPtr->getId(), true)
<< ";" << endl;
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId() << ".readFromObject("
@ -250,7 +250,7 @@ string CodeGenerator::generateDispatch(const NamespacePtr &nPtr, const Interface
}
else
{
dstr << TAB << "var " << vParamDecl[i]->getTypeIdPtr()->getId()
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
<< " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId()
<< ";" << endl;
}

54
src/gen_server_ts.cpp
View File

@ -198,17 +198,63 @@ string CodeGenerator::generateTSServerDispatch(const NamespacePtr &nPtr, const I
for (size_t i = 0; i < vParamDecl.size(); i++)
{
// if (vParamDecl[i]->isOut())
// {
// dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
// << " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId() << " || " << getDefault(vParamDecl[i]->getTypeIdPtr(), "", nPtr->getId(), true)
// << ";" << endl;
// }
// else
// {
// dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
// << " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId()
// << ";" << endl;
// }
if (vParamDecl[i]->isOut())
{
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
StructPtr sPtr = StructPtr::dynamicCast(vParamDecl[i]->getTypeIdPtr()->getTypePtr());
if (sPtr)
{
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
<< " = " << getDefault(vParamDecl[i]->getTypeIdPtr(), "", nPtr->getId(), true)
<< ";" << endl;
dstr << TAB << "_data_." << vParamDecl[i]->getTypeIdPtr()->getId() << " ? " << vParamDecl[i]->getTypeIdPtr()->getId() << ".readFromObject("
<< "_data_." << vParamDecl[i]->getTypeIdPtr()->getId() << ") : " << vParamDecl[i]->getTypeIdPtr()->getId()
<< ";" << endl;
}
else
{
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
<< " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId() << " || " << getDefault(vParamDecl[i]->getTypeIdPtr(), "", nPtr->getId(), true)
<< ";" << endl;
}
// dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
// << " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId() << " || " << getDefault(vParamDecl[i]->getTypeIdPtr(), "", nPtr->getId(), true)
// << ";" << endl;
}
else
{
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
<< " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId()
<< ";" << endl;
// dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
// << " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId()
// << ";" << endl;
StructPtr sPtr = StructPtr::dynamicCast(vParamDecl[i]->getTypeIdPtr()->getTypePtr());
if (sPtr)
{
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
<< " = " << getDefault(vParamDecl[i]->getTypeIdPtr(), "", nPtr->getId(), true)
<< ";" << endl;
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId() << ".readFromObject("
<< "_data_." << vParamDecl[i]->getTypeIdPtr()->getId() << ")"
<< ";" << endl;
}
else
{
dstr << TAB << vParamDecl[i]->getTypeIdPtr()->getId()
<< " = _data_." << vParamDecl[i]->getTypeIdPtr()->getId()
<< ";" << endl;
}
}
}
DEL_TAB;