diff --git a/C/parser.c b/C/parser.c index 85a2ddb2b..85ee7aa88 100755 --- a/C/parser.c +++ b/C/parser.c @@ -64,8 +64,6 @@ static void syntax_msg(const char *msg, ...) { if (!LOCAL_ErrorMessage) { LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE + 1); } - LOCAL_ActiveError->parserLine = LOCAL_toktide->TokLine; - LOCAL_ActiveError->parserPos = LOCAL_toktide->TokPos; va_start(ap, msg); vsnprintf(LOCAL_ErrorMessage, MAX_ERROR_MSG_SIZE, msg, ap); va_end(ap); diff --git a/os/readterm.c b/os/readterm.c index a9709f55d..5b247f4b6 100644 --- a/os/readterm.c +++ b/os/readterm.c @@ -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); TokEntry *tok = LOCAL_tokptr; Int start_line = tok->TokLine; - Int err_line = errtok->TokLine; + Int err_line = LOCAL_toktide->TokLine; Int startpos = tok->TokPos; - Int errpos = errtok->TokPos; + Int errpos = LOCAL_toktide->TokPos; Int end_line = GetCurInpLine(GLOBAL_Stream + sno); Int endpos = GetCurInpPos(GLOBAL_Stream + sno); diff --git a/packages/ProbLog/problog_examples/learn_graph.pl b/packages/ProbLog/problog_examples/learn_graph.pl index 4e15cfedf..1970599d4 100644 --- a/packages/ProbLog/problog_examples/learn_graph.pl +++ b/packages/ProbLog/problog_examples/learn_graph.pl @@ -15,7 +15,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% :- use_module(library(matrix)). -:- use_module(('../problog_lbfgs')). +:- use_module('../problog_learning'). %%%% % background knowledge diff --git a/packages/ProbLog/problog_learning.yap b/packages/ProbLog/problog_learning.yap index 5d60bf244..a9f3993db 100644 --- a/packages/ProbLog/problog_learning.yap +++ b/packages/ProbLog/problog_learning.yap @@ -220,7 +220,7 @@ :- use_module(library(system), [file_exists/1, shell/2]). % load our own modules -:- use_module(problog). +:- reexport(problog). :- use_module('problog/logger'). :- use_module('problog/flags'). :- use_module('problog/os'). @@ -1335,7 +1335,7 @@ lineSearch(Final_X,Final_Value) :- 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 diff --git a/pl/debug.yap b/pl/debug.yap index ca648226f..d7af3a948 100644 --- a/pl/debug.yap +++ b/pl/debug.yap @@ -477,7 +477,7 @@ be lost. '$trace_goal'(G, M, GoalNumber, H) :- '$undefined'(G, M), !, - '$get_undefined_pred'(M:G, NM:Goal), + '$get_undefined_predicates'(M:G, NM:Goal), ( ( M == NM ; NM == prolog), G == Goal -> yap_flag( unknown, Action ),