===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OM2OXM.java,v
retrieving revision 1.18
retrieving revision 1.21
diff -u -p -r1.18 -r1.21
--- OpenXM/src/OpenMath/OM2OXM.java	2000/02/28 14:10:28	1.18
+++ OpenXM/src/OpenMath/OM2OXM.java	2000/03/14 05:10:37	1.21
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.17 2000/01/21 12:17:49 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OM2OXM.java,v 1.20 2000/03/14 05:02:34 tam Exp $
  *
  * このクラスでは以下の BNF で表される構文解析を実装している
  * expr -> stag [expr | immediate]* etag
@@ -77,18 +77,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.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();
@@ -142,7 +142,7 @@ 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:
       ret += "<OMA><OMS name=\"times\" cd=\"basic\"/>";