r + lbfhs

packages/real/yap4r/src/yap4r.cpp

@@ -20,14 +20,19 @@ class yap4r {
   std::vector<YAPTerm> args;
   bool failed;
   
+
 public:
+
+  SEXP qsexp;
   yap4r();
-  bool query(std::string p_name,std::string p_module,Rcpp::GenericVector sexps);
+  bool query(std::string p_name, GenericVector  sexps=R_NilValue, std::string p_module="user"); 
   bool more();
   bool done();
   SEXP peek(int i);
+  bool compile(std::string s);
+  bool library(std::string s);
 };
-
+  
   yap4r::yap4r() {
   YAPEngineArgs *yargs = new YAPEngineArgs();
   yap = new YAPEngine(yargs);
@@ -36,25 +41,29 @@ public:
 
 
 
-  bool yap4r::query(std::string p_name,std::string p_module,Rcpp::GenericVector sexps) {
- 
+bool yap4r::query(std::string p_name, GenericVector  sexps, std::string p_module) {  
   if (q) {
     q->close();
     q = nullptr;
   }
-  std::vector<Term> args = std::vector<Term>();
+  yhandle_t t;
+  arity_t arity;
+  if (sexps.isNULL()) {
+    YAPTerm qt = YAPAtomTerm(p_name.c_str());
+  q = new YAPQuery(qt);
+t =qt.handle();
+  } else {
+arity = sexps.length();
+    std::vector<YAPTerm> args = std::vector<YAPTerm>();
   yhandle_t sls = Yap_NewHandles(sexps.length());
   for (int i=0; i<sexps.length();i++) {
     if (!sexp_to_pl(sls+i, sexps[i]))
       return false;
-    args.push_back( Yap_GetFromSlot(sls+i) );
+    args.push_back( YAPTerm(Yap_GetFromSlot(sls+i)) );
   }
-  if (i==0) {
-    YAPTerm qt = YAPAtomTerm(p_name);
-  q = new YAPQuery(qt);
-  } else {
-    YAPFunctor f= YAPFunctor(p_name, args.length());
-    YAPAtomTerm mod = YAPAtomTerm(p_module);
+  YAPFunctor f= YAPFunctor(p_name.c_str(), arity);
+  YAPAtomTerm mod = YAPAtomTerm(p_module.c_str());
+  t = YAPApplTerm(p_name.c_str(),args.data()).handle();
     q = new YAPQuery(f,mod,args.data());
   }
   if (q == nullptr)
@@ -64,10 +73,25 @@ public:
     failed = true;
     q = nullptr;
   }
-  return true;
+  if(rc)
+    qsexp  = term_to_sexp(t, false);
+
+  return rc;
 }
 
-  
+bool yap4r::compile(std::string s) {
+  YAPTerm fs[1];
+  fs[0] = YAPAtomTerm(s.c_str());
+  return yap->mgoal(YAPApplTerm("compile",fs).term(), USER_MODULE); 
+
+}
+bool yap4r::library(std::string s) {
+  YAPTerm fs[1], l[1];
+  l[0] = YAPAtomTerm(s.c_str());
+  fs[0] = YAPApplTerm("library", l);
+  return yap->mgoal(YAPApplTerm("compile",fs).term(), USER_MODULE); 
+
+}
 
   bool yap4r::more() {
     bool rc = true;
@@ -96,6 +120,8 @@ public:
   SEXP yap4r::peek(int i) {
     if (failed || q==nullptr)
 	return R_MissingArg;
+    if  (i==0)
+      return qsexp;
     return term_to_sexp(Yap_InitSlot(Yap_XREGS[i]), false);
   }
 
@@ -106,6 +132,8 @@ public:
       .method( "query", &yap4r::query, "create an active query within the engine")
       .method( "more", &yap4r::more, "ask for an extra solution")
       .method( "done", &yap4r::done, "terminate the query")
+      .method( "compile", &yap4r::compile, "compile the file")
+      .method( "library", &yap4r::library, "compile the library")
       .method( "peek", &yap4r::peek, "load arg[i] into R")
       ;
 }