=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v retrieving revision 1.5 retrieving revision 1.13 diff -u -p -r1.5 -r1.13 --- OpenXM_contrib2/asir2000/builtin/strobj.c 2000/03/02 07:16:09 1.5 +++ OpenXM_contrib2/asir2000/builtin/strobj.c 2004/02/26 10:07:55 1.13 @@ -1,10 +1,60 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.4 2000/02/07 06:04:56 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@sec.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/builtin/strobj.c,v 1.12 2004/02/26 07:06:31 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "ctype.h" -#if PARI +#if defined(PARI) #include "genpari.h" +# if !(PARI_VERSION_CODE > 131588) extern jmp_buf environnement; +# endif #endif #include @@ -13,6 +63,10 @@ extern char *parse_strp; void Prtostr(), Pstrtov(), Peval_str(); void Pstrtoascii(), Pasciitostr(); void Pstr_len(), Pstr_chr(), Psub_str(); +void Popen_textbuffer(); +void Pclose_textbuffer(); +void Pwrite_to_textbuffer(); +void Ptextbuffer_to_string(); struct ftab str_tab[] = { {"rtostr",Prtostr,1}, @@ -23,9 +77,94 @@ struct ftab str_tab[] = { {"str_len",Pstr_len,1}, {"str_chr",Pstr_chr,3}, {"sub_str",Psub_str,3}, + {"open_textbuffer",Popen_textbuffer,0}, + {"close_textbuffer",Pclose_textbuffer,1}, + {"write_to_textbuffer",Pwrite_to_textbuffer,2}, + {"textbuffer_to_string",Ptextbuffer_to_string,1}, {0,0,0}, }; +typedef struct oAsirTextBuffer { + int size,next; + char **body; +} *AsirTextBuffer; + +static AsirTextBuffer *TBArray; +static int TBArrayLen; + +void Popen_textbuffer(Q *rp) +{ + int i; + AsirTextBuffer tb; + + if ( !TBArray ) { + TBArrayLen = 256; + TBArray = (AsirTextBuffer *)MALLOC(TBArrayLen*sizeof(AsirTextBuffer)); + } + for ( i = 0; i < TBArrayLen; i++ ) + if ( !TBArray[i] ) break; + if ( i == TBArrayLen ) { + TBArrayLen *= 2; + TBArray = (AsirTextBuffer *)REALLOC(TBArray, + TBArrayLen*sizeof(AsirTextBuffer)); + } + TBArray[i] = tb = (AsirTextBuffer)MALLOC(sizeof(struct oAsirTextBuffer)); + tb->size = 256; + tb->next = 0; + tb->body = (char **)MALLOC(tb->size*sizeof(char *)); + STOQ(i,*rp); +} + +void Pclose_textbuffer(NODE arg,Q *rp) +{ + int i; + + i = QTOS((Q)ARG0(arg)); + if ( i >= 0 && i < TBArrayLen ) + TBArray[i] = 0; + else + error("close_textbuffer : invalid argument"); + *rp = 0; +} + +void Pwrite_to_textbuffer(NODE arg,Q *rp) +{ + int i; + AsirTextBuffer tb; + + i = QTOS((Q)ARG0(arg)); + if ( i >= 0 && i < TBArrayLen && (tb = TBArray[i])) { + if ( tb->next == tb->size ) { + tb->size *= 2; + tb->body = (char **)REALLOC(tb->body,tb->size*sizeof(char *)); + } + tb->body[tb->next] = BDY((STRING)ARG1(arg)); + tb->next++; + } else + error("write_to_textbuffer : invalid argument"); + *rp = 0; +} + +void Ptextbuffer_to_string(NODE arg,STRING *rp) +{ + int i,j,len; + AsirTextBuffer tb; + char *all,*p,*q; + + i = QTOS((Q)ARG0(arg)); + if ( i >= 0 && i < TBArrayLen && (tb = TBArray[i])) { + tb = TBArray[i]; + for ( j = 0, len = 0; j < tb->next; j++ ) + len += strlen(tb->body[j]); + all = (char *)MALLOC_ATOMIC((len+1)*sizeof(char)); + for ( j = 0, p = all; j < tb->next; j++ ) + for ( q = tb->body[j]; *q; *p++ = *q++ ); + *p = 0; + MKSTR(*rp,all); + } else + error("textbuffer_to_string : invalid argument"); +} + void Pstr_len(arg,rp) NODE arg; Q *rp; @@ -57,7 +196,7 @@ Q *rp; p = BDY(str); spos = QTOS(start); chr = BDY(terminator)[0]; - if ( spos > strlen(p) ) + if ( spos > (int)strlen(p) ) r = -1; else { ind = strchr(p+spos,chr); @@ -155,15 +294,19 @@ Obj *rp; { FNODE fnode; char *cmd; -#if PARI +#if defined(PARI) + void recover(int); + recover(0); +# if !(PARI_VERSION_CODE > 131588) if ( setjmp(environnement) ) { avma = top; recover(1); resetenv(""); } +# endif #endif cmd = BDY((STRING)ARG0(arg)); - exprparse(0,cmd,&fnode); + exprparse_create_var(0,cmd,&fnode); *rp = eval(fnode); } @@ -175,7 +318,7 @@ STRING *rp; int len; len = estimate_length(CO,ARG0(arg)); - b = (char *)MALLOC(len+1); + b = (char *)MALLOC_ATOMIC(len+1); soutput_init(b); sprintexpr(CO,ARG0(arg)); MKSTR(*rp,b); @@ -185,7 +328,7 @@ void Pstrtov(arg,rp) NODE arg; P *rp; { - char *p,*t; + char *p; p = BDY((STRING)ARG0(arg)); #if 0