aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libexpr/eval.cc2
-rw-r--r--src/libexpr/lexer.l10
-rw-r--r--src/libexpr/nixexpr.cc1
-rw-r--r--src/libexpr/primops.cc1
-rw-r--r--src/libexpr/print.cc1
-rw-r--r--src/libmain/progress-bar.cc1
-rw-r--r--src/libstore/binary-cache-store.cc1
-rw-r--r--src/libstore/build/local-derivation-goal.cc5
-rw-r--r--src/libstore/daemon.cc2
-rw-r--r--src/libstore/machines.cc2
-rw-r--r--src/libutil/current-process.cc1
-rw-r--r--src/libutil/file-system.hh2
-rw-r--r--src/libutil/logging.cc1
-rw-r--r--src/libutil/processes.hh2
-rw-r--r--src/libutil/strings.cc39
-rw-r--r--src/libutil/strings.hh21
-rw-r--r--src/nix-env/user-env.cc3
-rw-r--r--src/nix/develop.cc1
18 files changed, 64 insertions, 32 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index c9a624eeb..c72b69af2 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -22,6 +22,7 @@
#include <algorithm>
#include <chrono>
#include <iostream>
+#include <sstream>
#include <cstring>
#include <optional>
#include <unistd.h>
@@ -29,7 +30,6 @@
#include <sys/resource.h>
#include <fstream>
#include <functional>
-#include <iostream>
#include <sys/resource.h>
#include <nlohmann/json.hpp>
diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l
index 1780f5cb9..1c1cdd673 100644
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -26,10 +26,9 @@
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
#endif
-#include <boost/lexical_cast.hpp>
-
#include "nixexpr.hh"
#include "parser-tab.hh"
+#include "strings.hh"
using namespace nix;
@@ -132,9 +131,10 @@ or { return OR_KW; }
{ID} { yylval->id = {yytext, (size_t) yyleng}; return ID; }
{INT} { errno = 0;
- try {
- yylval->n = boost::lexical_cast<int64_t>(yytext);
- } catch (const boost::bad_lexical_cast &) {
+ std::optional<int64_t> numMay = string2Int<int64_t>(yytext);
+ if (numMay.has_value()) {
+ yylval->n = *numMay;
+ } else {
throw ParseError(ErrorInfo{
.msg = HintFmt("invalid integer '%1%'", yytext),
.pos = state->positions[CUR_POS],
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index 6a1aa8f35..664872882 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -6,6 +6,7 @@
#include "escape-string.hh"
#include <cstdlib>
+#include <sstream>
namespace nix {
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index f8ce90ac1..3cc2659fb 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -25,6 +25,7 @@
#include <algorithm>
#include <cstring>
+#include <sstream>
#include <regex>
#include <dlfcn.h>
diff --git a/src/libexpr/print.cc b/src/libexpr/print.cc
index c56b0e72e..e387a09fb 100644
--- a/src/libexpr/print.cc
+++ b/src/libexpr/print.cc
@@ -1,6 +1,7 @@
#include <limits>
#include <span>
#include <unordered_set>
+#include <sstream>
#include "escape-string.hh"
#include "print.hh"
diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index 11b2fe800..d83b09cd4 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -7,6 +7,7 @@
#include <atomic>
#include <map>
#include <thread>
+#include <sstream>
#include <iostream>
#include <chrono>
diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index e9413cf99..ea643fd31 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -16,6 +16,7 @@
#include <future>
#include <regex>
#include <fstream>
+#include <sstream>
#include <nlohmann/json.hpp>
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
index 479b4ffeb..99468d420 100644
--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@@ -64,10 +64,13 @@ extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags,
namespace nix {
+namespace {
/**
* The system for which Nix is compiled.
*/
-constexpr std::string_view nativeSystem = SYSTEM;
+[[gnu::unused]]
+constexpr const std::string_view nativeSystem = SYSTEM;
+}
void handleDiffHook(
uid_t uid, uid_t gid,
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 420fc8bfe..641910bd7 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -14,6 +14,8 @@
#include "derivations.hh"
#include "args.hh"
+#include <sstream>
+
namespace nix::daemon {
Sink & operator << (Sink & sink, const Logger::Fields & fields)
diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc
index cdd1e1c2c..833482815 100644
--- a/src/libstore/machines.cc
+++ b/src/libstore/machines.cc
@@ -140,7 +140,7 @@ static Machine parseBuilderLine(const std::string & line)
};
auto parseFloatField = [&](size_t fieldIndex) {
- const auto result = string2Int<float>(tokens[fieldIndex]);
+ const auto result = string2Float<float>(tokens[fieldIndex]);
if (!result) {
throw FormatError("bad machine specification: failed to convert column #%lu in a row: '%s' to 'float'", fieldIndex, line);
}
diff --git a/src/libutil/current-process.cc b/src/libutil/current-process.cc
index c64dd1e0d..3c037c33f 100644
--- a/src/libutil/current-process.cc
+++ b/src/libutil/current-process.cc
@@ -5,6 +5,7 @@
#include "namespaces.hh"
#include "signals.hh"
#include "strings.hh"
+#include <math.h>
#ifdef __APPLE__
# include <mach-o/dyld.h>
diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
index b9b753980..6c1923d55 100644
--- a/src/libutil/file-system.hh
+++ b/src/libutil/file-system.hh
@@ -13,8 +13,6 @@
#include <dirent.h>
#include <unistd.h>
-#include <boost/lexical_cast.hpp>
-
#include <functional>
#include <optional>
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index febbfdb55..b01bb4dd4 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -6,6 +6,7 @@
#include "terminal.hh"
#include <atomic>
+#include <sstream>
#include <nlohmann/json.hpp>
namespace nix {
diff --git a/src/libutil/processes.hh b/src/libutil/processes.hh
index 91a4edfd2..b84fc7c4b 100644
--- a/src/libutil/processes.hh
+++ b/src/libutil/processes.hh
@@ -10,8 +10,6 @@
#include <unistd.h>
#include <signal.h>
-#include <boost/lexical_cast.hpp>
-
#include <functional>
#include <map>
#include <optional>
diff --git a/src/libutil/strings.cc b/src/libutil/strings.cc
index 9cb319cce..947478481 100644
--- a/src/libutil/strings.cc
+++ b/src/libutil/strings.cc
@@ -1,4 +1,6 @@
#include "strings.hh"
+#include <boost/lexical_cast.hpp>
+#include <stdint.h>
namespace nix {
@@ -89,6 +91,43 @@ std::string Rewriter::operator()(std::string s)
return s;
}
+template<class N>
+std::optional<N> string2Int(const std::string_view s)
+{
+ if (s.substr(0, 1) == "-" && !std::numeric_limits<N>::is_signed)
+ return std::nullopt;
+ try {
+ return boost::lexical_cast<N>(s.data(), s.size());
+ } catch (const boost::bad_lexical_cast &) {
+ return std::nullopt;
+ }
+}
+
+// Explicitly instantiated in one place for faster compilation
+template std::optional<unsigned char> string2Int<unsigned char>(const std::string_view s);
+template std::optional<unsigned short> string2Int<unsigned short>(const std::string_view s);
+template std::optional<unsigned int> string2Int<unsigned int>(const std::string_view s);
+template std::optional<unsigned long> string2Int<unsigned long>(const std::string_view s);
+template std::optional<unsigned long long> string2Int<unsigned long long>(const std::string_view s);
+template std::optional<signed char> string2Int<signed char>(const std::string_view s);
+template std::optional<signed short> string2Int<signed short>(const std::string_view s);
+template std::optional<signed int> string2Int<signed int>(const std::string_view s);
+template std::optional<signed long> string2Int<signed long>(const std::string_view s);
+template std::optional<signed long long> string2Int<signed long long>(const std::string_view s);
+
+template<class N>
+std::optional<N> string2Float(const std::string_view s)
+{
+ try {
+ return boost::lexical_cast<N>(s.data(), s.size());
+ } catch (const boost::bad_lexical_cast &) {
+ return std::nullopt;
+ }
+}
+
+template std::optional<double> string2Float<double>(const std::string_view s);
+template std::optional<float> string2Float<float>(const std::string_view s);
+
std::string toLower(const std::string & s)
{
diff --git a/src/libutil/strings.hh b/src/libutil/strings.hh
index daeb5be50..03dff8160 100644
--- a/src/libutil/strings.hh
+++ b/src/libutil/strings.hh
@@ -4,7 +4,6 @@
#include "error.hh"
#include "types.hh"
-#include <boost/lexical_cast.hpp>
#include <vector>
namespace nix {
@@ -130,16 +129,7 @@ inline std::string rewriteStrings(std::string s, const StringMap & rewrites)
* Parse a string into an integer.
*/
template<class N>
-std::optional<N> string2Int(const std::string_view s)
-{
- if (s.substr(0, 1) == "-" && !std::numeric_limits<N>::is_signed)
- return std::nullopt;
- try {
- return boost::lexical_cast<N>(s.data(), s.size());
- } catch (const boost::bad_lexical_cast &) {
- return std::nullopt;
- }
-}
+std::optional<N> string2Int(const std::string_view s);
/**
* Like string2Int(), but support an optional suffix 'K', 'M', 'G' or
@@ -169,14 +159,7 @@ N string2IntWithUnitPrefix(std::string_view s)
* Parse a string into a float.
*/
template<class N>
-std::optional<N> string2Float(const std::string_view s)
-{
- try {
- return boost::lexical_cast<N>(s.data(), s.size());
- } catch (const boost::bad_lexical_cast &) {
- return std::nullopt;
- }
-}
+std::optional<N> string2Float(const std::string_view s);
/**
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc
index 530039ac6..f5dbd06ca 100644
--- a/src/nix-env/user-env.cc
+++ b/src/nix-env/user-env.cc
@@ -9,8 +9,9 @@
#include "eval-inline.hh"
#include "profiles.hh"
#include "print-ambiguous.hh"
-#include <limits>
+#include <limits>
+#include <sstream>
namespace nix {
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index cd32bb20a..90bdf3bed 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -11,6 +11,7 @@
#include <iterator>
#include <memory>
+#include <sstream>
#include <nlohmann/json.hpp>
#include <algorithm>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 01:23:43 +0000