=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- OpenXM_contrib2/asir2000/parse/pvar.c 2000/08/21 08:31:47 1.2 +++ OpenXM_contrib2/asir2000/parse/pvar.c 2001/10/09 01:36:25 1.6 @@ -23,7 +23,7 @@ * 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@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 * SOFTWARE. * @@ -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/pvar.c,v 1.1.1.1 1999/12/03 07:39:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.5 2000/12/05 01:24:57 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -53,7 +53,7 @@ NODE PVSS; void mkpvs() - { +{ VS pvs; pvs = (VS)MALLOC(sizeof(struct oVS)); @@ -63,8 +63,7 @@ void mkpvs() CPVS = pvs; } -void pushpvs(f) -FUNC f; +void pushpvs(FUNC f) { VS pvs; NODE node; @@ -103,8 +102,7 @@ void poppvs() { int gdef; -int makepvar(str) -char *str; +int makepvar(char *str) { int c; @@ -125,8 +123,7 @@ char *str; extern FUNC parse_targetf; -int searchpvar(str) -char *str; +int searchpvar(char *str) { VS pvs; int i; @@ -141,10 +138,7 @@ char *str; return i; } -int getpvar(pvs,str,searchonly) -VS pvs; -char *str; -int searchonly; +int getpvar(VS pvs,char *str,int searchonly) { struct oPV *va; PV v; @@ -175,19 +169,10 @@ void closecurrentinput() if ( asir_infile && !asir_infile->fp ) return; -#if defined(THINK_C) || defined(VISUAL) -#if defined(THINK_C) - void setDir(short); - +#if defined(VISUAL) fclose(asir_infile->fp); - setDir(asir_infile->vol); unlink(asir_infile->tname); - resetDir(); #else - fclose(asir_infile->fp); - unlink(asir_infile->tname); -#endif -#else PCLOSE(asir_infile->fp); #endif asir_infile = NEXT(asir_infile); @@ -224,46 +209,15 @@ void restorepvs() nextbplevel = saved_nextbplevel; } -void storeans(p) -pointer p; +void storeans(pointer p) { if ( APVS->asize == APVS->n ) reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); APVS->va[APVS->n++].priv = p; } -#if 1 -pointer evalpv(id,expr,f) -int id; -FNODE expr; -pointer f; -{ - pointer a,val = 0; - pointer *addr; - - if ( expr->id != I_PVAR && expr->id != I_CAST ) - error("evalpv : invalid assignment"); - switch ( id ) { - case I_PRESELF: - getmemberp((FNODE)expr,(Obj **)&addr); - (*((ARF)f)->fp)(CO,*addr,ONE,&val); *addr = val; break; - case I_POSTSELF: - getmemberp((FNODE)expr,(Obj **)&addr); - val = *addr; (*((ARF)f)->fp)(CO,*addr,ONE,&a); *addr = a; break; - case I_PVAR: - getmember((FNODE)expr,(Obj *)&val); break; - case I_ASSPVAR: - getmemberp((FNODE)expr,(Obj **)&addr); *addr = val = eval((FNODE)f); break; - } - return val; -} -#endif - #if 0 -pointer evalpv(id,tree,f) -int id; -NODE2 tree; -pointer f; +pointer evalpv(int id,NODE2 tree,pointer f) { pointer a,val = 0; pointer *addr;