===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.28
retrieving revision 1.36
diff -u -p -r1.28 -r1.36
--- OpenXM/src/OpenMath/OMproxy.java	2000/01/21 07:04:55	1.28
+++ OpenXM/src/OpenMath/OMproxy.java	2000/04/17 03:18:57	1.36
@@ -1,46 +1,50 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.27 2000/01/21 06:55:45 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.35 2000/03/15 15:02:06 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
 import java.util.Stack;
 import java.io.*;
 
-class OMproxy implements Runnable{
+class OMproxy extends OpenXMserver{
   private OpenXM ox;
   private Stack stack = new Stack();
   protected boolean debug = false;
   final int version = 200001190;
 
-  public OMproxy(String host,int ControlPort,int DataPort) throws IOException{
-    ox = new OpenXM(this,host,ControlPort,DataPort);
-  }
-
-  public void run(){
+  public void computeProcess(OpenXMconnection stream){
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
-    while(true){
-      try{
-	int ox_tag = ox.receiveOXtag();
+    try{
+      while(true){
+	try{
+	  OXmessage message = stream.receive();
+	  int ox_tag = message.getTag();
 
-	switch(ox_tag){
-	case OpenXM.OX_COMMAND:
-	  StackMachine(ox.receiveSM());
-	  break;
+	  switch(ox_tag){
+	  case OXmessage.OX_COMMAND:
+	    StackMachine((SM)message.getBody());
+	    break;
 
-	case OpenXM.OX_DATA:
-	  stack.push(ox.receiveCMO());
-	  debug("push: "+ stack.peek());
-	  break;
+	  case OXmessage.OX_DATA:
+	    stack.push(message.getBody());
+	    debug("push: "+ stack.peek());
+	    break;
+	  }
+	}catch(RuntimeException e){
+	  System.err.println(e.getMessage());
+	  e.printStackTrace();
+	  debug("error occured. stack was cleared.");
 	}
-      }catch(Throwable e){
-	System.err.println(e.getMessage());
-	e.printStackTrace();
-	debug("error occured. stack was cleared.");
       }
+    }catch(IOException e){
+      System.err.println(e.getMessage());
+      e.printStackTrace();
+      System.err.println("error occured, and recovering processes seems to be impossible.");
+    }finally{
+      System.out.println("breaking...");
     }
-    //System.out.println("breaking...");
   }
 
   /*
@@ -62,7 +66,7 @@ class OMproxy implements Runnable{
 	ox.send(new CMO_NULL());
       }else{
 	debug("sending CMO: "+ stack.peek());
-	ox.send(stack.pop());
+	ox.send((CMO)stack.pop());
       }
     }catch(MathcapViolation e){
       try{
@@ -78,7 +82,7 @@ class OMproxy implements Runnable{
     int argc;
 
     if(!(stack.peek() instanceof CMO_STRING)){
-      stack.push(new CMO_ERROR2());
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
     function_name = ((CMO_STRING)stack.pop()).getString();
@@ -89,7 +93,7 @@ class OMproxy implements Runnable{
     }
 
     if(argc != 1){
-      stack.push(new CMO_ERROR2());
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
 
@@ -101,7 +105,7 @@ class OMproxy implements Runnable{
       return;
     }
 
-    stack.push(new CMO_ERROR2());
+    stack.push(new CMO_ERROR2(new CMO_NULL()));
     return;
   }
 
@@ -127,22 +131,22 @@ class OMproxy implements Runnable{
     }
 
     {
-      CMO[] CMOFormat = {new CMO_INT32(CMO.CMO_NULL),
-			 new CMO_INT32(CMO.CMO_INT32),
-			 new CMO_INT32(CMO.CMO_STRING),
-			 new CMO_INT32(CMO.CMO_LIST),
-			 new CMO_INT32(CMO.CMO_MONOMIAL32),
-			 new CMO_INT32(CMO.CMO_ZZ),
-			 new CMO_INT32(CMO.CMO_QQ),
-			 new CMO_INT32(CMO.CMO_ZERO),
-			 new CMO_INT32(CMO.CMO_DMS_GENERIC),
-			 new CMO_INT32(CMO.CMO_RECURSIVE_POLYNOMIAL),
-			 new CMO_INT32(CMO.CMO_DISTRIBUTED_POLYNOMIAL),
-			 new CMO_INT32(CMO.CMO_POLYNOMIAL_IN_ONE_VARIABLE),
-			 new CMO_INT32(CMO.CMO_BIGFLOAT),
-			 new CMO_INT32(CMO.CMO_INDETERMINATE),
-			 new CMO_INT32(CMO.CMO_TREE)};
-      CMO[] DataFormat1 = {new CMO_INT32(OpenXM.OX_DATA),
+      CMO[] CMOFormat = {new CMO_INT32(CMO.NULL),
+			 new CMO_INT32(CMO.INT32),
+			 new CMO_INT32(CMO.STRING),
+			 new CMO_INT32(CMO.LIST),
+			 new CMO_INT32(CMO.MONOMIAL32),
+			 new CMO_INT32(CMO.ZZ),
+			 new CMO_INT32(CMO.QQ),
+			 new CMO_INT32(CMO.ZERO),
+			 new CMO_INT32(CMO.DMS_GENERIC),
+			 new CMO_INT32(CMO.RECURSIVE_POLYNOMIAL),
+			 new CMO_INT32(CMO.DISTRIBUTED_POLYNOMIAL),
+			 new CMO_INT32(CMO.POLYNOMIAL_IN_ONE_VARIABLE),
+			 new CMO_INT32(CMO.BIGFLOAT),
+			 new CMO_INT32(CMO.INDETERMINATE),
+			 new CMO_INT32(CMO.TREE)};
+      CMO[] DataFormat1 = {new CMO_INT32(OXmessage.OX_DATA),
 			   new CMO_LIST(CMOFormat)};
       CMO[] list = {new CMO_LIST(DataFormat1)};
 
@@ -157,7 +161,7 @@ class OMproxy implements Runnable{
     Object mathcap = stack.pop();
 
     if(mathcap instanceof CMO_MATHCAP){
-      stack.push(new CMO_ERROR2());
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
     }
     ox.setMathCap((CMO_MATHCAP)mathcap);
   }
@@ -247,6 +251,7 @@ class OMproxy implements Runnable{
     return ret;
   }
 
+  /*
   public static void main(String argv[]){
     String host = "localhost";
     int DataPort = 1300, ControlPort = 1200;
@@ -284,4 +289,5 @@ class OMproxy implements Runnable{
       System.err.println(e.getMessage());
     }
   }
+  */
 }