alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

@eelco's feedback: downgrade to regular float for size, remove unused function.

Browse source
This commit is contained in:
Christian Theune 2016-01-06 08:25:58 +01:00
parent a12a43046b
commit 934642155c
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/value.hh
View file

@ -39,7 +39,7 @@ class XMLWriter;
typedef long NixInt; typedef long NixInt;
typedef double NixFloat; typedef float NixFloat;
/* External values must descend from ExternalValueBase, so that /* External values must descend from ExternalValueBase, so that
* type-agnostic nix functions (e.g. showType) can be implemented * type-agnostic nix functions (e.g. showType) can be implemented

23
src/libmain/shared.hh
View file

@ -66,29 +66,6 @@ template<class N> N getIntArg(const string & opt,
return n * multiplier; return n * multiplier;
} }
template<class N> N getFloatArg(const string & opt,
Strings::iterator & i, const Strings::iterator & end, bool allowUnit)
{
++i;
if (i == end) throw UsageError(format("‘%1%’ requires an argument") % opt);
string s = *i;
N multiplier = 1;
if (allowUnit && !s.empty()) {
char u = std::toupper(*s.rbegin());
if (std::isalpha(u)) {
if (u == 'K') multiplier = 1ULL << 10;
else if (u == 'M') multiplier = 1ULL << 20;
else if (u == 'G') multiplier = 1ULL << 30;
else if (u == 'T') multiplier = 1ULL << 40;
else throw UsageError(format("invalid unit specifier ‘%1%’") % u);
s.resize(s.size() - 1);
}
}
N n;
if (!string2Float(s, n))
throw UsageError(format("‘%1%’ requires a float argument") % opt);
return n * multiplier;
}
/* Show the manual page for the specified program. */ /* Show the manual page for the specified program. */
void showManPage(const string & name); void showManPage(const string & name);