Replace CL_REQUIRE/CL_PROVIDE(cl_C_ring) with portable code.

[cln.git] / src / rational / input / cl_RA_read.cc

diff --git a/src/rational/input/cl_RA_read.cc b/src/rational/input/cl_RA_read.cc
index 8252a7d060ef245dc3471357043272acb540c64e..6d065223186d3f287151959a0692d2378e3fc10f 100644 (file)
--- a/src/rational/input/cl_RA_read.cc
+++ b/src/rational/input/cl_RA_read.cc
@@ -7,21 +7,20 @@
 #include "cl_sysdep.h"
 
 // Specification.
-#include "cl_rational_io.h"
+#include "cln/rational_io.h"
 
 
 // Implementation.
 
-#include <string.h>
-#include "cl_input.h"
-#include "cl_integer.h"
-#include "cl_integer_io.h"
+#include <cstring>
+#include <sstream>
+#include "cln/input.h"
+#include "cln/integer.h"
+#include "cln/integer_io.h"
 #include "cl_I.h"
-#include "cl_abort.h"
+#include "cln/exception.h"
 
-#undef floor
-#include <math.h>
-#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)
@@ -51,14 +50,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_RA read_rational (const cl_read_flags& flags, const char * string, const char * string_limit, const char * * end_of_parse)
 {
        ASSERT((flags.syntax & ~(syntax_rational|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;
@@ -85,12 +84,12 @@ const cl_RA read_rational (const cl_read_flags& flags, const char * string, cons
                                                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++;
@@ -143,11 +142,12 @@ const cl_RA read_rational (const cl_read_flags& flags, const char * string, cons
                }
        }
 not_rational_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