===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OM2OXM.java,v
retrieving revision 1.9
retrieving revision 1.14
diff -u -p -r1.9 -r1.14
--- OpenXM/src/OpenMath/OM2OXM.java	1999/11/16 13:16:22	1.9
+++ OpenXM/src/OpenMath/OM2OXM.java	2000/01/19 15:32:50	1.14
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.8 1999/11/15 23:13:21 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.13 1999/12/09 00:32:36 tam Exp $
  *
  * このクラスでは以下の BNF で表される構文解析を実装している
  * expr -> stag [expr | immediate]* etag
@@ -39,7 +39,7 @@ final class OM2OXM implements Runnable{
   private int token = TT_NULL;
   private boolean lexPushbackFlag = false;
   private OpenXM asir; // for debug
-  private boolean debug = false;
+  protected boolean debug = false; // for debug message
 
   // Token Type for lexical analyzer
   final static int TT_NULL      = 0;
@@ -118,6 +118,9 @@ final class OM2OXM implements Runnable{
       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_sub(((CMO_DISTRIBUTED_POLYNOMIAL)cmo).getRing());
@@ -129,6 +132,8 @@ final class OM2OXM implements Runnable{
       ret += "</OMA></OMA>";
       return ret;
 
+      //case CMO.CMO_POLYNOMIAL_IN_ONE_VARIABLE:
+
     case CMO.CMO_BIGFLOAT:
       ret += "<OMA><OMS name=\"times\" cd=\"basic\"/>";
       ret += CMO2OM_sub(((CMO_BIGFLOAT)cmo).getSyosubu());
@@ -141,19 +146,53 @@ final class OM2OXM implements Runnable{
     case CMO.CMO_INDETERMINATE:
       return "<OMV name=\""+ ((CMO_INDETERMINATE)cmo).getString() +"\"/>";
 
-      /*
-	case CMO.CMO_TREE:
-	return "<OMA><OMS name=\""+ ((CMO_TREE)cmo).getName() +"\" cdname=\""+
-	((CMO_TREE)cmo).getCDName() +"\"/>" + "</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().getElement().length;i++){
+	ret += CMO2OM_sub(((CMO_TREE)cmo).getLeaves().getElement()[i]);
+      }
+      ret += "</OMA>";
+      return ret;
 
     default:
       //return "<OMSTR>"+ cmo.toCMOexpression() +"</OMSTR>";
     }
 
-    throw new NumberFormatException(""+ cmo.toCMOexpression());
+    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.getElement()[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');
   }
@@ -568,6 +607,7 @@ final class OM2OXM implements Runnable{
       parse_error("We expect integer.");
     }
 
+    debug("ZZ: "+ str);
     return new CMO_ZZ(str);
   }