the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <stdio.h>
-
#ifdef emacs
-
#include <config.h>
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
#endif
+#include <stdio.h>
+
+#ifdef emacs
+
#include "lisp.h"
#include "charset.h"
#include "ccl.h"
is an index for Vccl_protram_table. */
Lisp_Object Qccl_program_idx;
-/* Vector of CCL program names vs corresponding program data. */
+/* Table of registered CCL programs. Each element is a vector of
+ NAME, CCL_PROG, and RESOLVEDP where NAME (symbol) is the name of
+ the program, CCL_PROG (vector) is the compiled code of the program,
+ RESOLVEDP (t or nil) is the flag to tell if symbols in CCL_PROG is
+ already resolved to index numbers or not. */
Lisp_Object Vccl_program_table;
/* CCL (Code Conversion Language) is a simple language which has
*/
#define CCL_Call 0x13 /* Call the CCL program whose ID is
- (CC..C).
- 1:CCCCCCCCCCCCCCCCCCCC000XXXXX
+ CC..C or cc..c.
+ 1:CCCCCCCCCCCCCCCCCCCCFFFXXXXX
+ [2:00000000cccccccccccccccccccc]
------------------------------
- call (CC..C)
+ if (FFF)
+ call (cc..c)
+ IC++;
+ else
+ call (CC..C)
*/
#define CCL_WriteConstString 0x14 /* Write a constant or a string:
At first, VAL0 is set to reg[rrr], and it is translated by the
first map to VAL1. Then, VAL1 is translated by the next map to
VAL2. This mapping is iterated until the last map is used. The
- result of the mapping is the last value of VAL?.
+ result of the mapping is the last value of VAL?. When the mapping
+ process reached to the end of the map set, it moves to the next
+ map set. If the next does not exit, the mapping process terminates,
+ and regard the last value as a result.
But, when VALm is mapped to VALn and VALn is not a number, the
mapping proceed as below:
In VALn is t, VALm is reverted to reg[rrr] and the mapping of VALm
proceed to the next map.
- If VALn is lambda, the whole mapping process terminates, and VALm
- is the result of this mapping.
+ If VALn is lambda, move to the next map set like reaching to the
+ end of the current map set.
+
+ If VALn is a symbol, call the CCL program refered by it.
+ Then, use reg[rrr] as a mapped value except for -1, -2 and -3.
+ Such special values are regarded as nil, t, and lambda respectively.
Each map is a Lisp vector of the following format (a) or (b):
(a)......[STARTPOINT VAL1 VAL2 ...]
N:SEPARATOR_z (< 0)
*/
-#define MAX_MAP_SET_LEVEL 20
+#define MAX_MAP_SET_LEVEL 30
typedef struct
{
static tr_stack mapping_stack[MAX_MAP_SET_LEVEL];
static tr_stack *mapping_stack_pointer;
-#define PUSH_MAPPING_STACK(restlen, orig) \
-{ \
- mapping_stack_pointer->rest_length = (restlen); \
- mapping_stack_pointer->orig_val = (orig); \
- mapping_stack_pointer++; \
-}
+/* If this variable is non-zero, it indicates the stack_idx
+ of immediately called by CCL_MapMultiple. */
+static int stack_idx_of_map_multiple = 0;
+
+#define PUSH_MAPPING_STACK(restlen, orig) \
+ do { \
+ mapping_stack_pointer->rest_length = (restlen); \
+ mapping_stack_pointer->orig_val = (orig); \
+ mapping_stack_pointer++; \
+ } while (0)
+
+#define POP_MAPPING_STACK(restlen, orig) \
+ do { \
+ mapping_stack_pointer--; \
+ (restlen) = mapping_stack_pointer->rest_length; \
+ (orig) = mapping_stack_pointer->orig_val; \
+ } while (0)
-#define POP_MAPPING_STACK(restlen, orig) \
-{ \
- mapping_stack_pointer--; \
- (restlen) = mapping_stack_pointer->rest_length; \
- (orig) = mapping_stack_pointer->orig_val; \
-} \
+#define CCL_CALL_FOR_MAP_INSTRUCTION(symbol, ret_ic) \
+ do { \
+ struct ccl_program called_ccl; \
+ if (stack_idx >= 256 \
+ || (setup_ccl_program (&called_ccl, (symbol)) != 0)) \
+ { \
+ if (stack_idx > 0) \
+ { \
+ ccl_prog = ccl_prog_stack_struct[0].ccl_prog; \
+ ic = ccl_prog_stack_struct[0].ic; \
+ } \
+ CCL_INVALID_CMD; \
+ } \
+ ccl_prog_stack_struct[stack_idx].ccl_prog = ccl_prog; \
+ ccl_prog_stack_struct[stack_idx].ic = (ret_ic); \
+ stack_idx++; \
+ ccl_prog = called_ccl.prog; \
+ ic = CCL_HEADER_MAIN; \
+ goto ccl_repeat; \
+ } while (0)
#define CCL_MapSingle 0x12 /* Map by single code conversion map
1:ExtendedCOMMNDXXXRRRrrrXXXXX
/* Encode one character CH to multibyte form and write to the current
output buffer. If CH is less than 256, CH is written as is. */
-#define CCL_WRITE_CHAR(ch) \
- do { \
- if (!dst) \
- CCL_INVALID_CMD; \
- else \
- { \
- unsigned char work[4], *str; \
- int len = CHAR_STRING (ch, work, str); \
- if (dst + len <= (dst_bytes ? dst_end : src)) \
- { \
- while (len--) *dst++ = *str++; \
- } \
- else \
- CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \
- } \
+#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) \
+ { \
+ *dst++ = (ch); \
+ if ((ch) >= 0x80 && (ch) < 0xA0) \
+ /* We may have to convert this eight-bit char to \
+ multibyte form later. */ \
+ dst_end--; \
+ } \
+ else \
+ dst += CHAR_STRING (ch, dst); \
+ } \
+ else \
+ CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \
} while (0)
/* Write a string at ccl_prog[IC] of length LEN to the current output
if (!src) \
CCL_INVALID_CMD; \
else if (src < src_end) \
- r = *src++; \
+ { \
+ r = *src++; \
+ if (r == LEADING_CODE_8_BIT_CONTROL \
+ && ccl->multibyte) \
+ r = *src++ - 0x20; \
+ } \
else if (ccl->last_block) \
{ \
ic = ccl->eof_ic; \
} while (0)
+/* Set C to the character code made from CHARSET and CODE. This is
+ like MAKE_CHAR but check the validity of CHARSET and CODE. If they
+ are not valid, set C to (CODE & 0xFF) because that is usually the
+ case that CCL_ReadMultibyteChar2 read an invalid code and it set
+ CODE to that invalid byte. */
+
+#define CCL_MAKE_CHAR(charset, code, c) \
+ do { \
+ if (charset == CHARSET_ASCII) \
+ c = code & 0xFF; \
+ else if (CHARSET_DEFINED_P (charset) \
+ && (code & 0x7F) >= 32 \
+ && (code < 256 || ((code >> 7) & 0x7F) >= 32)) \
+ { \
+ int c1 = code & 0x7F, c2 = 0; \
+ \
+ if (code >= 256) \
+ c2 = c1, c1 = (code >> 7) & 0x7F; \
+ c = MAKE_CHAR (charset, c1, c2); \
+ } \
+ else \
+ c = code & 0xFF; \
+ } while (0)
+
+
/* Execute CCL code on SRC_BYTES length text at SOURCE. The resulting
text goes to a place pointed by DESTINATION, the length of which
should not exceed DST_BYTES. The bytes actually processed is
if (ccl->buf_magnification ==0) /* We can't produce any bytes. */
dst = NULL;
+ /* Set mapping stack pointer. */
+ mapping_stack_pointer = mapping_stack;
+
#ifdef CCL_DEBUG
ccl_backtrace_idx = 0;
#endif
i = reg[RRR];
j = XINT (ccl_prog[ic]);
op = field1 >> 6;
- ic++;
+ jump_address = ic + 1;
goto ccl_set_expr;
case CCL_WriteRegister: /* CCCCCCCCCCCCCCCCCCCrrrXXXXX */
i = reg[RRR];
j = reg[Rrr];
op = field1 >> 6;
+ jump_address = ic;
goto ccl_set_expr;
- case CCL_Call: /* CCCCCCCCCCCCCCCCCCCC000XXXXX */
+ case CCL_Call: /* 1:CCCCCCCCCCCCCCCCCCCCFFFXXXXX */
{
Lisp_Object slot;
+ int prog_id;
+
+ /* If FFF is nonzero, the CCL program ID is in the
+ following code. */
+ if (rrr)
+ {
+ prog_id = XINT (ccl_prog[ic]);
+ ic++;
+ }
+ else
+ prog_id = field1;
if (stack_idx >= 256
- || field1 < 0
- || field1 >= XVECTOR (Vccl_program_table)->size
- || (slot = XVECTOR (Vccl_program_table)->contents[field1],
- !CONSP (slot))
- || !VECTORP (XCONS (slot)->cdr))
+ || prog_id < 0
+ || prog_id >= XVECTOR (Vccl_program_table)->size
+ || (slot = XVECTOR (Vccl_program_table)->contents[prog_id],
+ !VECTORP (slot))
+ || !VECTORP (XVECTOR (slot)->contents[1]))
{
if (stack_idx > 0)
{
ccl_prog_stack_struct[stack_idx].ccl_prog = ccl_prog;
ccl_prog_stack_struct[stack_idx].ic = ic;
stack_idx++;
- ccl_prog = XVECTOR (XCONS (slot)->cdr)->contents;
+ ccl_prog = XVECTOR (XVECTOR (slot)->contents[1])->contents;
ic = CCL_HEADER_MAIN;
}
break;
break;
case CCL_End: /* 0000000000000000000000XXXXX */
- if (stack_idx-- > 0)
+ if (stack_idx > 0)
{
+ stack_idx--;
ccl_prog = ccl_prog_stack_struct[stack_idx].ccl_prog;
ic = ccl_prog_stack_struct[stack_idx].ic;
break;
{
i = reg[rrr];
CCL_WRITE_CHAR (i);
+ ic = jump_address;
}
else if (!reg[rrr])
ic = jump_address;
}
i = *src++;
- if (i == LEADING_CODE_COMPOSITION)
- {
- if (src >= src_end)
- goto ccl_read_multibyte_character_suspend;
- if (*src == 0xFF)
- {
- ccl->private_state = COMPOSING_WITH_RULE_HEAD;
- src++;
- }
- else
- ccl->private_state = COMPOSING_NO_RULE_HEAD;
-
- continue;
- }
- if (ccl->private_state != COMPOSING_NO)
- {
- /* composite character */
- if (i < 0xA0)
- ccl->private_state = COMPOSING_NO;
- else
- {
- if (COMPOSING_WITH_RULE_RULE == ccl->private_state)
- {
- ccl->private_state = COMPOSING_WITH_RULE_HEAD;
- continue;
- }
- else if (COMPOSING_WITH_RULE_HEAD == ccl->private_state)
- ccl->private_state = COMPOSING_WITH_RULE_RULE;
-
- if (i == 0xA0)
- {
- if (src >= src_end)
- goto ccl_read_multibyte_character_suspend;
- i = *src++ & 0x7F;
- }
- else
- i -= 0x20;
- }
- }
-
if (i < 0x80)
{
/* ASCII */
reg[rrr] = ((i << 7) | (*src & 0x7F));
src++;
}
+ else if (i == LEADING_CODE_8_BIT_CONTROL)
+ {
+ if (src >= src_end)
+ goto ccl_read_multibyte_character_suspend;
+ reg[RRR] = CHARSET_8_BIT_CONTROL;
+ reg[rrr] = (*src++ - 0x20);
+ }
+ else if (i >= 0xA0)
+ {
+ reg[RRR] = CHARSET_8_BIT_GRAPHIC;
+ reg[rrr] = i;
+ }
else
{
/* INVALID CODE. Return a single byte character. */
case CCL_WriteMultibyteChar2:
i = reg[RRR]; /* charset */
- if (i == CHARSET_ASCII)
+ if (i == CHARSET_ASCII
+ || i == CHARSET_8_BIT_CONTROL
+ || i == CHARSET_8_BIT_GRAPHIC)
i = reg[rrr] & 0xFF;
- else if (i == CHARSET_COMPOSITION)
- i = MAKE_COMPOSITE_CHAR (reg[rrr]);
else if (CHARSET_DIMENSION (i) == 1)
i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
else if (i < MIN_CHARSET_PRIVATE_DIMENSION2)
break;
case CCL_TranslateCharacter:
- i = reg[RRR]; /* charset */
- if (i == CHARSET_ASCII)
- i = reg[rrr];
- else if (i == CHARSET_COMPOSITION)
- {
- reg[RRR] = -1;
- break;
- }
- else if (CHARSET_DIMENSION (i) == 1)
- i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
- else if (i < MIN_CHARSET_PRIVATE_DIMENSION2)
- i = ((i - 0x8F) << 14) | (reg[rrr] & 0x3FFF);
- else
- i = ((i - 0xE0) << 14) | (reg[rrr] & 0x3FFF);
-
+ CCL_MAKE_CHAR (reg[RRR], reg[rrr], i);
op = translate_char (GET_TRANSLATION_TABLE (reg[Rrr]),
i, -1, 0, 0);
SPLIT_CHAR (op, reg[RRR], i, j);
case CCL_TranslateCharacterConstTbl:
op = XINT (ccl_prog[ic]); /* table */
ic++;
- i = reg[RRR]; /* charset */
- if (i == CHARSET_ASCII)
- i = reg[rrr];
- else if (i == CHARSET_COMPOSITION)
- {
- reg[RRR] = -1;
- break;
- }
- else if (CHARSET_DIMENSION (i) == 1)
- i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
- else if (i < MIN_CHARSET_PRIVATE_DIMENSION2)
- i = ((i - 0x8F) << 14) | (reg[rrr] & 0x3FFF);
- else
- i = ((i - 0xE0) << 14) | (reg[rrr] & 0x3FFF);
-
+ CCL_MAKE_CHAR (reg[RRR], reg[rrr], i);
op = translate_char (GET_TRANSLATION_TABLE (op), i, -1, 0, 0);
SPLIT_CHAR (op, reg[RRR], i, j);
if (j != -1)
/* Check map varidity. */
if (!CONSP (map)) continue;
- map = XCONS(map)->cdr;
+ map = XCDR (map);
if (!VECTORP (map)) continue;
size = XVECTOR (map)->size;
if (size <= 1) continue;
}
else if (CONSP (content))
{
- attrib = XCONS (content)->car;
- value = XCONS (content)->cdr;
+ attrib = XCAR (content);
+ value = XCDR (content);
if (!NUMBERP (attrib) || !NUMBERP (value))
continue;
reg[RRR] = i;
reg[rrr] = XUINT (value);
break;
}
+ else if (SYMBOLP (content))
+ CCL_CALL_FOR_MAP_INSTRUCTION (content, fin_ic);
+ else
+ CCL_INVALID_CMD;
}
if (i == j)
reg[RRR] = -1;
Lisp_Object map, content, attrib, value;
int point, size, map_vector_size;
int map_set_rest_length, fin_ic;
+ int current_ic = this_ic;
+
+ /* inhibit recursive call on MapMultiple. */
+ if (stack_idx_of_map_multiple > 0)
+ {
+ if (stack_idx_of_map_multiple <= stack_idx)
+ {
+ stack_idx_of_map_multiple = 0;
+ mapping_stack_pointer = mapping_stack;
+ CCL_INVALID_CMD;
+ }
+ }
+ else
+ mapping_stack_pointer = mapping_stack;
+ stack_idx_of_map_multiple = 0;
map_set_rest_length =
XINT (ccl_prog[ic++]); /* number of maps and separators. */
fin_ic = ic + map_set_rest_length;
+ op = reg[rrr];
+
if ((map_set_rest_length > reg[RRR]) && (reg[RRR] >= 0))
{
ic += reg[RRR];
{
ic = fin_ic;
reg[RRR] = -1;
+ mapping_stack_pointer = mapping_stack;
break;
}
- mapping_stack_pointer = mapping_stack;
- op = reg[rrr];
- PUSH_MAPPING_STACK (0, op);
- reg[RRR] = -1;
- map_vector_size = XVECTOR (Vcode_conversion_map_vector)->size;
- for (;map_set_rest_length > 0;i++, map_set_rest_length--)
- {
- point = XINT(ccl_prog[ic++]);
- if (point < 0)
- {
- point = -point;
- if (mapping_stack_pointer
- >= &mapping_stack[MAX_MAP_SET_LEVEL])
- {
- CCL_INVALID_CMD;
- }
- PUSH_MAPPING_STACK (map_set_rest_length - point,
- reg[rrr]);
- map_set_rest_length = point + 1;
- reg[rrr] = op;
- continue;
- }
-
- if (point >= map_vector_size) continue;
- map = (XVECTOR (Vcode_conversion_map_vector)
- ->contents[point]);
-
- /* Check map varidity. */
- if (!CONSP (map)) continue;
- map = XCONS (map)->cdr;
- if (!VECTORP (map)) continue;
- size = XVECTOR (map)->size;
- if (size <= 1) continue;
- content = XVECTOR (map)->contents[0];
-
- /* check map type,
- [STARTPOINT VAL1 VAL2 ...] or
- [t ELEMENT STARTPOINT ENDPOINT] */
- if (NUMBERP (content))
- {
- point = XUINT (content);
- point = op - point + 1;
- if (!((point >= 1) && (point < size))) continue;
- content = XVECTOR (map)->contents[point];
- }
- else if (EQ (content, Qt))
- {
- if (size != 4) continue;
- if ((op >= XUINT (XVECTOR (map)->contents[2])) &&
- (op < XUINT (XVECTOR (map)->contents[3])))
- content = XVECTOR (map)->contents[1];
- else
- continue;
- }
- else
- continue;
+ if (mapping_stack_pointer <= (mapping_stack + 1))
+ {
+ /* Set up initial state. */
+ mapping_stack_pointer = mapping_stack;
+ PUSH_MAPPING_STACK (0, op);
+ reg[RRR] = -1;
+ }
+ else
+ {
+ /* Recover after calling other ccl program. */
+ int orig_op;
- if (NILP (content))
- continue;
- else if (NUMBERP (content))
+ POP_MAPPING_STACK (map_set_rest_length, orig_op);
+ POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
+ switch (op)
{
- op = XINT (content);
- reg[RRR] = i;
- i += map_set_rest_length;
- POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
- }
- else if (CONSP (content))
- {
- attrib = XCONS (content)->car;
- value = XCONS (content)->cdr;
- if (!NUMBERP (attrib) || !NUMBERP (value))
- continue;
- reg[RRR] = i;
- op = XUINT (value);
- i += map_set_rest_length;
- POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
- }
- else if (EQ (content, Qt))
- {
- reg[RRR] = i;
+ case -1:
+ /* Regard it as Qnil. */
+ op = orig_op;
+ i++;
+ ic++;
+ map_set_rest_length--;
+ break;
+ case -2:
+ /* Regard it as Qt. */
op = reg[rrr];
+ i++;
+ ic++;
+ map_set_rest_length--;
+ break;
+ case -3:
+ /* Regard it as Qlambda. */
+ op = orig_op;
+ i += map_set_rest_length;
+ ic += map_set_rest_length;
+ map_set_rest_length = 0;
+ break;
+ default:
+ /* Regard it as normal mapping. */
i += map_set_rest_length;
+ ic += map_set_rest_length;
POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
- }
- else if (EQ (content, Qlambda))
- {
break;
}
- else
- CCL_INVALID_CMD;
}
+ map_vector_size = XVECTOR (Vcode_conversion_map_vector)->size;
+
+ do {
+ for (;map_set_rest_length > 0;i++, ic++, map_set_rest_length--)
+ {
+ point = XINT(ccl_prog[ic]);
+ if (point < 0)
+ {
+ /* +1 is for including separator. */
+ point = -point + 1;
+ if (mapping_stack_pointer
+ >= &mapping_stack[MAX_MAP_SET_LEVEL])
+ CCL_INVALID_CMD;
+ PUSH_MAPPING_STACK (map_set_rest_length - point,
+ reg[rrr]);
+ map_set_rest_length = point;
+ reg[rrr] = op;
+ continue;
+ }
+
+ if (point >= map_vector_size) continue;
+ map = (XVECTOR (Vcode_conversion_map_vector)
+ ->contents[point]);
+
+ /* Check map varidity. */
+ if (!CONSP (map)) continue;
+ map = XCDR (map);
+ if (!VECTORP (map)) continue;
+ size = XVECTOR (map)->size;
+ if (size <= 1) continue;
+
+ content = XVECTOR (map)->contents[0];
+
+ /* check map type,
+ [STARTPOINT VAL1 VAL2 ...] or
+ [t ELEMENT STARTPOINT ENDPOINT] */
+ if (NUMBERP (content))
+ {
+ point = XUINT (content);
+ point = op - point + 1;
+ if (!((point >= 1) && (point < size))) continue;
+ content = XVECTOR (map)->contents[point];
+ }
+ else if (EQ (content, Qt))
+ {
+ if (size != 4) continue;
+ if ((op >= XUINT (XVECTOR (map)->contents[2])) &&
+ (op < XUINT (XVECTOR (map)->contents[3])))
+ content = XVECTOR (map)->contents[1];
+ else
+ continue;
+ }
+ else
+ continue;
+
+ if (NILP (content))
+ continue;
+
+ reg[RRR] = i;
+ if (NUMBERP (content))
+ {
+ op = XINT (content);
+ i += map_set_rest_length - 1;
+ ic += map_set_rest_length - 1;
+ POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
+ map_set_rest_length++;
+ }
+ else if (CONSP (content))
+ {
+ attrib = XCAR (content);
+ value = XCDR (content);
+ if (!NUMBERP (attrib) || !NUMBERP (value))
+ continue;
+ op = XUINT (value);
+ i += map_set_rest_length - 1;
+ ic += map_set_rest_length - 1;
+ POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
+ map_set_rest_length++;
+ }
+ else if (EQ (content, Qt))
+ {
+ op = reg[rrr];
+ }
+ else if (EQ (content, Qlambda))
+ {
+ i += map_set_rest_length;
+ ic += map_set_rest_length;
+ break;
+ }
+ else if (SYMBOLP (content))
+ {
+ if (mapping_stack_pointer
+ >= &mapping_stack[MAX_MAP_SET_LEVEL])
+ CCL_INVALID_CMD;
+ PUSH_MAPPING_STACK (map_set_rest_length, reg[rrr]);
+ PUSH_MAPPING_STACK (map_set_rest_length, op);
+ stack_idx_of_map_multiple = stack_idx + 1;
+ CCL_CALL_FOR_MAP_INSTRUCTION (content, current_ic);
+ }
+ else
+ CCL_INVALID_CMD;
+ }
+ if (mapping_stack_pointer <= (mapping_stack + 1))
+ break;
+ POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
+ i += map_set_rest_length;
+ ic += map_set_rest_length;
+ POP_MAPPING_STACK (map_set_rest_length, reg[rrr]);
+ } while (1);
+
ic = fin_ic;
}
reg[rrr] = op;
reg[RRR] = -1;
break;
}
- map = XCONS(map)->cdr;
+ map = XCDR (map);
if (!VECTORP (map))
{
reg[RRR] = -1;
reg[RRR] = -1;
else
{
+ reg[RRR] = 0;
content = XVECTOR (map)->contents[point];
if (NILP (content))
reg[RRR] = -1;
else if (NUMBERP (content))
reg[rrr] = XINT (content);
- else if (EQ (content, Qt))
- reg[RRR] = i;
+ else if (EQ (content, Qt));
else if (CONSP (content))
{
- attrib = XCONS (content)->car;
- value = XCONS (content)->cdr;
+ attrib = XCAR (content);
+ value = XCDR (content);
if (!NUMBERP (attrib) || !NUMBERP (value))
continue;
reg[rrr] = XUINT(value);
break;
}
+ else if (SYMBOLP (content))
+ CCL_CALL_FOR_MAP_INSTRUCTION (content, ic);
else
reg[RRR] = -1;
}
return (dst ? dst - destination : 0);
}
+/* Resolve symbols in the specified CCL code (Lisp vector). This
+ function converts symbols of code conversion maps and character
+ translation tables embeded in the CCL code into their ID numbers.
+
+ The return value is a vector (CCL itself or a new vector in which
+ all symbols are resolved), Qt if resolving of some symbol failed,
+ or nil if CCL contains invalid data. */
+
+static Lisp_Object
+resolve_symbol_ccl_program (ccl)
+ Lisp_Object ccl;
+{
+ int i, veclen, unresolved = 0;
+ Lisp_Object result, contents, val;
+
+ result = ccl;
+ veclen = XVECTOR (result)->size;
+
+ for (i = 0; i < veclen; i++)
+ {
+ contents = XVECTOR (result)->contents[i];
+ if (INTEGERP (contents))
+ continue;
+ else if (CONSP (contents)
+ && SYMBOLP (XCAR (contents))
+ && SYMBOLP (XCDR (contents)))
+ {
+ /* This is the new style for embedding symbols. The form is
+ (SYMBOL . PROPERTY). (get SYMBOL PROPERTY) should give
+ an index number. */
+
+ if (EQ (result, ccl))
+ result = Fcopy_sequence (ccl);
+
+ val = Fget (XCAR (contents), XCDR (contents));
+ if (NATNUMP (val))
+ XVECTOR (result)->contents[i] = val;
+ else
+ unresolved = 1;
+ continue;
+ }
+ else if (SYMBOLP (contents))
+ {
+ /* This is the old style for embedding symbols. This style
+ may lead to a bug if, for instance, a translation table
+ and a code conversion map have the same name. */
+ if (EQ (result, ccl))
+ result = Fcopy_sequence (ccl);
+
+ val = Fget (contents, Qtranslation_table_id);
+ if (NATNUMP (val))
+ XVECTOR (result)->contents[i] = val;
+ else
+ {
+ val = Fget (contents, Qcode_conversion_map_id);
+ if (NATNUMP (val))
+ XVECTOR (result)->contents[i] = val;
+ else
+ {
+ val = Fget (contents, Qccl_program_idx);
+ if (NATNUMP (val))
+ XVECTOR (result)->contents[i] = val;
+ else
+ unresolved = 1;
+ }
+ }
+ continue;
+ }
+ return Qnil;
+ }
+
+ return (unresolved ? Qt : result);
+}
+
+/* Return the compiled code (vector) of CCL program CCL_PROG.
+ CCL_PROG is a name (symbol) of the program or already compiled
+ code. If necessary, resolve symbols in the compiled code to index
+ numbers. If we failed to get the compiled code or to resolve
+ symbols, return Qnil. */
+
+static Lisp_Object
+ccl_get_compiled_code (ccl_prog)
+ Lisp_Object ccl_prog;
+{
+ Lisp_Object val, slot;
+
+ if (VECTORP (ccl_prog))
+ {
+ val = resolve_symbol_ccl_program (ccl_prog);
+ return (VECTORP (val) ? val : Qnil);
+ }
+ if (!SYMBOLP (ccl_prog))
+ return Qnil;
+
+ val = Fget (ccl_prog, Qccl_program_idx);
+ if (! NATNUMP (val)
+ || XINT (val) >= XVECTOR (Vccl_program_table)->size)
+ return Qnil;
+ slot = XVECTOR (Vccl_program_table)->contents[XINT (val)];
+ if (! VECTORP (slot)
+ || XVECTOR (slot)->size != 3
+ || ! VECTORP (XVECTOR (slot)->contents[1]))
+ return Qnil;
+ if (NILP (XVECTOR (slot)->contents[2]))
+ {
+ val = resolve_symbol_ccl_program (XVECTOR (slot)->contents[1]);
+ if (! VECTORP (val))
+ return Qnil;
+ XVECTOR (slot)->contents[1] = val;
+ XVECTOR (slot)->contents[2] = Qt;
+ }
+ return XVECTOR (slot)->contents[1];
+}
+
/* Setup fields of the structure pointed by CCL appropriately for the
- execution of compiled CCL code in VEC (vector of integer).
- If VEC is nil, we skip setting ups based on VEC. */
-void
-setup_ccl_program (ccl, vec)
+ execution of CCL program CCL_PROG. CCL_PROG is the name (symbol)
+ of the CCL program or the already compiled code (vector).
+ Return 0 if we succeed this setup, else return -1.
+
+ If CCL_PROG is nil, we just reset the structure pointed by CCL. */
+int
+setup_ccl_program (ccl, ccl_prog)
struct ccl_program *ccl;
- Lisp_Object vec;
+ Lisp_Object ccl_prog;
{
int i;
- if (VECTORP (vec))
+ if (! NILP (ccl_prog))
{
- struct Lisp_Vector *vp = XVECTOR (vec);
+ struct Lisp_Vector *vp;
+ ccl_prog = ccl_get_compiled_code (ccl_prog);
+ if (! VECTORP (ccl_prog))
+ return -1;
+ vp = XVECTOR (ccl_prog);
ccl->size = vp->size;
ccl->prog = vp->contents;
ccl->eof_ic = XINT (vp->contents[CCL_HEADER_EOF]);
ccl->private_state = 0;
ccl->status = 0;
ccl->stack_idx = 0;
+ ccl->eol_type = CODING_EOL_LF;
+ return 0;
}
-/* Resolve symbols in the specified CCL code (Lisp vector). This
- function converts symbols of code conversion maps and character
- translation tables embeded in the CCL code into their ID numbers. */
+#ifdef emacs
-Lisp_Object
-resolve_symbol_ccl_program (ccl)
- Lisp_Object ccl;
+DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
+ "Return t if OBJECT is a CCL program name or a compiled CCL program code.\n\
+See the documentation of `define-ccl-program' for the detail of CCL program.")
+ (object)
+ Lisp_Object object;
{
- int i, veclen;
- Lisp_Object result, contents, prop;
-
- result = ccl;
- veclen = XVECTOR (result)->size;
+ Lisp_Object val;
- /* Set CCL program's table ID */
- for (i = 0; i < veclen; i++)
+ if (VECTORP (object))
{
- contents = XVECTOR (result)->contents[i];
- if (SYMBOLP (contents))
- {
- if (EQ(result, ccl))
- result = Fcopy_sequence (ccl);
-
- prop = Fget (contents, Qtranslation_table_id);
- if (NUMBERP (prop))
- {
- XVECTOR (result)->contents[i] = prop;
- continue;
- }
- prop = Fget (contents, Qcode_conversion_map_id);
- if (NUMBERP (prop))
- {
- XVECTOR (result)->contents[i] = prop;
- continue;
- }
- prop = Fget (contents, Qccl_program_idx);
- if (NUMBERP (prop))
- {
- XVECTOR (result)->contents[i] = prop;
- continue;
- }
- }
+ val = resolve_symbol_ccl_program (object);
+ return (VECTORP (val) ? Qt : Qnil);
}
+ if (!SYMBOLP (object))
+ return Qnil;
- return result;
+ val = Fget (object, Qccl_program_idx);
+ return ((! NATNUMP (val)
+ || XINT (val) >= XVECTOR (Vccl_program_table)->size)
+ ? Qnil : Qt);
}
-
-#ifdef emacs
-
DEFUN ("ccl-execute", Fccl_execute, Sccl_execute, 2, 2, 0,
"Execute CCL-PROGRAM with registers initialized by REGISTERS.\n\
\n\
-CCL-PROGRAM is a symbol registered by register-ccl-program,\n\
+CCL-PROGRAM is a CCL program name (symbol)\n\
or a compiled code generated by `ccl-compile' (for backward compatibility,\n\
-in this case, the execution is slower).\n\
+in this case, the overhead of the execution is bigger than the former case).\n\
No I/O commands should appear in CCL-PROGRAM.\n\
\n\
REGISTERS is a vector of [R0 R1 ... R7] where RN is an initial value\n\
of Nth register.\n\
\n\
As side effect, each element of REGISTERS holds the value of\n\
- corresponding register after the execution.")
+ corresponding register after the execution.\n\
+\n\
+See the documentation of `define-ccl-program' for the detail of CCL program.")
(ccl_prog, reg)
Lisp_Object ccl_prog, reg;
{
struct ccl_program ccl;
int i;
- Lisp_Object ccl_id;
- if ((SYMBOLP (ccl_prog)) &&
- (!NILP (ccl_id = Fget (ccl_prog, Qccl_program_idx))))
- {
- ccl_prog = XVECTOR (Vccl_program_table)->contents[XUINT (ccl_id)];
- CHECK_LIST (ccl_prog, 0);
- ccl_prog = XCONS (ccl_prog)->cdr;
- CHECK_VECTOR (ccl_prog, 1);
- }
- else
- {
- CHECK_VECTOR (ccl_prog, 1);
- ccl_prog = resolve_symbol_ccl_program (ccl_prog);
- }
+ if (setup_ccl_program (&ccl, ccl_prog) < 0)
+ error ("Invalid CCL program");
- CHECK_VECTOR (reg, 2);
+ CHECK_VECTOR (reg, 1);
if (XVECTOR (reg)->size != 8)
- error ("Invalid length of vector REGISTERS");
+ error ("Length of vector REGISTERS is not 8");
- setup_ccl_program (&ccl, ccl_prog);
for (i = 0; i < 8; i++)
ccl.reg[i] = (INTEGERP (XVECTOR (reg)->contents[i])
? XINT (XVECTOR (reg)->contents[i])
It returns the contents of write buffer as a string,\n\
and as side effect, STATUS is updated.\n\
If the optional 5th arg UNIBYTE-P is non-nil, the returned string\n\
-is a unibyte string. By default it is a multibyte string.")
+is a unibyte string. By default it is a multibyte string.\n\
+\n\
+See the documentation of `define-ccl-program' for the detail of CCL program.")
(ccl_prog, status, str, contin, unibyte_p)
Lisp_Object ccl_prog, status, str, contin, unibyte_p;
{
int i, produced;
int outbufsize;
char *outbuf;
- struct gcpro gcpro1, gcpro2, gcpro3;
- Lisp_Object ccl_id;
+ struct gcpro gcpro1, gcpro2;
- if ((SYMBOLP (ccl_prog)) &&
- (!NILP (ccl_id = Fget (ccl_prog, Qccl_program_idx))))
- {
- ccl_prog = XVECTOR (Vccl_program_table)->contents[XUINT (ccl_id)];
- CHECK_LIST (ccl_prog, 0);
- ccl_prog = XCONS (ccl_prog)->cdr;
- CHECK_VECTOR (ccl_prog, 1);
- }
- else
- {
- CHECK_VECTOR (ccl_prog, 1);
- ccl_prog = resolve_symbol_ccl_program (ccl_prog);
- }
+ if (setup_ccl_program (&ccl, ccl_prog) < 0)
+ error ("Invalid CCL program");
CHECK_VECTOR (status, 1);
if (XVECTOR (status)->size != 9)
- error ("Invalid length of vector STATUS");
+ error ("Length of vector STATUS is not 9");
CHECK_STRING (str, 2);
- GCPRO3 (ccl_prog, status, str);
- setup_ccl_program (&ccl, ccl_prog);
+ GCPRO2 (status, str);
+
for (i = 0; i < 8; i++)
{
if (NILP (XVECTOR (status)->contents[i]))
}
outbufsize = STRING_BYTES (XSTRING (str)) * ccl.buf_magnification + 256;
outbuf = (char *) xmalloc (outbufsize);
- if (!outbuf)
- error ("Not enough memory");
ccl.last_block = NILP (contin);
+ ccl.multibyte = STRING_MULTIBYTE (str);
produced = ccl_driver (&ccl, XSTRING (str)->data, outbuf,
STRING_BYTES (XSTRING (str)), outbufsize, (int *)0);
for (i = 0; i < 8; i++)
val = make_string (outbuf, produced);
else
val = make_unibyte_string (outbuf, produced);
- free (outbuf);
+ xfree (outbuf);
QUIT;
if (ccl.status != CCL_STAT_SUCCESS
&& ccl.status != CCL_STAT_SUSPEND_BY_SRC
DEFUN ("register-ccl-program", Fregister_ccl_program, Sregister_ccl_program,
2, 2, 0,
- "Register CCL program PROGRAM of NAME in `ccl-program-table'.\n\
-PROGRAM should be a compiled code of CCL program, or nil.\n\
+ "Register CCL program CCL_PROG as NAME in `ccl-program-table'.\n\
+CCL_PROG should be a compiled CCL program (vector), or nil.\n\
+If it is nil, just reserve NAME as a CCL program name.\n\
Return index number of the registered CCL program.")
(name, ccl_prog)
Lisp_Object name, ccl_prog;
{
int len = XVECTOR (Vccl_program_table)->size;
- int i;
+ int idx;
+ Lisp_Object resolved;
CHECK_SYMBOL (name, 0);
+ resolved = Qnil;
if (!NILP (ccl_prog))
{
CHECK_VECTOR (ccl_prog, 1);
- ccl_prog = resolve_symbol_ccl_program (ccl_prog);
+ resolved = resolve_symbol_ccl_program (ccl_prog);
+ if (! NILP (resolved))
+ {
+ ccl_prog = resolved;
+ resolved = Qt;
+ }
}
-
- for (i = 0; i < len; i++)
+
+ for (idx = 0; idx < len; idx++)
{
- Lisp_Object slot = XVECTOR (Vccl_program_table)->contents[i];
+ Lisp_Object slot;
- if (!CONSP (slot))
+ slot = XVECTOR (Vccl_program_table)->contents[idx];
+ if (!VECTORP (slot))
+ /* This is the first unsed slot. Register NAME here. */
break;
- if (EQ (name, XCONS (slot)->car))
+ if (EQ (name, XVECTOR (slot)->contents[0]))
{
- XCONS (slot)->cdr = ccl_prog;
- return make_number (i);
+ /* Update this slot. */
+ XVECTOR (slot)->contents[1] = ccl_prog;
+ XVECTOR (slot)->contents[2] = resolved;
+ return make_number (idx);
}
}
- if (i == len)
+ if (idx == len)
{
- Lisp_Object new_table = Fmake_vector (make_number (len * 2), Qnil);
+ /* Extend the table. */
+ Lisp_Object new_table;
int j;
+ new_table = Fmake_vector (make_number (len * 2), Qnil);
for (j = 0; j < len; j++)
XVECTOR (new_table)->contents[j]
= XVECTOR (Vccl_program_table)->contents[j];
Vccl_program_table = new_table;
}
- XVECTOR (Vccl_program_table)->contents[i] = Fcons (name, ccl_prog);
- Fput (name, Qccl_program_idx, make_number (i));
- return make_number (i);
+ {
+ Lisp_Object elt;
+
+ elt = Fmake_vector (make_number (3), Qnil);
+ XVECTOR (elt)->contents[0] = name;
+ XVECTOR (elt)->contents[1] = ccl_prog;
+ XVECTOR (elt)->contents[2] = resolved;
+ XVECTOR (Vccl_program_table)->contents[idx] = elt;
+ }
+
+ Fput (name, Qccl_program_idx, make_number (idx));
+ return make_number (idx);
}
/* Register code conversion map.
if (!CONSP (slot))
break;
- if (EQ (symbol, XCONS (slot)->car))
+ if (EQ (symbol, XCAR (slot)))
{
index = make_number (i);
- XCONS (slot)->cdr = map;
+ XCDR (slot) = map;
Fput (symbol, Qcode_conversion_map, map);
Fput (symbol, Qcode_conversion_map_id, index);
return index;
If the font is single-byte font, the register R2 is not used.");
Vfont_ccl_encoder_alist = Qnil;
+ defsubr (&Sccl_program_p);
defsubr (&Sccl_execute);
defsubr (&Sccl_execute_on_string);
defsubr (&Sregister_ccl_program);
HCoop / bpt / emacs.git / blobdiff