diff options
Diffstat (limited to 'sample')
-rw-r--r-- | sample/ruby-mode.el | 2 | ||||
-rw-r--r-- | sample/test.rb | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/sample/ruby-mode.el b/sample/ruby-mode.el index 7b9549612c..bfecb51214 100644 --- a/sample/ruby-mode.el +++ b/sample/ruby-mode.el @@ -319,7 +319,7 @@ The variable ruby-indent-level controls the amount of indentation. (setq nest (cdr nest)) (setq depth (1- depth))) (goto-char pnt)) - ((looking-at "def\\s *[^\n;]*\\(\\|$\\)") + ((looking-at "def\\s +[^(\n;]*") (if (or (bolp) (progn (forward-char -1) diff --git a/sample/test.rb b/sample/test.rb index 9f1a92a0eb..9bf6433b83 100644 --- a/sample/test.rb +++ b/sample/test.rb @@ -24,6 +24,24 @@ end # make sure conditional operators work +check "assignment" + +a=[]; a[0] ||= "bar"; +ok(a[0] == "bar") +h={}; h["foo"] ||= "bar"; +ok(h["foo"] == "bar") + +aa = 5 +aa ||= 25 +ok(aa == 5) +bb ||= 25 +ok(bb == 25) +cc &&=33 +ok(cc == nil) +cc = 5 +cc &&=44 +ok(cc == 44) + check "condition" $x = '0'; @@ -518,9 +536,6 @@ $good = true; for i in 4000..4096 n1 = 1 << i; if (n1**2-1) / (n1+1) != (n1-1) - p i - p (n1**2-1)/(n1+1) - p (n1-1) $good = false end end |