- ::findUUIDList no longer assumes success after matching the first
  UUID.
This commit is contained in:
Paul Beckingham 2014-05-23 15:47:38 -04:00
parent 42f3419bd3
commit 8d45e73744

View file

@ -1152,40 +1152,40 @@ void A3t::findUUIDList ()
sequence.push_back (uuid); sequence.push_back (uuid);
} }
if (!n.depleted ()) if (n.depleted ())
throw std::string (STRING_A3_PATTERN_GARBAGE);
(*i)->unTag ("?");
(*i)->tag ("UUID");
Tree* branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "(");
branch->tag ("OP");
std::vector <std::string>::iterator u;
for (u = sequence.begin (); u != sequence.end (); ++u)
{ {
if (u != sequence.begin ()) (*i)->unTag ("?");
(*i)->tag ("UUID");
Tree* branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "(");
branch->tag ("OP");
std::vector <std::string>::iterator u;
for (u = sequence.begin (); u != sequence.end (); ++u)
{ {
if (u != sequence.begin ())
{
branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "or");
branch->tag ("OP");
}
branch = (*i)->addBranch (new Tree ("argSeq")); branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "or"); branch->attribute ("raw", "uuid");
branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "=");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "'" + *u + "'");
} }
branch = (*i)->addBranch (new Tree ("argSeq")); branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "uuid"); branch->attribute ("raw", ")");
branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "=");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", "'" + *u + "'");
} }
branch = (*i)->addBranch (new Tree ("argSeq"));
branch->attribute ("raw", ")");
branch->tag ("OP");
} }
} }
} }