Skip to content

Commit ed9bae9

Browse files
committed
update rolog pack
1 parent ac28f75 commit ed9bae9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/rolog.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ PREDICATE(r_eval_, 1)
13821382
throw PlException(PlTerm_string("R not initialized. Please invoke r_init.")) ;
13831383

13841384
CharacterVector names ;
1385-
term_t vars = PL_new_term_ref() ;
1385+
PlTerm_var vars ;
13861386
List options ;
13871387
options = List::create(
13881388
Named("realvec") = "##", Named("realmat") = "###",
@@ -1391,7 +1391,7 @@ PREDICATE(r_eval_, 1)
13911391
Named("intvec") = "%%", Named("intmat") = "%%%",
13921392
Named("atomize") = false, Named("scalar") = true) ;
13931393

1394-
RObject Expr = pl2r(A1.unwrap(), names, vars, options) ;
1394+
RObject Expr = pl2r(A1, names, vars, options) ;
13951395
RObject Res = Expr ;
13961396
try
13971397
{
@@ -1429,7 +1429,7 @@ PREDICATE(r_eval_, 2)
14291429
throw PlException(PlTerm_string("R not initialized. Please invoke r_init.")) ;
14301430

14311431
CharacterVector names ;
1432-
term_t vars = PL_new_term_ref() ;
1432+
PlTerm_var vars ;
14331433
List options ;
14341434
options = List::create(
14351435
Named("realvec") = "##", Named("realmat") = "###",
@@ -1438,7 +1438,7 @@ PREDICATE(r_eval_, 2)
14381438
Named("intvec") = "%%", Named("intmat") = "%%%",
14391439
Named("atomize") = false, Named("scalar") = true) ;
14401440

1441-
RObject Expr = pl2r(A1.unwrap(), names, vars, options) ;
1441+
RObject Expr = pl2r(A1, names, vars, options) ;
14421442
RObject Res = Expr ;
14431443
try
14441444
{
@@ -1469,7 +1469,7 @@ PREDICATE(r_eval_, 2)
14691469

14701470
try
14711471
{
1472-
if(!A2.unify_term(PlTerm_term_t(r2pl(Res, names, vars, options))))
1472+
if(!A2.unify_term(r2pl(Res, names, vars, options)))
14731473
{
14741474
throw PlException(PlTerm_string("r_eval/2: Cannot unify R object.")) ;
14751475
return false ;

0 commit comments

Comments
 (0)