===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.22
retrieving revision 1.26
diff -u -p -r1.22 -r1.26
--- OpenXM/src/OpenMath/OMproxy.java	2000/01/19 15:32:50	1.22
+++ OpenXM/src/OpenMath/OMproxy.java	2000/01/21 06:27:24	1.26
@@ -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.25 2000/01/20 18:55:22 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -34,7 +34,7 @@ class OMproxy implements Runnable{
 	  debug("push: "+ stack.peek());
 	  break;
 	}
-      }catch(Exception e){
+      }catch(Throwable e){
 	System.err.println(e.getMessage());
 	e.printStackTrace();
 	debug("error occured. stack was cleared.");
@@ -57,25 +57,29 @@ 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){
+      stack.push(new CMO_STRING(e.getMessage()));
     }
   }
 
   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());
       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();
@@ -146,6 +150,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());
+    }
+    ox.setMathCap((CMO_MATHCAP)mathcap);
+  }
+
   private void StackMachine(SM mesg) throws java.io.IOException{
     debug("receive: "+mesg);
 
@@ -160,6 +173,10 @@ class OMproxy implements Runnable{
 
     case SM.SM_mathcap:
       SM_mathcap();
+      break;
+
+    case SM.SM_setMathCap:
+      SM_setMathCap();
       break;
 
     default: