=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v retrieving revision 1.19 retrieving revision 1.22 diff -u -p -r1.19 -r1.22 --- OpenXM/src/kan96xx/plugin/oxmisc2.c 2003/11/17 08:49:16 1.19 +++ OpenXM/src/kan96xx/plugin/oxmisc2.c 2004/03/08 08:24:42 1.22 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.18 2003/11/17 05:45:47 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.21 2004/03/01 07:19:45 takayama Exp $ */ #include #include "ox_kan.h" #include "oxmisc2.h" /* This file requires sm1 object description. */ @@ -226,6 +226,14 @@ int oxReq(oxclientp client,int func,struct object ob) oxReqExecuteFunction(client->datafp2,KopString(ob)); client->dstate = DSTATE_ANY; break; + case SM_executeFunctionWithOptionalArgument: + if (ob.tag != Sdollar) { + errorOxmisc2("SM_executeFunctionWithOptionalArgument : the argument must be a string."); + return(-1); + } + oxReqExecuteFunctionWithOptionalArgument(client->datafp2,KopString(ob)); + client->dstate = DSTATE_ANY; + break; case SM_popString: oxReqPopString(client->datafp2); client->dstate = DSTATE_ANY; @@ -254,6 +262,10 @@ int oxReq(oxclientp client,int func,struct object ob) oxReqSingleOperand(client->datafp2,SM_dupErrors); client->dstate = DSTATE_ANY; break; + case SM_pushCMOtag: + oxReqSingleOperand(client->datafp2,SM_pushCMOtag); + client->dstate = DSTATE_ANY; + break; default: fprintf(MyErrorOut,"func=%d ",func); errorOxmisc2("This function is not implemented."); @@ -766,6 +778,7 @@ static int cmoCheck00(struct object obj,int cmo[], int /* typeTrans[Spoly] = CMO_DMS; */ typeTrans[Spoly] = CMO_DISTRIBUTED_POLYNOMIAL; typeTrans[Sdouble] = CMO_64BIT_MACHINE_DOUBLE; + typeTrans[SrationalFunction] = CMO_RATIONAL; typeTrans[CLASSNAME_ERROR_PACKET] = CMO_ERROR2; typeTrans[CLASSNAME_mathcap] = CMO_MATHCAP; typeTrans[CLASSNAME_indeterminate] = CMO_INDETERMINATE;