REQUEST_ROUTER now inherit from ITERABLE [..]

This commit is contained in:
Jocelyn Fiat
2012-01-17 16:35:52 +01:00
parent 7a6c51e47e
commit 60574ee85f
2 changed files with 4 additions and 3 deletions

View File

@@ -7,6 +7,9 @@ note
deferred class deferred class
REQUEST_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_HANDLER_CONTEXT] REQUEST_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_HANDLER_CONTEXT]
inherit
ITERABLE [TUPLE [handler: H; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
feature -- Mapping feature -- Mapping
map_default (h: like default_handler) map_default (h: like default_handler)
@@ -102,8 +105,6 @@ feature -- Traversing
new_cursor: ITERATION_CURSOR [TUPLE [handler: H; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]] new_cursor: ITERATION_CURSOR [TUPLE [handler: H; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
-- Fresh cursor associated with current structure -- Fresh cursor associated with current structure
deferred deferred
ensure
result_attached: Result /= Void
end end
feature {NONE} -- Access: Implementation feature {NONE} -- Access: Implementation

View File

@@ -94,7 +94,7 @@ feature {NONE} -- Access: Implementation
feature {NONE} -- Context factory feature {NONE} -- Context factory
handler_context (p: detachable STRING; req: WSF_REQUEST; tpl: URI_TEMPLATE; tpl_res: URI_TEMPLATE_MATCH_RESULT): C handler_context (p: detachable READABLE_STRING_8; req: WSF_REQUEST; tpl: URI_TEMPLATE; tpl_res: URI_TEMPLATE_MATCH_RESULT): C
do do
if p /= Void then if p /= Void then
create Result.make (req, tpl, tpl_res, p) create Result.make (req, tpl, tpl_res, p)