* lisp/progmodes/ruby-mode.el: Fix recently added tests.

(ruby-smie-grammar): Add - and +.
(ruby-smie--redundant-do-p, ruby-smie--forward-id)
(ruby-smie--backward-id): New functions.
(ruby-smie--forward-token, ruby-smie--backward-token): Use them.
(ruby-smie-rules): Handle hanging do.  Get rid of hack, not needed
any more.
* test/indent/ruby.rb: Add a few more tests; adjust some indentation.

1 files changed, 18 insertions, 3 deletions

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index e40ef217e54..7c8de323bdb 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -99,6 +99,14 @@ if something == :==
   do_something
 end
 
+# Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html
+d = 4 + 5 +      # no '\' needed
+    6 + 7
+
+# Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html
+e = 8 + 9   \
+    + 10         # '\' needed
+
 begin
   foo
 ensure
@@ -109,20 +117,27 @@ end
 MSG = 'Separate every 3 digits in the integer portion of a number' +
       'with underscores(_).'
 
-# Examples below fail with SMIE.
+class C
+  def foo
+    self.end
+    D.new.class
+  end
+end
 
 a = foo(j, k) -
-  bar_tee
+    bar_tee
 
 while a < b do # "do" is optional
   foo
 end
 
 desc "foo foo" \
-  "bar bar"
+     "bar bar"
 
 foo.
   bar
 
+# FIXME: is this really valid Ruby?  Isn't the newline after "foo" treated as
+# an implicit semi-colon?
 foo
   .bar