diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more string support

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-06-19 00:51:17 +01:00
parent 17049ce8ec
commit aef6cf35d6
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
H/YapText.h
View File

@ -54,10 +54,12 @@ typedef enum {
#define YAP_STRING_DIFF 0x2000 // difference list #define YAP_STRING_DIFF 0x2000 // difference list
#define YAP_STRING_NCHARS 0x4000 // size of input/result #define YAP_STRING_NCHARS 0x4000 // size of input/result
#define YAP_STRING_TRUNC 0x8000 // truncate on maximum size of input/result #define YAP_STRING_TRUNC 0x8000 // truncate on maximum size of input/result
#define YAP_STRING_WQ 0x10000 // output with write_quote
#define YAP_STRING_WC 0x20000 // output with write_canonical
typedef UInt seq_type_t; typedef UInt seq_type_t;
#define YAP_TYPE_MASK 0x1FFF #define YAP_TYPE_MASK 0xFFFF
typedef union { typedef union {
Float f; Float f;
@ -81,12 +83,6 @@ typedef struct text_cvt {
size_t max; // max_size size_t max; // max_size
} seq_tv_t; } seq_tv_t;
typedef enum internal_encoding {
YAP_CHAR,
YAP_UTF8,
YAP_WCHAR
} encoding_t;
// string construction // string construction
#ifdef HR #ifdef HR
static inline Term static inline Term
@ -137,6 +133,7 @@ mod_to_type( Term mod USES_REGS )
// the routines // the routines
extern void *Yap_readText( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *lengp USES_REGS);
extern int write_Text( void *inp, seq_tv_t *out, encoding_t enc, int minimal, size_t leng USES_REGS); extern int write_Text( void *inp, seq_tv_t *out, encoding_t enc, int minimal, size_t leng USES_REGS);
extern int Yap_CVT_Text( seq_tv_t *inp, seq_tv_t *out USES_REGS); extern int Yap_CVT_Text( seq_tv_t *inp, seq_tv_t *out USES_REGS);
extern void *Yap_Concat_Text( int n, seq_tv_t inp[], seq_tv_t *out USES_REGS); extern void *Yap_Concat_Text( int n, seq_tv_t inp[], seq_tv_t *out USES_REGS);
@ -355,6 +352,21 @@ Yap_CharsToListOfCodes( const char *s USES_REGS )
return out.val.t; return out.val.t;
} }
static inline Term
Yap_CharsToDiffListOfCodes( const char *s, Term tail USES_REGS )
{
seq_tv_t inp, out;
inp.val.c = s;
inp.sz = 0;
inp.type = YAP_STRING_CHARS;
out.type = YAP_STRING_DIFF;
out.dif = tail;
if (!Yap_CVT_Text(&inp, &out PASS_REGS))
return 0L;
return out.val.t;
}
static inline Term static inline Term
Yap_CharsToString( const char *s USES_REGS ) Yap_CharsToString( const char *s USES_REGS )
{ {
@ -560,20 +572,20 @@ Yap_NCharsToAtom( const char *s, size_t len USES_REGS )
} }
static inline Term static inline Term
Yap_NCharsToListOfAtoms( const char *s, size_t len USES_REGS ) Yap_CharsToDiffListOfAtoms( const char *s, Term tail USES_REGS )
{ {
seq_tv_t inp, out; seq_tv_t inp, out;
inp.val.c = s; inp.val.c = s;
inp.sz = len; inp.type = YAP_STRING_CHARS;
inp.type = YAP_STRING_CHARS|YAP_STRING_NCHARS; out.type = YAP_STRING_ATOMS|YAP_STRING_DIFF;
out.type = YAP_STRING_ATOMS; out.dif = tail;
out.max = len;
if (!Yap_CVT_Text(&inp, &out PASS_REGS)) if (!Yap_CVT_Text(&inp, &out PASS_REGS))
return 0L; return 0L;
return out.val.t; return out.val.t;
} }
static inline Term static inline Term
Yap_NCharsToListOfCodes( const char *s, size_t len USES_REGS ) Yap_NCharsToListOfCodes( const char *s, size_t len USES_REGS )
{ {
@ -673,16 +685,16 @@ Yap_NumberToString(Term t0 USES_REGS)
static inline Atom static inline Atom
Yap_NWCharsToAtom( const wchar_t *s, size_t len USES_REGS ) Yap_NWCharsToAtom( const wchar_t *s, size_t len USES_REGS )
{ {
seq_tv_t inp, out; seq_tv_t inp, out;
inp.val.w = s; inp.val.w = s;
inp.sz = len; inp.sz = len;
inp.type = YAP_STRING_WCHARS|YAP_STRING_NCHARS; inp.type = YAP_STRING_WCHARS|YAP_STRING_NCHARS;
out.type = YAP_STRING_ATOM; out.type = YAP_STRING_ATOM;
out.max = len; out.max = len;
if (!Yap_CVT_Text(&inp, &out PASS_REGS)) if (!Yap_CVT_Text(&inp, &out PASS_REGS))
return 0L; return 0L;
return out.val.a; return out.val.a;
} }
static inline Term static inline Term