diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/telnet.rb | 18 | ||||
-rw-r--r-- | lib/rdoc/parsers/parse_c.rb | 6 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index 55c9a4e6c3..095be45334 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -277,7 +277,7 @@ module Net # :nodoc: @options["Binmode"] = false else unless (true == @options["Binmode"] or false == @options["Binmode"]) - raise ArgumentError, "Binmode option required true or false" + raise ArgumentError, "Binmode option must be true or false" end end @@ -285,7 +285,7 @@ module Net # :nodoc: @options["Telnetmode"] = true else unless (true == @options["Telnetmode"] or false == @options["Telnetmode"]) - raise ArgumentError, "Telnetmode option required true or false" + raise ArgumentError, "Telnetmode option must be true or false" end end @@ -330,7 +330,7 @@ module Net # :nodoc: elsif @options["Proxy"].kind_of?(IO) @sock = @options["Proxy"] else - raise "Error; Proxy is Net::Telnet or IO object." + raise "Error: Proxy must be an instance of Net::Telnet or IO." end else message = "Trying " + @options["Host"] + "...\n" @@ -347,7 +347,7 @@ module Net # :nodoc: end end rescue TimeoutError - raise TimeoutError, "timed-out; opening of the host" + raise TimeoutError, "timed out while opening a connection to the host" rescue @log.write($ERROR_INFO.to_s + "\n") if @options.has_key?("Output_log") @dumplog.log_dump('#', $ERROR_INFO.to_s + "\n") if @options.has_key?("Dump_log") @@ -382,7 +382,7 @@ module Net # :nodoc: when true, false @options["Telnetmode"] = mode else - raise ArgumentError, "required true or false" + raise ArgumentError, "argument must be true or false, or missing" end end @@ -393,7 +393,7 @@ module Net # :nodoc: if (true == mode or false == mode) @options["Telnetmode"] = mode else - raise ArgumentError, "required true or false" + raise ArgumentError, "argument must be true or false" end end @@ -406,7 +406,7 @@ module Net # :nodoc: when true, false @options["Binmode"] = mode else - raise ArgumentError, "required true or false" + raise ArgumentError, "argument must be true or false" end end @@ -415,7 +415,7 @@ module Net # :nodoc: if (true == mode or false == mode) @options["Binmode"] = mode else - raise ArgumentError, "required true or false" + raise ArgumentError, "argument must be true or false" end end @@ -542,7 +542,7 @@ module Net # :nodoc: rest = '' until(prompt === line and not IO::select([@sock], nil, nil, waittime)) unless IO::select([@sock], nil, nil, time_out) - raise TimeoutError, "timed-out; wait for the next data" + raise TimeoutError, "timed out while waiting for more data" end begin c = @sock.sysread(1024 * 1024) diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb index 37f13515bd..0cc19d851f 100644 --- a/lib/rdoc/parsers/parse_c.rb +++ b/lib/rdoc/parsers/parse_c.rb @@ -182,10 +182,14 @@ module RDoc def find_class_comment(class_name, class_meth) + comment = nil if @body =~ %r{((?>/\*.*?\*/\s+)) (static\s+)?void\s+Init_#{class_name}\s*\(\)}xm - class_meth.comment = mangle_comment($1) + comment = $1 + elsif @body =~ %r{Document-class:\s#{class_name}.*?\n((?>.*?\*/))}m + comment = $1 end + class_meth.comment = mangle_comment(comment) if comment end def do_classes |