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

skip/2 was using user_input

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-11-11 08:45:03 +00:00
parent edd5c007c8
commit 2466db7ff5
9 changed files with 31096 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
OPTYap/ Normal file
View File

15552
docs/my.yap Normal file
View File

File diff suppressed because it is too large Load Diff

15509
docs/yapdocs.yap Normal file
View File

File diff suppressed because it is too large Load Diff

4
misc/gengroups Normal file
View File

@ -0,0 +1,4 @@
grep -nHR -e group ../pl ../C ../H ../packages ../library | \
grep '(@|\\)'| \
grep -v \#| \
grep -v ^grep

10
misc/sysgraph
View File

@ -1,7 +1,6 @@
x#!/usr/local/bin/yap -L -- * #!/usr/local/bin/yap -L -- $*
#. #.
:- style_check(all). :- style_check(all).
:- yap_flag( write_strings, on). :- yap_flag( write_strings, on).
@ -20,7 +19,9 @@ x#!/usr/local/bin/yap -L -- *
:- yap_flag( double_quotes, string ). :- yap_flag( double_quotes, string ).
%:- yap_flag( dollar_as_lower_case, on ). %:- yap_flag( dollar_as_lower_case, on ).
:- dynamic edge/1, :- dynamic
node/4,
edge/1,
public/2, public/2,
private/2, private/2,
module_on/3, module_on/3,
@ -74,7 +75,6 @@ main :-
c_links, c_links,
mkdocs. mkdocs.
init :- init :-
retractall(dir(_)), retractall(dir(_)),
retractall(edge(_)), retractall(edge(_)),
@ -624,7 +624,7 @@ decl(I0, I) -->
( " " ; "\t" ; "\n" ), !, ( " " ; "\t" ; "\n" ), !,
skip_early_comment(C). skip_early_comment(C).
skip_early_comment(C) --> skip_early_comment(C) -->
"@" ( "{" ; "}" ), !, "@", ( "{" ; "}" ), !,
skip_early_comment(C). skip_early_comment(C).
skip_early_comment(_) --> []. skip_early_comment(_) --> [].

1
misc/tmp/foreigns.yap Normal file
View File

@ -0,0 +1 @@
sys working_directory/2.

16
os/alias.c
View File

@ -18,7 +18,11 @@
static char SccsId[] = "%W% %G%"; static char SccsId[] = "%W% %G%";
#endif #endif
/** Aliases /**
* @group
*
*
* Aliases:
* This file defines the main operations on aliases, a second name for a file. Aliases are always * This file defines the main operations on aliases, a second name for a file. Aliases are always
* textual constants (atoms). * textual constants (atoms).
* *
@ -115,6 +119,16 @@ static char SccsId[] = "%W% %G%";
static Atom FetchAlias (int sno); static Atom FetchAlias (int sno);
static bool ExistsAliasForStream (int sno, Atom al); static bool ExistsAliasForStream (int sno, Atom al);
/**
* Specify an alias to the stream. The alias <tt>Name</tt> must be an atom. The
* alias can be used instead of the stream descriptor for every operation
* concerning the stream.
*
* @param + _tname_ Name of Alias
* @param + _tstream_ stream identifier
*
* @return
*/
static Int add_alias_to_stream (USES_REGS1) static Int add_alias_to_stream (USES_REGS1)
{ {
Term tname = Deref(ARG1); Term tname = Deref(ARG1);

7
os/charsio.c
View File

@ -579,7 +579,7 @@ static Int put_byte_1(USES_REGS1) { /* '$put_byte'(Stream,N) */
return (TRUE); return (TRUE);
} }
static Int skip_1(USES_REGS1) { /* '$skip'(Stream,N) */ static Int skip_1(USES_REGS1) { /* 'skip'(N) */
Int n; Int n;
Term t2; Term t2;
int sno; int sno;
@ -607,9 +607,11 @@ static Int skip_1(USES_REGS1) { /* '$skip'(Stream,N) */
static Int skip(USES_REGS1) { /* '$skip'(Stream,N) */ static Int skip(USES_REGS1) { /* '$skip'(Stream,N) */
Int n; Int n;
Term t2; Term t2;
int sno; int sno = Yap_CheckTextStream(ARG1, Input_Stream_f, "skip/2");
int ch; int ch;
if (sno < 0)
return (FALSE);
if (IsVarTerm(t2 = Deref(ARG2))) { if (IsVarTerm(t2 = Deref(ARG2))) {
Yap_Error(INSTANTIATION_ERROR, t2, "skip/2"); Yap_Error(INSTANTIATION_ERROR, t2, "skip/2");
return FALSE; return FALSE;
@ -620,7 +622,6 @@ static Int skip(USES_REGS1) { /* '$skip'(Stream,N) */
Yap_Error(DOMAIN_ERROR_OUT_OF_RANGE, t2, "skip/2"); Yap_Error(DOMAIN_ERROR_OUT_OF_RANGE, t2, "skip/2");
return FALSE; return FALSE;
} }
sno = LOCAL_c_input_stream;
LOCK(GLOBAL_Stream[sno].streamlock); LOCK(GLOBAL_Stream[sno].streamlock);
while ((ch = GLOBAL_Stream[sno].stream_wgetc(sno)) != n && ch != -1) while ((ch = GLOBAL_Stream[sno].stream_wgetc(sno)) != n && ch != -1)
; ;

4
pl/preds.yap
View File

@ -671,8 +671,8 @@ system_predicate(A,T1) :-
Defines the relation: _P_ is a currently defined system predicate. Defines the relation: _P_ is a currently defined system predicate.
*/ */
system_predicate(P) :- system_predicate(P0) :-
strip_module(M, P), strip_module(P0, M, P),
system_predicate(_, M:P). system_predicate(_, M:P).