===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OM2OXM.java,v
retrieving revision 1.1.1.1
retrieving revision 1.21
diff -u -p -r1.1.1.1 -r1.21
--- OpenXM/src/OpenMath/OM2OXM.java	1999/11/02 11:52:34	1.1.1.1
+++ OpenXM/src/OpenMath/OM2OXM.java	2000/03/14 05:10:37	1.21
@@ -1,5 +1,5 @@
 /**
- * OM2OXM.java
+ * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.20 2000/03/14 05:02:34 tam Exp $
  *
  * このクラスでは以下の BNF で表される構文解析を実装している
  * expr -> stag [expr | immediate]* etag
@@ -39,6 +39,7 @@ final class OM2OXM implements Runnable{
   private int token = TT_NULL;
   private boolean lexPushbackFlag = false;
   private OpenXM asir; // for debug
+  protected boolean debug = false; // for debug message
 
   // Token Type for lexical analyzer
   final static int TT_NULL      = 0;
@@ -53,8 +54,6 @@ final class OM2OXM implements Runnable{
       while(true){
 	CMO tmp;
 
-	Thread.yield();
-
 	switch(asir.receiveOXtag()){
 	case OpenXM.OX_COMMAND:
           asir.receiveSM();
@@ -62,7 +61,7 @@ final class OM2OXM implements Runnable{
 
 	case OpenXM.OX_DATA:
           tmp = asir.receiveCMO();
-	  System.out.println("=> <OMOBJ>"+ CMO2OM(tmp) +"</OMOBJ>");
+	  System.out.println("=> "+ CMO2OM(tmp));
           break;
 	}
 
@@ -71,25 +70,39 @@ final class OM2OXM implements Runnable{
   }
 
   public static String CMO2OM(CMO cmo){
+    return "<OMOBJ>"+ CMO2OM_sub(cmo) +"</OMOBJ>";
+  }
+
+  private static String CMO2OM_sub(CMO cmo) throws NumberFormatException{
     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.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();
 
+	for(int i=0;i<ob.length;i++){
+	  ret += CMO2OM_sub(ob[i]);
+	}
+      }
+      ret += "</OMA>";
+      return ret;
+
     case CMO.CMO_MONOMIAL32:
       ret += "<OMA><OMS name=\"Monom\" cd=\"poly\"/>";
-      ret += CMO2OM(((CMO_MONOMIAL32)cmo).getCoefficient());
+      ret += CMO2OM_sub(((CMO_MONOMIAL32)cmo).getCoefficient());
       for(int i=0;i<((CMO_MONOMIAL32)cmo).getDegree().length;i++){
 	ret += "<OMI>"+ ((CMO_MONOMIAL32)cmo).getDegree()[i] +"</OMI>";
       }
@@ -101,8 +114,9 @@ final class OM2OXM implements Runnable{
 
     case CMO.CMO_QQ:
       return "<OMA><OMS name=\"over\" cd=\"basic\"/>"+
-	CMO2OM(((CMO_QQ)cmo).getBunshi()) + CMO2OM(((CMO_QQ)cmo).getBunbo())
-	+"</OMA>";
+	CMO2OM_sub(((CMO_QQ)cmo).getBunshi())+
+	CMO2OM_sub(((CMO_QQ)cmo).getBunbo())+
+	"</OMA>";
 
     case CMO.CMO_ZERO:
       return "<OMI> 0 </OMI>";
@@ -111,33 +125,84 @@ final class OM2OXM implements Runnable{
 
     case CMO.CMO_DMS_GENERIC:
       ret += "<OMA><OMS name=\"PolyRing\" cd=\"poly\"/>";
-      ret += "<OMI>2</OMI>";
+      ret += "<OMI>2</OMI></OMA>";
       return ret;
 
+    case CMO.CMO_RECURSIVE_POLYNOMIAL:
+      return CMO2OM_CoefficientOfRecursivePOLYNOMIAL(((CMO_RECURSIVE_POLYNOMIAL)cmo).getPolynomial(),((CMO_RECURSIVE_POLYNOMIAL)cmo).getVariables());
+
     case CMO.CMO_DISTRIBUTED_POLYNOMIAL:
       ret += "<OMA><OMS name=\"DMP\" cd=\"poly\"/>";
-      ret += CMO2OM(((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getRing());
+      ret += CMO2OM_sub(((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getRing());
       ret += "<OMA><OMS name=\"SDMP\" cd=\"poly\"/>";
-      for(int i=0;i<((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getMonomials().length;i++){
-	ret += CMO2OM(((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getMonomials()[i]);
+      for(int i=0;i<((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getMonomials().length;
+	  i++){
+	ret += CMO2OM_sub(((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getMonomials()[i]);
       }
       ret += "</OMA></OMA>";
       return ret;
 
+      //case CMO.POLYNOMIAL_IN_ONE_VARIABLE:
+
+    case CMO.CMO_BIGFLOAT:
+      ret += "<OMA><OMS name=\"times\" cd=\"basic\"/>";
+      ret += CMO2OM_sub(((CMO_BIGFLOAT)cmo).getSyosubu());
+      ret += "<OMA><OMS name=\"power\" cd=\"basic\"/>";
+      ret += "<OMI>2</OMI>";
+      ret += CMO2OM_sub(((CMO_BIGFLOAT)cmo).getShisubu());
+      ret += "</OMA></OMA>";
+      return ret;
+
     case CMO.CMO_INDETERMINATE:
       return "<OMV name=\""+ ((CMO_INDETERMINATE)cmo).getString() +"\"/>";
 
-      /*
-	case CMO.CMO_TREE:
-      return "<OMA><OMS name=\""+ "\"/>"+
-	"</OMA>";
-	*/
+    case CMO.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++){
+	ret += CMO2OM_sub(((CMO_TREE)cmo).getLeaves().getElements()[i]);
+      }
+      ret += "</OMA>";
+      return ret;
 
     default:
-      return "<OMSTR>"+ cmo.toCMOexpression() +"</OMSTR>";
+      //return "<OMSTR>"+ cmo.toCMOexpression() +"</OMSTR>";
     }
+
+    throw new NumberFormatException("unknown convert way:"+
+				    cmo.toCMOexpression());
   }
 
+  private static String CMO2OM_CoefficientOfRecursivePOLYNOMIAL(CMO cmo,CMO_LIST variables){
+    CMO_POLYNOMIAL_IN_ONE_VARIABLE poly;
+    String ret = "",variable;
+
+    if(!(cmo instanceof CMO_POLYNOMIAL_IN_ONE_VARIABLE)){
+      return CMO2OM_sub(cmo);
+    }
+
+    poly = (CMO_POLYNOMIAL_IN_ONE_VARIABLE)cmo;
+    variable = CMO2OM_sub(variables.getElements()[poly.getVariable()]);
+ 
+   for(int i=0;i<poly.getDegrees().length;i++){
+      String mono;
+
+      mono = "<OMA><OMS name=\"times\" cd=\"basic\"/>"+
+	"<OMA><OMS name=\"power\" cd=\"basic\"/>"+
+	variable +"<OMI>"+ poly.getDegrees()[i] +"</OMI></OMA>"+
+	CMO2OM_CoefficientOfRecursivePOLYNOMIAL(poly.getCoefficients()[i],
+						variables)
+	+"</OMA>";
+      if(i==0){
+	ret = mono;
+      }else{
+	ret = "<OMA><OMS name=\"plus\" cd=\"basic\"/>"+ ret + mono +"</OMA>";
+      }
+    }
+
+   return ret;
+  }
+
   private boolean isSpace(int ch){ // use from lex
     return (ch==' ' || ch=='\t' || ch=='\n' || ch=='\r');
   }
@@ -214,9 +279,9 @@ final class OM2OXM implements Runnable{
     }else if(ch != -1){
       is.unread(ch);
       while((ch = is.read()) != '<' && ch != -1){
-	System.out.println("debug: "+ch);
+	debug("debug: "+ch);
 	if(isSpace(ch)){
-	  String spaces = String.valueOf(ch);
+	  String spaces = String.valueOf((char)ch);
 
 	  while(isSpace(ch = is.read())){
 	    spaces += (char)ch;
@@ -244,7 +309,7 @@ final class OM2OXM implements Runnable{
       parse_error("We expect type :'"+ type
 		  +"', but we got type :'"+ token +"'("+ attribute +").");
     }
-    //System.out.println(":"+token+":"+attribute+":"+type);
+    //debug(":"+token+":"+attribute+":"+type);
     return true;
   }
 
@@ -260,7 +325,7 @@ final class OM2OXM implements Runnable{
     }
 
     ret = parse_object();
-	
+
     exceptTokenTypeInParse(TT_EndTag);
     if(!attribute.equals("OMOBJ")){
       parse_error("We expect '</OMOBJ>'.");
@@ -272,6 +337,7 @@ final class OM2OXM implements Runnable{
   private CMO parse_object() throws IOException{
     // object -> variable
     //         | '<OMI>' S? integer S? '</OMI>'
+    //         | '<OMSTR>' S? utf7 S? '</OMSTR>'
     //         | '<OMA>' S? symbol S? objects S? '</OMA>'
     CMO ret;
 
@@ -285,6 +351,9 @@ final class OM2OXM implements Runnable{
     }else if(attribute.equals("OMI")){
       pushbackLex();
       ret = parse_OMI();
+    }else if(attribute.equals("OMSTR")){
+      pushbackLex();
+      ret = parse_OMSTR();
     }else if(attribute.equals("OMA")){
       String name,cdname;
       int argnum = 0;
@@ -293,8 +362,19 @@ final class OM2OXM implements Runnable{
 
       if(name.equals("DMP")){
 	ret = parse_symb_DMP();
+	debug("poly: "+ret);
       }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);
@@ -302,7 +382,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;
     }
 
@@ -327,6 +407,30 @@ final class OM2OXM implements Runnable{
     return ret;
   }
 
+  private CMO_STRING parse_OMSTR() throws IOException{
+    CMO_STRING ret;
+
+    exceptTokenTypeInParse(TT_StartTag);
+    if(!attribute.equals("OMSTR")){
+      parse_error("We expect '<OMSTR>'.");
+    }
+
+    if(readNextToken() == TT_String){
+      //ret = (CMO_STRING)parse_utf7();
+      ret = new CMO_STRING(attribute);
+    }else{
+      ret = new CMO_STRING("");
+      pushbackLex();
+    }
+
+    exceptTokenTypeInParse(TT_EndTag);
+    if(!attribute.equals("OMSTR")){
+      parse_error("We expect '</OMSTR>'.");
+    }
+
+    return ret;
+  }
+
   private CMO parse_symb_DMP() throws IOException{
     parse_object();
     return new CMO_DISTRIBUTED_POLYNOMIAL(new CMO_DMS_GENERIC(),
@@ -363,6 +467,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);
@@ -374,6 +479,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());
@@ -383,16 +496,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();
     }
 
-    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 parse_objects() throws IOException{
-    // 解析された object を LIST で返す
+  private CMO[] parse_objects() throws IOException{
     Vector objects = new Vector();
     CMO[] array;
 
@@ -406,8 +519,8 @@ final class OM2OXM implements Runnable{
     array = new CMO[objects.size()];
     objects.copyInto((Object[])array);
 
-    System.out.println("debug :"+ new CMO_LIST(array));
-    return new CMO_LIST(array);
+    debug("debug :"+ new CMO_LIST(array));
+    return array;
   }
 
   private String parse_symbol() throws IOException{
@@ -522,6 +635,7 @@ final class OM2OXM implements Runnable{
       parse_error("We expect integer.");
     }
 
+    debug("ZZ: "+ str);
     return new CMO_ZZ(str);
   }
 
@@ -614,18 +728,27 @@ final class OM2OXM implements Runnable{
     return str;
   }
 
-  private void parse_error(String mesg){
-    System.err.println(mesg);
-    System.err.print("error occuered near :");
+  private void parse_error(String mesg) throws NumberFormatException{
+    String ret;
+
+    ret = mesg +"\n";
+    ret += "error occuered before that :";
     try{
-      for(int i=0;i<10;i++){
-	System.err.print((char)is.read());
+      for(int i=0;i<40;i++){
+	ret += (char)is.read();
       }
-      System.err.println((char)is.read());
     }catch(IOException e){}
-    System.exit(1);
+    ret += "\n";
+
+    throw new NumberFormatException(ret);
   }
 
+  private void debug(String str){
+    if(debug){
+      System.err.println(str);
+    }
+  }
+
   public static void main(String[] argv) throws IOException{
     OM2OXM P = new OM2OXM();
     OpenXM asir;
@@ -671,15 +794,21 @@ final class OM2OXM implements Runnable{
 
       //サーバ側から送信された文字列を受信します。
       while(true){
-	CMO obj = P.parse(System.in);
-	asir.send(obj);
-	asir.sendSM(new SM(SM.SM_popCMO));
+	try{
+	  CMO obj = P.parse(System.in);
+	  asir.send(obj);
+	  asir.sendSM(new SM(SM.SM_popCMO));
+	}catch(NumberFormatException e){
+	  System.err.println(e.getMessage());
+	}catch(MathcapViolation e){
+	  System.err.println(e.getMessage());
+	}
       }
 
-      //System.out.println("breaking...");
-
     }catch(IOException e){
       e.printStackTrace();
+    }finally{
+      System.out.println("breaking...");
     }
   }
 }