Add arbitrary-base string-to-int conversion and more error checking

Author: sethrj

src/flc_string.i

@@ -122,11 +122,35 @@ class string {
   }
 }
 
-// String conversion
-int stoi(const std::string& s);
-long stol(const std::string& s);
-long long stoll(const std::string& s);
-float stof(const std::string& s);
-double stod(const std::string& s);
+%fragment("flc_has_junk", "header", fragment="<cctype>", fragment="<algorithm>") %{
+  SWIGINTERN bool flc_has_junk(const std::string& s, size_t pos) {
+    return !std::all_of(s.begin() + pos, s.end(), std::isspace);
+  }
+%}
+
+%typemap(in, numinputs=0, noblock=1) size_t* result_pos (size_t temp_pos) {
+  temp_pos = 0;
+  $1 = &temp_pos;
+}
+%typemap(argout, noblock=1, fragment="flc_has_junk") size_t* result_pos {
+  if (flc_has_junk(*arg1, temp_pos$argnum)) {
+    SWIG_exception(SWIG_ValueError, "Junk at end of string");
+  }
+}
+
+// String conversion routines
+#define %add_string_int_conversion(RETURN_TYPE, NAME) \
+  RETURN_TYPE NAME(const string& s, size_t* result_pos, int base = 10)
+#define %add_string_real_conversion(RETURN_TYPE, NAME) \
+  RETURN_TYPE NAME(const string& s, size_t* result_pos)
+
+%add_string_int_conversion(int, stoi);
+%add_string_int_conversion(long, stol);
+%add_string_int_conversion(long long, stoll);
+%add_string_real_conversion(float, stof);
+%add_string_real_conversion(double, stod);
+
+// Don't add exception code later
+%exception;
 
 } // namespace std

src/generated/flc_string.f90

@@ -59,11 +59,20 @@ module flc_string
   module procedure swigf_new_string__SWIG_1
   module procedure swigf_new_string__SWIG_2
  end interface
- public :: stoi
- public :: stol
- public :: stoll
  public :: stof
  public :: stod
+ interface stoi
+  module procedure swigf_stoi__SWIG_0, swigf_stoi__SWIG_1
+ end interface
+ public :: stoi
+ interface stoll
+  module procedure swigf_stoll__SWIG_0, swigf_stoll__SWIG_1
+ end interface
+ public :: stoll
+ interface stol
+  module procedure swigf_stol__SWIG_0, swigf_stol__SWIG_1
+ end interface
+ public :: stol
 
 ! WRAPPER DECLARATIONS
 interface
@@ -275,26 +284,56 @@ subroutine swigc_string_op_assign__(farg1, farg2) &
 type(SwigClassWrapper) :: farg2
 end subroutine
 
-function swigc_stoi(farg1) &
-bind(C, name="_wrap_stoi") &
+function swigc_stoi__SWIG_0(farg1, farg3) &
+bind(C, name="_wrap_stoi__SWIG_0") &
 result(fresult)
 use, intrinsic :: ISO_C_BINDING
 import :: swigarraywrapper
 type(SwigArrayWrapper) :: farg1
+integer(C_INT), intent(in) :: farg3
 integer(C_INT) :: fresult
 end function
 
-function swigc_stol(farg1) &
-bind(C, name="_wrap_stol") &
+function swigc_stoi__SWIG_1(farg1) &
+bind(C, name="_wrap_stoi__SWIG_1") &
 result(fresult)
 use, intrinsic :: ISO_C_BINDING
 import :: swigarraywrapper
 type(SwigArrayWrapper) :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_stol__SWIG_0(farg1, farg3) &
+bind(C, name="_wrap_stol__SWIG_0") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+import :: swigarraywrapper
+type(SwigArrayWrapper) :: farg1
+integer(C_INT), intent(in) :: farg3
 integer(C_LONG) :: fresult
 end function
 
-function swigc_stoll(farg1) &
-bind(C, name="_wrap_stoll") &
+function swigc_stol__SWIG_1(farg1) &
+bind(C, name="_wrap_stol__SWIG_1") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+import :: swigarraywrapper
+type(SwigArrayWrapper) :: farg1
+integer(C_LONG) :: fresult
+end function
+
+function swigc_stoll__SWIG_0(farg1, farg3) &
+bind(C, name="_wrap_stoll__SWIG_0") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+import :: swigarraywrapper
+type(SwigArrayWrapper) :: farg1
+integer(C_INT), intent(in) :: farg3
+integer(C_LONG_LONG) :: fresult
+end function
+
+function swigc_stoll__SWIG_1(farg1) &
+bind(C, name="_wrap_stoll__SWIG_1") &
 result(fresult)
 use, intrinsic :: ISO_C_BINDING
 import :: swigarraywrapper
@@ -693,7 +732,24 @@ subroutine swigf_string_op_assign__(self, other)
 self%swigdata = farg1
 end subroutine
 
-function stoi(s) &
+function swigf_stoi__SWIG_0(s, base) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+character(kind=C_CHAR, len=*), target :: s
+integer(C_INT), intent(in) :: base
+integer(C_INT) :: fresult 
+character(kind=C_CHAR), dimension(:), allocatable, target :: farg1_temp 
+type(SwigArrayWrapper) :: farg1 
+integer(C_INT) :: farg3 
+
+call SWIGTM_fin_const_SS_char_Sm_(s, farg1, farg1_temp)
+farg3 = base
+fresult = swigc_stoi__SWIG_0(farg1, farg3)
+swig_result = fresult
+end function
+
+function swigf_stoi__SWIG_1(s) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
@@ -703,25 +759,59 @@ function stoi(s) &
 type(SwigArrayWrapper) :: farg1 
 
 call SWIGTM_fin_const_SS_char_Sm_(s, farg1, farg1_temp)
-fresult = swigc_stoi(farg1)
+fresult = swigc_stoi__SWIG_1(farg1)
 swig_result = fresult
 end function
 
-function stol(s) &
+function swigf_stol__SWIG_0(s, base) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
 integer(C_LONG) :: swig_result
 character(kind=C_CHAR, len=*), target :: s
+integer(C_INT), intent(in) :: base
 integer(C_LONG) :: fresult 
 character(kind=C_CHAR), dimension(:), allocatable, target :: farg1_temp 
 type(SwigArrayWrapper) :: farg1 
+integer(C_INT) :: farg3 
+
+call SWIGTM_fin_const_SS_char_Sm_(s, farg1, farg1_temp)
+farg3 = base
+fresult = swigc_stol__SWIG_0(farg1, farg3)
+swig_result = fresult
+end function
+
+function swigf_stol__SWIG_1(s) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_LONG) :: swig_result
+character(kind=C_CHAR, len=*), target :: s
+integer(C_LONG) :: fresult 
+character(kind=C_CHAR), dimension(:), allocatable, target :: farg1_temp 
+type(SwigArrayWrapper) :: farg1 
+
+call SWIGTM_fin_const_SS_char_Sm_(s, farg1, farg1_temp)
+fresult = swigc_stol__SWIG_1(farg1)
+swig_result = fresult
+end function
+
+function swigf_stoll__SWIG_0(s, base) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_LONG_LONG) :: swig_result
+character(kind=C_CHAR, len=*), target :: s
+integer(C_INT), intent(in) :: base
+integer(C_LONG_LONG) :: fresult 
+character(kind=C_CHAR), dimension(:), allocatable, target :: farg1_temp 
+type(SwigArrayWrapper) :: farg1 
+integer(C_INT) :: farg3 
 
 call SWIGTM_fin_const_SS_char_Sm_(s, farg1, farg1_temp)
-fresult = swigc_stol(farg1)
+farg3 = base
+fresult = swigc_stoll__SWIG_0(farg1, farg3)
 swig_result = fresult
 end function
 
-function stoll(s) &
+function swigf_stoll__SWIG_1(s) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
 integer(C_LONG_LONG) :: swig_result
@@ -731,7 +821,7 @@ function stoll(s) &
 type(SwigArrayWrapper) :: farg1 
 
 call SWIGTM_fin_const_SS_char_Sm_(s, farg1, farg1_temp)
-fresult = swigc_stoll(farg1)
+fresult = swigc_stoll__SWIG_1(farg1)
 swig_result = fresult
 end function