===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OM2OXM.java,v
retrieving revision 1.15
retrieving revision 1.26
diff -u -p -r1.15 -r1.26
--- OpenXM/src/OpenMath/OM2OXM.java	2000/01/20 13:58:48	1.15
+++ OpenXM/src/OpenMath/OM2OXM.java	2000/10/11 08:32:13	1.26
@@ -1,6 +1,8 @@
+/*
+ * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.25 2000/09/13 06:44:55 tam Exp $
+ */
+
 /**
- * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.14 2000/01/19 15:32:50 tam Exp $
- *
  * このクラスでは以下の BNF で表される構文解析を実装している
  * expr -> stag [expr | immediate]* etag
  * immediate -> INTEGER
@@ -31,7 +33,7 @@
 import java.io.*;
 import java.net.*;
 import java.util.Vector;
-import JP.ac.kobe_u.math.tam.OpenXM.*;
+import ORG.openxm.tam.*;
 
 final class OM2OXM implements Runnable{
   private PushbackInputStream is;
@@ -52,19 +54,12 @@ final class OM2OXM implements Runnable{
     //サーバ側から送信された文字列を受信します。
     try{
       while(true){
-	CMO tmp;
+	OXmessage message = asir.receive();
 
-	switch(asir.receiveOXtag()){
-	case OpenXM.OX_COMMAND:
-          asir.receiveSM();
+	if(message.getTag() == OXmessage.OX_DATA){
+	  System.err.println("=> "+ CMO2OM((CMO)message.getBody()));
           break;
-
-	case OpenXM.OX_DATA:
-          tmp = asir.receiveCMO();
-	  System.out.println("=> "+ CMO2OM(tmp));
-          break;
 	}
-
       }
     }catch(IOException e){}
   }
@@ -77,18 +72,18 @@ final class OM2OXM implements Runnable{
     String ret = "";
 
     switch(cmo.getDISCRIMINATOR()){
-    case CMO.CMO_NULL:
+    case CMO.NULL:
       return "<OMI>0</OMI>";
 
-    case CMO.CMO_INT32:
+    case CMO.INT32:
       return "<OMI>"+ ((CMO_INT32)cmo).intValue() +"</OMI>";
 
-      // case CMO.CMO_DATUM:
+      // case CMO.DATUM:
 
-    case CMO.CMO_STRING:
+    case CMO.STRING:
       return "<OMSTR>"+ ((CMO_STRING)cmo).getString() +"</OMSTR>";
 
-    case CMO.CMO_LIST:
+    case CMO.LIST:
       ret += "<OMA><OMS name=\"list\" cd=\"basic\"/>";
       {
 	CMO ob[] = ((CMO_LIST)cmo).getElements();
@@ -100,7 +95,7 @@ final class OM2OXM implements Runnable{
       ret += "</OMA>";
       return ret;
 
-    case CMO.CMO_MONOMIAL32:
+    case CMO.MONOMIAL32:
       ret += "<OMA><OMS name=\"Monom\" cd=\"poly\"/>";
       ret += CMO2OM_sub(((CMO_MONOMIAL32)cmo).getCoefficient());
       for(int i=0;i<((CMO_MONOMIAL32)cmo).getDegree().length;i++){
@@ -109,29 +104,29 @@ final class OM2OXM implements Runnable{
       ret += "</OMA>";
       return ret;
 
-    case CMO.CMO_ZZ:
+    case CMO.ZZ:
       return "<OMI>"+ ((CMO_ZZ)cmo).BigIntValue() +"</OMI>";
 
-    case CMO.CMO_QQ:
+    case CMO.QQ:
       return "<OMA><OMS name=\"over\" cd=\"basic\"/>"+
 	CMO2OM_sub(((CMO_QQ)cmo).getBunshi())+
 	CMO2OM_sub(((CMO_QQ)cmo).getBunbo())+
 	"</OMA>";
 
-    case CMO.CMO_ZERO:
+    case CMO.ZERO:
       return "<OMI> 0 </OMI>";
 
-      // case CMO.CMO_DMS:
+      // case CMO.DMS:
 
-    case CMO.CMO_DMS_GENERIC:
+    case CMO.DMS_GENERIC:
       ret += "<OMA><OMS name=\"PolyRing\" cd=\"poly\"/>";
       ret += "<OMI>2</OMI></OMA>";
       return ret;
 
-    case CMO.CMO_RECURSIVE_POLYNOMIAL:
+    case CMO.RECURSIVE_POLYNOMIAL:
       return CMO2OM_CoefficientOfRecursivePOLYNOMIAL(((CMO_RECURSIVE_POLYNOMIAL)cmo).getPolynomial(),((CMO_RECURSIVE_POLYNOMIAL)cmo).getVariables());
 
-    case CMO.CMO_DISTRIBUTED_POLYNOMIAL:
+    case CMO.DISTRIBUTED_POLYNOMIAL:
       ret += "<OMA><OMS name=\"DMP\" cd=\"poly\"/>";
       ret += CMO2OM_sub(((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getRing());
       ret += "<OMA><OMS name=\"SDMP\" cd=\"poly\"/>";
@@ -142,9 +137,9 @@ final class OM2OXM implements Runnable{
       ret += "</OMA></OMA>";
       return ret;
 
-      //case CMO.CMO_POLYNOMIAL_IN_ONE_VARIABLE:
+      //case CMO.POLYNOMIAL_IN_ONE_VARIABLE:
 
-    case CMO.CMO_BIGFLOAT:
+    case CMO.BIGFLOAT:
       ret += "<OMA><OMS name=\"times\" cd=\"basic\"/>";
       ret += CMO2OM_sub(((CMO_BIGFLOAT)cmo).getSyosubu());
       ret += "<OMA><OMS name=\"power\" cd=\"basic\"/>";
@@ -153,10 +148,10 @@ final class OM2OXM implements Runnable{
       ret += "</OMA></OMA>";
       return ret;
 
-    case CMO.CMO_INDETERMINATE:
+    case CMO.INDETERMINATE:
       return "<OMV name=\""+ ((CMO_INDETERMINATE)cmo).getString() +"\"/>";
 
-    case CMO.CMO_TREE:
+    case CMO.TREE:
       ret += "<OMA><OMS name=\""+ ((CMO_TREE)cmo).getName() +"\" cd=\""+
 	((CMO_TREE)cmo).getCDName() +"\"/>";
       for(int i=0;i<((CMO_TREE)cmo).getLeaves().getElements().length;i++){
@@ -363,10 +358,18 @@ final class OM2OXM implements Runnable{
       if(name.equals("DMP")){
 	ret = parse_symb_DMP();
 	debug("poly: "+ret);
-      }else if(name.equals("list")){
-	ret = parse_objects();
       }else{
-	ret = new CMO_TREE(name,"Basic",parse_objects());
+	CMO[] leaves = parse_objects();
+
+	if(name.equals("list")){
+	  ret = new CMO_LIST(leaves);
+	}else if(name.equals("over") && leaves.length==2
+		 && leaves[0] instanceof CMO_ZZ
+		 && leaves[1] instanceof CMO_ZZ){
+	  ret = new CMO_QQ((CMO_ZZ)leaves[0],(CMO_ZZ)leaves[1]);
+	}else{
+	  ret = new CMO_TREE(name,"basic",new CMO_LIST(leaves));
+	}
       }
 
       exceptTokenTypeInParse(TT_EndTag);
@@ -374,7 +377,7 @@ final class OM2OXM implements Runnable{
 	parse_error("We expect '</OMA>'.");
       }
     }else{
-      parse_error("???");
+      parse_error("We expect '<OMI> or '<OMA>' or '<OMV>'.");
       ret = null;
     }
 
@@ -459,6 +462,7 @@ final class OM2OXM implements Runnable{
 
   private CMO_MONOMIAL32 parse_symb_Monom() throws IOException{
     Vector degree = new Vector();
+    CMO coefficient;
     int[] array;
 
     exceptTokenTypeInParse(TT_StartTag);
@@ -470,6 +474,14 @@ final class OM2OXM implements Runnable{
       parse_error("We expect '<Monom>'");
     }
 
+    coefficient = parse_object();
+    if(!(coefficient instanceof CMO_ZZ
+	 || coefficient instanceof CMO_QQ
+	 || coefficient instanceof CMO_INT32
+	 || coefficient instanceof CMO_ZERO)){
+      parse_error("the coefficient of Monomials must be integer or rational.");
+    }
+
     while(readNextToken() != TT_EndTag){
       pushbackLex();
       degree.addElement(parse_OMI());
@@ -479,17 +491,16 @@ final class OM2OXM implements Runnable{
       parse_error("We expect '<OMA>'.");
     }
 
-    array = new int[degree.size()-1];
+    array = new int[degree.size()];
     for(int i=0;i<array.length;i++){
-      array[i] = ((CMO_ZZ)degree.elementAt(i+1)).intValue();
+      array[i] = ((CMO_ZZ)degree.elementAt(i)).intValue();
     }
 
-    //debug("monom: "+ new CMO_MONOMIAL32(array,(CMO_ZZ)degree.elementAt(0)));
-    return new CMO_MONOMIAL32(array,(CMO_ZZ)degree.elementAt(0));
+    //debug("monom: "+ new CMO_MONOMIAL32(array,coefficient));
+    return new CMO_MONOMIAL32(array,coefficient);
   }
 
-  private CMO_LIST parse_objects() throws IOException{
-    // 解析された object を LIST で返す
+  private CMO[] parse_objects() throws IOException{
     Vector objects = new Vector();
     CMO[] array;
 
@@ -504,7 +515,7 @@ final class OM2OXM implements Runnable{
     objects.copyInto((Object[])array);
 
     debug("debug :"+ new CMO_LIST(array));
-    return new CMO_LIST(array);
+    return array;
   }
 
   private String parse_symbol() throws IOException{
@@ -716,9 +727,9 @@ final class OM2OXM implements Runnable{
     String ret;
 
     ret = mesg +"\n";
-    ret += "error occuered near :";
+    ret += "error occuered before that :";
     try{
-      for(int i=0;i<10;i++){
+      for(int i=0;i<40;i++){
 	ret += (char)is.read();
       }
     }catch(IOException e){}
@@ -741,7 +752,7 @@ final class OM2OXM implements Runnable{
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
-	System.out.println("");
+	System.err.println("");
 	System.exit(0);
       }else if(argv[i].equals("-host")){
 	host = argv[++i];
@@ -757,7 +768,7 @@ final class OM2OXM implements Runnable{
 
     try{
       asir = new OpenXM(host,CtrlPort,StreamPort);
-      asir.sendSM(new SM(SM.SM_mathcap));
+      asir.send(new SM(SM.SM_mathcap));
     }catch(UnknownHostException e){
       System.err.println("host unknown.");
       System.err.println(e.getMessage());
@@ -767,11 +778,15 @@ final class OM2OXM implements Runnable{
       System.err.println("IOException occuer !!");
       System.err.println(e.getMessage());
       return;
+    }catch(MathcapViolation e){
+      System.err.println("MathcapViolation !!");
+      System.err.println(e.getMessage());
+      return;
     }
 
     P.asir = asir;
     new Thread(P).start();
-    System.out.println("start");
+    System.err.println("start");
 
     try{
       //P.value = new Attribute(System.in);
@@ -781,16 +796,18 @@ final class OM2OXM implements Runnable{
 	try{
 	  CMO obj = P.parse(System.in);
 	  asir.send(obj);
-	  asir.sendSM(new SM(SM.SM_popCMO));
+	  asir.send(new SM(SM.SM_popCMO));
 	}catch(NumberFormatException e){
 	  System.err.println(e.getMessage());
+	}catch(MathcapViolation e){
+	  System.err.println(e.getMessage());
 	}
       }
 
     }catch(IOException e){
       e.printStackTrace();
     }finally{
-      System.out.println("breaking...");
+      System.err.println("breaking...");
     }
   }
 }