Missing files.

3 files changed, 204 insertions, 0 deletions

diff --git a/src/locale_convert.cc b/src/locale_convert.cc
new file mode 100644
index 0000000..8f3073c
--- /dev/null
+++ b/src/locale_convert.cc
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "locale_convert.h"
+
+using std::string;
+
+template<>
+string
+sub::locale_convert (int x, int, bool)
+{
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "%d", x);
+	return buffer;
+}
+
+template<>
+string
+sub::locale_convert (long int x, int, bool)
+{
+	char buffer[64];
+#ifdef LIBSUB_WINDOWS
+	__mingw_snprintf (buffer, sizeof(buffer), "%ld", x);
+#else
+	snprintf (buffer, sizeof(buffer), "%ld", x);
+#endif
+	return buffer;
+}
+
+template<>
+string
+sub::locale_convert (unsigned long int x, int, bool)
+{
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "%lu", x);
+	return buffer;
+}
+
+template<>
+string
+sub::locale_convert (string x, int, bool)
+{
+	return x;
+}
+
+template<>
+int
+sub::locale_convert (string x, int, bool)
+{
+	int y = 0;
+	sscanf (x.c_str(), "%d", &y);
+	return y;
+}
+
+template<>
+float
+sub::locale_convert (string x, int, bool)
+{
+	float y = 0;
+	sscanf (x.c_str(), "%f", &y);
+	return y;
+}
diff --git a/src/locale_convert.h b/src/locale_convert.h
new file mode 100644
index 0000000..be0903b
--- /dev/null
+++ b/src/locale_convert.h
@@ -0,0 +1,59 @@
+/*
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/static_assert.hpp>
+#include <string>
+
+namespace sub {
+
+template <typename P, typename Q>
+P
+locale_convert (Q x, int precision = 16, bool fixed = false)
+{
+	/* We can't write a generic version of locale_convert; all required
+	   versions must be specialised.
+	*/
+	BOOST_STATIC_ASSERT (sizeof (Q) == 0);
+}
+
+template <>
+std::string
+locale_convert (int x, int, bool);
+
+template <>
+std::string
+locale_convert (long int x, int, bool);
+
+template <>
+std::string
+locale_convert (unsigned long int x, int, bool);
+
+template <>
+std::string
+locale_convert (std::string x, int, bool);
+
+template <>
+int
+locale_convert (std::string x, int, bool);
+
+template <>
+float
+locale_convert (std::string x, int, bool);
+
+}
diff --git a/src/raw_convert.cc b/src/raw_convert.cc
new file mode 100644
index 0000000..141453f
--- /dev/null
+++ b/src/raw_convert.cc
@@ -0,0 +1,67 @@
+/*
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "raw_convert.h"
+#include "locale_convert.h"
+#include <boost/algorithm/string.hpp>
+
+using std::string;
+
+static
+string
+make_local (string v)
+{
+	struct lconv* lc = localeconv ();
+	boost::algorithm::replace_all (v, ".", lc->decimal_point);
+	/* We hope it's ok not to add in thousands separators here */
+	return v;
+}
+
+/** @param v Numeric value as an ASCII string */
+static
+string
+make_raw (string v)
+{
+	struct lconv* lc = localeconv ();
+	/* thousands_sep may be . so remove them before changing decimal points */
+	boost::algorithm::replace_all (v, lc->thousands_sep, "");
+	boost::algorithm::replace_all (v, lc->decimal_point, ".");
+	return v;
+}
+
+template <>
+int
+sub::raw_convert (string v, int precision)
+{
+	return locale_convert<int> (make_local(v), precision);
+}
+
+template <>
+float
+sub::raw_convert (string v, int precision)
+{
+	return locale_convert<float> (make_local(v), precision);
+}
+
+template <>
+string
+sub::raw_convert (unsigned long v, int precision)
+{
+	return make_raw (locale_convert<string>(v, precision));
+}