=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cio.c,v retrieving revision 1.1 retrieving revision 1.3 diff -u -p -r1.1 -r1.3 --- OpenXM_contrib2/asir2000/io/cio.c 1999/12/03 07:39:11 1.1 +++ OpenXM_contrib2/asir2000/io/cio.c 2000/08/21 08:31:38 1.3 @@ -1,4 +1,51 @@ -/* $OpenXM: OpenXM/src/asir99/io/cio.c,v 1.2 1999/11/18 02:24:01 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * $OpenXM: OpenXM_contrib2/asir2000/io/cio.c,v 1.2 2000/03/28 06:32:22 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "ox.h" @@ -20,7 +67,7 @@ Obj obj; case O_ERR: case O_USINT: case O_VOID: return 1; case O_N: - if ( NID((Num)obj) == N_Q ) + if ( NID((Num)obj) == N_Q || NID((Num)obj) == N_R ) return 1; else return 0; @@ -47,7 +94,19 @@ Obj obj; } switch ( OID(obj) ) { case O_N: - write_cmo_q(s,obj); + switch ( NID((Num)obj) ) { + case N_Q: + write_cmo_q(s,(Q)obj); + break; + case N_R: + write_cmo_real(s,(Real)obj); + break; + default: + sprintf(errmsg, "write_cmo : number id=%d not implemented.", + NID((Num)obj)); + error(errmsg); + break; + } break; case O_P: write_cmo_p(s,obj); @@ -119,6 +178,17 @@ Q q; } } +write_cmo_real(s,real) +FILE *s; +Real real; +{ + unsigned int r; + double dbl; + + r = CMO_IEEE_DOUBLE_FLOAT; write_int(s,&r); + dbl = real->body; write_double(s,&dbl); +} + write_cmo_zz(s,sgn,n) FILE *s; int sgn; @@ -292,6 +362,8 @@ Obj *rp; N nm,dn; P p,pnm,pdn; R r; + Real real; + double dbl; STRING str; USINT t; DP dp; @@ -338,6 +410,9 @@ Obj *rp; read_cmo_zz(s,&sgn,&nm); read_cmo_zz(s,&dummy,&dn); NDTOQ(nm,dn,sgn,q); *rp = (Obj)q; + break; + case CMO_IEEE_DOUBLE_FLOAT: + read_double(s,&dbl); MKReal(dbl,real); *rp = (Obj)real; break; case CMO_DISTRIBUTED_POLYNOMIAL: read_cmo_dp(s,&dp); *rp = (Obj)dp;