===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OM2OXM.java,v
retrieving revision 1.12
retrieving revision 1.16
diff -u -p -r1.12 -r1.16
--- OpenXM/src/OpenMath/OM2OXM.java	1999/11/18 15:13:01	1.12
+++ OpenXM/src/OpenMath/OM2OXM.java	2000/01/20 18:14:32	1.16
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.11 1999/11/17 08:37:29 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.15 2000/01/20 13:58:48 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;
@@ -88,8 +88,18 @@ final class OM2OXM implements Runnable{
     case CMO.CMO_STRING:
       return "<OMSTR>"+ ((CMO_STRING)cmo).getString() +"</OMSTR>";
 
-      // case CMO.CMO_LIST:
+    case CMO.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_sub(((CMO_MONOMIAL32)cmo).getCoefficient());
@@ -149,8 +159,8 @@ final class OM2OXM implements Runnable{
     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]);
+      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;
@@ -172,7 +182,7 @@ final class OM2OXM implements Runnable{
     }
 
     poly = (CMO_POLYNOMIAL_IN_ONE_VARIABLE)cmo;
-    variable = CMO2OM_sub(variables.getElement()[poly.getVariable()]);
+    variable = CMO2OM_sub(variables.getElements()[poly.getVariable()]);
  
    for(int i=0;i<poly.getDegrees().length;i++){
       String mono;
@@ -353,6 +363,8 @@ 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());
       }
@@ -607,6 +619,7 @@ final class OM2OXM implements Runnable{
       parse_error("We expect integer.");
     }
 
+    debug("ZZ: "+ str);
     return new CMO_ZZ(str);
   }
 
@@ -770,6 +783,8 @@ final class OM2OXM implements Runnable{
 	  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());
 	}
       }