summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-catch/mrblib/catch.rb
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2021-02-06 13:28:47 +0900
committerKOBAYASHI Shuji <[email protected]>2021-02-06 13:28:47 +0900
commit1ea4c512450a79e979b2652764b35a28630f5570 (patch)
tree7af5932607dba8bb35a6ef62c01b28afb9e435c3 /mrbgems/mruby-catch/mrblib/catch.rb
parent4bf4650321c540a8abf31aa801afc0e8545571f6 (diff)
downloadmruby-1ea4c512450a79e979b2652764b35a28630f5570.tar.gz
mruby-1ea4c512450a79e979b2652764b35a28630f5570.zip
Make the argument of `Kernel#catch` optional as Ruby does
Also implement the following changes. * Add tests * Use `Object#equal?` to compare tags for Ruby compatibility * Use `attr_reader`
Diffstat (limited to 'mrbgems/mruby-catch/mrblib/catch.rb')
-rw-r--r--mrbgems/mruby-catch/mrblib/catch.rb15
1 files changed, 5 insertions, 10 deletions
diff --git a/mrbgems/mruby-catch/mrblib/catch.rb b/mrbgems/mruby-catch/mrblib/catch.rb
index f8dcb3e84..68b165c8d 100644
--- a/mrbgems/mruby-catch/mrblib/catch.rb
+++ b/mrbgems/mruby-catch/mrblib/catch.rb
@@ -1,22 +1,17 @@
class ThrowCatchJump < Exception
+ attr_reader :_tag, :_val
def initialize(tag, val)
- @tag = tag
- @val = val
+ @_tag = tag
+ @_val = val
super("uncaught throw #{tag.inspect}")
end
- def _tag
- @tag
- end
- def _val
- @val
- end
end
module Kernel
- def catch(tag, &block)
+ def catch(tag=Object.new, &block)
block.call(tag)
rescue ThrowCatchJump => e
- unless e._tag == tag
+ unless e._tag.equal?(tag)
raise e
end
return e._val