=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v retrieving revision 1.7 retrieving revision 1.24 diff -u -p -r1.7 -r1.24 --- OpenXM/src/OpenMath/OMproxy.java 1999/11/07 21:14:38 1.7 +++ OpenXM/src/OpenMath/OMproxy.java 2000/01/20 18:14:32 1.24 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.6 1999/11/04 18:38:59 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.23 2000/01/20 16:40:13 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -9,7 +9,8 @@ import java.io.*; class OMproxy implements Runnable{ private OpenXM ox; private Stack stack = new Stack(); - private boolean debug = true; + protected boolean debug = false; + final int version = 200001190; public OMproxy(String host,int ControlPort,int DataPort) throws IOException{ ox = new OpenXM(this,host,ControlPort,DataPort); @@ -18,31 +19,31 @@ class OMproxy implements Runnable{ public void run(){ OM2OXM P = new OM2OXM(); - try{ - while(true){ - synchronized(ox){ - int ox_tag = ox.receiveOXtag(); + debug("OMproxy started."); + while(true){ + try{ + int ox_tag = ox.receiveOXtag(); - switch(ox_tag){ - case OpenXM.OX_COMMAND: - StackMachine(ox.receiveSM()); - break; + switch(ox_tag){ + case OpenXM.OX_COMMAND: + StackMachine(ox.receiveSM()); + break; - case OpenXM.OX_DATA: - stack.push(ox.receiveCMO()); - debug("push: "+ stack.peek()); - break; - } + case OpenXM.OX_DATA: + stack.push(ox.receiveCMO()); + debug("push: "+ stack.peek()); + break; } + }catch(Throwable e){ + System.err.println(e.getMessage()); + e.printStackTrace(); + debug("error occured. stack was cleared."); } - }catch(java.io.IOException e){ - System.err.println(e.getMessage()); - e.printStackTrace(); } - - System.out.println("breaking..."); + //System.out.println("breaking..."); } + /* public void stop(){ System.out.println("OMproxy Stoping..."); synchronized(ox){ @@ -53,12 +54,18 @@ class OMproxy implements Runnable{ System.out.println("OMproxy Stopped"); } } + */ private void SM_popCMO() throws java.io.IOException{ - if(stack.empty()){ - ox.send(new CMO_NULL()); - }else{ - ox.send(stack.pop()); + try{ + if(stack.empty()){ + ox.send(new CMO_NULL()); + }else{ + debug("sending CMO: "+ stack.peek()); + ox.send(stack.pop()); + } + }catch(MathcapViolation e){ + stack.push(new CMO_STRING(e.getMessage())); } } @@ -99,9 +106,9 @@ class OMproxy implements Runnable{ CMO[] mathcap = new CMO[3]; { - CMO[] list = {new CMO_INT32(199911070), + CMO[] list = {new CMO_INT32(version), new CMO_STRING("Ox_system=OMproxy.class"), - new CMO_STRING("Version=0.199911070"), + new CMO_STRING("Version=0."+ version), new CMO_STRING("HOSTTYPE=JAVA")}; mathcap[0] = new CMO_LIST(list); } @@ -109,26 +116,38 @@ class OMproxy implements Runnable{ { CMO[] list = {new CMO_INT32(SM.SM_popCMO), new CMO_INT32(SM.SM_executeFunction), - new CMO_INT32(SM.SM_mathcap)}; + new CMO_INT32(SM.SM_mathcap), + new CMO_INT32(SM.SM_setMathCap), + new CMO_INT32(SM.SM_control_kill), + new CMO_INT32(SM.SM_control_reset_connection)}; mathcap[1] = new CMO_LIST(list); } { - CMO[] DataFormat = {new CMO_INT32(OpenXM.OX_DATA)}; CMO[] CMOFormat = {new CMO_INT32(CMO.CMO_NULL), new CMO_INT32(CMO.CMO_INT32), new CMO_INT32(CMO.CMO_STRING), + new CMO_INT32(CMO.CMO_LIST), new CMO_INT32(CMO.CMO_MONOMIAL32), new CMO_INT32(CMO.CMO_ZZ), new CMO_INT32(CMO.CMO_QQ), new CMO_INT32(CMO.CMO_ZERO), - new CMO_INT32(CMO.CMO_DMS_GENERIC)}; - CMO[] list = {new CMO_LIST(DataFormat), - new CMO_LIST(CMOFormat)}; + new CMO_INT32(CMO.CMO_DMS_GENERIC), + new CMO_INT32(CMO.CMO_RECURSIVE_POLYNOMIAL), + new CMO_INT32(CMO.CMO_DISTRIBUTED_POLYNOMIAL), + new CMO_INT32(CMO.CMO_POLYNOMIAL_IN_ONE_VARIABLE), + new CMO_INT32(CMO.CMO_BIGFLOAT), + new CMO_INT32(CMO.CMO_INDETERMINATE), + new CMO_INT32(CMO.CMO_TREE)}; + CMO[] DataFormat1 = {new CMO_INT32(OpenXM.OX_DATA), + new CMO_LIST(CMOFormat)}; + CMO[] list = {new CMO_LIST(DataFormat1)}; + mathcap[2] = new CMO_LIST(list); } - ox.send(new CMO_LIST(mathcap)); + stack.push(new CMO_MATHCAP(new CMO_LIST(mathcap))); + debug("push: "+ stack.peek()); } private void StackMachine(SM mesg) throws java.io.IOException{ @@ -153,8 +172,15 @@ class OMproxy implements Runnable{ } private CMO CMO2OMXML(CMO obj){ - String str = OM2OXM.CMO2OM(obj); + String str; + try{ + str = OM2OXM.CMO2OM(obj); + }catch(NumberFormatException e){ + debug("CMO2OMXML occuered error in trans"); + return new CMO_ERROR2(new CMO_STRING(e.toString())); + } + return new CMO_STRING(str); } @@ -166,7 +192,7 @@ class OMproxy implements Runnable{ debug("OMXML2CMO called: "+obj); if(!(obj instanceof CMO_STRING)){ - return new CMO_ERROR2(); + return new CMO_ERROR2(new CMO_STRING("It's not CMO_STRING.")); } try{ @@ -175,6 +201,9 @@ class OMproxy implements Runnable{ }catch(IOException e){ debug("OMXML2CMO occuered error in trans"); return new CMO_ERROR2(new CMO_STRING(e.toString())); + }catch(NumberFormatException e){ + debug("OMXML2CMO occuered error in trans"); + return new CMO_ERROR2(new CMO_STRING(e.toString())); } debug("push: "+ret); @@ -196,6 +225,8 @@ class OMproxy implements Runnable{ ret += "\t -host hostname \t (default localhost)\n"; ret += "\t -data port \t (default 1300)\n"; ret += "\t -control port \t (default 1200)\n"; + ret += "\t -insecure \t this version ignore this option\n"; + ret += "\t -debug \t display debug messages\n"; return ret; } @@ -203,6 +234,7 @@ class OMproxy implements Runnable{ public static void main(String argv[]){ String host = "localhost"; int DataPort = 1300, ControlPort = 1200; + boolean debug = false; for(int i=0;i