steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

primitive_format_float, return empty string on bad locale instead of C++ exception

db4
Jon Harper 2015-07-05 21:52:41 +02:00 committed by John Benediktsson
parent 19fadb6c96
commit 13ba081ac8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vm/math.cpp
View File

@ -1,6 +1,7 @@
#include "master.hpp" #include "master.hpp"
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <stdexcept>
namespace factor { namespace factor {
@ -220,7 +221,14 @@ void factor_vm::primitive_format_float() {
char* fill = alien_offset(ctx->pop()); char* fill = alien_offset(ctx->pop());
double value = untag_float_check(ctx->peek()); double value = untag_float_check(ctx->peek());
std::ostringstream localized_stream; std::ostringstream localized_stream;
try {
localized_stream.imbue(std::locale(locale)); localized_stream.imbue(std::locale(locale));
} catch (const runtime_error& error) {
byte_array* array = allot_byte_array(1);
array->data<char>()[0] = '\0';
ctx->replace(tag<byte_array>(array));
return;
}
switch (format[0]) { switch (format[0]) {
case 'f': localized_stream << std::fixed; break; case 'f': localized_stream << std::fixed; break;
case 'e': localized_stream << std::scientific; break; case 'e': localized_stream << std::scientific; break;