nobu	2008-07-31 01:37:53 +0900 (Thu, 31 Jul 2008)

  New Revision: 18281

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18281

  Log:
    * merged from trunk r18273:18280.

  Modified files:
    branches/mvm/.merged-trunk-revision
    branches/mvm/ChangeLog
    branches/mvm/Makefile.in
    branches/mvm/dir.c
    branches/mvm/ext/bigdecimal/bigdecimal.c
    branches/mvm/parse.y

Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 18280)
+++ mvm/ChangeLog	(revision 18281)
@@ -14,10 +14,23 @@
 
 	* thread.c (rb_mutex_unlock_all): mutex is no longer a ruby object.
 
+Thu Jul 31 01:25:43 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread.c (rb_mutex_unlock_all): mutex is no longer a ruby object.
+
+Thu Jul 31 01:18:07 2008  Yusuke Endoh  <mame@t...>
+
+	* parse.y (magic_comment_encoding): remove meaningless null check.
+
 Thu Jul 31 01:11:58 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (ruby_vm_specific_ptr): fix for reallocation.
 
+Thu Jul 31 01:09:28 2008  Yusuke Endoh  <mame@t...>
+
+	* ext/bigdecimal/bigdecimal.c (VpIsRoundMode): fix tautology
+	  condition.
+
 Thu Jul 31 00:58:33 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* pack.c (pack_unpack): reduced static variables.
Index: mvm/dir.c
===================================================================
--- mvm/dir.c	(revision 18280)
+++ mvm/dir.c	(revision 18281)
@@ -1947,7 +1947,7 @@
 #if USE_OPENAT
     base = dirfd(dp->dir);
 #endif
-    return rb_openat(argc, argv, base, dp->path);
+    return rb_openat(argc, argv, base, RSTRING_PTR(dp->path));
 }
 
 static long
@@ -1984,7 +1984,7 @@
 #endif
 	if (ret < 0) {
 #if USE_OPENAT
-	    preserving_errno(fullpath = to_fullpath(&path, rb_str_new2(dp->path)));
+	    preserving_errno(fullpath = to_fullpath(&path, dp->path));
 #endif
 	    rb_sys_fail(fullpath);
 	}
@@ -2252,7 +2252,7 @@
     GetDIR(dir, dp);
 #if USE_OPENAT
     if (mkdirat(dirfd(dp->dir), RSTRING_PTR(path), mode) == -1) {
-	preserving_errno(fullpath = to_fullpath(&path, rb_str_new2(dp->path)));
+	preserving_errno(fullpath = to_fullpath(&path, dp->path));
 	rb_sys_fail(fullpath);
     }
 #else
@@ -2276,7 +2276,7 @@
     GetDIR(dir, dp);
 #if USE_OPENAT
     if (unlinkat(dirfd(dp->dir), RSTRING_PTR(path), 0) == -1) {
-	preserving_errno(fullpath = to_fullpath(&path, rb_str_new2(dp->path)));
+	preserving_errno(fullpath = to_fullpath(&path, dp->path));
 	rb_sys_fail(fullpath);
     }
 #else
@@ -2321,7 +2321,7 @@
     GetDIR(dir, dp);
 #if USE_OPENAT
     if (unlinkat(dirfd(dp->dir), RSTRING_PTR(path), AT_REMOVEDIR) == -1) {
-	preserving_errno(fullpath = to_fullpath(&path, rb_str_new2(dp->path)));
+	preserving_errno(fullpath = to_fullpath(&path, dp->path));
 	rb_sys_fail(fullpath);
     }
 #else
Index: mvm/parse.y
===================================================================
--- mvm/parse.y	(revision 18280)
+++ mvm/parse.y	(revision 18281)
@@ -5805,7 +5805,7 @@
 static void
 magic_comment_encoding(struct parser_params *parser, const char *name, const char *val)
 {
-    if (parser && parser->line_count != (parser->has_shebang ? 2 : 1))
+    if (parser->line_count != (parser->has_shebang ? 2 : 1))
 	return;
     parser_set_encode(parser, val);
 }
Index: mvm/Makefile.in
===================================================================
--- mvm/Makefile.in	(revision 18280)
+++ mvm/Makefile.in	(revision 18281)
@@ -212,7 +212,7 @@
 	sed -e '/\.$(OBJEXT):$$/{p;d}' \
 	    -e '/.* [B-Db-d] /!d;s///' \
 	    -e '/^rb_intern_id_cache/d' \
-	    -e '/^id/d;/^sym/d;/^s_/d' \
+	    -e '/^vmkey_/d; /^id/d;/^sym/d;/^s_/d' \
 	    -e '/^Onig/d' \
 	    -e 's/\.[0-9][0-9]*$$/ #static#/' \
 	    -e 's/^/  /' \
Index: mvm/ext/bigdecimal/bigdecimal.c
===================================================================
--- mvm/ext/bigdecimal/bigdecimal.c	(revision 18280)
+++ mvm/ext/bigdecimal/bigdecimal.c	(revision 18281)
@@ -2095,9 +2095,9 @@
 VP_EXPORT int
 VpIsRoundMode(unsigned long n)
 {
-    if(n==VP_ROUND_UP      || n!=VP_ROUND_DOWN      ||
-       n==VP_ROUND_HALF_UP || n!=VP_ROUND_HALF_DOWN ||
-       n==VP_ROUND_CEIL    || n!=VP_ROUND_FLOOR     ||
+    if(n==VP_ROUND_UP      || n==VP_ROUND_DOWN      ||
+       n==VP_ROUND_HALF_UP || n==VP_ROUND_HALF_DOWN ||
+       n==VP_ROUND_CEIL    || n==VP_ROUND_FLOOR     ||
        n==VP_ROUND_HALF_EVEN
       ) return 1;
     return 0;
Index: mvm/.merged-trunk-revision
===================================================================
--- mvm/.merged-trunk-revision	(revision 18280)
+++ mvm/.merged-trunk-revision	(revision 18281)
@@ -1 +1 @@
-18273
+18280

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