diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-14 04:20:59 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-14 04:20:59 +0000 |
commit | 3bf1afbdd8446faaa5e125dfcfb8741a4893e89e (patch) | |
tree | 057c0d10bab22feba4543fd8ad89cc8abe615888 | |
parent | 87da8f0a292798126a40dfc3f06a4a8f98aa9073 (diff) | |
download | ruby-3bf1afbdd8446faaa5e125dfcfb8741a4893e89e.tar.gz |
* include/ruby/intern.h (rb_make_backtrace, rb_make_exception):
used in ripper.
* node.h (rb_parser_{malloc,realloc,calloc,free}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | include/ruby/intern.h | 2 | ||||
-rw-r--r-- | node.h | 6 | ||||
-rw-r--r-- | parse.y | 10 |
4 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,10 @@ +Sat Aug 14 13:20:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/intern.h (rb_make_backtrace, rb_make_exception): + used in ripper. + + * node.h (rb_parser_{malloc,realloc,calloc,free}): ditto. + Fri Aug 13 22:48:39 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_truncate): Pathname#truncate translated diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 748df322b7..f6c77a99ad 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -855,6 +855,8 @@ VALUE rb_str_succ(VALUE); VALUE rb_time_succ(VALUE); void rb_frame_pop(void); int rb_frame_method_id_and_class(ID *idp, VALUE *klassp); +VALUE rb_make_backtrace(void); +VALUE rb_make_exception(int, VALUE*); #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility pop @@ -480,6 +480,12 @@ VALUE rb_gvar_set(struct rb_global_entry *, VALUE); VALUE rb_gvar_defined(struct rb_global_entry *); const struct kwtable *rb_reserved_word(const char *, unsigned int); +struct parser_params; +void *rb_parser_malloc(struct parser_params *, size_t); +void *rb_parser_realloc(struct parser_params *, void *, size_t); +void *rb_parser_calloc(struct parser_params *, size_t, size_t); +void rb_parser_free(struct parser_params *, void *); + #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility pop #endif @@ -272,13 +272,6 @@ struct parser_params { #define ENC_SINGLE(cr) ((cr)==ENC_CODERANGE_7BIT) #define TOK_INTERN(mb) rb_intern3(tok(), toklen(), parser->enc) -#ifdef YYMALLOC -void *rb_parser_malloc(struct parser_params *, size_t); -void *rb_parser_realloc(struct parser_params *, void *, size_t); -void *rb_parser_calloc(struct parser_params *, size_t, size_t); -void rb_parser_free(struct parser_params *, void *); -#endif - static int parser_yyerror(struct parser_params*, const char*); #define yyerror(msg) parser_yyerror(parser, msg) @@ -6211,9 +6204,6 @@ parser_set_encode(struct parser_params *parser, const char *name) VALUE excargs[3]; if (idx < 0) { - VALUE rb_make_backtrace(void); - VALUE rb_make_exception(int, VALUE*); - excargs[1] = rb_sprintf("unknown encoding name: %s", name); error: excargs[0] = rb_eArgError; |