Major renaming, adopt the WSF_ prefix for all classes under "wsf", and simplify some class names

Removed in WGI_INPUT_STREAM, the assertion "same_last_string_reference"
Copyright updates
This commit is contained in:
Jocelyn Fiat
2012-03-16 09:49:41 +01:00
parent 25218996e0
commit 46eb92ac37
109 changed files with 517 additions and 236 deletions

View File

@@ -75,6 +75,7 @@ feature -- Access
last_string: STRING
-- Last string read
-- <Precursor>
last_character: CHARACTER_8
-- Last item read

View File

@@ -1,5 +1,5 @@
${NOTE_KEYWORD}
copyright: "2011-${YEAR}, Eiffel Software and others"
copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -36,21 +36,27 @@ feature -- Input
read_character
-- Read the next character in input stream.
-- Make the result available in `last_character'.
local
src: like source
do
if source.socket_ok then
source.read_character
last_character := source.last_character
src := source
if src.socket_ok then
src.read_character
last_character := src.last_character
else
last_character := '%U'
end
end
read_string (nb: INTEGER)
local
src: like source
do
src := source
last_string.wipe_out
if source.socket_ok then
source.read_stream_thread_aware (nb)
last_string.append_string (source.last_string)
if src.socket_ok then
src.read_stream_thread_aware (nb)
last_string.append_string (src.last_string)
end
end
@@ -58,7 +64,7 @@ feature -- Access
last_string: STRING_8
-- Last string read
-- (Note: this query always return the same object.
-- (Note: this query *might* return the same object.
-- Therefore a clone should be used if the result
-- is to be kept beyond the next call to this feature.
-- However `last_string' is not shared between input objects.)
@@ -81,7 +87,7 @@ feature -- Status report
end
;note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -1,5 +1,5 @@
${NOTE_KEYWORD}
copyright: "2011-${YEAR}, Eiffel Software and others"
copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -20,7 +20,7 @@ feature -- Access
end
note
copyright: "2011-2011, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -79,7 +79,7 @@ feature -- Extra names
orig_path_info: STRING = "ORIG_PATH_INFO"
note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -626,7 +626,7 @@ invariant
path_info_identical: path_info ~ meta_string_variable ({WGI_META_NAMES}.path_info)
note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -124,7 +124,7 @@ feature -- Output operation
end
note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -411,7 +411,7 @@ invariant
empty_string_unchanged: empty_string.is_empty
note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -133,7 +133,7 @@ feature {NONE} -- Implementation: Access
-- Server output channel
;note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -36,7 +36,7 @@ invariant
callback_attached: callback /= Void
note
copyright: "2011-2011, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -198,7 +198,7 @@ feature {NONE} -- Implementation
-- Input Stream
;note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -15,16 +15,16 @@ feature -- Input
read_character
-- Read the next character in input stream.
-- Make the result available in `last_character'.
-- Make the result available in `last_character'
require
is_open_read: is_open_read
not_end_of_input: not end_of_input
deferred
ensure
same_last_string_reference: last_string = old last_string
end
read_string (nb: INTEGER)
-- Read the next `nb' characters and
-- make the string result available in `last_string'
require
is_open_read: is_open_read
not_end_of_input: not end_of_input
@@ -33,7 +33,6 @@ feature -- Input
ensure
last_string_count_small_enough: not end_of_input implies last_string.count <= nb
character_read: not end_of_input implies last_string.count > 0
same_last_string_reference: last_string = old last_string
end
read_to_string (a_string: STRING; pos, nb: INTEGER): INTEGER
@@ -74,14 +73,14 @@ feature -- Input
nb_char_read_large_enough: Result >= 0
nb_char_read_small_enough: Result <= nb
character_read: not end_of_input implies Result > 0
same_last_string_reference: last_string = old last_string
end
feature -- Access
last_string: STRING_8
-- Last string read
-- (Note: this query always return the same object.
-- Last string read.
--
-- Note: this query *might* return the same object.
-- Therefore a clone should be used if the result
-- is to be kept beyond the next call to this feature.
-- However `last_string' is not shared between file objects.)
@@ -94,7 +93,7 @@ feature -- Access
end
last_character: CHARACTER_8
-- Last item read
-- Last item read.
require
is_open_read: is_open_read
not_end_of_input: not end_of_input
@@ -116,7 +115,7 @@ feature -- Status report
end
note
copyright: "2011-2011, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -81,7 +81,7 @@ feature -- Basic operations
end
note
copyright: "2011-2011, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -26,7 +26,7 @@ feature {WGI_CONNECTOR} -- Execution
end
note
copyright: "2011-2012, Eiffel Software and others"
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software