miku 2011.6.20 → 2011.6.24

raw patch · 2 files changed

+9/−3 lines, 2 files

Files

• miku.cabal +1/−1
• src/Network/Miku/Engine.hs +8/−2

@@ -1,5 +1,5 @@ Name:                 miku-Version:              2011.6.20+Version:              2011.6.24 Build-type:           Simple Synopsis:             A minimum web dev DSL in Haskell Description:

@@ -67,13 +67,18 @@ parse_params "" ""  = Just ("", []) parse_params "" _   = Nothing parse_params "/" "" = Nothing-parse_params "/" _  = Just ("/", [])+parse_params "/" "/"  = Just ("/", [])  parse_params t s = +     let template_tokens = t.B.split '/'       url_tokens      = s.B.split '/'+  +      _template_last_token_matches_everything         = template_tokens.length P.> 0 && template_tokens.last.is "*"+      _template_tokens_length_equals_url_token_length = template_tokens.length == url_tokens.length   in-  if url_tokens.length P.< template_tokens.length+  +  if not - _template_last_token_matches_everything || _template_tokens_length_equals_url_token_length     then Nothing     else        let rs = zipWith capture template_tokens url_tokens@@ -89,5 +94,6 @@   where     capture x y        | x.B.unpack.starts_with ":" = Just - Just (x.B.tail, y)+      | x.is "*" = Just Nothing       | x == y = Just Nothing       | otherwise = Nothing