1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for

Browse Source 
labels inside switch block.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-10-26 06:00:52 +00:00
parent 27b35eddd6
commit 32865ef821
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Oct 26 15:00:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for
labels inside switch block.
Fri Oct 26 05:48:57 UTC 2007 David Flanagan <davidflanagan@ruby-lang.org> Fri Oct 26 05:48:57 UTC 2007 David Flanagan <davidflanagan@ruby-lang.org>
* array.c: raise IndexError for negative length in rb_ary_fill * array.c: raise IndexError for negative length in rb_ary_fill

8
misc/ruby-style.el
View File

@ -20,18 +20,22 @@
(defun ruby-style-case-indent (x) (defun ruby-style-case-indent (x)
(save-excursion (save-excursion
(unless (progn (backward-up-list) (back-to-indentation)
(> (point) (cdr x)))
(goto-char (cdr x)) (goto-char (cdr x))
(if (looking-at "\\<case\\|default\\>") '*))) (if (looking-at "\\<case\\|default\\>") '*))))
(defun ruby-style-label-indent (x) (defun ruby-style-label-indent (x)
(save-excursion (save-excursion
(unless (progn (backward-up-list) (back-to-indentation)
(> (point) (cdr x)))
(goto-char (cdr x)) (goto-char (cdr x))
(condition-case () (condition-case ()
(progn (progn
(backward-up-list) (backward-up-list)
(backward-sexp 2) (backward-sexp 2)
(if (looking-at "\\<switch\\>") '/)) (if (looking-at "\\<switch\\>") '/))
(error)))) (error)))))
(require 'cc-styles) (require 'cc-styles)
(c-add-style (c-add-style

8
parse.y
View File

@ -5903,7 +5903,7 @@ parser_yylex(struct parser_params *parser)
return tOP_ASGN; return tOP_ASGN;
} }
pushback(c); pushback(c);
if (IS_ARG() && space_seen && !ISSPACE(c)){ if (IS_ARG() && space_seen && !ISSPACE(c)) {
rb_warning0("`*' interpreted as argument prefix"); rb_warning0("`*' interpreted as argument prefix");
c = tSTAR; c = tSTAR;
} }
@ -6084,8 +6084,8 @@ parser_yylex(struct parser_params *parser)
compile_error(PARSER_ARG "incomplete character syntax"); compile_error(PARSER_ARG "incomplete character syntax");
return 0; return 0;
} }
if (rb_enc_isspace(c, parser->enc)){ if (rb_enc_isspace(c, parser->enc)) {
if (!IS_ARG()){ if (!IS_ARG()) {
int c2 = 0; int c2 = 0;
switch (c) { switch (c) {
case ' ': case ' ':
@ -6156,7 +6156,7 @@ parser_yylex(struct parser_params *parser)
return tOP_ASGN; return tOP_ASGN;
} }
pushback(c); pushback(c);
if (IS_ARG() && space_seen && !ISSPACE(c)){ if (IS_ARG() && space_seen && !ISSPACE(c)) {
rb_warning0("`&' interpreted as argument prefix"); rb_warning0("`&' interpreted as argument prefix");
c = tAMPER; c = tAMPER;
} }