[BACK]Return to strobj.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/strobj.c between version 1.6 and 1.12

version 1.6, 2000/08/21 08:31:21 version 1.12, 2004/02/26 07:06:31
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (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   * 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   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.5 2000/03/02 07:16:09 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.11 2004/02/13 05:48:35 saito Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #include "ctype.h"  #include "ctype.h"
 #if PARI  #if defined(PARI)
 #include "genpari.h"  #include "genpari.h"
   #  if !(PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;  extern jmp_buf environnement;
   #  endif
 #endif  #endif
 #include <string.h>  #include <string.h>
   
Line 105  Q *rp;
Line 107  Q *rp;
         p = BDY(str);          p = BDY(str);
         spos = QTOS(start);          spos = QTOS(start);
         chr = BDY(terminator)[0];          chr = BDY(terminator)[0];
         if ( spos > strlen(p) )          if ( spos > (int)strlen(p) )
                 r = -1;                  r = -1;
         else {          else {
                 ind = strchr(p+spos,chr);                  ind = strchr(p+spos,chr);
Line 203  Obj *rp;
Line 205  Obj *rp;
 {  {
         FNODE fnode;          FNODE fnode;
         char *cmd;          char *cmd;
 #if PARI  #if defined(PARI)
           void recover(int);
   
         recover(0);          recover(0);
   #  if !(PARI_VERSION_CODE > 131588)
         if ( setjmp(environnement) ) {          if ( setjmp(environnement) ) {
                 avma = top; recover(1);                  avma = top; recover(1);
                 resetenv("");                  resetenv("");
         }          }
   #  endif
 #endif  #endif
         cmd = BDY((STRING)ARG0(arg));          cmd = BDY((STRING)ARG0(arg));
         exprparse(0,cmd,&fnode);          exprparse_create_var(0,cmd,&fnode);
         *rp = eval(fnode);          *rp = eval(fnode);
 }  }
   
Line 223  STRING *rp;
Line 229  STRING *rp;
         int len;          int len;
   
         len = estimate_length(CO,ARG0(arg));          len = estimate_length(CO,ARG0(arg));
         b = (char *)MALLOC(len+1);          b = (char *)MALLOC_ATOMIC(len+1);
         soutput_init(b);          soutput_init(b);
         sprintexpr(CO,ARG0(arg));          sprintexpr(CO,ARG0(arg));
         MKSTR(*rp,b);          MKSTR(*rp,b);
Line 233  void Pstrtov(arg,rp)
Line 239  void Pstrtov(arg,rp)
 NODE arg;  NODE arg;
 P *rp;  P *rp;
 {  {
         char *p,*t;          char *p;
   
         p = BDY((STRING)ARG0(arg));          p = BDY((STRING)ARG0(arg));
 #if 0  #if 0
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.12
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>