=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v retrieving revision 1.26 retrieving revision 1.33 diff -u -p -r1.26 -r1.33 --- OpenXM/src/OpenMath/OMproxy.java 2000/01/21 06:27:24 1.26 +++ OpenXM/src/OpenMath/OMproxy.java 2000/03/14 05:10:37 1.33 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.25 2000/01/20 18:55:22 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.32 2000/03/14 05:02:34 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -20,27 +20,34 @@ class OMproxy implements Runnable{ OM2OXM P = new OM2OXM(); debug("OMproxy started."); - while(true){ - try{ - int ox_tag = ox.receiveOXtag(); + try{ + 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(RuntimeException e){ + System.err.println(e.getMessage()); + e.printStackTrace(); + debug("error occured. stack was cleared."); } - }catch(Throwable e){ - System.err.println(e.getMessage()); - e.printStackTrace(); - debug("error occured. stack was cleared."); } + }catch(IOException e){ + System.err.println(e.getMessage()); + e.printStackTrace(); + System.err.println("error occured, and recovering processes seems to be impossible."); + }finally{ + System.out.println("breaking..."); } - //System.out.println("breaking..."); } /* @@ -65,7 +72,10 @@ class OMproxy implements Runnable{ ox.send(stack.pop()); } }catch(MathcapViolation e){ - stack.push(new CMO_STRING(e.getMessage())); + try{ + ox.send(new CMO_ERROR2(new CMO_STRING("MathcapViolation: "+ + e.getMessage()))); + }catch(MathcapViolation tmp){} } } @@ -75,7 +85,7 @@ class OMproxy implements Runnable{ int argc; if(!(stack.peek() instanceof CMO_STRING)){ - stack.push(new CMO_ERROR2()); + stack.push(new CMO_ERROR2(new CMO_NULL())); return; } function_name = ((CMO_STRING)stack.pop()).getString(); @@ -86,7 +96,7 @@ class OMproxy implements Runnable{ } if(argc != 1){ - stack.push(new CMO_ERROR2()); + stack.push(new CMO_ERROR2(new CMO_NULL())); return; } @@ -98,7 +108,7 @@ class OMproxy implements Runnable{ return; } - stack.push(new CMO_ERROR2()); + stack.push(new CMO_ERROR2(new CMO_NULL())); return; } @@ -124,10 +134,10 @@ class OMproxy implements Runnable{ } { - 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), + CMO[] CMOFormat = {new CMO_INT32(CMO.NULL), + new CMO_INT32(CMO.INT32), + new CMO_INT32(CMO.STRING), + new CMO_INT32(CMO.LIST), new CMO_INT32(CMO.CMO_MONOMIAL32), new CMO_INT32(CMO.CMO_ZZ), new CMO_INT32(CMO.CMO_QQ), @@ -135,7 +145,7 @@ class OMproxy implements Runnable{ 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.POLYNOMIAL_IN_ONE_VARIABLE), new CMO_INT32(CMO.CMO_BIGFLOAT), new CMO_INT32(CMO.CMO_INDETERMINATE), new CMO_INT32(CMO.CMO_TREE)}; @@ -154,7 +164,7 @@ class OMproxy implements Runnable{ Object mathcap = stack.pop(); if(mathcap instanceof CMO_MATHCAP){ - stack.push(new CMO_ERROR2()); + stack.push(new CMO_ERROR2(new CMO_NULL())); } ox.setMathCap((CMO_MATHCAP)mathcap); }