Replace unused macro with cl_unused.

[cln.git] / src / real / input / cl_R_read.cc

diff --git a/src/real/input/cl_R_read.cc b/src/real/input/cl_R_read.cc
index 7178f9e33d3aae5f8a449cc3a2654af02f6db667..af7b59e40e7d24a106d95be65330492357f3e420 100644 (file)
--- a/src/real/input/cl_R_read.cc
+++ b/src/real/input/cl_R_read.cc
@@ -3,7 +3,7 @@
 // It does not pull in all the complex function code.
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/real_io.h"
@@ -12,14 +12,15 @@
 // Implementation.
 
 #include <cstring>
+#include <sstream>
 #include "cln/input.h"
 #include "cln/rational_io.h"
 #include "cln/integer_io.h"
 #include "cln/float_io.h"
 #include "cln/integer.h"
-#include "cl_I.h"
-#include "cl_F.h"
-#include "cln/abort.h"
+#include "integer/cl_I.h"
+#include "float/cl_F.h"
+#include "cln/exception.h"
 
 #undef floor
 #include <cmath>
@@ -56,7 +57,7 @@ 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)
 {
@@ -90,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(std::cerr, "Base must be an integer in the range from 2 to 36, not ");
-                                               fprint(std::cerr, base);
-                                               fprint(std::cerr, "\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++;
@@ -105,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;
                }
@@ -158,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)
@@ -220,9 +219,9 @@ not_rational_syntax:
                        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);
+                       var uintC prec2 = cl_I_to_ulong(prec1);
                        prec = (float_base==10 ? float_format(prec2)
-                                              : (float_format_t)((uintL)((1+prec2)*::log((double)float_base)*1.442695041)+1)
+                                              : (float_format_t)((uintC)((1+prec2)*::log((double)float_base)*1.442695041)+1)
                               );
                } else {
                        switch (exponent_marker) {
@@ -237,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 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)((uintL)((1+prec2)*::log((double)float_base)*1.442695041)+1)
+                                                 : (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;
                        }
                }
@@ -252,7 +251,7 @@ 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);
@@ -264,7 +263,7 @@ not_float_syntax:
                *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