@@ -1382,7 +1382,7 @@ PREDICATE(r_eval_, 1)
1382
1382
throw PlException (PlTerm_string (" R not initialized. Please invoke r_init." )) ;
1383
1383
1384
1384
CharacterVector names ;
1385
- term_t vars = PL_new_term_ref () ;
1385
+ PlTerm_var vars ;
1386
1386
List options ;
1387
1387
options = List::create (
1388
1388
Named (" realvec" ) = " ##" , Named (" realmat" ) = " ###" ,
@@ -1391,7 +1391,7 @@ PREDICATE(r_eval_, 1)
1391
1391
Named (" intvec" ) = " %%" , Named (" intmat" ) = " %%%" ,
1392
1392
Named (" atomize" ) = false , Named (" scalar" ) = true ) ;
1393
1393
1394
- RObject Expr = pl2r (A1. unwrap () , names, vars, options) ;
1394
+ RObject Expr = pl2r (A1, names, vars, options) ;
1395
1395
RObject Res = Expr ;
1396
1396
try
1397
1397
{
@@ -1429,7 +1429,7 @@ PREDICATE(r_eval_, 2)
1429
1429
throw PlException (PlTerm_string (" R not initialized. Please invoke r_init." )) ;
1430
1430
1431
1431
CharacterVector names ;
1432
- term_t vars = PL_new_term_ref () ;
1432
+ PlTerm_var vars ;
1433
1433
List options ;
1434
1434
options = List::create (
1435
1435
Named (" realvec" ) = " ##" , Named (" realmat" ) = " ###" ,
@@ -1438,7 +1438,7 @@ PREDICATE(r_eval_, 2)
1438
1438
Named (" intvec" ) = " %%" , Named (" intmat" ) = " %%%" ,
1439
1439
Named (" atomize" ) = false , Named (" scalar" ) = true ) ;
1440
1440
1441
- RObject Expr = pl2r (A1. unwrap () , names, vars, options) ;
1441
+ RObject Expr = pl2r (A1, names, vars, options) ;
1442
1442
RObject Res = Expr ;
1443
1443
try
1444
1444
{
@@ -1469,7 +1469,7 @@ PREDICATE(r_eval_, 2)
1469
1469
1470
1470
try
1471
1471
{
1472
- if (!A2.unify_term (PlTerm_term_t ( r2pl (Res, names, vars, options) )))
1472
+ if (!A2.unify_term (r2pl (Res, names, vars, options)))
1473
1473
{
1474
1474
throw PlException (PlTerm_string (" r_eval/2: Cannot unify R object." )) ;
1475
1475
return false ;
0 commit comments