From 210367ec889f5910e270d6ea2c7ddb8a8d939e61 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Jan 1999 04:59:39 +0000
Subject: This commit was generated by cvs2svn to compensate for changes in
 r372, which included commits to RCS files with non-trunk default branches.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/e2mmap.rb | 77 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 20 deletions(-)

(limited to 'lib/e2mmap.rb')

diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index d10657bbad..bf860dc5c1 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -1,11 +1,22 @@
 #
 #   e2mmap.rb - for ruby 1.1
-#   	$Release Version: 1.1$
-#   	$Revision: 1.4 $
-#   	$Date: 1997/08/18 07:12:12 $
+#   	$Release Version: 1.2$
+#   	$Revision: 1.8 $
+#   	$Date: 1998/08/19 15:22:22 $
 #   	by Keiju ISHITSUKA
 #
 # --
+#   Usage:
+#
+#   class Foo
+#     extend Exception2MassageMapper
+#     def_exception :NewExceptionClass, "message..."[, superclass]
+#     def_e2meggage ExistingExceptionClass, "message..."
+#     ...
+#   end
+#
+#   Foo.Fail NewExceptionClass, arg...
+#   Foo.Fail ExistingExceptionClass, arg...
 #
 #
 if VERSION < "1.1"
@@ -13,40 +24,60 @@ if VERSION < "1.1"
 else  
   
   module Exception2MessageMapper
-    RCS_ID='-$Header: /home/keiju/var/src/var.lib/ruby/RCS/e2mmap.rb,v 1.4 1997/08/18 07:12:12 keiju Exp keiju $-'
+    @RCS_ID='-$Id: e2mmap.rb,v 1.8 1998/08/19 15:22:22 keiju Exp keiju $-'
     
     E2MM = Exception2MessageMapper
-    
+
     def E2MM.extend_object(cl)
       super
       cl.bind(self)
     end
     
-    # 以前との互換性のために残してある.
+    # backward compatibility
     def E2MM.extend_to(b)
       c = eval("self", b)
       c.extend(self)
     end
     
-#    public :fail
-    #    alias e2mm_fail fail
+    #    public :fail
+    alias fail! fail
+
+    #def fail(err = nil, *rest)
+    #  super
+    #end
 
-    def fail(err = nil, *rest)
-      Exception2MessageMapper.fail Exception2MessageMapper::ErrNotRegisteredException, err.to_s
+    def Fail(err = nil, *rest)
+      Exception2MessageMapper.Fail Exception2MessageMapper::ErrNotRegisteredException, err.inspect
     end
     
     def bind(cl)
       self.module_eval %q^
-	E2MM_ErrorMSG = {}
+	E2MM_ErrorMSG = {} unless self.const_defined?(:E2MM_ErrorMSG)
 	# fail(err, *rest)
-	#	err:	例外
-	#	rest:	メッセージに渡すパラメータ
+	#	err:	Exception
+	#	rest:	Parameter accompanied with the exception
 	#
+	def self.Fail(err = nil, *rest)
+	  if form = E2MM_ErrorMSG[err]
+	    $! = err.new(sprintf(form, *rest))
+	    $@ = caller(0) if $@.nil?
+	    $@.shift
+	    # e2mm_fail()
+	    raise()
+#	  elsif self == Exception2MessageMapper
+#	    fail Exception2MessageMapper::ErrNotRegisteredException, err.to_s
+	  else
+#	    print "super\n"
+	    super
+	  end
+	end
+
+	# 過去の互換性のため
 	def self.fail(err = nil, *rest)
-	  $@ = caller(0) if $@.nil?
-	  $@.shift
 	  if form = E2MM_ErrorMSG[err]
 	    $! = err.new(sprintf(form, *rest))
+	    $@ = caller(0) if $@.nil?
+	    $@.shift
 	    # e2mm_fail()
 	    raise()
 #	  elsif self == Exception2MessageMapper
@@ -63,7 +94,6 @@ else
 	# def_exception(c, m)
 	#	    c:  exception
 	#	    m:  message_form
-	#	例外cのメッセージをmとする.
 	#
 	def self.def_e2message(c, m)
 	  E2MM_ErrorMSG[c] = m
@@ -72,13 +102,21 @@ else
 	# def_exception(c, m)
 	#	    n:  exception_name
 	#	    m:  message_form
-	#	    s:	例外スーパークラス(デフォルト: Exception)
-	#	例外名``c''をもつ例外を定義し, そのメッセージをmとする.
+	#	    s:	superclass_of_exception (default: Exception)
+	#	defines excaption named ``c'', whose message is ``m''.
 	#
 	#def def_exception(n, m)
-	def self.def_exception(n, m, s = Exception)
+	def self.def_exception(n, m, s = nil)
 	  n = n.id2name if n.kind_of?(Fixnum)
+	  unless s
+	    if defined?(StandardError)
+	      s = StandardError
+	    else
+	      s = Exception
+	    end
+	  end
 	  e = Class.new(s)
+
 	  const_set(n, e)
 	  E2MM_ErrorMSG[e] = m
 	  #	const_get(:E2MM_ErrorMSG)[e] = m
@@ -91,4 +129,3 @@ else
       def_exception(:ErrNotRegisteredException, "not registerd exception(%s)")
     end
 end
-
-- 
cgit v1.2.3