third_codes/wx-compiler
1
0
Fork 0
mirror of https://github.com/msojocs/wx-compiler.git synced 2025-07-19 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: DealSingleTokenToOps

Browse Source
This commit is contained in:
msojocs 2023-08-01 21:00:12 +08:00
parent 4a03309f23
commit 8c660a63e8
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/wxml.h
View File

@ -262,9 +262,6 @@ namespace WXML
偏移应该不超过0x128u, 296 偏移应该不超过0x128u, 296
*/ */
// std::string offset_52; // std::string offset_52;
int offset_104 = 0; // len
int offset_140 = 0;
std::string offset_144;
std::string offset_196; std::string offset_196;
std::string offset_220; std::string offset_220;
int offset_244 = 0; int offset_244 = 0;

2
src/wxml/compiler.cpp
View File

@ -948,6 +948,7 @@ namespace WXML{
a1 = result.str(); a1 = result.str();
} }
int RenderDefine_i = 0;
int RenderDefine( int RenderDefine(
WXML::DOMLib::WXMLDom & a1, WXML::DOMLib::WXMLDom & a1,
std::string const& a2, std::string const& a2,
@ -973,6 +974,7 @@ namespace WXML{
{ {
try try
{ {
int inner_RenderDefine_i = ++RenderDefine_i;
if (a1 == "template") if (a1 == "template")
{ {
auto it = a1.offset_48.find("name"); auto it = a1.offset_48.find("name");

25
src/wxml/dom_lib/wxml_dom.cpp
View File

@ -57,6 +57,13 @@ namespace WXML {
WXML::StringTemplating::Token v85; WXML::StringTemplating::Token v85;
v85.offset_0 = false; v85.offset_0 = false;
v85.offset_4 = ptm->second; v85.offset_4 = ptm->second;
if (v77.begin() != v77.end() && v77[0].offset_0)
{
v77.insert(v77.begin(), v85);
}
if (v77.begin() != v77.end() && v77.back().offset_0)
{
v77.push_back(v85); v77.push_back(v85);
} }
std::string v80 = ptm->second; std::string v80 = ptm->second;
@ -70,13 +77,14 @@ namespace WXML {
v77[i - 1].offset_4.append(v80); v77[i - 1].offset_4.append(v80);
} }
} }
else if (!curToken.offset_0 && v77[i - 1].offset_0) else if (v77[i - 1].offset_0)
{ {
curToken.offset_4 = v80 + curToken.offset_4; curToken.offset_4 = v80 + curToken.offset_4;
} }
} }
} }
} // end a8
// DealSingleTokenToOps - 15 // DealSingleTokenToOps - 15
if (a7) if (a7)
{ {
@ -844,7 +852,7 @@ namespace WXML {
} }
// int emplace_back_i = 0; int RenderNonDefine_i = 0;
void WXMLDom::RenderNonDefine( void WXMLDom::RenderNonDefine(
std::string const& a2, std::string const& a2,
std::string const& a3, std::string const& a3,
@ -862,6 +870,7 @@ namespace WXML {
std::map<std::string,std::string> * a15 std::map<std::string,std::string> * a15
) )
{ {
int inner_RenderNonDefine_i = ++RenderNonDefine_i;
// RenderNonDefine - 0 // RenderNonDefine - 0
if (a13 && this->offset_24.size()) if (a13 && this->offset_24.size())
{ {
@ -871,10 +880,10 @@ namespace WXML {
} }
if (this->offset_0 == "TEXTNODE") if (this->offset_0 == "TEXTNODE")
{ {
int code = this->offset_140; int code = this->offset_84.offset_56;
if (code == -3) if (code == -3)
{ {
std::string ret = this->Error(a2, this->offset_84, "", this->offset_144); std::string ret = this->Error(a2, this->offset_84, "", this->offset_84.offset_60);
throw ret; throw ret;
} }
if (code == -1) if (code == -1)
@ -882,7 +891,7 @@ namespace WXML {
std::string ret = this->Error(a2, this->offset_84, "", "value not set"); std::string ret = this->Error(a2, this->offset_84, "", "value not set");
throw ret; throw ret;
} }
a6 << "var " << a5 << "=_oz(z," << this->offset_140; a6 << "var " << a5 << "=_oz(z," << this->offset_84.offset_56;
a6 << "," << a8 << "," << a9 << "," << a10 << ")"; a6 << "," << a8 << "," << a9 << "," << a10 << ")";
LABEL_69: LABEL_69:
a6 << a12; a6 << a12;
@ -1645,14 +1654,14 @@ namespace WXML {
"pos: %d, %d, len: %d, %s", "pos: %d, %d, len: %d, %s",
this->offset_84.offset_8, this->offset_84.offset_8,
this->offset_84.offset_12, this->offset_84.offset_12,
this->offset_104, this->offset_84.offset_20,
this->offset_84.ToString().data() this->offset_84.ToString().data()
); );
} }
else else
{ {
*v4 << "pos: " << this->offset_84.offset_8 *v4 << "pos: " << this->offset_84.offset_8
<< ", " << this->offset_84.offset_12 << ", len: " << this->offset_104 << ", " << this->offset_84.offset_12 << ", len: " << this->offset_84.offset_20
<< ", "; << ", ";
*v4 << this->offset_84.ToString(); *v4 << this->offset_84.ToString();
} }