=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cio.c,v retrieving revision 1.5 retrieving revision 1.13 diff -u -p -r1.5 -r1.13 --- OpenXM_contrib2/asir2000/io/cio.c 2000/09/07 23:59:54 1.5 +++ OpenXM_contrib2/asir2000/io/cio.c 2015/08/04 06:20:45 1.13 @@ -44,30 +44,31 @@ * 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.4 2000/08/22 05:04:17 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/cio.c,v 1.12 2003/04/08 22:29:00 ohara Exp $ */ #include "ca.h" #include "parse.h" #include "ox.h" +#if !defined(VISUAL) +#include +#endif #define ISIZ sizeof(int) -int write_cmo_zz(FILE *,int,N); -int read_cmo_zz(FILE *,int *,N *); - -int valid_as_cmo(obj) -Obj obj; +int valid_as_cmo(Obj obj) { NODE m; + int nid; if ( !obj ) return 1; switch ( OID(obj) ) { case O_MATHCAP: case O_P: case O_R: case O_DP: case O_STR: - case O_ERR: case O_USINT: case O_VOID: + case O_ERR: case O_USINT: case O_BYTEARRAY: case O_VOID: return 1; case O_N: - if ( NID((Num)obj) == N_Q || NID((Num)obj) == N_R ) + nid = NID((Num)obj); + if ( nid == N_Q || nid == N_R || nid == N_B ) return 1; else return 0; @@ -76,17 +77,18 @@ Obj obj; if ( !valid_as_cmo(BDY(m)) ) return 0; return 1; + case O_QUOTE: + return 1; default: return 0; } } -write_cmo(s,obj) -FILE *s; -Obj obj; +void write_cmo(FILE *s,Obj obj) { int r; char errmsg[BUFSIZ]; + LIST l; if ( !obj ) { r = CMO_NULL; write_int(s,&r); @@ -101,6 +103,9 @@ Obj obj; case N_R: write_cmo_real(s,(Real)obj); break; + case N_B: + write_cmo_bf(s,(BF)obj); + break; default: sprintf(errmsg, "write_cmo : number id=%d not implemented.", NID((Num)obj)); @@ -109,32 +114,39 @@ Obj obj; } break; case O_P: - write_cmo_p(s,obj); + write_cmo_p(s,(P)obj); break; case O_R: - write_cmo_r(s,obj); + write_cmo_r(s,(R)obj); break; case O_DP: - write_cmo_dp(s,obj); + write_cmo_dp(s,(DP)obj); break; case O_LIST: - write_cmo_list(s,obj); + write_cmo_list(s,(LIST)obj); break; case O_STR: - write_cmo_string(s,obj); + write_cmo_string(s,(STRING)obj); break; case O_USINT: - write_cmo_uint(s,obj); + write_cmo_uint(s,(USINT)obj); break; case O_MATHCAP: - write_cmo_mathcap(s,obj); + write_cmo_mathcap(s,(MATHCAP)obj); break; case O_ERR: - write_cmo_error(s,obj); + write_cmo_error(s,(ERR)obj); break; + case O_BYTEARRAY: + write_cmo_bytearray(s,(BYTEARRAY)obj); + break; case O_VOID: r = ((USINT)obj)->body; write_int(s,&r); break; + case O_QUOTE: + fnodetotree(BDY((QUOTE)obj),&l); + write_cmo_tree(s,l); + break; default: sprintf(errmsg, "write_cmo : id=%d not implemented.",OID(obj)); error(errmsg); @@ -142,9 +154,7 @@ Obj obj; } } -int cmo_tag(obj,tag) -Obj obj; -int *tag; +int cmo_tag(Obj obj,int *tag) { if ( !valid_as_cmo(obj) ) return 0; @@ -159,6 +169,8 @@ int *tag; *tag = DN((Q)obj) ? CMO_QQ : CMO_ZZ; break; case N_R: *tag = CMO_IEEE_DOUBLE_FLOAT; break; + case N_B: + *tag = CMO_BIGFLOAT; break; default: return 0; } @@ -179,25 +191,23 @@ int *tag; *tag = CMO_MATHCAP; break; case O_ERR: *tag = CMO_ERROR2; break; + case O_QUOTE: + *tag = CMO_TREE; break; break; default: return 0; } return 1; } -write_cmo_mathcap(s,mc) -FILE *s; -MATHCAP mc; +void write_cmo_mathcap(FILE *s,MATHCAP mc) { unsigned int r; r = CMO_MATHCAP; write_int(s,&r); - write_cmo(s,BDY(mc)); + write_cmo(s,(Obj)BDY(mc)); } -write_cmo_uint(s,ui) -FILE *s; -USINT ui; +void write_cmo_uint(FILE *s,USINT ui) { unsigned int r; @@ -205,9 +215,7 @@ USINT ui; r = ui->body; write_int(s,&r); } -write_cmo_q(s,q) -FILE *s; -Q q; +void write_cmo_q(FILE *s,Q q) { int r; @@ -221,9 +229,7 @@ Q q; } } -write_cmo_real(s,real) -FILE *s; -Real real; +void write_cmo_real(FILE *s,Real real) { unsigned int r; double dbl; @@ -232,16 +238,32 @@ Real real; dbl = real->body; write_double(s,&dbl); } -write_cmo_zz(s,sgn,n) -FILE *s; -int sgn; -N n; +void write_cmo_bf(FILE *s,BF bf) { - int i,l,bytes; - unsigned int t; - unsigned int *b; - unsigned char c; + unsigned int r; + int len,t; + L exp; + r = CMO_BIGFLOAT; write_int(s,&r); + write_int(s,&MPFR_SIGN(bf->body)); + write_int(s,&MPFR_PREC(bf->body)); + exp = MPFR_EXP(bf->body); + write_int64(s,&exp); + len = MPFR_LIMB_SIZE(bf->body); + write_int(s,&len); +#if SIZEOF_LONG == 4 + write_intarray(s,MPFR_MANT(bf->body),len); +#else /* SIZEOF_LONG == 8 */ + t = 2*len; + write_int(s,&t); + write_longarray(s,MPFR_MANT(bf->body),len); +#endif +} + +void write_cmo_zz(FILE *s,int sgn,N n) +{ + int l,bytes; + #if 1 l = PL(n); bytes = sgn*l; @@ -261,15 +283,12 @@ N n; #endif } -write_cmo_p(s,p) -FILE *s; -P p; +void write_cmo_p(FILE *s,P p) { int r,i; VL t,vl; char *namestr; STRING name; - NODE n0,n; r = CMO_RECURSIVE_POLYNOMIAL; write_int(s,&r); get_vars((Obj)p,&vl); @@ -284,17 +303,14 @@ P p; /* localname_to_cmoname(NAME(t->v),&namestr); */ namestr = NAME(t->v); MKSTR(name,namestr); - write_cmo(s,name); + write_cmo(s,(Obj)name); } /* body */ write_cmo_upoly(s,vl,p); } -write_cmo_upoly(s,vl,p) -FILE *s; -VL vl; -P p; +void write_cmo_upoly(FILE *s,VL vl,P p) { int r,i; V v; @@ -302,7 +318,7 @@ P p; VL vlt; if ( NUM(p) ) - write_cmo(s,p); + write_cmo(s,(Obj)p); else { r = CMO_UNIVARIATE_POLYNOMIAL; write_int(s,&r); v = VR(p); @@ -318,20 +334,16 @@ P p; } } -write_cmo_r(s,f) -FILE *s; -R f; +void write_cmo_r(FILE *s,R f) { int r; r = CMO_RATIONAL; write_int(s,&r); - write_cmo(s,NM(f)); - write_cmo(s,DN(f)); + write_cmo(s,(Obj)NM(f)); + write_cmo(s,(Obj)DN(f)); } -write_cmo_dp(s,dp) -FILE *s; -DP dp; +void write_cmo_dp(FILE *s,DP dp) { int i,n,nv,r; MP m; @@ -345,10 +357,7 @@ DP dp; write_cmo_monomial(s,m,nv); } -write_cmo_monomial(s,m,n) -FILE *s; -MP m; -int n; +void write_cmo_monomial(FILE *s,MP m,int n) { int i,r; int *p; @@ -358,12 +367,10 @@ int n; for ( i = 0, p = m->dl->d; i < n; i++ ) { write_int(s,p++); } - write_cmo_q(s,m->c); + write_cmo_q(s,(Q)m->c); } -write_cmo_list(s,list) -FILE *s; -LIST list; +void write_cmo_list(FILE *s,LIST list) { NODE m; int i,n,r; @@ -375,9 +382,7 @@ LIST list; write_cmo(s,BDY(m)); } -write_cmo_string(s,str) -FILE *s; -STRING str; +void write_cmo_string(FILE *s,STRING str) { int r; @@ -385,35 +390,87 @@ STRING str; savestr(s,BDY(str)); } -write_cmo_error(s,e) -FILE *s; -ERR e; +void write_cmo_bytearray(FILE *s,BYTEARRAY array) { int r; + r = CMO_DATUM; write_int(s,&r); + write_int(s,&array->len); + write_string(s,array->body,array->len); +} + +void write_cmo_error(FILE *s,ERR e) +{ + int r; + r = CMO_ERROR2; write_int(s,&r); write_cmo(s,BDY(e)); } -read_cmo(s,rp) -FILE *s; -Obj *rp; +/* XXX */ + +/* + * BDY(l) = treenode + * treenode = [property,(name,)arglist] + * arglist = list of treenode + */ + +void write_cmo_tree(FILE *s,LIST l) { + NODE n; + int r; + STRING prop,name,key; + + /* (CMO_TREE (CMO_LIST,n,key1,attr1,...,keyn,attn),(CMO_LIST,m,arg1,...,argm)) */ + n = BDY(l); + prop = (STRING)BDY(n); n = NEXT(n); + if ( !strcmp(BDY(prop),"internal") ) { + write_cmo(s,(Obj)BDY(n)); + } else { + if ( strcmp(BDY(prop),"list") ) { + r = CMO_TREE; write_int(s,&r); + name = (STRING)BDY(n); + n = NEXT(n); + /* function name */ + write_cmo(s,(Obj)name); + + /* attribute list */ + r = CMO_LIST; write_int(s,&r); + r = 2; write_int(s,&r); + MKSTR(key,"asir"); + write_cmo(s,(Obj)key); + write_cmo(s,(Obj)prop); + } + + /* argument list */ + r = CMO_LIST; write_int(s,&r); + /* len = number of arguments */ + r = length(n); write_int(s,&r); + while ( n ) { + write_cmo_tree(s,BDY(n)); + n = NEXT(n); + } + } +} + +void read_cmo(FILE *s,Obj *rp) +{ int id; - int n,sgn,dummy; - Q q,qnm,qdn; + int sgn,dummy; + Q q; N nm,dn; P p,pnm,pdn; - R r; Real real; double dbl; STRING str; USINT t; DP dp; - char *b; Obj obj; ERR e; + BF bf; MATHCAP mc; + BYTEARRAY array; + LIST list; read_int(s,&id); switch ( id ) { @@ -422,9 +479,11 @@ Obj *rp; *rp = 0; break; case CMO_INT32: - read_cmo_uint(s,rp); + read_cmo_uint(s,&t); *rp = (Obj)t; break; case CMO_DATUM: + loadbytearray(s,&array); *rp = (Obj)array; + break; case CMO_STRING: loadstring(s,&str); *rp = (Obj)str; break; @@ -443,7 +502,7 @@ Obj *rp; read_cmo_list(s,rp); break; case CMO_MONOMIAL32: - read_cmo_monomial(s,rp); + read_cmo_monomial(s,&dp); *rp = (Obj)dp; break; case CMO_ZZ: read_cmo_zz(s,&sgn,&nm); @@ -457,6 +516,9 @@ Obj *rp; case CMO_IEEE_DOUBLE_FLOAT: read_double(s,&dbl); MKReal(dbl,real); *rp = (Obj)real; break; + case CMO_BIGFLOAT: + read_cmo_bf(s,&bf); *rp = (Obj)bf; + break; case CMO_DISTRIBUTED_POLYNOMIAL: read_cmo_dp(s,&dp); *rp = (Obj)dp; break; @@ -467,10 +529,11 @@ Obj *rp; read_cmo_upoly(s,&p); *rp = (Obj)p; break; case CMO_INDETERMINATE: - read_cmo(s,&str); *rp = (Obj)str; + read_cmo(s,rp); break; case CMO_RATIONAL: - read_cmo(s,&pnm); read_cmo(s,&pdn); + read_cmo(s,&obj); pnm = (P)obj; + read_cmo(s,&obj); pdn = (P)obj; divr(CO,(Obj)pnm,(Obj)pdn,rp); break; case CMO_ZERO: @@ -482,6 +545,16 @@ Obj *rp; case CMO_RING_BY_NAME: read_cmo(s,rp); break; + case CMO_TREE: + read_cmo_tree_as_list(s,&list); +#if 0 + treetofnode(list,&fn); + MKQUOTE(quote,fn); + *rp = (Obj)quote; +#else + *rp = (Obj)list; +#endif + break; default: MKUSINT(t,id); t->id = O_VOID; @@ -490,9 +563,7 @@ Obj *rp; } } -read_cmo_uint(s,rp) -FILE *s; -USINT *rp; +void read_cmo_uint(FILE *s,USINT *rp) { unsigned int body; @@ -500,16 +571,10 @@ USINT *rp; MKUSINT(*rp,body); } -read_cmo_zz(s,sgn,rp) -FILE *s; -int *sgn; -N *rp; +void read_cmo_zz(FILE *s,int *sgn,N *rp) { - int l,i,words; + int l; N n; - unsigned int *b; - unsigned int h; - unsigned char c; read_int(s,&l); if ( l == 0 ) { @@ -549,14 +614,33 @@ N *rp; #endif } -read_cmo_list(s,rp) -FILE *s; -Obj *rp; +void read_cmo_bf(FILE *s,BF *bf) { + BF r; + int sgn,prec,len; + L exp; + + NEWBF(r); + read_int(s,&sgn); + read_int(s,&prec); + read_int64(s,&exp); + read_int(s,&len); + mpfr_init2(r->body,prec); + MPFR_SIGN(r->body) = sgn; + MPFR_EXP(r->body) = exp; +#if SIZEOF_LONG == 4 + read_intarray(s,MPFR_MANT(r->body),len); +#else /* SIZEOF_LONG == 8 */ + read_longarray(s,MPFR_MANT(r->body),len>>1); +#endif + *bf = r; +} + +void read_cmo_list(FILE *s,Obj *rp) +{ int len; Obj *w; int i; - Obj r,r1; NODE n0,n1; LIST list; @@ -571,13 +655,10 @@ Obj *rp; *rp = (Obj)list; } -read_cmo_dp(s,rp) -FILE *s; -DP *rp; +void read_cmo_dp(FILE *s,DP *rp) { int len; int i; - NODE n0,n1; MP mp0,mp; int nv,d; DP dp; @@ -587,7 +668,7 @@ DP *rp; /* skip the ring definition */ read_cmo(s,&obj); for ( mp0 = 0, i = 0, d = 0; i < len; i++ ) { - read_cmo(s,&dp); + read_cmo(s,&obj); dp = (DP)obj; if ( !mp0 ) { nv = dp->nv; mp0 = dp->body; @@ -602,10 +683,9 @@ DP *rp; dp->sugar = d; *rp = dp; } -read_cmo_monomial(s,rp) -FILE *s; -DP *rp; +void read_cmo_monomial(FILE *s,DP *rp) { + Obj obj; MP m; DP dp; int i,sugar,n; @@ -617,16 +697,15 @@ DP *rp; for ( sugar = 0, i = 0; i < n; i++ ) sugar += dl->d[i]; dl->td = sugar; - read_cmo(s,&m->c); + read_cmo(s,&obj); m->c = (P)obj; NEXT(m) = 0; MKDP(n,m,dp); dp->sugar = sugar; *rp = dp; } static V *remote_vtab; -read_cmo_p(s,rp) -FILE *s; -P *rp; +void read_cmo_p(FILE *s,P *rp) { + Obj obj; LIST vlist; int nv,i; V *vtab; @@ -636,7 +715,7 @@ P *rp; VL tvl,rvl; char *name; - read_cmo(s,&vlist); + read_cmo(s,&obj); vlist = (LIST)obj; nv = length(BDY(vlist)); vtab = (V *)ALLOCA(nv*sizeof(V)); for ( i = 0, t = BDY(vlist); i < nv; t = NEXT(t), i++ ) { @@ -645,7 +724,7 @@ P *rp; makevar(name,&v); vtab[i] = VR(v); } remote_vtab = vtab; - read_cmo(s,&p); + read_cmo(s,&obj); p = (P)obj; for ( i = 0; i < nv-1; i++ ) { v1 = vtab[i]; v2 = vtab[i+1]; for ( tvl = CO; tvl->v != v1 && tvl->v != v2; tvl = NEXT(tvl) ); @@ -661,11 +740,10 @@ P *rp; *rp = p; } -read_cmo_upoly(s,rp) -FILE *s; -P *rp; +void read_cmo_upoly(FILE *s,P *rp) { int n,ind,i,d; + Obj obj; P c; Q q; DCP dc0,dc; @@ -674,7 +752,7 @@ P *rp; read_int(s,&ind); for ( i = 0, dc0 = 0; i < n; i++ ) { read_int(s,&d); - read_cmo(s,&c); + read_cmo(s,&obj); c = (P)obj; if ( c ) { if ( OID(c) == O_USINT ) { UTOQ(((USINT)c)->body,q); c = (P)q; @@ -689,10 +767,143 @@ P *rp; MKP(remote_vtab[ind],dc0,*rp); } -localname_to_cmoname(a,b) -char *a; -char **b; +/* XXX */ + +extern struct oARF arf[]; + +struct operator_tab { + char *name; + fid id; + ARF arf; + cid cid; +}; + +static struct operator_tab optab[] = { + {"+",I_BOP,&arf[0],0}, /* XXX */ + {"-",I_BOP,&arf[1],0}, + {"*",I_BOP,&arf[2],0}, + {"/",I_BOP,&arf[3],0}, + {"%",I_BOP,&arf[4],0}, + {"^",I_BOP,&arf[5],0}, + {"==",I_COP,0,C_EQ}, + {"!=",I_COP,0,C_NE}, + {"<",I_COP,0,C_LT}, + {"<=",I_COP,0,C_LE}, + {">",I_COP,0,C_GT}, + {">=",I_COP,0,C_GE}, + {"&&",I_AND,0,0}, + {"||",I_OR,0,0}, + {"!",I_NOT,0,0}, +}; + +static int optab_len = sizeof(optab)/sizeof(struct operator_tab); + +#if 0 +/* old code */ +void read_cmo_tree(s,rp) +FILE *s; +FNODE *rp; { + int r,i,n; + char *opname; + STRING name,cd; + int op; + pointer *arg; + QUOTE quote; + FNODE fn; + NODE t,t1; + fid id; + Obj expr; + FUNC func; + + read_cmo(s,&name); + read_cmo(s,&attr); + for ( i = 0; i < optab_len; i++ ) + if ( !strcmp(optab[i].name,BDY(name)) ) + break; + if ( i == optab_len ) { + /* may be a function name */ + n = read_cmo_tree_arg(s,&arg); + for ( i = n-1, t = 0; i >= 0; i-- ) { + MKNODE(t1,arg[i],t); t = t1; + } + searchf(sysf,BDY(name),&func); + if ( !func ) + searchf(ubinf,BDY(name),&func); + if ( !func ) + searchpf(BDY(name),&func); + if ( !func ) + searchf(usrf,BDY(name),&func); + if ( !func ) + appenduf(BDY(name),&func); + *rp = mkfnode(2,I_FUNC,func,mkfnode(1,I_LIST,t)); + } else { + opname = optab[i].name; + id = optab[i].id; + switch ( id ) { + case I_BOP: + read_cmo_tree_arg(s,&arg); + *rp = mkfnode(3,I_BOP,optab[i].arf,arg[0],arg[1]); + return; + case I_COP: + read_cmo_tree_arg(s,&arg); + *rp = mkfnode(3,I_COP,optab[i].cid,arg[0],arg[0]); + return; + case I_AND: + read_cmo_tree_arg(s,&arg); + *rp = mkfnode(2,I_AND,arg[0],arg[1]); + return; + case I_OR: + read_cmo_tree_arg(s,&arg); + *rp = mkfnode(2,I_OR,arg[0],arg[1]); + return; + case I_NOT: + read_cmo_tree_arg(s,&arg); + *rp = mkfnode(1,I_OR,arg[0]); + return; + } + } +} + +int read_cmo_tree_arg(s,argp) +FILE *s; +pointer **argp; +{ + int id,n,i; + pointer *ap; + Obj t; + + read_int(s,&id); /* id = CMO_LIST */ + read_int(s,&n); /* n = the number of args */ + *argp = ap = (pointer *) MALLOC(n*sizeof(pointer)); + for ( i = 0; i < n; i++ ) { + read_cmo(s,&t); + if ( !t || (OID(t) != O_QUOTE) ) + ap[i] = mkfnode(1,I_FORMULA,t); + else + ap[i] = BDY((QUOTE)t); + } + return n; +} +#else +void read_cmo_tree_as_list(FILE *s,LIST *rp) +{ + Obj obj; + STRING name; + LIST attr,args; + NODE t0,t1; + + read_cmo(s,&obj); name = (STRING)obj; + read_cmo(s,&obj); attr = (LIST)obj; + read_cmo(s,&obj); args = (LIST)obj; + MKNODE(t1,name,BDY(args)); + MKNODE(t0,attr,t1); + MKLIST(*rp,t0); +} +#endif + +void localname_to_cmoname(char *a,char **b) +{ int l; char *t; @@ -706,9 +917,7 @@ char **b; } } -cmoname_to_localname(a,b) -char *a; -char **b; +void cmoname_to_localname(char *a,char **b) { int l; char *t;