===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.8
retrieving revision 1.26
diff -u -p -r1.8 -r1.26
--- OpenXM/src/OpenMath/OMproxy.java	1999/11/09 09:43:48	1.8
+++ 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.7 1999/11/07 21:14:38 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.*;
@@ -9,7 +9,8 @@ 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{
     ox = new OpenXM(this,host,ControlPort,DataPort);
@@ -18,31 +19,31 @@ class OMproxy implements Runnable{
   public void run(){
     OM2OXM P = new OM2OXM();
 
-    try{
-      while(true){
-	synchronized(ox){
-	  int ox_tag = ox.receiveOXtag();
+    debug("OMproxy started.");
+    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(Throwable e){
+	System.err.println(e.getMessage());
+	e.printStackTrace();
+	debug("error occured. stack was cleared.");
       }
-    }catch(java.io.IOException e){
-      System.err.println(e.getMessage());
-      e.printStackTrace();
     }
-
-    System.out.println("breaking...");
+    //System.out.println("breaking...");
   }
 
+  /*
   public void stop(){
     System.out.println("OMproxy Stoping...");
     synchronized(ox){
@@ -53,27 +54,32 @@ class OMproxy implements Runnable{
       System.out.println("OMproxy Stopped");
     }
   }
+  */
 
   private void SM_popCMO() throws java.io.IOException{
-    if(stack.empty()){
-      ox.send(new CMO_NULL());
-    }else{
-      debug("pushing 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();
@@ -100,9 +106,9 @@ class OMproxy implements Runnable{
     CMO[] mathcap = new CMO[3];
 
     {
-      CMO[] list = {new CMO_INT32(199911090),
+      CMO[] list = {new CMO_INT32(version),
 		  new CMO_STRING("Ox_system=OMproxy.class"),
-		  new CMO_STRING("Version=0.199911090"),
+		  new CMO_STRING("Version=0."+ version),
 		  new CMO_STRING("HOSTTYPE=JAVA")};
       mathcap[0] = new CMO_LIST(list);
     }
@@ -110,22 +116,33 @@ class OMproxy implements Runnable{
     {
       CMO[] list = {new CMO_INT32(SM.SM_popCMO),
 		    new CMO_INT32(SM.SM_executeFunction),
-		    new CMO_INT32(SM.SM_mathcap)};
+		    new CMO_INT32(SM.SM_mathcap),
+		    new CMO_INT32(SM.SM_setMathCap),
+		    new CMO_INT32(SM.SM_control_kill),
+		    new CMO_INT32(SM.SM_control_reset_connection)};
       mathcap[1] = new CMO_LIST(list);
     }
 
     {
-      CMO[] DataFormat = {new CMO_INT32(OpenXM.OX_DATA)};
       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)};
-      CMO[] list = {new CMO_LIST(DataFormat),
-		    new CMO_LIST(CMOFormat)};
+			 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),
+			   new CMO_LIST(CMOFormat)};
+      CMO[] list = {new CMO_LIST(DataFormat1)};
+
       mathcap[2] = new CMO_LIST(list);
     }
 
@@ -133,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);
 
@@ -149,14 +175,25 @@ class OMproxy implements Runnable{
       SM_mathcap();
       break;
 
+    case SM.SM_setMathCap:
+      SM_setMathCap();
+      break;
+
     default:
       System.out.println("received "+ mesg);
     }
   }
 
   private CMO CMO2OMXML(CMO obj){
-    String str = OM2OXM.CMO2OM(obj);
+    String str;
 
+    try{
+      str = OM2OXM.CMO2OM(obj);
+    }catch(NumberFormatException e){
+      debug("CMO2OMXML occuered error in trans");
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
+    }
+
     return new CMO_STRING(str);
   }
 
@@ -168,7 +205,7 @@ class OMproxy implements Runnable{
 
     debug("OMXML2CMO called: "+obj);
     if(!(obj instanceof CMO_STRING)){
-      return new CMO_ERROR2();
+      return new CMO_ERROR2(new CMO_STRING("It's not CMO_STRING."));
     }
 
     try{
@@ -177,6 +214,9 @@ class OMproxy implements Runnable{
     }catch(IOException e){
       debug("OMXML2CMO occuered error in trans");
       return new CMO_ERROR2(new CMO_STRING(e.toString()));
+    }catch(NumberFormatException e){
+      debug("OMXML2CMO occuered error in trans");
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }
 
     debug("push: "+ret);
@@ -199,6 +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 -debug \t display debug messages\n";
 
     return ret;
   }
@@ -206,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")){
@@ -218,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());
@@ -229,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);