Commit 39a68837 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(Fccl_execute_on_string): Add new arg UNIBYTE-P.

parent 93bcb785
......@@ -1519,7 +1519,7 @@ As side effect, each element of REGISTER holds the value of\n\
}
DEFUN ("ccl-execute-on-string", Fccl_execute_on_string, Sccl_execute_on_string,
3, 4, 0,
3, 5, 0,
"Execute CCL-PROGRAM with initial STATUS on STRING.\n\
CCL-PROGRAM is a compiled code generated by `ccl-compile'.\n\
Read buffer is set to STRING, and write buffer is allocated automatically.\n\
......@@ -1528,13 +1528,17 @@ STATUS is a vector of [R0 R1 ... R7 IC], where\n\
IC is the instruction counter specifying from where to start the program.\n\
If R0..R7 are nil, they are initialized to 0.\n\
If IC is nil, it is initialized to head of the CCL program.\n\
Returns the contents of write buffer as a string,\n\
and as side effect, STATUS is updated.\n\
If optional 4th arg CONTINUE is non-nil, keep IC on read operation\n\
\n\
If optional 4th arg CONTIN is non-nil, keep IC on read operation\n\
when read buffer is exausted, else, IC is always set to the end of\n\
CCL-PROGRAM on exit.")
(ccl_prog, status, str, contin)
Lisp_Object ccl_prog, status, str, contin;
CCL-PROGRAM on exit.
\n\
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.")
(ccl_prog, status, str, contin, unibyte_p)
Lisp_Object ccl_prog, status, str, contin, unibyte_p;
{
Lisp_Object val;
struct ccl_program ccl;
......@@ -1576,7 +1580,10 @@ CCL-PROGRAM on exit.")
XSETINT (XVECTOR (status)->contents[8], ccl.ic);
UNGCPRO;
val = make_string (outbuf, produced);
if (NILP (unibyte_p))
val = make_string (outbuf, produced);
else
val = make_unibyte_string (outbuf, produced);
free (outbuf);
QUIT;
if (ccl.status != CCL_STAT_SUCCESS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment