===================================================================
RCS file: /home/cvs/OpenXM/src/k097/lib/ox/ox.k,v
retrieving revision 1.3
retrieving revision 1.10
diff -u -p -r1.3 -r1.10
--- OpenXM/src/k097/lib/ox/ox.k	2000/12/10 11:07:45	1.3
+++ OpenXM/src/k097/lib/ox/ox.k	2001/01/13 12:40:57	1.10
@@ -1,14 +1,17 @@
-/* $OpenXM: OpenXM/src/k097/lib/ox/ox.k,v 1.2 2000/12/06 23:45:32 takayama Exp $  */
+/* $OpenXM: OpenXM/src/k097/lib/ox/ox.k,v 1.9 2000/12/27 10:16:12 takayama Exp $  */
 
-Load_sm1(["ox.sm1",AddString([GetEnv("OpenXM_HOME"),"/lib/sm1/ox.sm1"])],
-         "ox.sm1.loaded");
-def void Error(s) {
-  sm1(" s error ");
-}
+/* Load_sm1(["ox.sm1",AddString([GetEnv("OpenXM_HOME"),"/lib/sm1/ox.sm1"])],
+         "ox.sm1.loaded"); */
+Load_sm1(["oxasir.sm1",AddString([GetEnv("OpenXM_HOME"),
+          "/lib/sm1/oxasir.sm1"])],
+         "oxasir.sm1.loaded");
 
 class OXchannel extends Object {
   local channel;
   /* Just add a tag. */
+  def getChannel() {
+    return(channel);
+  }
   def generate(c) {
     this = new();
     if (IsArray(c)) {
@@ -34,12 +37,31 @@ class OXchannel extends Object {
     if (IsInteger(ob)) {
       ob = IntegerToSm1Integer(ob);
     }
-    sm1(" cc ob oxpushcmd ");
+    sm1(" [(oxPushCMD) cc ob] extension ");
   }
+
+  def popCMO() {
+    local cc,r;
+    cc = channel;
+    sm1(" cc oxpopcmo /r set ");
+    return(r);
+  }
+
+  def popString() {
+    local cc,r;
+    cc = channel;
+    sm1(" cc oxpopstring /r set ");
+    return(r);
+  }
+    
+
 }
 
 class OXcontrol extends Object {
   local control;
+  def getControl() {
+    return(control);
+  }
   def generate(c) {
      if (Tag(c) != 0) {
        control = c;
@@ -50,12 +72,13 @@ class OXcontrol extends Object {
   }
   def start() {
     local c,e, pass, peer, data, s, stmp;
-    this = new(super.new0());
+    this = new(Object.new0());
     sm1(" [(oxGenPass)] extension /pass set ");
     sm1(" [(oxGetPort1) (localhost)] extension /peer set ");
     sm1(" /data peer 1 get toString def ");
     s = AddString(
-      ["/home/nobuki/OpenXM/src/oxc/oxc", 
+      [GetEnv("OpenXM_HOME"),
+       "/bin/oxc", 
        " -c ", pass, " -h "," localhost ", " -p ", data, " -x ",
        " & "]);
     sm1(" [ (/bin/csh -c \") s (\") ] cat /stmp set ");
@@ -71,27 +94,143 @@ class OXcontrol extends Object {
   def pushCMD(a) {
     control.channel.pushCMD(a);
   }
+  def popCMO() {
+    return(control.channel.popCMO());
+  }
+  def popString() {
+    return(control.channel.popString());
+  }
 
 }
 
+/* How to debug?
+   sm1(" OX { vname } sendmsg /aaa set ");
+   Get the value of vname in the context OX and set it to aaa.
+*/
 
 class OX extends OXcontrol {
-  local engine;
-  /* OX.generate(null,"ox_sm1"); */
-  def generate(control,name) {
+  local engine, engineIDs;
+  def getEngine() {
+     return(engine);
+  }
+  def getEngineIDs() {
+     return(engineIDs);
+  }
+  /* OX.generate("ox_sm1"); or OX.generate("ox_sm1",null) */
+  def generate(name,control) {
     local c,e, pass, peer, data, s, stmp, engineID;
-    this = new(super.generate(control));
-    control = this.control;
+    if (Length(Arglist) == 0) {
+      name = "ox_sm1";  control = null;
+    }
+    if (Length(Arglist) == 1) {
+      control = null;
+    }
+    this = new(OXcontrol.generate(control));
+    control = this.getControl();
     sm1(" [(oxGetPort1) (localhost)] extension /peer set ");
     sm1(" /data peer 1 get def ");
-    control.pushCMO(data);
-    control.pushCMO(name);
+    /* BUG: control.pushCMO(data) does not work. 
+            Use control = super.getControl(); */
+    control.pushCMO([[data],name]);
     control.pushCMD(SM_control_spawn_server);
     engineID = control.popCMO();
+    print("engineID=");Println(engineID);
+    if (Tag(engineID) == 257 ) {  /* error object */
+       Error("Server could be found.");
+    }
+    engineIDs = [engineID];
     sm1(" [(oxCreateEngine_RFC_101) peer 0 (Empty) engineID] extension /c set ");
     engine = OXchannel.generate(c);
     return(this);
   }
+  def pushCMO(a) {
+    engine.channel.pushCMO(a);
+  }
+  def pushCMD(a) {
+    engine.channel.pushCMD(a);
+  }
+  def popCMO() {
+    return(engine.channel.popCMO());
+  }
+  def popString() {
+    return(engine.channel.popString());
+  }
 
+  def rpc_submit(func,ar) {
+     local n,i,one,comm;
+     if (! IsString(func)) {
+       Error("The first argument of rpc must be a string.");
+     }
+     if (! IsArray(ar)) {
+       Error("The second argument of rpc must be a list.");
+     }
+     one = IntegerToSm1Integer(1);
+     sm1(" getVlist2 toString /comm set ");
+     comm = AddString(["OxVlist=",comm,";"]);
+     this.pushCMO(comm);
+     this.pushCMD(SM_executeStringByLocalParser);
+
+     this.pushCMO("print(OxVlist);");
+     this.pushCMD(SM_executeStringByLocalParser);
+
+     n = Length(ar);
+     for (i=n-1; i>=0; i--) {
+       this.pushCMO(ar[i]);
+       this.pushCMO(one);
+       this.pushCMO("ox_dtop");
+       this.pushCMD(SM_executeFunction);
+     }
+     this.pushCMO(IntegerToSm1Integer(n));
+     this.pushCMO(func);
+     this.pushCMD(SM_executeFunction);
+
+  }
+
+  def rpc(func,ar) {
+     local one;
+     sm1(" /one 1 def ");
+     rpc_submit(func,ar);
+     this.pushCMO(one);
+     this.pushCMO("ox_ptod");
+     this.pushCMD(SM_executeFunction);
+     return(this.popCMO());
+  }
+
+  def rpc_str(func,ar) {
+     rpc_submit(func,ar);
+     return(this.popString());
+  }
+  def executeString(s) {
+     this.pushCMO(s);
+     this.pushCMD(SM_executeStringByLocalParser);
+  }
+
 }
 
+/*
+  Example:
+     a = startAsir();
+     f = a.rpc("fctr",[x^10-1]);
+     Println(f);
+*/
+def startAsir() {
+  local a,asirpeer;
+  a = OX.generate("ox_asir");
+  asirpeer = (a.getEngine()).getChannel();
+  Println(asirpeer);
+  sm1(" [asirpeer oxasirpath.asirlib] loadAsirFile ");
+  return(a);
+}
+
+class Asir extends OX {
+  local ;
+  def generate() {
+    local asirpeer,a;
+    this = new(OX.generate("ox_asir",null));
+    a = this;
+    asirpeer = (a.getEngine()).getChannel();
+    Println(asirpeer);
+    sm1(" [asirpeer oxasirpath.asirlib] loadAsirFile ");
+    return(this);
+  }
+}