* encoding.c: provide basic features for M17N.

* parse.y: encoding aware parsing.

* parse.y (pragma_encoding): encoding specification pragma.

* parse.y (rb_intern3): encoding specified symbols.

* string.c (rb_str_length): length based on characters.  
  for older behavior, bytesize method added.

* string.c (rb_str_index_m): index based on characters.  rindex as
  well.

* string.c (succ_char): encoding aware succeeding string.

* string.c (rb_str_reverse): reverse based on characters.

* string.c (rb_str_inspect): encoding aware string description.

* string.c (rb_str_upcase_bang): encoding aware case conversion.
  downcase, capitalize, swapcase as well.

* string.c (rb_str_tr_bang): tr based on characters.  delete,
  squeeze, tr_s, count as well.

* string.c (rb_str_split_m): split based on characters.

* string.c (rb_str_each_line): encoding aware each_line.

* string.c (rb_str_each_char): added.  iteration based on
  characters.

* string.c (rb_str_strip_bang): encoding aware whitespace
  stripping.  lstrip, rstrip as well.

* string.c (rb_str_justify): encoding aware justifying (ljust,
  rjust, center).

* string.c (str_encoding): get encoding attribute from a string. 

* re.c (rb_reg_initialize): encoding aware regular expression

* sprintf.c (rb_str_format): formatting (i.e. length count) based
  on characters.

* io.c (rb_io_getc): getc to return one-character string.
  for older behavior, getbyte method added.

* ext/stringio/stringio.c (strio_getc): ditto.

* io.c (rb_io_ungetc): allow pushing arbitrary string at the
  current reading point.

* ext/stringio/stringio.c (strio_ungetc): ditto.

* ext/strscan/strscan.c: encoding support.

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

1 files changed, 10 insertions, 7 deletions

diff --git a/ruby.c b/ruby.c
index 7fb36355fa..ad3c172971 100644
--- a/ruby.c
+++ b/ruby.c
@@ -6,7 +6,7 @@
   $Date$
   created at: Tue Aug 10 12:47:31 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
@@ -676,7 +676,7 @@ proc_options(int argc, char **argv)
 
 	  case 'F':
 	    if (*++s) {
-		rb_fs = rb_reg_new(s, strlen(s), 0);
+		rb_fs = rb_reg_new(rb_str_new2(s), 0);
 	    }
 	    break;
 
@@ -962,10 +962,14 @@ load_file(VALUE parser, const char *fname, int script)
 	    rb_raise(rb_eLoadError, "no Ruby script found in input");
 	}
 
-	c = rb_io_getc(f);
+	c = rb_io_getbyte(f);
 	if (c == INT2FIX('#')) {
-	    c = rb_io_getc(f);
-	    if (c == INT2FIX('!') && !NIL_P(line = rb_io_gets(f))) {
+	    c = rb_io_getbyte(f);
+	    if (c == INT2FIX('!')) {
+		line = rb_io_gets(f);
+		if (NIL_P(line))
+		    return 0;
+
 		if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) {
 		    /* not ruby script, kick the program */
 		    char **argv;
@@ -1011,8 +1015,7 @@ load_file(VALUE parser, const char *fname, int script)
 		}
 
 		/* push back shebang for pragma may exist in next line */
-		rb_io_ungetc(f, INT2FIX('\n'));
-		rb_io_ungetc(f, INT2FIX('!'));
+		rb_io_ungetc(f, rb_str_new2("!\n"));
 	    }
 	    else if (!NIL_P(c)) {
 		rb_io_ungetc(f, c);