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

Merge branch 'master' of ssh://ssh.dcc.fc.up.pt:31064/home/vsc/yap

Browse Source
This commit is contained in:
Vitor Santos Costa 2019-03-03 12:27:29 +00:00
commit 7ab1624401
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/parser.c
View File

@ -64,8 +64,6 @@ static void syntax_msg(const char *msg, ...) {
if (!LOCAL_ErrorMessage) { if (!LOCAL_ErrorMessage) {
LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE + 1); LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE + 1);
} }
LOCAL_ActiveError->parserLine = LOCAL_toktide->TokLine;
LOCAL_ActiveError->parserPos = LOCAL_toktide->TokPos;
va_start(ap, msg); va_start(ap, msg);
vsnprintf(LOCAL_ErrorMessage, MAX_ERROR_MSG_SIZE, msg, ap); vsnprintf(LOCAL_ErrorMessage, MAX_ERROR_MSG_SIZE, msg, ap);
va_end(ap); va_end(ap);

4
os/readterm.c
View File

@ -376,9 +376,9 @@ static Term syntax_error(TokEntry *errtok, int sno, Term cmod, Int newpos, bool
Yap_MkErrorRecord(LOCAL_ActiveError, __FILE__, __FUNCTION__, __LINE__, SYNTAX_ERROR, 0, NULL); Yap_MkErrorRecord(LOCAL_ActiveError, __FILE__, __FUNCTION__, __LINE__, SYNTAX_ERROR, 0, NULL);
TokEntry *tok = LOCAL_tokptr; TokEntry *tok = LOCAL_tokptr;
Int start_line = tok->TokLine; Int start_line = tok->TokLine;
Int err_line = errtok->TokLine; Int err_line = LOCAL_toktide->TokLine;
Int startpos = tok->TokPos; Int startpos = tok->TokPos;
Int errpos = errtok->TokPos; Int errpos = LOCAL_toktide->TokPos;
Int end_line = GetCurInpLine(GLOBAL_Stream + sno); Int end_line = GetCurInpLine(GLOBAL_Stream + sno);
Int endpos = GetCurInpPos(GLOBAL_Stream + sno); Int endpos = GetCurInpPos(GLOBAL_Stream + sno);

2
packages/ProbLog/problog_examples/learn_graph.pl
View File

@ -15,7 +15,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
:- use_module(library(matrix)). :- use_module(library(matrix)).
:- use_module(('../problog_lbfgs')). :- use_module('../problog_learning').
%%%% %%%%
% background knowledge % background knowledge

4
packages/ProbLog/problog_learning.yap
View File

@ -220,7 +220,7 @@
:- use_module(library(system), [file_exists/1, shell/2]). :- use_module(library(system), [file_exists/1, shell/2]).
% load our own modules % load our own modules
:- use_module(problog). :- reexport(problog).
:- use_module('problog/logger'). :- use_module('problog/logger').
:- use_module('problog/flags'). :- use_module('problog/flags').
:- use_module('problog/os'). :- use_module('problog/os').
@ -1335,7 +1335,7 @@ lineSearch(Final_X,Final_Value) :-
line_search_evaluate_point(InitLeft,Value_InitLeft), line_search_evaluate_point(InitLeft,Value_InitLeft),
i Parameters=ls(A,B,InitLeft,InitRight,Value_A,Value_B,Value_InitLeft,Value_InitRight,1), Parameters=ls(A,B,InitLeft,InitRight,Value_A,Value_B,Value_InitLeft,Value_InitRight,1),
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% BEGIN BACK TRACKING %%%% BEGIN BACK TRACKING

2
pl/debug.yap
View File

@ -477,7 +477,7 @@ be lost.
'$trace_goal'(G, M, GoalNumber, H) :- '$trace_goal'(G, M, GoalNumber, H) :-
'$undefined'(G, M), '$undefined'(G, M),
!, !,
'$get_undefined_pred'(M:G, NM:Goal), '$get_undefined_predicates'(M:G, NM:Goal),
( ( M == NM ; NM == prolog), G == Goal ( ( M == NM ; NM == prolog), G == Goal
-> ->
yap_flag( unknown, Action ), yap_flag( unknown, Action ),