Skip to content
Snippets Groups Projects
Commit 5df6c4bf authored by Mikaël Mayer's avatar Mikaël Mayer
Browse files

Updated the way Leon renders strings

parent 905aa048
No related branches found
No related tags found
No related merge requests found
......@@ -18,22 +18,19 @@ object StrOps {
def substring(a: String, start: BigInt, end: BigInt): String = {
if(start > end || start >= length(a) || end <= 0) "" else a.substring(start.toInt, end.toInt)
}
@ignore
@library
def bigIntToString(a: BigInt): String = {
a.toString
}
@ignore
@library
def intToString(a: Int): String = {
a.toString
}
@ignore
def doubleToString(a: Double): String = {
a.toString
}
@library
def booleanToString(a: Boolean): String = {
if(a) "true" else "false"
}
@ignore
@library
def charToString(a: Char): String = {
a.toString
}
......
......@@ -167,11 +167,11 @@ class PrettyPrinter(opts: PrinterOptions,
case Equals(l,r) => optP { p"$l == $r" }
case Int32ToString(expr) => p"StrOps.intToString($expr)"
case BooleanToString(expr) => p"StrOps.booleanToString($expr)"
case IntegerToString(expr) => p"StrOps.bigIntToString($expr)"
case CharToString(expr) => p"StrOps.charToString($expr)"
case RealToString(expr) => p"StrOps.realToString($expr)"
case Int32ToString(expr) => p"$expr.toString"
case BooleanToString(expr) => p"$expr.toString"
case IntegerToString(expr) => p"$expr.toString"
case CharToString(expr) => p"$expr.toString"
case RealToString(expr) => p"$expr.toString"
case StringConcat(lhs, rhs) => optP { p"$lhs + $rhs" }
case SubString(expr, start, end) => p"StrOps.substring($expr, $start, $end)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment