=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.58 retrieving revision 1.60 diff -u -p -r1.58 -r1.60 --- OpenXM_contrib2/asir2000/parse/glob.c 2005/08/24 06:28:39 1.58 +++ OpenXM_contrib2/asir2000/parse/glob.c 2005/10/26 07:33:03 1.60 @@ -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/parse/glob.c,v 1.57 2005/07/12 02:37:32 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.59 2005/10/10 15:16:38 saito Exp $ */ #include "ca.h" #include "al.h" @@ -126,10 +126,11 @@ struct oVL oVLIST[52]; VL CO = oVLIST; VL ALG; -struct oVS oGPVS,oAPVS,oEPVS; +struct oVS oGPVS,oAPVS,oEPVS,oPPVS; VS GPVS = &oGPVS; VS APVS = &oAPVS; VS EPVS = &oEPVS; +VS PPVS = &oPPVS; VS CPVS,MPVS; NODE MODULE_LIST; @@ -165,6 +166,7 @@ void glob_init() { VR(&oVLIST[i]) = &oVAR[i]; NEXT(&oVLIST[i]) = 0; reallocarray((char **)&GPVS->va,(int *)&GPVS->asize,(int *)&GPVS->n,(int)sizeof(struct oPV)); reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); + reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV)); CPVS = GPVS; MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),0); OID(F_TRUE)=O_F; FOP(F_TRUE)=AL_TRUE; F_TRUE->arg.dummy = 0; @@ -768,10 +770,11 @@ char *get_pariversion() { #if PARI #if 0 - return "PARI 2.2.4, copyright (C) 2002 The PARI Group.\nPARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n H. Cohen and M. Olivier.\n"; -#endif + return PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n"; +#else return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n H. Cohen and M. Olivier.\n"; #endif +#endif return ""; } @@ -786,7 +789,7 @@ char *get_intervalversion() void copyright() { - char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s"; + char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 Copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s"; printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion()); }