Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-21 15:02:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More nrex fixes

Browse Source
This commit is contained in:
Zher Huei Lee 2015-07-24 13:25:04 +01:00
parent 732bfd0baf
commit d9f1a85948
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/nrex/nrex.cpp
View File

@ -246,7 +246,18 @@ struct nrex_node_group : public nrex_node
{
return res;
}
if ((res >= 0) != negate)
if (negate)
{
if (res < 0)
{
res = pos + 1;
}
else
{
return -1;
}
}
if (res >= 0)
{
if (capturing >= 0)
{
@ -479,7 +490,6 @@ struct nrex_node_quantifier : public nrex_node
{
nrex_array<int> backtrack;
backtrack.push(pos);
s->complete = false;
while (backtrack.top() <= s->end)
{
if (max >= 1 && backtrack.size() > (unsigned int)max)
@ -502,7 +512,6 @@ struct nrex_node_quantifier : public nrex_node
return res;
}
}
s->complete = false;
int res = child->test(s, backtrack.top());
if (s->complete)
{
@ -516,12 +525,7 @@ struct nrex_node_quantifier : public nrex_node
}
while (greedy && (unsigned int) min < backtrack.size())
{
s->complete = false;
int res = backtrack.top();
if (s->complete)
{
return res;
}
if (next)
{
res = next->test(s, res);
@ -530,6 +534,10 @@ struct nrex_node_quantifier : public nrex_node
{
return res;
}
if (s->complete)
{
return res;
}
backtrack.pop();
}
return -1;