summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-26 03:58:33 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-26 03:58:33 +0000
commit0051369ba3eff58cb734795543d7ca894b621d05 ()
tree0c271bf123ac3ae817668d14acc271eec6dfa163
parent6048f9a6cf5bc650da33124a5889a3160422f58d (diff)
* hash.c (rb_env_size): Restored documentation for ENV.size
* lib/drb/drb.rb: Documented DRb::DRb#run. * lib/erb.rb (class ERB): Improved documentation of ERb. * transcode.c: Documented Encoding::Converter constants. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--hash.c18
-rw-r--r--lib/drb/drb.rb4
-rw-r--r--lib/erb.rb10
-rw-r--r--transcode.c69
5 files changed, 100 insertions, 11 deletions
@@ -1,3 +1,13 @@
Sat Jan 26 10:09:57 2013 Eric Hodel <[email protected]>
* lib/webrick/accesslog.rb: Improved WEBrick documentation.
@@ -2566,15 +2566,6 @@ env_keys(void)
return ary;
}
-/*
- * call-seq:
- * ENV.each_key { |name| } -> Hash
- * ENV.each_key -> Enumerator
- *
- * Yields each environment variable name.
- *
- * An Enumerator is returned if no block is given.
- */
static VALUE
rb_env_size(VALUE ehash)
{
@@ -2593,6 +2584,15 @@ rb_env_size(VALUE ehash)
return LONG2FIX(cnt);
}
static VALUE
env_each_key(VALUE ehash)
{
@@ -1453,6 +1453,10 @@ module DRb
end
private
def run
Thread.start do
begin
@@ -257,7 +257,7 @@ require "cgi/util"
# Rails, the web application framework, uses ERB to create views.
#
class ERB
- Revision = '$Date:: $' #'
# Returns revision information for the erb.rb module.
def self.version
@@ -800,6 +800,9 @@ class ERB
@filename = nil
end
def make_compiler(trim_mode)
ERB::Compiler.new(trim_mode)
end
@@ -847,8 +850,11 @@ class ERB
end
end
def new_toplevel
- # New binding each time *near* toplevel for unspecified runs
TOPLEVEL_BINDING.dup
end
private :new_toplevel
@@ -4430,18 +4430,87 @@ Init_transcode(void)
rb_define_method(rb_cEncodingConverter, "replacement=", econv_set_replacement, 1);
rb_define_method(rb_cEncodingConverter, "==", econv_equal, 1);
rb_define_const(rb_cEncodingConverter, "INVALID_MASK", INT2FIX(ECONV_INVALID_MASK));
rb_define_const(rb_cEncodingConverter, "INVALID_REPLACE", INT2FIX(ECONV_INVALID_REPLACE));
rb_define_const(rb_cEncodingConverter, "UNDEF_MASK", INT2FIX(ECONV_UNDEF_MASK));
rb_define_const(rb_cEncodingConverter, "UNDEF_REPLACE", INT2FIX(ECONV_UNDEF_REPLACE));
rb_define_const(rb_cEncodingConverter, "UNDEF_HEX_CHARREF", INT2FIX(ECONV_UNDEF_HEX_CHARREF));
rb_define_const(rb_cEncodingConverter, "PARTIAL_INPUT", INT2FIX(ECONV_PARTIAL_INPUT));
rb_define_const(rb_cEncodingConverter, "AFTER_OUTPUT", INT2FIX(ECONV_AFTER_OUTPUT));
rb_define_const(rb_cEncodingConverter, "UNIVERSAL_NEWLINE_DECORATOR", INT2FIX(ECONV_UNIVERSAL_NEWLINE_DECORATOR));
rb_define_const(rb_cEncodingConverter, "CRLF_NEWLINE_DECORATOR", INT2FIX(ECONV_CRLF_NEWLINE_DECORATOR));
rb_define_const(rb_cEncodingConverter, "CR_NEWLINE_DECORATOR", INT2FIX(ECONV_CR_NEWLINE_DECORATOR));
rb_define_const(rb_cEncodingConverter, "XML_TEXT_DECORATOR", INT2FIX(ECONV_XML_TEXT_DECORATOR));
rb_define_const(rb_cEncodingConverter, "XML_ATTR_CONTENT_DECORATOR", INT2FIX(ECONV_XML_ATTR_CONTENT_DECORATOR));
rb_define_const(rb_cEncodingConverter, "XML_ATTR_QUOTE_DECORATOR", INT2FIX(ECONV_XML_ATTR_QUOTE_DECORATOR));
rb_define_method(rb_eUndefinedConversionError, "source_encoding_name", ecerr_source_encoding_name, 0);