1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2010-08-14 04:20:59 +00:00
parent 87da8f0a29
commit 3bf1afbdd8
4 changed files with 15 additions and 10 deletions

View file

@ -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

View file

@ -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

6
node.h
View file

@ -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

10
parse.y
View file

@ -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;