[macruby-changes] [164] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 164
          http://trac.macosforge.org/projects/ruby/changeset/164
Author:   lsansonetti at apple.com
Date:     2008-04-22 18:29:13 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
misc fixes

Modified Paths:
--------------
    MacRuby/trunk/class.c
    MacRuby/trunk/mkconfig.rb
    MacRuby/trunk/re.c
    MacRuby/trunk/string.c
    MacRuby/trunk/vm_insnhelper.c

Modified: MacRuby/trunk/class.c
===================================================================
--- MacRuby/trunk/class.c	2008-04-22 21:44:07 UTC (rev 163)
+++ MacRuby/trunk/class.c	2008-04-23 01:29:13 UTC (rev 164)
@@ -1101,6 +1101,7 @@
     else {
 	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
     }
+#if !WITH_OBJC
     if (OBJ_TAINTED(obj)) {
 	OBJ_TAINT(klass);
     }
@@ -1108,6 +1109,7 @@
 	FL_UNSET(klass, FL_TAINT);
     }
     if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
+#endif
     ALLOW_INTS;
 
     return klass;

Modified: MacRuby/trunk/mkconfig.rb
===================================================================
--- MacRuby/trunk/mkconfig.rb	2008-04-22 21:44:07 UTC (rev 163)
+++ MacRuby/trunk/mkconfig.rb	2008-04-23 01:29:13 UTC (rev 164)
@@ -22,6 +22,9 @@
 end
 $stdout = config
 
+puts "hello"
+exit
+
 fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE}
 print %[
 # This file was created by #{mkconfig} when ruby was built.  Any

Modified: MacRuby/trunk/re.c
===================================================================
--- MacRuby/trunk/re.c	2008-04-22 21:44:07 UTC (rev 163)
+++ MacRuby/trunk/re.c	2008-04-23 01:29:13 UTC (rev 164)
@@ -2973,18 +2973,18 @@
 rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
 {
     VALUE val = 0;
-    char *p, *s, *e;
+    const char *p, *s, *e;
     int no, clen;
     rb_encoding *str_enc = rb_enc_get(str);
     rb_encoding *src_enc = rb_enc_get(src);
 
     rb_enc_check(str, src);
-    p = s = RSTRING_PTR(str);
-    e = s + RSTRING_LEN(str);
+    p = s = RSTRING_CPTR(str);
+    e = s + RSTRING_CLEN(str);
 
     while (s < e) {
         int c = rb_enc_ascget(s, e, &clen, str_enc);
-	char *ss;
+	const char *ss;
 
 	if (c == -1) {
 	    s += mbclen(s, e, str_enc);
@@ -3023,7 +3023,7 @@
 
           case 'k':
             if (s < e && rb_enc_ascget(s, e, &clen, str_enc) == '<') {
-                char *name, *name_end;
+                const char *name, *name_end;
                
                 name_end = name = s + clen;
                 while (name_end < e) {
@@ -3050,11 +3050,11 @@
 	    break;
 
 	  case '`':
-	    rb_enc_str_buf_cat(val, RSTRING_PTR(src), BEG(0), src_enc);
+	    rb_enc_str_buf_cat(val, RSTRING_CPTR(src), BEG(0), src_enc);
 	    continue;
 
 	  case '\'':
-	    rb_enc_str_buf_cat(val, RSTRING_PTR(src)+END(0), RSTRING_LEN(src)-END(0), src_enc);
+	    rb_enc_str_buf_cat(val, RSTRING_CPTR(src)+END(0), RSTRING_CLEN(src)-END(0), src_enc);
 	    continue;
 
 	  case '+':
@@ -3075,7 +3075,7 @@
 	if (no >= 0) {
 	    if (no >= regs->num_regs) continue;
 	    if (BEG(no) == -1) continue;
-	    rb_enc_str_buf_cat(val, RSTRING_PTR(src)+BEG(no), END(no)-BEG(no), src_enc);
+	    rb_enc_str_buf_cat(val, RSTRING_CPTR(src)+BEG(no), END(no)-BEG(no), src_enc);
 	}
     }
 

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2008-04-22 21:44:07 UTC (rev 163)
+++ MacRuby/trunk/string.c	2008-04-23 01:29:13 UTC (rev 164)
@@ -8022,7 +8022,9 @@
     rb_define_method(rb_cString, "<=>", rb_str_cmp_m, 1);
     rb_define_method(rb_cString, "==", rb_str_equal, 1);
     rb_define_method(rb_cString, "eql?", rb_str_eql, 1);
+#if !WITH_OBJC
     rb_define_method(rb_cString, "hash", rb_str_hash_m, 0);
+#endif
     rb_define_method(rb_cString, "casecmp", rb_str_casecmp, 1);
     rb_define_method(rb_cString, "+", rb_str_plus, 1);
     rb_define_method(rb_cString, "*", rb_str_times, 1);

Modified: MacRuby/trunk/vm_insnhelper.c
===================================================================
--- MacRuby/trunk/vm_insnhelper.c	2008-04-22 21:44:07 UTC (rev 163)
+++ MacRuby/trunk/vm_insnhelper.c	2008-04-23 01:29:13 UTC (rev 164)
@@ -1089,7 +1089,7 @@
 		     rb_id2name(id), rb_obj_classname(obj));
 	}
 
-	if (OBJ_FROZEN(obj)) {
+	if (rb_obj_frozen_p(obj)) {
 	    rb_error_frozen("object");
 	}
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080422/9f6cf690/attachment.html