1 files changed, 39 insertions, 29 deletions

diff --git a/lualibs-url.lua b/lualibs-url.lua
index 7bb7312..b189ec5 100644
--- a/lualibs-url.lua
+++ b/lualibs-url.lua
@@ -145,19 +145,25 @@ local splitquery = Cf ( Ct("") * P { "sequence",
 -- hasher
 
 local function hashed(str) -- not yet ok (/test?test)
-    if str == "" then
+    if not str or str == "" then
         return {
             scheme   = "invalid",
             original = str,
         }
     end
-    local s = split(str)
-    local rawscheme  = s[1]
-    local rawquery   = s[4]
-    local somescheme = rawscheme ~= ""
-    local somequery  = rawquery  ~= ""
+    local detailed   = split(str)
+    local rawscheme  = ""
+    local rawquery   = ""
+    local somescheme = false
+    local somequery  = false
+    if detailed then
+        rawscheme  = detailed[1]
+        rawquery   = detailed[4]
+        somescheme = rawscheme ~= ""
+        somequery  = rawquery  ~= ""
+    end
     if not somescheme and not somequery then
-        s = {
+        return {
             scheme    = "file",
             authority = "",
             path      = str,
@@ -167,30 +173,33 @@ local function hashed(str) -- not yet ok (/test?test)
             noscheme  = true,
             filename  = str,
         }
-    else -- not always a filename but handy anyway
-        local authority, path, filename = s[2], s[3]
-        if authority == "" then
-            filename = path
-        elseif path == "" then
-            filename = ""
-        else
-            filename = authority .. "/" .. path
-        end
-        s = {
-            scheme    = rawscheme,
-            authority = authority,
-            path      = path,
-            query     = lpegmatch(unescaper,rawquery),  -- unescaped, but possible conflict with & and =
-            queries   = lpegmatch(splitquery,rawquery), -- split first and then unescaped
-            fragment  = s[5],
-            original  = str,
-            noscheme  = false,
-            filename  = filename,
-        }
     end
-    return s
+    -- not always a filename but handy anyway
+    local authority = detailed[2]
+    local path      = detailed[3]
+    local filename  = nil
+    if authority == "" then
+        filename = path
+    elseif path == "" then
+        filename = ""
+    else
+        filename = authority .. "/" .. path
+    end
+    return {
+        scheme    = rawscheme,
+        authority = authority,
+        path      = path,
+        query     = lpegmatch(unescaper,rawquery),  -- unescaped, but possible conflict with & and =
+        queries   = lpegmatch(splitquery,rawquery), -- split first and then unescaped
+        fragment  = detailed[5],
+        original  = str,
+        noscheme  = false,
+        filename  = filename,
+    }
 end
 
+-- inspect(hashed())
+-- inspect(hashed(""))
 -- inspect(hashed("template:///test"))
 -- inspect(hashed("template:///test++.whatever"))
 -- inspect(hashed("template:///test%2B%2B.whatever"))
@@ -247,7 +256,7 @@ function url.construct(hash) -- dodo: we need to escape !
     return lpegmatch(escaper,concat(fullurl))
 end
 
-local pattern = Cs(noslash * R("az","AZ") * (S(":|")/":") * noslash * P(1)^0)
+local pattern = Cs(slash^-1/"" * R("az","AZ") * ((S(":|")/":") + P(":")) * slash * P(1)^0)
 
 function url.filename(filename)
     local spec = hashed(filename)
@@ -257,6 +266,7 @@ end
 
 -- print(url.filename("/c|/test"))
 -- print(url.filename("/c/test"))
+-- print(url.filename("file:///t:/sources/cow.svg"))
 
 local function escapestring(str)
     return lpegmatch(escaper,str)