Browse Source

Rename match() into match_rule().

Loïc Hoguin 14 years ago
parent
commit
6712eaa5c8
2 changed files with 5 additions and 5 deletions
  1. 2 2
      include/types.hrl
  2. 3 3
      src/cowboy_dispatcher.erl

+ 2 - 2
include/types.hrl

@@ -20,8 +20,8 @@
 
 -type bindings() :: list({Key::atom(), Value::string()}).
 -type path_tokens() :: list(nonempty_string()).
--type match() :: '_' | '*' | list(string() | '_' | atom()).
+-type match_rule() :: '_' | '*' | list(string() | '_' | atom()).
 
--type dispatch_rule() :: {Host::match(), list({Path::match(),
+-type dispatch_rule() :: {Host::match_rule(), list({Path::match_rule(),
 	Handler::module(), Opts::term()})}.
 -type dispatch_rules() :: list(dispatch_rule()).

+ 3 - 3
src/cowboy_dispatcher.erl

@@ -55,7 +55,7 @@ match(Host, Path, [{HostMatch, PathMatchs}|Tail]) ->
 			match_path(Path, PathMatchs, HostBinds)
 	end.
 
--spec match_path(Path::path_tokens(), list({Path::match(),
+-spec match_path(Path::path_tokens(), list({Path::match_rule(),
 	Handler::module(), Opts::term()}), HostBinds::bindings())
 	-> {ok, Handler::module(), Opts::term(), Binds::bindings()}
 	| {error, notfound, path}.
@@ -75,7 +75,7 @@ match_path(Path, [{PathMatch, Handler, Opts}|Tail], HostBinds) ->
 
 %% Internal.
 
--spec try_match(Type::host | path, List::path_tokens(), Match::match())
+-spec try_match(Type::host | path, List::path_tokens(), Match::match_rule())
 	-> {true, Binds::bindings()} | false.
 try_match(_Type, _List, '_') ->
 	{true, []};
@@ -86,7 +86,7 @@ try_match(host, List, Match) ->
 try_match(path, List, Match) ->
 	list_match(List, Match, []).
 
--spec list_match(List::path_tokens(), Match::match(), Binds::bindings())
+-spec list_match(List::path_tokens(), Match::match_rule(), Binds::bindings())
 	-> {true, Binds::bindings()} | false.
 %% Atom '_' matches anything, continue.
 list_match([_E|Tail], ['_'|TailMatch], Binds) ->