===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OM2OXM.java,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- OpenXM/src/OpenMath/OM2OXM.java 2000/01/19 15:32:50 1.14
+++ 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.13 1999/12/09 00:32:36 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
@@ -88,8 +88,18 @@ final class OM2OXM implements Runnable{
case CMO.CMO_STRING:
return ""+ ((CMO_STRING)cmo).getString() +"";
- // case CMO.CMO_LIST:
+ case CMO.CMO_LIST:
+ ret += "";
+ {
+ CMO ob[] = ((CMO_LIST)cmo).getElements();
+ for(int i=0;i";
+ return ret;
+
case CMO.CMO_MONOMIAL32:
ret += "";
ret += CMO2OM_sub(((CMO_MONOMIAL32)cmo).getCoefficient());
@@ -149,8 +159,8 @@ final class OM2OXM implements Runnable{
case CMO.CMO_TREE:
ret += "";
- 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 += "";
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