mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Code Issues Releases Activity

(CCL_WRITE_CHAR): Don't handle EOL conversion here.

Browse Source 
(CCL_READ_CHAR): Handle EOL conversion here.
(ccl_driver) <CCL_ReadMultibyteChar2>: Likewise.
This commit is contained in:
Kenichi Handa 2000-12-22 00:06:52 +00:00
parent 3ad93d8dc4
commit 17312e44d7
1 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/ccl.c
View File

@ -701,22 +701,11 @@ static int stack_idx_of_map_multiple;
#define CCL_WRITE_CHAR(ch) \
do { \
int bytes = SINGLE_BYTE_CHAR_P (ch) ? 1: CHAR_BYTES (ch); \
if (ch == '\n' && ccl->eol_type == CODING_EOL_CRLF) \
bytes++; \
if (!dst) \
CCL_INVALID_CMD; \
else if (dst + bytes <= (dst_bytes ? dst_end : src)) \
{ \
if (ch == '\n') \
{ \
if (ccl->eol_type == CODING_EOL_CRLF) \
*dst++ = '\r', *dst++ = '\n'; \
else if (ccl->eol_type == CODING_EOL_CR) \
*dst++ = '\r'; \
else \
*dst++ = '\n'; \
} \
else if (bytes == 1) \
if (bytes == 1) \
{ \
*dst++ = (ch); \
if ((ch) >= 0x80 && (ch) < 0xA0) \
@ -746,24 +735,42 @@ static int stack_idx_of_map_multiple;
} while (0)
/* Read one byte from the current input buffer into Rth register. */
#define CCL_READ_CHAR(r) \
do { \
if (!src) \
CCL_INVALID_CMD; \
else if (src < src_end) \
{ \
r = *src++; \
if (r == LEADING_CODE_8_BIT_CONTROL \
&& ccl->multibyte) \
r = *src++ - 0x20; \
} \
else if (ccl->last_block) \
{ \
ic = ccl->eof_ic; \
goto ccl_repeat; \
} \
else \
CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC); \
#define CCL_READ_CHAR(r) \
do { \
if (!src) \
CCL_INVALID_CMD; \
else if (src < src_end) \
{ \
r = *src++; \
if (r == '\n' \
&& ccl->eol_type != CODING_EOL_LF) \
{ \
/* We are encoding. */ \
if (ccl->eol_type == CODING_EOL_CRLF) \
{ \
if (ccl->cr_consumed) \
ccl->cr_consumed = 0; \
else \
{ \
ccl->cr_consumed = 1; \
r = '\r'; \
src--; \
} \
} \
else \
r = '\r'; \
} \
if (r == LEADING_CODE_8_BIT_CONTROL \
&& ccl->multibyte) \
r = *src++ - 0x20; \
} \
else if (ccl->last_block) \
{ \
ic = ccl->eof_ic; \
goto ccl_repeat; \
} \
else \
CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC); \
} while (0)
@ -1209,7 +1216,26 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
}
i = *src++;
if (i < 0x80)
if (i == '\n' && ccl->eol_type != CODING_EOL_LF)
{
/* We are encoding. */
if (ccl->eol_type == CODING_EOL_CRLF)
{
if (ccl->cr_consumed)
ccl->cr_consumed = 0;
else
{
ccl->cr_consumed = 1;
i = '\r';
src--;
}
}
else
i = '\r';
reg[rrr] = i;
reg[RRR] = CHARSET_ASCII;
}
else if (i < 0x80)
{
/* ASCII */
reg[rrr] = i;