projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(byte_table_same_value_p): Use `internal_equal' instead of `EQ'.
[chise/xemacs-chise.git-]
/
src
/
mule-ccl.c
diff --git
a/src/mule-ccl.c
b/src/mule-ccl.c
index
b09fd3b
..
68d123e
100644
(file)
--- a/
src/mule-ccl.c
+++ b/
src/mule-ccl.c
@@
-34,7
+34,7
@@
Boston, MA 02111-1307, USA. */
#include "lisp.h"
#include "buffer.h"
#include "lisp.h"
#include "buffer.h"
-#include "mule-charset.h"
+#include "character.h"
#include "mule-ccl.h"
#include "file-coding.h"
#include "mule-ccl.h"
#include "file-coding.h"
@@
-181,18
+181,18
@@
Lisp_Object Vccl_program_table;
#define CCL_WriteConstJump 0x08 /* Write constant and jump:
1:A--D--D--R--E--S--S-000XXXXX
#define CCL_WriteConstJump 0x08 /* Write constant and jump:
1:A--D--D--R--E--S--S-000XXXXX
- 2:CONST
+ 2:const
------------------------------
------------------------------
- write (CONST);
+ write (const);
IC += ADDRESS;
*/
#define CCL_WriteConstReadJump 0x09 /* Write constant, read, and jump:
1:A--D--D--R--E--S--S-rrrXXXXX
IC += ADDRESS;
*/
#define CCL_WriteConstReadJump 0x09 /* Write constant, read, and jump:
1:A--D--D--R--E--S--S-rrrXXXXX
- 2:CONST
+ 2:const
3:A--D--D--R--E--S--S-rrrYYYYY
-----------------------------
3:A--D--D--R--E--S--S-rrrYYYYY
-----------------------------
- write (CONST);
+ write (const);
IC += 2;
read (reg[rrr]);
IC += ADDRESS;
IC += 2;
read (reg[rrr]);
IC += ADDRESS;
@@
-422,7
+422,7
@@
Lisp_Object Vccl_program_table;
IC += 2;
*/
IC += 2;
*/
-#define CCL_Extention 0x1F /* Extended CCL code
+#define CCL_Extension 0x1F /* Extended CCL code
1:ExtendedCOMMNDRrrRRRrrrXXXXX
2:ARGUEMENT
3:...
1:ExtendedCOMMNDRrrRRRrrrXXXXX
2:ARGUEMENT
3:...
@@
-756,7
+756,7
@@
struct ccl_prog_stack
static struct ccl_prog_stack ccl_prog_stack_struct[256];
int
static struct ccl_prog_stack ccl_prog_stack_struct[256];
int
-ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
+ccl_driver (struct ccl_program *ccl, const unsigned char *source,
unsigned_char_dynarr *destination, int src_bytes,
int *consumed, int conversion_mode)
{
unsigned_char_dynarr *destination, int src_bytes,
int *consumed, int conversion_mode)
{
@@
-765,7
+765,7
@@
ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
int code = -1; /* init to illegal value, */
int field1, field2;
Lisp_Object *ccl_prog = ccl->prog;
int code = -1; /* init to illegal value, */
int field1, field2;
Lisp_Object *ccl_prog = ccl->prog;
- CONST unsigned char *src = source, *src_end = src + src_bytes;
+ const unsigned char *src = source, *src_end = src + src_bytes;
int jump_address = 0; /* shut up the compiler */
int i, j, op;
int stack_idx = ccl->stack_idx;
int jump_address = 0; /* shut up the compiler */
int i, j, op;
int stack_idx = ccl->stack_idx;
@@
-1124,9
+1124,10
@@
ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
ic = jump_address;
break;
ic = jump_address;
break;
- case CCL_Extention:
+ case CCL_Extension:
switch (EXCMD)
{
switch (EXCMD)
{
+#ifndef UTF2000
case CCL_ReadMultibyteChar2:
if (!src)
CCL_INVALID_CMD;
case CCL_ReadMultibyteChar2:
if (!src)
CCL_INVALID_CMD;
@@
-1240,7
+1241,9
@@
ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC);
break;
CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC);
break;
+#endif
+#ifndef UTF2000
case CCL_WriteMultibyteChar2:
i = reg[RRR]; /* charset */
if (i == LEADING_BYTE_ASCII)
case CCL_WriteMultibyteChar2:
i = reg[RRR]; /* charset */
if (i == LEADING_BYTE_ASCII)
@@
-1260,6
+1263,7
@@
ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
CCL_WRITE_CHAR (i);
break;
CCL_WRITE_CHAR (i);
break;
+#endif
#if 0
case CCL_TranslateCharacter:
#if 0
case CCL_TranslateCharacter:
@@
-1768,7
+1772,7
@@
As side effect, each element of REGISTER holds the value of
? XINT (XVECTOR_DATA (reg)[i])
: 0);
? XINT (XVECTOR_DATA (reg)[i])
: 0);
- ccl_driver (&ccl, (CONST unsigned char *)0, (unsigned_char_dynarr *)0,
+ ccl_driver (&ccl, (const unsigned char *)0, (unsigned_char_dynarr *)0,
0, (int *)0, CCL_MODE_ENCODING);
QUIT;
if (ccl.status != CCL_STAT_SUCCESS)
0, (int *)0, CCL_MODE_ENCODING);
QUIT;
if (ccl.status != CCL_STAT_SUCCESS)