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

disable make_index for now.

Browse Source
This commit is contained in:
Vítor Santos Costa 2011-06-14 09:39:19 +01:00
parent 5614d05a03
commit 866d2130af
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,12 +1,12 @@
[submodule "packages/chr"] [submodule "packages/chr"]
path = packages/chr path = packages/chr
url = git://yap.dcc.fc.up.pt/chr url = git://yap.git.sourceforge.net/gitroot/yap/chr
[submodule "packages/clpqr"] [submodule "packages/clpqr"]
path = packages/clpqr path = packages/clpqr
url = git://yap.dcc.fc.up.pt/clpqr url = git://yap.git.sourceforge.net/gitroot/yap/clpqr
[submodule "packages/jpl"] [submodule "packages/jpl"]
path = packages/jpl path = packages/jpl
url = git://yap.dcc.fc.up.pt/jpl url = git://yap.git.sourceforge.net/gitroot/yap/jpl
[submodule "packages/zlib"] [submodule "packages/zlib"]
path = packages/zlib path = packages/zlib
url = git://yap.git.sourceforge.net/gitroot/yap/zlib url = git://yap.git.sourceforge.net/gitroot/yap/zlib

24
C/scanner.c
View File

@ -774,7 +774,7 @@ Yap_scan_num(IOSTREAM *inp)
static void static void
open_comment(int ch, IOSTREAM *inp_stream) { open_comment(int ch, IOSTREAM *inp_stream USES_REGS) {
CELL *h0 = H; CELL *h0 = H;
H += 5; H += 5;
h0[0] = AbsAppl(h0+2); h0[0] = AbsAppl(h0+2);
@ -799,7 +799,7 @@ open_comment(int ch, IOSTREAM *inp_stream) {
} }
static void static void
extend_comment(int ch) { extend_comment(int ch USES_REGS) {
LOCAL_CommentsBuff[LOCAL_CommentsBuffPos] = ch; LOCAL_CommentsBuff[LOCAL_CommentsBuffPos] = ch;
LOCAL_CommentsBuffPos++; LOCAL_CommentsBuffPos++;
if (LOCAL_CommentsBuffPos == LOCAL_CommentsBuffLim-1) { if (LOCAL_CommentsBuffPos == LOCAL_CommentsBuffLim-1) {
@ -809,7 +809,7 @@ extend_comment(int ch) {
} }
static void static void
close_comment(void) { close_comment( USES_REGS1 ) {
LOCAL_CommentsBuff[LOCAL_CommentsBuffPos] = '\0'; LOCAL_CommentsBuff[LOCAL_CommentsBuffPos] = '\0';
*LOCAL_CommentsNextChar = Yap_MkBlobWideStringTerm(LOCAL_CommentsBuff, LOCAL_CommentsBuffPos); *LOCAL_CommentsNextChar = Yap_MkBlobWideStringTerm(LOCAL_CommentsBuff, LOCAL_CommentsBuffPos);
free(LOCAL_CommentsBuff); free(LOCAL_CommentsBuff);
@ -903,22 +903,22 @@ Yap_tokenizer(IOSTREAM *inp_stream, int store_comments, Term *tposp)
case CC: case CC:
if (store_comments) { if (store_comments) {
CHECK_SPACE(); CHECK_SPACE();
open_comment(ch, inp_stream); open_comment(ch, inp_stream PASS_REGS);
continue_comment: continue_comment:
while ((ch = getchr(inp_stream)) != 10 && chtype(ch) != EF) { while ((ch = getchr(inp_stream)) != 10 && chtype(ch) != EF) {
CHECK_SPACE(); CHECK_SPACE();
extend_comment(ch); extend_comment(ch PASS_REGS);
} }
CHECK_SPACE(); CHECK_SPACE();
extend_comment(ch); extend_comment(ch PASS_REGS);
if (chtype(ch) != EF) { if (chtype(ch) != EF) {
ch = getchr(inp_stream); ch = getchr(inp_stream);
if (chtype(ch) == CC) { if (chtype(ch) == CC) {
extend_comment(ch); extend_comment(ch PASS_REGS);
goto continue_comment; goto continue_comment;
} }
} }
close_comment(); close_comment( PASS_REGS1 );
} else { } else {
while ((ch = getchr(inp_stream)) != 10 && chtype(ch) != EF); while ((ch = getchr(inp_stream)) != 10 && chtype(ch) != EF);
} }
@ -1218,18 +1218,18 @@ Yap_tokenizer(IOSTREAM *inp_stream, int store_comments, Term *tposp)
if (och == '/' && ch == '*') { if (och == '/' && ch == '*') {
if (store_comments) { if (store_comments) {
CHECK_SPACE(); CHECK_SPACE();
open_comment('/', inp_stream); open_comment('/', inp_stream PASS_REGS);
while ((och != '*' || ch != '/') && chtype(ch) != EF) { while ((och != '*' || ch != '/') && chtype(ch) != EF) {
och = ch; och = ch;
CHECK_SPACE(); CHECK_SPACE();
extend_comment(ch); extend_comment(ch PASS_REGS);
ch = getchr(inp_stream); ch = getchr(inp_stream);
} }
if (chtype(ch) != EF) { if (chtype(ch) != EF) {
CHECK_SPACE(); CHECK_SPACE();
extend_comment(ch); extend_comment(ch PASS_REGS);
} }
close_comment(); close_comment( PASS_REGS1 );
} else { } else {
while ((och != '*' || ch != '/') && chtype(ch) != EF) { while ((och != '*' || ch != '/') && chtype(ch) != EF) {
och = ch; och = ch;

8
packages/CLPBN/learning/example/school_params.yap
View File

@ -10,8 +10,8 @@
%:- clpbn:set_clpbn_flag(em_solver,gibbs). %:- clpbn:set_clpbn_flag(em_solver,gibbs).
%:- clpbn:set_clpbn_flag(em_solver,jt). %:- clpbn:set_clpbn_flag(em_solver,jt).
:- clpbn:set_clpbn_flag(em_solver,ve). %:- clpbn:set_clpbn_flag(em_solver,ve).
%:- clpbn:set_clpbn_flag(em_solver,bp). :- clpbn:set_clpbn_flag(em_solver,bp).
timed_main :- timed_main :-
statistics(runtime, _), statistics(runtime, _),
@ -40,8 +40,8 @@ graph([professor_ability(p0,_G131367),professor_ability(p1,h),professor_ability(
% %
% change to 0.0, 0.1, 0.2 to make things simpler/harder % change to 0.0, 0.1, 0.2 to make things simpler/harder
% %%
missing(0.5). missing(0.99).
% miss 30% of the examples. % miss 30% of the examples.
goal(professor_ability(P,V)) :- goal(professor_ability(P,V)) :-

2
packages/chr

@ -1 +1 @@
Subproject commit 9b0d051d7c1b5a665df6c71b98fde555532aaab4 Subproject commit 59f3bce3c819d7a9459ec26bfb41c78f7dd9a500