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 940e9e9cf687fc9a07c6124d1dae05d8c1650e42..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"
@@ -18,8 +18,8 @@
 #include "cln/integer_io.h"
 #include "cln/float_io.h"
 #include "cln/integer.h"
-#include "cl_I.h"
-#include "cl_F.h"
+#include "integer/cl_I.h"
+#include "float/cl_F.h"
 #include "cln/exception.h"
 
 #undef floor
@@ -106,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;
                }
@@ -159,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)
@@ -253,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);