===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.22
retrieving revision 1.34
diff -u -p -r1.22 -r1.34
--- OpenXM/src/OpenMath/OMproxy.java	2000/01/19 15:32:50	1.22
+++ OpenXM/src/OpenMath/OMproxy.java	2000/03/14 05:38:49	1.34
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.21 2000/01/19 15:21:58 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.33 2000/03/14 05:10:37 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -20,27 +20,34 @@ class OMproxy implements Runnable{
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
-    while(true){
-      try{
-	int ox_tag = ox.receiveOXtag();
+    try{
+      while(true){
+	try{
+	  int ox_tag = ox.receiveOXtag();
 
-	switch(ox_tag){
-	case OpenXM.OX_COMMAND:
-	  StackMachine(ox.receiveSM());
-	  break;
+	  switch(ox_tag){
+	  case OpenXM.OX_COMMAND:
+	    StackMachine(ox.receiveSM());
+	    break;
 
-	case OpenXM.OX_DATA:
-	  stack.push(ox.receiveCMO());
-	  debug("push: "+ stack.peek());
-	  break;
+	  case OpenXM.OX_DATA:
+	    stack.push(ox.receiveCMO());
+	    debug("push: "+ stack.peek());
+	    break;
+	  }
+	}catch(RuntimeException e){
+	  System.err.println(e.getMessage());
+	  e.printStackTrace();
+	  debug("error occured. stack was cleared.");
 	}
-      }catch(Exception 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...");
   }
 
   /*
@@ -57,32 +64,39 @@ class OMproxy implements Runnable{
   */
 
   private void SM_popCMO() throws java.io.IOException{
-    if(stack.empty()){
-      ox.send(new CMO_NULL());
-    }else{
-      debug("sending CMO: "+ stack.peek());
-      ox.send(stack.pop());
+    try{
+      if(stack.empty()){
+	ox.send(new CMO_NULL());
+      }else{
+	debug("sending CMO: "+ stack.peek());
+	ox.send(stack.pop());
+      }
+    }catch(MathcapViolation e){
+      try{
+	ox.send(new CMO_ERROR2(new CMO_STRING("MathcapViolation: "+
+					      e.getMessage())));
+      }catch(MathcapViolation tmp){}
     }
   }
 
   private void SM_executeFunction() throws java.io.IOException{
     String function_name;
     CMO[] argv;
-    int argc = 1;
+    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();
-    //argc = ((CMO_INT32)stack.pop()).intValue();
+    argc = ((CMO_INT32)stack.pop()).intValue();
     argv = new CMO[argc];
     for(int i=0;i<argc;i++){
       argv[i] = (CMO)stack.pop();
     }
 
     if(argc != 1){
-      stack.push(new CMO_ERROR2());
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
 
@@ -94,7 +108,7 @@ class OMproxy implements Runnable{
       return;
     }
 
-    stack.push(new CMO_ERROR2());
+    stack.push(new CMO_ERROR2(new CMO_NULL()));
     return;
   }
 
@@ -120,21 +134,21 @@ 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[] 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(OpenXM.OX_DATA),
 			   new CMO_LIST(CMOFormat)};
       CMO[] list = {new CMO_LIST(DataFormat1)};
@@ -146,6 +160,15 @@ class OMproxy implements Runnable{
     debug("push: "+ stack.peek());
   }
 
+  private void SM_setMathCap() throws java.io.IOException{
+    Object mathcap = stack.pop();
+
+    if(mathcap instanceof CMO_MATHCAP){
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
+    }
+    ox.setMathCap((CMO_MATHCAP)mathcap);
+  }
+
   private void StackMachine(SM mesg) throws java.io.IOException{
     debug("receive: "+mesg);
 
@@ -160,6 +183,10 @@ class OMproxy implements Runnable{
 
     case SM.SM_mathcap:
       SM_mathcap();
+      break;
+
+    case SM.SM_setMathCap:
+      SM_setMathCap();
       break;
 
     default: