akr	2007-12-11 16:39:16 +0900 (Tue, 11 Dec 2007)

  New Revision: 14195

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/include/ruby/encoding.h
    trunk/re.c

  Log:
    * encoding.c (rb_enc_ascget): renamed from rb_enc_get_ascii.
    
    * include/ruby/encoding.h: follow the renaming.
    
    * re.c: ditto. 
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14195&r2=14194
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/encoding.h?r1=14195&r2=14194
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=14195&r2=14194
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14195&r2=14194

Index: encoding.c
===================================================================
--- encoding.c	(revision 14194)
+++ encoding.c	(revision 14195)
@@ -505,7 +505,7 @@
     return n;
 }
 
-int rb_enc_get_ascii(const char *p, const char *e, int *len, rb_encoding *enc)
+int rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
 {
     int c, l;
     if (e <= p)
Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h	(revision 14194)
+++ include/ruby/encoding.h	(revision 14195)
@@ -79,7 +79,7 @@
 #define MBCLEN_NEEDMORE(ret)      ONIGENC_MBCLEN_NEEDMORE(ret)
 
 /* -> 0x00..0x7f, -1 */
-int rb_enc_get_ascii(const char *p, const char *e, int *len, rb_encoding *enc);
+int rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc);
 
 /* code,encoding -> codelen */
 int rb_enc_codelen(int, rb_encoding*);
Index: re.c
===================================================================
--- re.c	(revision 14194)
+++ re.c	(revision 14195)
@@ -222,7 +222,7 @@
 
     p = s; pend = p + len;
     while (p<pend) {
-        c = rb_enc_get_ascii(p, pend, &clen, enc);
+        c = rb_enc_ascget(p, pend, &clen, enc);
         if (c == -1) {
             p += mbclen(p, pend, enc);
         }
@@ -240,7 +240,7 @@
     else {
 	p = s;
 	while (p<pend) {
-            c = rb_enc_get_ascii(p, pend, &clen, enc);
+            c = rb_enc_ascget(p, pend, &clen, enc);
 	    if (c == '\\' && p+clen < pend) {
 		int n = clen + mbclen(p+clen, pend, enc);
 		rb_str_buf_cat(str, p, n);
@@ -2387,7 +2387,7 @@
     s = RSTRING_PTR(str);
     send = s + RSTRING_LEN(str);
     while (s < send) {
-        c = rb_enc_get_ascii(s, send, &clen, enc);
+        c = rb_enc_ascget(s, send, &clen, enc);
 	if (c == -1) {
             s += mbclen(s, send, enc);
 	    continue;
@@ -2420,7 +2420,7 @@
     t += s - RSTRING_PTR(str);
 
     while (s < send) {
-        c = rb_enc_get_ascii(s, send, &clen, enc);
+        c = rb_enc_ascget(s, send, &clen, enc);
 	if (c == -1) {
 	    int n = mbclen(s, send, enc);
 
@@ -2694,7 +2694,7 @@
     e = s + RSTRING_LEN(str);
 
     while (s < e) {
-        int c = rb_enc_get_ascii(s, e, &clen, enc);
+        int c = rb_enc_ascget(s, e, &clen, enc);
 	char *ss;
 
 	if (c == -1) {
@@ -2711,7 +2711,7 @@
 	}
         rb_str_buf_cat(val, p, ss-p);
 
-        c = rb_enc_get_ascii(s, e, &clen, enc);
+        c = rb_enc_ascget(s, e, &clen, enc);
         if (c == -1) {
             s += mbclen(s, e, enc);
 	    rb_str_buf_cat(val, ss, s-ss);
@@ -2732,12 +2732,12 @@
 	    break;
 
           case 'k':
-            if (s < e && rb_enc_get_ascii(s, e, &clen, enc) == '<') {
+            if (s < e && rb_enc_ascget(s, e, &clen, enc) == '<') {
                 char *name, *name_end;
                
                 name_end = name = s + clen;
                 while (name_end < e) {
-                    c = rb_enc_get_ascii(name_end, e, &clen, enc);
+                    c = rb_enc_ascget(name_end, e, &clen, enc);
                     if (c == '>') break;
                     name_end += c == -1 ? mbclen(name_end, e, enc) : clen;
                 }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14194)
+++ ChangeLog	(revision 14195)
@@ -1,3 +1,11 @@
+Tue Dec 11 16:37:47 2007  Tanaka Akira  <akr@f...>
+
+	* encoding.c (rb_enc_ascget): renamed from rb_enc_get_ascii.
+
+	* include/ruby/encoding.h: follow the renaming.
+
+	* re.c: ditto.
+
 Tue Dec 11 16:19:26 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in, */Makefile.sub (CP, MV): added.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml