if (factory) factory->documentModified(doc);
}
-std::string
-TPushParser::PRIME() const
+TNode
+TPushParser::PRIME()
{
const TDictionary::Entry entry = dictionary.find("prime");
- if (entry.cls == TDictionary::OPERATOR) return entry.value;
- else return "?";
+ if (entry.cls == TDictionary::OPERATOR)
+ {
+ TNode op = doc.createO(entry.value, nextId++);
+ op["name"] = "prime";
+ return op;
+ }
+ else
+ {
+ TNode op = doc.createO("?", nextId++);
+ return op;
+ }
}
bool
TPushParser::isPrimes(const TNode& node) const
{
assert(node);
- return node.isG() && node.last() && node.last().is("o") && node.last()["val"] == PRIME();
+ return node.isG() && node.last() && node.last().is("o") && node.last()["name"] == "prime";
}
bool
{
if (prev.isSp() && prev[1] && isPrimes(prev[1]))
{
- prev[1].append(doc.createO(PRIME(), nextId++));
+ prev[1].append(PRIME());
return true;
}
else if (prev.isSb() && prev[0] &&
prev[0].isSp() && prev[0][1] &&
isPrimes(prev[0][1]))
{
- prev[0][1].append(doc.createO(PRIME(), nextId++));
+ prev[0][1].append(PRIME());
return true;
}
else
prev.replace(elem);
elem.append(prev);
elem.append(g);
- g.append(doc.createO(PRIME(), nextId++));
+ g.append(PRIME());
return true;
}
}