file locator cleanup

diff --git a/src/core/file.slate b/src/core/file.slate
index 7b9400b..e00208a 100644 (file)
--- a/src/core/file.slate
+++ b/src/core/file.slate
@@ -419,11 +419,13 @@ l@(File Locator traits) readPathElementsFrom: s &pathSeparator: pathSeparator
   pathSeparator ifNil: [pathSeparator: l pathSeparator].
   pathElements: (s upToEnd splitWith: pathSeparator).
   l path: pathElements allButLast.
-  pathElements isEmpty
-    ifFalse:
-      [l name: (pathElements last copyUpToLast: l dot).
-       (pathElements last lastIndexOf: l dot)
-        ifNotNil: [l fileType: (pathElements last copyAfterLast: l dot)]].
+  pathElements isEmpty ifFalse: [l readFilenameFrom: pathElements last].
+].
+
+l@(File Locator traits) readFilenameFrom: s
+[
+  l name: (s copyUpToLast: l dot).
+  (s lastIndexOf: l dot) ifNotNil: [l fileType: (s copyAfterLast: l dot)].
 ].
 
 l@(File Locator traits) isRoot

diff --git a/src/shell/shell.slate b/src/shell/shell.slate
index 05ba970..9382f2e 100644 (file)
--- a/src/shell/shell.slate
+++ b/src/shell/shell.slate
@@ -13,13 +13,13 @@ l@(File Locator traits) maskedEntries: mask@(Regex Regex traits) do: block
 [ | matcher |
   matcher: (Regex Matcher newOn: mask).
   (Directory new `>> [locator: l. ]) reader reset
-    do: [|:each| (matcher match: each) = Regex Matcher Fail ifFalse: [block applyWith: l clone `>> [name: each. ]]].
+    do: [|:each| (matcher match: each) = Regex Matcher Fail ifFalse: [block applyWith: (l clone readFilenameFrom: each)]].
 ].
 
 l@(File Locator traits) maskedEntries: mask@(Shell MaskPattern traits) do: block
 [ 
   (Directory new `>> [locator: l. ]) reader reset
-    do: [|:each| (mask matches: each) ifTrue: [block applyWith: l clone `>> [name: each. ]]].
+    do: [|:each| (mask matches: each) ifTrue: [block applyWith: (l clone readFilenameFrom: each)]].
 ].