[前][次][番号順一覧][スレッド一覧]

ruby-changes:14462

From: nobu <ko1@a...>
Date: Tue, 12 Jan 2010 12:50:04 +0900 (JST)
Subject: [ruby-changes:14462] Ruby:r26294 (trunk, ruby_1_8): * misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc

nobu	2010-01-12 12:49:42 +0900 (Tue, 12 Jan 2010)

  New Revision: 26294

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26294

  Log:
    * misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
      which ends with an underscore.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/misc/ruby-mode.el
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/misc/ruby-mode.el

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26293)
+++ ChangeLog	(revision 26294)
@@ -1,3 +1,8 @@
+Tue Jan 12 12:49:39 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
+	  which ends with an underscore.
+
 Tue Jan 12 09:58:03 2010  NAKAMURA Usaku  <usa@r...>
 
 	* hash.c: need to include errno.h for EINVAL.
Index: misc/ruby-mode.el
===================================================================
--- misc/ruby-mode.el	(revision 26293)
+++ misc/ruby-mode.el	(revision 26294)
@@ -121,13 +121,15 @@
                (match-string 6)))))
 
 (defun ruby-here-doc-beg-match ()
-  (let ((contents (regexp-quote (concat (match-string 2) (match-string 3)))))
+  (let ((contents (concat
+		   (regexp-quote (concat (match-string 2) (match-string 3)))
+		   (if (string= (match-string 3) "_") "\\B" "\\b"))))
     (concat "<<"
             (let ((match (match-string 1)))
               (if (and match (> (length match) 0))
                   (concat "\\(?:-\\([\"']?\\)\\|\\([\"']\\)" (match-string 1) "\\)"
-                          contents "\\b\\(\\1\\|\\2\\)")
-                (concat "-?\\([\"']\\|\\)" contents "\\b\\1"))))))
+                          contents "\\(\\1\\|\\2\\)")
+                (concat "-?\\([\"']\\|\\)" contents "\\1"))))))
 
 (defconst ruby-delimiter
   (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26293)
+++ ruby_1_8/ChangeLog	(revision 26294)
@@ -1,3 +1,8 @@
+Tue Jan 12 12:49:39 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
+	  which ends with an underscore.
+
 Mon Jan 11 13:30:35 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/webrick/accesslog.rb (WEBrick::AccessLog#format): fixed typo.
Index: ruby_1_8/misc/ruby-mode.el
===================================================================
--- ruby_1_8/misc/ruby-mode.el	(revision 26293)
+++ ruby_1_8/misc/ruby-mode.el	(revision 26294)
@@ -80,13 +80,15 @@
                (match-string 6)))))
 
 (defun ruby-here-doc-beg-match ()
-  (let ((contents (regexp-quote (concat (match-string 2) (match-string 3)))))
+  (let ((contents (concat
+		   (regexp-quote (concat (match-string 2) (match-string 3)))
+		   (if (string= (match-string 3) "_") "\\B" "\\b"))))
     (concat "<<"
             (let ((match (match-string 1)))
               (if (and match (> (length match) 0))
                   (concat "\\(?:-\\([\"']?\\)\\|\\([\"']\\)" (match-string 1) "\\)"
-                          contents "\\b\\(\\1\\|\\2\\)")
-                (concat "-?\\([\"']\\|\\)" contents "\\b\\1"))))))
+                          contents "\\(\\1\\|\\2\\)")
+                (concat "-?\\([\"']\\|\\)" contents "\\1"))))))
 
 (defconst ruby-delimiter
   (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 26293)
+++ ruby_1_8/version.h	(revision 26294)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-01-11"
+#define RUBY_RELEASE_DATE "2010-01-12"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100111
+#define RUBY_RELEASE_CODE 20100112
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]