=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/elimi.java,v retrieving revision 1.3 retrieving revision 1.6 diff -u -p -r1.3 -r1.6 --- OpenXM/src/OpenMath/elimi.java 1999/12/09 00:32:36 1.3 +++ OpenXM/src/OpenMath/elimi.java 2000/10/11 08:32:13 1.6 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/elimi.java,v 1.2 1999/11/21 20:38:41 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/elimi.java,v 1.5 2000/04/02 19:24:40 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -102,20 +102,12 @@ class elimi extends Applet implements ActionListener,R public void run(){ // for debug try{ while(true){ - CMO tmp; + OXmessage tmp; Thread.yield(); - switch(oxm.receiveOXtag()){ - case OpenXM.OX_COMMAND: - oxm.receiveSM(); - break; - - case OpenXM.OX_DATA: - tmp = oxm.receiveCMO(); - System.out.println("=> "+ tmp); - break; - } + tmp = oxm.receive(); + System.err.println("=> "+ tmp); } }catch(java.io.IOException e){} } @@ -183,10 +175,12 @@ class elimi extends Applet implements ActionListener,R com += ")] gb"; debug("command: "+ com); - oxm.sendCMO(new CMO_STRING(com)); - oxm.sendSM(new SM(SM.SM_executeStringByLocalParser)); - oxm.sendSM(new SM(SM.SM_popString)); - }catch(java.io.IOException e){} + oxm.send(new CMO_STRING(com)); + oxm.send(new SM(SM.SM_executeStringByLocalParser)); + oxm.send(new SM(SM.SM_popString)); + }catch(java.io.IOException e){ + }catch(MathcapViolation e){ + } } /* if ("first".equals(arg)) { @@ -204,7 +198,7 @@ class elimi extends Applet implements ActionListener,R } public void start(){ - System.out.println("Connecting to "+ host + System.err.println("Connecting to "+ host +"("+ ControlPort +","+ DataPort +")"); try{ @@ -218,14 +212,14 @@ class elimi extends Applet implements ActionListener,R Thread.sleep(3000); oxm = new OpenXM(host,ControlPort,DataPort); - System.out.println("Connected."); - oxm.sendCMO(new CMO_STRING("(cohom.sm1) run ;\n")); - oxm.sendSM(new SM(SM.SM_executeStringByLocalParser)); + System.err.println("Connected."); + oxm.send(new CMO_STRING("(cohom.sm1) run ;\n")); + oxm.send(new SM(SM.SM_executeStringByLocalParser)); thread = new Thread(this); thread.start(); }catch(Exception e){ - System.out.println("failed."); + System.err.println("failed."); stop(); } } @@ -259,7 +253,7 @@ class elimi extends Applet implements ActionListener,R for(int i=0;i