JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: Do not take string context into account

Browse Source 
Close #2883.
This commit is contained in:
Kirill Elagin 2014-06-10 13:55:25 +04:00 committed by Vladimír Čunát
parent dbf92db3b9
commit 751a01063d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/strings.nix
View File

@ -58,12 +58,13 @@ rec {
# Determine whether a string has given prefix/suffix. # Determine whether a string has given prefix/suffix.
hasPrefix = pref: str: hasPrefix = pref: str:
substring 0 (stringLength pref) str == pref; eqStrings (substring 0 (stringLength pref) str) pref;
hasSuffix = suff: str: hasSuffix = suff: str:
let lenStr = stringLength str; let
lenSuff = stringLength suff; lenStr = stringLength str;
lenSuff = stringLength suff;
in lenStr >= lenSuff && in lenStr >= lenSuff &&
substring (lenStr - lenSuff) lenStr str == suff; eqStrings (substring (lenStr - lenSuff) lenStr str) suff;
# Convert a string to a list of characters (i.e. singleton strings). # Convert a string to a list of characters (i.e. singleton strings).
@ -118,17 +119,21 @@ rec {
toLower = replaceChars upperChars lowerChars; toLower = replaceChars upperChars lowerChars;
toUpper = replaceChars lowerChars upperChars; toUpper = replaceChars lowerChars upperChars;
# Appends string context from another string
addContextFrom = a: b: (substring 0 0 a)+b;
# Compares strings not requiring context equality # Compares strings not requiring context equality
# Obviously, a workaround but works on all Nix versions # Obviously, a workaround but works on all Nix versions
eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b); eqStrings = a: b: addContextFrom b a == addContextFrom a b;
# Cut a string with a separator and produces a list of strings which were # Cut a string with a separator and produces a list of strings which were
# separated by this separator. e.g., # separated by this separator. e.g.,
# `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"]. # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
splitString = sep: s: splitString = _sep: _s:
let let
sep = addContextFrom _s _sep;
s = addContextFrom _sep _s;
sepLen = stringLength sep; sepLen = stringLength sep;
sLen = stringLength s; sLen = stringLength s;
lastSearch = sub sLen sepLen; lastSearch = sub sLen sepLen;
@ -167,7 +172,7 @@ rec {
sufLen = stringLength suf; sufLen = stringLength suf;
sLen = stringLength s; sLen = stringLength s;
in in
if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then if sufLen <= sLen && eqStrings suf (substring (sLen - sufLen) sufLen s) then
substring 0 (sLen - sufLen) s substring 0 (sLen - sufLen) s
else else
s; s;