From d84c9e148b0d9544cc81096eb6183648396807ae Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 9 Feb 2018 18:56:40 +0100 Subject: Generic pretty-printed numbers.. --- libdevcore/CommonData.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libdevcore/CommonData.h b/libdevcore/CommonData.h index b85abe95..e410af5c 100644 --- a/libdevcore/CommonData.h +++ b/libdevcore/CommonData.h @@ -155,6 +155,14 @@ inline std::string formatNumber(bigint const& _value) return _value.str(); } +inline std::string formatNumber(u256 const& _value) +{ + if (_value > 0x1000000) + return toHex(toCompactBigEndian(_value), 2, HexPrefix::Add); + else + return _value.str(); +} + inline std::string toCompactHexWithPrefix(u256 val) { std::ostringstream ret; -- cgit From d7e5cc3f9706ef55414c19abeac63e58bf5a1137 Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 9 Feb 2018 18:59:57 +0100 Subject: Pretty-print constants in simplifier. --- libjulia/optimiser/SimplificationRules.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libjulia/optimiser/SimplificationRules.cpp b/libjulia/optimiser/SimplificationRules.cpp index a439caef..e5dbb059 100644 --- a/libjulia/optimiser/SimplificationRules.cpp +++ b/libjulia/optimiser/SimplificationRules.cpp @@ -154,7 +154,7 @@ Expression Pattern::toExpression(SourceLocation const& _location) const if (m_kind == PatternKind::Constant) { assertThrow(m_data, OptimizerException, "No match group and no constant value given."); - return Literal{_location, assembly::LiteralKind::Number, m_data->str(), ""}; + return Literal{_location, assembly::LiteralKind::Number, formatNumber(*m_data), ""}; } else if (m_kind == PatternKind::Operation) { -- cgit