indenting

This commit is contained in:
Vitor Santos Costa 2016-04-05 08:12:16 +01:00
parent 55a840e2d8
commit b89f6e55b4

View File

@ -25,7 +25,8 @@
*
*/
/*
* This file includes the interface to the console IO, tty style. Refer also to the readline library.
* This file includes the interface to the console IO, tty style. Refer also to
the readline library.
* @defgroup console Support for console-based interaction.
* @ingroup InputOutput
@ -33,18 +34,16 @@
#include "sysbits.h"
static Int prompt( USES_REGS1 );
static Int prompt1( USES_REGS1 );
static Int prompt(USES_REGS1);
static Int prompt1(USES_REGS1);
static int ConsoleGetc( int);
static int ConsolePutc( int, int);
static int ConsoleGetc(int);
static int ConsolePutc(int, int);
/* check if we read a newline or an EOF */
int
console_post_process_read_char(int ch, StreamDesc *s)
{
int console_post_process_read_char(int ch, StreamDesc *s) {
/* the character is also going to be output by the console handler */
console_count_output_char(ch,GLOBAL_Stream+StdErrStream);
console_count_output_char(ch, GLOBAL_Stream + StdErrStream);
if (ch == '\n') {
CACHE_REGS
++s->linecount;
@ -60,43 +59,35 @@ console_post_process_read_char(int ch, StreamDesc *s)
return ch;
}
bool
is_same_tty(FILE *f1, FILE *f2)
{
bool is_same_tty(FILE *f1, FILE *f2) {
#if HAVE_TTYNAME
return(ttyname(fileno(f1)) == ttyname(fileno(f2)));
#else
return ttyname_r(fileno(f1), LOCAL_FileNameBuf, YAP_FILENAME_MAX - 1) ==
ttyname_r(fileno(f2), LOCAL_FileNameBuf, YAP_FILENAME_MAX - 1);
#endif
// assume a single console, for now
return true;
#endif
}
static Int
is_same_tty2 (USES_REGS1)
{ /* 'prompt(Atom) */
int sni = Yap_CheckStream (ARG1, Input_Stream_f, "put/2");
int sno = Yap_CheckStream (ARG2, Output_Stream_f, "put/2");
static Int is_same_tty2(USES_REGS1) { /* 'prompt(Atom) */
int sni = Yap_CheckStream(ARG1, Input_Stream_f, "put/2");
int sno = Yap_CheckStream(ARG2, Output_Stream_f, "put/2");
bool out = (GLOBAL_Stream[sni].status & Tty_Stream_f) &&
(GLOBAL_Stream[sno].status & Tty_Stream_f) &&
is_same_tty(GLOBAL_Stream[sno].file,GLOBAL_Stream[sni].file);
is_same_tty(GLOBAL_Stream[sno].file, GLOBAL_Stream[sni].file);
UNLOCK(GLOBAL_Stream[sno].streamlock);
UNLOCK(GLOBAL_Stream[sni].streamlock);
return out;
}
void
Yap_ConsoleOps( StreamDesc *s, bool recursive )
{
void Yap_ConsoleOps(StreamDesc *s, bool recursive) {
if (!recursive)
Yap_DefaultStreamOps( s );
Yap_DefaultStreamOps(s);
/* the putc routine only has to check it is putting out a newline */
s->stream_putc = ConsolePutc;
#if USE_READLINE
/* if a tty have a special routine to call readline */
if (( s->status & Readline_Stream_f) &&
trueGlobalPrologFlag(READLINE_FLAG) ) {
if (Yap_ReadlineOps( s ))
if ((s->status & Readline_Stream_f) && trueGlobalPrologFlag(READLINE_FLAG)) {
if (Yap_ReadlineOps(s))
return;
}
#endif
@ -104,33 +95,27 @@ Yap_ConsoleOps( StreamDesc *s, bool recursive )
}
/* static */
static int
ConsolePutc (int sno, int ch)
{
static int ConsolePutc(int sno, int ch) {
StreamDesc *s = &GLOBAL_Stream[sno];
#if MAC || _MSC_VER || defined(__MINGW32__)
if (ch == 10)
{
putc ('\n', s->file);
if (ch == 10) {
putc('\n', s->file);
LOCAL_newline = true;
}
else
} else
#endif
putc (ch, s->file);
console_count_output_char(ch,s);
return ((int) ch);
putc(ch, s->file);
console_count_output_char(ch, s);
return ((int)ch);
}
/* send a prompt, and use the system for internal buffering. Speed is
not of the essence here !!! */
static int
ConsoleGetc(int sno)
{
static int ConsoleGetc(int sno) {
CACHE_REGS
register StreamDesc *s = &GLOBAL_Stream[sno];
int ch;
restart:
restart:
/* keep the prompt around, just in case, but don't actually
show it in silent mode */
if (LOCAL_newline) {
@ -142,7 +127,7 @@ ConsoleGetc(int sno)
GLOBAL_Stream[StdErrStream].stream_putc(StdErrStream, ch);
}
}
strncpy (LOCAL_Prompt, (char *)RepAtom (LOCAL_AtPrompt)->StrOfAE, MAX_PROMPT);
strncpy(LOCAL_Prompt, (char *)RepAtom(LOCAL_AtPrompt)->StrOfAE, MAX_PROMPT);
LOCAL_newline = FALSE;
}
#if HAVE_SIGINTERRUPT
@ -154,7 +139,7 @@ ConsoleGetc(int sno)
siginterrupt(SIGINT, FALSE);
#endif
if (LOCAL_PrologMode & InterruptMode) {
Yap_external_signal( 0, YAP_INT_SIGNAL );
Yap_external_signal(0, YAP_INT_SIGNAL);
LOCAL_PrologMode &= ~ConsoleGetcMode;
LOCAL_newline = TRUE;
if (LOCAL_PrologMode & AbortMode) {
@ -179,42 +164,41 @@ Changes YAP input prompt for the .
*/
static Int
prompt1 ( USES_REGS1 )
{ /* prompt1(Atom) */
static Int prompt1(USES_REGS1) { /* prompt1(Atom) */
Term t = Deref(ARG1);
Atom a;
if (IsVarTerm (t) || !IsAtomTerm (t))
if (IsVarTerm(t) || !IsAtomTerm(t))
return (FALSE);
LOCAL_AtPrompt = a = AtomOfTerm(t);
if (strlen((char *)RepAtom(a)->StrOfAE) > MAX_PROMPT) {
Yap_Error(SYSTEM_ERROR_INTERNAL, t, "prompt %s is too long",
RepAtom(a)->StrOfAE);
return (FALSE);
LOCAL_AtPrompt = a = AtomOfTerm (t);
if (strlen ((char *)RepAtom (a)->StrOfAE) > MAX_PROMPT) {
Yap_Error(SYSTEM_ERROR_INTERNAL,t,"prompt %s is too long", RepAtom (a)->StrOfAE);
return(FALSE);
}
strncpy(LOCAL_Prompt, (char *)RepAtom (a)->StrOfAE, MAX_PROMPT);
strncpy(LOCAL_Prompt, (char *)RepAtom(a)->StrOfAE, MAX_PROMPT);
return (TRUE);
}
/** @pred prompt(- _A_,+ _B_)
Changes YAP input prompt from _A_ to _B_, active on *next* standard input interaction.
Changes YAP input prompt from _A_ to _B_, active on *next* standard input
interaction.
*/
static Int
prompt ( USES_REGS1 )
{ /* prompt(Old,New) */
Term t = Deref (ARG2);
static Int prompt(USES_REGS1) { /* prompt(Old,New) */
Term t = Deref(ARG2);
Atom a;
if (!Yap_unify_constant (ARG1, MkAtomTerm (LOCAL_AtPrompt)))
if (!Yap_unify_constant(ARG1, MkAtomTerm(LOCAL_AtPrompt)))
return (FALSE);
if (IsVarTerm (t) || !IsAtomTerm (t))
if (IsVarTerm(t) || !IsAtomTerm(t))
return (FALSE);
a = AtomOfTerm (t);
if (strlen(RepAtom (a)->StrOfAE) > MAX_PROMPT) {
Yap_Error(SYSTEM_ERROR_INTERNAL,t,"prompt %s is too long", RepAtom (a)->StrOfAE);
a = AtomOfTerm(t);
if (strlen(RepAtom(a)->StrOfAE) > MAX_PROMPT) {
Yap_Error(SYSTEM_ERROR_INTERNAL, t, "prompt %s is too long",
RepAtom(a)->StrOfAE);
return false;
}
strncpy(LOCAL_Prompt, (char *)RepAtom (LOCAL_AtPrompt)->StrOfAE, MAX_PROMPT);
strncpy(LOCAL_Prompt, (char *)RepAtom(LOCAL_AtPrompt)->StrOfAE, MAX_PROMPT);
LOCAL_AtPrompt = a;
return (TRUE);
}
@ -225,18 +209,14 @@ Make sure we have a prompt at this point, even if we have to
introduce a new line.
*/
static Int
ensure_prompting ( USES_REGS1 )
{ /* prompt(Old,New) */
if (!LOCAL_newline) {
static Int ensure_prompting(USES_REGS1) { /* prompt(Old,New) */
if (!LOCAL_newline) {
GLOBAL_Stream[2].stream_wputc(2, 10); // hack!
}
return true;
}
return true;
}
int
Yap_GetCharForSIGINT(void)
{
int Yap_GetCharForSIGINT(void) {
CACHE_REGS
int ch;
#if USE_READLINE
@ -247,22 +227,21 @@ Yap_GetCharForSIGINT(void)
fprintf(stderr, "Action (h for help): ");
ch = getc(stdin);
/* first process up to end of line */
while ((fgetc(stdin)) != '\n');
while ((fgetc(stdin)) != '\n')
;
}
LOCAL_newline = TRUE;
return ch;
}
void Yap_InitConsole(void) {
CACHE_REGS
LOCAL_newline = true;
Yap_InitCPred ("prompt", 1, prompt1, SafePredFlag|SyncPredFlag);
Yap_InitCPred ("prompt1", 1, prompt1, SafePredFlag|SyncPredFlag);
Yap_InitCPred ("$is_same_tty", 2, is_same_tty2, SafePredFlag|SyncPredFlag|HiddenPredFlag);
Yap_InitCPred ("prompt", 2, prompt, SafePredFlag|SyncPredFlag);
Yap_InitCPred ("$ensure_prompting", 0, ensure_prompting, SafePredFlag|SyncPredFlag);
Yap_InitCPred("prompt", 1, prompt1, SafePredFlag | SyncPredFlag);
Yap_InitCPred("prompt1", 1, prompt1, SafePredFlag | SyncPredFlag);
Yap_InitCPred("$is_same_tty", 2, is_same_tty2,
SafePredFlag | SyncPredFlag | HiddenPredFlag);
Yap_InitCPred("prompt", 2, prompt, SafePredFlag | SyncPredFlag);
Yap_InitCPred("$ensure_prompting", 0, ensure_prompting,
SafePredFlag | SyncPredFlag);
}