Skip to content

Speed up checkPathForIllegalChars without a cache. #2138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 1 commit into from
Dec 31, 2016
Merged

Speed up checkPathForIllegalChars without a cache. #2138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions src/utils/filename.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,11 @@ open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library

exception IllegalFileNameChar of string * char

/// The set of characters which may not be used in a path.
/// This is saved here because Path.GetInvalidPathChars() allocates and returns
/// a new array each time it's called (by necessity, for security reasons).
/// This is only used within `checkPathForIllegalChars`, and is only read from.
let illegalPathChars =
let chars = Path.GetInvalidPathChars ()
chars

let checkPathForIllegalChars (path:string) =
let len = path.Length
for i = 0 to len - 1 do
let c = path.[i]

// Determine if this character is disallowed within a path by
// attempting to find it in the array of illegal path characters.
for badChar in illegalPathChars do
if c = badChar then
raise(IllegalFileNameChar(path, c))
let checkPathForIllegalChars =
let chars = new System.Collections.Generic.HashSet<_>(Path.GetInvalidPathChars())
(fun (path:string) ->
for c in path do
if chars.Contains c then raise(IllegalFileNameChar(path, c)))

// Case sensitive (original behaviour preserved).
let checkSuffix (x:string) (y:string) = x.EndsWith(y,System.StringComparison.Ordinal)
Expand Down