Mercurial > emacs
comparison src/coding.c @ 88876:af9012fdad56
(LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12,
LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
deleted. Callers changes to use
EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
(decode_coding_ccl): Add `const' to local variables.
(consume_chars): Likewise.
(Ffind_coding_systems_region_internal): Likewise.
(Fcheck_coding_systems_region): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 22 Jul 2002 06:39:58 +0000 |
| parents | 108e2535280d |
| children | 4548f224c603 |
comparison
equal
deleted
inserted
replaced
| 88875:1a232a6d79fc | 88876:af9012fdad56 |
|---|---|
| 1535 represents a composition rule. | 1535 represents a composition rule. |
| 1536 */ | 1536 */ |
| 1537 | 1537 |
| 1538 char emacs_mule_bytes[256]; | 1538 char emacs_mule_bytes[256]; |
| 1539 | 1539 |
| 1540 /* Leading-code followed by extended leading-code. */ | |
| 1541 #define LEADING_CODE_PRIVATE_11 0x9A /* for private DIMENSION1 of 1-column */ | |
| 1542 #define LEADING_CODE_PRIVATE_12 0x9B /* for private DIMENSION1 of 2-column */ | |
| 1543 #define LEADING_CODE_PRIVATE_21 0x9C /* for private DIMENSION2 of 1-column */ | |
| 1544 #define LEADING_CODE_PRIVATE_22 0x9D /* for private DIMENSION2 of 2-column */ | |
| 1545 | |
| 1546 | |
| 1547 int | 1540 int |
| 1548 emacs_mule_char (coding, src, nbytes, nchars) | 1541 emacs_mule_char (coding, src, nbytes, nchars) |
| 1549 struct coding_system *coding; | 1542 struct coding_system *coding; |
| 1550 unsigned char *src; | 1543 unsigned char *src; |
| 1551 int *nbytes, *nchars; | 1544 int *nbytes, *nchars; |
| 1567 ONE_MORE_BYTE (c); | 1560 ONE_MORE_BYTE (c); |
| 1568 code = c & 0x7F; | 1561 code = c & 0x7F; |
| 1569 break; | 1562 break; |
| 1570 | 1563 |
| 1571 case 3: | 1564 case 3: |
| 1572 if (c == LEADING_CODE_PRIVATE_11 | 1565 if (c == EMACS_MULE_LEADING_CODE_PRIVATE_11 |
| 1573 || c == LEADING_CODE_PRIVATE_12) | 1566 || c == EMACS_MULE_LEADING_CODE_PRIVATE_12) |
| 1574 { | 1567 { |
| 1575 ONE_MORE_BYTE (c); | 1568 ONE_MORE_BYTE (c); |
| 1576 if (! (charset = emacs_mule_charset[c])) | 1569 if (! (charset = emacs_mule_charset[c])) |
| 1577 goto invalid_code; | 1570 goto invalid_code; |
| 1578 ONE_MORE_BYTE (c); | 1571 ONE_MORE_BYTE (c); |
| 4100 | 4093 |
| 4101 static void | 4094 static void |
| 4102 decode_coding_ccl (coding) | 4095 decode_coding_ccl (coding) |
| 4103 struct coding_system *coding; | 4096 struct coding_system *coding; |
| 4104 { | 4097 { |
| 4105 unsigned char *src = coding->source + coding->consumed; | 4098 const unsigned char *src = coding->source + coding->consumed; |
| 4106 unsigned char *src_end = coding->source + coding->src_bytes; | 4099 unsigned char *src_end = coding->source + coding->src_bytes; |
| 4107 int *charbuf = coding->charbuf; | 4100 int *charbuf = coding->charbuf; |
| 4108 int *charbuf_end = charbuf + coding->charbuf_size; | 4101 int *charbuf_end = charbuf + coding->charbuf_size; |
| 4109 int consumed_chars = 0; | 4102 int consumed_chars = 0; |
| 4110 int multibytep = coding->src_multibyte; | 4103 int multibytep = coding->src_multibyte; |
| 4114 | 4107 |
| 4115 setup_ccl_program (&ccl, CODING_CCL_DECODER (coding)); | 4108 setup_ccl_program (&ccl, CODING_CCL_DECODER (coding)); |
| 4116 | 4109 |
| 4117 while (src < src_end) | 4110 while (src < src_end) |
| 4118 { | 4111 { |
| 4119 unsigned char *p = src; | 4112 const unsigned char *p = src; |
| 4120 int *source, *source_end; | 4113 int *source, *source_end; |
| 4121 int i = 0; | 4114 int i = 0; |
| 4122 | 4115 |
| 4123 if (multibytep) | 4116 if (multibytep) |
| 4124 while (i < 1024 && p < src_end) | 4117 while (i < 1024 && p < src_end) |
| 5617 struct coding_system *coding; | 5610 struct coding_system *coding; |
| 5618 { | 5611 { |
| 5619 int *buf = coding->charbuf; | 5612 int *buf = coding->charbuf; |
| 5620 /* -1 is to compensate for CRLF. */ | 5613 /* -1 is to compensate for CRLF. */ |
| 5621 int *buf_end = coding->charbuf + coding->charbuf_size - 1; | 5614 int *buf_end = coding->charbuf + coding->charbuf_size - 1; |
| 5622 unsigned char *src = coding->source + coding->consumed; | 5615 const unsigned char *src = coding->source + coding->consumed; |
| 5623 int pos = coding->src_pos + coding->consumed_char; | 5616 int pos = coding->src_pos + coding->consumed_char; |
| 5624 int end_pos = coding->src_pos + coding->src_chars; | 5617 int end_pos = coding->src_pos + coding->src_chars; |
| 5625 int multibytep = coding->src_multibyte; | 5618 int multibytep = coding->src_multibyte; |
| 5626 Lisp_Object eol_type; | 5619 Lisp_Object eol_type; |
| 5627 int c; | 5620 int c; |
| 6455 (start, end, exclude) | 6448 (start, end, exclude) |
| 6456 Lisp_Object start, end, exclude; | 6449 Lisp_Object start, end, exclude; |
| 6457 { | 6450 { |
| 6458 Lisp_Object coding_attrs_list, safe_codings; | 6451 Lisp_Object coding_attrs_list, safe_codings; |
| 6459 EMACS_INT start_byte, end_byte; | 6452 EMACS_INT start_byte, end_byte; |
| 6460 unsigned char *p, *pbeg, *pend; | 6453 const unsigned char *p, *pbeg, *pend; |
| 6461 int c; | 6454 int c; |
| 6462 Lisp_Object tail, elt; | 6455 Lisp_Object tail, elt; |
| 6463 | 6456 |
| 6464 if (STRINGP (start)) | 6457 if (STRINGP (start)) |
| 6465 { | 6458 { |
| 6585 Lisp_Object start, end, coding_system_list; | 6578 Lisp_Object start, end, coding_system_list; |
| 6586 { | 6579 { |
| 6587 Lisp_Object list; | 6580 Lisp_Object list; |
| 6588 EMACS_INT start_byte, end_byte; | 6581 EMACS_INT start_byte, end_byte; |
| 6589 int pos; | 6582 int pos; |
| 6590 unsigned char *p, *pbeg, *pend; | 6583 const unsigned char *p, *pbeg, *pend; |
| 6591 int c; | 6584 int c; |
| 6592 Lisp_Object tail, elt; | 6585 Lisp_Object tail, elt; |
| 6593 | 6586 |
| 6594 if (STRINGP (start)) | 6587 if (STRINGP (start)) |
| 6595 { | 6588 { |
| 7888 | 7881 |
| 7889 for (i = 0; i < 256; i++) | 7882 for (i = 0; i < 256; i++) |
| 7890 { | 7883 { |
| 7891 emacs_mule_bytes[i] = 1; | 7884 emacs_mule_bytes[i] = 1; |
| 7892 } | 7885 } |
| 7893 emacs_mule_bytes[LEADING_CODE_PRIVATE_11] = 3; | 7886 emacs_mule_bytes[EMACS_MULE_LEADING_CODE_PRIVATE_11] = 3; |
| 7894 emacs_mule_bytes[LEADING_CODE_PRIVATE_12] = 3; | 7887 emacs_mule_bytes[EMACS_MULE_LEADING_CODE_PRIVATE_12] = 3; |
| 7895 emacs_mule_bytes[LEADING_CODE_PRIVATE_21] = 4; | 7888 emacs_mule_bytes[EMACS_MULE_LEADING_CODE_PRIVATE_21] = 4; |
| 7896 emacs_mule_bytes[LEADING_CODE_PRIVATE_22] = 4; | 7889 emacs_mule_bytes[EMACS_MULE_LEADING_CODE_PRIVATE_22] = 4; |
| 7897 } | 7890 } |
| 7898 | 7891 |
| 7899 #ifdef emacs | 7892 #ifdef emacs |
| 7900 | 7893 |
| 7901 void | 7894 void |
