===================================================================
RCS file: /home/cvs/OpenXM/src/k097/lib/ox/ox.k,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- OpenXM/src/k097/lib/ox/ox.k	2000/12/11 13:53:28	1.4
+++ OpenXM/src/k097/lib/ox/ox.k	2000/12/12 13:58:21	1.5
@@ -1,14 +1,17 @@
-/* $OpenXM: OpenXM/src/k097/lib/ox/ox.k,v 1.3 2000/12/10 11:07:45 takayama Exp $  */
+/* $OpenXM: OpenXM/src/k097/lib/ox/ox.k,v 1.4 2000/12/11 13:53:28 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)) {
@@ -48,6 +51,9 @@ class OXchannel extends Object {
 
 class OXcontrol extends Object {
   local control;
+  def getControl() {
+    return(control);
+  }
   def generate(c) {
      if (Tag(c) != 0) {
        control = c;
@@ -63,7 +69,8 @@ class OXcontrol extends Object {
     sm1(" [(oxGetPort1) (localhost)] extension /peer set ");
     sm1(" /data peer 1 get toString def ");
     s = AddString(
-      ["/home/nobuki/OpenXM/src/oxc/oxc", 
+      [GetEnv("OpenXM_HOME"),
+       "/src/oxc/oxc", 
        " -c ", pass, " -h "," localhost ", " -p ", data, " -x ",
        " & "]);
     sm1(" [ (/bin/csh -c \") s (\") ] cat /stmp set ");
@@ -91,24 +98,98 @@ class OXcontrol extends Object {
 */
 
 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;
+    if (Length(Arglist) == 0) {
+      name = "ox_sm1";  control = null;
+    }
+    if (Length(Arglist) == 1) {
+      control = null;
+    }
     this = new(super.generate(control));
-    control = this.control;
+    control = super.getControl();
     sm1(" [(oxGetPort1) (localhost)] extension /peer set ");
     sm1(" /data peer 1 get def ");
-    control.pushCMO(data);
+    control.pushCMO(data); /* BUG: control.pushCMO(data) does not work. 
+                              Use control = super.getControl(); */
     control.pushCMO(name);
     control.pushCMD(SM_control_spawn_server);
     engineID = control.popCMO();
     print("engineID=");Println(engineID);
-    HOGE = control;
+    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 rpc(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);
+
+     this.pushCMO(one);
+     this.pushCMO("ox_ptod");
+     this.pushCMD(SM_executeFunction);
+     return(this.popCMO());
+  }
+
+}
+
+/*
+  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);
 }