Avoid "this statement may fall through" warnings.

[cln.git] / src / complex / input / cl_N_read.cc

diff --git a/src/complex/input/cl_N_read.cc b/src/complex/input/cl_N_read.cc
index cc9a043589a807a009a57c7072089ff69361a194..9365972a5d71227fbc1c49c7dd936681fa339353 100644 (file)
--- a/src/complex/input/cl_N_read.cc
+++ b/src/complex/input/cl_N_read.cc
@@ -1,7 +1,7 @@
 // read_complex().
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/complex_io.h"
@@ -17,9 +17,9 @@
 #include "cln/rational_io.h"
 #include "cln/integer_io.h"
 #include "cln/integer.h"
-#include "cl_I.h"
-#include "cl_F.h"
-#include "cl_C.h"
+#include "integer/cl_I.h"
+#include "float/cl_F.h"
+#include "complex/cl_C.h"
 #include "cln/exception.h"
 
 #undef floor
@@ -108,7 +108,7 @@ const cl_N read_complex (const cl_read_flags& flags, const char * string, const
                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,19 +158,17 @@ 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 bool have_dot = 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 = true;
                        ptr_before_fracpart = ptr+1;
                        ptr_after_fracpart = skip_digits(ptr_before_fracpart,string_limit,float_base);
                }
@@ -318,7 +316,7 @@ static const cl_N read_complex_number_rest (const cl_read_flags& flags, const ch
                        return complex(0,x);
                }
                switch (*ptr) {
-                       case '+': ptr++;
+                       case '+': ptr++; // fallthrough
                        case '-': break;
                        default: goto not_complex_syntax;
                }