diff options
| author | Marius <mariausol@gmail.com> | 2010-10-29 13:00:23 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2010-10-29 13:00:23 +0300 |
| commit | 42c4d16ce1daa37425d12be6c87d6f64a72b5094 (patch) | |
| tree | 494b8c10ccef29abe26db9acf08261ce78c16cf6 /tex/context/base/l-file.lua | |
| parent | f56f0054360a9bdfb57de9abcf0d81a2766c22b9 (diff) | |
| download | context-42c4d16ce1daa37425d12be6c87d6f64a72b5094.tar.gz | |
beta 2010.10.29 11:35
Diffstat (limited to 'tex/context/base/l-file.lua')
| -rw-r--r-- | tex/context/base/l-file.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tex/context/base/l-file.lua b/tex/context/base/l-file.lua index edf3f8a06..7c5b9c67f 100644 --- a/tex/context/base/l-file.lua +++ b/tex/context/base/l-file.lua @@ -159,7 +159,7 @@ end file.isreadable = file.is_readable -- depricated file.iswritable = file.is_writable -- depricated --- todo: lpeg +-- todo: lpeg \\ / .. does not save much local checkedsplit = string.checkedsplit @@ -174,7 +174,7 @@ end -- we can hash them weakly ---~ function file.old_collapse_path(str) -- fails on b.c/.. +--~ function file.collapsepath(str) -- fails on b.c/.. --~ str = gsub(str,"\\","/") --~ if find(str,"/") then --~ str = gsub(str,"^%./",(gsub(getcurrentdir(),"\\","/")) .. "/") -- ./xx in qualified @@ -198,7 +198,7 @@ end --~ Of course there are some optimizations too. Finally we had to deal with --~ windows drive prefixes and thinsg like sys://. -function file.collapse_path(str,anchor) +function file.collapsepath(str,anchor) if anchor and not find(str,"^/") and not find(str,"^%a:") then str = getcurrentdir() .. "/" .. str end @@ -253,8 +253,10 @@ function file.collapse_path(str,anchor) end end +file.collapse_path = file.collapsepath + --~ local function test(str) ---~ print(string.format("%-20s %-15s %-15s",str,file.collapse_path(str),file.collapse_path(str,true))) +--~ print(string.format("%-20s %-15s %-15s",str,file.collapsepath(str),file.collapsepath(str,true))) --~ end --~ test("a/b.c/d") test("b.c/d") test("b.c/..") --~ test("/") test("c:/..") test("sys://..") |