Mercurial > urweb
diff src/compiler.sml @ 2096:6b7749da1ddc
Broaden handling of wildcard rewrites
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Wed, 24 Dec 2014 12:35:20 -0500 |
| parents | 88841212f0ba |
| children | c15f35e507b5 |
line wrap: on
line diff
--- a/src/compiler.sml Tue Dec 23 14:41:23 2014 -0500 +++ b/src/compiler.sml Wed Dec 24 12:35:20 2014 -0500 @@ -693,8 +693,8 @@ | _ => (ErrorMsg.error "Bad path kind spec"; Settings.Any) - fun parseFrom s = - if size s > 1 andalso String.sub (s, size s - 2) = #"/" andalso String.sub (s, size s - 1) = #"*" then + fun parsePattern s = + if size s > 0 andalso String.sub (s, size s - 1) = #"*" then (Settings.Prefix, String.substring (s, 0, size s - 1)) else (Settings.Exact, s) @@ -709,12 +709,6 @@ | _ => (ErrorMsg.error "Bad filter kind"; url) - fun parsePattern s = - if size s > 0 andalso String.sub (s, size s - 1) = #"*" then - (Settings.Prefix, String.substring (s, 0, size s - 1)) - else - (Settings.Exact, s) - fun read () = case inputCommentableLine inf of EndOfFile => finish [] @@ -801,7 +795,7 @@ fun doit (pkind, from, to, hyph) = let val pkind = parsePkind pkind - val (kind, from) = parseFrom from + val (kind, from) = parsePattern from in rewrites := {pkind = pkind, kind = kind, from = from, to = to, hyphenate = hyph} :: !rewrites end