* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace

  also locally defined modules.

* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.

* ext/strscan/strscan.c: moved misplaced rdoc.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 33 insertions, 12 deletions

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index c395373ff2..a6d63855ae 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -83,6 +83,7 @@ struct iconv_env_t
     VALUE (*append)_((VALUE, VALUE));
 };
 
+static VALUE rb_eIconvInvalidEncoding;
 static VALUE rb_eIconvFailure;
 static VALUE rb_eIconvIllegalSeq;
 static VALUE rb_eIconvInvalidChar;
@@ -161,10 +162,15 @@ iconv_create
 	    cd = iconv_open(tocode, fromcode);
 	}
 	if (cd == (iconv_t)-1) {
-	    volatile VALUE msg = rb_str_new2("iconv(\"");
+	    int inval = errno == EINVAL;
+	    volatile VALUE msg = rb_str_new2("iconv(\"" + (inval ? 5 : 0));
+	    char *s;
+
 	    rb_str_buf_cat2(rb_str_buf_append(msg, to), "\", \"");
 	    rb_str_buf_cat2(rb_str_buf_append(msg, from), "\")");
-	    rb_sys_fail(StringValuePtr(msg));
+	    s = StringValuePtr(msg);
+	    if (!inval) rb_sys_fail(s);
+	    rb_raise(rb_eIconvInvalidEncoding, "invalid encoding %s", s);
 	}
     }
 
@@ -625,6 +631,8 @@ iconv_s_iconv
  * Document-method: Iconv::conv
  * call-seq: Iconv.iconv(to, from, *strs)
  *
+ * Shorthand for
+ *   Iconv.iconv(to, from, str).join
  * See Iconv.iconv ???
  */
 static VALUE
@@ -732,7 +740,7 @@ iconv_iconv
 
     return iconv_convert(VALUE2ICONV(cd), str,
 			 NIL_P(n1) ? 0 : NUM2INT(n1),
-                        NIL_P(n2) ? -1 : NUM2INT(n2),
+			 NIL_P(n2) ? -1 : NUM2INT(n2),
 			 NULL);
 }
 
@@ -868,6 +876,7 @@ Init_iconv _((void))
     rb_define_method(rb_eIconvFailure, "failed", iconv_failure_failed, 0);
     rb_define_method(rb_eIconvFailure, "inspect", iconv_failure_inspect, 0);
 
+    rb_eIconvInvalidEncoding = rb_define_class_under(rb_cIconv, "InvalidEncoding", rb_eArgError);
     rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
     rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
     rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 81d3d84b9b..17ec3a8f81 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -269,7 +269,8 @@ strscan_terminate(self)
 }
 
 /*
- * Returns the string being scanned.
+ * Equivalent to #terminate.
+ * This method is obsolete; use #terminate instead.
  */
 static VALUE
 strscan_clear(self)
@@ -279,6 +280,9 @@ strscan_clear(self)
     return strscan_terminate(self);
 }
 
+/*
+ * Returns the string being scanned.
+ */
 static VALUE
 strscan_get_string(self)
     VALUE self;
@@ -719,6 +723,10 @@ strscan_get_byte(self)
                             p->prev + p->regs.end[0]);
 }
 
+/*
+ * Equivalent to #get_byte.
+ * This method is obsolete; use #get_byte instead.
+ */
 static VALUE
 strscan_getbyte(self)
     VALUE self;
@@ -757,6 +765,18 @@ strscan_peek(self, vlen)
 }
 
 /*
+ * Equivalent to #peek.
+ * This method is obsolete; use #peek instead.
+ */
+static VALUE
+strscan_peep(self, vlen)
+    VALUE self, vlen;
+{
+    rb_warning("StringScanner#peep is obsolete; use #peek instead");
+    return strscan_peek(self, vlen);
+}
+
+/*
  * Set the scan pointer to the previous position.  Only one previous position is
  * remembered, and it changes with each scanning operation.
  *
@@ -768,14 +788,6 @@ strscan_peek(self, vlen)
  *   s.unscan             # ScanError: can't unscan: prev match had failed
  */
 static VALUE
-strscan_peep(self, vlen)
-    VALUE self, vlen;
-{
-    rb_warning("StringScanner#peep is obsolete; use #peek instead");
-    return strscan_peek(self, vlen);
-}
-
-static VALUE
 strscan_unscan(self)
     VALUE self;
 {