Skip to content

Commit

Permalink
* include/ruby/encoding.h (rb_char_to_option_kcode): used in
Browse files Browse the repository at this point in the history
  ripper.

* node.h (rb_reserved_word): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Aug 11, 2010
1 parent 73f5b84 commit 2b1f857
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Thu Aug 12 05:58:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>

* 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 <akr@fsij.org>

* test/ruby/test_rubyoptions.rb (test_script_from_stdin): disable
Expand Down
2 changes: 2 additions & 0 deletions include/ruby/encoding.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 11 additions & 0 deletions node.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions parse.y
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 2b1f857

Please sign in to comment.