diff options
Diffstat (limited to 'lib/Expr')
| -rw-r--r-- | lib/Expr/ExprPPrinter.cpp | 10 | ||||
| -rw-r--r-- | lib/Expr/Parser.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/Expr/ExprPPrinter.cpp b/lib/Expr/ExprPPrinter.cpp index 831a4d91..e3a83f9a 100644 --- a/lib/Expr/ExprPPrinter.cpp +++ b/lib/Expr/ExprPPrinter.cpp @@ -167,7 +167,9 @@ private: // Special case empty list. if (!head) { - PC << "arr" << updates.root->id; + // FIXME: We need to do something (assert, mangle, etc.) so that printing + // distinct arrays with the same name doesn't fail. + PC << updates.root->name; return; } @@ -217,7 +219,7 @@ private: if (openedList) PC << ']'; - PC << " @ arr" << updates.root->id; + PC << " @ " << updates.root->name; } void printWidth(PrintContext &PC, ref<Expr> e) { @@ -528,7 +530,7 @@ void ExprPPrinter::printQuery(std::ostream &os, ie = p.usedArrays.end(); it != ie; ++it) { const Array *A = *it; // FIXME: Print correct name, domain, and range. - PC << "array " << "arr" << A->id + PC << "array " << A->name << "[" << A->size << "]" << " : " << "w32" << " -> " << "w8" << " = symbolic"; @@ -572,7 +574,7 @@ void ExprPPrinter::printQuery(std::ostream &os, PC.breakLine(indent - 1); PC << '['; for (const Array * const* it = evalArraysBegin; it != evalArraysEnd; ++it) { - PC << "arr" << (*it)->id; + PC << (*it)->name; if (it + 1 != evalArraysEnd) PC.breakLine(indent); } diff --git a/lib/Expr/Parser.cpp b/lib/Expr/Parser.cpp index 77596727..8c18fe73 100644 --- a/lib/Expr/Parser.cpp +++ b/lib/Expr/Parser.cpp @@ -1557,7 +1557,7 @@ Decl::Decl(DeclKind _Kind) : Kind(_Kind) {} void ArrayDecl::dump() { // FIXME: For now, print using the Array* "name". - std::cout << "array " << "arr" << Root->id + std::cout << "array " << Root->name << "[" << Size << "]" << " : " << 'w' << Domain << " -> " << 'w' << Range << " = "; |