Author: mvidner Date: Fri Jun 19 14:15:30 2009 New Revision: 57660 URL: http://svn.opensuse.org/viewcvs/yast?rev=57660&view=rev Log: float::tolstring fixed to use the fixed notation (obvious, when you think of it, huh?) Added test cases for that Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.err trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.ycp trunk/core/package/yast2-core.changes Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinFloat.cc?rev=57660&r1=57659&r2=57660&view=diff ============================================================================== --- trunk/core/libycp/src/YCPBuiltinFloat.cc (original) +++ trunk/core/libycp/src/YCPBuiltinFloat.cc Fri Jun 19 14:15:30 2009 @@ -288,7 +288,7 @@ std::ostringstream ss; ss.imbue (std::locale ("")); ss.precision (precision->value ()); - ss << f->value (); + ss << fixed<< f->value (); YCPString ret (ss.str ()); return ret; Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.err?rev=57660&r1=57659&r2=57660&view=diff ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.err (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.err Fri Jun 19 14:15:30 2009 @@ -73,6 +73,38 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +tostring (0., 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +float::tolstring (0., 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +tostring (1., 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +float::tolstring (1., 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +tostring ((1049. / /* const integer -> const float */1024), 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +float::tolstring ((1049. / /* const integer -> const float */1024), 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +tostring (((((1.126e+15 / /* const integer -> const float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024), 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +float::tolstring (((((1.126e+15 / /* const integer -> const float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024), 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- (tohexstring (31) == "0x1f") ---------------------------------------------------------------------- Parsed: Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out?rev=57660&r1=57659&r2=57660&view=diff ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out Fri Jun 19 14:15:30 2009 @@ -15,6 +15,14 @@ (true) (true) (true) +("0.00") +("0,00") +("1.00") +("1,00") +("1.02") +("1,02") +("1024.09") +("1Â024,09") (true) (true) (true) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.ycp?rev=57660&r1=57659&r2=57660&view=diff ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.ycp Fri Jun 19 14:15:30 2009 @@ -84,6 +84,14 @@ // ( tostring(0.12345, 4) == "0.1235" ) ( float::tolstring(0.12345, 4) == "0,1235" ) +( tostring(0.0, 2) ) +( float::tolstring(0.0, 2) ) +( tostring(1.0, 2) ) +( float::tolstring(1.0, 2) ) +( tostring(1049.0/1024, 2) ) +( float::tolstring(1049.0/1024, 2) ) +( tostring(1126000000000000.0/1024/1024/1024/1024, 2) ) +( float::tolstring(1126000000000000.0/1024/1024/1024/1024, 2) ) // Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=57660&r1=57659&r2=57660&view=diff ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Jun 19 14:15:30 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jun 19 14:14:13 CEST 2009 - mvidner@suse.cz + +- float::tolstring fixed to use the fixed notation + +------------------------------------------------------------------- Thu Jun 18 16:59:49 CEST 2009 - lslezak@suse.cz - DBus service - fixed returning "any" values (bnc#513503), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org