From 2b1f8574c7fb97d6333c60ab312a93d260eedca3 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 11 Aug 2010 20:58:11 +0000 Subject: [PATCH] * include/ruby/encoding.h (rb_char_to_option_kcode): used in ripper. * node.h (rb_reserved_word): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ include/ruby/encoding.h | 2 ++ node.h | 11 +++++++++++ parse.y | 2 -- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91e99df0bac78b..6cd614f8b9a403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 12 05:58:09 2010 Nobuyoshi Nakada + + * include/ruby/encoding.h (rb_char_to_option_kcode): used in + ripper. + + * node.h (rb_reserved_word): ditto. + Thu Aug 12 00:19:53 2010 Tanaka Akira * test/ruby/test_rubyoptions.rb (test_script_from_stdin): disable diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 2527427b1b9af7..c2da285bd7c946 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -79,6 +79,8 @@ extern "C" { typedef OnigEncodingType rb_encoding; +int rb_char_to_option_kcode(int c, int *option, int *kcode); + int rb_enc_replicate(const char *, rb_encoding *); int rb_define_dummy_encoding(const char *); #define rb_enc_to_index(enc) ((enc) ? ENC_TO_ENCINDEX(enc) : 0) diff --git a/node.h b/node.h index f8cf7de7b29859..dbdb6785afcd57 100644 --- a/node.h +++ b/node.h @@ -448,9 +448,15 @@ typedef struct RNode { #define NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0) #define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0) +#if defined __GNUC__ && __GNUC__ >= 4 +#pragma GCC visibility push(default) +#endif + VALUE rb_parser_new(void); VALUE rb_parser_end_seen_p(VALUE); VALUE rb_parser_encoding(VALUE); +VALUE rb_parser_get_yydebug(VALUE); +VALUE rb_parser_set_yydebug(VALUE, VALUE); NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int); NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int); @@ -472,6 +478,11 @@ struct rb_global_entry *rb_global_entry(ID); VALUE rb_gvar_get(struct rb_global_entry *); 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); + +#if defined __GNUC__ && __GNUC__ >= 4 +#pragma GCC visibility pop +#endif #if defined(__cplusplus) #if 0 diff --git a/parse.y b/parse.y index 7ac471cf3cc653..2fd1451cadd823 100644 --- a/parse.y +++ b/parse.y @@ -5701,8 +5701,6 @@ parser_tokadd_escape(struct parser_params *parser, rb_encoding **encp) return 0; } -extern int rb_char_to_option_kcode(int c, int *option, int *kcode); - static int parser_regx_options(struct parser_params *parser) {