From d53d108238926b23c386d93a695e5f4bd3462a63 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 24 Apr 2002 04:54:16 +0000 Subject: * io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed. * io.c (rb_io_mode_modenum): ditto. * gc.c (rb_memerror): rename from mem_error, and exported. * gc.c (Init_GC): pre-allocate NoMemoryError instance. * object.c (convert_type): error message changed from "failed to convert" to "cannot convert", since it does not try to convert if an object does not respond to the converting method. * eval.c (block_pass): convert Method to Proc using rb_check_convert_type(). * object.c (rb_check_convert_type): always convert T_DATA * eval.c (rb_thread_cleanup): should not terminate main_thread by Fatal error. * regex.c (is_in_list): need to not exclude NUL and NEWLINE. * re.c (rb_reg_expr_str): wrong backslash escapement. * re.c (rb_reg_expr_str): do not escape embedded space characters. * marshal.c (w_object): T_DATA process patch from Joel VanderWerf . This is temporary hack; it remains undocumented, and it will be removed when marshaling is re-designed. * marshal.c (r_object): ditto. * numeric.c (num_step): Integer#step is moved to Numeric#step; Fixnum#step is merged into this method. * numeric.c (int_dotimes): Fixnum#times is merged. * numeric.c (int_upto): Fixnum#upto is merged. * numeric.c (int_downto): Fixnum#downto is merged. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'error.c') diff --git a/error.c b/error.c index 936079a65..65f4ec374 100644 --- a/error.c +++ b/error.c @@ -182,30 +182,30 @@ static struct types { int type; const char *name; } builtin_types[] = { - T_NIL, "nil", - T_OBJECT, "Object", - T_CLASS, "Class", - T_ICLASS, "iClass", /* internal use: mixed-in module holder */ - T_MODULE, "Module", - T_FLOAT, "Float", - T_STRING, "String", - T_REGEXP, "Regexp", - T_ARRAY, "Array", - T_FIXNUM, "Fixnum", - T_HASH, "Hash", - T_STRUCT, "Struct", - T_BIGNUM, "Bignum", - T_FILE, "File", - T_TRUE, "true", - T_FALSE, "false", - T_SYMBOL, "Symbol", /* :symbol */ - T_DATA, "Data", /* internal use: wrapped C pointers */ - T_MATCH, "MatchData", /* data of $~ */ - T_VARMAP, "Varmap", /* internal use: dynamic variables */ - T_SCOPE, "Scope", /* internal use: variable scope */ - T_NODE, "Node", /* internal use: syntax tree node */ - T_UNDEF, "undef", /* internal use: #undef; should not happen */ - -1, 0, + {T_NIL, "nil"}, + {T_OBJECT, "Object"}, + {T_CLASS, "Class"}, + {T_ICLASS, "iClass"}, /* internal use: mixed-in module holder */ + {T_MODULE, "Module"}, + {T_FLOAT, "Float"}, + {T_STRING, "String"}, + {T_REGEXP, "Regexp"}, + {T_ARRAY, "Array"}, + {T_FIXNUM, "Fixnum"}, + {T_HASH, "Hash"}, + {T_STRUCT, "Struct"}, + {T_BIGNUM, "Bignum"}, + {T_FILE, "File"}, + {T_TRUE, "true"}, + {T_FALSE, "false"}, + {T_SYMBOL, "Symbol"}, /* :symbol */ + {T_DATA, "Data"}, /* internal use: wrapped C pointers */ + {T_MATCH, "MatchData"}, /* data of $~ */ + {T_VARMAP, "Varmap"}, /* internal use: dynamic variables */ + {T_SCOPE, "Scope"}, /* internal use: variable scope */ + {T_NODE, "Node"}, /* internal use: syntax tree node */ + {T_UNDEF, "undef"}, /* internal use: #undef; should not happen */ + {-1, 0} }; void -- cgit