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

Merge branch 'master' of ../yap-6.2

This commit is contained in:
Vitor Santos Costa 2010-12-30 23:40:07 -06:00
parent fa0e2d6954 150d54d527
commit 06d42c8b39
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
C/cdmgr.c
View File

@ -918,6 +918,7 @@ split_megaclause(PredEntry *ap)
} }
return; return;
} }
break;
} }
Yap_ClauseSpace += sizeof(StaticClause)+mcl->ClItemSize+(UInt)NEXTOP((yamop *)NULL,p); Yap_ClauseSpace += sizeof(StaticClause)+mcl->ClItemSize+(UInt)NEXTOP((yamop *)NULL,p);
new->ClFlags = StaticMask|FactMask; new->ClFlags = StaticMask|FactMask;

4
C/scanner.c
View File

@ -636,10 +636,6 @@ get_num(int *chp, int *chbuffp, int inp_stream, int (*Nxtch) (int), int (*Quoted
char *sp0 = sp; char *sp0 = sp;
char cbuff = ch; char cbuff = ch;
if (yap_flags[STRICT_ISO_FLAG] && ch == 'E') {
Yap_ErrorMessage = "Float format not allowed in ISO mode";
return TermNil;
}
if (--max_size == 0) { if (--max_size == 0) {
Yap_ErrorMessage = "Number Too Long"; Yap_ErrorMessage = "Number Too Long";
return TermNil; return TermNil;

2
Makefile.in
View File

@ -28,7 +28,7 @@ INCLUDEDIR=$(ROOTDIR)/include/Yap
# #
INFODIR=$(SHAREDIR)/info INFODIR=$(SHAREDIR)/info
# #
# where to store documentaion files # where to store documentation files
# #
DOCSDIR=$(SHAREDIR)/doc/Yap DOCSDIR=$(SHAREDIR)/doc/Yap

2
pl/boot.yap
View File

@ -515,7 +515,7 @@ true :- true.
X == '$', !, X == '$', !,
( recorded('$reconsulting',_,R) -> erase(R) ). ( recorded('$reconsulting',_,R) -> erase(R) ).
'$prompt_alternatives_on'(groundness). '$prompt_alternatives_on'(determinism).
/* Executing a query */ /* Executing a query */

2
pl/init.yap
View File

@ -206,5 +206,5 @@ file_search_path(system, Dir) :-
prolog_flag(host_type, Dir). prolog_flag(host_type, Dir).
file_search_path(foreign, yap('lib/Yap')). file_search_path(foreign, yap('lib/Yap')).
%:- yap_flag(unknown,error). :- yap_flag(unknown,error).

6
pl/utils.yap
View File

@ -668,10 +668,14 @@ sub_atom(At, Bef, Size, After, SubAt) :-
atom_to_term(Atom, Term, Bindings) :- atom_to_term(Atom, Term, Bindings) :-
atom_codes(Atom, Chars), atom_codes(Atom, Chars),
charsio:open_mem_read_stream(Chars, Stream), charsio:open_mem_read_stream(Chars, Stream),
read_term(Stream, T, [variable_names(Bindings)]), catch(read_term(Stream, T, [variable_names(Bindings)]),Error,'$handle_atom_to_term_error'(Stream, Error)),
close(Stream), close(Stream),
T = Term. T = Term.
'$handle_atom_to_term_error'(Stream, Error) :-
close(Stream),
throw(Error).
term_to_atom(Term,Atom) :- term_to_atom(Term,Atom) :-
nonvar(Atom), !, nonvar(Atom), !,
atom_codes(Atom,S), atom_codes(Atom,S),