diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-16 20:07:20 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-16 20:07:20 +0000 |
| commit | 3cd040b6ef9ddfd9373083498a7537436f7ed0bb (patch) | |
| tree | f0edbde7c7fb43658ef81f9232c87779a0031fd6 /include | |
| parent | b06a606278f48ff10ef6dfecb2f819f7caac8c19 (diff) | |
* encoding.c (rb_primary_encoding): added Encoding.primary_encoding.
* parse.y (rb_parser_encoding): added.
* ruby.c (proc_options): added -E and --encoding options.
* ruby.c (process_options): set primary encoding from command line
option if set, or source encoding.
* include/ruby/encoding.h (rb_enc_from_encoding,
rb_get_primary_encoding, rb_set_primary_encoding): prototypes.
* include/ruby/node.h (rb_parser_encoding): prototype.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/encoding.h | 3 | ||||
| -rw-r--r-- | include/ruby/node.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 6645a1e29d..08371cc141 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -99,5 +99,8 @@ int rb_enc_tolower(int c, rb_encoding *enc); ID rb_intern3(const char*, long, rb_encoding*); int rb_enc_symname_p(const char*, rb_encoding*); int rb_enc_str_coderange(VALUE); +VALUE rb_enc_from_encoding(rb_encoding *enc); +VALUE rb_get_primary_encoding(void); +void rb_set_primary_encoding(VALUE encoding); #endif /* RUBY_ENCODING_H */ diff --git a/include/ruby/node.h b/include/ruby/node.h index 51268061e0..eeea3cea99 100644 --- a/include/ruby/node.h +++ b/include/ruby/node.h @@ -481,6 +481,7 @@ typedef struct RNode { VALUE rb_parser_new(void); VALUE rb_parser_end_seen_p(VALUE); +VALUE rb_parser_encoding(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); |