===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.30
retrieving revision 1.35
diff -u -p -r1.30 -r1.35
--- OpenXM/src/OpenMath/OMproxy.java	2000/03/12 14:24:21	1.30
+++ OpenXM/src/OpenMath/OMproxy.java	2000/03/15 15:02:06	1.35
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.29 2000/01/21 07:33:18 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.34 2000/03/14 05:38:49 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -23,15 +23,16 @@ class OMproxy implements Runnable{
     try{
       while(true){
 	try{
-	  int ox_tag = ox.receiveOXtag();
+	  OXmessage message = ox.receive();
+	  int ox_tag = message.getTag();
 
 	  switch(ox_tag){
 	  case OpenXM.OX_COMMAND:
-	    StackMachine(ox.receiveSM());
+	    StackMachine((SM)message.getBody());
 	    break;
 
 	  case OpenXM.OX_DATA:
-	    stack.push(ox.receiveCMO());
+	    stack.push(message.getBody());
 	    debug("push: "+ stack.peek());
 	    break;
 	  }
@@ -69,11 +70,11 @@ 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{
-	ox.send(new cmoError2(new CMO_STRING("MathcapViolation: "+
+	ox.send(new CMO_ERROR2(new CMO_STRING("MathcapViolation: "+
 					      e.getMessage())));
       }catch(MathcapViolation tmp){}
     }
@@ -85,7 +86,7 @@ class OMproxy implements Runnable{
     int argc;
 
     if(!(stack.peek() instanceof CMO_STRING)){
-      stack.push(new cmoError2(new cmoNull()));
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
     function_name = ((CMO_STRING)stack.pop()).getString();
@@ -96,7 +97,7 @@ class OMproxy implements Runnable{
     }
 
     if(argc != 1){
-      stack.push(new cmoError2(new cmoNull()));
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
 
@@ -108,7 +109,7 @@ class OMproxy implements Runnable{
       return;
     }
 
-    stack.push(new cmoError2(new cmoNull()));
+    stack.push(new CMO_ERROR2(new CMO_NULL()));
     return;
   }
 
@@ -134,21 +135,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)};
@@ -164,7 +165,7 @@ class OMproxy implements Runnable{
     Object mathcap = stack.pop();
 
     if(mathcap instanceof CMO_MATHCAP){
-      stack.push(new cmoError2(new cmoNull()));
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
     }
     ox.setMathCap((CMO_MATHCAP)mathcap);
   }
@@ -201,7 +202,7 @@ class OMproxy implements Runnable{
       str = OM2OXM.CMO2OM(obj);
     }catch(NumberFormatException e){
       debug("CMO2OMXML occuered error in trans");
-      return new cmoError2(new CMO_STRING(e.toString()));
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }
 
     return new CMO_STRING(str);
@@ -215,7 +216,7 @@ class OMproxy implements Runnable{
 
     debug("OMXML2CMO called: "+obj);
     if(!(obj instanceof CMO_STRING)){
-      return new cmoError2(new CMO_STRING("It's not CMO_STRING."));
+      return new CMO_ERROR2(new CMO_STRING("It's not CMO_STRING."));
     }
 
     try{
@@ -223,10 +224,10 @@ class OMproxy implements Runnable{
       ret = trans.parse(stream);
     }catch(IOException e){
       debug("OMXML2CMO occuered error in trans");
-      return new cmoError2(new CMO_STRING(e.toString()));
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }catch(NumberFormatException e){
       debug("OMXML2CMO occuered error in trans");
-      return new cmoError2(new CMO_STRING(e.toString()));
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }
 
     debug("push: "+ret);