From d887a2fc45b9ccd27cb4c029c30f709f748a910c Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 19 Nov 2007 07:10:09 +0000
Subject: * parse.y (parser_yylex): should clear parser->tokp as well.  
 [ruby-dev:32250]

* parse.y: remove NEED_ASSOC that break test_parser_events.

* parse.y (parser_yylex): should not decrement line numbers at the
  end of file.

* file.c (rb_find_file_ext): search .rb files first through in the
  loadpath.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13966 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 file.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 903e74481..3127ecde6 100644
--- a/file.c
+++ b/file.c
@@ -4197,16 +4197,16 @@ rb_find_file_ext(VALUE *filep, const char *const *ext)
     if (!rb_load_path) return 0;
 
     Check_Type(rb_load_path, T_ARRAY);
-    for (i=0;i<RARRAY_LEN(rb_load_path);i++) {
-	VALUE str = RARRAY_PTR(rb_load_path)[i];
+    for (j=0; ext[j]; j++) {
+	fname = rb_str_dup(*filep);
+	rb_str_cat2(fname, ext[j]);
+	OBJ_FREEZE(fname);
+	for (i=0;i<RARRAY_LEN(rb_load_path);i++) {
+	    VALUE str = RARRAY_PTR(rb_load_path)[i];
 
-	FilePathValue(str);
-	if (RSTRING_LEN(str) == 0) continue;
-	path = RSTRING_PTR(str);
-	for (j=0; ext[j]; j++) {
-	    fname = rb_str_dup(*filep);
-	    rb_str_cat2(fname, ext[j]);
-	    OBJ_FREEZE(fname);
+	    FilePathValue(str);
+	    if (RSTRING_LEN(str) == 0) continue;
+	    path = RSTRING_PTR(str);
 	    found = dln_find_file(StringValueCStr(fname), path);
 	    if (found && file_load_ok(found)) {
 		*filep = rb_str_new2(found);
-- 
cgit