=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v retrieving revision 1.1.1.1 retrieving revision 1.21 diff -u -p -r1.1.1.1 -r1.21 --- OpenXM/src/OpenMath/OMproxy.java 1999/11/02 11:52:34 1.1.1.1 +++ OpenXM/src/OpenMath/OMproxy.java 2000/01/19 15:21:58 1.21 @@ -1,3 +1,7 @@ +/** + * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.20 2000/01/19 15:19:29 tam Exp $ + */ + import JP.ac.kobe_u.math.tam.OpenXM.*; import java.util.Stack; import java.io.*; @@ -5,6 +9,8 @@ import java.io.*; class OMproxy implements Runnable{ private OpenXM ox; private Stack stack = new Stack(); + private boolean debug = true; + final int version = 200001190; public OMproxy(String host,int ControlPort,int DataPort) throws IOException{ ox = new OpenXM(this,host,ControlPort,DataPort); @@ -13,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()); - System.out.println("push: "+ stack.peek()); - break; - } + case OpenXM.OX_DATA: + stack.push(ox.receiveCMO()); + debug("push: "+ stack.peek()); + break; } + }catch(Exception 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){ @@ -48,11 +54,13 @@ 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{ + debug("sending CMO: "+ stack.peek()); ox.send(stack.pop()); } } @@ -60,14 +68,14 @@ class OMproxy implements Runnable{ private void SM_executeFunction() throws java.io.IOException{ String function_name; CMO[] argv; - int argc; + int argc = 1; if(!(stack.peek() instanceof CMO_STRING)){ stack.push(new CMO_ERROR2()); return; } function_name = ((CMO_STRING)stack.pop()).getString(); - argc = ((CMO_INT32)stack.pop()).intValue(); + //argc = ((CMO_INT32)stack.pop()).intValue(); argv = new CMO[argc]; for(int i=0;i