]> www.ginac.de Git - cln.git/blobdiff - src/complex/input/cl_N_read.cc
2006-04-25 Bruno Haible <bruno@clisp.org>
[cln.git] / src / complex / input / cl_N_read.cc
index b2314cd433432866db8bd442d773cbb4b34dfc5c..0c363394cb81d31393e7032cdeb85ef127571470 100644 (file)
@@ -9,7 +9,7 @@
 
 // Implementation.
 
-#include <string.h>
+#include <cstring>
 #include "cln/input.h"
 #include "cln/real_io.h"
 #include "cln/float_io.h"
@@ -25,6 +25,7 @@
 #include <cmath>
 #define floor cln_floor
 
+
 namespace cln {
 
 // Step forward over all digits, to the end of string or to the next non-digit.
@@ -91,12 +92,12 @@ const cl_N read_complex (const cl_read_flags& flags, const char * string, const
                                                goto not_rational_syntax;
                                        var cl_I base = read_integer(10,0,ptr,0,base_end_ptr-ptr);
                                        if (!((base >= 2) && (base <= 36))) {
-                                               fprint(stderr, "Base must be an integer in the range from 2 to 36, not ");
-                                               fprint(stderr, base);
-                                               fprint(stderr, "\n");
+                                               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();
                                        }
-                                       rational_base = FN_to_UL(base); ptr = base_end_ptr;
+                                       rational_base = FN_to_UV(base); ptr = base_end_ptr;
                                        break;
                                }
                                ptr++;
@@ -218,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) {
@@ -235,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;
                        }
                }
@@ -291,7 +292,6 @@ not_float_syntax:
                return complex(realpart,imagpart);
        }
 not_complex_syntax:
-bad_syntax:
        if (flags.syntax & syntax_maybe_bad) {
                ASSERT(end_of_parse);
                *end_of_parse = string;