summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-01 06:01:51 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-01 06:01:51 +0000
commit859ed608bc3e7ea5726ec4ec8299deabf30a6164 (patch)
tree1193a0b92e7668389b5f045b3f538d9dc30fff79
parente198d0e5cb7e8db7d4dbd8a3047455b8b014a175 (diff)
* re.c (rb_reg_search): should set regs.allocated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c2
-rw-r--r--misc/inf-ruby.el7
-rw-r--r--re.c1
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d36a271bf..b3ce24a8c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ Thu Jan 31 20:45:33 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* lib/mkmf.rb (arg_config): avoid special variables for
font-lock-mode.
+Wed Jan 30 13:37:05 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (rb_reg_search): should set regs.allocated.
+
Mon Jan 28 18:33:18 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* parse.y (yylex): strict check for numbers.
diff --git a/eval.c b/eval.c
index ca7c936f75..95e743b81f 100644
--- a/eval.c
+++ b/eval.c
@@ -6784,7 +6784,7 @@ umethod_bind(method, recv)
method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
*bound = *data;
bound->recv = recv;
- bound->klass = CLASS_OF(recv);
+ bound->oklass = CLASS_OF(recv);
return method;
}
diff --git a/misc/inf-ruby.el b/misc/inf-ruby.el
index dab2d51743..188693554b 100644
--- a/misc/inf-ruby.el
+++ b/misc/inf-ruby.el
@@ -15,7 +15,7 @@
;;; for example :
;;;
;;; (autoload 'ruby-mode "ruby-mode"
-;;; "Mode for editing ruby source files")
+;;; "Mode for editing ruby source files" t)
;;; (setq auto-mode-alist
;;; (append '(("\\.rb$" . ruby-mode)) auto-mode-alist))
;;; (setq interpreter-mode-alist (append '(("ruby" . ruby-mode))
@@ -35,9 +35,12 @@
;;; HISTORY
;;; senda - 8 Apr 1998: Created.
;;; $Log$
+;;; Revision 1.3.2.1 2002/02/01 06:01:51 matz
+;;; * re.c (rb_reg_search): should set regs.allocated.
+;;;
;;; Revision 1.3 1999/12/01 09:24:18 matz
;;; 19991201
-;;;
+;;;
;;; Revision 1.2 1999/08/13 05:45:18 matz
;;; 1.4.0
;;;
diff --git a/re.c b/re.c
index 42ae86f401..5658f5db47 100644
--- a/re.c
+++ b/re.c
@@ -611,6 +611,7 @@ rb_reg_search(re, str, pos, reverse)
else {
range = RSTRING(str)->len - pos;
}
+ regs.allocated = 0;
result = re_search(RREGEXP(re)->ptr,RSTRING(str)->ptr,RSTRING(str)->len,
pos, range, &regs);