mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
c0d3881e0e
* include/ruby/encoding.h (rb_econv_t): new field: flags. (rb_econv_binmode): declared. * io.c (io_unread): text mode hack removed. (NEED_NEWLINE_DECODER): defined. (NEED_NEWLINE_ENCODER): defined. (NEED_READCONV): defined. (NEED_WRITECONV): defined. (TEXTMODE_NEWLINE_ENCODER): defined for windows. (make_writeconv): setup converter with TEXTMODE_NEWLINE_ENCODER for text mode. (io_fwrite): use NEED_WRITECONV. character code conversion is disabled if fptr->writeconv_stateless is nil. (make_readconv): setup converter with ECONV_UNIVERSAL_NEWLINE_DECODER for text mode. (read_all): use NEED_READCONV. (appendline): use NEED_READCONV. (rb_io_getline_1): use NEED_READCONV. (io_getc): use NEED_READCONV. (rb_io_ungetc): use NEED_READCONV. (rb_io_binmode): OS-level text mode test removed. call rb_econv_binmode. (rb_io_binmode_m): call rb_io_binmode_m with write_io as well. (rb_io_flags_mode): return mode string including "t". (rb_io_mode_flags): detect "t" for text mode. (rb_sysopen): always specify O_BINARY. * transcode.c (rb_econv_open_by_transcoder_entries): initialize flags. (rb_econv_open): if source and destination encoding is both empty string, open newline converter. last_tc will be NULL in this case. (rb_econv_encoding_to_insert_output): last_tc may be NULL now. (rb_econv_string): ditto. (output_replacement_character): ditto. (transcode_loop): ditto. (econv_init): ditto. (econv_inspect): ditto. (rb_econv_binmode): new function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
94 lines
2 KiB
Text
94 lines
2 KiB
Text
#include "transcode_data.h"
|
|
|
|
<%
|
|
map_normalize = {}
|
|
map_normalize["{00-ff}"] = :func_so
|
|
%>
|
|
|
|
<%= transcode_generate_node(ActionMap.parse(map_normalize), "universal_newline") %>
|
|
|
|
static int
|
|
fun_so_universal_newline(rb_transcoding* t, const unsigned char* s, size_t l, unsigned char* o)
|
|
{
|
|
int len;
|
|
/*
|
|
t->stateful[0] == 0 : normal
|
|
t->stateful[0] == 1 : just after '\r'
|
|
*/
|
|
if (s[0] == '\n') {
|
|
if (t->stateful[0] == 0) {
|
|
o[0] = '\n';
|
|
len = 1;
|
|
}
|
|
else {
|
|
len = 0;
|
|
}
|
|
t->stateful[0] = 0;
|
|
}
|
|
else if (s[0] == '\r') {
|
|
o[0] = '\n';
|
|
len = 1;
|
|
t->stateful[0] = 1;
|
|
}
|
|
else {
|
|
o[0] = s[0];
|
|
len = 1;
|
|
t->stateful[0] = 0;
|
|
}
|
|
return len;
|
|
}
|
|
|
|
static const rb_transcoder
|
|
rb_universal_newline = {
|
|
"universal_newline", "", &universal_newline,
|
|
1, /* input_unit_length */
|
|
1, /* max_input */
|
|
1, /* max_output */
|
|
stateful_decoder, /* stateful_type */
|
|
NULL, NULL, NULL, fun_so_universal_newline
|
|
};
|
|
|
|
<%
|
|
map_crlf = {}
|
|
map_crlf["{00-09,0b-ff}"] = :nomap
|
|
map_crlf["0a"] = "0d0a"
|
|
%>
|
|
|
|
<%= transcode_generate_node(ActionMap.parse(map_crlf), "crlf_newline") %>
|
|
|
|
static const rb_transcoder
|
|
rb_crlf_newline = {
|
|
"", "crlf_newline", &crlf_newline,
|
|
1, /* input_unit_length */
|
|
1, /* max_input */
|
|
2, /* max_output */
|
|
stateless_converter, /* stateful_type */
|
|
NULL, NULL, NULL, NULL
|
|
};
|
|
|
|
<%
|
|
map_cr = {}
|
|
map_cr["{00-09,0b-ff}"] = :nomap
|
|
map_cr["0a"] = "0d"
|
|
%>
|
|
|
|
<%= transcode_generate_node(ActionMap.parse(map_cr), "cr_newline") %>
|
|
|
|
static const rb_transcoder
|
|
rb_cr_newline = {
|
|
"", "cr_newline", &cr_newline,
|
|
1, /* input_unit_length */
|
|
1, /* max_input */
|
|
1, /* max_output */
|
|
stateless_converter, /* stateful_type */
|
|
NULL, NULL, NULL, NULL
|
|
};
|
|
|
|
void
|
|
Init_newline(void)
|
|
{
|
|
rb_register_transcoder(&rb_universal_newline);
|
|
rb_register_transcoder(&rb_crlf_newline);
|
|
rb_register_transcoder(&rb_cr_newline);
|
|
}
|
|
|