* dir.c (push_braces): do not push_braces() unless rbrace is found.

matz · matz · commit 750db27c6ff8 · 2003-05-19T16:20:30.000Z
(ruby-bugs-ja:PR#469)

* eval.c (rb_f_require): clear ruby_errinfo.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 20 00:45:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (push_braces): do not push_braces() unless rbrace is found.
+	  (ruby-bugs-ja:PR#469)
+
 Thu May 15 19:30:44 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* eval.c (rb_block_given_p): false if ruby_block is null.
@@ -24,6 +29,10 @@ Sun Mar 23 19:55:32 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.
 
+Thu Mar 20 10:11:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_require): clear ruby_errinfo.
+
 Wed Mar 19 23:05:30 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
 
 	* lib/tracer.rb (trace_func): save and recover Thread.critical state.
@@ -40,6 +49,7 @@ Fri Mar  7 00:30:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/Win32API/extconf.rb: no need to add gcc options.
 
+>>>>>>> 1.285.2.597
 Fri Feb 28 22:53:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* win32/win32.c (flock): maps error code.
@@ -13953,3 +13963,6 @@ Wed Aug 13 17:51:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* version 1.1 alpha0 released.
 
+Local variables:
+add-log-time-format: current-time-string
+end:
diff --git a/dir.c b/dir.c
@@ -783,7 +783,7 @@ push_braces(ary, s)
 	p++;
     }
 
-    if (lbrace) {
+    if (lbrace && rbrace) {
 	int len = strlen(s);
 	if (len >= MAXPATHLEN)
 	    buf = xmalloc(len + 1);
diff --git a/eval.c b/eval.c
@@ -5504,6 +5504,7 @@ rb_f_require(obj, fname)
 	SCOPE_SET(old_vmode);
     }
     if (state) JUMP_TAG(state);
+    ruby_errinfo = Qnil;
 
     return Qtrue;
 
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
@@ -1227,7 +1227,7 @@ def inspect
   def ==(other)
     case other
     when TkVariable
-      self.equal(self)
+      self.equal(other)
     when String
       self.to_s == other
     when Integer
diff --git a/sample/test.rb b/sample/test.rb
@@ -1,5 +1,6 @@
 #! /usr/bin/env ruby
 
+$KCODE = "none"
 $testnum=0
 $ntest=0
 $failed = 0

Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ push_braces(ary, s)`
`783`	`783`	`p++;`
`784`	`784`	`}`
`785`	`785`
`786`		`- if (lbrace) {`
	`786`	`+ if (lbrace && rbrace) {`
`787`	`787`	`int len = strlen(s);`
`788`	`788`	`if (len >= MAXPATHLEN)`
`789`	`789`	`buf = xmalloc(len + 1);`
Original file line number	Diff line number	Diff line change
`@@ -5504,6 +5504,7 @@ rb_f_require(obj, fname)`
`5504`	`5504`	`SCOPE_SET(old_vmode);`
`5505`	`5505`	`}`
`5506`	`5506`	`if (state) JUMP_TAG(state);`
	`5507`	`+ ruby_errinfo = Qnil;`
`5507`	`5508`
`5508`	`5509`	`return Qtrue;`
`5509`	`5510`