Commit 5b30f789 authored by dearblue's avatar dearblue

Avoid method in method

And rename `File.concat_path` to `File._concat_path`.
parent 6c5ee8f7
...@@ -55,8 +55,7 @@ class File < IO ...@@ -55,8 +55,7 @@ class File < IO
s s
end end
def self.expand_path(path, default_dir = '.') def self._concat_path(path, base_path)
def concat_path(path, base_path)
if path[0] == "/" || path[1] == ':' # Windows root! if path[0] == "/" || path[1] == ':' # Windows root!
expanded_path = path expanded_path = path
elsif path[0] == "~" elsif path[0] == "~"
...@@ -87,14 +86,15 @@ class File < IO ...@@ -87,14 +86,15 @@ class File < IO
expanded_path += "/" expanded_path += "/"
end end
else else
expanded_path = concat_path(base_path, _getwd) expanded_path = _concat_path(base_path, _getwd)
expanded_path += "/" + path expanded_path += "/" + path
end end
expanded_path expanded_path
end end
expanded_path = concat_path(path, default_dir) def self.expand_path(path, default_dir = '.')
expanded_path = _concat_path(path, default_dir)
drive_prefix = "" drive_prefix = ""
if File::ALT_SEPARATOR && expanded_path.size > 2 && if File::ALT_SEPARATOR && expanded_path.size > 2 &&
("A".."Z").include?(expanded_path[0].upcase) && expanded_path[1] == ":" ("A".."Z").include?(expanded_path[0].upcase) && expanded_path[1] == ":"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment