[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/ccl.c
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/ccl.c |
|
Date: |
Fri, 04 Apr 2003 01:23:48 -0500 |
Index: emacs/src/ccl.c
diff -c emacs/src/ccl.c:1.80 emacs/src/ccl.c:1.81
*** emacs/src/ccl.c:1.80 Wed Jul 17 10:39:54 2002
--- emacs/src/ccl.c Tue Feb 4 09:03:11 2003
***************
*** 426,432 ****
extended_command (rrr,RRR,Rrr,ARGS)
*/
! /*
Here after, Extended CCL Instructions.
Bit length of extended command is 14.
Therefore, the instruction code range is 0..16384(0x3fff).
--- 426,432 ----
extended_command (rrr,RRR,Rrr,ARGS)
*/
! /*
Here after, Extended CCL Instructions.
Bit length of extended command is 14.
Therefore, the instruction code range is 0..16384(0x3fff).
***************
*** 484,490 ****
3:MAP-ID1
4:MAP-ID2
...
! */
/* Map the code in reg[rrr] by MAPs starting from the Nth (N =
reg[RRR]) map.
--- 484,490 ----
3:MAP-ID1
4:MAP-ID2
...
! */
/* Map the code in reg[rrr] by MAPs starting from the Nth (N =
reg[RRR]) map.
***************
*** 562,568 ****
where
STARTPOINT is an offset to be used for indexing a map,
ENDPOINT is a maximum index number of a map,
! VAL and VALn is a number, nil, t, or lambda.
Valid index range of a map of type (a) is:
STARTPOINT <= index < STARTPOINT + map_size - 1
--- 562,568 ----
where
STARTPOINT is an offset to be used for indexing a map,
ENDPOINT is a maximum index number of a map,
! VAL and VALn is a number, nil, t, or lambda.
Valid index range of a map of type (a) is:
STARTPOINT <= index < STARTPOINT + map_size - 1
***************
*** 862,868 ****
int ic; /* Instruction Counter. */
};
! /* For the moment, we only support depth 256 of stack. */
static struct ccl_prog_stack ccl_prog_stack_struct[256];
int
--- 862,868 ----
int ic; /* Instruction Counter. */
};
! /* For the moment, we only support depth 256 of stack. */
static struct ccl_prog_stack ccl_prog_stack_struct[256];
int
***************
*** 1096,1102 ****
}
CCL_INVALID_CMD;
}
!
ccl_prog_stack_struct[stack_idx].ccl_prog = ccl_prog;
ccl_prog_stack_struct[stack_idx].ic = ic;
stack_idx++;
--- 1096,1102 ----
}
CCL_INVALID_CMD;
}
!
ccl_prog_stack_struct[stack_idx].ccl_prog = ccl_prog;
ccl_prog_stack_struct[stack_idx].ic = ic;
stack_idx++;
***************
*** 1260,1266 ****
src++;
goto ccl_read_multibyte_character_suspend;
}
!
if (!ccl->multibyte)
{
int bytes;
--- 1260,1266 ----
src++;
goto ccl_read_multibyte_character_suspend;
}
!
if (!ccl->multibyte)
{
int bytes;
***************
*** 1274,1280 ****
i = *src++;
if (i == '\n' && ccl->eol_type != CODING_EOL_LF)
{
! /* We are encoding. */
if (ccl->eol_type == CODING_EOL_CRLF)
{
if (ccl->cr_consumed)
--- 1274,1280 ----
i = *src++;
if (i == '\n' && ccl->eol_type != CODING_EOL_LF)
{
! /* We are encoding. */
if (ccl->eol_type == CODING_EOL_CRLF)
{
if (ccl->cr_consumed)
***************
*** 1399,1405 ****
SPLIT_CHAR (op, reg[RRR], i, j);
if (j != -1)
i = (i << 7) | j;
!
reg[rrr] = i;
break;
--- 1399,1405 ----
SPLIT_CHAR (op, reg[RRR], i, j);
if (j != -1)
i = (i << 7) | j;
!
reg[rrr] = i;
break;
***************
*** 1411,1424 ****
SPLIT_CHAR (op, reg[RRR], i, j);
if (j != -1)
i = (i << 7) | j;
!
reg[rrr] = i;
break;
case CCL_LookupIntConstTbl:
op = XINT (ccl_prog[ic]); /* table */
ic++;
! {
struct Lisp_Hash_Table *h = GET_HASH_TABLE (op);
op = hash_lookup (h, make_number (reg[RRR]), NULL);
--- 1411,1424 ----
SPLIT_CHAR (op, reg[RRR], i, j);
if (j != -1)
i = (i << 7) | j;
!
reg[rrr] = i;
break;
case CCL_LookupIntConstTbl:
op = XINT (ccl_prog[ic]); /* table */
ic++;
! {
struct Lisp_Hash_Table *h = GET_HASH_TABLE (op);
op = hash_lookup (h, make_number (reg[RRR]), NULL);
***************
*** 1443,1449 ****
op = XINT (ccl_prog[ic]); /* table */
ic++;
CCL_MAKE_CHAR (reg[RRR], reg[rrr], i);
! {
struct Lisp_Hash_Table *h = GET_HASH_TABLE (op);
op = hash_lookup (h, make_number (i), NULL);
--- 1443,1449 ----
op = XINT (ccl_prog[ic]); /* table */
ic++;
CCL_MAKE_CHAR (reg[RRR], reg[rrr], i);
! {
struct Lisp_Hash_Table *h = GET_HASH_TABLE (op);
op = hash_lookup (h, make_number (i), NULL);
***************
*** 1517,1523 ****
else
continue;
}
! else
continue;
if (NILP (content))
--- 1517,1523 ----
else
continue;
}
! else
continue;
if (NILP (content))
***************
*** 1553,1559 ****
ic = fin_ic;
}
break;
!
case CCL_MapMultiple:
{
Lisp_Object map, content, attrib, value;
--- 1553,1559 ----
ic = fin_ic;
}
break;
!
case CCL_MapMultiple:
{
Lisp_Object map, content, attrib, value;
***************
*** 1640,1646 ****
}
}
map_vector_size = ASIZE (Vcode_conversion_map_vector);
!
do {
for (;map_set_rest_length > 0;i++, ic++,
map_set_rest_length--)
{
--- 1640,1646 ----
}
}
map_vector_size = ASIZE (Vcode_conversion_map_vector);
!
do {
for (;map_set_rest_length > 0;i++, ic++,
map_set_rest_length--)
{
***************
*** 1690,1696 ****
else
continue;
}
! else
continue;
if (NILP (content))
--- 1690,1696 ----
else
continue;
}
! else
continue;
if (NILP (content))
***************
*** 1808,1814 ****
}
}
break;
!
default:
CCL_INVALID_CMD;
}
--- 1808,1814 ----
}
}
break;
!
default:
CCL_INVALID_CMD;
}
***************
*** 1881,1887 ****
bcopy (msg, dst, msglen);
dst += msglen;
}
!
if (ccl->status == CCL_STAT_INVALID_CMD)
{
#if 0 /* If the remaining bytes contain 0x80..0x9F, copying them
--- 1881,1887 ----
bcopy (msg, dst, msglen);
dst += msglen;
}
!
if (ccl->status == CCL_STAT_INVALID_CMD)
{
#if 0 /* If the remaining bytes contain 0x80..0x9F, copying them
***************
*** 2317,2323 ****
CHECK_SYMBOL (symbol);
CHECK_VECTOR (map);
!
for (i = 0; i < len; i++)
{
Lisp_Object slot = AREF (Vcode_conversion_map_vector, i);
--- 2317,2323 ----
CHECK_SYMBOL (symbol);
CHECK_VECTOR (map);
!
for (i = 0; i < len; i++)
{
Lisp_Object slot = AREF (Vcode_conversion_map_vector, i);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/ccl.c,
Miles Bader <=