fix broken padding
This commit is contained in:
parent
e4bcc5e8a2
commit
0b982a72fe
@ -27,8 +27,6 @@
|
|||||||
|
|
||||||
#define LOCAL_newline LOCAL->newline_
|
#define LOCAL_newline LOCAL->newline_
|
||||||
#define REMOTE_newline(wid) REMOTE(wid)->newline_
|
#define REMOTE_newline(wid) REMOTE(wid)->newline_
|
||||||
#define LOCAL_FormatInfo LOCAL->FormatInfo_
|
|
||||||
#define REMOTE_FormatInfo(wid) REMOTE(wid)->FormatInfo_
|
|
||||||
#define LOCAL_AtPrompt LOCAL->AtPrompt_
|
#define LOCAL_AtPrompt LOCAL->AtPrompt_
|
||||||
#define REMOTE_AtPrompt(wid) REMOTE(wid)->AtPrompt_
|
#define REMOTE_AtPrompt(wid) REMOTE(wid)->AtPrompt_
|
||||||
#define LOCAL_Prompt LOCAL->Prompt_
|
#define LOCAL_Prompt LOCAL->Prompt_
|
||||||
|
@ -18,7 +18,6 @@ typedef struct worker_local {
|
|||||||
|
|
||||||
|
|
||||||
bool newline_;
|
bool newline_;
|
||||||
struct format_status* FormatInfo_;
|
|
||||||
Atom AtPrompt_;
|
Atom AtPrompt_;
|
||||||
char Prompt_[MAX_PROMPT+1];
|
char Prompt_[MAX_PROMPT+1];
|
||||||
encoding_t encoding_;
|
encoding_t encoding_;
|
||||||
|
@ -18,7 +18,6 @@ static void InitWorker(int wid) {
|
|||||||
|
|
||||||
|
|
||||||
REMOTE_newline(wid) = true;
|
REMOTE_newline(wid) = true;
|
||||||
REMOTE_FormatInfo(wid) = NULL;
|
|
||||||
REMOTE_AtPrompt(wid) = AtomNil;
|
REMOTE_AtPrompt(wid) = AtomNil;
|
||||||
|
|
||||||
REMOTE_encoding(wid) = Yap_DefaultEncoding();
|
REMOTE_encoding(wid) = Yap_DefaultEncoding();
|
||||||
|
@ -66,7 +66,6 @@ static void RestoreWorker(int wid USES_REGS) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
REMOTE_GlobalArena(wid) = TermToGlobalOrAtomAdjust(REMOTE_GlobalArena(wid));
|
REMOTE_GlobalArena(wid) = TermToGlobalOrAtomAdjust(REMOTE_GlobalArena(wid));
|
||||||
|
@ -20,8 +20,6 @@ bool within_print_message =false
|
|||||||
//
|
//
|
||||||
bool newline =true
|
bool newline =true
|
||||||
|
|
||||||
struct format_status* FormatInfo =NULL
|
|
||||||
|
|
||||||
Atom AtPrompt =AtomNil
|
Atom AtPrompt =AtomNil
|
||||||
char Prompt[MAX_PROMPT+1] void
|
char Prompt[MAX_PROMPT+1] void
|
||||||
|
|
||||||
|
185
os/format.c
185
os/format.c
@ -232,7 +232,6 @@ output is directed to the stream used by format/2.
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "Yap.h"
|
#include "Yap.h"
|
||||||
#include "Yatom.h"
|
#include "Yatom.h"
|
||||||
#include "YapHeap.h"
|
#include "YapHeap.h"
|
||||||
@ -261,7 +260,6 @@ output is directed to the stream used by format/2.
|
|||||||
#include "iopreds.h"
|
#include "iopreds.h"
|
||||||
#include "eval.h"
|
#include "eval.h"
|
||||||
|
|
||||||
|
|
||||||
#define FORMAT_MAX_SIZE 1024
|
#define FORMAT_MAX_SIZE 1024
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@ -277,9 +275,7 @@ typedef struct format_status {
|
|||||||
int padders;
|
int padders;
|
||||||
} format_info;
|
} format_info;
|
||||||
|
|
||||||
static int
|
static int fill(int sno, int n, wchar_t nch) {
|
||||||
fill(int sno, int n, wchar_t nch)
|
|
||||||
{
|
|
||||||
int (*f_putc)(int, wchar_t);
|
int (*f_putc)(int, wchar_t);
|
||||||
f_putc = GLOBAL_Stream[sno].stream_wputc;
|
f_putc = GLOBAL_Stream[sno].stream_wputc;
|
||||||
while (n--)
|
while (n--)
|
||||||
@ -287,9 +283,7 @@ fill(int sno, int n, wchar_t nch)
|
|||||||
return nch;
|
return nch;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int f_puts(int sno, char *s, int n) {
|
||||||
f_puts(int sno, char *s, int n)
|
|
||||||
{
|
|
||||||
int (*f_putc)(int, wchar_t);
|
int (*f_putc)(int, wchar_t);
|
||||||
f_putc = GLOBAL_Stream[sno].stream_wputc;
|
f_putc = GLOBAL_Stream[sno].stream_wputc;
|
||||||
while (n--)
|
while (n--)
|
||||||
@ -297,13 +291,12 @@ f_puts(int sno, char *s, int n)
|
|||||||
return *s;
|
return *s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// uses directly the buffer in the memory stream.
|
// uses directly the buffer in the memory stream.
|
||||||
static bool fill_pads(int sno, int nchars, format_info *fg USES_REGS)
|
static bool fill_pads(int sno, int nchars, format_info *fg USES_REGS) {
|
||||||
{
|
|
||||||
int nfillers, fill_space, lfill_space;
|
int nfillers, fill_space, lfill_space;
|
||||||
|
|
||||||
if (nchars < 0) nchars = 0; /* ignore */
|
if (nchars < 0)
|
||||||
|
nchars = 0; /* ignore */
|
||||||
nfillers = fg->padders;
|
nfillers = fg->padders;
|
||||||
if (fg->padders == 0) {
|
if (fg->padders == 0) {
|
||||||
return fill(sno, nchars, ' ');
|
return fill(sno, nchars, ' ');
|
||||||
@ -328,9 +321,8 @@ static bool fill_pads(int sno, int nchars, format_info *fg USES_REGS)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int format_print_str(Int sno, Int size, Int has_size, Term args,
|
||||||
format_print_str (Int sno, Int size, Int has_size, Term args, int (* f_putc)(int, wchar_t))
|
int (*f_putc)(int, wchar_t)) {
|
||||||
{
|
|
||||||
Term arghd;
|
Term arghd;
|
||||||
if (IsStringTerm(args)) {
|
if (IsStringTerm(args)) {
|
||||||
const unsigned char *pt = UStringOfTerm(args);
|
const unsigned char *pt = UStringOfTerm(args);
|
||||||
@ -346,8 +338,7 @@ format_print_str (Int sno, Int size, Int has_size, Term args, int (* f_putc)(int
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
} else if (args == TermNil) {
|
} else if (args == TermNil) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
} else if (!IsPairTerm(args)) {
|
||||||
else if (!IsPairTerm (args)) {
|
|
||||||
Yap_Error(TYPE_ERROR_LIST, args, "format/2");
|
Yap_Error(TYPE_ERROR_LIST, args, "format/2");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
@ -367,15 +358,9 @@ format_print_str (Int sno, Int size, Int has_size, Term args, int (* f_putc)(int
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef enum {
|
typedef enum { fst_ok, fst_error, fst_too_long } format_cp_res;
|
||||||
fst_ok,
|
|
||||||
fst_error,
|
|
||||||
fst_too_long
|
|
||||||
} format_cp_res;
|
|
||||||
|
|
||||||
static format_cp_res
|
static format_cp_res copy_format_string(Term inp, char *out, int max) {
|
||||||
copy_format_string(Term inp, char *out, int max)
|
|
||||||
{
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
while (inp != TermNil) {
|
while (inp != TermNil) {
|
||||||
Term hd;
|
Term hd;
|
||||||
@ -418,9 +403,7 @@ copy_format_string(Term inp, char *out, int max)
|
|||||||
#define FORMAT_COPY_ARGS_ERROR -1
|
#define FORMAT_COPY_ARGS_ERROR -1
|
||||||
#define FORMAT_COPY_ARGS_OVERFLOW -2
|
#define FORMAT_COPY_ARGS_OVERFLOW -2
|
||||||
|
|
||||||
static Int
|
static Int format_copy_args(Term args, Term *targs, Int tsz) {
|
||||||
format_copy_args(Term args, Term *targs, Int tsz)
|
|
||||||
{
|
|
||||||
Int n = 0;
|
Int n = 0;
|
||||||
while (args != TermNil) {
|
while (args != TermNil) {
|
||||||
if (IsVarTerm(args)) {
|
if (IsVarTerm(args)) {
|
||||||
@ -438,13 +421,11 @@ format_copy_args(Term args, Term *targs, Int tsz)
|
|||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
return n;
|
return n;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
||||||
format_clean_up( int sno, const char *fstr, const Term *targs)
|
format_clean_up(int sno, const char *fstr, const Term *targs) {
|
||||||
{
|
|
||||||
if (fstr) {
|
if (fstr) {
|
||||||
Yap_FreeAtomSpace((void *)fstr);
|
Yap_FreeAtomSpace((void *)fstr);
|
||||||
}
|
}
|
||||||
@ -452,9 +433,7 @@ format_clean_up( int sno, const char *fstr, const Term *targs)
|
|||||||
Yap_FreeAtomSpace((void *)targs);
|
Yap_FreeAtomSpace((void *)targs);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Int
|
static Int fetch_index_from_args(Term t) {
|
||||||
fetch_index_from_args(Term t)
|
|
||||||
{
|
|
||||||
Int i;
|
Int i;
|
||||||
|
|
||||||
if (IsVarTerm(t))
|
if (IsVarTerm(t))
|
||||||
@ -467,10 +446,7 @@ fetch_index_from_args(Term t)
|
|||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static wchar_t base_dig(Int dig, Int ch) {
|
||||||
static wchar_t
|
|
||||||
base_dig(Int dig, Int ch)
|
|
||||||
{
|
|
||||||
if (dig < 10)
|
if (dig < 10)
|
||||||
return dig + '0';
|
return dig + '0';
|
||||||
else if (ch == 'r')
|
else if (ch == 'r')
|
||||||
@ -481,9 +457,8 @@ base_dig(Int dig, Int ch)
|
|||||||
|
|
||||||
#define TMP_STRING_SIZE 1024
|
#define TMP_STRING_SIZE 1024
|
||||||
|
|
||||||
static Int
|
static Int doformat(volatile Term otail, volatile Term oargs,
|
||||||
doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
int sno USES_REGS) {
|
||||||
{
|
|
||||||
char tmp1[TMP_STRING_SIZE], *tmpbase;
|
char tmp1[TMP_STRING_SIZE], *tmpbase;
|
||||||
int ch;
|
int ch;
|
||||||
Term mytargs[8], *targs;
|
Term mytargs[8], *targs;
|
||||||
@ -497,12 +472,10 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
volatile void *old_handler;
|
volatile void *old_handler;
|
||||||
volatile int old_pos;
|
volatile int old_pos;
|
||||||
format_info finfo;
|
format_info finfo;
|
||||||
unsigned char *bufp;
|
unsigned char *bufp = NULL;
|
||||||
Term fmod = CurrentModule;
|
Term fmod = CurrentModule;
|
||||||
size_t sz;
|
size_t sz;
|
||||||
|
|
||||||
|
|
||||||
LOCAL_FormatInfo = &finfo;
|
|
||||||
finfo.padders = 0;
|
finfo.padders = 0;
|
||||||
finfo.format_error = FALSE;
|
finfo.format_error = FALSE;
|
||||||
if (GLOBAL_Stream[sno].status & InMemory_Stream_f) {
|
if (GLOBAL_Stream[sno].status & InMemory_Stream_f) {
|
||||||
@ -538,11 +511,11 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
format_cp_res fr;
|
format_cp_res fr;
|
||||||
char *fstr0;
|
char *fstr0;
|
||||||
|
|
||||||
|
|
||||||
fstr = fptr = fstr0 = Yap_AllocAtomSpace(sz * sizeof(char));
|
fstr = fptr = fstr0 = Yap_AllocAtomSpace(sz * sizeof(char));
|
||||||
if ((fr = copy_format_string(tail, fstr0, sz)) == fst_ok)
|
if ((fr = copy_format_string(tail, fstr0, sz)) == fst_ok)
|
||||||
break;
|
break;
|
||||||
if (fr == fst_error) return FALSE;
|
if (fr == fst_error)
|
||||||
|
return FALSE;
|
||||||
sz += 256;
|
sz += 256;
|
||||||
Yap_FreeCodeSpace(fstr0);
|
Yap_FreeCodeSpace(fstr0);
|
||||||
} while (TRUE);
|
} while (TRUE);
|
||||||
@ -600,7 +573,7 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
tnum = 0;
|
tnum = 0;
|
||||||
targs = mytargs;
|
targs = mytargs;
|
||||||
}
|
}
|
||||||
finfo.format_error = FALSE;
|
finfo.format_error = false;
|
||||||
|
|
||||||
f_putc = GLOBAL_Stream[sno].stream_wputc;
|
f_putc = GLOBAL_Stream[sno].stream_wputc;
|
||||||
while ((ch = *fptr++)) {
|
while ((ch = *fptr++)) {
|
||||||
@ -647,10 +620,8 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
// stream is already locked.
|
// stream is already locked.
|
||||||
Yap_plwrite(t, GLOBAL_Stream + sno, 0, Handle_vars_f | To_heap_f, 1200);
|
Yap_plwrite(t, GLOBAL_Stream + sno, 0, Handle_vars_f | To_heap_f, 1200);
|
||||||
Yap_CloseSlots(sl);
|
Yap_CloseSlots(sl);
|
||||||
LOCAL_FormatInfo = &finfo;
|
|
||||||
break;
|
break;
|
||||||
case 'c':
|
case 'c': {
|
||||||
{
|
|
||||||
Int nch, i;
|
Int nch, i;
|
||||||
|
|
||||||
if (targ > tnum - 1)
|
if (targ > tnum - 1)
|
||||||
@ -673,8 +644,7 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
case 'E':
|
case 'E':
|
||||||
case 'f':
|
case 'f':
|
||||||
case 'g':
|
case 'g':
|
||||||
case 'G':
|
case 'G': {
|
||||||
{
|
|
||||||
Float fl;
|
Float fl;
|
||||||
char *ptr;
|
char *ptr;
|
||||||
|
|
||||||
@ -704,7 +674,8 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
#else
|
#else
|
||||||
sprintf(ptr, "%d", repeats);
|
sprintf(ptr, "%d", repeats);
|
||||||
#endif
|
#endif
|
||||||
while (*ptr) ptr++;
|
while (*ptr)
|
||||||
|
ptr++;
|
||||||
ptr[0] = ch;
|
ptr[0] = ch;
|
||||||
ptr[1] = '\0';
|
ptr[1] = '\0';
|
||||||
{
|
{
|
||||||
@ -752,14 +723,16 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
sprintf(tmp1, "%ld", (long int)il);
|
sprintf(tmp1, "%ld", (long int)il);
|
||||||
#endif
|
#endif
|
||||||
siz = strlen(tmp1);
|
siz = strlen(tmp1);
|
||||||
if (il < 0) siz--;
|
if (il < 0)
|
||||||
|
siz--;
|
||||||
#ifdef HAVE_GMP
|
#ifdef HAVE_GMP
|
||||||
} else if (IsBigIntTerm(t) && RepAppl(t)[1] == BIG_INT) {
|
} else if (IsBigIntTerm(t) && RepAppl(t)[1] == BIG_INT) {
|
||||||
char *res;
|
char *res;
|
||||||
|
|
||||||
tmpbase = tmp1;
|
tmpbase = tmp1;
|
||||||
|
|
||||||
while (!(res = Yap_gmp_to_string(t, tmpbase, TMP_STRING_SIZE, 10))) {
|
while (
|
||||||
|
!(res = Yap_gmp_to_string(t, tmpbase, TMP_STRING_SIZE, 10))) {
|
||||||
if (tmpbase == tmp1) {
|
if (tmpbase == tmp1) {
|
||||||
tmpbase = NULL;
|
tmpbase = NULL;
|
||||||
} else {
|
} else {
|
||||||
@ -784,8 +757,7 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
int first = TRUE;
|
int first = TRUE;
|
||||||
|
|
||||||
while (siz > repeats) {
|
while (siz > repeats) {
|
||||||
if ((siz-repeats) % 3 == 0 &&
|
if ((siz - repeats) % 3 == 0 && !first) {
|
||||||
!first) {
|
|
||||||
f_putc(sno, (int)',');
|
f_putc(sno, (int)',');
|
||||||
}
|
}
|
||||||
f_putc(sno, (int)(*ptr++));
|
f_putc(sno, (int)(*ptr++));
|
||||||
@ -799,8 +771,7 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (repeats) {
|
if (repeats) {
|
||||||
if (ptr == tmpbase ||
|
if (ptr == tmpbase || ptr[-1] == '-') {
|
||||||
ptr[-1] == '-') {
|
|
||||||
f_putc(sno, (int)'0');
|
f_putc(sno, (int)'0');
|
||||||
}
|
}
|
||||||
f_putc(sno, (int)'.');
|
f_putc(sno, (int)'.');
|
||||||
@ -817,8 +788,7 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
free(tmpbase);
|
free(tmpbase);
|
||||||
break;
|
break;
|
||||||
case 'r':
|
case 'r':
|
||||||
case 'R':
|
case 'R': {
|
||||||
{
|
|
||||||
Int numb, radix;
|
Int numb, radix;
|
||||||
UInt divfactor = 1, size = 1, i;
|
UInt divfactor = 1, size = 1, i;
|
||||||
wchar_t och;
|
wchar_t och;
|
||||||
@ -840,7 +810,8 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
char *pt, *res;
|
char *pt, *res;
|
||||||
|
|
||||||
tmpbase = tmp1;
|
tmpbase = tmp1;
|
||||||
while (!(res = Yap_gmp_to_string(t, tmpbase, TMP_STRING_SIZE, radix))) {
|
while (!(res = Yap_gmp_to_string(t, tmpbase, TMP_STRING_SIZE,
|
||||||
|
radix))) {
|
||||||
if (tmpbase == tmp1) {
|
if (tmpbase == tmp1) {
|
||||||
tmpbase = NULL;
|
tmpbase = NULL;
|
||||||
} else {
|
} else {
|
||||||
@ -899,9 +870,9 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
goto do_consistency_error;
|
goto do_consistency_error;
|
||||||
t = targs[targ++];
|
t = targs[targ++];
|
||||||
yhandle_t sl = Yap_StartSlots();
|
yhandle_t sl = Yap_StartSlots();
|
||||||
Yap_plwrite (t, GLOBAL_Stream+sno,0, Quote_illegal_f|Ignore_ops_f|To_heap_f , 1200);
|
Yap_plwrite(t, GLOBAL_Stream + sno, 0,
|
||||||
|
Quote_illegal_f | Ignore_ops_f | To_heap_f, 1200);
|
||||||
Yap_CloseSlots(sl);
|
Yap_CloseSlots(sl);
|
||||||
LOCAL_FormatInfo = &finfo;
|
|
||||||
break;
|
break;
|
||||||
case '@':
|
case '@':
|
||||||
t = targs[targ++];
|
t = targs[targ++];
|
||||||
@ -920,10 +891,11 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
sl2 = Yap_InitSlot(ta[1]);
|
sl2 = Yap_InitSlot(ta[1]);
|
||||||
ts = Yap_MkApplTerm(FunctorGFormatAt, 2, ta);
|
ts = Yap_MkApplTerm(FunctorGFormatAt, 2, ta);
|
||||||
res = Yap_execute_goal(ts, 0, CurrentModule, true);
|
res = Yap_execute_goal(ts, 0, CurrentModule, true);
|
||||||
LOCAL_FormatInfo = &finfo;
|
|
||||||
args = Yap_GetFromSlot(sl);
|
args = Yap_GetFromSlot(sl);
|
||||||
if (EX) goto ex_handler;
|
if (EX)
|
||||||
if (!res) return FALSE;
|
goto ex_handler;
|
||||||
|
if (!res)
|
||||||
|
return FALSE;
|
||||||
ts = Yap_GetFromSlot(sl2);
|
ts = Yap_GetFromSlot(sl2);
|
||||||
Yap_CloseSlots(sl0);
|
Yap_CloseSlots(sl0);
|
||||||
if (!format_print_str(sno, repeats, has_repeats, ts, f_putc)) {
|
if (!format_print_str(sno, repeats, has_repeats, ts, f_putc)) {
|
||||||
@ -937,8 +909,8 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
t = targs[targ++];
|
t = targs[targ++];
|
||||||
{
|
{
|
||||||
Int sl = Yap_InitSlot(args);
|
Int sl = Yap_InitSlot(args);
|
||||||
Yap_plwrite(t, GLOBAL_Stream+sno, 0, Handle_vars_f|Use_portray_f|To_heap_f, 1200);
|
Yap_plwrite(t, GLOBAL_Stream + sno, 0,
|
||||||
LOCAL_FormatInfo = &finfo;
|
Handle_vars_f | Use_portray_f | To_heap_f, 1200);
|
||||||
args = Yap_GetFromSlot(sl);
|
args = Yap_GetFromSlot(sl);
|
||||||
Yap_CloseSlots(sl);
|
Yap_CloseSlots(sl);
|
||||||
}
|
}
|
||||||
@ -966,18 +938,18 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
goto do_consistency_error;
|
goto do_consistency_error;
|
||||||
t = targs[targ++];
|
t = targs[targ++];
|
||||||
yhandle_t sl0 = Yap_StartSlots();
|
yhandle_t sl0 = Yap_StartSlots();
|
||||||
Yap_plwrite (t, GLOBAL_Stream+sno, 0, Handle_vars_f|Quote_illegal_f|To_heap_f, 1200);
|
Yap_plwrite(t, GLOBAL_Stream + sno, 0,
|
||||||
|
Handle_vars_f | Quote_illegal_f | To_heap_f, 1200);
|
||||||
Yap_CloseSlots(sl0);
|
Yap_CloseSlots(sl0);
|
||||||
LOCAL_FormatInfo = &finfo;
|
|
||||||
break;
|
break;
|
||||||
case 'w':
|
case 'w':
|
||||||
if (targ > tnum - 1 || has_repeats)
|
if (targ > tnum - 1 || has_repeats)
|
||||||
goto do_consistency_error;
|
goto do_consistency_error;
|
||||||
t = targs[targ++];
|
t = targs[targ++];
|
||||||
yhandle_t slf = Yap_StartSlots();
|
yhandle_t slf = Yap_StartSlots();
|
||||||
Yap_plwrite (t, GLOBAL_Stream+sno, 0, Handle_vars_f|To_heap_f, 1200);
|
Yap_plwrite(t, GLOBAL_Stream + sno, 0, Handle_vars_f | To_heap_f,
|
||||||
|
1200);
|
||||||
Yap_CloseSlots(slf);
|
Yap_CloseSlots(slf);
|
||||||
LOCAL_FormatInfo = &finfo;
|
|
||||||
break;
|
break;
|
||||||
case '~':
|
case '~':
|
||||||
if (has_repeats)
|
if (has_repeats)
|
||||||
@ -1026,15 +998,15 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
repeats = (repeats < 0 ? 0 : repeats);
|
repeats = (repeats < 0 ? 0 : repeats);
|
||||||
fill_pads(sno, repeats, &finfo PASS_REGS);
|
fill_pads(sno, repeats, &finfo PASS_REGS);
|
||||||
break;
|
break;
|
||||||
case 't':
|
case 't': {
|
||||||
{
|
|
||||||
int nsno;
|
int nsno;
|
||||||
|
|
||||||
finfo.pad_entries[finfo.padders].len = sz;
|
finfo.pad_entries[finfo.padders].len = sz;
|
||||||
finfo.pad_entries[finfo.padders].pad = (char *)bufp;
|
finfo.pad_entries[finfo.padders].pad = (char *)bufp;
|
||||||
bufp = NULL;
|
bufp = NULL;
|
||||||
sz = 0;
|
sz = 0;
|
||||||
nsno = Yap_open_buf_write_stream((char *)bufp, sz, &GLOBAL_Stream[sno].encoding, 0);
|
nsno = Yap_open_buf_write_stream((char *)bufp, sz,
|
||||||
|
&GLOBAL_Stream[sno].encoding, 0);
|
||||||
if (osno) {
|
if (osno) {
|
||||||
GLOBAL_Stream[nsno].linepos = GLOBAL_Stream[sno].linepos;
|
GLOBAL_Stream[nsno].linepos = GLOBAL_Stream[sno].linepos;
|
||||||
GLOBAL_Stream[nsno].linecount = GLOBAL_Stream[sno].linecount;
|
GLOBAL_Stream[nsno].linecount = GLOBAL_Stream[sno].linecount;
|
||||||
@ -1047,12 +1019,12 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
GLOBAL_Stream[nsno].charcount = GLOBAL_Stream[sno].charcount;
|
GLOBAL_Stream[nsno].charcount = GLOBAL_Stream[sno].charcount;
|
||||||
}
|
}
|
||||||
sno = nsno;
|
sno = nsno;
|
||||||
finfo.padders++;
|
|
||||||
finfo.pad_entries[finfo.padders].start = GLOBAL_Stream[sno].linepos;
|
finfo.pad_entries[finfo.padders].start = GLOBAL_Stream[sno].linepos;
|
||||||
if (!has_repeats)
|
if (!has_repeats)
|
||||||
finfo.pad_entries[finfo.padders].filler = ' ';
|
finfo.pad_entries[finfo.padders].filler = ' ';
|
||||||
else
|
else
|
||||||
finfo.pad_entries[finfo.padders].filler = fptr[-2];
|
finfo.pad_entries[finfo.padders].filler = fptr[-2];
|
||||||
|
finfo.padders++;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
do_instantiation_error:
|
do_instantiation_error:
|
||||||
@ -1086,7 +1058,9 @@ doformat(volatile Term otail, volatile Term oargs, int sno USES_REGS)
|
|||||||
Term ta[2];
|
Term ta[2];
|
||||||
ta[0] = otail;
|
ta[0] = otail;
|
||||||
ta[1] = oargs;
|
ta[1] = oargs;
|
||||||
Yap_Error(LOCAL_Error_TYPE, Yap_MkApplTerm(Yap_MkFunctor(AtomFormat,2),2,ta), "format/2");
|
Yap_Error(LOCAL_Error_TYPE,
|
||||||
|
Yap_MkApplTerm(Yap_MkFunctor(AtomFormat, 2), 2, ta),
|
||||||
|
"format/2");
|
||||||
}
|
}
|
||||||
if (GLOBAL_Stream[sno].status & InMemory_Stream_f) {
|
if (GLOBAL_Stream[sno].status & InMemory_Stream_f) {
|
||||||
GLOBAL_Stream[sno].u.mem_string.error_handler = old_handler;
|
GLOBAL_Stream[sno].u.mem_string.error_handler = old_handler;
|
||||||
@ -1141,29 +1115,35 @@ X = [104, 101, 108, 108, 111]
|
|||||||
~~~~~
|
~~~~~
|
||||||
|
|
||||||
+ A Stream handle or alias
|
+ A Stream handle or alias
|
||||||
Temporary switch current output to the given stream. Redirection using with_output_to/2 guarantees the original output is restored, also if Goal fails or raises an exception. See also call_cleanup/2.
|
Temporary switch current output to the given stream. Redirection using
|
||||||
|
with_output_to/2 guarantees the original output is restored, also if Goal fails
|
||||||
|
or raises an exception. See also call_cleanup/2.
|
||||||
+ atom(- _Atom_)
|
+ atom(- _Atom_)
|
||||||
Create an atom from the emitted characters.
|
Create an atom from the emitted characters.
|
||||||
Applications should generally avoid creating atoms by breaking and
|
Applications should generally avoid creating atoms by breaking and
|
||||||
concatenating other atoms as the creation of large numbers of
|
concatenating other atoms as the creation of large numbers of
|
||||||
intermediate atoms puts pressure on the atom table and the data-base. This may lead to collisions in the hash tables used to implement atoms, and may result in frequent calls to the garbage collector. In multi-threaded applications, access to the atom table is controlled by locks. This predicate supports creating the therms by expanding
|
intermediate atoms puts pressure on the atom table and the data-base. This may
|
||||||
|
lead to collisions in the hash tables used to implement atoms, and may result in
|
||||||
|
frequent calls to the garbage collector. In multi-threaded applications, access
|
||||||
|
to the atom table is controlled by locks. This predicate supports creating the
|
||||||
|
therms by expanding
|
||||||
difference-list.
|
difference-list.
|
||||||
|
|
||||||
+ string(- _String_)
|
+ string(- _String_)
|
||||||
Create a string-object, notice that strings are atomic objects.
|
Create a string-object, notice that strings are atomic objects.
|
||||||
+ codes(- _Codes_)
|
+ codes(- _Codes_)
|
||||||
Create a list of character codes from the emitted characters, similar to atom_codes/2.
|
Create a list of character codes from the emitted characters, similar to
|
||||||
|
atom_codes/2.
|
||||||
+ codes(- _Codes_, - _Tail_)
|
+ codes(- _Codes_, - _Tail_)
|
||||||
Create a list of character codes as a difference-list.
|
Create a list of character codes as a difference-list.
|
||||||
+ chars(- _Chars_)
|
+ chars(- _Chars_)
|
||||||
Create a list of one-character-atoms codes from the emitted characters, similar to atom_chars/2.
|
Create a list of one-character-atoms codes from the emitted characters, similar
|
||||||
|
to atom_chars/2.
|
||||||
+ chars(- _Chars_, - _Tail_)
|
+ chars(- _Chars_, - _Tail_)
|
||||||
Create a list of one-character-atoms as a difference-list.
|
Create a list of one-character-atoms as a difference-list.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
static Int
|
static Int with_output_to(USES_REGS1) {
|
||||||
with_output_to( USES_REGS1 )
|
|
||||||
{
|
|
||||||
int old_out = LOCAL_c_output_stream;
|
int old_out = LOCAL_c_output_stream;
|
||||||
int output_stream;
|
int output_stream;
|
||||||
Term tin = Deref(ARG1);
|
Term tin = Deref(ARG1);
|
||||||
@ -1174,12 +1154,9 @@ with_output_to( USES_REGS1 )
|
|||||||
Yap_Error(INSTANTIATION_ERROR, tin, "with_output_to/3");
|
Yap_Error(INSTANTIATION_ERROR, tin, "with_output_to/3");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (IsApplTerm(tin) &&
|
if (IsApplTerm(tin) && (f = FunctorOfTerm(tin)) &&
|
||||||
(f = FunctorOfTerm(tin)) &&
|
(f == FunctorAtom || f == FunctorString || f == FunctorCodes1 ||
|
||||||
(f == FunctorAtom || f == FunctorString ||
|
f == FunctorCodes || f == FunctorChars1 || f == FunctorChars)) {
|
||||||
f == FunctorCodes1 || f == FunctorCodes ||
|
|
||||||
f == FunctorChars1 || f == FunctorChars) )
|
|
||||||
{
|
|
||||||
output_stream = Yap_OpenBufWriteStream(PASS_REGS1);
|
output_stream = Yap_OpenBufWriteStream(PASS_REGS1);
|
||||||
} else {
|
} else {
|
||||||
/* needs to change LOCAL_c_output_stream for write */
|
/* needs to change LOCAL_c_output_stream for write */
|
||||||
@ -1220,9 +1197,7 @@ with_output_to( USES_REGS1 )
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Int
|
static Int format(Term tout, Term tf, Term tas USES_REGS) {
|
||||||
format(Term tout, Term tf, Term tas USES_REGS)
|
|
||||||
{
|
|
||||||
bool mem_stream = false;
|
bool mem_stream = false;
|
||||||
int output_stream;
|
int output_stream;
|
||||||
Functor f;
|
Functor f;
|
||||||
@ -1232,11 +1207,9 @@ format(Term tout, Term tf, Term tas USES_REGS)
|
|||||||
Yap_Error(INSTANTIATION_ERROR, tout, "format/3");
|
Yap_Error(INSTANTIATION_ERROR, tout, "format/3");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (IsApplTerm(tout) &&
|
if (IsApplTerm(tout) && (f = FunctorOfTerm(tout)) &&
|
||||||
(f = FunctorOfTerm(tout)) &&
|
(f == FunctorAtom || f == FunctorString1 || f == FunctorCodes1 ||
|
||||||
(f == FunctorAtom || f == FunctorString1 ||
|
f == FunctorCodes || f == FunctorChars1 || f == FunctorChars)) {
|
||||||
f == FunctorCodes1 || f == FunctorCodes ||
|
|
||||||
f == FunctorChars1 || f == FunctorChars) ) {
|
|
||||||
output_stream = Yap_OpenBufWriteStream(PASS_REGS1);
|
output_stream = Yap_OpenBufWriteStream(PASS_REGS1);
|
||||||
mem_stream = true;
|
mem_stream = true;
|
||||||
} else {
|
} else {
|
||||||
@ -1288,30 +1261,24 @@ format(Term tout, Term tf, Term tas USES_REGS)
|
|||||||
*
|
*
|
||||||
* Print formatted output to the current output stream.
|
* Print formatted output to the current output stream.
|
||||||
*/
|
*/
|
||||||
static Int
|
static Int format2(USES_REGS1) { /* 'format'(Stream,Control,Args) */
|
||||||
format2( USES_REGS1 )
|
|
||||||
{ /* 'format'(Stream,Control,Args) */
|
|
||||||
Int res;
|
Int res;
|
||||||
|
|
||||||
res = doformat(Deref(ARG1), Deref(ARG2), LOCAL_c_output_stream PASS_REGS);
|
res = doformat(Deref(ARG1), Deref(ARG2), LOCAL_c_output_stream PASS_REGS);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** @pred format(+_Stream_+ _T_, :ListWithArguments)
|
/** @pred format(+_Stream_+ _T_, :ListWithArguments)
|
||||||
*
|
*
|
||||||
* Print formatted output to the stream _Stream_.
|
* Print formatted output to the stream _Stream_.
|
||||||
*/
|
*/
|
||||||
static Int
|
static Int format3(USES_REGS1) {
|
||||||
format3( USES_REGS1 )
|
|
||||||
{
|
|
||||||
Int res;
|
Int res;
|
||||||
res = format(Deref(ARG1), Deref(ARG2), Deref(ARG3) PASS_REGS);
|
res = format(Deref(ARG1), Deref(ARG2), Deref(ARG3) PASS_REGS);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void Yap_InitFormat(void) {
|
||||||
Yap_InitFormat(void)
|
|
||||||
{
|
|
||||||
Yap_InitCPred("format", 2, format2, SyncPredFlag);
|
Yap_InitCPred("format", 2, format2, SyncPredFlag);
|
||||||
Yap_InitCPred("format", 3, format3, SyncPredFlag);
|
Yap_InitCPred("format", 3, format3, SyncPredFlag);
|
||||||
Yap_InitCPred("with_output_to", 2, with_output_to, SyncPredFlag);
|
Yap_InitCPred("with_output_to", 2, with_output_to, SyncPredFlag);
|
||||||
|
Reference in New Issue
Block a user