=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v retrieving revision 1.24 retrieving revision 1.62 diff -u -p -r1.24 -r1.62 --- OpenXM_contrib2/asir2000/builtin/strobj.c 2004/03/05 01:19:09 1.24 +++ OpenXM_contrib2/asir2000/builtin/strobj.c 2005/09/27 09:32:22 1.62 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.23 2004/03/05 01:15:48 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.61 2005/09/27 03:00:21 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -65,6 +65,7 @@ struct TeXSymbol { extern char *parse_strp; +void Psprintf(); void Prtostr(), Pstrtov(), Peval_str(); void Pstrtoascii(), Pasciitostr(); void Pstr_len(), Pstr_chr(), Psub_str(); @@ -75,13 +76,23 @@ void Pstring_to_tb(); void Pquotetotex_tb(); void Pquotetotex(); void Pquotetotex_env(); +void Pflatten_quote(); +void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name(); +void Pquote_unify(); +void do_assign(NODE arg); void fnodetotex_tb(FNODE f,TB tb); char *symbol_name(char *name); +char *conv_rule(char *name); +char *conv_subs(char *name); +char *call_convfunc(char *name); void tb_to_string(TB tb,STRING *rp); void fnodenodetotex_tb(NODE n,TB tb); void fargstotex_tb(char *opname,FNODE f,TB tb); +int top_is_minus(FNODE f); +int quote_unify(Obj f,Obj pat,NODE *rp); struct ftab str_tab[] = { + {"sprintf",Psprintf,-99999999}, {"rtostr",Prtostr,1}, {"strtov",Pstrtov,1}, {"eval_str",Peval_str,1}, @@ -97,6 +108,11 @@ struct ftab str_tab[] = { {"quotetotex_tb",Pquotetotex_tb,2}, {"quotetotex",Pquotetotex,1}, {"quotetotex_env",Pquotetotex_env,-99999999}, + {"flatten_quote",Pflatten_quote,2}, + {"quote_to_funargs",Pquote_to_funargs,1}, + {"quote_unify",Pquote_unify,2}, + {"funargs_to_quote",Pfunargs_to_quote,1}, + {"get_function_name",Pget_function_name,1}, {0,0,0}, }; @@ -112,12 +128,32 @@ void write_tb(char *s,TB tb) int register_symbol_table(Obj arg); int register_conv_rule(Obj arg); +int register_conv_func(Obj arg); int register_dp_vars(Obj arg); +int register_dp_vars_origin(Obj arg); +int register_dp_dvars_origin(Obj arg); +int register_dp_dvars_prefix(Obj arg); +int register_dp_vars_prefix(Obj arg); +int register_dp_vars_hweyl(Obj arg); +int register_show_lt(Obj arg); +char *objtostr(Obj obj); static struct TeXSymbol *user_texsymbol; -static char *(*conv_rule)(char *); static char **dp_vars; -int dp_vars_len; +static int dp_vars_len; +static char *dp_vars_prefix; +static char *dp_dvars_prefix; +static int dp_vars_origin; +static int dp_dvars_origin; +static int show_lt; +static FUNC convfunc; +static int is_lt; +static int conv_flag; +static int dp_vars_hweyl; +#define CONV_TABLE (1U<<0) +#define CONV_SUBS (1U<<1) +#define CONV_DMODE (1U<<2) + static struct { char *name; Obj value; @@ -125,78 +161,129 @@ static struct { } qtot_env[] = { {"symbol_table",0,register_symbol_table}, {"conv_rule",0,register_conv_rule}, + {"conv_func",0,register_conv_func}, {"dp_vars",0,register_dp_vars}, + {"dp_vars_prefix",0,register_dp_vars_prefix}, + {"dp_dvars_prefix",0,register_dp_dvars_prefix}, + {"dp_vars_origin",0,register_dp_vars_origin}, + {"dp_dvars_origin",0,register_dp_dvars_origin}, + {"dp_vars_hweyl",0,register_dp_vars_hweyl}, + {"show_lt",0,register_show_lt}, {0,0,0}, }; #define PARTIAL "\\partial" -char *conv_rule_d(char *name) + +char *conv_rule(char *name) { - int l,i,j,alpha,start; - char *b,*r; - l = strlen(name); + char *body,*r; + int len; - if ( name[0] == 'd' ) { - /* 3 : _{} */ - b = (char *)ALLOCA((2*l+1+strlen(PARTIAL)+3)*sizeof(char)); - sprintf(b,"%s_{",PARTIAL); - i = 1; - j = strlen(b); - } else { - b = (char *)ALLOCA((2*l+1)*sizeof(char)); - i = j = 0; + if ( convfunc ) + name = call_convfunc(name); + if ( conv_flag & CONV_TABLE ) { + r = symbol_name(name); + if ( r ) return r; } - for ( ; i < l && name[i] == '_'; i++); - for ( ; i < l; ) { - if ( !isalpha(name[i]) ) - break; + if ( (conv_flag & CONV_DMODE) && *name == 'd' ) { + body = conv_rule(name+1); + r = MALLOC_ATOMIC((strlen(PARTIAL)+strlen(body)+5)*sizeof(char)); + if ( !body || !(len=strlen(body)) ) + strcpy(r,PARTIAL); + else if ( len == 1 ) + sprintf(r,"%s_%s",PARTIAL,body); else - b[j++] = name[i++]; - } - if ( i == l ) - if ( name[0] == 'd' ) - goto END; - else - return name; - /* we found a digit or '_' */ - b[j++] = '_'; b[j++] = '{'; - if ( name[i] == '_' ) i++; - for ( start = 1; i < l; ) { - if ( name[i] == '_' ) { - i++; - start = 1; - b[j++] = ','; - } else if ( start ) { - alpha = isalpha(name[i])?1:0; - b[j++] = name[i++]; - start = 0; - } else if ( alpha ) { - if ( isalpha(name[i]) ) - b[j++] = name[i++]; - else { - alpha = 0; - start = 1; - b[j++] = ','; + sprintf(r,"%s_{%s}",PARTIAL,body); + return r; + } else + return conv_subs(name); +} + +int _is_delimiter(char c) +{ + if ( (c == ' ' || c == '_' || c == ',') ) return 1; + else return 0; +} + +int _is_alpha(char c) +{ + if ( isdigit(c) || c == '{' || _is_delimiter(c) ) return 0; + else return 1; +} + +char *conv_subs(char *name) +{ + int i,j,k,len,clen,slen,start,level; + char *buf,*head,*r,*h,*brace,*buf_conv; + char **subs; + + if ( !name || !(len=strlen(name)) ) return ""; + if ( !(conv_flag&CONV_SUBS) ) return name; + subs = (char **)ALLOCA(len*sizeof(char* )); + for ( i = 0, j = 0, start = i; ; j++ ) { + while ( (i < len) && _is_delimiter(name[i]) ) i++; + start = i; + if ( i == len ) break; + if ( name[i] == '{' ) { + for ( level = 1, i++; i < len && level; i++ ) { + if ( name[i] == '{' ) level++; + else if ( name[i] == '}' ) level--; } + slen = i-start; + if ( slen >= 3 ) { + brace = (char *)ALLOCA((slen+1)*sizeof(char)); + strncpy(brace,name+start+1,slen-2); + brace[slen-2] = 0; + buf = conv_subs(brace); + subs[j] = (char *)ALLOCA((strlen(buf)+3)*sizeof(char)); + if ( strlen(buf) == 1 ) + strcpy(subs[j],buf); + else + sprintf(subs[j],"{%s}",buf); + } else + subs[j] = "{}"; } else { if ( isdigit(name[i]) ) - b[j++] = name[i++]; - else { - alpha = 1; - start = 1; - b[j++] = ','; - } + while ( i < len && isdigit(name[i]) ) i++; + else + while ( i < len && _is_alpha(name[i]) ) i++; + slen = i-start; + buf = (char *)ALLOCA((slen+1)*sizeof(char)); + strncpy(buf,name+start,slen); buf[slen] = 0; + buf_conv = symbol_name(buf); + subs[j] = buf_conv?buf_conv:buf; } } - b[j++] = '}'; -END: - if ( name[0] == 'd' ) b[j++] = '}'; - b[j++] = 0; - r = (char *)MALLOC_ATOMIC((j+1)*sizeof(char)); - strcpy(r,b); + for ( k = 0, clen = 0; k < j; k++ ) clen += strlen(subs[k]); + /* {subs(0)}_{{subs(1)},...,{subs(j-1)}} => {}:j+1 _:1 ,:j-2 */ + h = r = MALLOC_ATOMIC((clen+(j+1)*2+1+(j-2)+1)*sizeof(char)); + if ( j == 1 ) + sprintf(h,"{%s}",subs[0]); + else { + sprintf(h,"{%s}_{%s",subs[0],subs[1]); + h += strlen(h); + for ( k = 2; k < j; k++ ) { + sprintf(h,",%s",subs[k]); + h += strlen(h); + } + strcpy(h,"}"); + } return r; } +char *call_convfunc(char *name) +{ + STRING str,r; + NODE arg; + + MKSTR(str,name); + arg = mknode(1,str); + r = (STRING)bevalf(convfunc,arg); + if ( !r || OID(r) != O_STR ) + error("call_convfunc : invalid result"); + return BDY(r); +} + int register_symbol_table(Obj arg) { NODE n,t; @@ -243,25 +330,59 @@ int register_symbol_table(Obj arg) return 1; } +int register_dp_vars_origin(Obj arg) +{ + if ( INT(arg) ) { + dp_vars_origin = QTOS((Q)arg); + return 1; + } else return 0; +} + +int register_dp_dvars_origin(Obj arg) +{ + if ( INT(arg) ) { + dp_dvars_origin = QTOS((Q)arg); + return 1; + } else return 0; +} + +int register_dp_vars_hweyl(Obj arg) +{ + if ( INT(arg) ) { + dp_vars_hweyl = QTOS((Q)arg); + return 1; + } else return 0; +} + +int register_show_lt(Obj arg) +{ + if ( INT(arg) ) { + show_lt = QTOS((Q)arg); + return 1; + } else return 0; +} + int register_conv_rule(Obj arg) { if ( INT(arg) ) { - switch ( QTOS((Q)arg) ) { - case 0: - conv_rule = 0; - return 1; - break; - case 1: - conv_rule = conv_rule_d; - return 1; - break; - default: - return 0; - break; - } + conv_flag = QTOS((Q)arg); + convfunc = 0; + return 1; } else return 0; } +int register_conv_func(Obj arg) +{ + if ( !arg ) { + convfunc = 0; + return 1; + } else if ( OID(arg) == O_P && (int)(VR((P)arg))->attr == V_SR ) { + convfunc = (FUNC)(VR((P)arg)->priv); + /* f must be a function which takes single argument */ + return 1; + } else return 0; +} + int register_dp_vars(Obj arg) { int l,i; @@ -272,6 +393,7 @@ int register_dp_vars(Obj arg) if ( !arg ) { dp_vars = 0; dp_vars_len = 0; + return 1; } else if ( OID(arg) != O_LIST ) return 0; else { @@ -294,6 +416,34 @@ int register_dp_vars(Obj arg) } } +int register_dp_vars_prefix(Obj arg) +{ + if ( !arg ) { + dp_vars_prefix = 0; + return 1; + } else if ( OID(arg) == O_STR ) { + dp_vars_prefix = BDY((STRING)arg); + return 1; + } else if ( OID(arg) == O_P ) { + dp_vars_prefix = NAME(VR((P)arg)); + return 1; + } else return 0; +} + +int register_dp_dvars_prefix(Obj arg) +{ + if ( !arg ) { + dp_dvars_prefix = 0; + return 1; + } else if ( OID(arg) == O_STR ) { + dp_dvars_prefix = BDY((STRING)arg); + return 1; + } else if ( OID(arg) == O_P ) { + dp_dvars_prefix = NAME(VR((P)arg)); + return 1; + } else return 0; +} + void Pquotetotex_env(NODE arg,Obj *rp) { int ac,i; @@ -312,6 +462,13 @@ void Pquotetotex_env(NODE arg,Obj *rp) NEXT(n) = 0; MKLIST(l,n0); *rp = (Obj)l; + } else if ( ac == 1 && !ARG0(arg) ) { + /* set to default */ + for ( i = 0; qtot_env[i].name; i++ ) { + (qtot_env[i].reg)(0); + qtot_env[i].value = 0; + } + *rp = 0; } else if ( ac == 1 || ac == 2 ) { asir_assert(ARG0(arg),O_STR,"quotetotex_env"); name = BDY((STRING)ARG0(arg)); @@ -351,11 +508,176 @@ void Pwrite_to_tb(NODE arg,Q *rp) *rp = 0; } +FNODE partial_eval(FNODE); + +void Pquote_unify(NODE arg,Q *rp) +{ + FNODE f,g; + QUOTE q; + NODE r; + int ret; + +#if 0 + g = partial_eval(BDY(((QUOTE)ARG0(arg)))); + MKQUOTE(q,g); + ret = quote_unify((Obj)q,(Obj)ARG1(arg),&r); +#else + ret = quote_unify((Obj)ARG0(arg),(Obj)ARG1(arg),&r); +#endif + if ( ret ) { + do_assign(r); + *rp = ONE; + } else + *rp = 0; +} + +void do_assign(NODE arg) +{ + NODE t,pair; + int pv; + + QUOTE value; + + for ( t = arg; t; t = NEXT(t) ) { + pair = BDY((LIST)BDY(t)); + pv = (int)FA0((FNODE)BDY((QUOTE)BDY(pair))); + value = (QUOTE)(BDY(NEXT(pair))); + ASSPV(pv,value); + } +} + +/* +/* consistency check and merge + */ + +int merge_matching_node(NODE n,NODE a,NODE *rp) +{ + NODE ta,ba,tn,bn; + QUOTE pa,va,pn,vn; + + if ( !n ) { + *rp = a; + return 1; + } + for ( ta = a; ta; ta = NEXT(ta) ) { + ba = BDY((LIST)BDY(ta)); + if ( !ba ) continue; + pa = (QUOTE)BDY(ba); va = (QUOTE)BDY(NEXT(ba)); + for ( tn = n; tn; tn = NEXT(tn) ) { + bn = BDY((LIST)BDY(tn)); + if ( !bn ) continue; + pn = (QUOTE)BDY(bn); vn = (QUOTE)BDY(NEXT(bn)); + if ( !compquote(CO,pa,pn) ) { + if ( !compquote(CO,va,vn) ) break; + else return 0; + } + } + if ( !tn ) { + MKNODE(tn,(pointer)BDY(ta),n); + n = tn; + } + } + *rp = n; + return 1; +} + +int quote_unify_node(NODE f,NODE pat,NODE *rp) { + NODE r,a,tf,tp,r1; + int ret; + + if ( length(f) != length(pat) ) return 0; + r = 0; + for ( tf = f, tp = pat; tf; tf = NEXT(tf), tp = NEXT(tp) ) { + ret = quote_unify((Obj)BDY(tf),(Obj)BDY(tp),&a); + if ( !ret ) return 0; + ret = merge_matching_node(r,a,&r1); + if ( !ret ) return 0; + else r = r1; + } + *rp = r; + return 1; +} + +void get_quote_id_arg(QUOTE f,int *id,NODE *r) +{ + LIST fa; + NODE arg,fab; + + arg = mknode(1,f); Pquote_to_funargs(arg,&fa); fab = BDY((LIST)fa); + *id = QTOS((Q)BDY(fab)); *r = NEXT(fab); +} + +/* *rp : [[quote(A),quote(1)],...] */ + +int quote_unify(Obj f, Obj pat, NODE *rp) +{ + NODE tf,tp,head,body; + NODE parg,farg,r; + LIST fa,l; + int pid,id; + FUNC ff,pf; + int ret; + + if ( OID(pat) == O_LIST ) { + if ( OID(f) == O_LIST ) + return quote_unify_node(BDY((LIST)f),BDY((LIST)pat),rp); + else + return 0; + } else if ( OID(pat) == O_QUOTE ) { + if ( OID(f) != O_QUOTE ) return 0; + get_quote_id_arg((QUOTE)pat,&pid,&parg); + get_quote_id_arg((QUOTE)f,&id,&farg); + switch ( pid ) { + case I_FORMULA: + if ( compquote(CO,f,pat) ) + return 0; + else { + *rp = 0; + return 1; + } + break; + case I_LIST: + return quote_unify_node(BDY((LIST)BDY(farg)), + BDY((LIST)BDY(parg)),rp); + case I_PVAR: + /* [[pat,f]] */ + r = mknode(2,pat,f); MKLIST(l,r); + *rp = mknode(1,l); + return 1; + case I_IFUNC: + /* F(X,Y,...) = ... */ + if ( id == I_FUNC ) { + r = mknode(2,BDY(parg),BDY(farg)); MKLIST(l,r); + head = mknode(1,l); + ret = quote_unify(BDY(NEXT(farg)), + BDY(NEXT(parg)),&body); + if ( !ret ) return 0; + else return merge_matching_node(head,body,rp); + } else + return 0; + case I_BOP: + case I_FUNC: + /* X+Y = ... */ + /* f(...) = ... */ + if ( compqa(CO,BDY(farg),BDY(parg)) ) return 0; + return quote_unify_node(NEXT(farg),NEXT(parg),rp); + break; + default: + if ( pid == id ) + return quote_unify_node(farg,parg,rp); + else + return 0; + } + } +} + void Pquotetotex(NODE arg,STRING *rp) { TB tb; NEWTB(tb); + /* XXX for DP */ + is_lt = 1; fnodetotex_tb(BDY((QUOTE)ARG0(arg)),tb); tb_to_string(tb,rp); } @@ -366,6 +688,8 @@ void Pquotetotex_tb(NODE arg,Q *rp) TB tb; asir_assert(ARG1(arg),O_TB,"quotetotex_tb"); + /* XXX for DP */ + is_lt = 1; fnodetotex_tb(BDY((QUOTE)ARG0(arg)),ARG1(arg)); *rp = 0; } @@ -673,6 +997,11 @@ char *symbol_name(char *name) { int i; + if ( !name || strlen(name) == 0 ) + return ""; + if ( !(conv_flag & CONV_TABLE) ) + return name; + if ( user_texsymbol ) for ( i = 0; user_texsymbol[i].text; i++ ) if ( !strcmp(user_texsymbol[i].text,name) ) @@ -680,19 +1009,36 @@ char *symbol_name(char *name) for ( i = 0; texsymbol[i].text; i++ ) if ( !strcmp(texsymbol[i].text,name) ) return texsymbol[i].symbol; - if ( conv_rule ) - return (*conv_rule)(name); - else - return name; + return 0; } +void Pget_function_name(NODE arg,STRING *rp) +{ + QUOTEARG qa; + ARF f; + char *opname; + + qa = (QUOTEARG)BDY(arg); + if ( !qa || OID(qa) != O_QUOTEARG || qa->type != A_arf ) + *rp = 0; + else { + f = (ARF)BDY(qa); + opname = f->name; + MKSTR(*rp,opname); + } +} + +FNODE strip_paren(FNODE); + void fnodetotex_tb(FNODE f,TB tb) { NODE n,t,t0; - char vname[BUFSIZ]; - char *opname,*vname_conv; + char vname[BUFSIZ],prefix[BUFSIZ]; + char *opname,*vname_conv,*prefix_conv; Obj obj; - int i,len,allzero; + int i,len,allzero,elen,elen2,si; + C cplx; + char *r; FNODE fi,f2; write_tb(" ",tb); @@ -725,7 +1071,7 @@ void fnodetotex_tb(FNODE f,TB tb) opname = ((ARF)FA0(f))->name; if ( !strcmp(opname,"+") ) { fnodetotex_tb((FNODE)FA1(f),tb); - write_tb(opname,tb); + if ( !top_is_minus((FNODE)FA2(f)) ) write_tb(opname,tb); fnodetotex_tb((FNODE)FA2(f),tb); } else if ( !strcmp(opname,"-") ) { if ( FA1(f) ) fnodetotex_tb((FNODE)FA1(f),tb); @@ -756,7 +1102,7 @@ void fnodetotex_tb(FNODE f,TB tb) } else if ( !strcmp(opname,"^") ) { fnodetotex_tb((FNODE)FA1(f),tb); write_tb("^{",tb); - fnodetotex_tb((FNODE)FA2(f),tb); + fnodetotex_tb(strip_paren((FNODE)FA2(f)),tb); write_tb("} ",tb); } else if ( !strcmp(opname,"%") ) { fnodetotex_tb((FNODE)FA1(f),tb); @@ -780,12 +1126,12 @@ void fnodetotex_tb(FNODE f,TB tb) break; case C_GT: fnodetotex_tb((FNODE)FA1(f),tb); - write_tb(" \\gt ",tb); + write_tb(" > ",tb); fnodetotex_tb((FNODE)FA2(f),tb); break; case C_LT: fnodetotex_tb((FNODE)FA1(f),tb); - write_tb(" \\lt ",tb); + write_tb(" < ",tb); fnodetotex_tb((FNODE)FA2(f),tb); break; case C_GE: @@ -815,12 +1161,12 @@ void fnodetotex_tb(FNODE f,TB tb) break; case L_GT: fnodetotex_tb((FNODE)FA1(f),tb); - write_tb(" \\gt ",tb); + write_tb(" > ",tb); fnodetotex_tb((FNODE)FA2(f),tb); break; case L_LT: fnodetotex_tb((FNODE)FA1(f),tb); - write_tb(" \\lt ",tb); + write_tb(" < ",tb); fnodetotex_tb((FNODE)FA2(f),tb); break; case L_GE: @@ -879,16 +1225,22 @@ void fnodetotex_tb(FNODE f,TB tb) /* function */ case I_FUNC: - opname = symbol_name(((FUNC)FA0(f))->name); - write_tb(opname,tb); - write_tb("(",tb); - fargstotex_tb(opname,FA1(f),tb); - write_tb(")",tb); + if ( !strcmp(((FUNC)FA0(f))->name,"@pi") ) + write_tb("\\pi",tb); + else if ( !strcmp(((FUNC)FA0(f))->name,"@e") ) + write_tb("e",tb); + else { + opname = conv_rule(((FUNC)FA0(f))->name); + write_tb(opname,tb); + write_tb("(",tb); + fargstotex_tb(opname,FA1(f),tb); + write_tb(")",tb); + } break; /* XXX */ case I_CAR: - opname = symbol_name("car"); + opname = conv_rule("car"); write_tb(opname,tb); write_tb("(",tb); fargstotex_tb(opname,FA0(f),tb); @@ -896,7 +1248,7 @@ void fnodetotex_tb(FNODE f,TB tb) break; case I_CDR: - opname = symbol_name("cdr"); + opname = conv_rule("cdr"); write_tb(opname,tb); write_tb("(",tb); fargstotex_tb(opname,FA0(f),tb); @@ -906,16 +1258,51 @@ void fnodetotex_tb(FNODE f,TB tb) /* exponent vector */ case I_EV: n = (NODE)FA0(f); + if ( dp_vars_hweyl ) { + elen = length(n); + elen2 = elen>>1; + elen = elen2<<1; + } allzero = 1; + if ( show_lt && is_lt ) + write_tb("\\underline{",tb); for ( t0 = 0, i = 0; n; n = NEXT(n), i++ ) { fi = (FNODE)BDY(n); if ( fi->id == I_FORMULA && !FA0(fi) ) continue; allzero = 0; - if ( dp_vars && i < dp_vars_len ) + if ( dp_vars && i < dp_vars_len ) { strcpy(vname,dp_vars[i]); - else - sprintf(vname,"x_{%d}",i); - vname_conv = symbol_name(vname); + vname_conv = conv_rule(vname); + } else { + if ( dp_vars_hweyl ) { + if ( i < elen2 ) { + strcpy(prefix,dp_vars_prefix?dp_vars_prefix:"x"); + prefix_conv = conv_rule(prefix); + vname_conv = (char *)ALLOCA(strlen(prefix_conv)+50); + si = i+dp_vars_origin; + sprintf(vname_conv,(si>=0&&si<10)?"%s_%d":"%s_{%d}", + prefix_conv,si); + } else if ( i < elen ) { + strcpy(prefix, + dp_dvars_prefix?dp_dvars_prefix:"\\partial"); + prefix_conv = conv_rule(prefix); + vname_conv = (char *)ALLOCA(strlen(prefix_conv)+50); + si = i+dp_dvars_origin-elen2; + sprintf(vname_conv,(si>=0&&si<10)?"%s_%d":"%s_{%d}", + prefix_conv,si); + } else { + strcpy(prefix,"h"); + vname_conv = conv_rule(prefix); + } + } else { + strcpy(prefix,dp_vars_prefix?dp_vars_prefix:"x"); + prefix_conv = conv_rule(prefix); + vname_conv = (char *)ALLOCA(strlen(prefix_conv)+50); + si = i+dp_vars_origin; + sprintf(vname_conv,(si>=0&&si<10)?"%s_%d":"%s_{%d}", + prefix_conv,si); + } + } if ( fi->id == I_FORMULA && UNIQ(FA0(fi)) ) { len = strlen(vname_conv); opname = MALLOC_ATOMIC(len+2); @@ -934,6 +1321,10 @@ void fnodetotex_tb(FNODE f,TB tb) /* XXX */ if ( allzero ) write_tb(" 1 ",tb); + if ( show_lt && is_lt ) { + write_tb("}",tb); + is_lt = 0; + } break; /* string */ @@ -944,15 +1335,32 @@ void fnodetotex_tb(FNODE f,TB tb) /* internal object */ case I_FORMULA: obj = (Obj)FA0(f); - if ( obj && OID(obj) == O_P ) { - opname = symbol_name(VR((P)obj)->name); - } else { - len = estimate_length(CO,obj); - opname = (char *)MALLOC_ATOMIC(len+1); - soutput_init(opname); - sprintexpr(CO,obj); - } - write_tb(opname,tb); + if ( !obj ) + write_tb("0",tb); + else if ( OID(obj) == O_N && NID(obj) == N_C ) { + cplx = (C)obj; + write_tb("(",tb); + if ( cplx->r ) { + r = objtostr((Obj)cplx->r); write_tb(r,tb); + } + if ( cplx->i ) { + if ( cplx->r && compnum(0,cplx->i,0) > 0 ) { + write_tb("+",tb); + if ( !UNIQ(cplx->i) ) { + r = objtostr((Obj)cplx->i); write_tb(r,tb); + } + } else if ( MUNIQ(cplx->i) ) + write_tb("-",tb); + else if ( !UNIQ(cplx->i) ) { + r = objtostr((Obj)cplx->i); write_tb(r,tb); + } + write_tb("\\sqrt{-1}",tb); + } + write_tb(")",tb); + } else if ( OID(obj) == O_P ) + write_tb(conv_rule(VR((P)obj)->name),tb); + else + write_tb(objtostr(obj),tb); break; /* program variable */ @@ -968,9 +1376,58 @@ void fnodetotex_tb(FNODE f,TB tb) } } +char *objtostr(Obj obj) +{ + int len; + char *r; + + len = estimate_length(CO,obj); + r = (char *)MALLOC_ATOMIC(len+1); + soutput_init(r); + sprintexpr(CO,obj); + return r; +} + +void Psprintf(NODE arg,STRING *rp) +{ + STRING string; + char *s,*t,*r; + int argc,n,len; + NODE node; + + string = (STRING)ARG0(arg); + asir_assert(string,O_STR,"sprintf"); + s = BDY(string); + for(n = 0, t = s; *t; t++) { + if (*t=='%' && *(t+1)=='a') { + n++; + } + } + for(node = NEXT(arg), argc = 0, len = strlen(s); node; node = NEXT(node), argc++) { + len += estimate_length(CO,BDY(node)); + } + if (argc < n) { + error("sprintf: invalid argument"); + } + r = (char *)MALLOC_ATOMIC(len); + for(node = NEXT(arg), t = r; *s; s++) { + if (*s=='%' && *(s+1)=='a') { + strcpy(t,objtostr(BDY(node))); + node = NEXT(node); + t = strchr(t,0); + s++; + }else { + *t++ = *s; + } + } + *t = 0; + MKSTR(*rp,r); +} + void fnodenodetotex_tb(NODE n,TB tb) { for ( ; n; n = NEXT(n) ) { + is_lt = 1; fnodetotex_tb((FNODE)BDY(n),tb); if ( NEXT(n) ) write_tb(", ",tb); } @@ -991,4 +1448,218 @@ void fargstotex_tb(char *name,FNODE f,TB tb) } else fnodetotex_tb(f,tb); } +} + +int top_is_minus(FNODE f) +{ + char *opname; + int len; + Obj obj; + + if ( !f ) + return 0; + switch ( f->id ) { + case I_MINUS: + return 1; + case I_BOP: + opname = ((ARF)FA0(f))->name; + switch ( opname[0] ) { + case '+': case '*': case '/': case '^': case '%': + return top_is_minus((FNODE)FA1(f)); + case '-': + if ( FA1(f) ) + return top_is_minus((FNODE)FA1(f)); + else + return 1; + default: + return 0; + } + break; + case I_COP: + return top_is_minus((FNODE)FA1(f)); + case I_LOP: + if ( (lid)FA0(f) == L_NOT ) return 0; + else return top_is_minus((FNODE)FA1(f)); + case I_AND: case I_OR: + return top_is_minus((FNODE)FA0(f)); + case I_FORMULA: + obj = (Obj)FA0(f); + if ( !obj ) + return 0; + else { + switch ( OID(obj) ) { + case O_N: + return mmono((P)obj); + case O_P: + /* must be a variable */ + opname = conv_rule(VR((P)obj)->name); + return opname[0]=='-'; + default: + /* ??? */ + len = estimate_length(CO,obj); + opname = (char *)MALLOC_ATOMIC(len+1); + soutput_init(opname); + sprintexpr(CO,obj); + return opname[0]=='-'; + } + } + default: + return 0; + } +} + +FNODE flatten_fnode(FNODE,char *); + +void Pflatten_quote(NODE arg,Obj *rp) +{ + FNODE f; + QUOTE q; + + if ( !ARG0(arg) || OID((Obj)ARG0(arg)) != O_QUOTE ) + *rp = (Obj)ARG0(arg); + else { + f = flatten_fnode(BDY((QUOTE)ARG0(arg)),BDY((STRING)ARG1(arg))); + MKQUOTE(q,f); + *rp = (Obj)q; + } +} + +void Pquote_to_funargs(NODE arg,LIST *rp) +{ + fid_spec_p spec; + QUOTE q; + QUOTEARG qa; + FNODE f; + STRING s; + QUOTE r; + int i; + Q id,a; + LIST l; + NODE t0,t,w,u,u0; + + q = (QUOTE)ARG0(arg); + if ( !q || OID(q) != O_QUOTE ) + error("quote_to_funargs : invalid argument"); + f = BDY(q); + if ( !f ) { + MKLIST(*rp,0); + return; + } + get_fid_spec(f->id,&spec); + if ( !spec ) + error("quote_to_funargs : not supported yet"); + t0 = 0; + STOQ((int)f->id,id); + NEXTNODE(t0,t); + BDY(t) = (pointer)id; + for ( i = 0; spec->type[i] != A_end; i++ ) { + NEXTNODE(t0,t); + switch ( spec->type[i] ) { + case A_fnode: + MKQUOTE(r,(FNODE)f->arg[i]); + BDY(t) = (pointer)r; + break; + case A_int: + STOQ((int)f->arg[i],a); + BDY(t) = (pointer)a; + break; + case A_str: + MKSTR(s,(char *)f->arg[i]); + BDY(t) = (pointer)s; + break; + case A_internal: + BDY(t) = (pointer)f->arg[i]; + break; + case A_node: + w = (NODE)f->arg[i]; + for ( u0 = 0; w; w = NEXT(w) ){ + NEXTNODE(u0,u); + MKQUOTE(r,(FNODE)BDY(w)); + BDY(u) = (pointer)r; + } + if ( u0 ) NEXT(u) = 0; + MKLIST(l,u0); + BDY(t) = (pointer)l; + break; + default: + MKQUOTEARG(qa,spec->type[i],f->arg[i]); + BDY(t) = (pointer)qa; + break; + } + } + if ( t0 ) NEXT(t) = 0; + MKLIST(*rp,t0); +} + +void Pfunargs_to_quote(NODE arg,QUOTE *rp) +{ + fid_spec_p spec; + QUOTE q; + QUOTEARG qa; + FNODE f; + STRING s; + QUOTE r,b; + int i; + LIST l; + fid id; + Obj a; + NODE t0,t,u0,u,w; + + l = (LIST)ARG0(arg); + if ( !l || OID(l) != O_LIST || !(t=BDY(l)) ) + error("funargs_to_quote : invalid argument"); + t = BDY(l); + id = (fid)QTOS((Q)BDY(t)); t = NEXT(t); + get_fid_spec(id,&spec); + if ( !spec ) + error("funargs_to_quote : not supported yet"); + for ( i = 0; spec->type[i] != A_end; i++ ); + NEWFNODE(f,i); + f->id = id; + for ( i = 0; spec->type[i] != A_end; i++, t = NEXT(t) ) { + if ( !t ) + error("funargs_to_quote : argument mismatch"); + a = (Obj)BDY(t); + switch ( spec->type[i] ) { + case A_fnode: + if ( !a || OID(a) != O_QUOTE ) + error("funargs_to_quote : invalid argument"); + f->arg[i] = BDY((QUOTE)a); + break; + case A_int: + if ( !INT(a) ) + error("funargs_to_quote : invalid argument"); + f->arg[i] = (pointer)QTOS((Q)a); + break; + case A_str: + if ( !a || OID(a) != O_STR ) + error("funargs_to_quote : invalid argument"); + f->arg[i] = (pointer)BDY((STRING)a); + break; + case A_internal: + f->arg[i] = (pointer)a; + break; + case A_node: + if ( !a || OID(a) != O_LIST ) + error("funargs_to_quote : invalid argument"); + u0 = 0; + for ( w = BDY((LIST)a); w; w = NEXT(w) ) { + NEXTNODE(u0,u); + b = (QUOTE)BDY(w); + if ( !b || OID(b) != O_QUOTE ) + error("funargs_to_quote : invalid argument"); + BDY(u) = BDY(b); + } + if ( u0 ) NEXT(u) = 0; + f->arg[i] = (pointer)u0; + break; + default: + if ( !a || OID(a) != O_QUOTEARG || + ((QUOTEARG)a)->type != spec->type[i] ) + error("funargs_to_quote : invalid argument"); + f->arg[i] = BDY((QUOTEARG)a); + break; + } + } + MKQUOTE(*rp,f); }