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

use stdbool

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-09-09 23:53:10 -05:00
parent 1dd3ff800e
commit 3fd07064da
9 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/pl-error.c
View File

@ -207,7 +207,7 @@ PL_get_module_ex(term_t name, module_t *m)
} }
int int
PL_unify_bool_ex(term_t t, bool val) PL_unify_bool_ex(term_t t, int val)
{ GET_LD { GET_LD
bool v; bool v;

22
os/pl-file.c
View File

@ -347,8 +347,8 @@ initIO(void)
streamContext = newHTable(16); streamContext = newHTable(16);
PL_register_blob_type(&stream_blob); PL_register_blob_type(&stream_blob);
if ( false(Sinput, SIO_ISATTY) || if ( False(Sinput, SIO_ISATTY) ||
false(Soutput, SIO_ISATTY) ) False(Soutput, SIO_ISATTY) )
{ /* clear PLFLAG_TTY_CONTROL */ { /* clear PLFLAG_TTY_CONTROL */
PL_set_prolog_flag("tty_control", PL_BOOL, FALSE); PL_set_prolog_flag("tty_control", PL_BOOL, FALSE);
} }
@ -1548,7 +1548,7 @@ readLine() reads a line from the terminal. It is used only by the tracer.
#define DEL 127 #define DEL 127
#endif #endif
int bool
readLine(IOSTREAM *in, IOSTREAM *out, char *buffer) readLine(IOSTREAM *in, IOSTREAM *out, char *buffer)
{ GET_LD { GET_LD
int c; int c;
@ -1776,12 +1776,12 @@ set_stream(IOSTREAM *s, term_t stream, atom_t aname, term_t a ARG_LD)
if ( !PL_get_atom_ex(a, &type) ) if ( !PL_get_atom_ex(a, &type) )
return FALSE; return FALSE;
if ( type == ATOM_text ) if ( type == ATOM_text )
{ if ( false(s, SIO_TEXT) && Ssetenc(s, LD->encoding, NULL) != 0 ) { if ( False(s, SIO_TEXT) && Ssetenc(s, LD->encoding, NULL) != 0 )
return PL_error(NULL, 0, NULL, ERR_PERMISSION, return PL_error(NULL, 0, NULL, ERR_PERMISSION,
ATOM_encoding, ATOM_stream, stream); ATOM_encoding, ATOM_stream, stream);
s->flags |= SIO_TEXT; s->flags |= SIO_TEXT;
} else if ( type == ATOM_binary ) } else if ( type == ATOM_binary )
{ if ( true(s, SIO_TEXT) && Ssetenc(s, ENC_OCTET, NULL) != 0 ) { if ( True(s, SIO_TEXT) && Ssetenc(s, ENC_OCTET, NULL) != 0 )
return PL_error(NULL, 0, NULL, ERR_PERMISSION, return PL_error(NULL, 0, NULL, ERR_PERMISSION,
ATOM_encoding, ATOM_stream, stream); ATOM_encoding, ATOM_stream, stream);
@ -1922,7 +1922,7 @@ set_stream(IOSTREAM *s, term_t stream, atom_t aname, term_t a ARG_LD)
else if ( val == ATOM_dos ) else if ( val == ATOM_dos )
s->newline = SIO_NL_DOS; s->newline = SIO_NL_DOS;
else if ( val == ATOM_detect ) else if ( val == ATOM_detect )
{ if ( false(s, SIO_INPUT) ) { if ( False(s, SIO_INPUT) )
return PL_error(NULL, 0, "detect only allowed for input streams", return PL_error(NULL, 0, "detect only allowed for input streams",
ERR_DOMAIN, ATOM_newline, a); ERR_DOMAIN, ATOM_newline, a);
s->newline = SIO_NL_DETECT; s->newline = SIO_NL_DETECT;
@ -2081,7 +2081,7 @@ PRED_IMPL("set_end_of_stream", 1, set_end_of_stream, 0)
extern IOFUNCTIONS Smemfunctions; extern IOFUNCTIONS Smemfunctions;
int bool
tellString(char **s, size_t *size, IOENC enc) tellString(char **s, size_t *size, IOENC enc)
{ GET_LD { GET_LD
IOSTREAM *stream; IOSTREAM *stream;
@ -2095,8 +2095,8 @@ tellString(char **s, size_t *size, IOENC enc)
} }
int bool
toldString() toldString(void)
{ GET_LD { GET_LD
IOSTREAM *s = getStream(Scurout); IOSTREAM *s = getStream(Scurout);
@ -3384,7 +3384,7 @@ findStreamFromFile(atom_t name, unsigned int flags)
{ stream_context *ctx = symb->value; { stream_context *ctx = symb->value;
if ( ctx->filename == name && if ( ctx->filename == name &&
true(ctx, flags) ) True(ctx, flags) )
{ s = symb->name; { s = symb->name;
break; break;
} }
@ -4652,7 +4652,7 @@ peek(term_t stream, term_t chr, int how ARG_LD)
if ( !getInputStream(stream, how == PL_BYTE ? S_BINARY : S_TEXT, &s) ) if ( !getInputStream(stream, how == PL_BYTE ? S_BINARY : S_TEXT, &s) )
return FALSE; return FALSE;
if ( true(s, SIO_NBUF) || (s->bufsize && s->bufsize < PL_MB_LEN_MAX) ) if ( True(s, SIO_NBUF) || (s->bufsize && s->bufsize < PL_MB_LEN_MAX) )
{ releaseStream(s); { releaseStream(s);
return PL_error(NULL, 0, "stream is unbuffered", ERR_PERMISSION, return PL_error(NULL, 0, "stream is unbuffered", ERR_PERMISSION,
ATOM_peek, ATOM_stream, stream); ATOM_peek, ATOM_stream, stream);

6
os/pl-file.h
View File

@ -46,7 +46,7 @@ COMMON(int) streamStatus(IOSTREAM *s);
COMMON(int) setFileNameStream(IOSTREAM *s, atom_t name); COMMON(int) setFileNameStream(IOSTREAM *s, atom_t name);
COMMON(atom_t) fileNameStream(IOSTREAM *s); COMMON(atom_t) fileNameStream(IOSTREAM *s);
COMMON(int) getSingleChar(IOSTREAM *s, int signals); COMMON(int) getSingleChar(IOSTREAM *s, int signals);
COMMON(int) readLine(IOSTREAM *in, IOSTREAM *out, char *buffer); COMMON(bool) readLine(IOSTREAM *in, IOSTREAM *out, char *buffer);
COMMON(int) LockStream(void); COMMON(int) LockStream(void);
COMMON(int) UnlockStream(void); COMMON(int) UnlockStream(void);
COMMON(IOSTREAM *) PL_current_input(void); COMMON(IOSTREAM *) PL_current_input(void);
@ -56,8 +56,8 @@ COMMON(int) pl_seen(void);
COMMON(int) seeString(const char *s); COMMON(int) seeString(const char *s);
COMMON(int) seeingString(void); COMMON(int) seeingString(void);
COMMON(int) seenString(void); COMMON(int) seenString(void);
COMMON(int) tellString(char **s, size_t *size, IOENC enc); COMMON(bool) tellString(char **s, size_t *size, IOENC enc);
COMMON(int) toldString(void); COMMON(bool) toldString(void);
COMMON(void) prompt1(atom_t prompt); COMMON(void) prompt1(atom_t prompt);
COMMON(atom_t) PrologPrompt(void); COMMON(atom_t) PrologPrompt(void);
COMMON(int) streamNo(term_t spec, int mode); COMMON(int) streamNo(term_t spec, int mode);

2
os/pl-fmt.c
View File

@ -361,6 +361,8 @@ get_chr_from_text(const PL_chars_t *t, int index)
return t->text.t[index]&0xff; return t->text.t[index]&0xff;
case ENC_WCHAR: case ENC_WCHAR:
return t->text.w[index]; return t->text.w[index];
case ENC_UTF8:
return t->text.w[index];
default: default:
assert(0); assert(0);
return 0; /* not reached */ return 0; /* not reached */

2
os/pl-option.h
View File

@ -45,7 +45,7 @@ typedef struct
int type; /* Type of option */ int type; /* Type of option */
} opt_spec, *OptSpec; } opt_spec, *OptSpec;
COMMON(int) scan_options(term_t list, int flags, atom_t name, COMMON(bool) scan_options(term_t list, int flags, atom_t name,
const opt_spec *specs, ...); const opt_spec *specs, ...);
#endif /*OPTION_H_INCLUDED*/ #endif /*OPTION_H_INCLUDED*/

2
os/pl-os.c
View File

@ -1847,7 +1847,7 @@ Sread_terminal(void *handle, char *buf, size_t size)
int fd = (int)h; int fd = (int)h;
source_location oldsrc = LD->read_source; source_location oldsrc = LD->read_source;
if ( Soutput && true(Soutput, SIO_ISATTY) ) if ( Soutput && True(Soutput, SIO_ISATTY) )
{ if ( LD->prompt.next && ttymode != TTY_RAW ) { if ( LD->prompt.next && ttymode != TTY_RAW )
PL_write_prompt(TRUE); PL_write_prompt(TRUE);
else else

8
os/pl-prologflag.c
View File

@ -799,17 +799,17 @@ unify_prolog_flag_value(Module m, atom_t key, prolog_flag *f, term_t val)
{ GET_LD { GET_LD
if ( key == ATOM_character_escapes ) if ( key == ATOM_character_escapes )
{ atom_t v = (true(m, M_CHARESCAPE) ? ATOM_true : ATOM_false); { atom_t v = (True(m, M_CHARESCAPE) ? ATOM_true : ATOM_false);
return PL_unify_atom(val, v); return PL_unify_atom(val, v);
} else if ( key == ATOM_double_quotes ) } else if ( key == ATOM_double_quotes )
{ atom_t v; { atom_t v;
if ( true(m, DBLQ_CHARS) ) if ( True(m, DBLQ_CHARS) )
v = ATOM_chars; v = ATOM_chars;
else if ( true(m, DBLQ_ATOM) ) else if ( True(m, DBLQ_ATOM) )
v = ATOM_atom; v = ATOM_atom;
else if ( true(m, DBLQ_STRING) ) else if ( True(m, DBLQ_STRING) )
v = ATOM_string; v = ATOM_string;
else else
v = ATOM_codes; v = ATOM_codes;

2
os/pl-read.c
View File

@ -1265,7 +1265,7 @@ int process_comment;
int rval; int rval;
atom_t w; atom_t w;
read_data rd; read_data rd;
bool charescapes = -1; int charescapes = -1;
atom_t dq = NULL_ATOM; atom_t dq = NULL_ATOM;
atom_t mname = NULL_ATOM; atom_t mname = NULL_ATOM;
fid_t fid = PL_open_foreign_frame(); fid_t fid = PL_open_foreign_frame();

10
os/pl-write.c
View File

@ -400,11 +400,11 @@ pl_write_term3(term_t stream, term_t term, term_t opts)
{ GET_LD { GET_LD
bool quoted = FALSE; bool quoted = FALSE;
bool ignore_ops = FALSE; bool ignore_ops = FALSE;
bool numbervars = -1; /* not set */ int numbervars = -1; /* not set */
bool portray = FALSE; bool portray = FALSE;
term_t gportray = 0; term_t gportray = 0;
bool bqstring = truePrologFlag(PLFLAG_BACKQUOTED_STRING); bool bqstring = truePrologFlag(PLFLAG_BACKQUOTED_STRING);
bool charescape = -1; /* not set */ int charescape = -1; /* not set */
atom_t mname = ATOM_user; atom_t mname = ATOM_user;
atom_t attr = ATOM_nil; atom_t attr = ATOM_nil;
atom_t blobs = ATOM_nil; atom_t blobs = ATOM_nil;
@ -467,7 +467,7 @@ pl_write_term3(term_t stream, term_t term, term_t opts)
if ( charescape == TRUE || if ( charescape == TRUE ||
(charescape == -1 (charescape == -1
#ifndef __YAP_PROLOG__ #ifndef __YAP_PROLOG__
&& true(options.module, M_CHARESCAPE) && True(options.module, M_CHARESCAPE)
#endif #endif
) ) ) )
options.flags |= PL_WRT_CHARESCAPES; options.flags |= PL_WRT_CHARESCAPES;
@ -488,7 +488,7 @@ pl_write_term3(term_t stream, term_t term, term_t opts)
if ( bqstring ) options.flags |= PL_WRT_BACKQUOTED_STRING; if ( bqstring ) options.flags |= PL_WRT_BACKQUOTED_STRING;
if ( !cycles ) options.flags |= PL_WRT_NO_CYCLES; if ( !cycles ) options.flags |= PL_WRT_NO_CYCLES;
local_varnames = (varnames && false(&options, PL_WRT_NUMBERVARS)); local_varnames = (varnames && False(&options, PL_WRT_NUMBERVARS));
BEGIN_NUMBERVARS(local_varnames); BEGIN_NUMBERVARS(local_varnames);
if ( varnames ) if ( varnames )
@ -553,7 +553,7 @@ do_write2(term_t stream, term_t term, int flags)
options.module = MODULE_user; options.module = MODULE_user;
if ( options.module if ( options.module
#ifndef __YAP_PROLOG__ #ifndef __YAP_PROLOG__
&& true(options.module, M_CHARESCAPE) && True(options.module, M_CHARESCAPE)
#endif #endif
) )
options.flags |= PL_WRT_CHARESCAPES; options.flags |= PL_WRT_CHARESCAPES;