===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.21
retrieving revision 1.25
diff -u -p -r1.21 -r1.25
--- OpenXM/src/OpenMath/OMproxy.java	2000/01/19 15:21:58	1.21
+++ OpenXM/src/OpenMath/OMproxy.java	2000/01/20 18:55:22	1.25
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.20 2000/01/19 15:19:29 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.24 2000/01/20 18:14:32 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -9,7 +9,7 @@ import java.io.*;
 class OMproxy implements Runnable{
   private OpenXM ox;
   private Stack stack = new Stack();
-  private boolean debug = true;
+  protected boolean debug = false;
   final int version = 200001190;
 
   public OMproxy(String host,int ControlPort,int DataPort) throws IOException{
@@ -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,11 +57,15 @@ 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()));
     }
   }
 
@@ -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);
 
@@ -162,6 +175,10 @@ class OMproxy implements Runnable{
       SM_mathcap();
       break;
 
+    case SM.SM_setMathCap:
+      SM_setMathCap();
+      break;
+
     default:
       System.out.println("received "+ mesg);
     }
@@ -222,7 +239,7 @@ class OMproxy implements Runnable{
     ret += "\t -data port \t (default 1300)\n";
     ret += "\t -control port \t (default 1200)\n";
     ret += "\t -insecure \t this version ignore this option\n";
-    ret += "\t -nohup \t ignore signals (required libnative.so)\n";
+    ret += "\t -debug \t display debug messages\n";
 
     return ret;
   }
@@ -230,6 +247,7 @@ class OMproxy implements Runnable{
   public static void main(String argv[]){
     String host = "localhost";
     int DataPort = 1300, ControlPort = 1200;
+    boolean debug = false;
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
@@ -242,6 +260,8 @@ class OMproxy implements Runnable{
       }else if(argv[i].equals("-control")){
 	ControlPort = Integer.valueOf(argv[++i]).intValue();
       }else if(argv[i].equals("-insecure")){
+      }else if(argv[i].equals("-debug")){
+	debug = true;
       }else{
 	System.err.println("unknown option : "+ argv[i]);
 	System.err.print(usage());
@@ -253,7 +273,7 @@ class OMproxy implements Runnable{
 		       +"("+ ControlPort +","+ DataPort +")");
 
     try{
-      new OMproxy(host,ControlPort,DataPort);
+      new OMproxy(host,ControlPort,DataPort).debug = debug;
       System.out.println("connected.");
     }catch(IOException e){
       System.err.println("Error occured: "+ e);