more fiddles

src/utilities.jl

@@ -283,6 +283,36 @@ function get_identifier(x, offset, pos=0)
     end
 end
 
+
+if VERSION < v"1.1"
+    _splitdir_nodrive(path::String) = _splitdir_nodrive("", path)
+    function _splitdir_nodrive(a::String, b::String)
+        m = match(Base.Filesystem.path_dir_splitter, b)
+        m === nothing && return (a, b)
+        a = string(a, isempty(m.captures[1]) ? m.captures[2][1] : m.captures[1])
+        a, String(m.captures[3])
+    end
+    splitpath(p::AbstractString) = splitpath(String(p))
+
+    function splitpath(p::String)
+        drive, p = _splitdrive(p)
+        out = String[]
+        isempty(p) && (pushfirst!(out, p))  # "" means the current directory.
+        while !isempty(p)
+            dir, base = _splitdir_nodrive(p)
+            dir == p && (pushfirst!(out, dir); break)  # Reached root node.
+            if !isempty(base)  # Skip trailing '/' in basename
+                pushfirst!(out, base)
+            end
+            p = dir
+        end
+        if !isempty(drive)  # Tack the drive back on to the first element.
+            out[1] = drive * out[1]  # Note that length(out) is always >= 1.
+        end
+        return out
+    end
+end
+
 @static if Sys.iswindows() && VERSION < v"1.3"
     function _splitdir_nodrive(a::String, b::String)
         m = match(r"^(.*?)([/\\]+)([^/\\]*)$", b)
@@ -308,6 +338,7 @@ end
 else
     _dirname = dirname
     _splitdir = splitdir
+    _splitdrive = splitdrive
 end
 
 function valid_id(s::String)
@@ -374,31 +405,3 @@ function is_in_target_dir_of_package(pkgpath, target)
     end
 end
 
-if VERSION < v"1.1"
-    _splitdir_nodrive(path::String) = _splitdir_nodrive("", path)
-    function _splitdir_nodrive(a::String, b::String)
-        m = match(Base.Filesystem.path_dir_splitter, b)
-        m === nothing && return (a, b)
-        a = string(a, isempty(m.captures[1]) ? m.captures[2][1] : m.captures[1])
-        a, String(m.captures[3])
-    end
-    splitpath(p::AbstractString) = splitpath(String(p))
-
-    function splitpath(p::String)
-        drive, p = splitdrive(p)
-        out = String[]
-        isempty(p) && (pushfirst!(out, p))  # "" means the current directory.
-        while !isempty(p)
-            dir, base = _splitdir_nodrive(p)
-            dir == p && (pushfirst!(out, dir); break)  # Reached root node.
-            if !isempty(base)  # Skip trailing '/' in basename
-                pushfirst!(out, base)
-            end
-            p = dir
-        end
-        if !isempty(drive)  # Tack the drive back on to the first element.
-            out[1] = drive * out[1]  # Note that length(out) is always >= 1.
-        end
-        return out
-    end
-end