[Emacs-diffs] trunk r115010: * lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Lower priority of

[Dmitry Gutov]

------------------------------------------------------------
revno: 115010
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-11-07 03:58:12 +0200
message:
  * lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Lower priority of
  "." compared to "do".
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
  test/indent/ruby.rb            ruby.rb-20120424165921-h044139hbrd7snvw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-06 17:56:48 +0000
+++ b/lisp/ChangeLog    2013-11-07 01:58:12 +0000
@@ -1,3 +1,8 @@
+2013-11-07  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-smie-grammar): Lower priority of
+       "." compared to "do".
+
 2013-11-06  Glenn Morris  <address@hidden>
 
        * Makefile.in (setwins_almost, setwins_for_subdirs):

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-11-05 16:28:40 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-11-07 01:58:12 +0000
@@ -280,7 +280,7 @@
        (inst (exp) (inst "iuwu-mod" exp))
        (exp  (exp1) (exp "," exp) (exp "=" exp)
              (id " @ " exp)
-             (exp "." exp))
+             (exp "." id))
        (exp1 (exp2) (exp2 "?" exp1 ":" exp1))
        (exp2 ("def" insts "end")
              ("begin" insts-rescue-insts "end")

=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb       2013-11-04 11:04:50 +0000
+++ b/test/indent/ruby.rb       2013-11-07 01:58:12 +0000
@@ -238,12 +238,10 @@
   qux
 end
 
-# Examples below still fail with `ruby-use-smie' on:
-
 foo = [1, 2, 3].map do |i|
   i + 1
 end
 
-bar.foo do # "." is parent to "do"; it shouldn't be.
+bar.foo do
   bar
 end