X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;ds=sidebyside;f=src%2Freal%2Finput%2Fcl_R_read.cc;h=af7b59e40e7d24a106d95be65330492357f3e420;hb=3af2cde18b3aabed4c808b0113daa81c2263b0bd;hp=eda1ec72ce6fe37aa76d0616be4ce8b0a107df24;hpb=dd9e0f894eec7e2a8cf85078330ddc0a6639090b;p=cln.git diff --git a/src/real/input/cl_R_read.cc b/src/real/input/cl_R_read.cc index eda1ec7..af7b59e 100644 --- a/src/real/input/cl_R_read.cc +++ b/src/real/input/cl_R_read.cc @@ -3,28 +3,32 @@ // It does not pull in all the complex function code. // General includes. -#include "cl_sysdep.h" +#include "base/cl_sysdep.h" // Specification. -#include "cl_real_io.h" +#include "cln/real_io.h" // Implementation. -#include -#include "cl_input.h" -#include "cl_rational_io.h" -#include "cl_integer_io.h" -#include "cl_float_io.h" -#include "cl_integer.h" -#include "cl_I.h" -#include "cl_F.h" -#include "cl_abort.h" +#include +#include +#include "cln/input.h" +#include "cln/rational_io.h" +#include "cln/integer_io.h" +#include "cln/float_io.h" +#include "cln/integer.h" +#include "integer/cl_I.h" +#include "float/cl_F.h" +#include "cln/exception.h" #undef floor -#include +#include #define floor cln_floor + +namespace cln { + // Step forward over all digits, to the end of string or to the next non-digit. static const char * skip_digits (const char * ptr, const char * string_limit, unsigned int base) { @@ -53,14 +57,14 @@ static const char * skip_digits (const char * ptr, const char * string_limit, un if (end_of_parse) \ { *end_of_parse = (ptr); } \ else \ - { if ((ptr) != string_limit) { read_number_junk((ptr),string,string_limit); } } + { if ((ptr) != string_limit) { throw read_number_junk_exception((ptr),string,string_limit); } } const cl_R read_real (const cl_read_flags& flags, const char * string, const char * string_limit, const char * * end_of_parse) { ASSERT((flags.syntax & ~(syntax_real|syntax_maybe_bad)) == 0); // If no string_limit is given, it defaults to the end of the string. if (!string_limit) - string_limit = string + strlen(string); + string_limit = string + ::strlen(string); if (flags.syntax & syntax_rational) { // Check for rational number syntax. var unsigned int rational_base = flags.rational_base; @@ -87,12 +91,12 @@ const cl_R read_real (const cl_read_flags& flags, const char * string, const cha goto not_rational_syntax; var cl_I base = read_integer(10,0,ptr,0,base_end_ptr-ptr); if (!((base >= 2) && (base <= 36))) { - fprint(cl_stderr, "Base must be an integer in the range from 2 to 36, not "); - fprint(cl_stderr, base); - fprint(cl_stderr, "\n"); - cl_abort(); + std::ostringstream buf; + fprint(buf, "Base must be an integer in the range from 2 to 36, not "); + fprint(buf, base); + throw runtime_exception(buf.str()); } - rational_base = FN_to_UL(base); ptr = base_end_ptr; + rational_base = FN_to_UV(base); ptr = base_end_ptr; break; } ptr++; @@ -102,7 +106,7 @@ const cl_R read_real (const cl_read_flags& flags, const char * string, const cha var cl_signean sign = 0; if (ptr == string_limit) goto not_rational_syntax; switch (*ptr) { - case '-': sign = ~sign; + case '-': sign = ~sign; // fallthrough case '+': ptr++; default: break; } @@ -155,35 +159,33 @@ not_rational_syntax: var cl_signean sign = 0; if (ptr == string_limit) goto not_float_syntax; switch (*ptr) { - case '-': sign = ~sign; + case '-': sign = ~sign; // fallthrough case '+': ptr++; default: break; } var const char * ptr_after_sign = ptr; var const char * ptr_after_intpart = skip_digits(ptr_after_sign,string_limit,float_base); - var cl_boolean have_dot = cl_false; var const char * ptr_before_fracpart = ptr_after_intpart; var const char * ptr_after_fracpart = ptr_after_intpart; ptr = ptr_after_intpart; if (ptr != string_limit) if (*ptr == '.') { - have_dot = cl_true; ptr_before_fracpart = ptr+1; ptr_after_fracpart = skip_digits(ptr_before_fracpart,string_limit,float_base); } ptr = ptr_after_fracpart; var char exponent_marker; - var cl_boolean have_exponent; + var bool have_exponent; var const char * ptr_in_exponent = ptr; var const char * ptr_after_exponent = ptr; if ((ptr == string_limit) || !(((*ptr >= '0') && (*ptr <= '9')) || ((*ptr >= 'A') && (*ptr <= 'Z') && (*ptr != 'I')) || ((*ptr >= 'a') && (*ptr <= 'z') && (*ptr != 'i')) || (*ptr == '.') || (*ptr == '/'))) { // No exponent. - have_exponent = cl_false; + have_exponent = false; // Must have at least one fractional part digit. if (ptr_after_fracpart == ptr_before_fracpart) goto not_float_syntax; exponent_marker = 'E'; } else { - have_exponent = cl_true; + have_exponent = true; // Must have at least one digit. if (ptr_after_sign == ptr_after_intpart) if (ptr_after_fracpart == ptr_before_fracpart) @@ -211,21 +213,21 @@ not_rational_syntax: } ptr = ptr_after_exponent; var const char * ptr_after_prec = ptr; - var cl_float_format_t prec; + var float_format_t prec; if ((ptr != string_limit) && (*ptr == '_')) { ptr++; ptr_after_prec = skip_digits(ptr,string_limit,10); if (ptr_after_prec == ptr) goto not_float_syntax; var cl_I prec1 = digits_to_I(ptr,ptr_after_prec-ptr,10); - var uintL prec2 = cl_I_to_UL(prec1); - prec = (float_base==10 ? cl_float_format(prec2) - : (cl_float_format_t)((uintL)((1+prec2)*log((double)float_base)*1.442695041)+1) + var uintC prec2 = cl_I_to_ulong(prec1); + prec = (float_base==10 ? float_format(prec2) + : (float_format_t)((uintC)((1+prec2)*::log((double)float_base)*1.442695041)+1) ); } else { switch (exponent_marker) { - case 'S': prec = cl_float_format_sfloat; break; - case 'F': prec = cl_float_format_ffloat; break; - case 'D': prec = cl_float_format_dfloat; break; + case 'S': prec = float_format_sfloat; break; + case 'F': prec = float_format_ffloat; break; + case 'D': prec = float_format_dfloat; break; case 'L': prec = flags.float_flags.default_lfloat_format; break; case 'E': prec = flags.float_flags.default_float_format; break; default: NOTREACHED @@ -234,14 +236,14 @@ not_rational_syntax: // Count the number of significant digits. ptr = ptr_after_sign; while (ptr < ptr_after_fracpart && (*ptr == '0' || *ptr == '.')) ptr++; - var uintL num_significant_digits = + var uintC num_significant_digits = (ptr_after_fracpart - ptr) - (ptr_before_fracpart > ptr ? 1 : 0); - var uintL prec2 = (num_significant_digits>=2 ? num_significant_digits-2 : 0); - var cl_float_format_t precx = - (float_base==10 ? cl_float_format(prec2) - : (cl_float_format_t)((uintL)((1+prec2)*log((double)float_base)*1.442695041)+1) + var uintC prec2 = (num_significant_digits>=2 ? num_significant_digits-2 : 0); + var float_format_t precx = + (float_base==10 ? float_format(prec2) + : (float_format_t)((uintC)((1+prec2)*::log((double)float_base)*1.442695041)+1) ); - if ((uintL)precx > (uintL)prec) + if ((uintC)precx > (uintC)prec) prec = precx; } } @@ -249,18 +251,19 @@ not_rational_syntax: , if (!(flags.syntax & syntax_sfloat)) goto not_float_syntax; , if (!(flags.syntax & syntax_ffloat)) goto not_float_syntax; , if (!(flags.syntax & syntax_dfloat)) goto not_float_syntax; - , unused len; + , cl_unused len; if (!(flags.syntax & syntax_lfloat)) goto not_float_syntax; ); at_end_of_parse(ptr_after_prec); return read_float(float_base,prec,sign,ptr_after_sign,0,ptr_after_fracpart-ptr_after_sign,ptr_after_exponent-ptr_after_sign,ptr_before_fracpart-ptr_after_sign); } not_float_syntax: -bad_syntax: if (flags.syntax & syntax_maybe_bad) { ASSERT(end_of_parse); *end_of_parse = string; return 0; // dummy return } - read_number_bad_syntax(string,string_limit); + throw read_number_bad_syntax_exception(string,string_limit); } + +} // namespace cln