mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* io.c (rb_io_reopen): should clear allocated OpenFile. pointed
out by Guy Decoux. [ruby-core:03288] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz
parent
5a72ce5cfa
commit
ecf157699d
6 changed files with 159 additions and 186 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Tue Aug 17 17:20:59 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* io.c (rb_io_reopen): should clear allocated OpenFile. pointed
|
||||
out by Guy Decoux. [ruby-core:03288]
|
||||
|
||||
Tue Aug 17 01:36:32 2004 Dave Thomas <dave@pragprog.com>
|
||||
|
||||
* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
|
||||
|
|
|
|||
5
error.c
5
error.c
|
|
@ -353,10 +353,7 @@ exc_initialize(argc, argv, exc)
|
|||
{
|
||||
VALUE arg;
|
||||
|
||||
if (rb_scan_args(argc, argv, "01", &arg) == 1) {
|
||||
VALUE mesg = arg;
|
||||
StringValue(mesg); /* ensure mesg can be converted to String */
|
||||
}
|
||||
rb_scan_args(argc, argv, "01", &arg);
|
||||
rb_iv_set(exc, "mesg", arg);
|
||||
rb_iv_set(exc, "bt", Qnil);
|
||||
|
||||
|
|
|
|||
1
eval.c
1
eval.c
|
|
@ -4594,7 +4594,6 @@ break_jump(retval)
|
|||
VALUE retval;
|
||||
{
|
||||
struct tag *tt = prot_tag;
|
||||
int yield = Qfalse;
|
||||
|
||||
if (retval == Qundef) retval = Qnil;
|
||||
while (tt) {
|
||||
|
|
|
|||
2
io.c
2
io.c
|
|
@ -3155,6 +3155,7 @@ rb_io_reopen(argc, argv, file)
|
|||
fptr = RFILE(file)->fptr;
|
||||
if (!fptr) {
|
||||
fptr = RFILE(file)->fptr = ALLOC(OpenFile);
|
||||
MEMZERO(fptr, OpenFile, 1);
|
||||
}
|
||||
|
||||
if (!NIL_P(nmode)) {
|
||||
|
|
@ -3178,7 +3179,6 @@ rb_io_reopen(argc, argv, file)
|
|||
fclose(fptr->f2);
|
||||
fptr->f2 = 0;
|
||||
}
|
||||
|
||||
return file;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ Also ignores spaces after parenthesis when 'space."
|
|||
(make-variable-buffer-local 'comment-column)
|
||||
(setq comment-column ruby-comment-column)
|
||||
(make-variable-buffer-local 'comment-start-skip)
|
||||
(setq comment-start-skip "\\(^\\|\\s-\\);?#+ *")
|
||||
(setq comment-start-skip "#+ *")
|
||||
(setq indent-tabs-mode ruby-indent-tabs-mode)
|
||||
(make-local-variable 'parse-sexp-ignore-comments)
|
||||
(setq parse-sexp-ignore-comments t)
|
||||
|
|
@ -561,181 +561,156 @@ The variable ruby-indent-level controls the amount of indentation.
|
|||
(defun ruby-indent-size (pos nest)
|
||||
(+ pos (* (or nest 1) ruby-indent-level)))
|
||||
|
||||
(defconst ruby-assign-re "\\s *\\(&&\\|||\\|<<\\|>>\\|[-+*/%&|^]\\)?=\\s *")
|
||||
|
||||
(defun ruby-beginning-of-arg (start end)
|
||||
(save-restriction
|
||||
(narrow-to-region start (1+ end))
|
||||
(goto-char start)
|
||||
(let ((beg t) arg)
|
||||
(while
|
||||
(progn
|
||||
(skip-chars-forward " \t\n")
|
||||
(and (not (eobp))
|
||||
(= (ruby-forward-sexp) 0)))
|
||||
(skip-syntax-forward " ")
|
||||
(cond ((looking-at ",")
|
||||
(forward-char)
|
||||
(setq arg start beg t))
|
||||
((ruby-expr-beg) t)
|
||||
((looking-at "=>\\s *")
|
||||
(goto-char (match-end 0))
|
||||
(setq arg nil beg nil))
|
||||
((looking-at ruby-assign-re)
|
||||
(goto-char (match-end 0))
|
||||
(if beg (setq beg nil arg (point))))
|
||||
((looking-at ruby-operator-re)
|
||||
(goto-char (match-end 0))
|
||||
(if beg (setq beg nil arg (match-end 0))))
|
||||
((not (eq (char-syntax (char-after)) ?\())
|
||||
(setq start (point)))))
|
||||
(goto-char (or arg start)))))
|
||||
|
||||
(defun ruby-calculate-indent (&optional parse-start)
|
||||
(save-excursion
|
||||
(beginning-of-line)
|
||||
(let ((indent-point (point))
|
||||
(case-fold-search nil)
|
||||
state bol eol begin
|
||||
(paren (progn (skip-syntax-forward " ")
|
||||
(and (char-after) (matching-paren (char-after)))))
|
||||
(indent 0))
|
||||
(if parse-start
|
||||
(goto-char parse-start)
|
||||
(ruby-beginning-of-indent)
|
||||
(setq parse-start (point)))
|
||||
(back-to-indentation)
|
||||
(setq indent (current-column))
|
||||
(setq state (ruby-parse-region parse-start indent-point))
|
||||
(cond
|
||||
((nth 0 state) ; within string
|
||||
(setq indent nil)) ; do nothing
|
||||
((car (nth 1 state)) ; in paren
|
||||
(goto-char (setq begin (cdr (nth 1 state))))
|
||||
(let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
|
||||
(if deep
|
||||
(cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
|
||||
(skip-syntax-backward " ")
|
||||
(setq indent (1- (current-column))))
|
||||
((let ((s (ruby-parse-region (point) indent-point)))
|
||||
(and (nth 2 s) (> (nth 2 s) 0)
|
||||
(or (goto-char (cdr (nth 1 s))) t)))
|
||||
(forward-word -1)
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
|
||||
(t
|
||||
(setq indent (current-column))
|
||||
(cond ((eq deep 'space))
|
||||
(paren (setq indent (1- indent)))
|
||||
(t (setq indent (ruby-indent-size (1- indent) 1))))))
|
||||
(if (nth 3 state) (goto-char (nth 3 state))
|
||||
(goto-char parse-start) (back-to-indentation))
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state))))))
|
||||
((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
|
||||
(if (null (cdr (nth 1 state)))
|
||||
(error "invalid nest"))
|
||||
(goto-char (cdr (nth 1 state)))
|
||||
(forward-word -1) ; skip back a keyword
|
||||
(setq begin (point))
|
||||
(cond
|
||||
((looking-at "do\\>[^_]") ; iter block is a special case
|
||||
(case-fold-search nil)
|
||||
state bol eol begin op-end
|
||||
(paren (progn (skip-syntax-forward " ")
|
||||
(and (char-after) (matching-paren (char-after)))))
|
||||
(indent 0))
|
||||
(if parse-start
|
||||
(goto-char parse-start)
|
||||
(ruby-beginning-of-indent)
|
||||
(setq parse-start (point)))
|
||||
(back-to-indentation)
|
||||
(setq indent (current-column))
|
||||
(setq state (ruby-parse-region parse-start indent-point))
|
||||
(cond
|
||||
((nth 0 state) ; within string
|
||||
(setq indent nil)) ; do nothing
|
||||
((car (nth 1 state)) ; in paren
|
||||
(goto-char (setq begin (cdr (nth 1 state))))
|
||||
(let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
|
||||
(if deep
|
||||
(cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
|
||||
(skip-syntax-backward " ")
|
||||
(setq indent (1- (current-column))))
|
||||
((let ((s (ruby-parse-region (point) indent-point)))
|
||||
(and (nth 2 s) (> (nth 2 s) 0)
|
||||
(or (goto-char (cdr (nth 1 s))) t)))
|
||||
(forward-word -1)
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
|
||||
(t
|
||||
(setq indent (current-column))
|
||||
(cond ((eq deep 'space))
|
||||
(paren (setq indent (1- indent)))
|
||||
(t (setq indent (ruby-indent-size (1- indent) 1))))))
|
||||
(if (nth 3 state) (goto-char (nth 3 state))
|
||||
(goto-char parse-start) (back-to-indentation))
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
|
||||
(t
|
||||
(setq indent (+ (current-column) ruby-indent-level)))))
|
||||
|
||||
((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
|
||||
(when indent
|
||||
(goto-char indent-point)
|
||||
(end-of-line)
|
||||
(setq eol (point))
|
||||
(beginning-of-line)
|
||||
(cond
|
||||
((and (not (ruby-deep-indent-paren-p paren))
|
||||
(re-search-forward ruby-negative eol t))
|
||||
(and (not (eq ?_ (char-after (match-end 0))))
|
||||
(setq indent (- indent ruby-indent-level))))
|
||||
;;operator terminated lines
|
||||
((and
|
||||
(save-excursion
|
||||
(beginning-of-line)
|
||||
(not (bobp)))
|
||||
(or (ruby-deep-indent-paren-p t)
|
||||
(null (car (nth 1 state)))))
|
||||
;; goto beginning of non-empty no-comment line
|
||||
(let (end done)
|
||||
(while (not done)
|
||||
(skip-chars-backward " \t\n")
|
||||
(setq end (point))
|
||||
(beginning-of-line)
|
||||
(if (re-search-forward "^\\s *#" end t)
|
||||
(beginning-of-line)
|
||||
(setq done t))))
|
||||
(setq bol (point))
|
||||
(end-of-line)
|
||||
(skip-chars-backward " \t")
|
||||
(let (end (pos (point)))
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state))))))
|
||||
((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
|
||||
(if (null (cdr (nth 1 state)))
|
||||
(error "invalid nest"))
|
||||
(goto-char (cdr (nth 1 state)))
|
||||
(forward-word -1) ; skip back a keyword
|
||||
(setq begin (point))
|
||||
(cond
|
||||
((looking-at "do\\>[^_]") ; iter block is a special case
|
||||
(if (nth 3 state) (goto-char (nth 3 state))
|
||||
(goto-char parse-start) (back-to-indentation))
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
|
||||
(t
|
||||
(setq indent (+ (current-column) ruby-indent-level)))))
|
||||
|
||||
((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
|
||||
(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
|
||||
(when indent
|
||||
(goto-char indent-point)
|
||||
(end-of-line)
|
||||
(setq eol (point))
|
||||
(beginning-of-line)
|
||||
(cond
|
||||
((and (not (ruby-deep-indent-paren-p paren))
|
||||
(re-search-forward ruby-negative eol t))
|
||||
(and (not (eq ?_ (char-after (match-end 0))))
|
||||
(setq indent (- indent ruby-indent-level))))
|
||||
((and
|
||||
(save-excursion
|
||||
(beginning-of-line)
|
||||
(not (bobp)))
|
||||
(or (ruby-deep-indent-paren-p t)
|
||||
(null (car (nth 1 state)))))
|
||||
;; goto beginning of non-empty no-comment line
|
||||
(let (end done)
|
||||
(while (not done)
|
||||
(skip-chars-backward " \t\n")
|
||||
(setq end (point))
|
||||
(beginning-of-line)
|
||||
(while (and (re-search-forward "#" pos t)
|
||||
(setq end (1- (point)))
|
||||
(ruby-special-char-p end))
|
||||
(setq end nil))
|
||||
(goto-char (or end pos))
|
||||
(skip-chars-backward " \t")
|
||||
(and
|
||||
(setq state (ruby-parse-region parse-start (point)))
|
||||
(nth 0 state)
|
||||
(setq begin (cdr (nth 1 state)))
|
||||
(goto-char pos)))
|
||||
(or (bobp) (forward-char -1))
|
||||
(and
|
||||
(or (and (looking-at ruby-symbol-re)
|
||||
(skip-chars-backward ruby-symbol-chars)
|
||||
(looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>"))
|
||||
(not (eq (point) (nth 3 state)))
|
||||
(save-excursion
|
||||
(goto-char (match-end 0))
|
||||
(not (looking-at "[a-z_]"))))
|
||||
(and (looking-at ruby-operator-re)
|
||||
(not (ruby-special-char-p))
|
||||
(let ((c (char-after (point))))
|
||||
(and
|
||||
(or (not (eq ?, c))
|
||||
(null begin)
|
||||
(save-excursion
|
||||
(goto-char begin)
|
||||
(skip-chars-forward " \t")
|
||||
(not (or (eolp) (looking-at "#")
|
||||
(and (eq (car (nth 1 state)) ?{)
|
||||
(looking-at "|"))))))
|
||||
(or (not (eq ?/ c))
|
||||
(null (nth 0 (ruby-parse-region (or begin parse-start) (point)))))
|
||||
(or (not (eq ?| (char-after (point))))
|
||||
(save-excursion
|
||||
(or (eolp) (forward-char -1))
|
||||
(cond
|
||||
((search-backward "|" nil t)
|
||||
(skip-chars-backward " \t\n")
|
||||
(and (not (eolp))
|
||||
(progn
|
||||
(forward-char -1)
|
||||
(not (looking-at "{")))
|
||||
(progn
|
||||
(forward-word -1)
|
||||
(not (looking-at "do\\>[^_]")))))
|
||||
(t t))))))))
|
||||
(setq indent
|
||||
(cond
|
||||
((and
|
||||
(not (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>")))
|
||||
(eq (ruby-deep-indent-paren-p t) 'space)
|
||||
(not (bobp)))
|
||||
(ruby-beginning-of-arg (or begin parse-start) (point))
|
||||
(current-column))
|
||||
(t
|
||||
(+ indent ruby-indent-level))))))))
|
||||
indent)))
|
||||
(if (re-search-forward "^\\s *#" end t)
|
||||
(beginning-of-line)
|
||||
(setq done t))))
|
||||
(setq bol (point))
|
||||
(end-of-line)
|
||||
;; skip the comment at the end
|
||||
(skip-chars-backward " \t")
|
||||
(let (end (pos (point)))
|
||||
(beginning-of-line)
|
||||
(while (and (re-search-forward "#" pos t)
|
||||
(setq end (1- (point)))
|
||||
(or (ruby-special-char-p end)
|
||||
(and (setq state (ruby-parse-region parse-start end))
|
||||
(nth 0 state))))
|
||||
(setq end nil))
|
||||
(goto-char (or end pos))
|
||||
(skip-chars-backward " \t")
|
||||
(setq begin (if (nth 0 state) pos (cdr (nth 1 state))))
|
||||
(setq state (ruby-parse-region parse-start (point))))
|
||||
(or (bobp) (forward-char -1))
|
||||
(and
|
||||
(or (and (looking-at ruby-symbol-re)
|
||||
(skip-chars-backward ruby-symbol-chars)
|
||||
(looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>"))
|
||||
(not (eq (point) (nth 3 state)))
|
||||
(save-excursion
|
||||
(goto-char (match-end 0))
|
||||
(not (looking-at "[a-z_]"))))
|
||||
(and (looking-at ruby-operator-re)
|
||||
(not (ruby-special-char-p))
|
||||
;; operator at the end of line
|
||||
(let ((c (char-after (point))))
|
||||
(and
|
||||
;; (or (null begin)
|
||||
;; (save-excursion
|
||||
;; (goto-char begin)
|
||||
;; (skip-chars-forward " \t")
|
||||
;; (not (or (eolp) (looking-at "#")
|
||||
;; (and (eq (car (nth 1 state)) ?{)
|
||||
;; (looking-at "|"))))))
|
||||
(or (not (eq ?/ c))
|
||||
(null (nth 0 (ruby-parse-region (or begin parse-start) (point)))))
|
||||
(or (not (eq ?| (char-after (point))))
|
||||
(save-excursion
|
||||
(or (eolp) (forward-char -1))
|
||||
(cond
|
||||
((search-backward "|" nil t)
|
||||
(skip-chars-backward " \t\n")
|
||||
(and (not (eolp))
|
||||
(progn
|
||||
(forward-char -1)
|
||||
(not (looking-at "{")))
|
||||
(progn
|
||||
(forward-word -1)
|
||||
(not (looking-at "do\\>[^_]")))))
|
||||
(t t))))
|
||||
(not (eq ?, c))
|
||||
(setq op-end t)))))
|
||||
(setq indent
|
||||
(cond
|
||||
((and
|
||||
(null op-end)
|
||||
(not (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>")))
|
||||
(eq (ruby-deep-indent-paren-p t) 'space)
|
||||
(not (bobp)))
|
||||
(save-excursion
|
||||
(widen)
|
||||
(goto-char (or begin parse-start))
|
||||
(skip-syntax-forward " ")
|
||||
(current-column)))
|
||||
(t
|
||||
(+ indent ruby-indent-level))))))))
|
||||
indent)))
|
||||
|
||||
(defun ruby-electric-brace (arg)
|
||||
(interactive "P")
|
||||
|
|
@ -802,9 +777,9 @@ An end of a defun is found by moving forward from the beginning of one."
|
|||
((> start pos)
|
||||
(setq done t)))))
|
||||
(if done
|
||||
(progn
|
||||
(save-excursion
|
||||
(back-to-indentation)
|
||||
(if (looking-at (concat ("\\<\\(" ruby-block-mid-re "\\)\\>")))
|
||||
(if (looking-at (concat "\\<\\(" ruby-block-mid-re "\\)\\>"))
|
||||
(setq done nil))))))
|
||||
(back-to-indentation))
|
||||
|
||||
|
|
@ -832,7 +807,9 @@ An end of a defun is found by moving forward from the beginning of one."
|
|||
(skip-chars-forward ",.:;|&^~=!?\\+\\-\\*")
|
||||
(looking-at "\\s("))
|
||||
(goto-char (scan-sexps (point) 1)))
|
||||
((looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
|
||||
((and (looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
|
||||
(not (eq (char-before (point)) ?.))
|
||||
(not (eq (char-before (point)) ?:)))
|
||||
(ruby-end-of-block)
|
||||
(forward-word 1))
|
||||
((looking-at "\\(\\$\\|@@?\\)?\\sw")
|
||||
|
|
@ -1013,10 +990,6 @@ balanced expression is found."
|
|||
("\\(^\\|[=(,~?:;]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
|
||||
(4 (7 . ?/))
|
||||
(6 (7 . ?/)))
|
||||
;; %Q!...!
|
||||
("\\(^\\|[[ \t\n<+(,=]\\)%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\2\\)"
|
||||
(2 (7 . nil))
|
||||
(4 (7 . nil)))
|
||||
("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
|
||||
("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
|
||||
|
||||
|
|
@ -1098,7 +1071,6 @@ balanced expression is found."
|
|||
t)
|
||||
nil)))
|
||||
|
||||
|
||||
(defvar ruby-font-lock-keywords
|
||||
(list
|
||||
;; functions
|
||||
|
|
@ -1168,6 +1140,9 @@ balanced expression is found."
|
|||
0 font-lock-string-face t)
|
||||
`(,ruby-here-doc-beg-re
|
||||
0 font-lock-string-face t)
|
||||
;; general delimited string
|
||||
'("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
|
||||
(2 font-lock-string-face))
|
||||
;; constants
|
||||
'("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)"
|
||||
2 font-lock-type-face)
|
||||
|
|
|
|||
3
string.c
3
string.c
|
|
@ -1242,9 +1242,6 @@ static VALUE
|
|||
rb_str_match(x, y)
|
||||
VALUE x, y;
|
||||
{
|
||||
VALUE reg;
|
||||
long start;
|
||||
|
||||
switch (TYPE(y)) {
|
||||
case T_STRING:
|
||||
rb_raise(rb_eTypeError, "type mismatch: String given");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue